Changeset 87899 in vbox

Timestamp:

Mar 1, 2021 4:43:03 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9950. Misc. fixes.

Location:

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

Files:

• UIWizardNewVM.h (modified) (1 diff)
• UIWizardNewVMPageBasic4.cpp (modified) (2 diffs)
• UIWizardNewVMPageBasic4.h (modified) (2 diffs)
• UIWizardNewVMPageBasic8.cpp (modified) (1 diff)

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

@@ -50 +50 @@
     QString m_strGuestAdditionsISOPath;
 };
+
+enum SelectedDiskSource
+{
+    SelectedDiskSource_Empty = 0,
+    SelectedDiskSource_New,
+    SelectedDiskSource_Existing,
+    SelectedDiskSource_Max
+};
+
+Q_DECLARE_METATYPE(SelectedDiskSource);
 
 /** New Virtual Machine wizard: */

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

@@ -32 +32 @@
 #include "UIMessageCenter.h"
 #include "UIWizardNewVD.h"
-#include "UIWizardNewVM.h"
 #include "UIWizardNewVMPageBasic4.h"
-
-Q_DECLARE_METATYPE(SelectedDiskSource);
 
 UIWizardNewVMPage4::UIWizardNewVMPage4()
@@ -76 +73 @@
         /* Focus on hard disk combo: */
         m_pDiskSelector->setFocus();
+        m_virtualDisk = uiCommon().medium(uMediumId).medium();
     }
 }

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

@@ -27 +27 @@
 /* GUI includes: */
 #include "UIWizardPage.h"
+#include "UIWizardNewVM.h"
 
 /* COM includes: */
@@ -39 +40 @@
 class UIMediaComboBox;
 
-enum SelectedDiskSource
-{
-    SelectedDiskSource_Empty = 0,
-    SelectedDiskSource_New,
-    SelectedDiskSource_Existing,
-    SelectedDiskSource_Max
-};
 
 class UIWizardNewVMPage4 : public UIWizardPageBase

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

@@ -165 +165 @@
     }
 
-    fResult = UIWizardNewVDPage3::checkFATSizeLimitation(fieldImp("mediumVariant").toULongLong(),
-                                                         fieldImp("mediumPath").toString(),
-                                                         fieldImp("mediumSize").toULongLong());
-    if (!fResult)
-    {
-        msgCenter().cannotCreateHardDiskStorageInFAT(strMediumPath, this);
-        return fResult;
-    }
 
 
     startProcessing();
 
-    fResult = qobject_cast<UIWizardNewVM*>(wizard())->createVirtualDisk();
+    SelectedDiskSource enmDiskSource = field("selectedDiskSource").value<SelectedDiskSource>();
+    if (enmDiskSource == SelectedDiskSource_New)
+    {
+        fResult = qobject_cast<UIWizardNewVM*>(wizard())->createVirtualDisk();
+        fResult = UIWizardNewVDPage3::checkFATSizeLimitation(fieldImp("mediumVariant").toULongLong(),
+                                                             fieldImp("mediumPath").toString(),
+                                                             fieldImp("mediumSize").toULongLong());
+        if (!fResult)
+        {
+            msgCenter().cannotCreateHardDiskStorageInFAT(strMediumPath, this);
+            return fResult;
+        }
+    }
     fResult = qobject_cast<UIWizardNewVM*>(wizard())->createVM();