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

Timestamp:

Jan 18, 2008 2:01:16 PM (17 years ago)

Author:

vboxsync

Message:

1905: Add GUI support for internal network name:

Internal network name set on one of the adapter pages now instantly becomes available in other pages' combo-boxes (even before OK is pressed).

Location:

trunk/src/VBox/Frontends/VirtualBox/ui

Files:

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

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

@@ -135 +135 @@
 #endif
     Assert (cbNetworkName);
+    QString curText = cbNetworkName->currentText();
     cbNetworkName->clear();
     cbNetworkName->clearEdit();
     cbNetworkName->insertStringList (aList);
+    cbNetworkName->setCurrentText (curText);
 }
 

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

@@ -3220 +3220 @@
     <variable access="private">bool mAllowResetFirstRunFlag;</variable>
     <variable access="private">bool mResetFirstRunFlag;</variable>
+    <variable access="private">bool mLockNetworkListUpdate;</variable>
 </variables>
 <slots>
@@ -3233 +3234 @@
     <slot>showVDImageManager( QUuid *id, VBoxMediaComboBox *le, QLabel *tx = NULL )</slot>
     <slot>addNetworkAdapter( const CNetworkAdapter &amp; )</slot>
+    <slot>updateNetworksList()</slot>
     <slot>addSerialPort( const CSerialPort &amp; )</slot>
     <slot>addParallelPort( const CParallelPort &amp; )</slot>

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

@@ -1040 +1040 @@
         }
     }
+    mLockNetworkListUpdate = false;
 }
 
@@ -2365 +2366 @@
              wval, SLOT (revalidate()));
     connect (cbNetworkName, SIGNAL (textChanged (const QString &)),
+             this, SLOT (updateNetworksList()));
+    connect (cbNetworkName, SIGNAL (textChanged (const QString &)),
              wval, SLOT (revalidate()));
     connect (wval, SIGNAL (validityChanged (const QIWidgetValidator *)),
@@ -2384 +2387 @@
 
 #endif
+}
+
+void VBoxVMSettingsDlg::updateNetworksList()
+{
+    if (mLockNetworkListUpdate)
+        return;
+    mLockNetworkListUpdate = true;
+
+    QStringList curList (mNetworksList);
+    for (int index = 0; index < tbwNetwork->count(); ++ index)
+    {
+        VBoxVMNetworkSettings *pg = tbwNetwork->page (index) ?
+            static_cast <VBoxVMNetworkSettings*> (tbwNetwork->page (index)) : 0;
+        if (pg)
+        {
+            QComboBox *cb = 0;
+#if defined Q_WS_WIN
+            cb = pg->cbInternalNetworkName_WIN;
+#else
+            cb = pg->cbInternalNetworkName_X11;
+#endif
+            Assert (cb);
+            QString curText = cb->currentText();
+            if (!curText.isEmpty() && !curList.contains (curText))
+                curList << curText;
+        }
+    }
+
+    for (int index = 0; index < tbwNetwork->count(); ++ index)
+    {
+        VBoxVMNetworkSettings *pg = tbwNetwork->page (index) ?
+            static_cast <VBoxVMNetworkSettings*> (tbwNetwork->page (index)) : 0;
+        pg->loadNetworksList (curList);
+    }
+
+    mLockNetworkListUpdate = false;
 }