Changeset 91122 in vbox for trunk/src/VBox

Timestamp:

Sep 6, 2021 1:07:59 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: UICommon: A bit of minor fixes USB stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICommon.cpp (modified) (4 diffs)
• globals/UICommon.h (modified) (1 diff)
• runtime/UIIndicatorsPool.cpp (modified) (1 diff)
• runtime/UIMachineLogic.cpp (modified) (5 diffs)
• settings/machine/UIMachineSettingsUSB.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp

@@ -2408 +2408 @@
 
 /* static */
-QString UICommon::details(const CUSBDevice &comDevice)
+QString UICommon::usbDetails(const CUSBDevice &comDevice)
 {
     QString strDetails;
@@ -2447 +2447 @@
 
 /* static */
-QString UICommon::toolTip(const CUSBDevice &comDevice)
+QString UICommon::usbToolTip(const CUSBDevice &comDevice)
 {
     QString strTip =
@@ -2474 +2474 @@
 
 /* static */
-QString UICommon::toolTip(const CUSBDeviceFilter &comFilter)
+QString UICommon::usbToolTip(const CUSBDeviceFilter &comFilter)
 {
     QString strTip;
@@ -2525 +2525 @@
 
 /* static */
-QString UICommon::toolTip(const CHostVideoInputDevice &comWebcam)
+QString UICommon::usbToolTip(const CHostVideoInputDevice &comWebcam)
 {
     QStringList records;

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.h

@@ -468 +468 @@
 
         /** Generates details for passed USB @a comDevice. */
-        static QString details(const CUSBDevice &comDevice);
+        static QString usbDetails(const CUSBDevice &comDevice);
         /** Generates tool-tip for passed USB @a comDevice. */
-        static QString toolTip(const CUSBDevice &comDevice);
+        static QString usbToolTip(const CUSBDevice &comDevice);
         /** Generates tool-tip for passed USB @a comFilter. */
-        static QString toolTip(const CUSBDeviceFilter &comFilter);
+        static QString usbToolTip(const CUSBDeviceFilter &comFilter);
         /** Generates tool-tip for passed USB @a comWebcam. */
-        static QString toolTip(const CHostVideoInputDevice &comWebcam);
+        static QString usbToolTip(const CHostVideoInputDevice &comWebcam);
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp

@@ -632 +632 @@
             const CConsole console = m_pSession->console();
             foreach (const CUSBDevice &usbDevice, console.GetUSBDevices())
-                strFullData += s_strTableRow1.arg(uiCommon().details(usbDevice));
+                strFullData += s_strTableRow1.arg(uiCommon().usbDetails(usbDevice));
             /* Handle 'no-usb-devices' case: */
             if (strFullData.isNull())

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -653 +653 @@
     {
         if (fIsAttached)
-            UINotificationMessage::cannotAttachUSBDevice(error, uiCommon().details(device), machineName());
+            UINotificationMessage::cannotAttachUSBDevice(error, uiCommon().usbDetails(device), machineName());
         else
-            UINotificationMessage::cannotDetachUSBDevice(error, uiCommon().details(device), machineName());
+            UINotificationMessage::cannotDetachUSBDevice(error, uiCommon().usbDetails(device), machineName());
     }
 }
@@ -2294 +2294 @@
             CUSBDevice device(hostDevice);
             /* Show a message about procedure failure: */
-            UINotificationMessage::cannotAttachUSBDevice(console(), uiCommon().details(device));
+            UINotificationMessage::cannotAttachUSBDevice(console(), uiCommon().usbDetails(device));
         }
     }
@@ -2308 +2308 @@
         {
             /* Show a message about procedure failure: */
-            UINotificationMessage::cannotDetachUSBDevice(console(), uiCommon().details(device));
+            UINotificationMessage::cannotDetachUSBDevice(console(), uiCommon().usbDetails(device));
         }
     }
@@ -2877 +2877 @@
 
             /* Create USB device action: */
-            QAction *pAttachUSBAction = pMenu->addAction(uiCommon().details(device),
+            QAction *pAttachUSBAction = pMenu->addAction(uiCommon().usbDetails(device),
                                                          this, SLOT(sltAttachUSBDevice()));
-            pAttachUSBAction->setToolTip(uiCommon().toolTip(device));
+            pAttachUSBAction->setToolTip(uiCommon().usbToolTip(device));
             pAttachUSBAction->setCheckable(true);
 
@@ -2927 +2927 @@
             QAction *pAttachWebcamAction = pMenu->addAction(strWebcamName,
                                                             this, SLOT(sltAttachWebCamDevice()));
-            pAttachWebcamAction->setToolTip(uiCommon().toolTip(webcam));
+            pAttachWebcamAction->setToolTip(uiCommon().usbToolTip(webcam));
             pAttachWebcamAction->setCheckable(true);
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp

@@ -209 +209 @@
                 CHostUSBDevice dev = devvec[i];
                 CUSBDevice usb(dev);
-                QAction *pAction = addAction(uiCommon().details(usb));
+                QAction *pAction = addAction(uiCommon().usbDetails(usb));
                 pAction->setCheckable(true);
                 m_usbDeviceMap[pAction] = usb;
@@ -238 +238 @@
                 if (!usb.isNull())
                 {
-                    QToolTip::showText(pHelpEvent->globalPos(), uiCommon().toolTip(usb));
+                    QToolTip::showText(pHelpEvent->globalPos(), uiCommon().usbToolTip(usb));
                     return true;
                 }
@@ -727 +727 @@
     UIDataSettingsMachineUSBFilter filterData;
     filterData.m_fActive = true;
-    filterData.m_strName = uiCommon().details(usb);
+    filterData.m_strName = uiCommon().usbDetails(usb);
     filterData.m_fHostUSBDevice = false;
     filterData.m_strVendorId = QString().sprintf("%04hX", usb.GetVendorId());