Changeset 84887 in vbox for trunk

Timestamp:

Jun 21, 2020 3:25:49 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9515. Overriding nextId() of the wizard to make it non-linear.

Location:

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

Files:

• UIWizardNewVM.cpp (modified) (3 diffs)
• UIWizardNewVM.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp

@@ -69 +69 @@
         case WizardMode_Basic:
         {
-            setPage(Page1, new UIWizardNewVMPageBasicUnattended);
-            setPage(Page2, new UIWizardNewVMPageBasicNameType(m_strGroup));
-            setPage(Page3, new UIWizardNewVMPageBasicHardware);
-            setPage(Page4, new UIWizardNewVMPageBasicDisk);
+            setPage(PageUnattended, new UIWizardNewVMPageBasicUnattended);
+            setPage(PageNameType, new UIWizardNewVMPageBasicNameType(m_strGroup));
+            setPage(PageHardware, new UIWizardNewVMPageBasicHardware);
+            setPage(PageDisk, new UIWizardNewVMPageBasicDisk);
             break;
         }
@@ -373 +373 @@
 }
 
+int UIWizardNewVM::nextId() const
+{
+    switch (currentId())
+    {
+        case PageUnattended:
+            return PageNameType;
+            break;
+        case PageNameType:
+            return PageHardware;
+            break;
+        case PageHardware:
+            return PageDisk;
+            break;
+        case PageDisk:
+            return UIWizard::nextId();
+        case PageMax:
+        default:
+            return PageUnattended;
+            break;
+    }
+    return UIWizard::nextId();
+}
+
 void UIWizardNewVM::sltHandleWizardCancel()
 {
@@ -379 +402 @@
         case WizardMode_Basic:
         {
-            UIWizardNewVMPageBasicNameType *pPage = qobject_cast<UIWizardNewVMPageBasicNameType*> (page(Page2));
+            UIWizardNewVMPageBasicNameType *pPage = qobject_cast<UIWizardNewVMPageBasicNameType*> (page(PageNameType));
             /* Make sure that we were able to find the page that created the folder. */
             Assert(pPage);

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.h

@@ -39 +39 @@
     enum
     {
-        Page1,
-        Page2,
-        Page3,
-        Page4
+        PageUnattended,
+        PageNameType,
+        PageHardware,
+        PageDisk,
+        PageMax
     };
 
@@ -71 +72 @@
     /* Attaches default devices: */
     bool attachDefaultDevices(const CGuestOSType &comGuestType);
+    virtual int nextId() const /* override */;
 
     /* Who will be able to create virtual-machine: */