Changeset 77195 in vbox for trunk/src/VBox

Timestamp:

Feb 7, 2019 12:17:13 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9340. In machine storage settings, replacing medium file selector with medium selector.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp (modified) (5 diffs)

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

@@ -3036 +3036 @@
                 pCreateNewHardDisk->setIcon(iconPool()->icon(HDNewEn, HDNewDis));
                 connect(pCreateNewHardDisk, SIGNAL(triggered(bool)), this, SLOT(sltCreateNewHardDisk()));
-                /* Add "Choose a virtual hard disk file" action: */
-                addChooseExistingMediumAction(pOpenMediumMenu, tr("Choose Virtual Hard Disk File..."));
+                /* Add "Choose a virtual hard disk" action: */
+                addChooseExistingMediumAction(pOpenMediumMenu, tr("Choose Virtual Hard Disk..."));
                 /* Add recent media list: */
                 addRecentMediumActions(pOpenMediumMenu, m_pMediumIdHolder->type());
@@ -3044 +3044 @@
             case UIMediumDeviceType_DVD:
             {
-                /* Add "Choose a virtual optical disk file" action: */
-                addChooseExistingMediumAction(pOpenMediumMenu, tr("Choose Virtual Optical Disk File..."));
+                /* Add "Choose a virtual optical disk" action: */
+                addChooseExistingMediumAction(pOpenMediumMenu, tr("Choose Virtual Optical Disk..."));
                 /* Add "Choose a physical drive" actions: */
                 addChooseHostDriveActions(pOpenMediumMenu);
@@ -3060 +3060 @@
             case UIMediumDeviceType_Floppy:
             {
-                /* Add "Choose a virtual floppy disk file" action: */
-                addChooseExistingMediumAction(pOpenMediumMenu, tr("Choose Virtual Floppy Disk File..."));
+                /* Add "Choose a virtual floppy disk" action: */
+                addChooseExistingMediumAction(pOpenMediumMenu, tr("Choose Virtual Floppy Disk..."));
                 /* Add "Choose a physical drive" actions: */
                 addChooseHostDriveActions(pOpenMediumMenu);
@@ -3096 +3096 @@
 {
     const QString strMachineFolder(QFileInfo(m_strMachineSettingsFilePath).absolutePath());
-    const QUuid uMediumId = vboxGlobal().openMediumWithFileOpenDialog(m_pMediumIdHolder->type(), this, strMachineFolder);
-    if (!uMediumId.isNull())
-        m_pMediumIdHolder->setId(uMediumId);
+
+    QUuid uMediumId;
+    int iResult = vboxGlobal().openMediumSelectorDialog(this, m_pMediumIdHolder->type(), uMediumId,
+                                                        m_strMachineName, strMachineFolder,
+                                                        m_strMachineGuestOSTypeId);
+
+    if (iResult == UIMediumSelector::ReturnCode_Rejected ||
+        (iResult == UIMediumSelector::ReturnCode_Accepted && uMediumId.isNull()))
+        return;
+    if (iResult == static_cast<int>(UIMediumSelector::ReturnCode_LeftEmpty) &&
+        (m_pMediumIdHolder->type() != UIMediumDeviceType_DVD && m_pMediumIdHolder->type() != UIMediumDeviceType_Floppy))
+        return;
+
+    m_pMediumIdHolder->setId(uMediumId);
 }
 
@@ -3795 +3806 @@
     Assert(m_pModelStorage->data(index, StorageModel::R_IsController).toBool());
     Assert(m_pModelStorage->data(index, StorageModel::R_IsMoreAttachmentsPossible).toBool());
-    const QString strControllerName(m_pModelStorage->data(index, StorageModel::R_CtrName).toString());
+    // const QString strControllerName(m_pModelStorage->data(index, StorageModel::R_CtrName).toString());
     const QString strMachineFolder(QFileInfo(m_strMachineSettingsFilePath).absolutePath());
 
     QUuid uMediumId;
-    int iAnswer = static_cast<int>(UIMediumSelector::ReturnCode_Rejected);
-
-    switch (enmDevice)
-    {
-        case KDeviceType_HardDisk:
-        {
-            iAnswer = vboxGlobal().openMediumSelectorDialog(this, UIMediumDeviceType_HardDisk, uMediumId,
-                                                            m_strMachineName, strMachineFolder,
-                                                            m_strMachineGuestOSTypeId);
-            break;
-        }
-        case KDeviceType_DVD:
-        {
-            iAnswer = vboxGlobal().openMediumSelectorDialog(this, UIMediumDeviceType_DVD, uMediumId,
-                                                            m_strMachineName, strMachineFolder);
-            break;
-        }
-        case KDeviceType_Floppy:
-        {
-            iAnswer = vboxGlobal().openMediumSelectorDialog(this, UIMediumDeviceType_Floppy, uMediumId,
-                                                            m_strMachineName, strMachineFolder);
-        }
-        default: break; /* Shut up, MSC! */
-    }
-    /* continue only if iAnswer is either UIMediumSelector::ReturnCode_Accepted or UIMediumSelector::ReturnCode_LeftEmpty: */
-    if (iAnswer != static_cast<int>(UIMediumSelector::ReturnCode_Accepted) &&
-        iAnswer != static_cast<int>(UIMediumSelector::ReturnCode_LeftEmpty))
+    int iResult = vboxGlobal().openMediumSelectorDialog(this, UIMediumDefs::mediumTypeToLocal(enmDevice), uMediumId,
+                                                        m_strMachineName, strMachineFolder,
+                                                        m_strMachineGuestOSTypeId);
+
+    /* Continue only if iResult is either UIMediumSelector::ReturnCode_Accepted or UIMediumSelector::ReturnCode_LeftEmpty: */
+    /* If iResult is UIMediumSelector::ReturnCode_Accepted then we have to have a valid uMediumId: */
+    if (iResult == UIMediumSelector::ReturnCode_Rejected ||
+        (iResult == UIMediumSelector::ReturnCode_Accepted && uMediumId.isNull()))
         return;
 
     /* Only DVDs and floppy can be created empty: */
-    if (iAnswer == static_cast<int>(UIMediumSelector::ReturnCode_LeftEmpty) &&
-        (enmDevice != KDeviceType_DVD && enmDevice != KDeviceType_Floppy))
-        return;
-
-    /* if iAnswer is UIMediumSelector::ReturnCode_Accepted then we have to have a valid uMediumId: */
-    if (iAnswer == static_cast<int>(UIMediumSelector::ReturnCode_Accepted) && uMediumId.isNull())
+    if (iResult == static_cast<int>(UIMediumSelector::ReturnCode_LeftEmpty) &&
+        (m_pMediumIdHolder->type() != UIMediumDeviceType_DVD && m_pMediumIdHolder->type() != UIMediumDeviceType_Floppy))
         return;