Changeset 38572 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Aug 30, 2011 1:35:09 PM (13 years ago)

Author:

vboxsync

Message:

FE/Qt4: don't show the variant page if the user don't have a choice

Location:

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

Files:

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

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newhd/UINewHDWizard.cpp

@@ -197 +197 @@
     /* Create & add pages: */
     if (wizardType() == UINewHDWizardType_Copying)
-        addPage(new UINewHDWizardPageWelcome(sourceHardDisk));
-    addPage(new UINewHDWizardPageFormat);
-    addPage(new UINewHDWizardPageVariant);
-    addPage(new UINewHDWizardPageOptions(strDefaultName, strDefaultPath, uDefaultSize));
-    addPage(new UINewHDWizardPageSummary);
+        setPage(PageWelcome, new UINewHDWizardPageWelcome(sourceHardDisk));
+    setPage(PageFormat, new UINewHDWizardPageFormat);
+    setPage(PageVariant, new UINewHDWizardPageVariant);
+    setPage(PageOptions, new UINewHDWizardPageOptions(strDefaultName, strDefaultPath, uDefaultSize));
+    setPage(PageSummary, new UINewHDWizardPageSummary);
 
     /* Translate wizard: */
@@ -454 +454 @@
 }
 
+int UINewHDWizardPageFormat::nextId() const
+{
+    CMediumFormat mediumFormat = field("mediumFormat").value<CMediumFormat>();
+    ULONG uCapabilities = mediumFormat.GetCapabilities();
+    int cTest = 0;
+    if (uCapabilities & KMediumFormatCapabilities_CreateDynamic)
+        ++cTest;
+    if (uCapabilities & KMediumFormatCapabilities_CreateFixed)
+        ++cTest;
+    if (uCapabilities & KMediumFormatCapabilities_CreateSplit2G)
+        ++cTest;
+    if (cTest > 1)
+        return UINewHDWizard::PageVariant;
+
+    return UINewHDWizard::PageOptions;
+}
+
 void UINewHDWizardPageFormat::processFormat(CMediumFormat mediumFormat)
 {
@@ -488 +505 @@
     registerField("mediumVariant", this, "mediumVariant");
 
-    /* Unfortuanelly, KMediumVariant is very messy,
+    /* Default */
+    setMediumVariant(KMediumVariant_Standard);
+
+    /* Unfortunately, KMediumVariant is very messy,
      * so we can't enumerate it to make sure GUI will not hard-code its values,
      * we can only use hard-coded values that we need: */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newhd/UINewHDWizard.h

@@ -50 +50 @@
 public:
 
+    enum
+    {
+        PageWelcome,
+        PageFormat,
+        PageVariant,
+        PageOptions,
+        PageSummary
+    };
+
     /* Constructor: */
     UINewHDWizard(QWidget *pParent,
@@ -155 +164 @@
     /* Completeness validator: */
     bool isComplete() const;
+
+    int nextId() const;
 
     /* Helping stuff: */