Changeset 3892 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 26, 2007 6:58:44 PM (18 years ago)

Author:

vboxsync

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

23271

Message:

FE/Qt: Fixed focus order in QIMessageBox.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/QIMessageBox.cpp (modified) (9 diffs)

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

@@ -45 +45 @@
  *  See QMessageBox for details.
  */
-QIMessageBox::QIMessageBox (
-    const QString &caption, const QString &text,
-    Icon icon, int button0, int button1, int button2,
-    QWidget *parent, const char *name, bool modal,
-    WFlags f
-) :
-    QDialog (
-        parent, name, modal,
-        f | WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu
-    )
-{
-    setCaption (caption);
-
-    b0 = button0;
-    b1 = button1;
-    b2 = button2;
+QIMessageBox::QIMessageBox (const QString &aCaption, const QString &aText,
+                            Icon aIcon, int aButton0, int aButton1, int aButton2,
+                            QWidget *aParent, const char *aName, bool aModal,
+                            WFlags aFlags)
+    : QDialog (aParent, aName, aModal,
+               aFlags | WStyle_Customize | WStyle_NormalBorder |
+                        WStyle_Title | WStyle_SysMenu)
+{
+    setCaption (aCaption);
+
+    mButton0 = aButton0;
+    mButton1 = aButton1;
+    mButton2 = aButton2;
 
     QVBoxLayout *layout = new QVBoxLayout (this);
@@ -74 +71 @@
     layout->addWidget (main);
 
-    licon = new QLabel (main);
-    licon->setPixmap (QMessageBox::standardIcon ((QMessageBox::Icon) icon));
-    licon->setSizePolicy (QSizePolicy::Fixed, QSizePolicy::Minimum);
-    licon->setAlignment (AlignHCenter | AlignTop);
-
-    message = new QVBox (main);
-    message->setMargin (0);
-    message->setSpacing (10);
-
-    ltext = new QLabel (text, message);
-    ltext->setAlignment (AlignAuto | AlignTop | ExpandTabs | WordBreak);
-    ltext->setSizePolicy (QSizePolicy::Minimum, QSizePolicy::Fixed, true);
-
-    dbox = new QVBox (this);
-    dbox->setMargin (0);
-    dbox->setSpacing (10);
-    layout->addWidget (dbox);
-
-    dtext = new QTextEdit (dbox);
+    mIconLabel = new QLabel (main);
+    mIconLabel->setPixmap (QMessageBox::standardIcon ((QMessageBox::Icon) aIcon));
+    mIconLabel->setSizePolicy (QSizePolicy::Fixed, QSizePolicy::Minimum);
+    mIconLabel->setAlignment (AlignHCenter | AlignTop);
+
+    mMessageVBox = new QVBox (main);
+    mMessageVBox->setMargin (0);
+    mMessageVBox->setSpacing (10);
+
+    mTextLabel = new QLabel (aText, mMessageVBox);
+    mTextLabel->setAlignment (AlignAuto | AlignTop | ExpandTabs | WordBreak);
+    mTextLabel->setSizePolicy (QSizePolicy::Minimum, QSizePolicy::Fixed, true);
+
+    mFlagCB_Main = new QCheckBox (mMessageVBox);
+
+    mDetailsVBox = new QVBox (this);
+    mDetailsVBox->setMargin (0);
+    mDetailsVBox->setSpacing (10);
+    layout->addWidget (mDetailsVBox);
+
+    mDetailsText = new QTextEdit (mDetailsVBox);
     {
         /* calculate the minimum size dynamically, approx. for 40 chars and
          * 6 lines */
-        QFontMetrics fm = dtext->fontMetrics();
-        dtext->setMinimumSize (40 * fm.width ('m'), fm.lineSpacing() * 6);
-    }
-    dtext->setReadOnly (true);
-    dtext->setWrapPolicy (QTextEdit::AtWordOrDocumentBoundary);
-    dtext->setSizePolicy (QSizePolicy::Expanding, QSizePolicy::MinimumExpanding);
-
-    /* cbflag has no parent initially, setDetailsShown() will do that */
-    cbflag = new QCheckBox (0);
-    cbflag->hide();
-
-    spacer = new QSpacerItem (0, 0);
-    layout->addItem (spacer);
+        QFontMetrics fm = mDetailsText->fontMetrics();
+        mDetailsText->setMinimumSize (40 * fm.width ('m'), fm.lineSpacing() * 6);
+    }
+    mDetailsText->setReadOnly (true);
+    mDetailsText->setWrapPolicy (QTextEdit::AtWordOrDocumentBoundary);
+    mDetailsText->setSizePolicy (QSizePolicy::Expanding,
+                                 QSizePolicy::MinimumExpanding);
+
+    mFlagCB_Details = new QCheckBox (mDetailsVBox);
+
+    mSpacer = new QSpacerItem (0, 0);
+    layout->addItem (mSpacer);
 
     QHBoxLayout *buttons = new QHBoxLayout (new QWidget (this));
@@ -115 +113 @@
     buttons->setSpacing (5);
 
-    bescape = 0;
-
-    pb0 = createButton (buttons->mainWidget(), button0);
-    if (pb0) connect (pb0, SIGNAL( clicked() ), SLOT( done0() ));
-    pb1 = createButton (buttons->mainWidget(), button1);
-    if (pb1) connect (pb1, SIGNAL( clicked() ), SLOT( done1() ));
-    pb2 = createButton (buttons->mainWidget(), button2);
-    if (pb2) connect (pb2, SIGNAL( clicked() ), SLOT( done2() ));
+    mButtonEsc = 0;
+
+    mButton0PB = createButton (buttons->mainWidget(), aButton0);
+    if (mButton0PB)
+        connect (mButton0PB, SIGNAL (clicked()), SLOT (done0()));
+    mButton1PB = createButton (buttons->mainWidget(), aButton1);
+    if (mButton1PB)
+        connect (mButton1PB, SIGNAL (clicked()), SLOT (done1()));
+    mButton2PB = createButton (buttons->mainWidget(), aButton2);
+    if (mButton2PB)
+        connect (mButton2PB, SIGNAL (clicked()), SLOT (done2()));
+
     buttons->setAlignment (AlignHCenter);
 
+    /* this call is a must -- it initializes mFlagCB and mSpacer */
     setDetailsShown (false);
 }
