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

Timestamp:

Jan 17, 2008 5:51:53 PM (17 years ago)

Author:

vboxsync

Message:

1905: Add GUI support for internal network name:

Network setup error enumeration (int->enum).

Location:

trunk/src/VBox/Frontends/VirtualBox/ui

Files:

• VBoxVMNetworkSettings.ui (modified) (2 diffs)
• VBoxVMNetworkSettings.ui.h (modified) (2 diffs)
• VBoxVMSettingsDlg.ui.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMNetworkSettings.ui

@@ -672 +672 @@
 </includes>
 <variables>
+    <variable access="public">enum CheckPageResult { NoErrors, IncorrectInterface, MissedNetworkName };</variable>
     <variable access="private">CNetworkAdapter cadapter;</variable>
     <variable access="private">QIWidgetValidator *mWalidator;</variable>
@@ -684 +685 @@
 <functions>
     <function access="private" specifier="non virtual">init()</function>
-    <function returnType="int">checkPage( const QStringList &amp; )</function>
+    <function returnType="CheckPageResult">checkPage( const QStringList &amp; )</function>
     <function>loadInterfaceList( const QStringList &amp;, const QString &amp; )</function>
     <function>loadNetworksList( const QStringList &amp; )</function>

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMNetworkSettings.ui.h

@@ -76 +76 @@
 }
 
-int VBoxVMNetworkSettings::checkPage (const QStringList &aList)
+VBoxVMNetworkSettings::CheckPageResult VBoxVMNetworkSettings::checkPage (const QStringList &aList)
 {
     CEnums::NetworkAttachmentType type =
@@ -83 +83 @@
     if (type == CEnums::HostInterfaceNetworkAttachment &&
         isInterfaceInvalid (aList, cbHostInterfaceName->currentText()))
-        return 1;
+        return IncorrectInterface;
     else if (type == CEnums::InternalNetworkAttachment &&
              cbInternalNetworkName_WIN->currentText().isEmpty())
-        return 2;
+        return MissedNetworkName;
     else
-        return 0;
+        return NoErrors;
 #else
     NOREF (aList);
     if (type == CEnums::InternalNetworkAttachment &&
         cbInternalNetworkName_X11->currentText().isEmpty())
-        return 2;
+        return MissedNetworkName;
     else
-        return 0;
+        return NoErrors;
 #endif
 }

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsDlg.ui.h

@@ -1530 +1530 @@
         {
             Assert (tab);
-            warningText = error == 1 ?
-                tr ("Incorrect host network interface is selected") : error == 2 ?
+            warningText = error == VBoxVMNetworkSettings::IncorrectInterface ?
+                tr ("Incorrect host network interface is selected") :
+                error == VBoxVMNetworkSettings::MissedNetworkName ?
                 tr ("Internal network name is not set") : QString::null;
             pageTitle += ": " + tbwNetwork->tabLabel (tab);