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

Timestamp:

Apr 3, 2013 7:28:29 AM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: QIMessageBox cleanup/rework (part 1).

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QIMessageBox.cpp (modified) (5 diffs)
• extensions/QIMessageBox.h (modified) (5 diffs)
• globals/UIMessageCenter.cpp (modified) (5 diffs)

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

@@ -51 +51 @@
  */
 QIMessageBox::QIMessageBox (const QString &aCaption, const QString &aText,
-                            Icon aIcon, int aButton0, int aButton1, int aButton2,
+                            IconType aIcon, int aButton0, int aButton1, int aButton2,
                             QWidget *aParent, const char *aName, bool aModal)
     : QIDialog (aParent)
@@ -156 +156 @@
     /* If this is an error message add an "Copy to clipboard" button for easier
      * bug reports. */
-    if (aIcon == QIMessageBox::Critical)
+    if (aIcon == QIMessageBox::IconType_Critical)
     {
         QPushButton *pCopyButton = createButton(Copy);
@@ -316 +316 @@
 }
 
-QPixmap QIMessageBox::standardPixmap (QIMessageBox::Icon aIcon)
+QPixmap QIMessageBox::standardPixmap (QIMessageBox::IconType aIcon)
 {
     QIcon icon;
     switch (aIcon)
     {
-        case QIMessageBox::Information:
+        case QIMessageBox::IconType_Information:
             icon = UIIconPool::defaultIcon(UIIconPool::MessageBoxInformationIcon, this);
             break;
@@ -327 +327 @@
             icon = UIIconPool::defaultIcon(UIIconPool::MessageBoxWarningIcon, this);
             break;
-        case QIMessageBox::Critical:
+        case QIMessageBox::IconType_Critical:
             icon = UIIconPool::defaultIcon(UIIconPool::MessageBoxCriticalIcon, this);
             break;
-        case QIMessageBox::Question:
+        case QIMessageBox::IconType_Question:
             icon = UIIconPool::defaultIcon(UIIconPool::MessageBoxQuestionIcon, this);
             break;
-        case QIMessageBox::GuruMeditation:
+        case QIMessageBox::IconType_GuruMeditation:
             icon = QIcon(":/meditation_32px.png");
             break;
@@ -364 +364 @@
         mTextLabel->useSizeHintForWidth (mTextLabel->width());
         mTextLabel->updateGeometry();
-        setFixedWidth (width());
+        setFixedSize(size());
         mDetailsSplitter->toggleWidget();
         mWasPolished = true;

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -20 +20 @@
 #define __QIMessageBox_h__
 
-/* VBox includes */
-#include "QIDialog.h"
-
-/* Qt includes */
+/* Qt includes: */
 #include <QCheckBox>
 #include <QMessageBox>
 #include <QTextEdit>
 
-/* VBox forwards */
+/* GUI includes: */
+#include "QIDialog.h"
+
+/* Forward declarations: */
+class QCloseEvent;
+class QLabel;
+class QPushButton;
+class QSpacerItem;
 class QIArrowSplitter;
 class QIDialogButtonBox;
 class QILabel;
 
-/* Qt forwards */
-class QCloseEvent;
-class QLabel;
-class QPushButton;
-class QSpacerItem;
-
-/** @class QIMessageBox
- *
- *  The QIMessageBox class is a message box similar to QMessageBox.
- *  It partly implements the QMessageBox interface and adds some enhanced
- *  functionality.
- */
+/* QIDialog extension representing GUI alerts: */
 class QIMessageBox : public QIDialog
 {
@@ -51 +44 @@
 public:
 
-    // for compatibility with QMessageBox
-    enum Icon
+    /* Icon type enumerator: */
+    enum IconType
     {
-        NoIcon = QMessageBox::NoIcon,
-        Information = QMessageBox::Information,
-        Warning = QMessageBox::Warning,
-        Critical = QMessageBox::Critical,
-        Question = QMessageBox::Question,
-        GuruMeditation,
+        IconType_NoIcon = QMessageBox::NoIcon,
+        IconType_Information = QMessageBox::Information,
+        IconType_Warning = QMessageBox::Warning,
+        IconType_Critical = QMessageBox::Critical,
+        IconType_Question = QMessageBox::Question,
+        IconType_GuruMeditation,
     };
 
@@ -75 +68 @@
 
     QIMessageBox (const QString &aCaption, const QString &aText,
-                  Icon aIcon, int aButton0, int aButton1 = 0, int aButton2 = 0,
+                  IconType aIcon, int aButton0, int aButton1 = 0, int aButton2 = 0,
                   QWidget *aParent = 0, const char *aName = 0, bool aModal = TRUE);
 
@@ -90 +83 @@
     void setDetailsText (const QString &aText);
 
-    QPixmap standardPixmap (QIMessageBox::Icon aIcon);
+    QPixmap standardPixmap (QIMessageBox::IconType aIcon);
 
 private:

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

@@ -134 +134 @@
     /* Assign corresponding title and icon: */
     QString strTitle;
-    QIMessageBox::Icon icon;
+    QIMessageBox::IconType icon;
     switch (type)
     {
@@ -140 +140 @@
         case MessageType_Info:
             strTitle = tr("VirtualBox - Information", "msg box title");
-            icon = QIMessageBox::Information;
+            icon = QIMessageBox::IconType_Information;
             break;
         case MessageType_Question:
             strTitle = tr("VirtualBox - Question", "msg box title");
-            icon = QIMessageBox::Question;
+            icon = QIMessageBox::IconType_Question;
             break;
         case MessageType_Warning:
             strTitle = tr("VirtualBox - Warning", "msg box title");
-            icon = QIMessageBox::Warning;
+            icon = QIMessageBox::IconType_Warning;
             break;
         case MessageType_Error:
             strTitle = tr("VirtualBox - Error", "msg box title");
-            icon = QIMessageBox::Critical;
+            icon = QIMessageBox::IconType_Critical;
             break;
         case MessageType_Critical:
             strTitle = tr("VirtualBox - Critical Error", "msg box title");
-            icon = QIMessageBox::Critical;
+            icon = QIMessageBox::IconType_Critical;
             break;
         case MessageType_GuruMeditation:
             strTitle = "VirtualBox - Guru Meditation"; /* don't translate this */
-            icon = QIMessageBox::GuruMeditation;
+            icon = QIMessageBox::IconType_GuruMeditation;
             break;
     }
@@ -795 +795 @@
     /* Show the message: */
     message(mainWindowShown(), res.isWarning() ? MessageType_Warning : MessageType_Error,
-             tr("Failed to access the USB subsystem."),
-             formatErrorInfo(res),
-             "cannotAccessUSB");
+            tr("Failed to access the USB subsystem."),
+            formatErrorInfo(res),
+            "cannotAccessUSB");
 }
 
@@ -2984 +2984 @@
     /* Choose title and icon: */
     QString title;
-    QIMessageBox::Icon icon;
+    QIMessageBox::IconType icon;
     switch (type)
     {
@@ -2990 +2990 @@
         case MessageType_Info:
             title = tr("VirtualBox - Information", "msg box title");
-            icon = QIMessageBox::Information;
+            icon = QIMessageBox::IconType_Information;
             break;
         case MessageType_Question:
             title = tr("VirtualBox - MessageType_Question", "msg box title");
-            icon = QIMessageBox::Question;
+            icon = QIMessageBox::IconType_Question;
             break;
         case MessageType_Warning:
             title = tr("VirtualBox - MessageType_Warning", "msg box title");
-            icon = QIMessageBox::Warning;
+            icon = QIMessageBox::IconType_Warning;
             break;
         case MessageType_Error:
             title = tr("VirtualBox - MessageType_Error", "msg box title");
-            icon = QIMessageBox::Critical;
+            icon = QIMessageBox::IconType_Critical;
             break;
         case MessageType_Critical:
             title = tr("VirtualBox - MessageType_Critical MessageType_Error", "msg box title");
-            icon = QIMessageBox::Critical;
+            icon = QIMessageBox::IconType_Critical;
             break;
         case MessageType_GuruMeditation:
             title = "VirtualBox - Guru Meditation"; /* don't translate this */
-            icon = QIMessageBox::GuruMeditation;
+            icon = QIMessageBox::IconType_GuruMeditation;
             break;
     }