VBox

Timestamp:

Aug 7, 2013 10:29:50 AM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

87779

Message:

FE/Qt: Settings dialog: New validation stuff: Step 4 (Perform cascade revalidation only *after* page loading).

Location:

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

Files:

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

-              r47563
+              r47579
             /* If such page present we should fetch internal page cache: */
             if (m_pages.contains(iPageId))
+                m_pages[iPageId]->getFromCache();
+            {
+                UISettingsPage *pSettingsPage = m_pages[iPageId];
+                pSettingsPage->setValidatorBlocked(true);
+                pSettingsPage->getFromCache();
+                pSettingsPage->setValidatorBlocked(false);
+            }
+        }
+    }
 …
             if (!m_fSavingComplete)
                 m_fSavingComplete = true;
+        }
+        /* If serializer loads settings: */
+        else
+        {
+            /* We have to do initial validation finally: */
+            foreach (UISettingsPage *pPage, m_pages.values())
+                pPage->revalidate();
+        }
+    }

r47573	r47579
31	31	, m_pFirstWidget(0)
32	32	, m_pValidator(0)
	33	, m_fIsValidatorBlocked(true)
33	34	{
34	35	}
…	…
48	49	{
49	50	/* Revalidate if possible: */
50		if (m_pValidator)
	51	if (m_pValidator && !m_fIsValidatorBlocked)
51	52	m_pValidator->revalidate();
52	53	}

-              r47573
+              r47579
     /* Validation stuff: */
     void setValidator(UIPageValidator *pValidator);
+    void setValidatorBlocked(bool fIsValidatorBlocked) { m_fIsValidatorBlocked = fIsValidatorBlocked; }
     virtual bool validate(QString& /* strWarningText */, QString& /* strTitle */) { return true; }
 …
     QWidget *m_pFirstWidget;
     UIPageValidator *m_pValidator;
+    bool m_fIsValidatorBlocked;
 };

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