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

Timestamp:

Jul 7, 2008 2:10:40 PM (17 years ago)

Author:

vboxsync

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

32947

Message:

FE/Qt4: Fix default/auto-default button and reject behavior of the main dialog.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/QIMainDialog.h (modified) (2 diffs)
• src/QIMainDialog.cpp (modified) (8 diffs)

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

@@ -59 +59 @@
     virtual bool eventFilter (QObject *aObject, QEvent *aEvent);
 
+    QPushButton* searchDefaultButton() const;
+
 protected slots:
 
@@ -78 +80 @@
 
     QPointer<QSizeGrip> mSizeGrip;
+
+    QPushButton* mDefaultButton;
 };
 

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

@@ -36 +36 @@
 #include <QSizeGrip>
 #include <QPushButton>
+#include <QDialogButtonBox>
 
 QIMainDialog::QIMainDialog (QWidget *aParent /* = NULL */, Qt::WindowFlags aFlags /* = Qt::Dialog */)
     : QMainWindow (aParent, aFlags) 
     , mRescode (QDialog::Rejected)
+    , mDefaultButton (NULL)
 {
     qApp->installEventFilter (this);
@@ -121 +123 @@
 bool QIMainDialog::event (QEvent *aEvent)
 {
-#ifdef Q_WS_MAC
      switch (aEvent->type()) 
      {
+#ifdef Q_WS_MAC
           case QEvent::IconDrag: 
               {
@@ -186 +188 @@
                   break;
               }
+#endif /* Q_WS_MAC */
+          case QEvent::Polish: 
+              {
+                  /* Initially search for the default button. */
+                  mDefaultButton = searchDefaultButton();
+                  break;
+              }
           default: 
               break;
      }
-#endif /* Q_WS_MAC */
      return QMainWindow::event (aEvent);
 }
@@ -215 +223 @@
     switch (aEvent->type())
     {
+        /* Auto-default button focus-in processor used to move the "default"
+         * button property into the currently focused button. */
+        case QEvent::FocusIn:
+            {
+                if (qobject_cast<QPushButton*> (aObject) &&
+                    (aObject->parent() == centralWidget() ||
+                     qobject_cast<QDialogButtonBox*> (aObject->parent()) != NULL))
+                {
+                    qobject_cast<QPushButton*> (aObject)->setDefault (aObject != mDefaultButton);
+                    if (mDefaultButton)
+                        mDefaultButton->setDefault (aObject == mDefaultButton);
+                }                                    
+                break;
+            }
+        /* Auto-default button focus-out processor used to remove the "default"
+         * button property from the previously focused button. */
+        case QEvent::FocusOut:
+            {
+                if (qobject_cast<QPushButton*> (aObject) && 
+                    (aObject->parent() == centralWidget() ||
+                     qobject_cast<QDialogButtonBox*> (aObject->parent()) != NULL))
+                {
+                    if (mDefaultButton)
+                        mDefaultButton->setDefault (aObject != mDefaultButton);
+                    qobject_cast<QPushButton*> (aObject)->setDefault (aObject == mDefaultButton);
+                }                     
+                break;
+            }
         case QEvent::KeyPress:
             {
@@ -220 +256 @@
 #ifdef Q_WS_MAC
                 if (event->modifiers() == Qt::ControlModifier && 
-                    event->key() == Qt::Key_Period) 
+                    event->key() == Qt::Key_Period &&
+                    aObject == this &&
+                    qApp->activePopupWidget() == NULL  &&
+                    qApp->activePopupWidget() == NULL &&
+                    (qApp->activeModalWidget() == this || 
+                     qApp->activeModalWidget() == NULL))
                     reject();
                 else
@@ -232 +273 @@
                             case Qt::Key_Return:
                                 {
-                                    QList<QPushButton*> list = qFindChildren<QPushButton*> (this);
-                                    for (int i=0; i < list.size(); ++i)
+                                    QPushButton *currentDefault = searchDefaultButton();
+                                    if (currentDefault)
                                     {
-                                        QPushButton *pb = list.at (i);
-                                        if (pb->isDefault() && pb->isVisible()) 
-                                        {
-                                            if (pb->isEnabled())
-                                                pb->click();
-                                            break;
-                                        }
+                                        /* We handle this, so return true after
+                                         * that. */
+                                        currentDefault->click();
+                                        return true;
                                     }
                                     break;
@@ -247 +285 @@
                             case Qt::Key_Escape:
                                 {
-                                    reject();
+                                    /* Make sure that we only reject if no
+                                     * popup or other modal widgets are open. */
+                                    if (aObject == this &&
+                                        qApp->activePopupWidget() == NULL &&
+                                        (qApp->activeModalWidget() == this || 
+                                         qApp->activeModalWidget() == NULL))
+                                    {
+                                        reject();
+                                        return true;
+                                    }
                                     break;
                                 }
@@ -258 +305 @@
     return QMainWindow::eventFilter (aObject, aEvent);
 }
+
+QPushButton* QIMainDialog::searchDefaultButton() const
+{
+    /* Search for the first default button in the dialog. */
+    QPushButton *button = NULL;
+    QList<QPushButton*> list = qFindChildren<QPushButton*> (this);
+    foreach (button, list)
+        if(button->isDefault() &&
+           (button->parent() == centralWidget() ||
+            qobject_cast<QDialogButtonBox*> (button->parent()) != NULL))
+            break;
+    return button;
+}
+
 
 void QIMainDialog::accept()