Changeset 77341 in vbox

Timestamp:

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

Author:

vboxsync

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

128874

Message:

FE/Qt: bugref:9340. Replace the file selector dialog in the storage menu with the medium selector dialog.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (3 diffs)
• settings/machine/UIMachineSettingsStorage.cpp (modified) (2 diffs)

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

@@ -3074 +3074 @@
                 QUuid uMediumID;
                 if (target.type == UIMediumTarget::UIMediumTargetType_WithID)
-                    uMediumID = openMediumWithFileOpenDialog(target.mediumType, windowManager().mainWindowShown(), strMachineFolder);
+                {
+                    int iDialogReturn = openMediumSelectorDialog(windowManager().mainWindowShown(), target.mediumType, uMediumID,
+                                                                 strMachineFolder, "" /*strMachineName*/,
+                                                                 "" /*strMachineGuestOSTypeId*/, true /*fEnableCreate */);
+                    if (iDialogReturn == UIMediumSelector::ReturnCode_LeftEmpty &&
+                        (target.mediumType == UIMediumDeviceType_DVD || target.mediumType == UIMediumDeviceType_Floppy))
+                        fMount = false;
+                }
                 else if(target.type == UIMediumTarget::UIMediumTargetType_CreateAdHocVISO)
                     uMediumID = createVisoMediumWithVisoCreator(windowManager().mainWindowShown(), strMachineFolder, comConstMachine.GetName());
@@ -3087 +3094 @@
                 if (!uMediumID.isNull())
                     uNewID = uMediumID;
-                /* Else just exit: */
-                else return;
+                else
+                    /* Else just exit in case left empty is not chosen in medium selector dialog: */
+                    if (fMount)
+                        return;
             }
             /* Use medium ID which was passed: */
@@ -3103 +3112 @@
             break;
         }
-        /* Do we have a resent location? */
+        /* Do we have a recent location? */
         case UIMediumTarget::UIMediumTargetType_WithLocation:
         {

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

@@ -3101 +3101 @@
     int iResult = vboxGlobal().openMediumSelectorDialog(this, m_pMediumIdHolder->type(), uMediumId,
                                                         strMachineFolder, m_strMachineName,
-                                                        m_strMachineGuestOSTypeId, true /* enable create action: */);
+                                                        m_strMachineGuestOSTypeId,
+                                                        true /* enable create action: */);
 
     if (iResult == UIMediumSelector::ReturnCode_Rejected ||
@@ -3813 +3814 @@
     int iResult = vboxGlobal().openMediumSelectorDialog(this, UIMediumDefs::mediumTypeToLocal(enmDeviceType), uMediumId,
                                                         strMachineFolder, m_strMachineName,
-                                                        m_strMachineGuestOSTypeId, true /* enable cr1eate action: */);
+                                                        m_strMachineGuestOSTypeId,
+                                                        true /* enable cr1eate action: */);
 
     /* Continue only if iResult is either UIMediumSelector::ReturnCode_Accepted or UIMediumSelector::ReturnCode_LeftEmpty: */