Changeset 23438 in vbox for trunk/src/VBox

Timestamp:

Sep 30, 2009 12:37:23 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: New Storage UI: Better storage-slots serialization/de-serialization procedures feating human readable format for i18n.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxGlobal.h (modified) (2 diffs)
• src/VBoxGlobal.cpp (modified) (5 diffs)
• src/VBoxProblemReporter.cpp (modified) (2 diffs)
• src/VBoxVMInformationDlg.cpp (modified) (1 diff)
• src/VBoxVMSettingsHD.cpp (modified) (2 diffs)

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

@@ -413 +413 @@
     LONG toStorageDevice (KStorageBus aBus, LONG aChannel, const QString &aDevice) const;
 
-    QString toFullString (StorageSlot aSlot) const;
+    QString toString (StorageSlot aSlot) const;
     StorageSlot toStorageSlot (const QString &aSlot) const;
 
@@ -924 +924 @@
     QLongStringHash mStorageBusChannels;
     QLongStringHash mStorageBusDevices;
+    QULongStringHash mSlotTemplates;
 
     QULongStringHash mDiskTypes;

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

@@ -1155 +1155 @@
 /**
  * Returns a full string representation of the given device of the given channel on the given storage bus.
+ * This method does not uses any separate string tags related to bus, channel, device, it has own
+ * separately translated string tags allowing to translate a full slot name into human readable format
+ * to be consistent with i18n.
  * Complementary to #toStorageSlot (const QString &) const.
  */
-QString VBoxGlobal::toFullString (StorageSlot aSlot) const
-{
-    QString device (vboxGlobal().toString (aSlot.bus) + ' ');
-
+QString VBoxGlobal::toString (StorageSlot aSlot) const
+{
+    int maxPort = virtualBox().GetSystemProperties().GetMaxPortCountForStorageBus (aSlot.bus);
+    int maxDevice = virtualBox().GetSystemProperties().GetMaxDevicesPerPortForStorageBus (aSlot.bus);
+    if (aSlot.port < 0 || aSlot.port > maxPort)
+        AssertMsgFailed (("Invalid port %d\n", aSlot.port));
+    if (aSlot.device < 0 || aSlot.device > maxDevice)
+        AssertMsgFailed (("Invalid device %d\n", aSlot.device));
+
+    QString result;
     switch (aSlot.bus)
     {
         case KStorageBus_IDE:
         {
-            device += vboxGlobal().toString (aSlot.bus, aSlot.port) + ' ' +
-                      vboxGlobal().toString (aSlot.bus, aSlot.port, aSlot.device);
+            result = mSlotTemplates [aSlot.port * maxDevice + aSlot.device];
             break;
         }
         case KStorageBus_SATA:
+        {
+            result = mSlotTemplates [4].arg (aSlot.port);
+            break;
+        }
         case KStorageBus_SCSI:
         {
-            device += vboxGlobal().toString (aSlot.bus, aSlot.port);
+            result = mSlotTemplates [5].arg (aSlot.port);
             break;
         }
         case KStorageBus_Floppy:
         {
-            device += vboxGlobal().toString (aSlot.bus, aSlot.port, aSlot.device);
+            result = mSlotTemplates [6].arg (aSlot.device);
             break;
         }
@@ -1186 +1198 @@
         }
     }
-
-    return device;
+    return result;
 }
 
