Changeset 18733 in vbox for trunk/src

Timestamp:

Apr 6, 2009 9:02:42 AM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: VM Settings / Network page: re-use already present tr() for adapter/network "Not selected" tegs + fixing gender-specification translation error.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxVMSettingsNetworkDetails.h (modified) (1 diff)
• src/VBoxVMSettingsNetworkDetails.cpp (modified) (3 diffs)

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

@@ -65 +65 @@
     KNetworkAttachmentType mType;
     CNetworkAdapter mAdapter;
-    QString mNotSelected;
 };
 

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

@@ -24 +24 @@
 #include "VBoxGlobal.h"
 #include "VBoxProblemReporter.h"
+#include "VBoxVMSettingsNetwork.h"
 #include "VBoxVMSettingsNetworkDetails.h"
 
@@ -224 +225 @@
 
     /* Translate empty items */
-    mNotSelected = tr ("Not selected", "Host-only Network Details, network adapter chooser");
     populateComboboxes();
 }
@@ -288 +288 @@
 void VBoxVMSettingsNetworkDetails::populateComboboxes()
 {
-    /* Append || retranslate <Not Selected> item */
-    QList <QComboBox*> list;
-    list << mCbBRG << mCbINT << mCbHOI;
-
-    foreach (QComboBox *cb, list)
-    {
-        int pos = cb->findData (emptyItemCode);
+    {   /* Bridged adapters combo-box */
+        int pos = mCbBRG->findData (emptyItemCode);
         if (pos == -1)
-            cb->insertItem (0, mNotSelected, emptyItemCode);
+            mCbBRG->insertItem (0,
+                VBoxVMSettingsNetwork::tr ("Not selected", "adapter"),
+                emptyItemCode);
         else
-            cb->setItemText (pos, mNotSelected);
-    }
+            mCbBRG->setItemText (pos,
+                VBoxVMSettingsNetwork::tr ("Not selected", "adapter"));
+    }   /* Bridged adapters combo-box */
+
+    {   /* Internal networks combo-box */
+        int pos = mCbINT->findData (emptyItemCode);
+        if (pos == -1)
+            mCbINT->insertItem (0,
+                VBoxVMSettingsNetwork::tr ("Not selected", "network"),
+                emptyItemCode);
+        else
+            mCbINT->setItemText (pos,
+                VBoxVMSettingsNetwork::tr ("Not selected", "network"));
+    }   /* Internal networks combo-box */
+
+    {   /* Host-only adapters combo-box */
+        int pos = mCbHOI->findData (emptyItemCode);
+        if (pos == -1)
+            mCbHOI->insertItem (0,
+                VBoxVMSettingsNetwork::tr ("Not selected", "adapter"),
+                emptyItemCode);
+        else
+            mCbHOI->setItemText (pos,
+                VBoxVMSettingsNetwork::tr ("Not selected", "adapter"));
+    }   /* Host-only adapters combo-box */
 }