Changeset 23759 in vbox for trunk/src

Timestamp:

Oct 14, 2009 12:38:03 PM (15 years ago)

Author:

vboxsync

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

53487

Message:

FE/Qt4: VBox Details report updated according multi-controller support.

File:

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

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

@@ -1565 +1565 @@
     static const char *sSectionItemTpl2 =
         "<tr><td width=40%><nobr>%1:</nobr></td><td/><td>%2</td></tr>";
+    static const char *sSectionItemTpl3 =
+        "<tr><td width=40%><nobr>%1</nobr></td><td/><td/></tr>";
 
     const QString &sectionTpl = aWithLinks ? sSectionHrefTpl : sSectionBoldTpl;
@@ -1719 +1721 @@
         QString item;
 
-        CMediumAttachmentVector vec = aMachine.GetMediumAttachments();
-        for (int i = 0; i < vec.size(); ++ i)
-        {
-            CMediumAttachment ma = vec [i];
-            CMedium medium = ma.GetMedium();
-
-            /// @todo for the explaination of the below isOk() checks, see ***
-            /// in VBoxMedium::details().
-            if (ma.isOk())
+        CStorageControllerVector controllers = aMachine.GetStorageControllers();
+        foreach (const CStorageController &controller, controllers)
+        {
+            item += QString (sSectionItemTpl3).arg (controller.GetName());
+            ++ rows;
+
+            CMediumAttachmentVector attachments = aMachine.GetMediumAttachmentsOfController (controller.GetName());
+            foreach (const CMediumAttachment &attachment, attachments)
             {
-                const QString controller = ma.GetController();
-                KStorageBus bus;
-
-                CStorageController ctrl = aMachine.GetStorageControllerByName (controller);
-                bus = ctrl.GetBus();
-
-                LONG port   = ma.GetPort();
-                LONG device = ma.GetDevice();
-                item += QString (sSectionItemTpl2)
-                        .arg (toString (StorageSlot (bus, port, device)))
-                        .arg (details (medium, false));
-                ++ rows;
+                CMedium medium = attachment.GetMedium();
+                if (attachment.isOk())
+                {
+                    item += QString (sSectionItemTpl2)
+                            .arg (QString ("&nbsp;&nbsp;") +
+                                  toString (StorageSlot (controller.GetBus(),
+                                                         attachment.GetPort(),
+                                                         attachment.GetDevice())))
+                            .arg (details (medium, false));
+                    ++ rows;
+                }
             }
         }