Changeset 368 in vbox for trunk

Timestamp:

Jan 26, 2007 5:17:55 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

17933

Message:

FE/Qt: USB filters from templates: use the device name as the initial filter name.

Location:

trunk/src/VBox/Frontends/VirtualBox/ui

Files:

• VBoxVMSettingsDlg.ui (modified) (9 diffs)
• VBoxVMSettingsDlg.ui.h (modified) (6 diffs)

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

@@ -1931 +1931 @@
                                                 </property>
                                                 <property name="textLabel">
-                                                    <string>Add</string>
+                                                    <string>Add Empty (Ins)</string>
                                                 </property>
                                                 <property name="autoRaise">
@@ -1937 +1937 @@
                                                 </property>
                                                 <property name="whatsThis" stdset="0">
-                                                    <string>Adds a new USB filter.</string>
+                                                    <string>Adds a new USB filter with
+all fields initially set to empty strings. Note that such a filter will match any attached
+USB device.</string>
                                                 </property>
                                             </widget>
@@ -1951 +1953 @@
                                                 </property>
                                                 <property name="accel">
-                                                    <string>Ins</string>
+                                                    <string>Alt+Ins</string>
                                                 </property>
                                                 <property name="iconSet">
@@ -1957 +1959 @@
                                                 </property>
                                                 <property name="textLabel">
-                                                    <string>Add existing</string>
+                                                    <string>Add From (Alt+Ins)</string>
                                                 </property>
                                                 <property name="autoRaise">
@@ -1963 +1965 @@
                                                 </property>
                                                 <property name="whatsThis" stdset="0">
-                                                    <string>Adds a new USB filter from an existing USB device.</string>
+                                                    <string>Adds a new USB filter
+with all fields set to the values of the selected USB device attached to a host PC.</string>
                                                 </property>
                                             </widget>
@@ -1983 +1986 @@
                                                 </property>
                                                 <property name="textLabel">
-                                                    <string>Remove</string>
+                                                    <string>Remove (Del)</string>
                                                 </property>
                                                 <property name="autoRaise">
@@ -2009 +2012 @@
                                                 </property>
                                                 <property name="textLabel">
-                                                    <string>Up</string>
+                                                    <string>Move Up (Ctrl+Up)</string>
                                                 </property>
                                                 <property name="autoRaise">
@@ -2035 +2038 @@
                                                 </property>
                                                 <property name="textLabel">
-                                                    <string>Down</string>
+                                                    <string>Move Down (Ctrl+Down)</string>
                                                 </property>
                                                 <property name="autoRaise">
@@ -2692 +2695 @@
     <variable access="private">QPopupMenu *usbDevicesMenu;</variable>
     <variable access="private">QMap&lt;int, CUSBDevice&gt; usbDevicesMap;</variable>
-    <variable access="private">int mUsbDevicesMenuNoDevicesId;</variable>
+    <variable access="private">enum { USBDevicesMenuNoDevicesId = 1 };</variable>
 </variables>
 <slots>

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

@@ -445 +445 @@
 
     /* setup iconsets -- qdesigner is not capable... */
-    tbAddUSBFilter->setIconSet (VBoxGlobal::iconSet ("usb_add_16px.png",
-                                                     "usb_add_disabled_16px.png"));
-    tbAddUSBFilterFrom->setIconSet (VBoxGlobal::iconSet ("usb_read_16px.png",
-                                                         "usb_read_16px.png"));
+    tbAddUSBFilter->setIconSet (VBoxGlobal::iconSet ("usb_16px.png",
+                                                     "usb_disabled_16px.png"));
+    tbAddUSBFilterFrom->setIconSet (VBoxGlobal::iconSet ("usb_add_16px.png",
+                                                         "usb_add_disabled_16px.png"));
     tbRemoveUSBFilter->setIconSet (VBoxGlobal::iconSet ("usb_remove_16px.png",
                                                         "usb_remove_disabled_16px.png"));
@@ -460 +460 @@
     mLastUSBFilterNum = 0;
     mUSBFilterListModified = false;
-    mUsbDevicesMenuNoDevicesId = -1;
 
     /* VRDP Page */
@@ -1725 +1724 @@
     if (isUSBEmpty)
     {
-        mUsbDevicesMenuNoDevicesId = usbDevicesMenu->insertItem (
-            tr ("<no available devices>", "USB devices"));
-        usbDevicesMenu->setItemEnabled (mUsbDevicesMenuNoDevicesId, false);
+        usbDevicesMenu->insertItem (
+            tr ("<no available devices>", "USB devices"),
+            USBDevicesMenuNoDevicesId);
+        usbDevicesMenu->setItemEnabled (USBDevicesMenuNoDevicesId, false);
     }
     else
     {
-        mUsbDevicesMenuNoDevicesId = -1;
         CHostUSBDeviceEnumerator en = host.GetUSBDevices().Enumerate();
         while (en.HasMore())
@@ -1741 +1740 @@
         }
     }
+
     usbDevicesMenu->exec (QCursor::pos());
 }
@@ -1747 +1747 @@
 {
     /* the <no available devices> item is highlighted */
-    if (aIndex == mUsbDevicesMenuNoDevicesId)
+    if (aIndex == USBDevicesMenuNoDevicesId)
     {
         QToolTip::add (usbDevicesMenu,
@@ -1775 +1775 @@
 
     CUSBDeviceFilter filter = cmachine.GetUSBController()
-        .CreateDeviceFilter (tr ("New Filter %1", "usb")
-                                 .arg (++ mLastUSBFilterNum));
+        .CreateDeviceFilter (vboxGlobal().details (usb));
 
     filter.SetVendorId (QString().sprintf ("%04hX", usb.GetVendorId()));