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

Timestamp:

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

Author:

vboxsync

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

28880

Message:

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

Location:

trunk/src/VBox/Frontends/VirtualBox4/ui

Files:

• VBoxDiskImageManagerDlg.ui.h (modified) (1 diff)
• VBoxNewVMWzd.ui.h (modified) (2 diffs)
• VBoxVMInformationDlg.ui (modified) (1 diff)
• VBoxVMInformationDlg.ui.h (modified) (3 diffs)
• VBoxVMSettingsDlg.ui.h (modified) (7 diffs)

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

@@ -2205 +2205 @@
                 if (hda.GetHardDisk().GetId() == aItemId)
                 {
-                    machine.DetachHardDisk (hda.GetController(),
-                                            hda.GetDeviceNumber());
+                    machine.DetachHardDisk (hda.GetBus(),
+                                            hda.GetChannel(),
+                                            hda.GetDevice());
                     if (!machine.isOk())
                         vboxProblem().cannotDetachHardDisk (this,
-                            machine, hda.GetController(), hda.GetDeviceNumber());
+                            machine, hda.GetBus(), hda.GetChannel(), hda.GetDevice());
                     break;
                 }

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

@@ -369 +369 @@
         {
             CMachine m = session.GetMachine();
-            m.AttachHardDisk (uuidHD, KDiskControllerType_IDE0, 0);
+            m.AttachHardDisk (uuidHD, KStorageBus_IDE, 0, 0);
             if (m.isOk())
             {
@@ -380 +380 @@
             else
                 vboxProblem().cannotAttachHardDisk (this, m, uuidHD,
-                                                    KDiskControllerType_IDE0, 0);
+                                                    KStorageBus_IDE, 0, 0);
             session.Close();
         }

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

@@ -160 +160 @@
     <function returnType="QString" access="pritave">parseStatistics( const QString &amp; )</function>
     <function access="private">refreshStatistics()</function>
-    <function returnType="QString" access="pritave">formatHardDisk( const QString &amp;, KDiskControllerType, LONG, int, int )</function>
+    <function returnType="QString" access="pritave">formatHardDisk( const QString &amp;, KStorageBus, LONG, LONG, int, int )</function>
     <function returnType="QString" access="pritave">formatAdapter( const QString &amp;, ULONG, int, int )</function>
     <function returnType="QString" access="pritave">composeArticle( const QString &amp;, int, int )</function>

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);

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

@@ -1718 +1718 @@
         struct
         {
-            KDiskControllerType ctl;
+            KStorageBus bus;
+            LONG channel;
             LONG dev;
             struct {
@@ -1729 +1730 @@
         diskSet[] =
         {
-            { KDiskControllerType_IDE0, 0, {grbHDA, cbHDA, txHDA, &uuidHDA} },
-            { KDiskControllerType_IDE0, 1, {grbHDB, cbHDB, txHDB, &uuidHDB} },
-            { KDiskControllerType_IDE1, 1, {grbHDD, cbHDD, txHDD, &uuidHDD} },
+            { KStorageBus_IDE, 0, 0, {grbHDA, cbHDA, txHDA, &uuidHDA} },
+            { KStorageBus_IDE, 0, 1, {grbHDB, cbHDB, txHDB, &uuidHDB} },
+            { KStorageBus_IDE, 1, 1, {grbHDD, cbHDD, txHDD, &uuidHDD} },
         };
 
@@ -1745 +1746 @@
             for (uint i = 0; i < SIZEOF_ARRAY (diskSet); i++)
             {
-                if (diskSet [i].ctl == hda.GetController() &&
-                    diskSet [i].dev == hda.GetDeviceNumber())
+                if (diskSet [i].bus == hda.GetBus() &&
+                    diskSet [i].channel == hda.GetChannel() &&
+                    diskSet [i].dev == hda.GetDevice())
                 {
                     CHardDisk hd = hda.GetHardDisk();
@@ -2101 +2103 @@
         struct
         {
-            KDiskControllerType ctl;
+            KStorageBus bus;
+            LONG channel;
             LONG dev;
             struct {
@@ -2110 +2113 @@
         diskSet[] =
         {
-            { KDiskControllerType_IDE0, 0, {grbHDA, &uuidHDA} },
-            { KDiskControllerType_IDE0, 1, {grbHDB, &uuidHDB} },
-            { KDiskControllerType_IDE1, 1, {grbHDD, &uuidHDD} }
+            { KStorageBus_IDE, 0, 0, {grbHDA, &uuidHDA} },
+            { KStorageBus_IDE, 0, 1, {grbHDB, &uuidHDB} },
+            { KStorageBus_IDE, 1, 1, {grbHDD, &uuidHDD} }
         };
 
@@ -2126 +2129 @@
             for (uint i = 0; i < SIZEOF_ARRAY (diskSet); i++)
             {
-                if (diskSet [i].ctl == hda.GetController() &&
-                    diskSet [i].dev == hda.GetDeviceNumber())
+                if (diskSet [i].bus == hda.GetBus() &&
+                    diskSet [i].channel == hda.GetChannel() &&
+                    diskSet [i].dev == hda.GetDevice())
                 {
-                    cmachine.DetachHardDisk (diskSet [i].ctl, diskSet [i].dev);
+                    cmachine.DetachHardDisk (diskSet [i].bus, diskSet [i].channel, diskSet [i].dev);
                     if (!cmachine.isOk())
                         vboxProblem().cannotDetachHardDisk (
-                            this, cmachine, diskSet [i].ctl, diskSet [i].dev);
+                            this, cmachine, diskSet [i].bus, diskSet [i].channel, diskSet [i].dev);
                 }
             }
@@ -2143 +2147 @@
             if (diskSet [i].data.grb->isChecked() && !(*newId).isNull())
             {
-                cmachine.AttachHardDisk (*newId, diskSet [i].ctl, diskSet [i].dev);
+                cmachine.AttachHardDisk (*newId, diskSet [i].bus, diskSet [i].channel, diskSet [i].dev);
                 if (!cmachine.isOk())
                     vboxProblem().cannotAttachHardDisk (
-                        this, cmachine, *newId, diskSet [i].ctl, diskSet [i].dev);
+                        this, cmachine, *newId, diskSet [i].bus, diskSet [i].channel, diskSet [i].dev);
             }
         }