Changeset 5803 in vbox for trunk/src/VBox

Timestamp:

Nov 20, 2007 1:55:28 PM (17 years ago)

Author:

vboxsync

Message:

FE/Qt: Improved most reminder messages (capture input, go fullscreen etc) so that the action they represent can be canceled now; Fixed tiny problem reporter's regressions.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxConsoleView.h (modified) (2 diffs)
• include/VBoxConsoleWnd.h (modified) (1 diff)
• include/VBoxProblemReporter.h (modified) (3 diffs)
• src/VBoxConsoleView.cpp (modified) (6 diffs)
• src/VBoxConsoleWnd.cpp (modified) (6 diffs)
• src/VBoxDownloaderWgt.cpp (modified) (2 diffs)
• src/VBoxProblemReporter.cpp (modified) (16 diffs)
• ui/VBoxNewVMWzd.ui.h (modified) (1 diff)

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

@@ -208 +208 @@
     QPoint captured_pos;
 
+        bool mDisableAutoCapture : 1;
+
     enum { IsKeyPressed = 0x01, IsExtKeyPressed = 0x02, IsKbdCaptured = 0x80 };
     uint8_t mPressedKeys [128];
@@ -214 +216 @@
     bool mIsHostkeyPressed : 1;
     bool mIsHostkeyAlone : 1;
+
     /** kbd_captured value during the the last host key press or release */
     bool hostkey_in_capture : 1;

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

@@ -117 +117 @@
     void updateAppearanceOf (int element);
 
-    void toggleFullscreenMode (bool, bool);
+    bool toggleFullscreenMode (bool, bool);
 
 private slots:

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

@@ -242 +242 @@
     void cannotDownloadGuestAdditions (const QString &aURL,
                                        const QString &aReason);
-    int confirmDownloadAdditions (const QString &aURL, ulong aSize);
-    int confirmMountAdditions (const QString &aURL, const QString &aSrc);
+    bool confirmDownloadAdditions (const QString &aURL, ulong aSize);
+    bool confirmMountAdditions (const QString &aURL, const QString &aSrc);
     void warnAboutTooOldAdditions (QWidget *, const QString &, const QString &);
     void warnAboutOldAdditions (QWidget *, const QString &, const QString &);
@@ -254 +254 @@
                              const QString &aResult);
 
-    bool remindAboutInputCapture();
-    bool remindAboutAutoCapture();
-    bool remindAboutMouseIntegration (bool supportsAbsolute);
+    bool confirmInputCapture();
+    void remindAboutAutoCapture();
+    void remindAboutMouseIntegration (bool aSupportsAbsolute);
     bool remindAboutPausedVMInput();
 
     bool remindAboutInaccessibleMedia();
 
-    void remindAboutGoingFullscreen (const QString &hotKey,
-                                     const QString &hostKey);
-    void remindAboutGoingSeamless (const QString &hotKey,
-                                   const QString &hostKey);
+    bool confirmGoingFullscreen (const QString &aHotKey);
+    bool confirmGoingSeamless (const QString &aHotKey);
 
     void remindAboutWrongColorDepth (ulong aRealBPP, ulong aWantedBPP);
@@ -273 +271 @@
     bool confirmVMReset (QWidget *aParent);
 
-    int remindAboutUnsetHD (QWidget *aParent);
+    bool confirmHardDisklessMachine (QWidget *aParent);
 
     void cannotRunInSelectorMode();

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

@@ -604 +604 @@
     , mouse_absolute (false)
     , mouse_integration (true)
+    , mDisableAutoCapture (false)
     , mIsHostkeyPressed (false)
     , mIsHostkeyAlone (false)
