Changeset 8369 in vbox for trunk/src/VBox

Timestamp:

Apr 24, 2008 4:11:40 PM (17 years ago)

Author:

vboxsync

Message:

FE/Qt4: QIMessageBox changes:

• QIMessageBox uses QIDialog: So all warnings/errors/... are sheets on Mac OS X now.
• use QDialogButtonBox for the bottom buttons
• replaced some deprecated window flags

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/QIMessageBox.h (modified) (5 diffs)
• src/QIMessageBox.cpp (modified) (7 diffs)

trunk/src/VBox/Frontends/VirtualBox4/include/QIMessageBox.h

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2008 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -24 +24 @@
 #define __QIMessageBox_h__
 
+#include "QIDialog.h"
+
 /* Qt includes */
-#include <QDialog>
 #include <QMessageBox>
 #include <QCheckBox>
@@ -34 +35 @@
 class QPushButton;
 class QSpacerItem;
+class QDialogButtonBox;
 
-class QIMessageBox : public QDialog
+class QIMessageBox : public QIDialog
 {
     Q_OBJECT
@@ -64 +66 @@
     QIMessageBox (const QString &aCaption, const QString &aText,
                   Icon aIcon, int aButton0, int aButton1 = 0, int aButton2 = 0,
-                  QWidget *aParent = 0, const char *aName = 0, bool aModal = TRUE,
-                  Qt::WFlags aFlags = Qt::WStyle_DialogBorder);
+                  QWidget *aParent = 0, const char *aName = 0, bool aModal = TRUE);
 
     QString buttonText (int aButton) const;
@@ -108 +109 @@
     QTextEdit *mDetailsText;
     QSpacerItem *mSpacer;
+    QDialogButtonBox *mButtonBox;
 };
 

trunk/src/VBox/Frontends/VirtualBox4/src/QIMessageBox.cpp

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2008 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -31 +31 @@
 #include <QPushButton>
 #include <QLabel>
+#include <QDialogButtonBox>
 
 /** @class QIMessageBox
@@ -40 +41 @@
 
 /**
- *  This constructor is equivalent to
- *  QMessageBox::QMessageBox (const QString &, const QString &, Icon,
- *      int, int, int, QWidget *, const char *, bool, WFlags).
  *  See QMessageBox for details.
  */
 QIMessageBox::QIMessageBox (const QString &aCaption, const QString &aText,
                             Icon aIcon, int aButton0, int aButton1, int aButton2,
-                            QWidget *aParent, const char *aName, bool aModal,
-                            Qt::WFlags aFlags)
-    : QDialog (aParent, aName, aModal,
-               aFlags | Qt::WStyle_Customize | Qt::WStyle_NormalBorder |
-                        Qt::WStyle_Title | Qt::WStyle_SysMenu)
+                            QWidget *aParent, const char *aName, bool aModal)
+    : QIDialog (aParent,
+                Qt::Window | Qt::Sheet | 
+                Qt::MSWindowsFixedSizeDialogHint | Qt::WindowTitleHint | Qt::WindowSystemMenuHint)
 {
     setWindowTitle (aCaption);
+    /* Necessary to later find some of the message boxes */
+    setObjectName (aName);
+    setModal (aModal);
 
     mButton0 = aButton0;
@@ -123 +123 @@
     layout->addItem (mSpacer);
 
-    QHBoxLayout *buttonsHLayout = new QHBoxLayout();
-    buttonsHLayout->setSpacing (5);
-    layout->addLayout (buttonsHLayout);
+    mButtonBox = new QDialogButtonBox;
+    mButtonBox->setCenterButtons (true);
+    layout->addWidget (mButtonBox);
 
     mButtonEsc = 0;
@@ -131 +131 @@
     mButton0PB = createButton (aButton0);
     if (mButton0PB)
-    {
-        buttonsHLayout->addWidget (mButton0PB);
         connect (mButton0PB, SIGNAL (clicked()), SLOT (done0()));
-    }
     mButton1PB = createButton (aButton1);
     if (mButton1PB)
-    {
-        buttonsHLayout->addWidget (mButton1PB);
         connect (mButton1PB, SIGNAL (clicked()), SLOT (done1()));
-    }
     mButton2PB = createButton (aButton2);
     if (mButton2PB)
-    {
-        buttonsHLayout->addWidget (mButton2PB);
         connect (mButton2PB, SIGNAL (clicked()), SLOT (done2()));
-    }
-
-    buttonsHLayout->setAlignment (Qt::AlignHCenter);
 
     /* this call is a must -- it initializes mFlagCB and mSpacer */
     setDetailsShown (false);
+
+    /* Set fixed size */
+    setSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed);
 }
 
@@ -241 +233 @@
 
     QString text;
+    QDialogButtonBox::ButtonRole role;
     switch (aButton & ButtonMask)
     {
-        case Ok:        text = tr ("OK"); break;
-        case Yes:       text = tr ("Yes"); break;
-        case No:        text = tr ("No"); break;
-        case Cancel:    text = tr ("Cancel"); break;
-        case Ignore:    text = tr ("Ignore"); break;
+        case Ok:        text = tr ("OK"); role = QDialogButtonBox::AcceptRole; break;
+        case Yes:       text = tr ("Yes"); role = QDialogButtonBox::YesRole; break;
+        case No:        text = tr ("No"); role = QDialogButtonBox::NoRole; break;
+        case Cancel:    text = tr ("Cancel"); role = QDialogButtonBox::RejectRole; break;
+        case Ignore:    text = tr ("Ignore"); role = QDialogButtonBox::AcceptRole; break;
         default:
             AssertMsgFailed (("Type %d is not implemented", aButton));
@@ -253 +246 @@
     }
 
-    QPushButton *b = new QPushButton (text);
+    QPushButton *b = mButtonBox->addButton (text, role);
 
     if (aButton & Default)