Changeset 47510 in vbox

Timestamp:

Aug 1, 2013 2:13:16 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Message & Popup centers small cleanup.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxFBOverlay.cpp (modified) (2 diffs)
• globals/UIMessageCenter.cpp (modified) (5 diffs)
• globals/UIMessageCenter.h (modified) (4 diffs)
• globals/UIPopupCenter.cpp (modified) (5 diffs)
• globals/UIPopupCenter.h (modified) (1 diff)
• runtime/UIFrameBufferQImage.cpp (modified) (1 diff)
• runtime/UIFrameBufferQuartz2D.cpp (modified) (1 diff)

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

@@ -31 +31 @@
 #include "VBoxFBOverlay.h"
 #include "UIMessageCenter.h"
+#include "UIPopupCenter.h"
 #include "VBoxGlobal.h"
 
@@ -3922 +3923 @@
 
     if (remind)
-        msgCenter().remindAboutWrongColorDepth(size.bitsPerPixel(), 32);
+        popupCenter().remindAboutWrongColorDepth(vboxGlobal().activeMachineWindow(), size.bitsPerPixel(), 32);
+    else
+        popupCenter().forgetAboutWrongColorDepth(vboxGlobal().activeMachineWindow());
 }
 

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

@@ -1766 +1766 @@
 }
 
-void UIMessageCenter::cannotSendACPIToMachine() const
-{
-    alert(0,  MessageType_Warning,
-          tr("You are trying to shut down the guest with the ACPI power button. "
-             "This is currently not possible because the guest does not support software shutdown."));
-}
-
 bool UIMessageCenter::confirmInputCapture(bool &fAutoConfirmed) const
 {
@@ -1796 +1789 @@
     /* True if "Ok" was pressed: */
     return (rc & AlertButtonMask) == AlertButton_Ok;
-}
-
-void UIMessageCenter::remindAboutAutoCapture() const
-{
-    alert(0, MessageType_Info,
-          tr("<p>You have the <b>Auto capture keyboard</b> option turned on. "
-             "This will cause the Virtual Machine to automatically <b>capture</b> "
-             "the keyboard every time the VM window is activated and make it "
-             "unavailable to other applications running on your host machine: "
-             "when the keyboard is captured, all keystrokes (including system ones "
-             "like Alt-Tab) will be directed to the VM.</p>"
-             "<p>You can press the <b>host key</b> at any time to <b>uncapture</b> the "
-             "keyboard and mouse (if it is captured) and return them to normal "
-             "operation. The currently assigned host key is shown on the status bar "
-             "at the bottom of the Virtual Machine window, next to the&nbsp;"
-             "<img src=:/hostkey_16px.png/>&nbsp;icon. This icon, together "
-             "with the mouse icon placed nearby, indicate the current keyboard "
-             "and mouse capture state.</p>") +
-          tr("<p>The host key is currently defined as <b>%1</b>.</p>",
-             "additional message box paragraph")
-             .arg(UIHostCombo::toReadableString(vboxGlobal().settings().hostCombo())),
-          "remindAboutAutoCapture");
-}
-
-void UIMessageCenter::remindAboutMouseIntegration(bool fSupportsAbsolute) const
-{
-    if (warningShown("remindAboutMouseIntegration"))
-        return;
-    setWarningShown("remindAboutMouseIntegration", true);
-
-    /* Show one of warnings, do not close outdated, not possible in current archi: */
-    static const char *kNames [2] =
-    {
-        "remindAboutMouseIntegrationOff",
-        "remindAboutMouseIntegrationOn"
-    };
-    if (fSupportsAbsolute)
-    {
-        alert(0, MessageType_Info,
-              tr("<p>The Virtual Machine reports that the guest OS supports <b>mouse pointer integration</b>. "
-                 "This means that you do not need to <i>capture</i> the mouse pointer to be able to use it in your guest OS -- "
-                 "all mouse actions you perform when the mouse pointer is over the Virtual Machine's display "
-                 "are directly sent to the guest OS. If the mouse is currently captured, it will be automatically uncaptured.</p>"
-                 "<p>The mouse icon on the status bar will look like&nbsp;<img src=:/mouse_seamless_16px.png/>&nbsp;to inform you "
-                 "that mouse pointer integration is supported by the guest OS and is currently turned on.</p>"
-                 "<p><b>Note</b>: Some applications may behave incorrectly in mouse pointer integration mode. "
-                 "You can always disable it for the current session (and enable it again) "
-                 "by selecting the corresponding action from the menu bar.</p>"),
-              kNames [1] /* auto-confirm id */);
-    }
-    else
-    {
-        alert(0, MessageType_Info,
-              tr("<p>The Virtual Machine reports that the guest OS does not support <b>mouse pointer integration</b> "
-                 "in the current video mode. You need to capture the mouse (by clicking over the VM display "
-                 "or pressing the host key) in order to use the mouse inside the guest OS.</p>"),
-              kNames [0] /* auto-confirm id */);
-    }
-
-    setWarningShown("remindAboutMouseIntegration", false);
-}
-
-void UIMessageCenter::remindAboutPausedVMInput() const
-{
-    alert(0, MessageType_Info,
-          tr("<p>The Virtual Machine is currently in the <b>Paused</b> state and "
-             "not able to see any keyboard or mouse input. If you want to "
-             "continue to work inside the VM, you need to resume it by selecting the "
-             "corresponding action from the menu bar.</p>"),
-             "remindAboutPausedVMInput");
 }
 
