Changeset 35131 in vbox for trunk/src

Timestamp:

Dec 15, 2010 1:19:00 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt: Prevent closing global/machine settings dialog while not all the settings pages loaded.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QIMainDialog.cpp (modified) (1 diff)
• extensions/QIMainDialog.h (modified) (1 diff)
• settings/UISettingsDialog.cpp (modified) (5 diffs)
• settings/UISettingsDialog.h (modified) (4 diffs)
• settings/UISettingsDialogSpecific.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMainDialog.cpp

@@ -328 +328 @@
                             reject();
                             return true;
+                        }
+                        default:
                             break;
-                        }
                     }
                 }

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMainDialog.h

@@ -67 +67 @@
 protected slots:
 
-    void accept();
-    void reject();
+    virtual void accept();
+    virtual void reject();
+
     void done (QDialog::DialogCode aRescode);
-
     void setResult (QDialog::DialogCode aRescode);
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp

@@ -22 +22 @@
 #include <QStackedWidget>
 #include <QTimer>
+#include <QCloseEvent>
 
 /* Local includes */
@@ -49 +50 @@
     /* Common variables: */
     , m_fPolished(false)
+    /* Loading stuff: */
+    , m_fProcessed(false)
     /* Error/Warning stuff: */
     , m_fValid(true)
@@ -188 +191 @@
 }
 
+void UISettingsDialog::sltMarkProcessed()
+{
+    m_fProcessed = true;
+}
+
 void UISettingsDialog::retranslateUi()
 {
@@ -410 +418 @@
         pWhatsThisWidget->setToolTip(QString("<qt>%1</qt>").arg(strWhatsThisText));
 #endif
+}
+
+void UISettingsDialog::reject()
+{
+    if (m_fProcessed)
+        QIMainDialog::reject();
 }
 
@@ -509 +523 @@
 }
 
+void UISettingsDialog::closeEvent(QCloseEvent *pEvent)
+{
+    m_fProcessed ? pEvent->accept() : pEvent->ignore();
+}
+
 void UISettingsDialog::assignValidator(UISettingsPage *pPage)
 {

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.h

@@ -56 +56 @@
     virtual void sltCategoryChanged(int cId);
 
+    /* Mark dialog as processed: */
+    virtual void sltMarkProcessed();
+
 protected:
 
@@ -91 +94 @@
     void sltUpdateWhatsThis(bool fGotFocus = false);
 
+    /* Slot to handle reject: */
+    void reject();
+
 private:
 
@@ -96 +102 @@
     bool eventFilter(QObject *pObject, QEvent *pEvent);
     void showEvent(QShowEvent *pEvent);
+    void closeEvent(QCloseEvent *pEvent);
 
     void assignValidator(UISettingsPage *pPage);
@@ -103 +110 @@
 
     /* Error & Warning stuff: */
+    bool m_fProcessed;
     bool m_fValid;
     bool m_fSilent;

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp

@@ -394 +394 @@
      * it will load global settings & delete itself in the appropriate time: */
     UISettingsSerializer *pGlobalSettingsLoader = new UISettingsSerializer(this, QVariant::fromValue(data), UISettingsSerializeDirection_Load);
+    connect(pGlobalSettingsLoader, SIGNAL(destroyed(QObject*)), this, SLOT(sltMarkProcessed()));
     /* Set pages to be loaded: */
     pGlobalSettingsLoader->setPageList(m_pSelector->settingPages());
@@ -692 +693 @@
      * it will load machine settings & delete itself in the appropriate time: */
     UISettingsSerializer *pMachineSettingsLoader = new UISettingsSerializer(this, QVariant::fromValue(data), UISettingsSerializeDirection_Load);
+    connect(pMachineSettingsLoader, SIGNAL(destroyed(QObject*)), this, SLOT(sltMarkProcessed()));
     connect(pMachineSettingsLoader, SIGNAL(sigNotifyAboutPagesProcessed()), this, SLOT(sltSetFirstRunFlag()));
     /* Set pages to be loaded: */