Changeset 37027 in vbox for trunk

Timestamp:

May 10, 2011 1:12:48 PM (14 years ago)

Author:

vboxsync

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

71642

Message:

FE/Qt: 5668: Refine USB warning. That warning will now only be shown if some issue happens while accessing USB controller but the controller accessible and enabled. Also, that warning will now be using text from Main (duplicated in GUI source code for translation reasons).

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxProblemReporter.cpp (modified) (3 diffs)
• settings/UISettingsDialogSpecific.cpp (modified) (1 diff)

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

@@ -626 +626 @@
         return;
 
-#ifdef RT_OS_LINUX
-    /* xxx There is no macro to turn an error into a warning, but we need
-     *     to do that here. */
-    if (res.rc() == (VBOX_E_HOST_ERROR & ~0x80000000))
-    {
-        message (mainWindowShown(), VBoxProblemReporter::Warning,
-                 tr ("Could not access USB on the host system, because "
-                     "neither the USB file system (usbfs) nor the DBus "
-                     "and hal services are currently available. If you "
-                     "wish to use host USB devices inside guest systems, "
-                     "you must correct this and restart VirtualBox."),
-                 formatErrorInfo (res),
-                 "cannotAccessUSB" /* aAutoConfirmId */);
-        return;
-    }
-#endif
     message (mainWindowShown(), res.isWarning() ? Warning : Error,
              tr ("Failed to access the USB subsystem."),
@@ -2956 +2940 @@
     connect(this, SIGNAL(sigRemindAboutUnsupportedUSB2(const QString&, QWidget*)),
             this, SLOT(sltRemindAboutUnsupportedUSB2(const QString&, QWidget*)), Qt::QueuedConnection);
+
+    /* Translations for Main.
+     * Please make sure they corresponds to the strings coming from Main one-by-one symbol! */
+    tr("Could not load the Host USB Proxy Service (VERR_FILE_NOT_FOUND). The service might not be installed on the host computer");
+    tr("VirtualBox is not currently allowed to access USB devices.  You can change this by adding your user to the 'vboxusers' group.  Please see the user manual for a more detailed explanation");
+    tr("VirtualBox is not currently allowed to access USB devices.  You can change this by allowing your user to access the 'usbfs' folder and files.  Please see the user manual for a more detailed explanation");
+    tr("The USB Proxy Service has not yet been ported to this host");
+    tr("Could not load the Host USB Proxy service");
 }
 
@@ -2973 +2965 @@
     QString formatted;
 
-    if (!aInfo.text().isEmpty())
-        formatted += QString ("<p>%1.</p>").arg (vboxGlobal().emphasize (aInfo.text()));
+    /* Check if details text is NOT empty: */
+    QString strDetailsInfo = aInfo.text();
+    if (!strDetailsInfo.isEmpty())
+    {
+        /* Check if details text written in English (latin1) and translated: */
+        if (strDetailsInfo == QString::fromLatin1(strDetailsInfo.toLatin1()) &&
+            strDetailsInfo != tr(strDetailsInfo.toLatin1().constData()))
+            formatted += QString("<p>%1.</p>").arg(vboxGlobal().emphasize(tr(strDetailsInfo.toLatin1().constData())));
+        else
+            formatted += QString("<p>%1.</p>").arg(vboxGlobal().emphasize(strDetailsInfo));
+    }
 
     formatted += "<!--EOM--><table bgcolor=#EEEEEE border=0 cellspacing=0 "

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp

@@ -1022 +1022 @@
             CUSBController controller = m_machine.GetUSBController();
             /* Show the machine error message if any: */
-            if (!m_machine.isReallyOk())
+            if (!m_machine.isReallyOk() && !controller.isNull() && controller.GetEnabled())
                 vboxProblem().cannotAccessUSB(m_machine);
             /* Check if USB is implemented: */