diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/imports/winextras/qquickwintaskbarbutton.cpp | 13 | ||||
-rw-r--r-- | src/imports/winextras/qquickwintaskbarbutton.h | 7 | ||||
-rw-r--r-- | src/winextras/qwintaskbarbutton.cpp | 20 | ||||
-rw-r--r-- | src/winextras/qwintaskbarbutton.h | 6 | ||||
-rw-r--r-- | src/winextras/qwintaskbarbutton_p.h | 2 |
5 files changed, 23 insertions, 25 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 diff --git a/src/winextras/qwintaskbarbutton.cpp b/src/winextras/qwintaskbarbutton.cpp index 268f6d9..4b5d7ec 100644 --- a/src/winextras/qwintaskbarbutton.cpp +++ b/src/winextras/qwintaskbarbutton.cpp @@ -116,9 +116,9 @@ void QWinTaskbarButtonPrivate::updateOverlayIcon() wchar_t *descrPtr = 0; HICON hicon = 0; - if (!overlayIconDescription.isEmpty()) { - descrPtr = new wchar_t[overlayIconDescription.length() + 1]; - descrPtr[overlayIconDescription.toWCharArray(descrPtr)] = 0; + if (!overlayAccessibleDescription.isEmpty()) { + descrPtr = new wchar_t[overlayAccessibleDescription.length() + 1]; + descrPtr[overlayAccessibleDescription.toWCharArray(descrPtr)] = 0; } if (!overlayIcon.isNull()) hicon = QtWinExtras::toHICON(overlayIcon.pixmap(iconSize())); @@ -226,25 +226,25 @@ void QWinTaskbarButton::setOverlayIcon(const QIcon &icon) */ void QWinTaskbarButton::clearOverlayIcon() { - setOverlayIconAccessibilityDescription(QString()); + setOverlayAccessibleDescription(QString()); setOverlayIcon(QIcon()); } /*! - \property QWinTaskbarButton::overlayIconAccessibilityDescription - \brief the overlay icon accessibility description text + \property QWinTaskbarButton::overlayAccessibleDescription + \brief the description of the overlay for accessibility purposes */ -QString QWinTaskbarButton::overlayIconAccessibilityDescription() const +QString QWinTaskbarButton::overlayAccessibleDescription() const { Q_D(const QWinTaskbarButton); - return d->overlayIconDescription; + return d->overlayAccessibleDescription; } -void QWinTaskbarButton::setOverlayIconAccessibilityDescription(const QString &description) +void QWinTaskbarButton::setOverlayAccessibleDescription(const QString &description) { Q_D(QWinTaskbarButton); - d->overlayIconDescription = description; + d->overlayAccessibleDescription = description; d->updateOverlayIcon(); } diff --git a/src/winextras/qwintaskbarbutton.h b/src/winextras/qwintaskbarbutton.h index b32f287..06731d1 100644 --- a/src/winextras/qwintaskbarbutton.h +++ b/src/winextras/qwintaskbarbutton.h @@ -56,7 +56,7 @@ class Q_WINEXTRAS_EXPORT QWinTaskbarButton : public QObject { Q_OBJECT Q_PROPERTY(QIcon overlayIcon READ overlayIcon WRITE setOverlayIcon RESET clearOverlayIcon) - Q_PROPERTY(QString overlayIconAccessibilityDescription READ overlayIconAccessibilityDescription WRITE setOverlayIconAccessibilityDescription) + Q_PROPERTY(QString overlayAccessibleDescription READ overlayAccessibleDescription WRITE setOverlayAccessibleDescription) Q_PROPERTY(QWinTaskbarProgress *progress READ progress) Q_PROPERTY(QWindow *window READ window WRITE setWindow) @@ -68,7 +68,7 @@ public: QWindow *window() const; QIcon overlayIcon() const; - QString overlayIconAccessibilityDescription() const; + QString overlayAccessibleDescription() const; QWinTaskbarProgress *progress() const; @@ -76,7 +76,7 @@ public: public Q_SLOTS: void setOverlayIcon(const QIcon &icon); - void setOverlayIconAccessibilityDescription(const QString &description); + void setOverlayAccessibleDescription(const QString &description); void clearOverlayIcon(); diff --git a/src/winextras/qwintaskbarbutton_p.h b/src/winextras/qwintaskbarbutton_p.h index 32b868e..b2f2504 100644 --- a/src/winextras/qwintaskbarbutton_p.h +++ b/src/winextras/qwintaskbarbutton_p.h @@ -62,7 +62,7 @@ public: QPointer<QWinTaskbarProgress> progressBar; QIcon overlayIcon; - QString overlayIconDescription; + QString overlayAccessibleDescription; HWND handle(); int iconSize() const; |