Changeset 24398 in vbox for trunk/src/VBox

Timestamp:

Nov 5, 2009 4:27:32 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: make sure the currently attached ISO is always shown in the list

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -2217 +2217 @@
             }
 
-            foreach (const CMedium &medium, mediums)
+            const int maxMediumsToBeShown = 5;
+            CMedium currentMedium = attachment.GetMedium();
+            QString currentId = currentMedium.isNull() ? QString::null : currentMedium.GetId();
+            bool currentUsed = false;
+            foreach (CMedium medium, mediums)
             {
                 bool isMediumUsed = false;
@@ -2234 +2238 @@
                 if (!isMediumUsed)
                 {
+                    if (   !currentUsed
+                        && !currentMedium.isNull()
+                        && addedIntoList == maxMediumsToBeShown-1)
+                        medium = currentMedium;
+
+                    if (medium.GetId() == currentId)
+                        currentUsed = true;
+
                     QAction *mountMediumAction = new QAction (VBoxMedium (medium, mediumType).name(), attachmentMenu);
                     mountMediumAction->setCheckable (true);
                     mountMediumAction->setChecked (!attachment.GetMedium().isNull() &&
-                                                   medium.GetId() == attachment.GetMedium().GetId());
+                                                   medium.GetId() == currentId);
                     mountMediumAction->setData (QVariant::fromValue (MountTarget (attachment.GetController().GetName(),
                                                                                   attachment.GetPort(),
@@ -2245 +2257 @@
                     attachmentMenu->addAction (mountMediumAction);
                     ++ addedIntoList;
-                    if (addedIntoList == 5)
+                    if (addedIntoList == maxMediumsToBeShown)
                         break;
                 }