@@ -1196 +1207 @@
 StorageSlot VBoxGlobal::toStorageSlot (const QString &aSlot) const
 {
+    int index = -1;
+    QRegExp regExp;
+    for (int i = 0; i < mSlotTemplates.size(); ++ i)
+    {
+        regExp = QRegExp (mSlotTemplates [i].arg ("(\\d+)"));
+        if (regExp.indexIn (aSlot) != -1)
+        {
+            index = i;
+            break;
+        }
+    }
+
     StorageSlot result;
-
-    result.bus = toStorageBusType (aSlot.section (' ', 0, 0));
-    QString other (aSlot.section (' ', 1));
-
-    switch (result.bus)
-    {
-        case KStorageBus_IDE:
-        {
-            result.port = toStorageChannel (result.bus, other.section (' ', 0, 0));
-            result.device = toStorageDevice (result.bus, result.port, other.section (' ', 1));
+    switch (index)
+    {
+        case 0:
+        case 1:
+        case 2:
+        case 3:
+        {
+            result.bus = KStorageBus_IDE;
+            int maxPort = virtualBox().GetSystemProperties().GetMaxPortCountForStorageBus (result.bus);
+            result.port = index / maxPort;
+            result.device = index % maxPort;
             break;
         }
-        case KStorageBus_SATA:
-        case KStorageBus_SCSI:
-        {
-            result.port = toStorageChannel (result.bus, other);
-            result.device = toStorageDevice (result.bus, result.port, QString::null);
+        case 4:
+        {
+            result.bus = KStorageBus_SATA;
+            int maxPort = virtualBox().GetSystemProperties().GetMaxPortCountForStorageBus (result.bus);
+            result.port = regExp.cap (1).toInt();
+            if (result.port < 0 || result.port > maxPort)
+                AssertMsgFailed (("Invalid port %d\n", result.port));
             break;
         }
-        case KStorageBus_Floppy:
-        {
-            result.port = toStorageChannel (result.bus, QString::null);
-            result.device = toStorageDevice (result.bus, result.port, other);
+        case 5:
+        {
+            result.bus = KStorageBus_SCSI;
+            int maxPort = virtualBox().GetSystemProperties().GetMaxPortCountForStorageBus (result.bus);
+            result.port = regExp.cap (1).toInt();
+            if (result.port < 0 || result.port > maxPort)
+                AssertMsgFailed (("Invalid port %d\n", result.port));
             break;
         }
+        case 6:
+        {
+            result.bus = KStorageBus_Floppy;
+            int maxDevice = virtualBox().GetSystemProperties().GetMaxDevicesPerPortForStorageBus (result.bus);
+            result.device = regExp.cap (1).toInt();
+            if (result.device < 0 || result.device > maxDevice)
+                AssertMsgFailed (("Invalid device %d\n", result.device));
+            break;
+        }
         default:
-        {
-            AssertMsgFailed (("Invalid bus type %d\n", result.bus));
             break;
-        }
-    }
-
+    }
     return result;
 }
@@ -1704 +1738 @@
                 LONG device = ma.GetDevice();
                 item += QString (sSectionItemTpl2)
-                        .arg (toFullString (StorageSlot (bus, port, device)))
+                        .arg (toString (StorageSlot (bus, port, device)))
                         .arg (details (medium, false));
                 ++ rows;
@@ -2629 +2663 @@
     mStorageBuses [KStorageBus_Floppy] =    tr ("Floppy", "StorageBus");
 
-    mStorageBusChannels [0] =   tr ("Primary", "StorageBusChannel");
-    mStorageBusChannels [1] =   tr ("Secondary", "StorageBusChannel");
-    mStorageBusChannels [2] =   tr ("Port %1", "StorageBusChannel");
-
-    mStorageBusDevices [0] =    tr ("Master", "StorageBusDevice");
-    mStorageBusDevices [1] =    tr ("Slave", "StorageBusDevice");
-    mStorageBusDevices [2] =    tr ("Device %1", "StorageBusDevice");
+    mStorageBusChannels [0] = tr ("Primary", "StorageBusChannel");
+    mStorageBusChannels [1] = tr ("Secondary", "StorageBusChannel");
+    mStorageBusChannels [2] = tr ("Port %1", "StorageBusChannel");
+
+    mStorageBusDevices [0] = tr ("Master", "StorageBusDevice");
+    mStorageBusDevices [1] = tr ("Slave", "StorageBusDevice");
+    mStorageBusDevices [2] = tr ("Device %1", "StorageBusDevice");
+
+    mSlotTemplates [0] = tr ("IDE Primary Master", "New Storage UI : Slot Name");
+    mSlotTemplates [1] = tr ("IDE Primary Slave", "New Storage UI : Slot Name");
+    mSlotTemplates [2] = tr ("IDE Secondary Master", "New Storage UI : Slot Name");
+    mSlotTemplates [3] = tr ("IDE Secondary Slave", "New Storage UI : Slot Name");
+    mSlotTemplates [4] = tr ("SATA Port %1", "New Storage UI : Slot Name");
+    mSlotTemplates [5] = tr ("SCSI Port %1", "New Storage UI : Slot Name");
+    mSlotTemplates [6] = tr ("Floppy Device %1", "New Storage UI : Slot Name");
 
     mDiskTypes [KMediumType_Normal] =           tr ("Normal", "DiskType");

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

@@ -1161 +1161 @@
             "to the slot <i>%2</i> of the machine <b>%3</b>.")
             .arg (aLocation)
-            .arg (vboxGlobal().toFullString (StorageSlot (aBus, aChannel, aDevice)))
+            .arg (vboxGlobal().toString (StorageSlot (aBus, aChannel, aDevice)))
             .arg (CMachine (aMachine).GetName()),
         formatErrorInfo (aMachine));
@@ -1174 +1174 @@
             "from the slot <i>%2</i> of the machine <b>%3</b>.")
             .arg (aLocation)