@@ -1935 +1936 @@
 
 /**
- *  Called on every focus change
- *  and also to forcibly capture/uncapture the input in situations similar
- *  to gaining or losing focus.
+ *  Called on every focus change and also to forcibly capture/uncapture the
+ *  input in situations similar to gaining or losing focus.
  *
  *  @param aHasFocus True if the window got focus and false otherwise.
@@ -1946 +1946 @@
     {
 #ifdef RT_OS_WINDOWS
-        if (   gs.autoCapture()
+        if (   !mDisableAutoCapture && gs.autoCapture()
             && GetAncestor (winId(), GA_ROOT) == GetForegroundWindow())
 #else
-        if (gs.autoCapture())
+        if (!mDisableAutoCapture && gs.autoCapture())
 #endif /* RT_OS_WINDOWS */
         {
@@ -2212 +2212 @@
             {
                 mIsHostkeyPressed = false;
+
                 if (mIsHostkeyAlone)
                 {
@@ -2222 +2223 @@
                     {
                         bool captured = kbd_captured;
+                        bool ok = true;
                         if (!captured)
-                            vboxProblem().remindAboutInputCapture();
-                        captureKbd (!captured, false);
-                        if (!(mouse_absolute && mouse_integration))
-                            captureMouse (kbd_captured);
+                        {
+                            /* temporarily disable auto capture that will take
+                             * place after this dialog is dismissed because
+                             * the capture state is to be defined by the
+                             * dialog result itself */
+                            mDisableAutoCapture = true;
+                            ok = vboxProblem().confirmInputCapture();
+                            mDisableAutoCapture = false;
+                        }
+                        if (ok)
+                        {
+                            captureKbd (!captured, false);
+                            if (!(mouse_absolute && mouse_integration))
+                                captureMouse (kbd_captured);
+                        }
                     }
                 }
+
                 if (isRunning())
                     sendChangedKeyStates();
+
                 emitSignal = true;
             }
@@ -2552 +2567 @@
                 else if (isRunning())
                 {
-                    vboxProblem().remindAboutInputCapture();
-                    captureKbd (true);
-                    captureMouse (true);
+                    /* temporarily disable auto capture that will take
+                     * place after this dialog is dismissed because
+                     * the capture state is to be defined by the
+                     * dialog result itself */
+                    mDisableAutoCapture = true;
+                    bool ok = vboxProblem().confirmInputCapture();
+                    mDisableAutoCapture = false;
+                    if (ok)
+                    {
+                        captureKbd (true);
+                        captureMouse (true);
+                    }
                 }
             }

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

@@ -1902 +1902 @@
 }
 
-void VBoxConsoleWnd::toggleFullscreenMode (bool aOn, bool aSeamless)
+/** 
+ * @return @c true if successfully performed the requested operation and false
+ * otherwise.
+ */
+bool VBoxConsoleWnd::toggleFullscreenMode (bool aOn, bool aSeamless)
 {
     if (aSeamless)
     {
-        /* Check if it is necessary to enter/leave seamless mode. */
-        if (aOn && (!mIsSeamlessSupported || mIsFullscreen) ||
-            !aOn && !mIsSeamless)
-            return;
+        /* Check if it is necessary to enter/leave seamless mode. We assert
+         * here because the corresponding actions must be properly disabled by
+         * the below code to give the user an adequate feedback and prevent
+         * from calling this method. */
+        AssertReturn (aOn && mIsSeamlessSupported && !mIsFullscreen ||
+                      !aOn && mIsSeamless,
+                      false);
 
         /* Check if the Guest Video RAM enough for the seamless mode. */
@@ -1927 +1934 @@
                 screen.height(), QColor::numBitPlanes());
             vmSeamlessAction->setOn (false);
-            return;
-        }
-    }
-
-    AssertReturnVoid (console);
-    AssertReturnVoid ((hidden_children.isEmpty() == aOn));
-    if (aSeamless)
-        AssertReturnVoid (mIsSeamless != aOn);
-    else
-        AssertReturnVoid (mIsFullscreen != aOn);
+            return false;
+        }
+    }
+
+    AssertReturn (console, false);
+    AssertReturn ((hidden_children.isEmpty() == aOn), false);
+    AssertReturn (aSeamless && mIsSeamless != aOn ||
+                  !aSeamless && mIsFullscreen != aOn, false);
 
     if (aOn)
@@ -1945 +1950 @@
         hotKey = QStringList::split ('\t', hotKey) [1];
         Assert (!hotKey.isEmpty());
