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

Timestamp:

Jul 7, 2021 3:40:54 PM (4 years ago)

Author:

vboxsync

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

145574

Message:

FE/Qt: bugref:9996. More cleaning

Location:

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

Files:

• UIWizardNewVMDiskPageBasic.cpp (modified) (13 diffs)
• UIWizardNewVMDiskPageBasic.h (modified) (4 diffs)

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

@@ -115 +115 @@
 // }
 
-    // registerField("mediumFormat", this, "mediumFormat");
-    // registerField("mediumVariant" /* KMediumVariant */, this, "mediumVariant");
-    // registerField("mediumPath", this, "mediumPath");
-    // registerField("mediumSize", this, "mediumSize");
+// registerField("mediumFormat", this, "mediumFormat");
+// registerField("mediumVariant" /* KMediumVariant */, this, "mediumVariant");
+// registerField("mediumPath", this, "mediumPath");
+// registerField("mediumSize", this, "mediumSize");
 
 UIWizardNewVMDiskPageBasic::UIWizardNewVMDiskPageBasic()
@@ -133 +133 @@
     , m_pDynamicLabel(0)
     , m_pFixedLabel(0)
-    , m_pSplitLabel(0)
     , m_pFixedCheckBox(0)
-    , m_pSplitBox(0)
     , m_enmSelectedDiskSource(SelectedDiskSource_New)
     , m_fRecommendedNoDisk(false)
+    , m_fVDIFormatFound(false)
 {
     prepare();
@@ -143 +142 @@
     // qRegisterMetaType<SelectedDiskSource>();
 
-    /* We do not have any UI elements for HDD format selection since we default to VDI in case of guided wizard mode: */
-    bool fFoundVDI = false;
-    CSystemProperties properties = uiCommon().virtualBox().GetSystemProperties();
-    const QVector<CMediumFormat> &formats = properties.GetMediumFormats();
-    foreach (const CMediumFormat &format, formats)
-    {
-        if (format.GetName() == "VDI")
-        {
-            m_mediumFormat = format;
-            fFoundVDI = true;
-        }
-    }
-    if (!fFoundVDI)
-        AssertMsgFailed(("No medium format corresponding to VDI could be found!"));
-
-    m_strDefaultExtension =  UIWizardNewVMDiskPage::defaultExtension(m_mediumFormat);
-
-    /* Since the medium format is static we can decide widget visibility here: */
-    setWidgetVisibility(m_mediumFormat);
-}
-
-CMediumFormat UIWizardNewVMDiskPageBasic::mediumFormat() const
-{
-    return m_mediumFormat;
-}
+}
+
 
 void UIWizardNewVMDiskPageBasic::prepare()
@@ -320 +296 @@
     }
 
-    if (m_pSplitBox)
-        m_pSplitBox->setText(UIWizardNewVD::tr("&Split Into Files of Less Than 2GB"));
-
-
     /* Translate rich text labels: */
     if (m_pDescriptionLabel)
@@ -335 +307 @@
         m_pFixedLabel->setText(UIWizardNewVD::tr("<p>A <b>fixed size</b> hard disk file may take longer to create on some "
                                                  "systems but is often faster to use.</p>"));
