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

Timestamp:

Oct 9, 2007 11:00:07 AM (17 years ago)

Author:

vboxsync

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

25120

Message:

FE/Qt: Added VBoxGlobal::setTextLabel(), a proper reimpl of QToolButton::setTextLabel() that assigns a correct accel if it is present in the text string.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

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

trunk/src/VBox/Frontends/VirtualBox/include/VBoxGlobal.h

@@ -41 +41 @@
 class QAction;
 class QLabel;
+class QToolButton;
 
 // Auxiliary types
@@ -431 +432 @@
                                const char *aDisabled = 0, const char *aSmallDisabled = 0,
                                const char *aActive = 0, const char *aSmallActive = 0);
+
+    static void setTextLabel (QToolButton *aToolButton, const QString &aTextLabel);
 
     static QRect normalizeGeometry (const QRect &aRect, const QRect &aBoundRect,

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

@@ -37 +37 @@
 #include <qimage.h>
 #include <qlabel.h>
+#include <qtoolbutton.h>
 
 #ifdef Q_WS_X11
@@ -2404 +2405 @@
 }
 
+/** 
+ *  Replacement for QToolButton::setTextLabel() that handles the shortcut
+ *  letter (if it is present in the argument string) as if it were a setText()
+ *  call: the shortcut letter is used to automatically assign an "Alt+<letter>"
+ *  accelerator key sequence to the given tool button.
+ *
+ *  @note This method preserves the icon set if it was assigned before. Only
+ *  the text label and the accelerator are changed.
+ * 
+ *  @param aToolButton  Tool button to set the text label on.
+ *  @param aTextLabel   Text label to set.
+ */
+/* static */
+void VBoxGlobal::setTextLabel (QToolButton *aToolButton,
+                               const QString &aTextLabel)
+{
+    AssertReturnVoid (aToolButton != NULL);
+
+    /* remember the icon set as setText() will kill it */
+    QIconSet iset = aToolButton->iconSet();
+    /* re-use the setText() method to detect and set the accelerator */
+    aToolButton->setText (aTextLabel);
+    QKeySequence accel = aToolButton->accel();
+    aToolButton->setTextLabel (aTextLabel);
+    aToolButton->setIconSet (iset);
+    /* set the accel last as setIconSet() would kill it */
+    aToolButton->setAccel (accel);
+}
+
 /**
  *  Ensures that the given rectangle \a aRect is fully contained within the