-        /* Get the host key name. */
-        QString hostKey = QIHotKeyEdit::keyName (vboxGlobal().settings()
-                                                             .hostKey());
+
         /* Show the info message. */
-        aSeamless ? vboxProblem().remindAboutGoingSeamless (hotKey, hostKey) :
-                    vboxProblem().remindAboutGoingFullscreen (hotKey, hostKey);
+        bool ok = aSeamless ?
+            vboxProblem().confirmGoingSeamless (hotKey) :
+            vboxProblem().confirmGoingFullscreen (hotKey);
+        if (!ok)
+            return false;
     }
 
@@ -2109 +2115 @@
         console->toggleFSMode();
     }
+
     if (wasHidden)
         hide();
+
+    return true;
 }
 
@@ -2119 +2128 @@
 void VBoxConsoleWnd::vmFullscreen (bool aOn)
 {
-    toggleFullscreenMode (aOn, false);
+    bool ok = toggleFullscreenMode (aOn, false /* aSeamless */);
+    if (!ok)
+    {
+        /* on failure, restore the previous button state */
+        vmFullscreenAction->blockSignals (true);
+        vmFullscreenAction->setOn (!aOn);
+        vmFullscreenAction->blockSignals (false);
+    }
 }
 
 void VBoxConsoleWnd::vmSeamless (bool aOn)
 {
-    toggleFullscreenMode (aOn, true);
+    bool ok = toggleFullscreenMode (aOn, true /* aSeamless */);
+    if (!ok)
+    {
+        /* on failure, restore the previous button state */
+        vmSeamlessAction->blockSignals (true);
+        vmSeamlessAction->setOn (!aOn);
+        vmSeamlessAction->blockSignals (false);
+    }
 }
 
@@ -3074 +3097 @@
  *  at the point of code where it is not expected at all (example:
  *  VBoxConsoleView::mouseEvent() calling
- *  VBoxProblemReporter::remindAboutInputCapture()). Instead, an attempt to
+ *  VBoxProblemReporter::confirmInputCapture()). Instead, an attempt to
  *  close the current modal widget is done and tryClose() is rescheduled for
  *  later execution using a single-shot zero timer.

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

@@ -249 +249 @@
                     //  emit a signal when it is done saving the downloaded file
                     //  (succeeded or failed).
-                    int rc = vboxProblem().confirmMountAdditions (mUrl.toString(),
-                                               QDir::convertSeparators (mTarget));
-                    if (rc == QIMessageBox::Yes)
+                    if (vboxProblem()
+                            .confirmMountAdditions (mUrl.toString(),
+                                                    QDir::convertSeparators (mTarget)))
                         vboxGlobal().consoleWnd().installGuestAdditionsFrom (mTarget);
                     QTimer::singleShot (0, this, SLOT (suicide()));
@@ -350 +350 @@
 
     /* Ask user about GA image downloading */
-    int rc = vboxProblem().confirmDownloadAdditions (mUrl.toString(), aSize);
-    if (rc == QIMessageBox::Yes)
+    if (vboxProblem().confirmDownloadAdditions (mUrl.toString(), aSize))
     {
         mIsChecking = false;

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

@@ -24 +24 @@
 
 #include "VBoxAboutDlg.h"
+
+#include "QIHotKeyEdit.h"
 
 #include <qmessagebox.h>
@@ -1339 +1341 @@
 }
 