-            .arg (vboxGlobal().toFullString (StorageSlot (aBus, aChannel, aDevice)))
+            .arg (vboxGlobal().toString (StorageSlot (aBus, aChannel, aDevice)))
             .arg (CMachine (aMachine).GetName()),
          formatErrorInfo (aMachine));

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

@@ -618 +618 @@
     CMedium hd = mSession.GetMachine().GetMedium (ctlName, aChannel, aDevice);
     QString header = "<tr><td></td><td colspan=2><nobr><u>%1</u></nobr></td></tr>";
-    QString name = vboxGlobal().toFullString (StorageSlot (ctl.GetBus(), aChannel, aDevice));
+    QString name = vboxGlobal().toString (StorageSlot (ctl.GetBus(), aChannel, aDevice));
     QString result = hd.isNull() ? QString::null : header.arg (name);
     result += composeArticle (aBelongsTo);

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

@@ -1729 +1729 @@
             KDeviceType attDevice = mStorageModel->data (attIndex, StorageModel::R_AttDevice).value <KDeviceType>();
             QString key (mStorageModel->data (attIndex, StorageModel::R_AttMediumId).toString());
-            QString value (QString ("%1 (%2)").arg (ctrName, vboxGlobal().toFullString (attSlot)));
+            QString value (QString ("%1 (%2)").arg (ctrName, vboxGlobal().toString (attSlot)));
             /* Check for emptiness */
             if (vboxGlobal().findMedium (key).isNull() && attDevice == KDeviceType_HardDisk)
@@ -1968 +1968 @@
                 SlotsList slotsList (mStorageModel->data (index, StorageModel::R_AttSlots).value <SlotsList>());
                 for (int i = 0; i < slotsList.size(); ++ i)
-                    mCbSlot->insertItem (mCbSlot->count(), vboxGlobal().toFullString (slotsList [i]));
+                    mCbSlot->insertItem (mCbSlot->count(), vboxGlobal().toString (slotsList [i]));
                 StorageSlot slt = mStorageModel->data (index, StorageModel::R_AttSlot).value <StorageSlot>();
-                int attSlotPos = mCbSlot->findText (vboxGlobal().toFullString (slt));
+                int attSlotPos = mCbSlot->findText (vboxGlobal().toString (slt));
                 mCbSlot->setCurrentIndex (attSlotPos == -1 ? 0 : attSlotPos);