Changeset 45346 in vbox for trunk/src/VBox

Timestamp:

Apr 4, 2013 5:51:15 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Message-center: VM settings stuff: Get rid of some annoying async warning.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -2476 +2476 @@
 void UIMessageCenter::remindAboutUnsupportedUSB2(const QString &strExtPackName, QWidget *pParent)
 {
-    emit sigRemindAboutUnsupportedUSB2(strExtPackName, pParent);
+    if (warningShown("remindAboutUnsupportedUSB2"))
+        return;
+    setWarningShown("remindAboutUnsupportedUSB2", true);
+
+    message(pParent ? pParent : mainMachineWindowShown(), MessageType_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));
+
+    setWarningShown("remindAboutUnsupportedUSB2", false);
 }
 
@@ -2606 +2618 @@
 }
 
-void UIMessageCenter::sltRemindAboutUnsupportedUSB2(const QString &strExtPackName, QWidget *pParent)
-{
-    if (warningShown("sltRemindAboutUnsupportedUSB2"))
-        return;
-    setWarningShown("sltRemindAboutUnsupportedUSB2", true);
-
-    message(pParent ? pParent : mainMachineWindowShown(), MessageType_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));
-
-    setWarningShown("sltRemindAboutUnsupportedUSB2", false);
-}
-
 UIMessageCenter::UIMessageCenter()
 {
@@ -2651 +2646 @@
     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);
 
     /* Translations for Main.

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

@@ -67 +67 @@
     /* Notifiers: Synchronization stuff: */
     void sigRemindAboutWrongColorDepth(ulong uRealBPP, ulong uWantedBPP);
-    void sigRemindAboutUnsupportedUSB2(const QString &strExtPackName, QWidget *pParent);
 
 public:
@@ -413 +412 @@
     /* Handlers: Synchronization stuff: */
     void sltRemindAboutWrongColorDepth(ulong uRealBPP, ulong uWantedBPP);
-    void sltRemindAboutUnsupportedUSB2(const QString &strExtPackName, QWidget *pParent);
 
 private:

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

@@ -574 +574 @@
                             .arg(GUI_ExtPackName);
         msgCenter().remindAboutUnsupportedUSB2(GUI_ExtPackName, this);
+        mCbUSB2->setChecked(false);
         return true;
     }