Changeset 8785 in vbox for trunk

Timestamp:

May 13, 2008 12:32:10 PM (17 years ago)

Author:

vboxsync

Message:

FE/Qt4: Backported:

• partly r29754 (New Hard Disk GUI (including SATA support) implemented: ...)
• partly r29788 (FE/Qt: Be consistnt (use the same spelling in the Details box as in the Hard Disk UI; method order).
• partly r30482 (Fix SATA bug #2818)
• r30496 (AssertMsgBreakVoid -> AssertMsgBreak.)
• r30497 (AssertFailedBreakVoid -> AssertFailedBreak.)
• r30498 (AssertMsgFailedBreakVoid -> AssertMsgFailedBreak)
• r30664 (1761: "Create VM session information dialog": ...)

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxGlobal.h (modified) (1 diff)
• src/VBoxGlobal.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxGlobal.h

@@ -211 +211 @@
     }
 
-    QString toString (KStorageBus t) const
-    {
-        AssertMsg (!storageBuses.value (t).isNull(), ("No text for %d", t));
-        return storageBuses.value (t);
-    }
-
-    QString toString (KStorageBus t, LONG c) const;
-    QString toString (KStorageBus t, LONG c, LONG d) const;
+    /**
+     * Returns a string representation of the given KStorageBus enum value.
+     * Complementary to #toStorageBusType (const QString &) const.
+     */
+    QString toString (KStorageBus aBus) const
+    {
+        AssertMsg (!storageBuses.value (aBus).isNull(), ("No text for %d", aBus));
+        return storageBuses [aBus];
+    }
+
+    /**
+     * Returns a KStorageBus enum value corresponding to the given string
+     * representation. Complementary to #toString (KStorageBus) const.
+     */
+    KStorageBus toStorageBusType (const QString &aBus) const
+    {
+        QStringVector::const_iterator it =
+            qFind (storageBuses.begin(), storageBuses.end(), aBus);
+        AssertMsg (it != storageBuses.end(), ("No value for {%s}", aBus.toLatin1().constData()));
+        return KStorageBus (it - storageBuses.begin());
+    }
+
+    QString toString (KStorageBus aBus, LONG aChannel) const;
+    LONG toStorageChannel (KStorageBus aBus, const QString &aChannel) const;
+
+    QString toString (KStorageBus aBus, LONG aChannel, LONG aDevice) const;
+    LONG toStorageDevice (KStorageBus aBus, LONG aChannel, const QString &aDevice) const;
+
+    QString toFullString (KStorageBus aBus, LONG aChannel, LONG aDevice) const;
 
     QString toString (KHardDiskType t) const

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

@@ -741 +741 @@
     , deviceTypes (KDeviceType_COUNT)
     , storageBuses (KStorageBus_COUNT)
-    , storageBusDevices (3)
+    , storageBusDevices (2)
     , storageBusChannels (3)
     , diskTypes (KHardDiskType_COUNT)
@@ -970 +970 @@
 }
 
