From 2c2b172221a7315dc43c62412db2ad2570fa178c Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Fri, 6 May 2016 17:27:22 +0200 Subject: [PATCH] Debugger: Fresh icons for QtQuick "App on Top" and "Select" Since these two features are revived for Qt 5.7, they deserve fresh icons. And since they could also gain back their place in the (qml)debugger toolbar, this patch provides also the toolbar icon variants. Change-Id: Id8c51aaa7ab81f594103fe1538fe6efe153af56a Reviewed-by: Ulf Hermann Reviewed-by: Thomas Hartmann --- src/plugins/debugger/debugger.qrc | 2 + src/plugins/debugger/debuggericons.h | 12 ++- src/plugins/debugger/debuggerplugin.cpp | 4 +- .../debugger/images/qml/app-on-top.png | Bin 178 -> 119 bytes .../debugger/images/qml/app-on-top@2x.png | Bin 0 -> 127 bytes src/plugins/debugger/images/qml/select.png | Bin 568 -> 157 bytes src/plugins/debugger/images/qml/select@2x.png | Bin 0 -> 246 bytes src/tools/icons/qtcreatoricons.svg | 83 ++++++++++++++++++ 8 files changed, 95 insertions(+), 6 deletions(-) create mode 100644 src/plugins/debugger/images/qml/app-on-top@2x.png create mode 100644 src/plugins/debugger/images/qml/select@2x.png diff --git a/src/plugins/debugger/debugger.qrc b/src/plugins/debugger/debugger.qrc index 699a0913de0..f49e25cd7bf 100644 --- a/src/plugins/debugger/debugger.qrc +++ b/src/plugins/debugger/debugger.qrc @@ -41,7 +41,9 @@ images/mode_debug_mask@2x.png images/pin.xpm images/qml/select.png + images/qml/select@2x.png images/qml/app-on-top.png + images/qml/app-on-top@2x.png images/debugger_restart_small.png images/debugger_restart_small@2x.png images/recordfill.png diff --git a/src/plugins/debugger/debuggericons.h b/src/plugins/debugger/debuggericons.h index 067f1379316..220b06fe4ca 100644 --- a/src/plugins/debugger/debuggericons.h +++ b/src/plugins/debugger/debuggericons.h @@ -81,10 +81,14 @@ const Utils::Icon LOCATION({ const Utils::Icon REVERSE_MODE({ {QLatin1String(":/debugger/images/debugger_reversemode_background.png"), Utils::Theme::IconsCodeModelOverlayForegroundColor}, {QLatin1String(":/debugger/images/debugger_reversemode.png"), Utils::Theme::IconsInfoColor}}, Utils::Icon::Tint); -const Utils::Icon APP_ON_TOP( - QLatin1String(":/debugger/images/qml/app-on-top.png")); -const Utils::Icon SELECT( - QLatin1String(":/debugger/images/qml/select.png")); +const Utils::Icon APP_ON_TOP({ + {QLatin1String(":/debugger/images/qml/app-on-top.png"), Utils::Theme::PanelTextColorMid}}, Utils::Icon::MenuTintedStyle); +const Utils::Icon APP_ON_TOP_TOOLBAR({ + {QLatin1String(":/debugger/images/qml/app-on-top.png"), Utils::Theme::IconsBaseColor}}); +const Utils::Icon SELECT({ + {QLatin1String(":/debugger/images/qml/select.png"), Utils::Theme::PanelTextColorMid}}, Utils::Icon::MenuTintedStyle); +const Utils::Icon SELECT_TOOLBAR({ + {QLatin1String(":/debugger/images/qml/select.png"), Utils::Theme::IconsBaseColor}}); const Utils::Icon EMPTY( QLatin1String(":/debugger/images/debugger_empty_14.png")); const Utils::Icon RECORD_ON({ diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index c59b8805c2d..6a7a0408554 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -1830,9 +1830,9 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments, // ToolbarDescription qmlToolbar // qmlToolbar.addAction(qmlUpdateOnSaveDummyAction); -// qmlToolbar.addAction(qmlShowAppOnTopDummyAction); +// qmlToolbar.addAction(qmlShowAppOnTopDummyAction, Icons::APP_ON_TOP_TOOLBAR.icon()); // qmlToolbar.addWidget(new StyledSeparator); -// qmlToolbar.addAction(qmlSelectDummyAction); +// qmlToolbar.addAction(qmlSelectDummyAction, Icons::SELECT_TOOLBAR.icon()); // qmlToolbar.addWidget(new StyledSeparator); Perspective basePerspective({}, { diff --git a/src/plugins/debugger/images/qml/app-on-top.png b/src/plugins/debugger/images/qml/app-on-top.png index e89026d1943fccd40fc5f02e9a3cc0b8b3572297..a6886d99c53e5ba21e59272af5b464d0ea9c876a 100644 GIT binary patch literal 119 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRdCT0c(hNQXTpBNYzI0Jk_Tp1V`&YU^(|NsB5 zovxJ(3=Eo{E{-7_(a904EIhnCJgX&kg{^f^l#rOQpd}+iKOGKa%5m&VDNPHb6Mw<&;$UTD zXBIGEGPD->?35`mUxDFutK@^{&zINy{PfiF)~#D<4*L`Yj3=is2x!|?e0cEc_V)bw zTefYR*8IcaOyhae6Ko9)S7w=JoBjRy`MGewo9ibhtMf-h)<;@09&K%$(JI0GLt0u| zI&M$JM@fxuqA4fZ`Q`8V&bQkutFfHxNX(0Mj^+(l&zw2)_1s+R`TJ{svlSgRSNO+y zWWRpwu99Pi4&fc=W$rF69uJKg_Dgce z*;aj#%y_ImLEGWS%gf8pS5;Ll+qGjy1=H0NkBb>suUxtE_TK96`)YoD;mqNw)niQq*&WS4OifLf?yvv_ zSvwyZH3)JlGv5dZ{z%?>p&Y!8@}6_{P0ot-WI{>_^;oW+a`^Lk<~$;mX` RU|?Wi@O1TaS?83{1OOs)3%>vW diff --git a/src/plugins/debugger/images/qml/select@2x.png b/src/plugins/debugger/images/qml/select@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..91470f8be1f588a6866bfbf704b02fe1b7d34717 GIT binary patch literal 246 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4h9AWhA=@@4F(2=y`Ckdu&=)~6lz>!Btdg>jus@W@EJ&@FEekd_z<@fzM=RQ66-}h1G zg5V#{1!nsje@tGoE3Cj@reW#^=6h3^_p~sW^a?quFAWrGn14xw^T2hJTuy}(l^LE4 z2WM{N5D=Tfxabh0K&%YI-%E@JJFba7`+GKQ_NPSFy=raWE-@t + + + + + + + + + + + + + + + + + + +