-    if (m_pSplitLabel)
-        m_pSplitLabel->setText(UIWizardNewVD::tr("<p>You can also choose to <b>split</b> the hard disk file into several files "
-                                                 "of up to two gigabytes each. This is mainly useful if you wish to store the "
-                                                 "virtual machine on removable USB devices or old systems, some of which cannot "
-                                                 "handle very large files."));
-
 }
 
 void UIWizardNewVMDiskPageBasic::initializePage()
 {
-     retranslateUi();
-
-     UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
-     AssertReturnVoid(pWizard);
-
-     LONG64 iRecommendedSize = 0;
-     CGuestOSType type = pWizard->guestOSType();
-     if (!type.isNull())
-     {
-         iRecommendedSize = type.GetRecommendedHDD();
-         if (iRecommendedSize != 0)
-         {
-             if (m_pDiskNew)
-             {
-                 m_pDiskNew->setFocus();
-                 m_pDiskNew->setChecked(true);
-             }
-             m_enmSelectedDiskSource = SelectedDiskSource_New;
-             m_fRecommendedNoDisk = false;
-         }
-         else
-         {
-             if (m_pDiskEmpty)
-             {
-                 m_pDiskEmpty->setFocus();
-                 m_pDiskEmpty->setChecked(true);
-             }
-             m_enmSelectedDiskSource = SelectedDiskSource_Empty;
-             m_fRecommendedNoDisk = true;
-         }
-     }
+    retranslateUi();
+
+    UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
+    AssertReturnVoid(pWizard);
+
+    LONG64 iRecommendedSize = 0;
+    CGuestOSType type = pWizard->guestOSType();
+    if (!type.isNull())
+    {
+        iRecommendedSize = type.GetRecommendedHDD();
+        if (iRecommendedSize != 0)
+        {
+            if (m_pDiskNew)
+            {
+                m_pDiskNew->setFocus();
+                m_pDiskNew->setChecked(true);
+            }
+            m_enmSelectedDiskSource = SelectedDiskSource_New;
+            m_fRecommendedNoDisk = false;
+        }
+        else
+        {
+            if (m_pDiskEmpty)
+            {
+                m_pDiskEmpty->setFocus();
+                m_pDiskEmpty->setChecked(true);
+            }
+            m_enmSelectedDiskSource = SelectedDiskSource_Empty;
+            m_fRecommendedNoDisk = true;
+        }
+    }
 
     if (m_pDiskSelector)
@@ -382 +348 @@
     setEnableNewDiskWidgets(m_enmSelectedDiskSource == SelectedDiskSource_New);
 
+    if (!m_fVDIFormatFound)
+    {
+        /* We do not have any UI elements for HDD format selection since we default to VDI in case of guided wizard mode: */
+        CSystemProperties properties = uiCommon().virtualBox().GetSystemProperties();
+        const QVector<CMediumFormat> &formats = properties.GetMediumFormats();
+        foreach (const CMediumFormat &format, formats)
+        {
+            if (format.GetName() == "VDI")
+            {
+                newVMWizardPropertySet(MediumFormat, format);
+                m_fVDIFormatFound = true;
+            }
+        }
+        if (!m_fVDIFormatFound)
+            AssertMsgFailed(("No medium format corresponding to VDI could be found!"));
+        setWidgetVisibility(pWizard->mediumFormat());
+    }
+    QString strDefaultExtension =  UIWizardNewVMDiskPage::defaultExtension(pWizard->mediumFormat());
+
     /* We set the medium name and path according to machine name/path and do not allow user change these in the guided mode: */
     QString strDefaultName = pWizard->machineBaseName().isEmpty() ? QString("NewVirtualDisk1") : pWizard->machineBaseName();
     const QString &strMachineFolder = pWizard->machineFolder();
-    QString strMediumPath = UIWizardNewVMDiskPage::absoluteFilePath(UIWizardNewVMDiskPage::toFileName(strDefaultName,
-                                                                                                      m_strDefaultExtension),
-                                                                    strMachineFolder);
+    QString strMediumPath =
+        UIWizardNewVMDiskPage::absoluteFilePath(UIWizardNewVMDiskPage::toFileName(strDefaultName,
+                                                                                  strDefaultExtension), strMachineFolder);
     newVMWizardPropertySet(MediumPath, strMediumPath);
 
@@ -464 +449 @@
     if (pWizard)
     {
-    //     if (selectedDiskSource() == SelectedDiskSource_New)
-    //     {
-    //         /* Try to create the hard drive:*/
-    //         fResult = pWizard->createVirtualDisk();
-    //         /*Don't show any error message here since UIWizardNewVM::createVirtualDisk already does so: */
-    //         if (!fResult)
-    //             return fResult;
-    //     }
-
-    //     fResult = pWizard->createVM();
-    //     /* Try to delete the hard disk: */
-    //     if (!fResult)
-    //         pWizard->deleteVirtualDisk();
+        //     if (selectedDiskSource() == SelectedDiskSource_New)
+        //     {
+        //         /* Try to create the hard drive:*/
+        //         fResult = pWizard->createVirtualDisk();
+        //         /*Don't show any error message here since UIWizardNewVM::createVirtualDisk already does so: */
+        //         if (!fResult)
+        //             return fResult;
+        //     }
+
+        //     fResult = pWizard->createVM();
+        //     /* Try to delete the hard disk: */
+        //     if (!fResult)
+        //         pWizard->deleteVirtualDisk();
     }
     // endProcessing();
@@ -552 +537 @@
             m_pDynamicLabel = new QIRichTextLabel;
             m_pFixedLabel = new QIRichTextLabel;
-            m_pSplitLabel = new QIRichTextLabel;
         }
         QVBoxLayout *pVariantLayout = new QVBoxLayout;