-QString VBoxGlobal::toString (KStorageBus t, LONG c, LONG d) const
-{
-    Assert (storageBusDevices.count() == 3);
-    QString dev;
-
-    NOREF(c);
-    switch (t)
+/**
+ * Returns a string representation of the given channel number on the given
+ * storage bus. Complementary to #toStorageChannel (KStorageBus, const
+ * QString &) const.
+ */
+QString VBoxGlobal::toString (KStorageBus aBus, LONG aChannel) const
+{
+    Assert (storageBusChannels.count() == 3);
+    QString channel;
+
+    switch (aBus)
     {
         case KStorageBus_IDE:
         {
-            if (d == 0 || d == 1)
+            if (aChannel == 0 || aChannel == 1)
             {
-                dev = storageBusDevices [d];
+                channel = storageBusChannels [aChannel];
                 break;
             }
+
+            AssertMsgFailedBreak (("Invalid channel %d\n", aChannel));
+        }
+        case KStorageBus_SATA:
+        {
+            channel = storageBusChannels [2].arg (aChannel);
+            break;
         }
         default:
-            dev = storageBusDevices [2].arg (d);
-    }
-    return dev;
-}
-
-QString VBoxGlobal::toString (KStorageBus t, LONG c) const
-{
-    Assert (storageBusChannels.count() == 3);
-    QString dev;
-    switch (t)
+            AssertFailedBreak();
+    }
+
+    return channel;
+}
+
+/**
+ * Returns a channel number on the given storage bus corresponding to the given
+ * string representation. Complementary to #toString (KStorageBus, LONG) const.
+ */
+LONG VBoxGlobal::toStorageChannel (KStorageBus aBus, const QString &aChannel) const
+{
+    LONG channel = 0;
+
+    switch (aBus)
     {
         case KStorageBus_IDE:
         {
-            if (c == 0 || c == 1)
+            QStringVector::const_iterator it =
+                qFind (storageBusChannels.begin(), storageBusChannels.end(),
+                       aChannel);
+            AssertMsgBreak (it != storageBusChannels.end(),
+                            ("No value for {%s}\n", aChannel.toLatin1().constData()));
+            channel = (LONG) (it - storageBusChannels.begin());
+            break;
+        }
+        case KStorageBus_SATA:
+        {
+            /// @todo use regexp to properly extract the %1 text
+            QString tpl = storageBusChannels [2].arg ("");
+            if (aChannel.startsWith (tpl))
             {
-                dev = storageBusChannels [c];
+                channel = aChannel.right (aChannel.length() - tpl.length()).toLong();
                 break;
             }
+
+            AssertMsgFailedBreak (("Invalid channel {%s}\n", aChannel.toLatin1().constData()));
+            break;
         }
         default:
-            dev = storageBusChannels [2].arg (c);
-    }
-    return dev;
+            AssertFailedBreak();
+    }
+
+    return channel;
+}
+
+/**
+ * Returns a string representation of the given device number of the given
+ * channel on the given storage bus. Complementary to #toStorageDevice
+ * (KStorageBus, LONG, const QString &) const.
+ */
+QString VBoxGlobal::toString (KStorageBus aBus, LONG aChannel, LONG aDevice) const
+{
+    NOREF (aChannel);
+
+    Assert (storageBusDevices.count() == 2);
+    QString device;
+
+    switch (aBus)
+    {
+        case KStorageBus_IDE:
+        {
+            if (aDevice == 0 || aDevice == 1)
+            {
+                device = storageBusDevices [aDevice];
+                break;
+            }
+
+            AssertMsgFailedBreak (("Invalid device %d\n", aDevice));
+        }
+        case KStorageBus_SATA:
+        {
+            AssertMsgBreak (aDevice == 0, ("Invalid device %d\n", aDevice));
+            /* always zero so far for SATA */
+            break;
+        }
+        default:
+            AssertFailedBreak();
+    }
+
+    return device;
+}
+
+/**
+ * Returns a device number of the given channel on the given storage bus
+ * corresponding to the given string representation. Complementary to #toString
+ * (KStorageBus, LONG, LONG) const.
+ */
+LONG VBoxGlobal::toStorageDevice (KStorageBus aBus, LONG aChannel,
+                                  const QString &aDevice) const
+{
+    NOREF (aChannel);
+
+    LONG device = 0;
+
+    switch (aBus)
+    {
+        case KStorageBus_IDE:
+        {
+            QStringVector::const_iterator it =
+                qFind (storageBusDevices.begin(), storageBusDevices.end(),
+                       aDevice);
+            AssertMsg (it != storageBusDevices.end(),
+                       ("No value for {%s}", aDevice.toLatin1().constData()));
+            device = (LONG) (it - storageBusDevices.begin());
+            break;
+        }
+        case KStorageBus_SATA:
+        {
+            AssertMsgBreak(aDevice.isEmpty(), ("Invalid device {%s}\n", aDevice.toLatin1().constData()));
+            /* always zero for SATA so far. */
+            break;
+        }
+        default:
+            AssertFailedBreak();
+    }
+
+    return device;
+}
+
+/**
+ * Returns a full string representation of the given device of the given channel
+ * on the given storage bus. Complementary to #toStorageParams (KStorageBus,
+ * LONG, LONG) const.
+ */
+QString VBoxGlobal::toFullString (KStorageBus aBus, LONG aChannel,
+                                  LONG aDevice) const
+{
+    QString device;
+
+    switch (aBus)
+    {
+        case KStorageBus_IDE:
+        {
+            device = QString ("%1 %2 %3")
+                .arg (vboxGlobal().toString (aBus))
+                .arg (vboxGlobal().toString (aBus, aChannel))
+                .arg (vboxGlobal().toString (aBus, aChannel, aDevice));
+            break;
+        }
+        case KStorageBus_SATA:
+        {
+            /* we only have one SATA device so far which is always zero */
+            device = QString ("%1 %2")
+                .arg (vboxGlobal().toString (aBus))
+                .arg (vboxGlobal().toString (aBus, aChannel));
+            break;
+        }
+        default:
+            AssertFailedBreak();
+    }
+
+    return device;
 }
 
@@ -1401 +1542 @@
                 {
                     QString src = root.GetLocation();
+                    KStorageBus bus = hda.GetBus();
+                    LONG channel = hda.GetChannel();
+                    LONG device = hda.GetDevice();
                     hardDisks += QString (sSectionItemTpl)
-                        .arg (QString ("%1 %2")
-                              .arg (toString (hda.GetBus(), hda.GetChannel()))
-                              .arg (toString (hda.GetBus(), hda.GetChannel(),
-                                              hda.GetDevice())))
+                        .arg (toFullString (bus, channel, device))
                         .arg (QString ("%1 [<nobr>%2</nobr>]")
                               .arg (prepareFileNameForHTML (src))
@@ -2318 +2459 @@
         tr ("Secondary", "StorageBusChannel");
     storageBusChannels [2] =
-        tr ("Channel&nbsp;%1", "StorageBusChannel");
-
-    Assert (storageBusDevices.count() == 3);
+        tr ("Port %1", "StorageBusChannel");
+
+    Assert (storageBusDevices.count() == 2);
     storageBusDevices [0] = tr ("Master", "StorageBusDevice");
     storageBusDevices [1] = tr ("Slave", "StorageBusDevice");
-    storageBusDevices [2] = tr ("Device&nbsp;%1", "StorageBusDevice");
 
     diskTypes [KHardDiskType_Normal] =