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

Timestamp:

Jun 22, 2011 4:01:17 PM (13 years ago)

Author:

vboxsync

Message:

5746: FE/Qt: Create generic network adapter UI in Machine settings / Network page: Another NLS update.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• selector/UIVMDesktop.cpp (modified) (1 diff)
• settings/machine/UIMachineSettingsNetwork.cpp (modified) (3 diffs)
• settings/machine/UIMachineSettingsNetwork.ui (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.cpp

@@ -842 +842 @@
                                                  "details report (network)").arg(adapter.GetHostOnlyInterface()));
                     else if (type == KNetworkAttachmentType_Generic)
-                        attType = attType.arg(tr("Generic driver, '%1' { %2 }",
-                                                 "details report (network)").arg(adapter.GetGenericDriver(), summarizeGenericProperties(adapter)));
+                    {
+                        QString strGenericDriverProperties(summarizeGenericProperties(adapter));
+                        attType = strGenericDriverProperties.isNull() ?
+                                  attType.arg(tr("Generic driver, '%1'", "details report (network)").arg(adapter.GetGenericDriver())) :
+                                  attType.arg(tr("Generic driver, '%1' { %2 }", "details report (network)")
+                                              .arg(adapter.GetGenericDriver(), strGenericDriverProperties));
+                    }
                     else
                         attType = attType.arg(vboxGlobal().toString(type));

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.cpp

@@ -357 +357 @@
     {
         case KNetworkAttachmentType_Bridged:
+            m_pAdapterNameCombo->setWhatsThis(tr("Selects the network adapter on the host system that traffic "
+                                                 "to and from this network card will go through."));
             m_pAdapterNameCombo->insertItems(0, m_pParent->brgList());
             m_pAdapterNameCombo->setEditable(false);
             break;
         case KNetworkAttachmentType_Internal:
+            m_pAdapterNameCombo->setWhatsThis(tr("Enter the name of the internal network that this network card "
+                                                 "will be connected to. You can create a new internal network by "
+                                                 "choosing a name which is not used by any other network cards "
+                                                 "in this virtual machine or others."));
             m_pAdapterNameCombo->insertItems(0, m_pParent->fullIntList());
             m_pAdapterNameCombo->setEditable(true);
@@ -366 +372 @@
             break;
         case KNetworkAttachmentType_HostOnly:
+            m_pAdapterNameCombo->setWhatsThis(tr("Selects the virtual network adapter on the host system that traffic "
+                                                 "to and from this network card will go through. "
+                                                 "You can create and remove adapters using the global network "
+                                                 "settings in the virtual machine manager window."));
             m_pAdapterNameCombo->insertItems(0, m_pParent->hoiList());
             m_pAdapterNameCombo->setEditable(false);
             break;
         case KNetworkAttachmentType_Generic:
+            m_pAdapterNameCombo->setWhatsThis(tr("Selects the driver to be used with this network card."));
             m_pAdapterNameCombo->insertItem(0, alternativeName());
             m_pAdapterNameCombo->setEditable(true);
@@ -375 +386 @@
             break;
         default:
+            m_pAdapterNameCombo->setWhatsThis(QString());
             break;
     }

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.ui

@@ -105 +105 @@
           <verstretch>0</verstretch>
          </sizepolicy>
-        </property>
-        <property name="whatsThis">
-         <string>Selects the name of the network adapter for &lt;b&gt;Bridged Adapter&lt;/b&gt; or &lt;b&gt;Host-only Adapter&lt;/b&gt; attachments and the name of the network &lt;b&gt;Internal Network&lt;/b&gt; attachments.</string>
         </property>
        </widget>