Changeset 45267 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Apr 1, 2013 10:06:23 AM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Message-center cleanup (part 7): Moving some code into appropriate place.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (2 diffs)
• globals/UIMessageCenter.h (modified) (1 diff)
• globals/VBoxGlobal.cpp (modified) (1 diff)
• globals/VBoxGlobal.h (modified) (1 diff)
• main.cpp (modified) (1 diff)

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

@@ -327 +327 @@
 }
 
+#ifdef RT_OS_LINUX
+void UIMessageCenter::warnAboutWrongUSBMounted()
+{
+    message(mainWindowShown(), MessageType_Warning,
+            tr("You seem to have the USBFS filesystem mounted at /sys/bus/usb/drivers. "
+               "We strongly recommend that you change this, as it is a severe mis-configuration of "
+               "your system which could cause USB devices to fail in unexpected ways."),
+            "checkForMountedWrongUSB");
+}
+#endif /* RT_OS_LINUX */
+
+void UIMessageCenter::cannotRunInSelectorMode()
+{
+    message(mainWindowShown(), MessageType_Critical,
+        tr("<p>Cannot run VirtualBox in <i>VM Selector</i> "
+           "mode due to local restrictions.</p>"
+           "<p>The application will now terminate.</p>"));
+}
+
 void UIMessageCenter::showBETAWarning()
 {
@@ -342 +361 @@
              "This version is not suitable for production use."));
 }
-
-void UIMessageCenter::cannotRunInSelectorMode()
-{
-    message(mainWindowShown(), MessageType_Critical,
-        tr("<p>Cannot run VirtualBox in <i>VM Selector</i> "
-           "mode due to local restrictions.</p>"
-           "<p>The application will now terminate.</p>"));
-}
-
-#ifdef RT_OS_LINUX
-void UIMessageCenter::checkForMountedWrongUSB()
-{
-    QFile file("/proc/mounts");
-    if (file.exists() && file.open(QIODevice::ReadOnly | QIODevice::Text))
-    {
-        QStringList contents;
-        for (;;)
-        {
-            QByteArray line = file.readLine();
-            if (line.isEmpty())
-                break;
-            contents << line;
-        }
-        QStringList grep1(contents.filter("/sys/bus/usb/drivers"));
-        QStringList grep2(grep1.filter("usbfs"));
-        if (!grep2.isEmpty())
-            message(mainWindowShown(), MessageType_Warning,
-                     tr("You seem to have the USBFS filesystem mounted at /sys/bus/usb/drivers. "
-                         "We strongly recommend that you change this, as it is a severe mis-configuration of "
-                         "your system which could cause USB devices to fail in unexpected ways."),
-                     "checkForMountedWrongUSB");
-    }
-}
-#endif /* RT_OS_LINUX */
 
 void UIMessageCenter::cannotInitCOM(HRESULT rc)

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

@@ -190 +190 @@
     bool askForOverridingFilesIfExists(const QVector<QString>& strPaths, QWidget *pParent = NULL);
 
-    /* API: Beta warnings: */
+    /* API: Main (startup) warnings: */
+#ifdef RT_OS_LINUX
+    void warnAboutWrongUSBMounted();
+#endif /* RT_OS_LINUX */
+    void cannotRunInSelectorMode();
     void showBETAWarning();
     void showBEBWarning();
-
-    /* API: Common startup warnings: */
-    void cannotRunInSelectorMode();
-#ifdef RT_OS_LINUX
-    void checkForMountedWrongUSB();
-#endif /* RT_OS_LINUX */
 
     /* API: COM startup warnings: */

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

@@ -3946 +3946 @@
     return !isApprovedByExtraData(machine, GUI_HideDetails);
 }
+
+#ifdef RT_OS_LINUX
+/* static */
+void VBoxGlobal::checkForWrongUSBMounted()
+{
+    /* Make sure '/proc/mounts' exists and can be opened: */
+    QFile file("/proc/mounts");
+    if (!file.exists() || !file.open(QIODevice::ReadOnly | QIODevice::Text))
+        return;
+
+    /* Fetch contents: */
+    QStringList contents;
+    for (;;)
+    {
+        QByteArray line = file.readLine();
+        if (line.isEmpty())
+            break;
+        contents << line;
+    }
+    /* Grep contents for usbfs presence: */
+    QStringList grep1(contents.filter("/sys/bus/usb/drivers"));
+    QStringList grep2(grep1.filter("usbfs"));
+    if (grep2.isEmpty())
+        return;
+
+    /* Show corresponding warning: */
+    msgCenter().warnAboutWrongUSBMounted();
+}
+#endif /* RT_OS_LINUX */
 
 // Public slots

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

@@ -396 +396 @@
     static bool shouldWeShowDetails(CMachine &machine,
                                     bool fIncludingMachineGeneralCheck = false);
+
+#ifdef RT_OS_LINUX
+    static void checkForWrongUSBMounted();
+#endif /* RT_OS_LINUX */
 
 signals:

trunk/src/VBox/Frontends/VirtualBox/src/main.cpp

@@ -473 +473 @@
 
 #ifdef RT_OS_LINUX
-            msgCenter().checkForMountedWrongUSB();
+            /* Make sure no wrong USB mounted: */
+            VBoxGlobal::checkForWrongUSBMounted();
 #endif /* RT_OS_LINUX */