From a8dd4f7d5b8f61b52a5aea7b8418a6a3961cae1e Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 13 Jun 2017 15:05:59 +0200 Subject: QQuickAbstractButton: add preliminary support for mnemonics This patch adds mnemonic shortcut functionality. We don't have a nice way to visualize mnemonics yet, so we just remove the ampersands from the UI for now. Change-Id: I90f54bd18d5d17f11e02c18c8461bfc25ce51cf1 Reviewed-by: Qt CI Bot Reviewed-by: Mitch Curtis --- src/quicktemplates2/qquickabstractbutton_p.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/quicktemplates2/qquickabstractbutton_p.h') diff --git a/src/quicktemplates2/qquickabstractbutton_p.h b/src/quicktemplates2/qquickabstractbutton_p.h index 25827c9f..81384298 100644 --- a/src/quicktemplates2/qquickabstractbutton_p.h +++ b/src/quicktemplates2/qquickabstractbutton_p.h @@ -116,6 +116,11 @@ public: QQuickAction *action() const; void setAction(QQuickAction *action); +#if QT_CONFIG(shortcut) + QKeySequence shortcut() const; + void setShortcut(const QKeySequence &shortcut); +#endif + public Q_SLOTS: void toggle(); @@ -141,6 +146,7 @@ Q_SIGNALS: protected: QQuickAbstractButton(QQuickAbstractButtonPrivate &dd, QQuickItem *parent); + bool event(QEvent *event) override; void focusOutEvent(QFocusEvent *event) override; void keyPressEvent(QKeyEvent *event) override; void keyReleaseEvent(QKeyEvent *event) override; @@ -148,6 +154,8 @@ protected: void mouseDoubleClickEvent(QMouseEvent *event) override; void timerEvent(QTimerEvent *event) override; + void itemChange(ItemChange change, const ItemChangeData &value) override; + enum ButtonChange { ButtonAutoRepeatChange, ButtonCheckedChange, -- cgit v1.2.3