Changeset 93659 in vbox for trunk/src/VBox

Timestamp:

Feb 8, 2022 2:53:08 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10193. Some fixes in clone vm wizard. Plus some changes in UINativeWizard so that we can dynamically update label of 'Next' button to 'Finish' and vice versa.

Location:

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

Files:

• UINativeWizard.cpp (modified) (3 diffs)
• UINativeWizard.h (modified) (1 diff)
• clonevm/UIWizardCloneVM.cpp (modified) (2 diffs)
• clonevm/UIWizardCloneVM.h (modified) (1 diff)
• clonevm/UIWizardCloneVMExpertPage.cpp (modified) (2 diffs)

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

@@ -143 +143 @@
     else
         m_invisiblePages.insert(iIndex);
+    /* Update the button labels since the last visible page might have changed. Thus 'Next' <-> 'Finish' might be needed: */
+    retranslateUi();
 }
 
@@ -210 +212 @@
     QPushButton *pButtonNext = wizardButton(WizardButtonType_Next);
     AssertMsgReturnVoid(pButtonNext, ("No Next wizard button found!\n"));
-    if (m_pWidgetStack && m_pWidgetStack->currentIndex() < m_pWidgetStack->count() - 1)
+    if (!isLastVisiblePage(m_pWidgetStack->currentIndex()))
     {
         pButtonNext->setText(tr("&Next"));
@@ -720 +722 @@
     m_pLabelPixmap->setPixmap(pixmapNew);
 }
+
+bool UINativeWizard::isLastVisiblePage(int iPageIndex) const
+{
+    if (!m_pWidgetStack)
+        return false;
+    if (iPageIndex == -1)
+        return false;
+    /* The page itself is not visible: */
+    if (m_invisiblePages.contains(iPageIndex))
+        return false;
+    bool fLastVisible = true;
+    /* Look at the page coming after the page with @p iPageIndex and check if they are visible: */
+    for (int i = iPageIndex + 1; i < m_pWidgetStack->count(); ++i)
+    {
+        if (!m_invisiblePages.contains(i))
+        {
+            fLastVisible = false;
+            break;
+        }
+    }
+    return fLastVisible;
+}
+
 #endif /* !VBOX_WS_MAC */

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

@@ -173 +173 @@
     void assignWatermark();
 #endif
+    /** Checks if the pages coming after the page with iPageIndex is visible or not. Returns true if
+      * page with iPageIndex is the last visible page of the wizard. Returns false otherwise. */
+    bool isLastVisiblePage(int iPageIndex) const;
 
     /** Holds the wizard type. */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVM.cpp

@@ -134 +134 @@
 }
 
+bool UIWizardCloneVM::machineHasSnapshot() const
+{
+    AssertReturn(!m_machine.isNull(), false);
+    return m_machine.GetSnapshotCount() > 0;
+}
+
 bool UIWizardCloneVM::cloneVM()
 {
@@ -235 +241 @@
             addPage(new UIWizardCloneVMNamePathPage(m_strCloneName, strDefaultMachineFolder, m_strGroup));
             addPage(new UIWizardCloneVMTypePage(m_snapshot.isNull()));
-            if (m_machine.GetSnapshotCount() > 0)
+            if (machineHasSnapshot())
                 m_iCloneModePageIndex = addPage(new UIWizardCloneVMModePage(m_snapshot.isNull() ? false : m_snapshot.GetChildrenCount() > 0));
             break;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVM.h

@@ -43 +43 @@
     /** Clone VM stuff. */
     bool cloneVM();
+    bool machineHasSnapshot() const;
 
     /** @name Parameter setter/getters

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMExpertPage.cpp

@@ -80 +80 @@
                 this, &UIWizardCloneVMExpertPage::sltKeepHardwareUUIDsToggled);
     }
-
     retranslateUi();
 }
@@ -118 +117 @@
     if (m_pCloneModeGroupBox)
         pWizard->setCloneMode(m_pCloneModeGroupBox->cloneMode());
+
+    if (m_pCloneModeGroupBox)
+        m_pCloneModeGroupBox->setEnabled(pWizard->machineHasSnapshot());
 
     retranslateUi();