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

Timestamp:

Mar 24, 2011 11:43:18 AM (14 years ago)

Author:

vboxsync

Message:

FE/Qt: 5605: Display the GUI warning in VM settings if USB 2.0 option is enabled but extension pack isn't installed.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxProblemReporter.cpp (modified) (3 diffs)
• globals/VBoxProblemReporter.h (modified) (3 diffs)
• settings/machine/UIMachineSettingsUSB.cpp (modified) (3 diffs)
• settings/machine/UIMachineSettingsUSB.h (modified) (1 diff)

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

@@ -2658 +2658 @@
 }
 
+void VBoxProblemReporter::remindAboutUnsupportedUSB2(const QString &strExtPackName, QWidget *pParent)
+{
+    emit sigRemindAboutUnsupportedUSB2(strExtPackName, pParent);
+}
+
 void VBoxProblemReporter::showHelpWebDialog()
 {
@@ -2888 +2893 @@
                .arg(uWantedBPP).arg(uRealBPP).arg(uWantedBPP).arg(uWantedBPP),
             kName);
+}
+
+void VBoxProblemReporter::sltRemindAboutUnsupportedUSB2(const QString &strExtPackName, QWidget *pParent)
+{
+    if (isAlreadyShown("sltRemindAboutUnsupportedUSB2"))
+        return;
+    setShownStatus("sltRemindAboutUnsupportedUSB2");
+
+    message(pParent ? pParent : mainMachineWindowShown(), Warning,
+            tr("<p>USB 2.0 is currently enabled for this virtual machine. "
+               "However this requires the <b><nobr>%1</nobr></b> to be installed.</p>"
+               "<p>Please install the Extension Pack from the VirtualBox download site. "
+               "After this you will be able to re-enable USB 2.0. "
+               "It will be disabled in the meantime unless you cancel the current settings changes.</p>")
+               .arg(strExtPackName));
+
+    clearShownStatus("sltRemindAboutUnsupportedUSB2");
 }
 
@@ -2931 +2953 @@
     connect(this, SIGNAL(sigRemindAboutWrongColorDepth(ulong, ulong)),
             this, SLOT(sltRemindAboutWrongColorDepth(ulong, ulong)), Qt::QueuedConnection);
+    connect(this, SIGNAL(sigRemindAboutUnsupportedUSB2(const QString&, QWidget*)),
+            this, SLOT(sltRemindAboutUnsupportedUSB2(const QString&, QWidget*)), Qt::QueuedConnection);
 }
 

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

@@ -411 +411 @@
                                   const QString &strPath, QWidget *pParent = 0);
     void remindAboutWrongColorDepth(ulong uRealBPP, ulong uWantedBPP);
+    void remindAboutUnsupportedUSB2(const QString &strExtPackName, QWidget *pParent = 0);
 
 signals:
@@ -433 +434 @@
                                      const QString &strPath, QWidget *pParent);
     void sigRemindAboutWrongColorDepth(ulong uRealBPP, ulong uWantedBPP);
+    void sigRemindAboutUnsupportedUSB2(const QString &strExtPackName, QWidget *pParent);
 
 public slots:
@@ -460 +462 @@
                                      const QString &strPath, QWidget *pParent);
     void sltRemindAboutWrongColorDepth(ulong uRealBPP, ulong uWantedBPP);
+    void sltRemindAboutUnsupportedUSB2(const QString &strExtPackName, QWidget *pParent);
 
 private:

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

@@ -22 +22 @@
 #include "UIIconPool.h"
 #include "VBoxGlobal.h"
+#include "VBoxProblemReporter.h"
 #include "UIToolBar.h"
 #include "UIMachineSettingsUSB.h"
@@ -280 +281 @@
         {
             /* Gather internal variables data from QWidget(s): */
+            /* USB 1.0 (OHCI): */
             m_cache.m_fUSBEnabled = mGbUSB->isChecked();
-            m_cache.m_fEHCIEnabled = mCbUSB2->isChecked();
+            /* USB 2.0 (EHCI): */
+            QString strExtPackName = "Oracle VM VirtualBox Extension Pack";
+            CExtPack extPack = vboxGlobal().virtualBox().GetExtensionPackManager().Find(strExtPackName);
+            m_cache.m_fEHCIEnabled = extPack.isNull() ? false : mCbUSB2->isChecked();
             break;
         }
@@ -408 +413 @@
     mValidator = aVal;
     connect (mGbUSB, SIGNAL (stateChanged (int)), mValidator, SLOT (revalidate()));
+    connect(mCbUSB2, SIGNAL(stateChanged(int)), mValidator, SLOT(revalidate()));
+}
+
+bool UIMachineSettingsUSB::revalidate(QString &strWarningText, QString& /* strTitle */)
+{
+    /* USB 2.0 Extension Pack presence test: */
+    QString strExtPackName = "Oracle VM VirtualBox Extension Pack";
+    CExtPack extPack = vboxGlobal().virtualBox().GetExtensionPackManager().Find(strExtPackName);
+    if (mCbUSB2->isChecked() && extPack.isNull())
+    {
+        strWarningText = tr("USB 2.0 is currently enabled for this virtual machine. "
+                            "However this requires the <b>%1</b> to be installed. "
+                            "Please install the Extension Pack from the VirtualBox download site. "
+                            "After this you will be able to re-enable USB 2.0. "
+                            "It will be disabled in the meantime unless you cancel the current settings changes.")
+                            .arg(strExtPackName);
+        vboxProblem().remindAboutUnsupportedUSB2(strExtPackName, this);
+        return true;
+    }
+    return true;
 }
 

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

@@ -91 +91 @@
 
     void setValidator (QIWidgetValidator *aVal);
+    bool revalidate(QString &strWarningText, QString &strTitle);
 
     void setOrderAfter (QWidget *aWidget);