@@ -2479 +2402 @@
 }
 
-void UIMessageCenter::remindAboutWrongColorDepth(ulong uRealBPP, ulong uWantedBPP) const
-{
-    emit sigRemindAboutWrongColorDepth(uRealBPP, uWantedBPP);
-}
-
 void UIMessageCenter::sltShowHelpWebDialog()
 {
@@ -2582 +2500 @@
 }
 
-void UIMessageCenter::sltRemindAboutWrongColorDepth(ulong uRealBPP, ulong uWantedBPP) const
-{
-    alert(0, MessageType_Info,
-          tr("<p>The virtual machine window is optimized to work in "
-             "<b>%1&nbsp;bit</b> color mode but the "
-             "virtual display is currently set to <b>%2&nbsp;bit</b>.</p>"
-             "<p>Please open the display properties dialog of the guest OS and "
-             "select a <b>%3&nbsp;bit</b> color mode, if it is available, for "
-             "best possible performance of the virtual video subsystem.</p>"
-             "<p><b>Note</b>. Some operating systems, like OS/2, may actually "
-             "work in 32&nbsp;bit mode but report it as 24&nbsp;bit "
-             "(16 million colors). You may try to select a different color "
-             "mode to see if this message disappears or you can simply "
-             "disable the message now if you are sure the required color "
-             "mode (%4&nbsp;bit) is not available in the guest OS.</p>")
-             .arg(uWantedBPP).arg(uRealBPP).arg(uWantedBPP).arg(uWantedBPP),
-          "remindAboutWrongColorDepth");
-}
-
 UIMessageCenter::UIMessageCenter()
 {
@@ -2638 +2537 @@
             Qt::BlockingQueuedConnection);
 
-    /* Prepare synchronization connection: */
-    connect(this, SIGNAL(sigRemindAboutWrongColorDepth(ulong, ulong)),
-            this, SLOT(sltRemindAboutWrongColorDepth(ulong, ulong)), Qt::QueuedConnection);
-
     /* Translations for Main.
      * Please make sure they corresponds to the strings coming from Main one-by-one symbol! */

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

@@ -63 +63 @@
                              const QString &strButtonText1, const QString &strButtonText2, const QString &strButtonText3,
                              const QString &strAutoConfirmId) const;
-
-    /* Notifiers: Synchronization stuff: */
-    void sigRemindAboutWrongColorDepth(ulong uRealBPP, ulong uWantedBPP) const;
 
 public:
@@ -282 +279 @@
     void cannotStartMachine(const CConsole &console, const QString &strName) const;
     void cannotStartMachine(const CProgress &progress, const QString &strName) const;
-    void cannotSendACPIToMachine() const;
     bool confirmInputCapture(bool &fAutoConfirmed) const;
-    void remindAboutAutoCapture() const;
-    void remindAboutMouseIntegration(bool fSupportsAbsolute) const;
-    void remindAboutPausedVMInput() const;
     bool confirmGoingFullscreen(const QString &strHotKey) const;
     bool confirmGoingSeamless(const QString &strHotKey) const;
@@ -358 +351 @@
     static QString formatErrorInfo(const COMResult &rc);
 
-    /* API: Async stuff: */
-    void remindAboutWrongColorDepth(ulong uRealBPP, ulong uWantedBPP) const;
-
 public slots:
 
@@ -379 +369 @@
                            const QString &strAutoConfirmId) const;
 
