Changeset 68326 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Aug 7, 2017 6:03:54 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8400: Medium manager: Separate handling of the apply/reset buttons availability status.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/medium

Files:

• UIMediumDetailsWidget.cpp (modified) (7 diffs)
• UIMediumDetailsWidget.h (modified) (2 diffs)
• UIMediumManager.cpp (modified) (2 diffs)
• UIMediumManager.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumDetailsWidget.cpp

@@ -58 +58 @@
     , m_pLabelSize(0), m_pEditorSize(0), m_pErrorPaneSize(0)
     , m_pButtonBox(0)
+    , m_fValid(true)
     , m_pLayoutDetails(0)
 {
@@ -638 +639 @@
 void UIMediumDetailsWidget::revalidate(QWidget *pWidget /* = 0 */)
 {
+    /* Reset the result: */
+    m_fValid = true;
+
     /* Validate 'Options' tab content: */
     if (!pWidget || pWidget == m_pErrorPaneType)
@@ -644 +648 @@
         const bool fError = false;
         m_pErrorPaneType->setVisible(fError);
+        if (fError)
+            m_fValid = false;
     }
     if (!pWidget || pWidget == m_pErrorPaneLocation)
@@ -650 +656 @@
         const bool fError = false;
         m_pErrorPaneLocation->setVisible(fError);
+        if (fError)
+            m_fValid = false;
     }
     if (!pWidget || pWidget == m_pErrorPaneDescription)
@@ -656 +664 @@
         const bool fError = false;
         m_pErrorPaneDescription->setVisible(fError);
+        if (fError)
+            m_fValid = false;
     }
     if (!pWidget || pWidget == m_pErrorPaneSize)
@@ -662 +672 @@
         const bool fError = false;
         m_pErrorPaneSize->setVisible(fError);
+        if (fError)
+            m_fValid = false;
     }
 
@@ -706 +718 @@
     {
         m_pButtonBox->button(QDialogButtonBox::Cancel)->setEnabled(m_oldData != m_newData);
-        m_pButtonBox->button(QDialogButtonBox::Ok)->setEnabled(m_oldData != m_newData);
+        m_pButtonBox->button(QDialogButtonBox::Ok)->setEnabled((m_oldData != m_newData) && m_fValid);
     }
 
     /* Notify listeners as well: */
-    emit sigDataChanged(m_oldData != m_newData);
+    emit sigRejectAllowed(m_oldData != m_newData);
+    emit sigAcceptAllowed((m_oldData != m_newData) && m_fValid);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumDetailsWidget.h

@@ -170 +170 @@
 signals:
 
-    /** Notifies listeners about data changed and whether it @a fDiffers. */
-    void sigDataChanged(bool fDiffers);
+    /** Notifies listeners about accept is allowed. */
+    void sigAcceptAllowed(bool fAllowed);
+    /** Notifies listeners about reject is allowed. */
+    void sigRejectAllowed(bool fAllowed);
 
     /** Notifies listeners about data change rejected and should be reseted. */
@@ -306 +308 @@
         /** Holds the button-box instance. */
         QIDialogButtonBox *m_pButtonBox;
+
+        /** Holds whether options are valid. */
+        bool m_fValid;
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp

@@ -1560 +1560 @@
         m_pDetailsWidget->setVisible(false);
         m_pDetailsWidget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
-        connect(m_pDetailsWidget, &UIMediumDetailsWidget::sigDataChanged,
-                this, &UIMediumManagerWidget::sigMediumDetailsDataChanged);
+        connect(m_pDetailsWidget, &UIMediumDetailsWidget::sigAcceptAllowed,
+                this, &UIMediumManagerWidget::sigAcceptAllowed);
+        connect(m_pDetailsWidget, &UIMediumDetailsWidget::sigRejectAllowed,
+                this, &UIMediumManagerWidget::sigRejectAllowed);
         connect(m_pDetailsWidget, &UIMediumDetailsWidget::sigDataChangeRejected,
                 this, &UIMediumManagerWidget::sltResetMediumDetailsChanges);
@@ -2317 +2319 @@
     connect(widget(), &UIMediumManagerWidget::sigMediumDetailsVisibilityChanged,
             button(ButtonType_Reset), &QPushButton::setVisible);
-    connect(widget(), &UIMediumManagerWidget::sigMediumDetailsDataChanged,
+    connect(widget(), &UIMediumManagerWidget::sigAcceptAllowed,
             button(ButtonType_Apply), &QPushButton::setEnabled);
-    connect(widget(), &UIMediumManagerWidget::sigMediumDetailsDataChanged,
+    connect(widget(), &UIMediumManagerWidget::sigRejectAllowed,
             button(ButtonType_Reset), &QPushButton::setEnabled);
     connect(buttonBox(), &QIDialogButtonBox::clicked,

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.h

@@ -64 +64 @@
     /** Notifies listeners about medium details-widget @a fVisible. */
     void sigMediumDetailsVisibilityChanged(bool fVisible);
-    /** Notifies listeners about medium details data @a fDiffers. */
-    void sigMediumDetailsDataChanged(bool fDiffers);
+    /** Notifies listeners about accept is @a fAllowed. */
+    void sigAcceptAllowed(bool fAllowed);
+    /** Notifies listeners about reject is @a fAllowed. */
+    void sigRejectAllowed(bool fAllowed);
 
 public: