Changeset 2400 in vbox for trunk

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.

Location:

trunk/src/VBox/Frontends/VirtualBox/ui

Files:

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

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

@@ -1223 +1223 @@
     <variable access="private">QString warningString;</variable>
     <variable access="private">QWidgetStack *wstUSBFilters;</variable>
-    <variable access="private">ulong mLastUSBFilterNum;</variable>
     <variable access="private">bool mUSBFilterListModified;</variable>
     <variable access="private">VBoxUSBMenu *usbDevicesMenu;</variable>

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

@@ -386 +386 @@
     usbDevicesMenu = new VBoxUSBMenu (this);
     connect (usbDevicesMenu, SIGNAL(activated(int)), this, SLOT(menuAddUSBFilterFrom_activated(int)));
-    mLastUSBFilterNum = 0;
     mUSBFilterListModified = false;
 
@@ -863 +862 @@
 void VBoxGlobalSettingsDlg::tbAddUSBFilter_clicked()
 {
-    CHost host = vboxGlobal().virtualBox().GetHost();
+    /* search for the max available filter index */
+    int maxFilterIndex = 0;
+    QString usbFilterName = tr ("New Filter %1", "usb");
+    QRegExp regExp (QString ("^") + usbFilterName.arg ("([0-9]+)") + QString ("$"));
+    QListViewItemIterator iterator (lvUSBFilters);
+    while (*iterator)
+    {
+        QString filterName = (*iterator)->text (lvUSBFilters_Name);
+        int pos = regExp.search (filterName);
+        if (pos != -1)
+            maxFilterIndex = regExp.cap (1).toInt() > maxFilterIndex ?
+                             regExp.cap (1).toInt() : maxFilterIndex;
+        ++ iterator;
+    }
+
+    /* creating new usb filter */
     CHostUSBDeviceFilter hostFilter;
-    host.CreateUSBDeviceFilter (tr ("New Filter %1", "usb")
-                                    .arg (++ mLastUSBFilterNum), hostFilter);
+    vboxGlobal().virtualBox().GetHost().CreateUSBDeviceFilter (
+        usbFilterName.arg (maxFilterIndex + 1), hostFilter);
     hostFilter.SetAction (CEnums::USBDeviceFilterHold);
 

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

@@ -769 +769 @@
 <variables>
     <variable access="private">CNetworkAdapter cadapter;</variable>
-    <variable access="private">int mInterfaceNumber;</variable>
     <variable access="private">QIWidgetValidator *mWalidator;</variable>
     <variable access="private">QString mNoInterfaces;</variable>
@@ -788 +787 @@
 <functions>
     <function access="private" specifier="non virtual">init()</function>
-    <function>loadList( const QStringList &amp;, int )</function>
+    <function>loadList( const QStringList &amp; )</function>
     <function>getFromAdapter( const CNetworkAdapter &amp; )</function>
     <function>putBackToAdapter()</function>

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);

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

@@ -628 +628 @@
     usbDevicesMenu = new VBoxUSBMenu (this);
     connect (usbDevicesMenu, SIGNAL(activated(int)), this, SLOT(menuAddUSBFilterFrom_activated(int)));
-    mLastUSBFilterNum = 0;
     mUSBFilterListModified = false;
-    mUSBFilterNamePrefix = tr ("New Filter ", "usb");
 
     /* VRDP Page */
@@ -851 +849 @@
         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);
@@ -874 +860 @@
     updateInterfaces (0);
     VBoxVMNetworkSettings *set = static_cast<VBoxVMNetworkSettings*> (aWidget);
-    set->loadList (mInterfaceList, mInterfaceNumber);
+    set->loadList (mInterfaceList);
     set->revalidate();
 #endif
@@ -1477 +1463 @@
 
             CUSBDeviceFilterEnumerator en = ctl.GetDeviceFilters().Enumerate();
-            /* loading filters & searching for max filter index */
-            int max = 0;
             while (en.HasMore())
-            {
-                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;
+                addUSBFilter (en.GetNext(), false /* isNew */);
 
             lvUSBFilters->setCurrentItem (lvUSBFilters->firstChild());
@@ -1807 +1782 @@
 {
     VBoxVMNetworkSettings *page = new VBoxVMNetworkSettings();
-    page->loadList (mInterfaceList, mInterfaceNumber);
+    page->loadList (mInterfaceList);
     page->getFromAdapter (aAdapter);
     tbwNetwork->addTab (page, QString (tr ("Adapter %1", "network"))
@@ -1981 +1956 @@
 void VBoxVMSettingsDlg::tbAddUSBFilter_clicked()
 {
+    /* search for the max available filter index */
+    int maxFilterIndex = 0;
+    QString usbFilterName = tr ("New Filter %1", "usb");
+    QRegExp regExp (QString ("^") + usbFilterName.arg ("([0-9]+)") + QString ("$"));
+    QListViewItemIterator iterator (lvUSBFilters);
+    while (*iterator)
+    {
+        QString filterName = (*iterator)->text (lvUSBFilters_Name);
+        int pos = regExp.search (filterName);
+        if (pos != -1)
+            maxFilterIndex = regExp.cap (1).toInt() > maxFilterIndex ?
+                             regExp.cap (1).toInt() : maxFilterIndex;
+        ++ iterator;
+    }
+
+    /* creating new usb filter */
     CUSBDeviceFilter filter = cmachine.GetUSBController()
-        .CreateDeviceFilter (QString ("%1%2")
-        .arg (mUSBFilterNamePrefix).arg (++ mLastUSBFilterNum));
+        .CreateDeviceFilter (usbFilterName.arg (maxFilterIndex + 1));
 
     filter.SetActive (true);