Changeset 77170 in vbox

Timestamp:

Feb 6, 2019 9:18:49 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9340. Adding create action to medium selection dialog

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (4 diffs)
• globals/VBoxGlobal.h (modified) (1 diff)
• medium/UIMediumSelector.cpp (modified) (4 diffs)
• medium/UIMediumSelector.h (modified) (2 diffs)
• settings/machine/UIMachineSettingsStorage.cpp (modified) (2 diffs)
• settings/machine/UIMachineSettingsStorage.h (modified) (1 diff)
• wizards/newvm/UIWizardNewVMPageBasic3.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -2636 +2636 @@
 QUuid VBoxGlobal::createVisoMediumWithVisoCreator(QWidget *pParent, const QString &strMachineName, const QString &strFolder)
 {
-
     QWidget *pDialogParent = windowManager().realParentWindow(pParent);
     QPointer<UIVisoCreator> pVisoCreator = new UIVisoCreator(pDialogParent, strMachineName);
@@ -2721 +2720 @@
 QUuid VBoxGlobal::showCreateFloppyDiskDialog(QWidget *pParent, const QString &strMachineName, const QString &strMachineFolder)
 {
+    QWidget *pDialogParent = windowManager().realParentWindow(pParent);
+
     UIFDCreationDialog *pDialog = new UIFDCreationDialog(pParent, strMachineName, strMachineFolder);
+    if (!pDialog)
+        return QUuid();
+    windowManager().registerNewParent(pDialog, pDialogParent);
+
     if (pDialog->exec())
     {
@@ -2731 +2736 @@
 
 QUuid VBoxGlobal::openMediumSelectorDialog(QWidget *pParent, UIMediumDeviceType  enmMediumType,
-                                           const QString &strMachineName, const QString &strMachineFolder)
+                                           const QString &strMachineName, const QString &strMachineFolder,
+                                           const QString &strMachineGuestOSTypeId  /* = QString() */)
 {
     QWidget *pDialogParent = windowManager().realParentWindow(pParent);
     QPointer<UIMediumSelector> pSelector = new UIMediumSelector(enmMediumType, strMachineName,
-                                                                strMachineFolder, pDialogParent);
+                                                                strMachineFolder, strMachineGuestOSTypeId, pDialogParent);
 
     if (!pSelector)
-        return QString();
+        return QUuid();
     windowManager().registerNewParent(pSelector, pDialogParent);
     if (pSelector->exec(false))
@@ -2762 +2768 @@
     /* Show New VD wizard: */
     UISafePointerWizardNewVD pWizard = new UIWizardNewVD(pParent, QString(), fileInfo.absolutePath(), comGuestOSType.GetRecommendedHDD());
+
+    if (!pWizard)
+        return QUuid();
+    QWidget *pDialogParent = windowManager().realParentWindow(pParent);
+    windowManager().registerNewParent(pWizard, pDialogParent);
     pWizard->prepare();
+
     const QUuid uResult = pWizard->exec() == QDialog::Accepted ? pWizard->virtualDisk().GetId() : QUuid();
     if (pWizard)

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h

@@ -513 +513 @@
 
         /** Creates and shows a UIMediumSelector dialog.
-          * @param  parent            Passes the parent of the dialog,
-          * @param  enmMediumType     Passes the medium type.
-          * @param  strMachineName    Passes the name of the machine,
-          * @param  strMachineFolder  Passes the machine folder,
+          * @param  parent                   Passes the parent of the dialog,
+          * @param  enmMediumType            Passes the medium type.
+          * @param  strMachineName           Passes the name of the machine,
+          * @param  strMachineFolder         Passes the machine folder,
+          * @param  strMachineGuestOSTypeId  Passes the type ID of machine's guest os,
           * returns the ID of the  selected/created medium if successful, a null QUuid otherwise.*/
         QUuid openMediumSelectorDialog(QWidget *pParent, UIMediumDeviceType  enmMediumType,
-                                       const QString &strMachineName, const QString &strMachineFolder);
+                                       const QString &strMachineName, const QString &strMachineFolder,
+                                       const QString &strMachineGuestOSTypeId = QString());
 
         /** Creates and shows a UIWizardNewVD wizard.

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp

@@ -55 +55 @@
 
 UIMediumSelector::UIMediumSelector(UIMediumDeviceType enmMediumType, const QString &machineName /* = QString() */,
-                                   const QString &machineSettigFilePath /* = QString() */, QWidget *pParent /* = 0 */)
+                                   const QString &machineSettingsFilePath /* = QString() */,
+                                   const QString &strMachineGuestOSTypeId /*= QString() */, QWidget *pParent /* = 0 */)
     :QIWithRetranslateUI<QIMainDialog>(pParent)
     , m_pCentralWidget(0)
