Frontends

Timestamp:

Feb 3, 2017 1:34:25 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: Settings dialog: Do not close the dialog on OK if save procedure had issues delivered through the new notification mechanism.

Location:

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

Files:

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

-              r64159
+              r65600
     , m_pSerializeProcess(0)
     , m_fSerializationIsInProgress(false)
+    , m_fSerializationClean(true)
     /* Status-bar stuff: */
     , m_pStatusBar(0)
 …
     saveOwnData();
+    /* Call to base-class: */
+    QIWithRetranslateUI<QIMainDialog>::accept();
+    /* If serialization was clean: */
+    if (m_fSerializationClean)
+    {
+        /* Call to base-class: */
+        QIWithRetranslateUI<QIMainDialog>::accept();
+    }
+}
 …
         if (pDlgSerializeProgress)
+        {
+            /* Remember whether the serialization was clean: */
+            m_fSerializationClean = pDlgSerializeProgress->isClean();
             /* Upload 'settings saver' data: */
             data = pDlgSerializeProgress->data();

r63978	r65600
147	147	/** Holds whether the serialization is in progress. */
148	148	bool m_fSerializationIsInProgress;
	149	/** Holds whether there were no serialization errors. */
	150	bool m_fSerializationClean;
149	151
150	152	/* Status bar widget: */

-              r62493
+              r65600
     , m_pLabelSubOperationProgress(0)
     , m_pBarSubOperationProgress(0)
+    , m_fClean(true)
+{
     /* Prepare: */
 …
 void UISettingsSerializerProgress::sltHandleOperationProgressError(QString strErrorInfo)
+{
+    /* Mark the serialization process dirty: */
+    m_fClean = false;
     /* Show the error message: */
     msgCenter().cannotSaveSettings(strErrorInfo, this);

-              r62493
+              r65600
     QVariant& data();
+    /** Returns whether there were no errors. */
+    bool isClean() const { return m_fClean; }
 protected:
 …
     QProgressBar *m_pBarSubOperationProgress;
+    /** Holds whether there were no errors. */
+    bool m_fClean;
     /** Holds the template for the sub-operation progress label. */
     static QString m_strProgressDescriptionTemplate;

Note: See TracChangeset for help on using the changeset viewer.