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

Timestamp:

Jun 22, 2011 9:57:30 AM (14 years ago)

Author:

vboxsync

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

72429

Message:

FE/Qt: 5746: Create generic network adapter UI in Machine settings / Network page: Renaming 'Generic' to 'Generic Driver'; Preventing settings being saved with no generic driver name specified.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (1 diff)
• selector/UIVMDesktop.cpp (modified) (1 diff)
• settings/machine/UIMachineSettingsNetwork.cpp (modified) (1 diff)

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

@@ -2986 +2986 @@
         tr ("Host-only Adapter", "NetworkAttachmentType");
     mNetworkAttachmentTypes [KNetworkAttachmentType_Generic] =
-        tr ("Generic", "NetworkAttachmentType");
+        tr ("Generic Driver", "NetworkAttachmentType");
 
     mNetworkAdapterPromiscModePolicyTypes [KNetworkAdapterPromiscModePolicy_Deny] =

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, '%1' { %2 }",
+                        attType = attType.arg(tr("Generic driver, '%1' { %2 }",
                                                  "details report (network)").arg(adapter.GetGenericDriver(), summarizeGenericProperties(adapter)));
                     else

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

@@ -240 +240 @@
             {
                 strWarning = tr("no host-only network adapter is selected");
+                fValid = false;
+            }
+            break;
+        case KNetworkAttachmentType_Generic:
+            if (alternativeName().isNull())
+            {
+                strWarning = tr("no generic driver is selected");
                 fValid = false;
             }