Changeset 90372 in vbox for trunk/src

Timestamp:

Jul 28, 2021 3:30:17 PM (4 years ago)

Author:

vboxsync

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

145953

Message:

FE/Qt: bugref:9996. More fixes for new disk wizard.

Location:

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

Files:

• newvd/UIWizardNewVD.cpp (modified) (4 diffs)
• newvd/UIWizardNewVD.h (modified) (2 diffs)
• newvd/UIWizardNewVDPageFileType.cpp (modified) (1 diff)
• newvd/UIWizardNewVDPageVariant.cpp (modified) (3 diffs)
• newvd/UIWizardNewVDPageVariant.h (modified) (1 diff)
• newvm/UIWizardNewVM.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVD.cpp

@@ -44 +44 @@
     , m_strDefaultPath(strDefaultPath)
     , m_uDefaultSize(uDefaultSize)
+    , m_iMediumVariantPageIndex(-1)
 {
 #ifndef VBOX_WS_MAC
@@ -72 +73 @@
 {
     m_comMediumFormat = mediumFormat;
+    if (mode() == WizardMode_Basic)
+        setMediumVariantPageVisibility();
 }
 
@@ -102 +105 @@
         {
             addPage(new UIWizardNewVDPageFileType);
-            addPage(new UIWizardNewVDPageVariant);
+            m_iMediumVariantPageIndex = addPage(new UIWizardNewVDPageVariant);
             addPage(new UIWizardNewVDPageSizeLocation(m_strDefaultName, m_strDefaultPath, m_uDefaultSize));
             break;
@@ -167 +170 @@
     setWindowTitle(tr("Create Virtual Hard Disk"));
 }
+
+void UIWizardNewVD::setMediumVariantPageVisibility()
+{
+    AssertReturnVoid(!m_comMediumFormat.isNull());
+    ULONG uCapabilities = 0;
+    QVector<KMediumFormatCapabilities> capabilities;
+    capabilities = m_comMediumFormat.GetCapabilities();
+    for (int i = 0; i < capabilities.size(); i++)
+        uCapabilities |= capabilities[i];
+
+    int cTest = 0;
+    if (uCapabilities & KMediumFormatCapabilities_CreateDynamic)
+        ++cTest;
+    if (uCapabilities & KMediumFormatCapabilities_CreateFixed)
+        ++cTest;
+    if (uCapabilities & KMediumFormatCapabilities_CreateSplit2G)
+        ++cTest;
+    setPageVisible(m_iMediumVariantPageIndex, cTest > 1);
+}

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVD.h

@@ -72 +72 @@
 private:
 
-    /* Translation stuff: */
     void retranslateUi();
-
+    /** Check medium capabilities and decide if medium variant page should be hidden. */
+    void setMediumVariantPageVisibility();
     qulonglong m_uMediumVariant;
     CMediumFormat m_comMediumFormat;
@@ -84 +84 @@
     QString     m_strDefaultPath;
     qulonglong  m_uDefaultSize;
+    int m_iMediumVariantPageIndex;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageFileType.cpp

@@ -103 +103 @@
     return true;
 }
-
-// int UIWizardNewVDPageFileType::nextId() const
-// {
-//     /* Show variant page only if there is something to show: */
-//     CMediumFormat mf = mediumFormat();
-//     if (mf.isNull())
-//     {
-//         AssertMsgFailed(("No medium format set!"));
-//     }
-//     else
-//     {
-//         ULONG uCapabilities = 0;
-//         QVector<KMediumFormatCapabilities> capabilities;
-//         capabilities = mf.GetCapabilities();
-//         for (int i = 0; i < capabilities.size(); i++)
-//             uCapabilities |= capabilities[i];
-
-//         int cTest = 0;
-//         if (uCapabilities & KMediumFormatCapabilities_CreateDynamic)
-//             ++cTest;
-//         if (uCapabilities & KMediumFormatCapabilities_CreateFixed)
-//             ++cTest;
-//         if (uCapabilities & KMediumFormatCapabilities_CreateSplit2G)
-//             ++cTest;
-//         if (cTest > 1)
-//             return UIWizardNewVD::Page2;
-//     }
-//     /* Skip otherwise: */
-//     return UIWizardNewVD::Page3;
-// }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageVariant.cpp

@@ -146 +146 @@
     m_pVariantGroupBox = new UIDiskVariantGroupBox(false, 0);
     pMainLayout->addWidget(m_pVariantGroupBox);
-
     pMainLayout->addStretch();
 
+    connect(m_pVariantGroupBox, &UIDiskVariantGroupBox::sigMediumVariantChanged,
+            this, &UIWizardNewVDPageVariant::sltMediumVariantChanged);
     retranslateUi();
 
@@ -191 +192 @@
     retranslateUi();
     UIWizardNewVD *pWizard = qobject_cast<UIWizardNewVD*>(wizard());
-    AssertReturnVoid(pWizard);
+    AssertReturnVoid(pWizard && m_pVariantGroupBox);
     setWidgetVisibility(pWizard->mediumFormat());
+    newVDWizardPropertySet(MediumVariant, m_pVariantGroupBox->mediumVariant());
 }
 
 bool UIWizardNewVDPageVariant::isComplete() const
 {
-    //return mediumVariant() != (qulonglong)KMediumVariant_Max;
-    return true;
-}
-
+    if (m_pVariantGroupBox && m_pVariantGroupBox->mediumVariant() != (qulonglong)KMediumVariant_Max)
+        return true;
+    return false;
+}
 
 void UIWizardNewVDPageVariant::setWidgetVisibility(const CMediumFormat &mediumFormat)
@@ -215 +217 @@
         m_pSplitLabel->setHidden(!m_pVariantGroupBox->isCreateSplitPossible());
 }
+
+void UIWizardNewVDPageVariant::sltMediumVariantChanged(qulonglong uVariant)
+{
+    newVDWizardPropertySet(MediumVariant, uVariant);
+}

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageVariant.h

@@ -58 +58 @@
     UIWizardNewVDPageVariant();
 
+private slots:
+
+    void sltMediumVariantChanged(qulonglong uVariant);
+
 private:
 

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

@@ -82 +82 @@
     void deleteVirtualDisk();
 
-
     CMedium &virtualDisk();
     void setVirtualDisk(const CMedium &medium);