Changeset 57628 in vbox for trunk/src/VBox/Frontends

Timestamp:

Sep 4, 2015 1:05:51 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: 8010: GUI MessageBox: Passing the right default focus to Messagebox API as the effect of change in r102504.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp (modified) (6 diffs)

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

@@ -183 +183 @@
 {
     return (message(pParent, type, strMessage, strDetails, pcszAutoConfirmId,
-                    AlertButton_Ok | AlertButtonOption_Default,
-                    AlertButton_Cancel | AlertButtonOption_Escape,
+                    AlertButton_Ok,
+                    AlertButton_Cancel | AlertButtonOption_Default | AlertButtonOption_Escape,
                     0 /* third button */,
                     strOkButtonText,
@@ -220 +220 @@
 {
     return (question(pParent, type, strMessage, pcszAutoConfirmId,
-                     AlertButton_Ok | AlertButtonOption_Default,
-                     AlertButton_Cancel | AlertButtonOption_Escape,
+                     AlertButton_Ok,
+                     AlertButton_Cancel | AlertButtonOption_Default | AlertButtonOption_Escape,
                      0 /* third button */,
                      strOkButtonText,
@@ -670 +670 @@
                    strText, QString(),
                    0 /* auto-confirm id */,
-                   AlertButton_Ok | AlertButtonOption_Default,
-                   AlertButton_Cancel | AlertButtonOption_Escape,
+                   AlertButton_Ok,
+                   AlertButton_Cancel | AlertButtonOption_Default | AlertButtonOption_Escape,
                    0,
                    tr("Remove")) :
@@ -678 +678 @@
                    0 /* auto-confirm id */,
                    AlertButton_Choice1,
-                   AlertButton_Choice2 | AlertButtonOption_Default,
-                   AlertButton_Cancel | AlertButtonOption_Escape,
+                   AlertButton_Choice2,
+                   AlertButton_Cancel | AlertButtonOption_Default | AlertButtonOption_Escape,
                    tr("Delete all files"),
                    tr("Remove only"));
@@ -831 +831 @@
                              tr("Create a snapshot of the current machine state"),
                              !gEDataManager->messagesWithInvertedOption().contains("confirmSnapshotRestoring"),
-                             AlertButton_Ok | AlertButtonOption_Default,
-                             AlertButton_Cancel | AlertButtonOption_Escape,
+                             AlertButton_Ok,
+                             AlertButton_Cancel | AlertButtonOption_Default | AlertButtonOption_Escape,
                              0 /* 3rd button */,
                              tr("Restore"), tr("Cancel"), QString() /* 3rd button text */) :
@@ -840 +840 @@
                    QString() /* details */,
                    0 /* auto-confirm id */,
-                   AlertButton_Ok | AlertButtonOption_Default,
-                   AlertButton_Cancel | AlertButtonOption_Escape,
+                   AlertButton_Ok,
+                   AlertButton_Cancel | AlertButtonOption_Default | AlertButtonOption_Escape,
                    0 /* 3rd button */,
                    tr("Restore"), tr("Cancel"), QString() /* 3rd button text */);