-int VBoxProblemReporter::confirmDownloadAdditions (const QString &aURL,
+bool VBoxProblemReporter::confirmDownloadAdditions (const QString &aURL,
                                                    ulong aSize)
 {
@@ -1351 +1353 @@
 }
 
-int VBoxProblemReporter::confirmMountAdditions (const QString &aURL,
+bool VBoxProblemReporter::confirmMountAdditions (const QString &aURL,
                                                 const QString &aSrc)
 {
@@ -1443 +1445 @@
 }
 
-/** @return false if the dialog wasn't actually shown (i.e. it was autoconfirmed) */
-bool VBoxProblemReporter::remindAboutInputCapture()
-{
-    int rc = message (&vboxGlobal().consoleWnd(), Info,
+/**
+ *  @return @c true if the user has confirmed input capture (this is always
+ *  the case if the dialog was autoconfirmed).
+ */
+bool VBoxProblemReporter::confirmInputCapture()
+{
+    return messageOkCancel (&vboxGlobal().consoleWnd(), Info,
         tr ("<p>You have <b>clicked the mouse</b> inside the Virtual Machine display "
             "or pressed the <b>host key</b>. This will cause the Virtual Machine to "
@@ -1461 +1466 @@
             "with the mouse icon placed nearby, indicate the current keyboard "
             "and mouse capture state."
-            "</p>"),
-        "remindAboutInputCapture");
-
-    return !(rc & AutoConfirmed);
-}
-
-/** @return false if the dialog wasn't actually shown (i.e. it was autoconfirmed) */
-bool VBoxProblemReporter::remindAboutAutoCapture()
-{
-    int rc = message ( &vboxGlobal().consoleWnd(), Info,
+            "</p>") +
+        tr ("<p>The host key is currently defined as <b>%1</b>.</p>",
+            "additional message box paragraph")
+            .arg (QIHotKeyEdit::keyName (vboxGlobal().settings().hostKey())),
+        "confirmInputCapture",
+        tr ("Capture", "do input capture"));
+}
+
+void VBoxProblemReporter::remindAboutAutoCapture()
+{
+    message (&vboxGlobal().consoleWnd(), 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> "
@@ -1485 +1491 @@
             "with the mouse icon placed nearby, indicate the current keyboard "
             "and mouse capture state."
-            "</p>"),
+            "</p>") +
+        tr ("<p>The host key is currently defined as <b>%1</b>.</p>",
+            "additional message box paragraph")
+            .arg (QIHotKeyEdit::keyName (vboxGlobal().settings().hostKey())),
         "remindAboutAutoCapture");
-
-    return !(rc & AutoConfirmed);
-}
-
-/** @return false if the dialog wasn't actually shown (i.e. it was autoconfirmed) */
-bool VBoxProblemReporter::remindAboutMouseIntegration (bool supportsAbsolute)
+}
+
+void VBoxProblemReporter::remindAboutMouseIntegration (bool aSupportsAbsolute)
 {
     static const char *kNames [2] =
@@ -1504 +1510 @@
     {
         QWidget *outdated =
-            VBoxGlobal::findWidget (NULL, kNames [int (!supportsAbsolute)],
+            VBoxGlobal::findWidget (NULL, kNames [int (!aSupportsAbsolute)],
                                     "QIMessageBox");
         if (outdated)
@@ -1510 +1516 @@
     }
 
-    if (supportsAbsolute)
-    {
-        int rc = message (&vboxGlobal().consoleWnd(), Info,
+    if (aSupportsAbsolute)
+    {
+        message (&vboxGlobal().consoleWnd(), Info,
             tr ("<p>The Virtual Machine reports that the guest OS supports "
                 "<b>mouse pointer integration</b>. This means that you do not "
@@ -1533 +1539 @@
                 "</p>"),
             kNames [1] /* aAutoConfirmId */);
-
-        return !(rc & AutoConfirmed);
     }
     else
     {
-        int rc = message (&vboxGlobal().consoleWnd(), Info,
+        message (&vboxGlobal().consoleWnd(), Info,
             tr ("<p>The Virtual Machine reports that the guest OS does not "
                 "support <b>mouse pointer integration</b> in the current video "
@@ -1545 +1549 @@
                 "mouse inside the guest OS.</p>"),
             kNames [0] /* aAutoConfirmId */);
-
-        return !(rc & AutoConfirmed);
-    }
-}
-
-/** @return false if the dialog wasn't actually shown (i.e. it was autoconfirmed) */
+    }
+}
+
+/**
+ * @return @c false if the dialog wasn't actually shown (i.e. it was
+ * autoconfirmed).
+ */
 bool VBoxProblemReporter::remindAboutPausedVMInput()
 {
@@ -1589 +1594 @@
 
 /**
- *  @param  fullscreen hot key as defined in the menu
- *  @param  current host key as in the global settings
- *  @return true if the user has chosen to go fullscreen.
+ *  @param aHotKey Fullscreen hot key as defined in the menu.
+ *
+ *  @return @c true if the user has chosen to go fullscreen (this is always
+ *  the case if the dialog was autoconfirmed).
  */
-void VBoxProblemReporter::remindAboutGoingFullscreen (const QString &hotKey,
-                                                      const QString &hostKey)
-{
-    int rc = message (&vboxGlobal().consoleWnd(), Info,
+bool VBoxProblemReporter::confirmGoingFullscreen (const QString &aHotKey)
+{
+    return messageOkCancel (&vboxGlobal().consoleWnd(), Info,
         tr ("<p>The virtual machine window will be now switched to "
             "<b>fullscreen</b> mode. "
@@ -1604 +1609 @@
             "<p>Note that the main menu bar is hidden in fullscreen mode. You "
             "can access it by pressing <b>Host+Home</b>.</p>")
-            .arg (hotKey).arg (hostKey),
-        "remindAboutGoingFullscreen");
-    NOREF(rc);
+            .arg (aHotKey)
+            .arg (QIHotKeyEdit::keyName (vboxGlobal().settings().hostKey())),
+        "confirmGoingFullscreen",
+        tr ("Switch", "fullscreen"));
 }
 
 /**
- *  @param  fullscreen hot key as defined in the menu
- *  @param  current host key as in the global settings
- *  @return true if the user has chosen to go fullscreen.
+ *  @param aHotKey Seamless hot key as defined in the menu.
+ *
+ *  @return @c true if the user has chosen to go seamless (this is always
+ *  the case if the dialog was autoconfirmed).
  */
-void VBoxProblemReporter::remindAboutGoingSeamless (const QString &hotKey,
-                                                    const QString &hostKey)
-{
-    int rc = message (&vboxGlobal().consoleWnd(), Info,
+bool VBoxProblemReporter::confirmGoingSeamless (const QString &aHotKey)
+{
+    return messageOkCancel (&vboxGlobal().consoleWnd(), Info,
         tr ("<p>The virtual machine window will be now switched to "
             "<b>Seamless</b> mode. "
@@ -1625 +1631 @@
             "<p>Note that the main menu bar is hidden in seamless mode. You "
             "can access it by pressing <b>Host+Home</b>.</p>")
-            .arg (hotKey).arg (hostKey),
-        "remindAboutGoingSeamless");
-    NOREF(rc);
+            .arg (aHotKey)
+            .arg (QIHotKeyEdit::keyName (vboxGlobal().settings().hostKey())),
+        "confirmGoingSeamless",
+        tr ("Switch", "seamless"));
 }
 
@@ -1698 +1705 @@
 
 /**
- *  Returns @c true if the user has selected to reset the machine.
+ *  @return @c true if the user has selected to reset the machine.
  */
 bool VBoxProblemReporter::confirmVMReset (QWidget *aParent)
@@ -1710 +1717 @@
 }
 
-int VBoxProblemReporter::remindAboutUnsetHD (QWidget *aParent)
+/**
+ *  @return @c true if the user has selected to continue without attaching a
+ *  hard disk.
+ */
+bool VBoxProblemReporter::confirmHardDisklessMachine (QWidget *aParent)
 {
     return message (aParent, Warning,
@@ -1719 +1730 @@
             "Run Wizard.</p><p>Do you want to continue?</p>"),
         0, /* aAutoConfirmId */
-        QIMessageBox::Yes,
-        QIMessageBox::No | QIMessageBox::Default | QIMessageBox::Escape);
+        QIMessageBox::Ok,
+        QIMessageBox::Cancel | QIMessageBox::Default | QIMessageBox::Escape,
+        0,
+        tr ("Continue", "no hard disk attached"),
+        tr ("Go Back", "no hard disk attached")) == QIMessageBox::Ok;
 }
 

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

@@ -241 +241 @@
         if (!mediaCombo->currentItem())
         {
-            int result = vboxProblem().remindAboutUnsetHD (this);
-            if (result == QIMessageBox::No)
+            if (!vboxProblem().confirmHardDisklessMachine (this))
                 return;
         }