Changeset 56233 in vbox

Timestamp:

Jun 4, 2015 9:05:23 AM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: 7840: Missed some code related to USB storage controller handling.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• converter/UIConverterBackendCOM.cpp (modified) (1 diff)
• wizards/newvm/UIWizardNewVM.cpp (modified) (2 diffs)
• wizards/newvm/UIWizardNewVM.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendCOM.cpp

@@ -474 +474 @@
         case KStorageBus_Floppy: return QApplication::translate("VBoxGlobal", "Floppy", "StorageBus");
         case KStorageBus_SAS:    return QApplication::translate("VBoxGlobal", "SAS", "StorageBus");
+        case KStorageBus_USB:    return QApplication::translate("VBoxGlobal", "USB", "StorageControllerType"); // TODO: change to proper context later
         default: AssertMsgFailed(("No text for %d", bus)); break;
     }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp

@@ -51 +51 @@
     , m_iFloppyCount(0)
     , m_iSASCount(0)
+    , m_iUSBCount(0)
 {
 #ifndef Q_WS_MAC
@@ -364 +365 @@
             break;
         }
+        case KStorageBus_USB:
+        {
+            strControllerName = "USB";
+            ++m_iUSBCount;
+            if (m_iUSBCount > 1)
+                strControllerName = QString("%1 %2").arg(strControllerName).arg(m_iUSBCount);
+            break;
+        }
         default:
             break;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.h

@@ -78 +78 @@
     int m_iFloppyCount;
     int m_iSASCount;
+    int m_iUSBCount;
 };