Changeset 62219 in vbox

Timestamp:

Jul 13, 2016 1:13:56 PM (9 years ago)

Author:

vboxsync

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

108730

Message:

FE/Qt: UIMessageCenter and QIMessageBox: Make sure Escape button always set for our message-boxes, that is required to properly handle closeEvent() when user clicked the window close button.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QIMessageBox.cpp (modified) (2 diffs)
• globals/UIMessageCenter.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMessageBox.cpp

@@ -249 +249 @@
             if (m_pButton3)
                 connect(m_pButton3, SIGNAL(clicked()), SLOT(sltDone3()));
+            /* Make sure Escape button always set: */
+            Assert(m_iButtonEsc);
             /* If this is a critical message add a "Copy to clipboard" button: */
             if (m_iconType == AlertIconType_Critical)
@@ -336 +338 @@
         pCloseEvent->accept();
     else
+    {
         pCloseEvent->ignore();
+        reject();
+    }
 }
 

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

@@ -172 +172 @@
 {
     message(pParent, type, strMessage, strDetails, pcszAutoConfirmId,
-            AlertButton_Ok | AlertButtonOption_Default);
+            AlertButton_Ok | AlertButtonOption_Default | AlertButtonOption_Escape);
 }