Changeset 108575 in vbox for trunk/src

Timestamp:

Mar 17, 2025 2:26:39 PM (8 weeks ago)

Author:

vboxsync

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

167980

Message:

FE/Qt: bugref:10867. Removing UIWizardNewVMDiskPage.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/wizards/editors/UIWizardDiskEditors.cpp (modified) (3 diffs)
• src/wizards/newvm/UIWizardNewVM.cpp (modified) (2 diffs)
• src/wizards/newvm/UIWizardNewVMDiskPage.cpp (deleted)
• src/wizards/newvm/UIWizardNewVMDiskPage.h (deleted)
• src/wizards/newvm/UIWizardNewVMExpertPage.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -660 +660 @@
         src/wizards/newvm/UIWizardNewVMUnattendedPage.h \
         src/wizards/newvm/UIWizardNewVMHardwarePage.h \
-        src/wizards/newvm/UIWizardNewVMDiskPage.h \
         src/wizards/newvm/UIWizardNewVMExpertPage.h \
         src/wizards/newvm/UIWizardNewVMSummaryPage.h \
@@ -1184 +1183 @@
         src/wizards/newvm/UIWizardNewVMUnattendedPage.cpp \
         src/wizards/newvm/UIWizardNewVMHardwarePage.cpp \
-        src/wizards/newvm/UIWizardNewVMDiskPage.cpp \
         src/wizards/newvm/UIWizardNewVMExpertPage.cpp \
         src/wizards/newvm/UIWizardNewVMSummaryPage.cpp \

trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIWizardDiskEditors.cpp

@@ -38 +38 @@
 
 /* GUI includes: */
+#include "QIFileDialog.h"
 #include "QILineEdit.h"
 #include "QIToolButton.h"
@@ -50 +51 @@
 #include "UIUserNamePasswordEditor.h"
 #include "UIWizardDiskEditors.h"
-#include "UIWizardNewVMDiskPage.h"
 
 /* Other VBox includes: */
@@ -56 +56 @@
 #include "iprt/fs.h"
 #include "CSystemProperties.h"
-
+#include "KMediumVariant.h"
 
 /*********************************************************************************************************************************

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

@@ -28 +28 @@
 /* Qt includes: */
 #include <QAbstractButton>
+#include <QDir>
 #include <QLayout>
 
@@ -41 +42 @@
 #include "UIWizardNewVMUnattendedPage.h"
 #include "UIWizardNewVMHardwarePage.h"
-#include "UIWizardNewVMDiskPage.h"
 #include "UIWizardNewVMExpertPage.h"
 #include "UIWizardNewVMSummaryPage.h"

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

@@ -29 +29 @@
 #include <QButtonGroup>
 #include <QCheckBox>
+#include <QDir>
 #include <QRadioButton>
 #include <QVBoxLayout>
@@ -39 +40 @@
 #include "UIMedium.h"
 #include "UIMediumEnumerator.h"
+#include "UIMediumSelector.h"
 #include "UINameAndSystemEditor.h"
 #include "UINotificationCenter.h"
@@ -44 +46 @@
 #include "UIWizardNewVM.h"
 #include "UIWizardDiskEditors.h"
-#include "UIWizardNewVMDiskPage.h"
 #include "UIWizardNewVMEditors.h"
 #include "UIWizardNewVMExpertPage.h"
@@ -51 +52 @@
 /* COM includes: */
 #include "CSystemProperties.h"
+
+QUuid getWithFileOpenDialog(const QString &strOSTypeID,
+                            const QString &strMachineFolder,
+                            QWidget *pCaller, UIActionPool *pActionPool)
+{
+    QUuid uMediumId;
+    int returnCode = UIMediumSelector::openMediumSelectorDialog(pCaller, UIMediumDeviceType_HardDisk,
+                                                         QUuid() /* current medium id */,
+                                                         uMediumId,
+                                                         strMachineFolder,
+                                                         QString() /* strMachineName */,
+                                                         strOSTypeID,
+                                                         false /* don't show/enable the create action: */,
+                                                         QUuid() /* Machinie Id */, pActionPool);
+    if (returnCode != static_cast<int>(UIMediumSelector::ReturnCode_Accepted))
+        return QUuid();
+    return uMediumId;
+}
 
 UIWizardNewVMExpertPage::UIWizardNewVMExpertPage(UIActionPool *pActionPool)
@@ -150 +169 @@
     UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
     AssertReturnVoid(pWizard);
-    QUuid uMediumId = UIWizardNewVMDiskCommon::getWithFileOpenDialog(pWizard->guestOSTypeId(),
-                                                                     pWizard->machineFolder(),
-                                                                     this, m_pActionPool);
+    QUuid uMediumId = getWithFileOpenDialog(pWizard->guestOSTypeId(),
+                                            pWizard->machineFolder(),
+                                            this, m_pActionPool);
     if (!uMediumId.isNull())
     {