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

Timestamp:

Apr 2, 2013 3:08:57 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

84686

Message:

FE/Qt: Message-center: Support for Ok/Cancel messages with Cancel by default. Make inaccessibility medium reminder have Cancel button as default one.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• UIMessageCenter.cpp (modified) (1 diff)
• UIMessageCenter.h (modified) (2 diffs)

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

@@ -617 +617 @@
                               "ignore this message.</p>"),
                            "remindAboutInaccessibleMedia",
-                           tr("Check", "inaccessible media message box"));
+                           tr("Check", "inaccessible media message box"), tr("Cancel"), false);
 }
 

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

@@ -140 +140 @@
                          const char *pcszAutoConfirmId = 0,
                          const QString &strOkButtonText = QString(),
-                         const QString &strCancelButtonText = QString()) const
-    {
+                         const QString &strCancelButtonText = QString(),
+                         bool fOkByDefault = true) const
+    {
+        int iOkButton = fOkByDefault ? QIMessageBox::Ok | QIMessageBox::Default :
+                                       QIMessageBox::Ok;
+        int iCancelButton = fOkByDefault ? QIMessageBox::Cancel | QIMessageBox::Escape :
+                                           QIMessageBox::Cancel | QIMessageBox::Escape | QIMessageBox::Default;
         return (message(pParent, type, strMessage, strDetails, pcszAutoConfirmId,
-                        QIMessageBox::Ok | QIMessageBox::Default,
-                        QIMessageBox::Cancel | QIMessageBox::Escape,
-                        0,
-                        strOkButtonText, strCancelButtonText, QString()) &
+                        iOkButton, iCancelButton, 0, strOkButtonText, strCancelButtonText, QString()) &
                 QIMessageBox::ButtonMask) == QIMessageBox::Ok;
     }
@@ -156 +158 @@
                          const char *pcszAutoConfirmId,
                          const QString &strOkButtonText = QString(),
-                         const QString &strCancelButtonText = QString()) const
-    {
-        return messageOkCancel(pParent, type, strMessage, QString(),
-                               pcszAutoConfirmId, strOkButtonText, strCancelButtonText);
+                         const QString &strCancelButtonText = QString(),
+                         bool fOkByDefault = true) const
+    {
+        return messageOkCancel(pParent, type, strMessage, QString(), pcszAutoConfirmId,
+                               strOkButtonText, strCancelButtonText, fOkByDefault);
     }