Changeset 100925 in vbox for trunk/src/VBox/Frontends

Timestamp:

Aug 21, 2023 3:09:13 PM (16 months ago)

Author:

vboxsync

Message:

FE/Qt: UISettingsDialog: Cleanup for polishing and serialization stuff.

Location:

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

Files:

• UISettingsDialog.cpp (modified) (9 diffs)
• UISettingsDialog.h (modified) (2 diffs)

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

@@ -71 +71 @@
     , m_fPolished(false)
     , m_fSerializationIsInProgress(false)
-    , m_fSerializationClean(true)
+    , m_fSerializationClean(false)
     , m_fClosed(false)
     , m_pStatusBar(0)
@@ -96 +96 @@
     save();
 
-    /* If serialization was clean: */
-    if (m_fSerializationClean)
-    {
-        /* Tell the listener to close us (once): */
-        if (!m_fClosed)
-        {
-            m_fClosed = true;
-            emit sigClose();
-        }
-    }
+    /* Close if theere is no ongoing serialization: */
+    if (!isSerializationInProgress())
+        close();
 }
 
 void UISettingsDialog::reject()
 {
+    /* Close if theere is no ongoing serialization: */
     if (!isSerializationInProgress())
         close();
@@ -163 +157 @@
 }
 
-void UISettingsDialog::sltHandleSerializationFinished()
-{
-    /* Delete serializer if exists: */
-    if (serializeProcess())
-    {
-        delete m_pSerializeProcess;
-        m_pSerializeProcess = 0;
-    }
-
-    /* Mark serialization finished: */
-    m_fSerializationIsInProgress = false;
-}
-
-void UISettingsDialog::sltHandleProcessStarted()
+void UISettingsDialog::sltHandleSerializationStarted()
 {
     m_pProcessBar->setValue(0);
@@ -182 +163 @@
 }
 
-void UISettingsDialog::sltHandleProcessProgressChange(int iValue)
+void UISettingsDialog::sltHandleSerializationProgressChange(int iValue)
 {
     m_pProcessBar->setValue(iValue);
@@ -192 +173 @@
             m_pStatusBar->setCurrentIndex(0);
     }
+}
+
+void UISettingsDialog::sltHandleSerializationFinished()
+{
+    /* Delete serializer if exists: */
+    delete m_pSerializeProcess;
+    m_pSerializeProcess = 0;
+
+    /* Mark serialization finished: */
+    m_fSerializationIsInProgress = false;
 }
 
@@ -219 +210 @@
     {
         m_fPolished = true;
-        polishEvent(pEvent);
+        polishEvent();
     }
 
@@ -226 +217 @@
 }
 
-void UISettingsDialog::polishEvent(QShowEvent*)
+void UISettingsDialog::polishEvent()
 {
     /* Check what's the minimum selector size: */
@@ -293 +284 @@
     pEvent->ignore();
 
-    /* Check whether there are unsaved settings
-     * which will be lost in such case: */
-    if (   !isSettingsChanged()
+    /* Check whether serialization was clean (save)
+     * or there are no unsaved settings to be lost (cancel): */
+    if (   m_fSerializationClean
+        || !isSettingsChanged()
         || msgCenter().confirmSettingsDiscarding(this))
     {
@@ -355 +347 @@
     {
         /* Configure settings loader: */
-        connect(m_pSerializeProcess, &UISettingsSerializer::sigNotifyAboutProcessStarted, this, &UISettingsDialog::sltHandleProcessStarted);
-        connect(m_pSerializeProcess, &UISettingsSerializer::sigNotifyAboutProcessProgressChanged, this, &UISettingsDialog::sltHandleProcessProgressChange);
-        connect(m_pSerializeProcess, &UISettingsSerializer::sigNotifyAboutProcessFinished, this, &UISettingsDialog::sltHandleSerializationFinished);
+        connect(m_pSerializeProcess, &UISettingsSerializer::sigNotifyAboutProcessStarted,
+                this, &UISettingsDialog::sltHandleSerializationStarted);
+        connect(m_pSerializeProcess, &UISettingsSerializer::sigNotifyAboutProcessProgressChanged,
+                this, &UISettingsDialog::sltHandleSerializationProgressChange);
+        connect(m_pSerializeProcess, &UISettingsSerializer::sigNotifyAboutProcessFinished,
+                this, &UISettingsDialog::sltHandleSerializationFinished);
 
         /* Raise current page priority: */

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

@@ -99 +99 @@
     virtual void sltCategoryChanged(int cId);
 
+    /** Handles serializartion start. */
+    virtual void sltHandleSerializationStarted();
+    /** Handles serializartion progress change to @a iValue. */
+    virtual void sltHandleSerializationProgressChange(int iValue);
     /** Handle serializartion finished. */
     virtual void sltHandleSerializationFinished();
-
-    /** Handles process start. */
-    void sltHandleProcessStarted();
-    /** Handles process progress change to @a iValue. */
-    void sltHandleProcessProgressChange(int iValue);
 
 protected:
@@ -113 +112 @@
     /** Handles show @a pEvent. */
     virtual void showEvent(QShowEvent *pEvent) RT_OVERRIDE;
-    /** Handles first show @a pEvent. */
-    virtual void polishEvent(QShowEvent *pEvent);
+    /** Handles first show event. */
+    virtual void polishEvent();
     /** Handles close @a pEvent. */
     virtual void closeEvent(QCloseEvent *pEvent) RT_OVERRIDE;