Changeset 99406 in vbox

Timestamp:

Apr 14, 2023 5:04:14 PM (2 years ago)

Author:

vboxsync

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

156856

Message:

FE/Qt: bugref:6669: VirtualBox Manager: A bit of fixes for New VD wizard modal case, s.a. r156827.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVD.cpp (modified) (1 diff)

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

@@ -172 +172 @@
                                         const QString &strMachineGuestOSTypeId  /* = QString() */)
 {
-    /* Initialize variables: */
-    QString strDefaultFolder = strMachineFolder;
-    if (strDefaultFolder.isEmpty())
-        strDefaultFolder = uiCommon().defaultFolderPathForType(UIMediumDeviceType_HardDisk);
-
-    /* In case we dont have a 'guest os type id' default back to 'Other': */
+    /* Default path: */
+    const QString strDefaultPath = !strMachineFolder.isEmpty()
+                                 ? strMachineFolder
+                                 : uiCommon().defaultFolderPathForType(UIMediumDeviceType_HardDisk);
+
+    /* Default name: */
+    const QString strDiskName = uiCommon().findUniqueFileName(strDefaultPath,
+                                                                !strMachineName.isEmpty()
+                                                              ? strMachineName
+                                                              : "NewVirtualDisk");
+
+    /* Default size: */
     const CGuestOSType comGuestOSType = uiCommon().virtualBox().GetGuestOSType(  !strMachineGuestOSTypeId.isEmpty()
-                                                                                 ? strMachineGuestOSTypeId
-                                                                                 : "Other");
-    const QString strDiskName = uiCommon().findUniqueFileName(strDefaultFolder,   !strMachineName.isEmpty()
-                                                                     ? strMachineName
-                                                                     : "NewVirtualDisk");
-
-    /* Show New VD wizard: */
-    UISafePointerWizardNewVD pWizard = new UIWizardNewVD(pParent,
+                                                                               ? strMachineGuestOSTypeId
+                                                                               : "Other");
+    const qulonglong uDefaultSize = comGuestOSType.GetRecommendedHDD();
+
+    /* Show New VD wizard the safe way: */
+    QWidget *pRealParent = windowManager().realParentWindow(pParent);
+    UISafePointerWizardNewVD pWizard = new UIWizardNewVD(pRealParent,
                                                          strDiskName,
-                                                         strDefaultFolder,
-                                                         comGuestOSType.GetRecommendedHDD());
+                                                         strDefaultPath,
+                                                         uDefaultSize);
     if (!pWizard)
         return QUuid();
-    QWidget *pDialogParent = windowManager().realParentWindow(pParent);
-    windowManager().registerNewParent(pWizard, pDialogParent);
-    QUuid mediumId = pWizard->mediumId();
+    windowManager().registerNewParent(pWizard, pRealParent);
     pWizard->exec();
+    const QUuid uMediumId = pWizard->mediumId();
     delete pWizard;
-    return mediumId;
+    return uMediumId;
 }