Changeset 2394 in vbox for trunk

Timestamp:

Apr 27, 2007 11:39:11 AM (18 years ago)

Author:

vboxsync

Message:

1942: Improve automatic naming for "Add New..." Uis

Feature implemented as designed:
Search algorithm will find the last created default named interface (filter) and will use its index+1 as a starting index for the newly created ones.

Location:

trunk/src/VBox/Frontends/VirtualBox/ui

Files:

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

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

@@ -788 +788 @@
 <functions>
     <function access="private" specifier="non virtual">init()</function>
-    <function>loadList( const QStringList &amp; )</function>
+    <function>loadList( const QStringList &amp;, int )</function>
     <function>getFromAdapter( const CNetworkAdapter &amp; )</function>
     <function>putBackToAdapter()</function>

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

@@ -152 +152 @@
 
 #if defined Q_WS_MAC
-    /* no Host Interface Networking on the Mac yet */   
+    /* no Host Interface Networking on the Mac yet */
     grbTAP->setHidden (true);
 #endif
@@ -171 +171 @@
 }
 
-void VBoxVMNetworkSettings::loadList (const QStringList &aList)
-{
-#if defined Q_WS_WIN
+void VBoxVMNetworkSettings::loadList (const QStringList &aList,
+                                      int aInterfaceNumber)
+{
+#if defined Q_WS_WIN
+    mInterfaceNumber = aInterfaceNumber;
     /* save current list item name */
     QString currentListItemName = leHostInterfaceName->text();
@@ -188 +190 @@
 #else
     NOREF (aList);
+    NOREF (aInterfaceNumber);
 #endif
 }
@@ -393 +396 @@
     /* creating add host interface dialog */
     VBoxAddNIDialog dlg (this, lbHostInterface->currentItem() != -1 ?
-                         tr ("VirtualBox Host Interface %1").arg (++mInterfaceNumber) :
+                         tr ("VirtualBox Host Interface %1").arg (mInterfaceNumber) :
                          leHostInterfaceName->text());
     if (dlg.exec() != QDialog::Accepted)
@@ -408 +411 @@
         if (progress.GetResultCode() == 0)
         {
+            ++ mInterfaceNumber;
             /* add&select newly created created interface */
             delete lbHostInterface->findItem (mNoInterfaces);

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

@@ -2771 +2771 @@
     <variable access="private">CMachine cmachine;</variable>
     <variable access="private">QStringList mInterfaceList;</variable>
+    <variable access="private">int mInterfaceNumber;</variable>
     <variable access="private">QWidgetStack *wstUSBFilters;</variable>
     <variable access="private">ulong mLastUSBFilterNum;</variable>
     <variable access="private">bool mUSBFilterListModified;</variable>
+    <variable access="private">QString mUSBFilterNamePrefix;</variable>
     <variable access="private">QTabWidget* tbwNetwork;</variable>
     <variable access="private">VBoxSharedFoldersSettings* mSharedFolders;</variable>

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

@@ -630 +630 @@
     mLastUSBFilterNum = 0;
     mUSBFilterListModified = false;
+    mUSBFilterNamePrefix = tr ("New Filter ", "usb");
 
     /* VRDP Page */
@@ -850 +851 @@
         set->revalidate();
     }
+    /* searching for max interface index */
+    QString interfacePrefix = tr ("VirtualBox Host Interface ");
+    QRegExp regExp (QString ("%1(\\d+)").arg (interfacePrefix));
+    QStringList list = mInterfaceList.grep (regExp);
+    int max = 0;
+    for (QStringList::Iterator it = list.begin(); it != list.end(); ++ it)
+    {
+        int pos = regExp.search (*it);
+        if (pos != -1)
+            max = regExp.cap (1).toInt() > max ? regExp.cap (1).toInt() : max;
+    }
+    mInterfaceNumber = ++ max;
 #else
     NOREF (aWidget);
@@ -861 +874 @@
     updateInterfaces (0);
     VBoxVMNetworkSettings *set = static_cast<VBoxVMNetworkSettings*> (aWidget);
-    set->loadList (mInterfaceList);
+    set->loadList (mInterfaceList, mInterfaceNumber);
     set->revalidate();
 #endif
@@ -1464 +1477 @@
 
             CUSBDeviceFilterEnumerator en = ctl.GetDeviceFilters().Enumerate();
+            /* loading filters & searching for max filter index */
+            int max = 0;
             while (en.HasMore())
-                addUSBFilter (en.GetNext(), false /* isNew */);
+            {
+                const CUSBDeviceFilter &filter = en.GetNext();
+                QRegExp regExp (QString ("%1(\\d+)").arg (mUSBFilterNamePrefix));
+                int pos = regExp.search (filter.GetName());
+                if (pos != -1)
+                    max = regExp.cap (1).toInt() > max ?
+                          regExp.cap (1).toInt() : max;
+                addUSBFilter (filter, false /* isNew */);
+            }
+            mLastUSBFilterNum = max;
 
             lvUSBFilters->setCurrentItem (lvUSBFilters->firstChild());
@@ -1783 +1807 @@
 {
     VBoxVMNetworkSettings *page = new VBoxVMNetworkSettings();
-    page->loadList (mInterfaceList);
+    page->loadList (mInterfaceList, mInterfaceNumber);
     page->getFromAdapter (aAdapter);
     tbwNetwork->addTab (page, QString (tr ("Adapter %1", "network"))
@@ -1958 +1982 @@
 {
     CUSBDeviceFilter filter = cmachine.GetUSBController()
-        .CreateDeviceFilter (tr ("New Filter %1", "usb")
-                                 .arg (++ mLastUSBFilterNum));
+        .CreateDeviceFilter (QString ("%1%2")
+        .arg (mUSBFilterNamePrefix).arg (++ mLastUSBFilterNum));
 
     filter.SetActive (true);