@@ -558 +542 @@
         {
             m_pFixedCheckBox = new QCheckBox;
-            m_pSplitBox = new QCheckBox;
             pVariantLayout->addWidget(m_pFixedCheckBox);
-            pVariantLayout->addWidget(m_pSplitBox);
         }
         if (fWithLabels)
@@ -567 +549 @@
             pMainLayout->addWidget(m_pDynamicLabel);
             pMainLayout->addWidget(m_pFixedLabel);
-            pMainLayout->addWidget(m_pSplitLabel);
         }
         pMainLayout->addLayout(pVariantLayout);
@@ -585 +566 @@
 }
 
-void UIWizardNewVMDiskPageBasic::setWidgetVisibility(CMediumFormat &mediumFormat)
+void UIWizardNewVMDiskPageBasic::setWidgetVisibility(const CMediumFormat &mediumFormat)
 {
     ULONG uCapabilities = 0;
@@ -595 +576 @@
     bool fIsCreateDynamicPossible = uCapabilities & KMediumFormatCapabilities_CreateDynamic;
     bool fIsCreateFixedPossible = uCapabilities & KMediumFormatCapabilities_CreateFixed;
-    bool fIsCreateSplitPossible = uCapabilities & KMediumFormatCapabilities_CreateSplit2G;
     if (m_pFixedCheckBox)
     {
@@ -615 +595 @@
     if (m_pFixedCheckBox)
         m_pFixedCheckBox->setHidden(!fIsCreateFixedPossible);
-    if (m_pSplitLabel)
-        m_pSplitLabel->setHidden(!fIsCreateSplitPossible);
-    if (m_pSplitBox)
-        m_pSplitBox->setHidden(!fIsCreateSplitPossible);
-}
+}

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

@@ -79 +79 @@
 
     UIWizardNewVMDiskPageBasic();
-    CMediumFormat mediumFormat() const;
 
 protected:
@@ -108 +107 @@
 
     void setEnableDiskSelectionWidgets(bool fEnabled);
-    void setWidgetVisibility(CMediumFormat &mediumFormat);
+    void setWidgetVisibility(const CMediumFormat &mediumFormat);
 
     /** @name Widgets
@@ -124 +123 @@
        QIRichTextLabel *m_pDynamicLabel;
        QIRichTextLabel *m_pFixedLabel;
-       QIRichTextLabel *m_pSplitLabel;
        QCheckBox *m_pFixedCheckBox;
-       QCheckBox *m_pSplitBox;
     /** @} */
 
-    /** For guided new vm wizard VDI is the only format. Thus we have no UI item for it. */
-    CMediumFormat m_mediumFormat;
     SelectedDiskSource m_enmSelectedDiskSource;
     bool m_fRecommendedNoDisk;
@@ -136 +131 @@
     QString m_strDefaultExtension;
     QSet<QString> m_userModifiedParameters;
+    bool m_fVDIFormatFound;
 };