Changeset 9866 in vbox

Timestamp:

Jun 23, 2008 9:03:47 AM (17 years ago)

Author:

vboxsync

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

32256

Message:

FE/Qt4-OSX: Macified help button.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• Makefile.kmk (modified) (2 diffs)
• VirtualBox.qrc (modified) (1 diff)
• images/help_button_normal_mac_22px.png (added)
• images/help_button_pressed_mac_22px.png (added)
• include/QIDialogButtonBox.h (modified) (3 diffs)
• include/QIHelpButton.h (added)
• src/QIDialogButtonBox.cpp (modified) (4 diffs)
• src/QIHelpButton.cpp (added)

trunk/src/VBox/Frontends/VirtualBox4/Makefile.kmk

@@ -538 +538 @@
         include/QITreeWidget.h \
         include/QIMainDialog.h \
+        include/QIHelpButton.h \
         include/VBoxGlobalSettings.h \
         include/VBoxUtils.h \
@@ -625 +626 @@
         src/QIMainDialog.cpp \
         src/QILineEdit.cpp \
+        src/QIHelpButton.cpp \
         src/VBoxDefs.cpp \
         src/VBoxGlobalSettings.cpp \

trunk/src/VBox/Frontends/VirtualBox4/VirtualBox.qrc

@@ -95 +95 @@
     <file alias="machine_16px.png">images/machine_16px.png</file>
     <file alias="help_16px.png">images/help_16px.png</file>
+    <file alias="help_button_normal_mac_22px.png">images/help_button_normal_mac_22px.png</file>
+    <file alias="help_button_pressed_mac_22px.png">images/help_button_pressed_mac_22px.png</file>
     <file alias="site_16px.png">images/site_16px.png</file>
     <file alias="register_16px.png">images/register_16px.png</file>

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

@@ -28 +28 @@
 /* Qt includes */
 #include <QDialogButtonBox>
+#include <QPointer>
 
 class QBoxLayout;
+
+class QIHelpButton;
 
 class QIDialogButtonBox: public QIWithRetranslateUI<QDialogButtonBox>
@@ -37 +40 @@
     QIDialogButtonBox (Qt::Orientation aOrientation, QWidget *aParent = 0) :QIWithRetranslateUI<QDialogButtonBox> (aParent) { setOrientation (aOrientation); }
     QIDialogButtonBox (StandardButtons aButtons, Qt::Orientation aOrientation = Qt::Horizontal, QWidget *aParent = 0);
+
+    QPushButton *button (StandardButton aWhich) const;
 
     QPushButton *addButton (const QString &aText, ButtonRole aRole);
@@ -52 +57 @@
 
     void retranslateUi();
+
+private:
+
+    QPointer<QIHelpButton> mHelpButton;
 };
 

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

@@ -22 +22 @@
 
 #include "QIDialogButtonBox.h"
+#include "QIHelpButton.h"
 
 #include <iprt/assert.h>
@@ -37 +38 @@
 
     retranslateUi();
+}
+
+QPushButton *QIDialogButtonBox::button (StandardButton aWhich) const
+{
+    QPushButton *button = QDialogButtonBox::button (aWhich);
+    if (!button &&
+        aWhich == QDialogButtonBox::Help)
+        button = mHelpButton;
+    return button;
 }
 
@@ -66 +76 @@
     layout->insertStretch(index + 2);
 }
+
 
 void QIDialogButtonBox::addExtraLayout (QLayout* aLayout)
@@ -98 +109 @@
 void QIDialogButtonBox::retranslateUi()
 {
-    QPushButton *btn = button (QDialogButtonBox::Help);
+    QPushButton *btn = QDialogButtonBox::button (QDialogButtonBox::Help);
     if (btn)
     {
-        btn->setText (tr ("&Help"));
-        if (btn->shortcut().isEmpty())
-            btn->setShortcut (QKeySequence::HelpContents); 
+        /* Use our very own help button if the user requested for one. */
+        if (!mHelpButton)
+            mHelpButton = new QIHelpButton;
+        mHelpButton->initFrom (btn);
+        removeButton (btn);
+        QDialogButtonBox::addButton (mHelpButton, QDialogButtonBox::HelpRole);
     }
 }
+