Changeset 8474 in vbox for trunk/src

Timestamp:

Apr 29, 2008 3:48:12 PM (17 years ago)

Author:

vboxsync

Message:

#2796: Network adapter UI misbehavior: fixed, but please check the behavior of interface combo-box now, it becomes editable.

Location:

trunk/src/VBox/Frontends/VirtualBox/ui

Files:

• VBoxVMNetworkSettings.ui (modified) (1 diff)
• VBoxVMNetworkSettings.ui.h (modified) (5 diffs)

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

@@ -240 +240 @@
                             <property name="name">
                                 <cstring>cbHostInterfaceName</cstring>
+                            </property>
+                            <property name="editable">
+                                <bool>true</bool>
+                            </property>
+                            <property name="insertionPolicy">
+                                <enum>NoInsertion</enum>
                             </property>
                             <property name="whatsThis" stdset="0">

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

@@ -87 +87 @@
     KNetworkAttachmentType type =
         vboxGlobal().toNetworkAttachmentType (cbNetworkAttachment->currentText());
+    if (!grbEnabled->isChecked())
+        return CheckPage_Ok;
+    else
 #if defined Q_WS_WIN
     if (type == KNetworkAttachmentType_HostInterface &&
@@ -112 +115 @@
     /* load current list items */
     if (aList.count())
-    {
         cbHostInterfaceName->insertStringList (aList);
-        int index = aList.findIndex (currentListItemName);
-        if (index != -1)
-            cbHostInterfaceName->setCurrentItem (index);
-    }
-    else
-    {
+    else
         cbHostInterfaceName->insertItem (aNillItem);
+
+    if (currentListItemName.isEmpty() || currentListItemName == aNillItem)
         cbHostInterfaceName->setCurrentItem (0);
-    }
+    else
+        cbHostInterfaceName->setCurrentText (currentListItemName);
 #else
     NOREF (aList);
@@ -162 +162 @@
 
 #if defined Q_WS_WIN
-    QString name = adapter.GetHostInterface();
-    for (int index = 0; index < cbHostInterfaceName->count(); ++ index)
-        if (cbHostInterfaceName->text (index) == name)
-        {
-            cbHostInterfaceName->setCurrentItem (index);
-            break;
-        }
-    if (cbHostInterfaceName->currentItem() == -1)
-        cbHostInterfaceName->setCurrentText (name);
+    if (!adapter.GetHostInterface().isEmpty())
+        cbHostInterfaceName->setCurrentText (adapter.GetHostInterface());
 #else
     leHostInterface->setText (adapter.GetHostInterface());
@@ -249 +242 @@
 {
 #if defined Q_WS_WIN
-    if (!aOn)
-    {
-        cbNetworkAttachment->setCurrentItem (0);
-        cbNetworkAttachment_activated (cbNetworkAttachment->currentText());
-    }
+    cbNetworkAttachment_activated (cbNetworkAttachment->currentText());
 #else
     NOREF (aOn);
@@ -261 +250 @@
 void VBoxVMNetworkSettings::cbNetworkAttachment_activated (const QString &aString)
 {
-    bool enableHostIf = vboxGlobal().toNetworkAttachmentType (aString) ==
+    bool enableHostIf = grbEnabled->isChecked() &&
+                        vboxGlobal().toNetworkAttachmentType (aString) ==
                         KNetworkAttachmentType_HostInterface;
-    bool enableIntNet = vboxGlobal().toNetworkAttachmentType (aString) ==
+    bool enableIntNet = grbEnabled->isChecked() &&
+                        vboxGlobal().toNetworkAttachmentType (aString) ==
                         KNetworkAttachmentType_Internal;
 #if defined Q_WS_WIN