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

Timestamp:

Jul 7, 2008 4:03:04 PM (17 years ago)

Author:

vboxsync

Message:

FE/Qt4: More default button improvements.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

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

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

@@ -49 +49 @@
     bool isSizeGripEnabled () const;
 
+    void setDefaultButton (QPushButton* aButton);
+    QPushButton* defaultButton () const;
+
 public slots:
 
@@ -80 +83 @@
 
     QPointer<QSizeGrip> mSizeGrip;
-
-    QPushButton* mDefaultButton;
+    QPointer<QPushButton> mDefaultButton;
 };
 

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

@@ -41 +41 @@
     : QMainWindow (aParent, aFlags) 
     , mRescode (QDialog::Rejected)
-    , mDefaultButton (NULL)
 {
     qApp->installEventFilter (this);
@@ -111 +110 @@
     return mSizeGrip;
 }
+
+void QIMainDialog::setDefaultButton (QPushButton* aButton)
+{
+    mDefaultButton = aButton;
+}
+
+QPushButton* QIMainDialog::defaultButton() const
+{
+    return mDefaultButton;
+}
+
 
 void QIMainDialog::setVisible (bool aVisible)
@@ -277 +287 @@
                                         /* We handle this, so return true after
                                          * that. */
-                                        currentDefault->click();
+                                        currentDefault->animateClick();
                                         return true;
                                     }

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

@@ -111 +111 @@
     connect (mBtnRefresh, SIGNAL (clicked()), this, SLOT (refresh()));
 
-    /* Save is default */
-    mBtnSave->setDefault (true);
-    /* Make the [Save] button focused by default */
-    mBtnSave->setFocus();
-
     /* Reading log files */
     refresh();
-
+    /* Set the focus to the initial default button */
+    defaultButton()->setDefault (true);
+    defaultButton()->setFocus();
+#ifdef Q_WS_MAC
+    /* We have to force this to get the default button L&F on the mac. */
+    defaultButton()->setEnabled (true);
+#endif /* Q_WS_MAC */
     /* Loading language constants */
     retranslateUi();
+
 }
 
@@ -201 +203 @@
     mBtnSave->setEnabled (isAnyLogPresent);
     mLogList->setEnabled (isAnyLogPresent);
+    /* Default to the save button if there are any log files otherwise to the
+     * close button. The initial automatic of the main dialog has to be
+     * overwritten */
+    setDefaultButton (isAnyLogPresent ? mBtnSave:mBtnClose);
 }