Changeset 50911 in vbox for trunk/src/VBox/Frontends

Timestamp:

Mar 27, 2014 3:34:51 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: VBoxGlobal: Cleanup medium-mounting functionality, prepare it for hard-drive reattach stuff.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp (modified) (7 diffs)

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

@@ -1942 +1942 @@
 
     /* Determine device & medium types: */
-    const KDeviceType deviceType = currentAttachment.GetType();
-    const UIMediumType mediumType = deviceType == KDeviceType_DVD    ? UIMediumType_DVD :
-                                    deviceType == KDeviceType_Floppy ? UIMediumType_Floppy :
-                                                                       UIMediumType_Invalid;
-    AssertMsgReturnVoid(deviceType != KDeviceType_Null, ("Incorrect storage device type!\n"));
+    const UIMediumType mediumType = mediumTypeToLocal(currentAttachment.GetType());
     AssertMsgReturnVoid(mediumType != UIMediumType_Invalid, ("Incorrect storage medium type!\n"));
 
@@ -1954 +1950 @@
     pActionOpenExistingMedium->setData(QVariant::fromValue(UIMediumTarget(strControllerName, currentAttachment.GetPort(), currentAttachment.GetDevice(),
                                                                           mediumType)));
+    switch (mediumType)
+    {
+        case UIMediumType_DVD:
+            pActionOpenExistingMedium->setText(QApplication::translate("UIMachineSettingsStorage", "Choose a virtual CD/DVD disk file..."));
+            break;
+        case UIMediumType_Floppy:
+            pActionOpenExistingMedium->setText(QApplication::translate("UIMachineSettingsStorage", "Choose a virtual floppy disk file..."));
+            break;
+        default:
+            break;
+    }
 
 
@@ -1964 +1971 @@
     switch (mediumType)
     {
-        case UIMediumType_DVD: mediums = vboxGlobal().host().GetDVDDrives(); break;
+        case UIMediumType_DVD:    mediums = vboxGlobal().host().GetDVDDrives(); break;
         case UIMediumType_Floppy: mediums = vboxGlobal().host().GetFloppyDrives(); break;
         default: break;
@@ -2001 +2008 @@
     switch (mediumType)
     {
-        case UIMediumType_DVD: strRecentMediumAddress = GUI_RecentListCD; break;
+        case UIMediumType_DVD:    strRecentMediumAddress = GUI_RecentListCD; break;
         case UIMediumType_Floppy: strRecentMediumAddress = GUI_RecentListFD; break;
         default: break;
@@ -2049 +2056 @@
     pActionUnmountMedium->setEnabled(!currentMedium.isNull());
     pActionUnmountMedium->setData(QVariant::fromValue(UIMediumTarget(strControllerName, currentAttachment.GetPort(), currentAttachment.GetDevice())));
-
-
-    /* Switch CD/FD names/icons: */
-    switch (mediumType)
-    {
-        case UIMediumType_DVD:
-            pActionOpenExistingMedium->setText(QApplication::translate("UIMachineSettingsStorage", "Choose a virtual CD/DVD disk file..."));
-            pActionUnmountMedium->setText(QApplication::translate("UIMachineSettingsStorage", "Remove disk from virtual drive"));
-            pActionUnmountMedium->setIcon(UIIconPool::iconSet(":/cd_unmount_16px.png", ":/cd_unmount_disabled_16px.png"));
-            break;
-        case UIMediumType_Floppy:
-            pActionOpenExistingMedium->setText(QApplication::translate("UIMachineSettingsStorage", "Choose a virtual floppy disk file..."));
-            pActionUnmountMedium->setText(QApplication::translate("UIMachineSettingsStorage", "Remove disk from virtual drive"));
-            pActionUnmountMedium->setIcon(UIIconPool::iconSet(":/fd_unmount_16px.png", ":/fd_unmount_disabled_16px.png"));
-            break;
-        default:
-            break;
-    }
+    pActionUnmountMedium->setText(QApplication::translate("UIMachineSettingsStorage", "Remove disk from virtual drive"));
+    if (mediumType == UIMediumType_DVD)
+        pActionUnmountMedium->setIcon(UIIconPool::iconSet(":/cd_unmount_16px.png", ":/cd_unmount_disabled_16px.png"));
+    else if (mediumType == UIMediumType_Floppy)
+        pActionUnmountMedium->setIcon(UIIconPool::iconSet(":/fd_unmount_16px.png", ":/fd_unmount_disabled_16px.png"));
 }
 
@@ -2091 +2085 @@
             /* New mount-target attributes: */
             QString strNewID;
-            const bool fSelectWithMediaManager = target.mediumType != UIMediumType_Invalid && target.data.isNull();
 
             /* Invoke file-open dialog to choose medium ID: */
-            if (fSelectWithMediaManager)
+            if (target.mediumType != UIMediumType_Invalid && target.data.isNull())
             {
                 /* Keyboard can be captured by machine-view.
@@ -2176 +2169 @@
     /* Remount medium to the predefined port/device: */
     bool fWasMounted = false;
+    /* Remounting: */
     machine.MountMedium(target.name, target.port, target.device, cmedium, false /* force? */);
-    if (machine.isOk())
-        fWasMounted = true;
-    else
+    fWasMounted = machine.isOk();
+    if (!fWasMounted)
     {
         /* Ask for force remounting: */
         if (msgCenter().cannotRemountMedium(machine, vboxGlobal().medium(strActualID),
-                                            fMount, true /* retry? */, activeMachineWindow()))
-        {
-            /* Force remount medium to the predefined port/device: */
+                                            fMount, true /* retry? */))
+        {
+            /* Force remounting: */
             machine.MountMedium(target.name, target.port, target.device, cmedium, true /* force? */);
-            if (machine.isOk())
-                fWasMounted = true;
-            else
+            fWasMounted = machine.isOk();
+            if (!fWasMounted)
                 msgCenter().cannotRemountMedium(machine, vboxGlobal().medium(strActualID),
-                                                fMount, false /* retry? */, activeMachineWindow());
+                                                fMount, false /* retry? */);
         }
     }