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

Timestamp:

Oct 29, 2009 4:09:25 PM (15 years ago)

Author:

vboxsync

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

54106

Message:

FE/Qt4: VBoxConsoleWND: Removing conflicting enumeration call, which is not quite necessary.

File:

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

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

@@ -327 +327 @@
     if (aSelf)
         *aSelf = this;
-
-    /* Enumerate mediums to work with cached data */
-    vboxGlobal().startEnumeratingMedia();
 
 #if !(defined (Q_WS_WIN) || defined (Q_WS_MAC))
@@ -2183 +2180 @@
             else attachmentMenu = menu;
 
-            /* Related VBoxMedium item */
-            VBoxMedium vboxMediumCurrent;
-            vboxGlobal().findMedium (attachment.GetMedium(), vboxMediumCurrent);
-
             /* Mount Medium actions */
             int addedIntoList = 0;
-            const VBoxMediaList &vboxMediums = vboxGlobal().currentMediaList();
-            foreach (const VBoxMedium &vboxMedium, vboxMediums)
+            CMediumVector mediums;
+            switch (mediumType)
             {
-                if (vboxMedium.type() == mediumType)
+                case VBoxDefs::MediumType_DVD:
+                    mediums += vboxGlobal().virtualBox().GetHost().GetDVDDrives();
+                    mediums += vboxGlobal().virtualBox().GetDVDImages();
+                    break;
+                case VBoxDefs::MediumType_Floppy:
+                    mediums += vboxGlobal().virtualBox().GetHost().GetFloppyDrives();
+                    mediums += vboxGlobal().virtualBox().GetFloppyImages();
+                    break;
+                default:
+                    break;
+            }
+
+            foreach (const CMedium &medium, mediums)
+            {
+                bool isMediumUsed = false;
+                foreach (const CMediumAttachment &otherAttachment, attachments)
                 {
-                    bool isMediumUsed = false;
-                    foreach (const CMediumAttachment &otherAttachment, attachments)
+                    if (otherAttachment != attachment)
                     {
-                        if (otherAttachment != attachment)
+                        CMedium otherMedium = otherAttachment.GetMedium();
+                        if (!otherMedium.isNull() && otherMedium.GetId() == medium.GetId())
                         {
-                            CMedium otherMedium = otherAttachment.GetMedium();
-                            if (!otherMedium.isNull() && otherMedium.GetId() == vboxMedium.id())
-                            {
-                                isMediumUsed = true;
-                                break;
-                            }
+                            isMediumUsed = true;
+                            break;
                         }
                     }
-                    if (!isMediumUsed)
-                    {
-                        QAction *mountMediumAction = new QAction (vboxMedium.name(), attachmentMenu);
-                        mountMediumAction->setCheckable (true);
-                        mountMediumAction->setChecked (vboxMedium.id() == vboxMediumCurrent.id());
-                        mountMediumAction->setData (QVariant::fromValue (MountTarget (attachment.GetController().GetName(),
-                                                                                      attachment.GetPort(),
-                                                                                      attachment.GetDevice(),
-                                                                                      vboxMedium.id())));
-                        connect (mountMediumAction, SIGNAL (triggered (bool)), this, SLOT (mountMedium()));
-                        attachmentMenu->addAction (mountMediumAction);
-                        ++ addedIntoList;
-                        if (addedIntoList == 5)
-                            break;
-                    }
+                }
+                if (!isMediumUsed)
+                {
+                    QAction *mountMediumAction = new QAction (VBoxMedium (medium, mediumType).name(), attachmentMenu);
+                    mountMediumAction->setCheckable (true);
+                    mountMediumAction->setChecked (medium.GetId() == attachment.GetMedium().GetId());
+                    mountMediumAction->setData (QVariant::fromValue (MountTarget (attachment.GetController().GetName(),
+                                                                                  attachment.GetPort(),
+                                                                                  attachment.GetDevice(),
+                                                                                  medium.GetId())));
+                    connect (mountMediumAction, SIGNAL (triggered (bool)), this, SLOT (mountMedium()));
+                    attachmentMenu->addAction (mountMediumAction);
+                    ++ addedIntoList;
+                    if (addedIntoList == 5)
+                        break;
                 }
             }
