Changeset 25042 in vbox for trunk/src/VBox/Frontends

Timestamp:

Nov 27, 2009 9:45:41 AM (15 years ago)

Author:

vboxsync

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

55373

Message:

FE/Qt4: Make sure the translated controller name is used in the new VM wizard also.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxNewVMWzd.cpp (modified) (3 diffs)
• VBoxVMFirstRunWzd.cpp (modified) (1 diff)

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

@@ -21 +21 @@
  */
 
+/* VBox includes */
 #include "VBoxNewVMWzd.h"
 #include "VBoxUtils.h"
@@ -27 +28 @@
 #include "VBoxNewHDWzd.h"
 #include "VBoxMediaManagerDlg.h"
+#include "VBoxVMSettingsHD.h"
 
 VBoxNewVMWzd::VBoxNewVMWzd (QWidget *aParent)
@@ -353 +355 @@
 
     /* Create default storage controllers */
-    QString ideCtrName ("IDE Controller");
-    QString floppyCtrName ("Floppy Controller");
+    QString ideCtrName = VBoxVMSettingsHD::tr ("IDE Controller");
+    QString floppyCtrName = VBoxVMSettingsHD::tr ("Floppy Controller");
     KStorageBus ideBus = KStorageBus_IDE;
     KStorageBus floppyBus = KStorageBus_Floppy;

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

@@ -99 +99 @@
 {
     /* Composing default controller name */
-    QString ctrName (mRbCdType->isChecked() ? "IDE Controller" : "Floppy Controller");
+    KStorageBus ctrBus (mRbCdType->isChecked() ? KStorageBus_IDE : KStorageBus_Floppy);
     LONG ctrPort = mRbCdType->isChecked() ? 1 : 0;
     LONG ctrDevice = 0;
-    /* Default should present */
-    CStorageController ctr = mMachine.GetStorageControllerByName (ctrName);
-    Assert (!ctr.isNull());
+    QString ctrName;
+    /* Search for the first controller of the given type */
+    QVector<CStorageController> ctrs = mMachine.GetStorageControllers();
+    foreach (CStorageController ctr, ctrs)
+    {
+        if (ctr.GetBus() == ctrBus)
+        {
+            ctrName = ctr.GetName();
+            break;
+        }
+    }
+    Assert (!ctrName.isEmpty());
     /* Mount medium to the predefined port/device */
     mMachine.MountMedium (ctrName, ctrPort, ctrDevice, mCbMedia->id(), false /* force */);