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

Timestamp:

Nov 20, 2007 4:59:20 PM (17 years ago)

Author:

vboxsync

Message:

FE/Qt: Fixed inpit captire canceling on Linux hosts.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxProblemReporter.h (modified) (1 diff)
• src/VBoxConsoleView.cpp (modified) (3 diffs)
• src/VBoxProblemReporter.cpp (modified) (3 diffs)

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

@@ -254 +254 @@
                              const QString &aResult);
 
-    bool confirmInputCapture();
+    bool confirmInputCapture (bool *aAutoConfirmed = NULL);
     void remindAboutAutoCapture();
     void remindAboutMouseIntegration (bool aSupportsAbsolute);

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

@@ -1961 +1961 @@
 //                captureMouse (true);
         }
+
+        /* reset the single-time disable capture flag */
+        if (mDisableAutoCapture)
+            mDisableAutoCapture = false;
     }
     else
@@ -2231 +2235 @@
                              * dialog result itself */
                             mDisableAutoCapture = true;
-                            ok = vboxProblem().confirmInputCapture();
-                            mDisableAutoCapture = false;
+                            bool autoConfirmed = false;
+                            ok = vboxProblem().confirmInputCapture (&autoConfirmed);
+                            if (autoConfirmed)
+                                mDisableAutoCapture = false;
+                            /* otherwise, the disable flag will be reset in
+                             * the next console view's foucs in event (since
+                             * may happen asynchronously on some platforms,
+                             * after we return from this code) */
                         }
+
                         if (ok)
                         {
@@ -2572 +2583 @@
                      * dialog result itself */
                     mDisableAutoCapture = true;
-                    bool ok = vboxProblem().confirmInputCapture();
-                    mDisableAutoCapture = false;
+                    bool autoConfirmed = false;
+                    bool ok = vboxProblem().confirmInputCapture (&autoConfirmed);
+                    if (autoConfirmed)
+                        mDisableAutoCapture = false;
+                    /* otherwise, the disable flag will be reset in
+                     * the next console view's foucs in event (since
+                     * may happen asynchronously on some platforms,
+                     * after we return from this code) */
+
                     if (ok)
                     {

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

@@ -1447 +1447 @@
 /**
  *  @return @c true if the user has confirmed input capture (this is always
- *  the case if the dialog was autoconfirmed).
+ *  the case if the dialog was autoconfirmed). @a aAutoConfirmed, when not
+ *  NULL, will receive @c true if the dialog wasn't actually shown.
  */
-bool VBoxProblemReporter::confirmInputCapture()
-{
-    return messageOkCancel (&vboxGlobal().consoleWnd(), Info,
+bool VBoxProblemReporter::confirmInputCapture (bool *aAutoConfirmed /* = NULL */)
+{
+    int rc = message (&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 "
@@ -1471 +1472 @@
             .arg (QIHotKeyEdit::keyName (vboxGlobal().settings().hostKey())),
         "confirmInputCapture",
+        QIMessageBox::Ok | QIMessageBox::Default,
+        QIMessageBox::Cancel | QIMessageBox::Escape,
+        0,
         tr ("Capture", "do input capture"));
+
+    if (aAutoConfirmed)
+        *aAutoConfirmed = (rc & AutoConfirmed);
+
+    return (rc & QIMessageBox::ButtonMask) == QIMessageBox::Ok;
 }
 
@@ -1575 +1584 @@
 bool VBoxProblemReporter::remindAboutInaccessibleMedia()
 {
-    int rc = message (
-        &vboxGlobal().selectorWnd(),
-        Warning,
+    int rc = message (&vboxGlobal().selectorWnd(), Warning,
         tr ("<p>One or more of the registered virtual hard disks, CD/DVD or "
             "floppy media are not currently accessible. As a result, you will "
             "not be able to operate virtual machines that use these media until "
             "they become accessible later.</p>"
-            "<p>Press <b>OK</b> to open the Virtual Disk Manager window and "
+            "<p>Press <b>Check</b> to open the Virtual Disk Manager window and "
             "see what media are inaccessible, or press <b>Ignore</b> to "
             "ignore this message.</p>"),
         "remindAboutInaccessibleMedia",
         QIMessageBox::Ok | QIMessageBox::Default,
-        QIMessageBox::Ignore | QIMessageBox::Escape
-    );
-
-    return rc == QIMessageBox::Ok && !(rc & AutoConfirmed);
+        QIMessageBox::Ignore | QIMessageBox::Escape,
+        0,
+        tr ("Check", "inaccessible media message box"));
+
+    return rc == QIMessageBox::Ok; /* implies !AutoConfirmed */
 }