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

Timestamp:

Jul 12, 2013 1:48:24 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Popup-center: More suitable *default* button (icon, tool-tip), similar thing for single-button case.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIPopupCenter.cpp (modified) (2 diffs)
• globals/UIPopupCenter.h (modified) (1 diff)
• widgets/UIPopupPaneButtonPane.cpp (modified) (1 diff)

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

@@ -117 +117 @@
     message(pParent, strPopupPaneID,
             strMessage, strDetails,
-            AlertButton_Ok | AlertButtonOption_Default | AlertButtonOption_Escape /* 1st button */,
+            AlertButton_Cancel | AlertButtonOption_Default | AlertButtonOption_Escape /* 1st button */,
             0 /* 2nd button */,
-            QString() /* 1st button text */,
+            QApplication::translate("UIMessageCenter", "Close") /* 1st button text */,
             QString() /* 2nd button text */,
             fProposeAutoConfirmation);
@@ -165 +165 @@
                                   const QString &strMessage, const QString &strDetails,
                                   int iButton1, int iButton2,
-                                  const QString &strButtonText1, const QString &strButtonText2,
+                                  QString strButtonText1, QString strButtonText2,
                                   bool fProposeAutoConfirmation)
 {
     /* Make sure at least one button is valid: */
     if (iButton1 == 0 && iButton2 == 0)
-        iButton1 = AlertButton_Ok | AlertButtonOption_Default | AlertButtonOption_Escape;
+    {
+        iButton1 = AlertButton_Cancel | AlertButtonOption_Default | AlertButtonOption_Escape;
+        strButtonText1 = QApplication::translate("UIMessageCenter", "Close");
+    }
 
     /* Check if popup-pane was auto-confirmed before: */

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

@@ -128 +128 @@
                        const QString &strMessage, const QString &strDetails,
                        int iButton1, int iButton2,
-                       const QString &strButtonText1, const QString &strButtonText2,
+                       QString strButtonText1, QString strButtonText2,
                        bool fProposeAutoConfirmation);
 

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPaneButtonPane.cpp

@@ -188 +188 @@
     switch (iButtonID & AlertButtonMask)
     {
-        case AlertButton_Ok:      icon = UIIconPool::iconSet(":/delete_16px.png"); break;
+        case AlertButton_Ok:      icon = UIIconPool::iconSet(":/ok_16px.png"); break;
         case AlertButton_Cancel:  icon = UIIconPool::iconSet(":/cancel_16px.png"); break;
         case AlertButton_Choice1: break;