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

Timestamp:

Jul 6, 2021 3:09:01 PM (4 years ago)

Author:

vboxsync

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

145564

Message:

FE/Qt: bugref:9996: UINativeWizard: A possibility to mark certain pages hidden; Useful if you wish to skip some of them on certain conditions; Keep in mind, 1st wizard page can't be hidden.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards

Files:

• UINativeWizard.cpp (modified) (4 diffs)
• UINativeWizard.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/UINativeWizard.cpp

@@ -114 +114 @@
 }
 
+bool UINativeWizard::isPageVisible(int iIndex) const
+{
+    return !m_invisiblePages.contains(iIndex);
+}
+
+void UINativeWizard::setPageVisible(int iIndex, bool fVisible)
+{
+    AssertMsgReturnVoid(iIndex || fVisible, ("Can't hide 1st wizard page!\n"));
+    if (fVisible)
+        m_invisiblePages.remove(iIndex);
+    else
+        m_invisiblePages.insert(iIndex);
+}
+
 int UINativeWizard::addPage(UINativeWizardPage *pPage)
 {
@@ -276 +290 @@
 void UINativeWizard::sltPrevious()
 {
-    /* For all the pages besides the 1st one we going backward: */
-    AssertReturnVoid(m_pWidgetStack->currentIndex() > 0);
-    m_pWidgetStack->setCurrentIndex(m_pWidgetStack->currentIndex() - 1);
+    /* For all allowed pages besides the 1st one we going backward: */
+    bool fPreviousFound = false;
+    int iIteratedIndex = m_pWidgetStack->currentIndex();
+    while (!fPreviousFound && iIteratedIndex > 0)
+        if (isPageVisible(--iIteratedIndex))
+            fPreviousFound = true;
+    if (fPreviousFound)
+        m_pWidgetStack->setCurrentIndex(iIteratedIndex);
 }
 
@@ -297 +316 @@
         return;
 
-    /* For all the pages besides the last one we going forward: */
-    if (m_pWidgetStack->currentIndex() < m_pWidgetStack->count() - 1)
-        m_pWidgetStack->setCurrentIndex(m_pWidgetStack->currentIndex() + 1);
+    /* For all allowed pages besides the last one we going forward: */
+    bool fNextFound = false;
+    int iIteratedIndex = m_pWidgetStack->currentIndex();
+    while (!fNextFound && iIteratedIndex < m_pWidgetStack->count() - 1)
+        if (isPageVisible(++iIteratedIndex))
+            fNextFound = true;
+    if (fNextFound)
+        m_pWidgetStack->setCurrentIndex(iIteratedIndex);
     /* For last one we just accept the wizard: */
     else
@@ -478 +502 @@
     /* Update last index: */
     m_iLastIndex = -1;
+    /* Update invisible pages: */
+    m_invisiblePages.clear();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/UINativeWizard.h

@@ -105 +105 @@
     void setPixmapName(const QString &strName);
 
+    /** Returns whether the page with certain @a iIndex is visible. */
+    bool isPageVisible(int iIndex) const;
+    /** Defines whether the page with certain @a iIndex is @a fVisible. */
+    void setPageVisible(int iIndex, bool fVisible);
+
     /** Appends wizard @a pPage.
       * @returns assigned page index. */
@@ -162 +167 @@
     /** Holds the last entered page index. */
     int         m_iLastIndex;
+    /** Holds the set of invisible pages. */
+    QSet<int>   m_invisiblePages;
 
     /** Holds the pixmap label instance. */