Changeset 2400 in vbox for trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMNetworkSettings.ui.h

Timestamp:

Apr 27, 2007 2:42:49 PM (18 years ago)

Author:

vboxsync

Message:

1942: Improve automatic naming for "Add New..." UIs
Corrections taken into account.

File:

• trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMNetworkSettings.ui.h (modified) (6 diffs)

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

@@ -104 +104 @@
 void VBoxVMNetworkSettings::init()
 {
-    mInterfaceNumber = 0;
     mNoInterfaces = tr ("<No suitable interfaces>");
 
@@ -171 +170 @@
 }
 
-void VBoxVMNetworkSettings::loadList (const QStringList &aList,
-                                      int aInterfaceNumber)
-{
-#if defined Q_WS_WIN
-    mInterfaceNumber = aInterfaceNumber;
+void VBoxVMNetworkSettings::loadList (const QStringList &aList)
+{
+#if defined Q_WS_WIN
     /* save current list item name */
     QString currentListItemName = leHostInterfaceName->text();
@@ -190 +187 @@
 #else
     NOREF (aList);
-    NOREF (aInterfaceNumber);
 #endif
 }
@@ -394 +390 @@
     AllowSetForegroundWindow (ASFW_ANY);
 
+    /* search for the max available interface index */
+    int ifaceNumber = 0;
+    QString ifaceName = tr ("VirtualBox Host Interface %1");
+    QRegExp regExp (QString ("^") + ifaceName.arg ("([0-9]+)") + QString ("$"));
+    for (uint index = 0; index < lbHostInterface->count(); ++ index)
+    {
+        QString iface = lbHostInterface->text (index);
+        int pos = regExp.search (iface);
+        if (pos != -1)
+            ifaceNumber = regExp.cap (1).toInt() > ifaceNumber ?
+                          regExp.cap (1).toInt() : ifaceNumber;
+    }
+
     /* creating add host interface dialog */
-    VBoxAddNIDialog dlg (this, lbHostInterface->currentItem() != -1 ?
-                         tr ("VirtualBox Host Interface %1").arg (mInterfaceNumber) :
-                         leHostInterfaceName->text());
+    VBoxAddNIDialog dlg (this, ifaceName.arg (ifaceNumber + 1));
     if (dlg.exec() != QDialog::Accepted)
         return;
@@ -411 +418 @@
         if (progress.GetResultCode() == 0)
         {
-            ++ mInterfaceNumber;
             /* add&select newly created created interface */
             delete lbHostInterface->findItem (mNoInterfaces);
             lbHostInterface->insertItem (iName);
             selectListItem (iName);
+            pbHostRemove->setEnabled (true);
             emit listChanged (this);
         }
@@ -469 +476 @@
             {
                 if (lbHostInterface->count() == 1)
+                {
                     lbHostInterface->insertItem (mNoInterfaces);
+                    pbHostRemove->setEnabled (false);
+                }
                 delete lbHostInterface->findItem (iName);
                 emit listChanged (this);