diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2013-09-05 02:38:37 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-06 11:06:20 +0200 |
| commit | 7192e799f3f7eb4ea510e1b11d8018c88b864121 (patch) | |
| tree | 7e81e1a85c73a268e2d47eec821374cd30c279fa /src/imports | |
| parent | d4dbe90ccfe43d93352846d20139531c03ed5627 (diff) | |
TaskbarButton::overlayAccessibleDescription
Unify the following properties to "overlayAccessibleDescription":
- QWinTaskbarButton::overlayIconAccessibilityDescription and
- QQuickWinTaskbarButton::iconDescription.
"overlayAccessibleDescription" is nice pair for "overlayIcon" and
more importantly, consistent with QWidget::accessibleDescription.
Change-Id: Id5c3afb1c9db6881876983ce482d622c90db3f2d
Reviewed-by: Ivan Vizir <define-true-false@yandex.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/winextras/qquickwintaskbarbutton.cpp | 13 | ||||
| -rw-r--r-- | src/imports/winextras/qquickwintaskbarbutton.h | 7 |
2 files changed, 9 insertions, 11 deletions
diff --git a/src/imports/winextras/qquickwintaskbarbutton.cpp b/src/imports/winextras/qquickwintaskbarbutton.cpp index 8ab9d42..179e838 100644 --- a/src/imports/winextras/qquickwintaskbarbutton.cpp +++ b/src/imports/winextras/qquickwintaskbarbutton.cpp @@ -102,19 +102,18 @@ void QQuickWinTaskbarButton::setOverlayIcon(const QString &path) } /*! - \qmlproperty int TaskbarButton::iconDescription + \qmlproperty string TaskbarButton::overlayAccessibleDescription - The accessibility description for the overlay icon. + The description of the overlay for accessibility purposes. */ -QString QQuickWinTaskbarButton::iconDescription() const +QString QQuickWinTaskbarButton::overlayAccessibleDescription() const { - return m_iconDescription; + return button->overlayAccessibleDescription(); } -void QQuickWinTaskbarButton::setIconDescription(const QString &descr) +void QQuickWinTaskbarButton::setOverlayAccessibleDescription(const QString &description) { - m_iconDescription = descr; - button->setOverlayIconAccessibilityDescription(m_iconDescription); + button->setOverlayAccessibleDescription(description); } void QQuickWinTaskbarButton::itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &data) diff --git a/src/imports/winextras/qquickwintaskbarbutton.h b/src/imports/winextras/qquickwintaskbarbutton.h index 118e085..a8bd874 100644 --- a/src/imports/winextras/qquickwintaskbarbutton.h +++ b/src/imports/winextras/qquickwintaskbarbutton.h @@ -54,7 +54,7 @@ class QQuickWinTaskbarButton : public QQuickItem { Q_OBJECT Q_PROPERTY(QString overlayIcon READ overlayIcon WRITE setOverlayIcon) - Q_PROPERTY(QString iconDescription READ iconDescription WRITE setIconDescription) + Q_PROPERTY(QString overlayAccessibleDescription READ overlayAccessibleDescription WRITE setOverlayAccessibleDescription) Q_PROPERTY(QWinTaskbarProgress *progress READ progress CONSTANT) public: @@ -63,8 +63,8 @@ public: QWinTaskbarProgress *progress() const; QString overlayIcon() const; void setOverlayIcon(const QString &path); - QString iconDescription() const; - void setIconDescription(const QString &descr); + QString overlayAccessibleDescription() const; + void setOverlayAccessibleDescription(const QString &description); protected: void itemChange(ItemChange, const ItemChangeData &) Q_DECL_OVERRIDE; @@ -72,7 +72,6 @@ protected: private: QWinTaskbarButton *button; QString m_iconPath; - QString m_iconDescription; }; QT_END_NAMESPACE |