Changeset 91076 in vbox for trunk/src/VBox

Timestamp:

Sep 1, 2021 6:52:17 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: Moving USB device enumeration stuff related warning from UIMessageCenter to UINotificationCenter.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (1 diff)
• globals/UIMessageCenter.h (modified) (1 diff)
• manager/UIVirtualBoxManager.cpp (modified) (1 diff)
• notificationcenter/UINotificationObjects.cpp (modified) (1 diff)
• notificationcenter/UINotificationObjects.h (modified) (1 diff)
• runtime/UISession.cpp (modified) (1 diff)

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

@@ -600 +600 @@
 {
     alert(0, MessageType_Error, QString("<p>%1:</p>%2").arg(tr("Failed to find the following help file")).arg(strFileLocation));
-}
-
-void UIMessageCenter::cannotEnumerateHostUSBDevices(const CHost &comHost, QWidget *pParent  /* = 0 */) const
-{
-    QString strHelpKeyword;
-    /* Refer users to manual's trouble shooting section depending on the host platform: */
-#if defined(RT_OS_LINUX)
-    strHelpKeyword = "ts_usb-linux";
-#elif defined(RT_OS_WINDOWS)
-    strHelpKeyword = "ts_win-guests";
-#elif defined(RT_OS_SOLARIS)
-    strHelpKeyword = "ts_sol-guests";
-#elif defined(RT_OS_DARWIN)
-#endif
-    error(pParent, MessageType_Warning,
-          tr("Failed to enumerate host USB devices."),
-          UIErrorString::formatErrorInfo(comHost), "USBEnumerationWarning",
-          strHelpKeyword);
 }
 

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

@@ -276 +276 @@
     void cannotAcquireSnapshotParameter(const CSnapshot &comSnapshot, QWidget *pParent = 0) const;
     void cannotFindHelpFile(const QString &strFileLocation) const;
-    void cannotEnumerateHostUSBDevices(const CHost &comHost, QWidget *pParent = 0) const;
 
     /* API: Selector warnings: */

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -709 +709 @@
         return;
     if (comHost.GetUSBDevices().isEmpty() && comHost.isWarning())
-        msgCenter().cannotEnumerateHostUSBDevices(comHost, this);
+        UINotificationMessage::cannotEnumerateHostUSBDevices(comHost);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.cpp

@@ -289 +289 @@
 
 /* static */
+void UINotificationMessage::cannotEnumerateHostUSBDevices(const CHost &comHost)
+{
+    /* Refer users to manual's trouble shooting section depending on the host platform: */
+    QString strHelpKeyword;
+#if defined(RT_OS_LINUX)
+    strHelpKeyword = "ts_usb-linux";
+#elif defined(RT_OS_WINDOWS)
+    strHelpKeyword = "ts_win-guests";
+#elif defined(RT_OS_SOLARIS)
+    strHelpKeyword = "ts_sol-guests";
+#elif defined(RT_OS_DARWIN)
+#endif
+
+    createMessage(
+        QApplication::translate("UIMessageCenter", "Can't enumerate USB devices ..."),
+        QApplication::translate("UIMessageCenter", "Failed to enumerate host USB devices.") +
+        UIErrorString::formatErrorInfo(comHost),
+        QString(),
+        strHelpKeyword);
+}
+
+/* static */
 void UINotificationMessage::cannotOpenMedium(const CVirtualBox &comVBox, const QString &strLocation)
 {

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.h

@@ -127 +127 @@
     static void cannotDetachWebCam(const CEmulatedUSB &comDispatcher,
                                    const QString &strWebCamName, const QString &strMachineName);
+    /** Notifies about inability to enumerate host USB devices.
+      * @param  comHost  Brings the host devices enumerated for. */
+    static void cannotEnumerateHostUSBDevices(const CHost &comHost);
     /** Notifies about inability to open medium.
       * @param  comVBox      Brings common VBox object trying to open medium.

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

@@ -1832 +1832 @@
             /* Do not bitch if there are no filters (check if enabled too?): */
             if (!machine().GetUSBDeviceFilters().GetDeviceFilters().isEmpty())
-                msgCenter().cannotEnumerateHostUSBDevices(comHost, activeMachineWindow());
+                UINotificationMessage::cannotEnumerateHostUSBDevices(comHost);
         }
     }