diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-04-08 10:08:19 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-09 14:56:32 +0200 |
| commit | 0e9ea64edcdb451ffcfbf055174354e6c8f2df88 (patch) | |
| tree | a64115cd160ae1c4b3aa455547617ed347f6e5d7 | |
| parent | 12d8264a24664965de5c8443ffbb013bbeee8b1f (diff) | |
Add Style hint for Clear buttons within QLineEdit.
Initial-patch-by: Kevin.Ottens@kdab.com
Change-Id: I4893923d5015535eb6d934636d6b5925088d7be8
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
| -rw-r--r-- | src/widgets/styles/images/cleartext-16.png | bin | 0 -> 760 bytes | |||
| -rw-r--r-- | src/widgets/styles/qcommonstyle.cpp | 9 | ||||
| -rw-r--r-- | src/widgets/styles/qstyle.cpp | 1 | ||||
| -rw-r--r-- | src/widgets/styles/qstyle.h | 1 | ||||
| -rw-r--r-- | src/widgets/styles/qstyle.qrc | 1 |
5 files changed, 12 insertions, 0 deletions
diff --git a/src/widgets/styles/images/cleartext-16.png b/src/widgets/styles/images/cleartext-16.png Binary files differnew file mode 100644 index 0000000000..74133bafff --- /dev/null +++ b/src/widgets/styles/images/cleartext-16.png diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp index c6edbee67d..e601110c3e 100644 --- a/src/widgets/styles/qcommonstyle.cpp +++ b/src/widgets/styles/qcommonstyle.cpp @@ -5289,6 +5289,13 @@ QPixmap QCommonStyle::standardPixmap(StandardPixmap sp, const QStyleOption *opti } } break; + case SP_LineEditClearButton: { + QString themeName = rtl ? QStringLiteral("edit-clear-locationbar-ltr") : QStringLiteral("edit-clear-locationbar-rtl"); + if (!QIcon::hasThemeIcon(themeName)) + themeName = QStringLiteral("edit-clear"); + pixmap = QIcon::fromTheme(themeName).pixmap(16); + } + break; default: break; } @@ -5417,6 +5424,8 @@ QPixmap QCommonStyle::standardPixmap(StandardPixmap sp, const QStyleOption *opti return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-volume-16.png")); case SP_MediaVolumeMuted: return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-volume-muted-16.png")); + case SP_LineEditClearButton: + return QPixmap(QStringLiteral(":/qt-project.org/styles/commonstyle/images/cleartext-16.png")); #endif // QT_NO_IMAGEFORMAT_PNG default: break; diff --git a/src/widgets/styles/qstyle.cpp b/src/widgets/styles/qstyle.cpp index 603d0e50a5..7ab5734eed 100644 --- a/src/widgets/styles/qstyle.cpp +++ b/src/widgets/styles/qstyle.cpp @@ -1986,6 +1986,7 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment, \value SP_MediaSeekBackward Icon indicating that media should seek backward. \value SP_MediaVolume Icon indicating a volume control. \value SP_MediaVolumeMuted Icon indicating a muted volume control. + \value SP_LineEditClearButton Icon for a standard clear button in a QLineEdit. This enum value was added in Qt 5.2. \value SP_CustomBase Base value for custom standard pixmaps; custom values must be greater than this value. diff --git a/src/widgets/styles/qstyle.h b/src/widgets/styles/qstyle.h index beafad326e..31ec2cd97a 100644 --- a/src/widgets/styles/qstyle.h +++ b/src/widgets/styles/qstyle.h @@ -777,6 +777,7 @@ public: SP_MediaSeekBackward, SP_MediaVolume, SP_MediaVolumeMuted, + SP_LineEditClearButton, // do not add any values below/greater than this SP_CustomBase = 0xf0000000 }; diff --git a/src/widgets/styles/qstyle.qrc b/src/widgets/styles/qstyle.qrc index 28ad484032..c063ec5036 100644 --- a/src/widgets/styles/qstyle.qrc +++ b/src/widgets/styles/qstyle.qrc @@ -1,5 +1,6 @@ <RCC> <qresource prefix="/qt-project.org/styles/commonstyle"> + <file>images/cleartext-16.png</file> <file>images/filelink-16.png</file> <file>images/filelink-32.png</file> <file>images/filelink-128.png</file> |