@@ -72 +73 @@
     , m_pSearchWidget(0)
     , m_iCurrentShownIndex(0)
-    , m_strMachineSettingsFilePath(machineSettigFilePath)
+    , m_strMachineSettingsFilePath(machineSettingsFilePath)
     , m_strMachineName(machineName)
+    , m_strMachineGuestOSTypeId(strMachineGuestOSTypeId)
 {
     configure();
@@ -176 +178 @@
     }
 
-    /* Currently create is supported only for Floppy: */
-    if (m_enmMediumType == UIMediumDeviceType_Floppy)
-    {
-        m_pActionCreate = new QAction(this);
-    }
+    m_pActionCreate = new QAction(this);
     if (m_pActionCreate)
     {
@@ -407 +405 @@
 void UIMediumSelector::sltCreateMedium()
 {
-    QString strMachineFolder = QFileInfo(m_strMachineSettingsFilePath).absolutePath();
-    UIFDCreationDialog *pDialog = new UIFDCreationDialog(this, m_strMachineName, strMachineFolder);
-    if (pDialog->exec())
+    QUuid uMediumId;
+
+    if (m_enmMediumType == UIMediumDeviceType_Floppy)
+        uMediumId = vboxGlobal().showCreateFloppyDiskDialog(this, m_strMachineName, m_strMachineSettingsFilePath);
+    else if (m_enmMediumType == UIMediumDeviceType_HardDisk)
+        uMediumId = vboxGlobal().createHDWithNewHDWizard(this, m_strMachineGuestOSTypeId, m_strMachineSettingsFilePath);
+    else if (m_enmMediumType == UIMediumDeviceType_DVD)
+        uMediumId = vboxGlobal().createVisoMediumWithVisoCreator(this, m_strMachineName, m_strMachineSettingsFilePath);
+
+    if (!uMediumId.isNull())
     {
         repopulateTreeWidget();
-        selectMedium(pDialog->mediumID());
-    }
-    delete pDialog;
+        selectMedium(uMediumId);
+    }
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.h

@@ -52 +52 @@
 
     UIMediumSelector(UIMediumDeviceType enmMediumType, const QString &machineName = QString(),
-                     const QString &machineSettigFilePath = QString(), QWidget *pParent = 0);
+                     const QString &machineSettingsFilePath = QString(), const QString &strMachineGuestOSTypeId = QString(),
+                     QWidget *pParent = 0);
+
     QList<QUuid> selectedMediumIds() const;
 
@@ -131 +133 @@
     QString               m_strMachineSettingsFilePath;
     QString               m_strMachineName;
+    QString               m_strMachineGuestOSTypeId;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp

@@ -3810 +3810 @@
             else if (iAnswer == AlertButton_Choice2)
                 uMediumId = vboxGlobal().openMediumSelectorDialog(this, UIMediumDeviceType_HardDisk,
-                                                                  m_strMachineName, m_strMachineSettingsFilePath);
+                                                                  m_strMachineName, m_strMachineSettingsFilePath,
+                                                                  m_strMachineGuestOSTypeId);
             else if (iAnswer == AlertButton_Cancel)
                 fCancelled = true;
@@ -3834 +3835 @@
                 uMediumId = vboxGlobal().openMediumSelectorDialog(this, UIMediumDeviceType_Floppy,
                                                                   m_strMachineName, m_strMachineSettingsFilePath);
+
             /* We allow creating an empty floppy drive: */
             else if (iAnswer == AlertButton_Choice1)

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.h

@@ -744 +744 @@
     /** Prepares connections. */
     void prepareConnections();
-    /** Opens medium selector dialog and retrieves uuid of a selected medium (if any). */
-    QUuid openMediumSelectorDialog(UIMediumDeviceType  enmMediumType,
-                                   const QString &strMachineName, const QString &strMachineSettingsFilePath);
+
     /** Cleanups all. */
     void cleanup();

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

@@ -64 +64 @@
     QUuid uMediumId = vboxGlobal().openMediumSelectorDialog(thisImp(), UIMediumDeviceType_HardDisk,
                                                             fieldImp("machineBaseName").toString(),
-                                                            fieldImp("machineFolder").toString());
+                                                            fieldImp("machineFolder").toString(),
+                                                            fieldImp("type").value<CGuestOSType>().GetFamilyId());
     if (!uMediumId.isNull())
     {