From 6c7fff8c91d68912797fa84360ab374b858f44c4 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 11 Jan 2018 12:54:56 +0100 Subject: QCommonStyle: Add title bar and tool bar extension icons Add larger pixmaps for the title bar and tool bar extension icons. Task-number: QTBUG-38776 Change-Id: If2514f7aa66fa46d25133165ca45318a5045d387 Reviewed-by: Richard Moe Gustavsen Reviewed-by: Gabriel de Dietrich --- .../styles/images/titlebar-contexthelp-16.png | Bin 0 -> 396 bytes .../styles/images/titlebar-contexthelp-32.png | Bin 0 -> 661 bytes .../styles/images/titlebar-contexthelp-48.png | Bin 0 -> 891 bytes src/widgets/styles/images/titlebar-max-16.png | Bin 0 -> 158 bytes src/widgets/styles/images/titlebar-max-32.png | Bin 0 -> 163 bytes src/widgets/styles/images/titlebar-max-48.png | Bin 0 -> 167 bytes src/widgets/styles/images/titlebar-min-16.png | Bin 0 -> 166 bytes src/widgets/styles/images/titlebar-min-32.png | Bin 0 -> 171 bytes src/widgets/styles/images/titlebar-min-48.png | Bin 0 -> 175 bytes src/widgets/styles/images/titlebar-shade-16.png | Bin 0 -> 253 bytes src/widgets/styles/images/titlebar-shade-32.png | Bin 0 -> 282 bytes src/widgets/styles/images/titlebar-shade-48.png | Bin 0 -> 339 bytes src/widgets/styles/images/titlebar-unshade-16.png | Bin 0 -> 244 bytes src/widgets/styles/images/titlebar-unshade-32.png | Bin 0 -> 294 bytes src/widgets/styles/images/titlebar-unshade-48.png | Bin 0 -> 336 bytes src/widgets/styles/images/toolbar-ext-h-16.png | Bin 0 -> 349 bytes src/widgets/styles/images/toolbar-ext-h-32.png | Bin 0 -> 568 bytes src/widgets/styles/images/toolbar-ext-h-8.png | Bin 0 -> 220 bytes src/widgets/styles/images/toolbar-ext-h-rtl-16.png | Bin 0 -> 128 bytes src/widgets/styles/images/toolbar-ext-h-rtl-32.png | Bin 0 -> 148 bytes src/widgets/styles/images/toolbar-ext-h-rtl-8.png | Bin 0 -> 114 bytes src/widgets/styles/images/toolbar-ext-v-10.png | Bin 0 -> 387 bytes src/widgets/styles/images/toolbar-ext-v-20.png | Bin 0 -> 625 bytes src/widgets/styles/images/toolbar-ext-v-5.png | Bin 0 -> 223 bytes src/widgets/styles/qcommonstyle.cpp | 42 ++++++++++++++++++--- src/widgets/styles/qstyle.qrc | 24 ++++++++++++ 26 files changed, 61 insertions(+), 5 deletions(-) create mode 100644 src/widgets/styles/images/titlebar-contexthelp-16.png create mode 100644 src/widgets/styles/images/titlebar-contexthelp-32.png create mode 100644 src/widgets/styles/images/titlebar-contexthelp-48.png create mode 100644 src/widgets/styles/images/titlebar-max-16.png create mode 100644 src/widgets/styles/images/titlebar-max-32.png create mode 100644 src/widgets/styles/images/titlebar-max-48.png create mode 100644 src/widgets/styles/images/titlebar-min-16.png create mode 100644 src/widgets/styles/images/titlebar-min-32.png create mode 100644 src/widgets/styles/images/titlebar-min-48.png create mode 100644 src/widgets/styles/images/titlebar-shade-16.png create mode 100644 src/widgets/styles/images/titlebar-shade-32.png create mode 100644 src/widgets/styles/images/titlebar-shade-48.png create mode 100644 src/widgets/styles/images/titlebar-unshade-16.png create mode 100644 src/widgets/styles/images/titlebar-unshade-32.png create mode 100644 src/widgets/styles/images/titlebar-unshade-48.png create mode 100644 src/widgets/styles/images/toolbar-ext-h-16.png create mode 100644 src/widgets/styles/images/toolbar-ext-h-32.png create mode 100644 src/widgets/styles/images/toolbar-ext-h-8.png create mode 100644 src/widgets/styles/images/toolbar-ext-h-rtl-16.png create mode 100644 src/widgets/styles/images/toolbar-ext-h-rtl-32.png create mode 100644 src/widgets/styles/images/toolbar-ext-h-rtl-8.png create mode 100644 src/widgets/styles/images/toolbar-ext-v-10.png create mode 100644 src/widgets/styles/images/toolbar-ext-v-20.png create mode 100644 src/widgets/styles/images/toolbar-ext-v-5.png (limited to 'src/widgets/styles') diff --git a/src/widgets/styles/images/titlebar-contexthelp-16.png b/src/widgets/styles/images/titlebar-contexthelp-16.png new file mode 100644 index 0000000000..2cead19910 Binary files /dev/null and b/src/widgets/styles/images/titlebar-contexthelp-16.png differ diff --git a/src/widgets/styles/images/titlebar-contexthelp-32.png b/src/widgets/styles/images/titlebar-contexthelp-32.png new file mode 100644 index 0000000000..1cd4843d5e Binary files /dev/null and b/src/widgets/styles/images/titlebar-contexthelp-32.png differ diff --git a/src/widgets/styles/images/titlebar-contexthelp-48.png b/src/widgets/styles/images/titlebar-contexthelp-48.png new file mode 100644 index 0000000000..9b170687be Binary files /dev/null and b/src/widgets/styles/images/titlebar-contexthelp-48.png differ diff --git a/src/widgets/styles/images/titlebar-max-16.png b/src/widgets/styles/images/titlebar-max-16.png new file mode 100644 index 0000000000..101a7eac2b Binary files /dev/null and b/src/widgets/styles/images/titlebar-max-16.png differ diff --git a/src/widgets/styles/images/titlebar-max-32.png b/src/widgets/styles/images/titlebar-max-32.png new file mode 100644 index 0000000000..529c54f61d Binary files /dev/null and b/src/widgets/styles/images/titlebar-max-32.png differ diff --git a/src/widgets/styles/images/titlebar-max-48.png b/src/widgets/styles/images/titlebar-max-48.png new file mode 100644 index 0000000000..cfa0b67edf Binary files /dev/null and b/src/widgets/styles/images/titlebar-max-48.png differ diff --git a/src/widgets/styles/images/titlebar-min-16.png b/src/widgets/styles/images/titlebar-min-16.png new file mode 100644 index 0000000000..95e714b522 Binary files /dev/null and b/src/widgets/styles/images/titlebar-min-16.png differ diff --git a/src/widgets/styles/images/titlebar-min-32.png b/src/widgets/styles/images/titlebar-min-32.png new file mode 100644 index 0000000000..0b9afedecf Binary files /dev/null and b/src/widgets/styles/images/titlebar-min-32.png differ diff --git a/src/widgets/styles/images/titlebar-min-48.png b/src/widgets/styles/images/titlebar-min-48.png new file mode 100644 index 0000000000..b59a336d36 Binary files /dev/null and b/src/widgets/styles/images/titlebar-min-48.png differ diff --git a/src/widgets/styles/images/titlebar-shade-16.png b/src/widgets/styles/images/titlebar-shade-16.png new file mode 100644 index 0000000000..cc870a1e5c Binary files /dev/null and b/src/widgets/styles/images/titlebar-shade-16.png differ diff --git a/src/widgets/styles/images/titlebar-shade-32.png b/src/widgets/styles/images/titlebar-shade-32.png new file mode 100644 index 0000000000..b785b8e216 Binary files /dev/null and b/src/widgets/styles/images/titlebar-shade-32.png differ diff --git a/src/widgets/styles/images/titlebar-shade-48.png b/src/widgets/styles/images/titlebar-shade-48.png new file mode 100644 index 0000000000..42b75b4a0c Binary files /dev/null and b/src/widgets/styles/images/titlebar-shade-48.png differ diff --git a/src/widgets/styles/images/titlebar-unshade-16.png b/src/widgets/styles/images/titlebar-unshade-16.png new file mode 100644 index 0000000000..ef19de6c2f Binary files /dev/null and b/src/widgets/styles/images/titlebar-unshade-16.png differ diff --git a/src/widgets/styles/images/titlebar-unshade-32.png b/src/widgets/styles/images/titlebar-unshade-32.png new file mode 100644 index 0000000000..9f74bb0ac7 Binary files /dev/null and b/src/widgets/styles/images/titlebar-unshade-32.png differ diff --git a/src/widgets/styles/images/titlebar-unshade-48.png b/src/widgets/styles/images/titlebar-unshade-48.png new file mode 100644 index 0000000000..bd17c3cf48 Binary files /dev/null and b/src/widgets/styles/images/titlebar-unshade-48.png differ diff --git a/src/widgets/styles/images/toolbar-ext-h-16.png b/src/widgets/styles/images/toolbar-ext-h-16.png new file mode 100644 index 0000000000..c6bd1b1784 Binary files /dev/null and b/src/widgets/styles/images/toolbar-ext-h-16.png differ diff --git a/src/widgets/styles/images/toolbar-ext-h-32.png b/src/widgets/styles/images/toolbar-ext-h-32.png new file mode 100644 index 0000000000..99c62698f2 Binary files /dev/null and b/src/widgets/styles/images/toolbar-ext-h-32.png differ diff --git a/src/widgets/styles/images/toolbar-ext-h-8.png b/src/widgets/styles/images/toolbar-ext-h-8.png new file mode 100644 index 0000000000..340a374bce Binary files /dev/null and b/src/widgets/styles/images/toolbar-ext-h-8.png differ diff --git a/src/widgets/styles/images/toolbar-ext-h-rtl-16.png b/src/widgets/styles/images/toolbar-ext-h-rtl-16.png new file mode 100644 index 0000000000..31c72892b4 Binary files /dev/null and b/src/widgets/styles/images/toolbar-ext-h-rtl-16.png differ diff --git a/src/widgets/styles/images/toolbar-ext-h-rtl-32.png b/src/widgets/styles/images/toolbar-ext-h-rtl-32.png new file mode 100644 index 0000000000..bfc333daac Binary files /dev/null and b/src/widgets/styles/images/toolbar-ext-h-rtl-32.png differ diff --git a/src/widgets/styles/images/toolbar-ext-h-rtl-8.png b/src/widgets/styles/images/toolbar-ext-h-rtl-8.png new file mode 100644 index 0000000000..538e408310 Binary files /dev/null and b/src/widgets/styles/images/toolbar-ext-h-rtl-8.png differ diff --git a/src/widgets/styles/images/toolbar-ext-v-10.png b/src/widgets/styles/images/toolbar-ext-v-10.png new file mode 100644 index 0000000000..2a6d0e4c70 Binary files /dev/null and b/src/widgets/styles/images/toolbar-ext-v-10.png differ diff --git a/src/widgets/styles/images/toolbar-ext-v-20.png b/src/widgets/styles/images/toolbar-ext-v-20.png new file mode 100644 index 0000000000..adc27f52b5 Binary files /dev/null and b/src/widgets/styles/images/toolbar-ext-v-20.png differ diff --git a/src/widgets/styles/images/toolbar-ext-v-5.png b/src/widgets/styles/images/toolbar-ext-v-5.png new file mode 100644 index 0000000000..21c670446c Binary files /dev/null and b/src/widgets/styles/images/toolbar-ext-v-5.png differ diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp index 06590afe72..f78aca58ac 100644 --- a/src/widgets/styles/qcommonstyle.cpp +++ b/src/widgets/styles/qcommonstyle.cpp @@ -5716,14 +5716,14 @@ static inline QString iconPngSuffix() { return QStringLiteral(".png"); } static void addIconFiles(const QString &prefix, const int sizes[], size_t count, QIcon &icon) { - for (size_t i = 0; i < count; ++i) { - const int size = sizes[i]; - icon.addFile(prefix + QString::number(size) + iconPngSuffix(), QSize(size, size)); - } + for (size_t i = 0; i < count; ++i) + icon.addFile(prefix + QString::number(sizes[i]) + iconPngSuffix()); } static const int dockTitleIconSizes[] = {10, 16, 20, 32, 48, 64}; - +static const int titleBarSizes[] = {16, 32, 48}; +static const int toolBarExtHSizes[] = {8, 16, 32}; +static const int toolBarExtVSizes[] = {5, 10, 20}; #endif // imageformat_png /*! @@ -6038,6 +6038,27 @@ QIcon QCommonStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption switch (standardIcon) { #ifndef QT_NO_IMAGEFORMAT_PNG + case SP_TitleBarMinButton: + addIconFiles(iconResourcePrefix() + QStringLiteral("titlebar-min-"), + titleBarSizes, sizeof(titleBarSizes)/sizeof(titleBarSizes[0]), icon); + break; + case SP_TitleBarMaxButton: + addIconFiles(iconResourcePrefix() + QStringLiteral("titlebar-max-"), + titleBarSizes, sizeof(titleBarSizes)/sizeof(titleBarSizes[0]), icon); + break; + case SP_TitleBarShadeButton: + addIconFiles(iconResourcePrefix() + QStringLiteral("titlebar-shade-"), + titleBarSizes, sizeof(titleBarSizes)/sizeof(titleBarSizes[0]), icon); + + break; + case SP_TitleBarUnshadeButton: + addIconFiles(iconResourcePrefix() + QStringLiteral("titlebar-unshade-"), + titleBarSizes, sizeof(titleBarSizes)/sizeof(titleBarSizes[0]), icon); + break; + case SP_TitleBarContextHelpButton: + addIconFiles(iconResourcePrefix() + QStringLiteral("titlebar-contexthelp-"), + titleBarSizes, sizeof(titleBarSizes)/sizeof(titleBarSizes[0]), icon); + break; case SP_FileDialogNewFolder: icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/newdirectory-16.png"), QSize(16, 16)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/newdirectory-32.png"), QSize(32, 32)); @@ -6246,6 +6267,17 @@ QIcon QCommonStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption addIconFiles(iconResourcePrefix() + QStringLiteral("normalizedockup-"), dockTitleIconSizes, sizeof(dockTitleIconSizes)/sizeof(dockTitleIconSizes[0]), icon); break; + case SP_ToolBarHorizontalExtensionButton: { + QString prefix = iconResourcePrefix() + QStringLiteral("toolbar-ext-h-"); + if (rtl) + prefix += QStringLiteral("rtl-"); + addIconFiles(prefix, toolBarExtHSizes, sizeof(toolBarExtHSizes)/sizeof(toolBarExtHSizes[0]), icon); + } + break; + case SP_ToolBarVerticalExtensionButton: + addIconFiles(iconResourcePrefix() + QStringLiteral("toolbar-ext-v-"), + toolBarExtVSizes, sizeof(toolBarExtVSizes)/sizeof(toolBarExtVSizes[0]), icon); + break; #endif // QT_NO_IMAGEFORMAT_PNG default: icon.addPixmap(proxy()->standardPixmap(standardIcon, option, widget)); diff --git a/src/widgets/styles/qstyle.qrc b/src/widgets/styles/qstyle.qrc index 93e4bf480e..d3511ee754 100644 --- a/src/widgets/styles/qstyle.qrc +++ b/src/widgets/styles/qstyle.qrc @@ -140,6 +140,30 @@ images/normalizedockup-32.png images/normalizedockup-48.png images/normalizedockup-64.png + images/toolbar-ext-h-8.png + images/toolbar-ext-h-16.png + images/toolbar-ext-h-32.png + images/toolbar-ext-h-rtl-8.png + images/toolbar-ext-h-rtl-16.png + images/toolbar-ext-h-rtl-32.png + images/toolbar-ext-v-5.png + images/toolbar-ext-v-10.png + images/toolbar-ext-v-20.png + images/titlebar-contexthelp-16.png + images/titlebar-contexthelp-32.png + images/titlebar-contexthelp-48.png + images/titlebar-max-16.png + images/titlebar-max-32.png + images/titlebar-max-48.png + images/titlebar-min-16.png + images/titlebar-min-32.png + images/titlebar-min-48.png + images/titlebar-shade-16.png + images/titlebar-shade-32.png + images/titlebar-shade-48.png + images/titlebar-unshade-16.png + images/titlebar-unshade-32.png + images/titlebar-unshade-48.png images/closedock-macstyle-16.png -- cgit v1.2.3