@@ -141 +144 @@
  *  will hide the flag. By default, the flag is hidden.
  */
-void QIMessageBox::setFlagText (const QString &text)
-{
-    if (text.isNull()) {
-        cbflag->hide();
-    } else {
-        cbflag->setText (text);
-        cbflag->show();
-        cbflag->setFocus();
+void QIMessageBox::setFlagText (const QString &aText)
+{
+    if (aText.isNull())
+    {
+        mFlagCB->hide();
+    }
+    else
+    {
+        mFlagCB->setText (aText);
+        mFlagCB->show();
+        mFlagCB->setFocus();
     }
 }
@@ -169 +175 @@
  */
 
-QPushButton *QIMessageBox::createButton (QWidget *parent, int button)
-{
-    if (button == 0)
+QPushButton *QIMessageBox::createButton (QWidget *aParent, int aButton)
+{
+    if (aButton == 0)
         return 0;
 
     QString text;
-    switch (button & ButtonMask)
+    switch (aButton & ButtonMask)
     {
         case Ok:        text = tr ("OK"); break;
@@ -183 +189 @@
         case Ignore:    text = tr ("Ignore"); break;
         default:
-            AssertMsgFailed (("QIMessageBox::createButton(): type %d is not implemented",
-                              button));
-            return 0;
-    }
-
-    QPushButton *b = new QPushButton (text, parent);
-
-    if (button & Default)
+            AssertMsgFailed (("Type %d is not implemented", aButton));
+            return NULL;
+    }
+
+    QPushButton *b = new QPushButton (text, aParent);
+
+    if (aButton & Default)
     {
         b->setDefault (true);
@@ -196 +201 @@
     }
     else
-    if (button & Escape)
-        bescape = button & ButtonMask;
+    if (aButton & Escape)
+        mButtonEsc = aButton & ButtonMask;
 
     return b;
@@ -217 +222 @@
  *  @see #setDetailsShown()
  */
-void QIMessageBox::setDetailsText (const QString &text)
-{
-    dtext->setText (text);
+void QIMessageBox::setDetailsText (const QString &aText)
+{
+    mDetailsText->setText (aText);
 }
 
@@ -238 +243 @@
  *  @see #setDetailsText()
  */
-void QIMessageBox::setDetailsShown (bool shown)
-{
-
-    bool cbflagShown = cbflag->isShown();
-
-    if (shown)
-    {
-        cbflag->reparent (dbox, QPoint());
-        cbflag->setShown (cbflagShown);
-        spacer->changeSize (0, 0, QSizePolicy::Minimum, QSizePolicy::Minimum);
-    }
-
-    dbox->setShown (shown);
-
-    if (!shown)
-    {
-        cbflag->reparent (message, QPoint(), cbflagShown);
-        cbflag->setShown (cbflagShown);
-        spacer->changeSize (0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
-    }
-}
-
+void QIMessageBox::setDetailsShown (bool aShown)
+{
+    if (aShown)
+    {
+        mFlagCB_Details->setShown (mFlagCB->isShown());
+        mFlagCB_Details->setChecked (mFlagCB->isChecked());
+        mFlagCB_Main->setShown (false);
+        mFlagCB = mFlagCB_Details;
+        mSpacer->changeSize (0, 0, QSizePolicy::Minimum, QSizePolicy::Minimum);
+    }
+
+    mDetailsVBox->setShown (aShown);
+
+    if (!aShown)
+    {
+        mFlagCB_Main->setShown (mFlagCB_Details->isShown());
+        mFlagCB_Main->setChecked (mFlagCB_Details->isChecked());
+        mFlagCB = mFlagCB_Main;
+        mSpacer->changeSize (0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
+    }
+}
+