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

Timestamp:

Feb 9, 2007 4:21:36 PM (18 years ago)

Author:

vboxsync

Message:

Main:

• Return E_NOTIMPL for global USB filters and all other stuff when no VBOX_WITH_USB is defined (as in OSE).
• Moved the USB Proxy Service check to Host to make it reusable both for global-related USB methods and for VM-related methods.

FE/Qt:

• Don't show Global USB UI when USB is not available.
• Show the "USB Proxy Service is unavailable" message box when opening both global and VM settings.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxProblemReporter.h (modified) (2 diffs)
• src/VBoxProblemReporter.cpp (modified) (2 diffs)
• ui/VBoxGlobalSettingsDlg.ui (modified) (1 diff)
• ui/VBoxGlobalSettingsDlg.ui.h (modified) (4 diffs)
• ui/VBoxVMSettingsDlg.ui.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxProblemReporter.h

@@ -102 +102 @@
     void cannotSaveGlobalConfig (const CVirtualBox &vbox);
     void cannotSetSystemProperties (const CSystemProperties &props);
+    void cannotAccessUSB (const COMBase &obj);
 
     void cannotCreateMachine (const CVirtualBox &vbox,
@@ -113 +114 @@
                                     bool strict = true,
                                     QWidget *parent = 0);
-    void cannotGetUSBController (const CMachine &machine);
 
     void cannotStartMachine (const CConsole &console);

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

@@ -491 +491 @@
 }
 
+void VBoxProblemReporter::cannotAccessUSB (const COMBase &obj)
+{
+    /* if there is no error info available, it should mean that
+     * IMachine::GetUSBController(), IHost::GetUSBDevices() etc. just returned
+     * E_NOTIMPL, as for the OSE version. Don't show the error message in this
+     * case since it's normal. */
+    COMErrorInfo errInfo = obj.errorInfo();
+    if (obj.lastRC() == E_NOTIMPL && !errInfo.isBasicAvailable())
+        return;
+
+    message (mainWindowShown(), Error,
+             tr ("Failed to access the USB subsystem."),
+             formatErrorInfo (errInfo),
+             "cannotAccessUSB");
+}
+
 void VBoxProblemReporter::cannotCreateMachine (const CVirtualBox &vbox,
                                                QWidget *parent /* = 0 */)
@@ -555 +571 @@
                  .arg (machine.GetName()),
              formatErrorInfo (errInfo));
-}
-
-void VBoxProblemReporter::cannotGetUSBController (const CMachine &machine)
-{
-    /* if there is no error info available, it should mean that
-     * IMachine::GetUSBController returned just E_NOTIMPL, as for the OSE
-     * version. Don't show the error message in this case since it's normal. */
-    COMErrorInfo errInfo = machine.errorInfo();
-    if (machine.lastRC() == E_NOTIMPL && !errInfo.isBasicAvailable())
-        return;
-
-    message (mainWindowShown(), Error,
-             tr ("Failed to access the USB controller of the virtual "
-                 "machine <b>%1</b>.")
-                 .arg (machine.GetName()),
-             formatErrorInfo (errInfo),
-             "cannotGetUSBController");
 }
 

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

@@ -1022 +1022 @@
     <include location="local" impldecl="in implementation">VBoxUtils.h</include>
     <include location="local" impldecl="in implementation">VBoxGlobal.h</include>
+    <include location="local" impldecl="in implementation">VBoxProblemReporter.h</include>
     <include location="local" impldecl="in implementation">VBoxUSBFilterSettings.h</include>
 </includes>

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

@@ -126 +126 @@
                                      6 /* seems that RichText adds some margin */ +
                                      whatsThisLabel->fontMetrics().width ('m') * 40);
-    
+
     /*
      *  create and layout non-standard widgets
@@ -215 +215 @@
     if (!object->isWidgetType())
         return QDialog::eventFilter (object, event);
-    
+
     QWidget *widget = static_cast <QWidget *> (object);
     if (widget->topLevelWidget() != this)
@@ -332 +332 @@
 
     CHost host = vboxGlobal().virtualBox().GetHost();
-    CHostUSBDeviceFilterEnumerator en = host.GetUSBDeviceFilters().Enumerate();
-    while (en.HasMore())
-    {
-        CHostUSBDeviceFilter hostFilter = en.GetNext();
-        CUSBDeviceFilter filter = CUnknown (hostFilter);
-        addUSBFilter (filter, false);
-    }
-    lvUSBFilters->setCurrentItem (lvUSBFilters->firstChild());
-    lvUSBFilters_currentChanged (lvUSBFilters->firstChild());
-
-//    wvalXXXX->revalidate();
+    CHostUSBDeviceFilterCollection coll = host.GetUSBDeviceFilters();
+    if (coll.isNull())
+    {
+        /* disable the USB host filters category if the USB is
+         * not available (i.e. in VirtualBox OSE) */
+
+        QListViewItem *usbItem = listView->findItem ("#usb", listView_Link);
+        Assert (usbItem);
+        usbItem->setVisible (false);
+
+        /* disable validators if any */
+        pageUSB->setEnabled (false);
+        
+        /* Show an error message (if there is any).
+         * This message box may be suppressed if the user wishes so. */
+        vboxProblem().cannotAccessUSB (host);
+    }
+    else
+    {
+        CHostUSBDeviceFilterEnumerator en = coll.Enumerate();
+        while (en.HasMore())
+        {
+            CHostUSBDeviceFilter hostFilter = en.GetNext();
+            CUSBDeviceFilter filter = CUnknown (hostFilter);
+            addUSBFilter (filter, false);
+        }
+        lvUSBFilters->setCurrentItem (lvUSBFilters->firstChild());
+        lvUSBFilters_currentChanged (lvUSBFilters->firstChild());
+    }
 }
 
@@ -440 +458 @@
     if (!warning.isEmpty())
         warningString = QString ("<font color=red>%1</font>").arg (warning);
-    
+
     if (!warningString.isEmpty())
         whatsThisLabel->setText (warningString);

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

@@ -1242 +1242 @@
             pageUSB->setEnabled (false);
 
-            /* If machine has something to say, show the message.
+            /* Show an error message (if there is any).
              * Note that we don't use the generic cannotLoadMachineSettings()
              * call here because we want this message to be suppressable. */
-            vboxProblem().cannotGetUSBController (machine);
+            vboxProblem().cannotAccessUSB (machine);
         }
         else