@@ -2241 +2245 @@
             /* Unmount Medium action */
             QAction *unmountMediumAction = new QAction (attachmentMenu);
-            unmountMediumAction->setEnabled (!vboxMediumCurrent.isNull());
+            unmountMediumAction->setEnabled (!attachment.GetMedium().isNull());
             unmountMediumAction->setData (QVariant::fromValue (MountTarget (attachment.GetController().GetName(),
                                                                             attachment.GetPort(),
@@ -2249 +2253 @@
 
             /* Switch CD/FD naming */
-            switch (deviceType)
+            switch (mediumType)
             {
-                case KDeviceType_DVD:
+                case VBoxDefs::MediumType_DVD:
                     callVMMAction->setText (tr ("More CD/DVD Images..."));
                     unmountMediumAction->setText (tr ("Unmount CD/DVD Device"));
@@ -2257 +2261 @@
                                                                        ":/cd_unmount_dis_16px.png"));
                     break;
-                case KDeviceType_Floppy:
+                case VBoxDefs::MediumType_Floppy:
                     callVMMAction->setText (tr ("More Floppy Images..."));
                     unmountMediumAction->setText (tr ("Unmount Floppy Device"));
@@ -2275 +2279 @@
         QAction *emptyMenuAction = new QAction (menu);
         emptyMenuAction->setEnabled (false);
-        switch (deviceType)
-        {
-            case KDeviceType_DVD:
+        switch (mediumType)
+        {
+            case VBoxDefs::MediumType_DVD:
                 emptyMenuAction->setText (tr ("No CD/DVD Devices Attached"));
                 break;
-            case KDeviceType_Floppy:
+            case VBoxDefs::MediumType_Floppy:
                 emptyMenuAction->setText (tr ("No Floppy Devices Attached"));
                 break;
@@ -2325 +2329 @@
         /* Open VMM Dialog */
         VBoxMediaManagerDlg dlg (this);
-        dlg.setup (target.type, true /* do select? */, false /* do refresh? */,
+        dlg.setup (target.type, true /* do select? */, true /* do refresh? */,
                    mSession.GetMachine(), QString(), true, usedImages);
         if (dlg.exec() == QDialog::Accepted)
@@ -2801 +2805 @@
                 attData += QString ("<br>&nbsp;<nobr>%1:&nbsp;%2</nobr>")
                     .arg (vboxGlobal().toString (StorageSlot (controller.GetBus(), attachment.GetPort(), attachment.GetDevice())))
-                    .arg (vboxGlobal().findMedium (attachment.GetMedium().GetId()).location());
+                    .arg (VBoxMedium (attachment.GetMedium(), VBoxDefs::MediumType_HardDisk).location());
                 attachmentsPresent = true;
             }
@@ -2830 +2834 @@
                 if (attachment.GetType() != KDeviceType_DVD)
                     continue;
-                QString id (attachment.GetMedium().isNull() ? QString() : attachment.GetMedium().GetId());
-                VBoxMedium vboxMedium = vboxGlobal().findMedium (id);
+                VBoxMedium vboxMedium (attachment.GetMedium(), VBoxDefs::MediumType_DVD);
                 attData += QString ("<br>&nbsp;<nobr>%1:&nbsp;%2</nobr>")
                     .arg (vboxGlobal().toString (StorageSlot (controller.GetBus(), attachment.GetPort(), attachment.GetDevice())))
@@ -2865 +2868 @@
                 if (attachment.GetType() != KDeviceType_Floppy)
                     continue;
-                QString id (attachment.GetMedium().isNull() ? QString() : attachment.GetMedium().GetId());
-                VBoxMedium vboxMedium = vboxGlobal().findMedium (id);
+                VBoxMedium vboxMedium (attachment.GetMedium(), VBoxDefs::MediumType_Floppy);
                 attData += QString ("<br>&nbsp;<nobr>%1:&nbsp;%2</nobr>")
                     .arg (vboxGlobal().toString (StorageSlot (controller.GetBus(), attachment.GetPort(), attachment.GetDevice())))