Changeset 7442 in vbox for trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMInformationDlg.ui.h

Timestamp:

Mar 13, 2008 2:33:18 PM (17 years ago)

Author:

vboxsync

Message:

Main: Applied SATA changes from #2406. Increased XML settings version format from 1.2 to 1.3.pre.

File:

• trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMInformationDlg.ui.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMInformationDlg.ui.h

@@ -485 +485 @@
 
     /* Hard Disk Statistics. */
+    QString primaryMaster = QString ("%1 %2")
+        .arg (vboxGlobal().toString (KStorageBus_IDE, 0))
+        .arg (vboxGlobal().toString (KStorageBus_IDE, 0, 0));
+    QString primarySlave = QString ("%1 %2")
+        .arg (vboxGlobal().toString (KStorageBus_IDE, 0))
+        .arg (vboxGlobal().toString (KStorageBus_IDE, 0, 1));
+    QString secondarySlave = QString ("%1 %2")
+        .arg (vboxGlobal().toString (KStorageBus_IDE, 1))
+        .arg (vboxGlobal().toString (KStorageBus_IDE, 1, 1));
+
     result += hdrRow.arg (":/hd_16px.png").arg (tr ("IDE Hard Disk Statistics"));
-    result += formatHardDisk (tr ("Primary Master"), KDiskControllerType_IDE0, 0, 0, 1);
+    result += formatHardDisk (primaryMaster, KStorageBus_IDE, 0, 0, 0, 1);
     result += interline;
-    result += formatHardDisk (tr ("Primary Slave"), KDiskControllerType_IDE0, 1, 4, 5);
+    result += formatHardDisk (primarySlave, KStorageBus_IDE, 0, 1, 4, 5);
     result += interline;
-    result += formatHardDisk (tr ("Secondary Slave"), KDiskControllerType_IDE1, 1, 12, 13);
+    result += formatHardDisk (secondarySlave, KStorageBus_IDE, 1, 1, 12, 13);
     result += paragraph;
 
     /* CD/DVD-ROM Statistics. */
     result += hdrRow.arg (":/cd_16px.png").arg (tr ("CD/DVD-ROM Statistics"));
-    result += formatHardDisk (QString::null /* tr ("Secondary Master") */,
-                              KDiskControllerType_IDE1, 0, 8, 9);
+    result += formatHardDisk (QString::null,
+                              KStorageBus_IDE, 1, 0, 8, 9);
     result += paragraph;
 
@@ -515 +525 @@
 
 QString VBoxVMInformationDlg::formatHardDisk (const QString &aName,
-                                              KDiskControllerType aType,
-                                              LONG aSlot, int aStart, int aFinish)
+                                              KStorageBus aBus, LONG aChannel,
+                                              LONG aDevice, int aStart, int aFinish)
 {
     if (mSession.isNull())
@@ -525 +535 @@
 
     QString result = aName.isNull() ? QString::null : header.arg (aName);
-    CHardDisk hd = machine.GetHardDisk (aType, aSlot);
-    if (!hd.isNull() || (aType == KDiskControllerType_IDE1 && aSlot == 0))
+    CHardDisk hd = machine.GetHardDisk (aBus, aChannel, aDevice);
+    if (!hd.isNull() || (aBus == KStorageBus_IDE && aChannel == 1 && aDevice == 0))
     {
         result += composeArticle (QString::null, aStart, aFinish);