diff options
author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2013-06-03 14:05:26 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-03 22:25:54 +0200 |
commit | eeb3c959334d1e6b4ea9f7538b603a711f8a8262 (patch) | |
tree | a8e8336d2cc1de41e64ddfdfa4092b5afe329000 /src/controls/qquickaction_p.h | |
parent | 4e5bf941f1b3089c22392bb5416d44cb8defe47d (diff) | |
download | qtquickcontrols-eeb3c959334d1e6b4ea9f7538b603a711f8a8262.tar.gz |
Buttons: Allow overriding of visual properties when 'action' is set
Those properties are, text, tooltip, iconName, and iconSource.
Also, properly capitalized gallery's tooltips.
Change-Id: I1995a85565edd7aaa420279821d7c1a31ef18253
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'src/controls/qquickaction_p.h')
-rw-r--r-- | src/controls/qquickaction_p.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/controls/qquickaction_p.h b/src/controls/qquickaction_p.h index e106a920..aa63b408 100644 --- a/src/controls/qquickaction_p.h +++ b/src/controls/qquickaction_p.h @@ -57,11 +57,11 @@ class QQuickAction : public QObject { Q_OBJECT - Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged) - Q_PROPERTY(QUrl iconSource READ iconSource WRITE setIconSource NOTIFY iconSourceChanged) + Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged RESET resetText) + Q_PROPERTY(QUrl iconSource READ iconSource WRITE setIconSource NOTIFY iconSourceChanged RESET resetIconSource) Q_PROPERTY(QString iconName READ iconName WRITE setIconName NOTIFY iconNameChanged) Q_PROPERTY(QVariant __icon READ iconVariant NOTIFY iconChanged) - Q_PROPERTY(QString tooltip READ tooltip WRITE setTooltip NOTIFY tooltipChanged) + Q_PROPERTY(QString tooltip READ tooltip WRITE setTooltip NOTIFY tooltipChanged RESET resetTooltip) Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged) Q_PROPERTY(bool checkable READ isCheckable WRITE setCheckable NOTIFY checkableChanged) Q_PROPERTY(bool checked READ isChecked WRITE setChecked DESIGNABLE isCheckable NOTIFY toggled) @@ -76,6 +76,7 @@ public: ~QQuickAction(); QString text() const { return m_text; } + void resetText() { setText(QString()); } void setText(const QString &text); QString shortcut() const; @@ -87,9 +88,11 @@ public: void setIconName(const QString &iconName); QUrl iconSource() const { return m_iconSource; } + void resetIconSource() { setIconSource(QString()); } void setIconSource(const QUrl &iconSource); QString tooltip() const { return m_tooltip; } + void resetTooltip() { setTooltip(QString()); } void setTooltip(const QString &tooltip); bool isEnabled() const { return m_enabled; } |