Changeset 75006 in vbox for trunk

Timestamp:

Oct 23, 2018 3:48:45 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9183 Move medium selector open function to VBoxGlobal to make it avaible in wizards as well

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (2 diffs)
• globals/VBoxGlobal.h (modified) (1 diff)
• settings/machine/UIMachineSettingsStorage.cpp (modified) (4 diffs)
• settings/machine/UIMachineSettingsStorage.h (modified) (1 diff)

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

@@ -72 +72 @@
 # include "UIMediumEnumerator.h"
 # include "UIMedium.h"
+# include "UIMediumSelector.h"
 # include "UIModalWindowManager.h"
 # include "UIIconPool.h"
@@ -2735 +2736 @@
 }
 
+QUuid VBoxGlobal::openMediumSelectorDialog(QWidget *pParent, UIMediumDeviceType  enmMediumType,
+                                           const QString &strMachineName, const QString &strMachineFolder)
+{
+    QWidget *pDialogParent = windowManager().realParentWindow(pParent);
+    QPointer<UIMediumSelector> pSelector = new UIMediumSelector(enmMediumType, strMachineName,
+                                                                strMachineFolder, pDialogParent);
+
+    if (!pSelector)
+        return QString();
+    windowManager().registerNewParent(pSelector, pDialogParent);
+    if (pSelector->execute(true, false))
+    {
+        QList<QUuid> selectedMediumIds = pSelector->selectedMediumIds();
+        delete pSelector;
+        /* Currently we only care about the 0th since we support single selection by intention: */
+        if (selectedMediumIds.isEmpty())
+            return QUuid();
+        else
+            return selectedMediumIds[0];
+    }
+    delete pSelector;
+    return QUuid();
+}
+
 void VBoxGlobal::prepareStorageMenu(QMenu &menu,
                                     QObject *pListener, const char *pszSlotName,

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

@@ -523 +523 @@
         QUuid showCreateFloppyDiskDialog(QWidget *pParent, const QString &strMachineName, const QString &strMachineFolder);
 
+        /** 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,
+          * returns the ID of the  selected/created medium if successful, an empty string otherwise.*/
+        QUuid openMediumSelectorDialog(QWidget *pParent, UIMediumDeviceType  enmMediumType,
+                                       const QString &strMachineName, const QString &strMachineFolder);
+
         /** Prepares storage menu according passed parameters.
           * @param  menu               Brings the #QMenu to be prepared.

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

@@ -3796 +3796 @@
 }
 
-QUuid UIMachineSettingsStorage::openMediumSelectorDialog(UIMediumDeviceType  enmMediumType)
-{
-    QWidget *pParent = windowManager().realParentWindow(this);
-    QPointer<UIMediumSelector> pSelector = new UIMediumSelector(enmMediumType, m_strMachineName,
-                                                                m_strMachineSettingsFilePath, pParent);
-
-    if (!pSelector)
-        return QString();
-    windowManager().registerNewParent(pSelector, pParent);
-    if (pSelector->execute(true, false))
-    {
-        QList<QUuid> selectedMediumIds = pSelector->selectedMediumIds();
-        delete pSelector;
-        /* Currently we only care about the 0th since we support single selection by intention: */
-        if (selectedMediumIds.isEmpty())
-            return QUuid();
-        else
-            return selectedMediumIds[0];
-    }
-
-    delete pSelector;
-    return QUuid();
-}
-
 void UIMachineSettingsStorage::addAttachmentWrapper(KDeviceType enmDevice)
 {
@@ -3838 +3814 @@
                 uMediumId = getWithNewHDWizard();
             else if (iAnswer == AlertButton_Choice2)
-                uMediumId = openMediumSelectorDialog(UIMediumDeviceType_HardDisk);
+                uMediumId = vboxGlobal().openMediumSelectorDialog(this, UIMediumDeviceType_HardDisk,
+                                                                  m_strMachineName, m_strMachineSettingsFilePath);
             else if (iAnswer == AlertButton_Cancel)
                 fCancelled = true;
@@ -3847 +3824 @@
             int iAnswer = msgCenter().confirmOpticalAttachmentCreation(strControllerName, this);
             if (iAnswer == AlertButton_Choice2)
-                uMediumId = openMediumSelectorDialog(UIMediumDeviceType_DVD);
+                uMediumId = vboxGlobal().openMediumSelectorDialog(this, UIMediumDeviceType_DVD,
+                                                                  m_strMachineName, m_strMachineSettingsFilePath);
             else if (iAnswer == AlertButton_Cancel)
                 fCancelled = true;
@@ -3856 +3834 @@
             int iAnswer = msgCenter().confirmFloppyAttachmentCreation(strControllerName, this);
             if (iAnswer == AlertButton_Choice2)
-                uMediumId = openMediumSelectorDialog(UIMediumDeviceType_Floppy);
+                uMediumId = vboxGlobal().openMediumSelectorDialog(this, UIMediumDeviceType_Floppy,
+                                                                  m_strMachineName, m_strMachineSettingsFilePath);
             else if (iAnswer == AlertButton_Cancel)
                 fCancelled = true;

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

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