-    /* Handlers: Synchronization stuff: */
-    void sltRemindAboutWrongColorDepth(ulong uRealBPP, ulong uWantedBPP) const;
-
 private:
 

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

@@ -173 +173 @@
                                   bool fProposeAutoConfirmation)
 {
+    /* Make sure parent is set! */
+    AssertMsg(pParent, ("Parent is NULL!"));
+    if (!pParent)
+        return;
+
     /* Make sure at least one button is valid: */
     if (iButton1 == 0 && iButton2 == 0)
@@ -196 +201 @@
     }
 
-    /* Make sure parent is set! */
-    AssertMsg(pParent, ("Parent is NULL!"));
-    if (!pParent)
-        return;
-
     /* Looking for the corresponding popup-stack: */
     const QString strPopupStackID(popupStackID(pParent));
@@ -442 +442 @@
 void UIPopupCenter::cannotSendACPIToMachine(QWidget *pParent)
 {
-    alert(pParent,  "cannotSendACPIToMachine",
+    alert(pParent, "cannotSendACPIToMachine",
           QApplication::translate("UIMessageCenter", "You are trying to shut down the guest with the ACPI power button. "
                                                      "This is currently not possible because the guest does not support software shutdown."));
@@ -504 +504 @@
 }
 
-void UIPopupCenter::remindAboutGuestAdditionsAreNotActive(QWidget *pParent)
-{
-    alert(pParent, "remindAboutGuestAdditionsAreNotActive",
-          QApplication::translate("UIMessageCenter", "<p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, "
-                                                     "and shared folders cannot be used without them. To use shared folders inside the virtual machine, "
-                                                     "please install the Guest Additions if they are not installed, or re-install them if they are "
-                                                     "not working correctly, by selecting <b>Install Guest Additions</b> from the <b>Devices</b> menu. "
-                                                     "If they are installed but the machine is not yet fully started then shared folders will be available once it is.</p>"),
-          true);
-}
-
-void UIPopupCenter::updatePopupAboutWrongColorDepth(QWidget *pParent, ulong uRealBPP, ulong uWantedBPP)
+void UIPopupCenter::remindAboutWrongColorDepth(QWidget *pParent, ulong uRealBPP, ulong uWantedBPP)
 {
     alert(pParent, "remindAboutWrongColorDepth",
@@ -530 +519 @@
 }
 
-void UIPopupCenter::recallPopupAboutWrongColorDepth(QWidget *pParent)
+void UIPopupCenter::forgetAboutWrongColorDepth(QWidget *pParent)
 {
     recall(pParent, "remindAboutWrongColorDepth");

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

@@ -104 +104 @@
     void remindAboutMouseIntegration(QWidget *pParent, bool fSupportsAbsolute);
     void remindAboutPausedVMInput(QWidget *pParent);
-    void remindAboutGuestAdditionsAreNotActive(QWidget *pParent);
-    void updatePopupAboutWrongColorDepth(QWidget *pParent, ulong uRealBPP, ulong uWantedBPP);
-    void recallPopupAboutWrongColorDepth(QWidget *pParent);
+    void remindAboutWrongColorDepth(QWidget *pParent, ulong uRealBPP, ulong uWantedBPP);
+    void forgetAboutWrongColorDepth(QWidget *pParent);
 
 private slots:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQImage.cpp

@@ -141 +141 @@
     /* Remind if requested: */
     if (bRemind)
-        popupCenter().updatePopupAboutWrongColorDepth(m_pMachineView->machineWindow(),
+        popupCenter().remindAboutWrongColorDepth(m_pMachineView->machineWindow(),
                                                       pEvent->bitsPerPixel(), 32);
     else
-        popupCenter().recallPopupAboutWrongColorDepth(m_pMachineView->machineWindow());
+        popupCenter().forgetAboutWrongColorDepth(m_pMachineView->machineWindow());
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQuartz2D.cpp

@@ -211 +211 @@
 
     if (remind)
-        popupCenter().updatePopupAboutWrongColorDepth(m_pMachineView->machineWindow(),
+        popupCenter().remindAboutWrongColorDepth(m_pMachineView->machineWindow(),
                                                       aEvent->bitsPerPixel(), 32);
     else
-        popupCenter().recallPopupAboutWrongColorDepth(m_pMachineView->machineWindow());
+        popupCenter().forgetAboutWrongColorDepth(m_pMachineView->machineWindow());
 }