From 4ff5157a24c1dce34d1e1c29a957108de7867085 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Wed, 3 Apr 2019 14:31:43 +0200 Subject: [PATCH] Debugger: Provide a mode-bar sized icon for the "Debugger.Stop" action That big Icon was always there, but unused. add it to the "Debugger.Stop" (in addition to the toolbar sized one), so that it looks good when it appears in the mode bar. For the "Classic" variant, I needed to add a @2x variant of the non-flat icon. Change-Id: Iea7200c7821b3780ff11a17b3ec74c44e06ba8d1 Reviewed-by: hjk --- src/plugins/debugger/debugger.qrc | 2 ++ src/plugins/debugger/debuggericons.cpp | 4 +++- src/plugins/debugger/debuggericons.h | 1 + src/plugins/debugger/debuggerplugin.cpp | 4 +++- src/plugins/debugger/images/debugger_stop.png | Bin 0 -> 1304 bytes src/plugins/debugger/images/debugger_stop@2x.png | Bin 0 -> 4662 bytes src/plugins/debugger/images/debugger_stop_32.png | Bin 1342 -> 0 bytes 7 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 src/plugins/debugger/images/debugger_stop.png create mode 100644 src/plugins/debugger/images/debugger_stop@2x.png delete mode 100644 src/plugins/debugger/images/debugger_stop_32.png diff --git a/src/plugins/debugger/debugger.qrc b/src/plugins/debugger/debugger.qrc index bf8095b3380..86a05a73ff1 100644 --- a/src/plugins/debugger/debugger.qrc +++ b/src/plugins/debugger/debugger.qrc @@ -14,6 +14,8 @@ images/debugger_interrupt@2x.png images/debugger_interrupt_mask.png images/debugger_interrupt_mask@2x.png + images/debugger_stop.png + images/debugger_stop@2x.png images/debugger_stop_mask.png images/debugger_stop_mask@2x.png images/debugger_reversemode.png diff --git a/src/plugins/debugger/debuggericons.cpp b/src/plugins/debugger/debuggericons.cpp index 1c047acc2df..c50f5fdc621 100644 --- a/src/plugins/debugger/debuggericons.cpp +++ b/src/plugins/debugger/debuggericons.cpp @@ -66,8 +66,10 @@ const Icon INTERRUPT( const Icon INTERRUPT_FLAT({ {":/debugger/images/debugger_interrupt_mask.png", Theme::IconsInterruptToolBarColor}, {":/projectexplorer/images/debugger_beetle_mask.png", Theme::IconsDebugColor}}); +const Icon STOP( + ":/debugger/images/debugger_stop.png"); const Icon STOP_FLAT({ - {":/debugger/images/debugger_stop_mask.png", Theme::IconsStopColor}, + {":/debugger/images/debugger_stop_mask.png", Theme::IconsStopToolBarColor}, {":/projectexplorer/images/debugger_beetle_mask.png", Theme::IconsDebugColor}}); const Icon DEBUG_INTERRUPT_SMALL({ {":/utils/images/interrupt_small.png", Theme::IconsInterruptColor}, diff --git a/src/plugins/debugger/debuggericons.h b/src/plugins/debugger/debuggericons.h index 778fb4a33f1..b7d83f27ddf 100644 --- a/src/plugins/debugger/debuggericons.h +++ b/src/plugins/debugger/debuggericons.h @@ -50,6 +50,7 @@ extern const Utils::Icon DEBUG_CONTINUE_SMALL; extern const Utils::Icon DEBUG_CONTINUE_SMALL_TOOLBAR; extern const Utils::Icon INTERRUPT; extern const Utils::Icon INTERRUPT_FLAT; +extern const Utils::Icon STOP; extern const Utils::Icon STOP_FLAT; extern const Utils::Icon DEBUG_INTERRUPT_SMALL; extern const Utils::Icon DEBUG_INTERRUPT_SMALL_TOOLBAR; diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index a0fb122a8c7..a18f0a652c7 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -1206,7 +1206,9 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments, touchBar->addAction(cmd); debugMenu->addAction(cmd, CC::G_DEFAULT_ONE); - act = new QAction(Icons::DEBUG_EXIT_SMALL.icon(), tr("Stop Debugger"), this); + const QIcon sidebarStopIcon = Icon::sideBarIcon(Icons::STOP, Icons::STOP_FLAT); + const QIcon stopIcon = Icon::combinedIcon({Icons::DEBUG_EXIT_SMALL.icon(), sidebarStopIcon}); + act = new QAction(stopIcon, tr("Stop Debugger"), this); act->setEnabled(false); cmd = ActionManager::registerAction(act, Constants::STOP); cmd->setTouchBarIcon(Icons::MACOS_TOUCHBAR_DEBUG_EXIT.icon()); diff --git a/src/plugins/debugger/images/debugger_stop.png b/src/plugins/debugger/images/debugger_stop.png new file mode 100644 index 0000000000000000000000000000000000000000..6d4c3c59e94339081f184e15be0314646c038a23 GIT binary patch literal 1304 zcmeAS@N?(olHy`uVBq!ia0y~yU{C^K4mJh`1}k^&LktWo_dQ)4Ln02Jo#CA`B~;{i z{e5%eTBD`9Yg<=tVLc_nap{88fdF~V1rsN1xYSUXX>dXGSnIJ36OOow=k!cXxHI9H z0FSozu?R;d!Gl39)28ivd3fLLiRY^Ky}$Q<*NZKg%ll_;ldwGL`|hl5@%jIM&hLCa zFaLq1Ag_bw*Z)lyOx|4X<~Mzt{oqM`!t+0@OZ`;Oc%&9>vI-B~y5Le$%}SOpc2>2s zxVLQj()YcH}8_km((Nqd;;0m8nqmoKbK5# z^7B!!k<&RHB{?C}fK!@P=dc40pAtKpL3`T-x${%zt(*L+U`?N(sJgk1qJXWfL~Lxw zzkibFLw!2dPHl5L+R`o&Fzvkij*WtwHw$YE&D<{kx+TW9??kHv2Mfpb>%uQz%+Rd6 z#^jLvyvVd?#f;m+d09$VE;JaORoxqY-pFLLq~PPnKl1N5RM`~onJ>Q1wP8b)o6dn3 zZ;zJ0mGbIn>DAk^eU%L7wr!7gR~D;@Pm}IT7n)U&ukW9KH%iE5&G&D2Vm9%~9-23` zm51fSy}jN4KPGRPYNX^VT<^`T>Ag=E<8aGb-RR!aZQ%w55kVg|9wx=fO->(rVhe z#fy^D)@J^gbg4jPsbCj}QrjHKe+y17xxZk+f(8eJBQ5DdhbKt1E!lCycTZhKoa1S` zf`p55N3LIEGn4)|!Ex8TmSw)NzPeSerM^O)95H(0b7SxBxT`wDt)u5m>5VrhqlH?`6|-n> zrp|4DmOm=JT{$^f{per&RoBy=W@cv32|QdpQ}RWn%j3IImx6*B3T~9nG3&mxxBU`B z{T&%k2QIfNc|ISW^0?gm+7mZkaI|R}`ebX#`*dEnJ~{VwxWKXl@*I!&SvXmkJ&YIa zt^M*>OF?_#Jk!1}jJ39B_umzAd$D@qKiT&pJH2J4KW(2dX;$Ad$MV~?Ic3)8&g8hU z{a((saFT}RioG@ewwk__pWh%Gy873Xo=W3yOD&5}ndfL#U!VC_YpeC7>&vW-Kk{tf zd~xf%Z`ar(4!N8;#WDL_wPsoAnx!xAUECob!P&+4gst}R)!5$sF)U@T%x+Jd^G9}< zvSsQ2V>Q?7PWRk6wCt#k{Q8=YPs^t_c%N4?*<4?4YxSMETt_q5{r4=XtgP947b`cb zTg%=3=fF{@zpD6a%-5&#kLInK;+1h^qKv}gW!q-Xx|O!=z0Uu#D!KFbiob3@Qmp)+ asq5-p)?IIIEM#C{VDNPHb6Mw<&;$S!7I7H> literal 0 HcmV?d00001 diff --git a/src/plugins/debugger/images/debugger_stop@2x.png b/src/plugins/debugger/images/debugger_stop@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..27f6b3828f4ca1ac9f865df592cead44d1b6735f GIT binary patch literal 4662 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