Changeset 37138 in vbox

Timestamp:

May 18, 2011 2:53:25 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt: Settings dialog: Separate loading/saving handlers; Disconnecting reloading handlers for the time loading procedure is in progress.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings

Files:

• UISettingsDialog.cpp (modified) (5 diffs)
• UISettingsDialog.h (modified) (3 diffs)
• UISettingsDialogSpecific.cpp (modified) (10 diffs)
• UISettingsDialogSpecific.h (modified) (1 diff)

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

@@ -53 +53 @@
     , m_fPolished(false)
     /* Loading/saving stuff: */
-    , m_fProcessed(false)
+    , m_fLoaded(false)
+    , m_fSaved(false)
     /* Status bar stuff: */
     , m_pStatusBar(new QStackedWidget(this))
@@ -217 +218 @@
 }
 
-void UISettingsDialog::sltMarkProcessed()
-{
-    m_fProcessed = true;
+void UISettingsDialog::sltMarkLoaded()
+{
+    m_fLoaded = true;
+}
+
+void UISettingsDialog::sltMarkSaved()
+{
+    m_fSaved = true;
 }
 
@@ -238 +244 @@
             m_pStatusBar->setCurrentIndex(0);
     }
+}
+
+void UISettingsDialog::loadData()
+{
+    m_fLoaded = false;
+}
+
+void UISettingsDialog::saveData()
+{
+    m_fSaved = false;
 }
 
@@ -488 +504 @@
 void UISettingsDialog::reject()
 {
-    if (m_fProcessed)
+    if (m_fLoaded)
         QIMainDialog::reject();
 }
@@ -591 +607 @@
 void UISettingsDialog::closeEvent(QCloseEvent *pEvent)
 {
-    if (m_fProcessed)
+    if (m_fLoaded)
         QIMainDialog::closeEvent(pEvent);
     else

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

@@ -60 +60 @@
     virtual void sltCategoryChanged(int cId);
 
-    /* Mark dialog as processed: */
-    virtual void sltMarkProcessed();
+    /* Mark dialog as loaded: */
+    virtual void sltMarkLoaded();
+    /* Mark dialog as saved: */
+    virtual void sltMarkSaved();
 
     /* Handlers for process bar: */
@@ -70 +72 @@
 
     /* Save/load API: */
-    virtual void loadData() = 0;
-    virtual void saveData() = 0;
+    virtual void loadData();
+    virtual void saveData();
 
     /* UI translator: */
@@ -126 +128 @@
 
     /* Loading/saving stuff: */
-    bool m_fProcessed;
+    bool m_fLoaded;
+    bool m_fSaved;
 
     /* Status bar widget: */

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

@@ -405 +405 @@
 void UISettingsDialogGlobal::loadData()
 {
+    /* Call for base-class: */
+    UISettingsDialog::loadData();
+
     /* Prepare global data: */
     qRegisterMetaType<UISettingsDataGlobal>();
@@ -411 +414 @@
      * 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()));
+    connect(pGlobalSettingsLoader, SIGNAL(destroyed(QObject*)), this, SLOT(sltMarkLoaded()));
     /* Set pages to be loaded: */
     pGlobalSettingsLoader->setPageList(m_pSelector->settingPages());
@@ -422 +425 @@
 void UISettingsDialogGlobal::saveData()
 {
+    /* Call for base-class: */
+    UISettingsDialog::saveData();
+
     /* Get properties and settings: */
     CSystemProperties properties = vboxGlobal().virtualBox().GetSystemProperties();
@@ -447 +453 @@
     else if (!(newSettings == settings))
         vboxGlobal().setSettings(newSettings);
+
+    /* Mark page processed: */
+    sltMarkSaved();
 }
 
@@ -700 +709 @@
     else
         m_pSelector->selectById(0);
-
-    /* Make sure settings dialog will be updated on machine state changes: */
-    connect(gVBoxEvents, SIGNAL(sigMachineStateChange(QString, KMachineState)),
-            this, SLOT(sltMachineStateChanged(QString, KMachineState)));
-    connect(gVBoxEvents, SIGNAL(sigMachineDataChange(QString)),
-            this, SLOT(sltMachineDataChanged(QString)));
 }
 
@@ -713 +716 @@
     if (!m_session.isNull())
         return;
+
+    /* Call for base-class: */
+    UISettingsDialog::loadData();
+
+    /* Disconnect global VBox events from this dialog: */
+    gVBoxEvents->disconnect(this);
 
     /* Prepare session: */
@@ -731 +740 @@
      * 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(destroyed(QObject*)), this, SLOT(sltMarkLoaded()));
     connect(pMachineSettingsLoader, SIGNAL(sigNotifyAboutPagesProcessed()), this, SLOT(sltSetFirstRunFlag()));
     /* Set pages to be loaded: */
@@ -748 +757 @@
     if (!m_session.isNull())
         return;
+
+    /* Call for base-class: */
+    UISettingsDialog::saveData();
 
     /* Prepare session: */
@@ -821 +833 @@
 
     /* Mark page processed: */
-    sltMarkProcessed();
+    sltMarkSaved();
 }
 
@@ -1014 +1026 @@
 }
 
-void UISettingsDialogMachine::sltMarkProcessed()
+void UISettingsDialogMachine::sltMarkLoaded()
 {
     /* Call for base-class: */
-    UISettingsDialog::sltMarkProcessed();
+    UISettingsDialog::sltMarkLoaded();
+
+    /* Unlock the session if exists: */
+    if (!m_session.isNull())
+    {
+        m_session.UnlockMachine();
+        m_session = CSession();
+        m_machine = CMachine();
+        m_console = CConsole();
+    }
+
+    /* Make sure settings dialog will be updated on machine state/data changes: */
+    connect(gVBoxEvents, SIGNAL(sigMachineStateChange(QString, KMachineState)),
+            this, SLOT(sltMachineStateChanged(QString, KMachineState)));
+    connect(gVBoxEvents, SIGNAL(sigMachineDataChange(QString)),
+            this, SLOT(sltMachineDataChanged(QString)));
+}
+
+void UISettingsDialogMachine::sltMarkSaved()
+{
+    /* Call for base-class: */
+    UISettingsDialog::sltMarkSaved();
 
     /* Unlock the session if exists: */

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

@@ -98 +98 @@
 private slots:
 
-    void sltMarkProcessed();
+    void sltMarkLoaded();
+    void sltMarkSaved();
     void sltMachineStateChanged(QString strMachineId, KMachineState machineState);
     void sltMachineDataChanged(QString strMachineId);