From 519b9566689d39438bc4fec7c0036c51d040870b Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Tue, 29 Mar 2016 13:00:46 +0200 Subject: [PATCH] Redone debug start/stop/interrupt/continue icons Currently, these icons have a big "bug beetle" and a small action icon as overlay. According to user feedback, the relevant element (the action) has too little visibility. This change turns the proportions around, so that the action icon is big and the "bug beetle" is a small overlay. Also the analyzer run icon is handled in the same way. Change-Id: I257c66ec5892c8aabaf8a9884795ae410e793017 Reviewed-by: Eike Ziller --- src/plugins/debugger/analyzer/analyzericons.h | 4 +- .../images/analyzer_overlay_small.png | Bin 109 -> 103 bytes .../images/analyzer_overlay_small@2x.png | Bin 118 -> 113 bytes src/plugins/debugger/debugger.qrc | 12 +- src/plugins/debugger/debuggericons.h | 22 +- .../images/continue_overlay_small.png | Bin 163 -> 0 bytes .../images/continue_overlay_small@2x.png | Bin 277 -> 0 bytes .../images/debugger_continue_1_mask.png | Bin 0 -> 97 bytes .../images/debugger_continue_1_mask@2x.png | Bin 0 -> 99 bytes .../images/debugger_continue_2_mask.png | Bin 0 -> 147 bytes .../images/debugger_continue_2_mask@2x.png | Bin 0 -> 192 bytes .../images/debugger_continue_mask.png | Bin 189 -> 0 bytes .../images/debugger_continue_mask@2x.png | Bin 337 -> 0 bytes .../images/debugger_interrupt_mask.png | Bin 96 -> 98 bytes .../images/debugger_interrupt_mask@2x.png | Bin 97 -> 101 bytes .../images/interrupt_overlay_small.png | Bin 94 -> 0 bytes .../images/interrupt_overlay_small@2x.png | Bin 97 -> 0 bytes .../debugger/images/stop_overlay_small.png | Bin 94 -> 0 bytes .../debugger/images/stop_overlay_small@2x.png | Bin 97 -> 0 bytes .../images/continue_1_small.png | Bin 0 -> 93 bytes .../images/continue_1_small@2x.png | Bin 0 -> 96 bytes .../images/continue_2_small.png | Bin 0 -> 136 bytes .../images/continue_2_small@2x.png | Bin 0 -> 161 bytes .../images/debugger_beetle_mask.png | Bin 221 -> 198 bytes .../images/debugger_beetle_mask@2x.png | Bin 436 -> 357 bytes .../images/debugger_overlay_small.png | Bin 169 -> 158 bytes .../images/debugger_overlay_small@2x.png | Bin 290 -> 175 bytes .../images/debugger_run_mask.png | Bin 131 -> 0 bytes .../images/debugger_run_mask@2x.png | Bin 197 -> 0 bytes .../images/run_overlay_small.png | Bin 163 -> 0 bytes .../images/run_overlay_small@2x.png | Bin 156 -> 0 bytes .../projectexplorer/projectexplorer.qrc | 8 +- .../projectexplorer/projectexplorericons.h | 8 +- src/tools/icons/qtcreatoricons.svg | 310 ++++++++---------- 34 files changed, 154 insertions(+), 210 deletions(-) delete mode 100644 src/plugins/debugger/images/continue_overlay_small.png delete mode 100644 src/plugins/debugger/images/continue_overlay_small@2x.png create mode 100644 src/plugins/debugger/images/debugger_continue_1_mask.png create mode 100644 src/plugins/debugger/images/debugger_continue_1_mask@2x.png create mode 100644 src/plugins/debugger/images/debugger_continue_2_mask.png create mode 100644 src/plugins/debugger/images/debugger_continue_2_mask@2x.png delete mode 100644 src/plugins/debugger/images/debugger_continue_mask.png delete mode 100644 src/plugins/debugger/images/debugger_continue_mask@2x.png delete mode 100644 src/plugins/debugger/images/interrupt_overlay_small.png delete mode 100644 src/plugins/debugger/images/interrupt_overlay_small@2x.png delete mode 100644 src/plugins/debugger/images/stop_overlay_small.png delete mode 100644 src/plugins/debugger/images/stop_overlay_small@2x.png create mode 100644 src/plugins/projectexplorer/images/continue_1_small.png create mode 100644 src/plugins/projectexplorer/images/continue_1_small@2x.png create mode 100644 src/plugins/projectexplorer/images/continue_2_small.png create mode 100644 src/plugins/projectexplorer/images/continue_2_small@2x.png delete mode 100644 src/plugins/projectexplorer/images/debugger_run_mask.png delete mode 100644 src/plugins/projectexplorer/images/debugger_run_mask@2x.png delete mode 100644 src/plugins/projectexplorer/images/run_overlay_small.png delete mode 100644 src/plugins/projectexplorer/images/run_overlay_small@2x.png diff --git a/src/plugins/debugger/analyzer/analyzericons.h b/src/plugins/debugger/analyzer/analyzericons.h index f9f4a69056b..30b333e4ecf 100644 --- a/src/plugins/debugger/analyzer/analyzericons.h +++ b/src/plugins/debugger/analyzer/analyzericons.h @@ -32,8 +32,8 @@ namespace Debugger { namespace Icons { const Utils::Icon ANALYZER_CONTROL_START({ - {QLatin1String(":/images/analyzer_overlay_small.png"), Utils::Theme::IconsBaseColor}, - {QLatin1String(":/core/images/run_overlay_small.png"), Utils::Theme::IconsRunColor}}); + {QLatin1String(":/projectexplorer/images/run_small.png"), Utils::Theme::IconsRunColor}, + {QLatin1String(":/images/analyzer_overlay_small.png"), Utils::Theme::IconsBaseColor}}); const Utils::Icon MODE_ANALYZE_CLASSIC( QLatin1String(":/images/mode_analyze.png")); const Utils::Icon MODE_ANALYZE_FLAT({ diff --git a/src/plugins/debugger/analyzer/images/analyzer_overlay_small.png b/src/plugins/debugger/analyzer/images/analyzer_overlay_small.png index 138391ddd01b1ae1849d233e0e9993babab6d32a..4e22d67ab0d999f4837581256932fc7bb9b58ff2 100644 GIT binary patch delta 54 zcmc~zpI~MvVSxduz`3ZmCGpY$6P!SGLWmtJwDEAnj$WjId1_n=8 KKbLh*2~7YZsS@-6 delta 60 zcmYe#onU6J7wQxi%e6H0v?j2mn4D-9IUvAbbWh@xS7`kk Q1_lNOPgg&ebxsLQ0KlCVdjJ3c diff --git a/src/plugins/debugger/analyzer/images/analyzer_overlay_small@2x.png b/src/plugins/debugger/analyzer/images/analyzer_overlay_small@2x.png index 7fb5ea48b776637454d0d58aaa4295063cd7ee7a..f8da44ca4861f10848fc09dd7fc1b010305db222 100644 GIT binary patch delta 64 zcmXRboM2|H=IP=X!V#VPgP(;bM3rYoV$0upiNpkcWr3t)1x$*^4)7>1c*e-^sXTAL U$bl>|1_lNOPgg&ebxsLQ0JdBedH?_b delta 69 zcmXRcn_%Xk?djqe!V#VPgP(;bimages/debugger_breakpoints.png images/debugger_continue.png images/debugger_continue@2x.png - images/debugger_continue_mask.png - images/debugger_continue_mask@2x.png - images/stop_overlay_small.png - images/stop_overlay_small@2x.png - images/interrupt_overlay_small.png - images/interrupt_overlay_small@2x.png - images/continue_overlay_small.png - images/continue_overlay_small@2x.png + images/debugger_continue_1_mask.png + images/debugger_continue_1_mask@2x.png + images/debugger_continue_2_mask.png + images/debugger_continue_2_mask@2x.png images/debugger_empty_14.png images/debugger_interrupt.png images/debugger_interrupt@2x.png diff --git a/src/plugins/debugger/debuggericons.h b/src/plugins/debugger/debuggericons.h index a1180bedb40..234f9000067 100644 --- a/src/plugins/debugger/debuggericons.h +++ b/src/plugins/debugger/debuggericons.h @@ -46,22 +46,24 @@ const Utils::Icon TRACEPOINT( const Utils::Icon CONTINUE( QLatin1String(":/debugger/images/debugger_continue.png")); const Utils::Icon CONTINUE_FLAT({ - {QLatin1String(":/projectexplorer/images/debugger_beetle_mask.png"), Utils::Theme::IconsDebugColor}, - {QLatin1String(":/debugger/images/debugger_continue_mask.png"), Utils::Theme::IconsRunColor}}); + {QLatin1String(":/debugger/images/debugger_continue_1_mask.png"), Utils::Theme::IconsInterruptColor}, + {QLatin1String(":/debugger/images/debugger_continue_2_mask.png"), Utils::Theme::IconsRunColor}, + {QLatin1String(":/projectexplorer/images/debugger_beetle_mask.png"), Utils::Theme::IconsDebugColor}}); const Utils::Icon DEBUG_CONTINUE_SMALL({ - {QLatin1String(":/projectexplorer/images/debugger_overlay_small.png"), Utils::Theme::IconsDebugColor}, - {QLatin1String(":/debugger/images/continue_overlay_small.png"), Utils::Theme::IconsRunColor}}); + {QLatin1String(":/projectexplorer/images/continue_1_small.png"), Utils::Theme::IconsInterruptColor}, + {QLatin1String(":/projectexplorer/images/continue_2_small.png"), Utils::Theme::IconsRunColor}, + {QLatin1String(":/projectexplorer/images/debugger_overlay_small.png"), Utils::Theme::IconsDebugColor}}); const Utils::Icon INTERRUPT( QLatin1String(":/debugger/images/debugger_interrupt.png")); const Utils::Icon INTERRUPT_FLAT({ - {QLatin1String(":/projectexplorer/images/debugger_beetle_mask.png"), Utils::Theme::IconsDebugColor}, - {QLatin1String(":/debugger/images/debugger_interrupt_mask.png"), Utils::Theme::IconsInterruptColor}}); + {QLatin1String(":/debugger/images/debugger_interrupt_mask.png"), Utils::Theme::IconsInterruptColor}, + {QLatin1String(":/projectexplorer/images/debugger_beetle_mask.png"), Utils::Theme::IconsDebugColor}}); const Utils::Icon DEBUG_INTERRUPT_SMALL({ - {QLatin1String(":/projectexplorer/images/debugger_overlay_small.png"), Utils::Theme::IconsDebugColor}, - {QLatin1String(":/debugger/images/interrupt_overlay_small.png"), Utils::Theme::IconsInterruptColor}}); + {QLatin1String(":/projectexplorer/images/interrupt_small.png"), Utils::Theme::IconsInterruptColor}, + {QLatin1String(":/projectexplorer/images/debugger_overlay_small.png"), Utils::Theme::IconsDebugColor}}); const Utils::Icon DEBUG_EXIT_SMALL({ - {QLatin1String(":/projectexplorer/images/debugger_overlay_small.png"), Utils::Theme::IconsDebugColor}, - {QLatin1String(":/debugger/images/stop_overlay_small.png"), Utils::Theme::IconsStopColor}}); + {QLatin1String(":/projectexplorer/images/stop_small.png"), Utils::Theme::IconsStopColor}, + {QLatin1String(":/projectexplorer/images/debugger_overlay_small.png"), Utils::Theme::IconsDebugColor}}); const Utils::Icon LOCATION( QLatin1String(":/debugger/images/location_16.png")); const Utils::Icon SNAPSHOT( diff --git a/src/plugins/debugger/images/continue_overlay_small.png b/src/plugins/debugger/images/continue_overlay_small.png deleted file mode 100644 index 75df55d1f6997d84d3250b22571a3cf401a9c670..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 163 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4h9AW2CEqh_A)RqWO=$chDd}b|LA9v$k6zZ z-DTGAcs_o|f&C0@0w4Z!3(q)qK)^>#=dD(C-K)?{Gi^z!&7*XSxB;&J9rx2>(iQ_EQE_(vfJQew9Kwmv7abjr3@ cyk9S=FhqZMf2O8zR}AD|Pgg&ebxsLQ0L$}d1ONa4 diff --git a/src/plugins/debugger/images/debugger_continue_1_mask.png b/src/plugins/debugger/images/debugger_continue_1_mask.png new file mode 100644 index 0000000000000000000000000000000000000000..522e5f36cc399a909b5dddae6e84af628b11a13b GIT binary patch literal 97 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|MrH;EhFd$=?`B|NU<>dGab;j&`2YX^(wp<| zGB7ZRdAc};aL6YA`2XLYnZtg=a=x~i>`NIPKUi>|f10?Bfq{X+)78&qol`;+0H^>Q A;s5{u literal 0 HcmV?d00001 diff --git a/src/plugins/debugger/images/debugger_continue_1_mask@2x.png b/src/plugins/debugger/images/debugger_continue_1_mask@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..217ddc826f789459a9be29f558b7d09c68d12977 GIT binary patch literal 99 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-MrH;EhTJpRM;I6w*aCb)Tp1V`{{R2K^yd7# z3=9kso-U3d65+`|_}O?OR@(FYQJ(gTpG_s0!Rp_Qn*s%!#2FYE7(8A5T-G@yGywpe CG#jh{ literal 0 HcmV?d00001 diff --git a/src/plugins/debugger/images/debugger_continue_2_mask.png b/src/plugins/debugger/images/debugger_continue_2_mask.png new file mode 100644 index 0000000000000000000000000000000000000000..756ba959f032de3914cdafaa499a481eca8d96b7 GIT binary patch literal 147 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|7G?$p2BAoW(+ms@`~f~8t_%ze<>lq|_4N%6 z4gdfDzqi`=9|Hq}y{C&~h(!3*Glqf(95@&pC3F;689mwl&$^WN@ofC|vqytuK6EX2 z?aG*_6t$#7Ow)@;gPl3+U_+F_gXj(BKNtbP0l+XkKx$rK1 literal 0 HcmV?d00001 diff --git a/src/plugins/debugger/images/debugger_continue_2_mask@2x.png b/src/plugins/debugger/images/debugger_continue_2_mask@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..a4801fa6baca4853a25997928f88fd97c01b8805 GIT binary patch literal 192 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-7G?$phNU`BwlFX-@CW#WxH2#>l$V#+*Vi{R zH2nYn|K4ife+&!^Ii4<#Ar`$?&+q0vV8Fv1C>V24IfbQf!QXVRiSh!!Pl*KnE>H;J z4Ua#lAmGT$BxrL|+ND5UxZ{CWn!v%CIu0!Eo0tTzK;&j9Ff9AXFhh=~L0W+!uYq9) lBhv#m4hW}rK|Qy%_hFVh*Za&&7#J8BJYD@<);T3K0RWJ;JH-G1 literal 0 HcmV?d00001 diff --git a/src/plugins/debugger/images/debugger_continue_mask.png b/src/plugins/debugger/images/debugger_continue_mask.png deleted file mode 100644 index fb9b1cb91698c20263a598fa0a5cff0b0bced6dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 189 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4h9AWhNCh`Dhvz^EuJopAsQ2tfAljO@Hlrq z5B)VK=9lUDi>lK;8Z|Kf*9z$r_2CIPu!Sq~k)%9x^Rr{;=bNuEHu$jDWzq_^uKnzW z_n1?&CaQdqlrVFOcr78pGf`!Sq=cPwguH~rj*UN*-^&Lyv3IjL-_Z(L{6L7u!TI$@ qFNVE8gxXs^Y0C)lNb#TKC}X%K{^m6Q$M!)QI9caAQRNrE9$2i@Aahv(a>>CHqH?aNSe{gw2 z`(#Guf;UIjJ~ZQJ7E>sZpWbF47NBZ1d0pM_s@g8SDcK+S+uME$RG!PMU-;0vRaR+} z(C)VSTLNFJ1)ZuDtxWzUUM-MFx?_^EQBz=}afIoWrl%$U7glg5Wt)caZcEsyxuQw< zK$BjCsYb)obql%T7`e5Qt{&i>_Pa^zhp3Q%i|Tuu3Hf%-rW^uG8x`Mu|Nnpb0jZRZ z%Lg8OfBRo$1Dm;$se#3wW|nN;jZzX%6a>pBW$<3;`99x;*W2St!smVy-k#$BlQWoa oYX$v1VAJiw%hMx!c*z$w29J`>Y1LO!*+F6D>FVdQ&MBb@0D-TF>;M1& diff --git a/src/plugins/debugger/images/debugger_interrupt_mask.png b/src/plugins/debugger/images/debugger_interrupt_mask.png index c2081ca1360ba43fb4ef8becdd5499b993b28716..87f195f5c08cceab8dc5fed8e78f8ad039638806 100644 GIT binary patch delta 49 zcmYdDnqa0Q?&;zf!Xcad=lp>K9EbRo)&;X3KGS@OAxlMD@xrI+Jq!#C44$rjF6*2U FngGtl5?25K delta 47 zcmYdFm|&(Q>gnPb!V#VP=lp>K9wz^0dP=1wFfgRFY0S*}p8kV@fq}u()z4*}Q$iB} DtgI1~ diff --git a/src/plugins/debugger/images/debugger_interrupt_mask@2x.png b/src/plugins/debugger/images/debugger_interrupt_mask@2x.png index 43aec6f9cc294378666b861df7108c9a8f6a29e1..6c477085d7be89d34dd14090d244697502c0f1e4 100644 GIT binary patch delta 52 zcmYdHonWRf<>}%WA`zbagP)BjVx>LLA9e{hjaE|!j$norZEFHq)$ delta 48 zcmYdIoM5Ic=IP=XA`zbagP)D3d9qc)VH*{Vmeq_=V($eFUeskWFfcH9y85}Sb4q9e E0C%+yX8-^I diff --git a/src/plugins/debugger/images/interrupt_overlay_small.png b/src/plugins/debugger/images/interrupt_overlay_small.png deleted file mode 100644 index e61b75384a332f4ef276e26cd730f0643a97f401..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 94 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRdMrH;E236Z!B?bltwg8_HR|W=#|Ns9ly*d9b w0|SGwr;B3D1_lNOPgg&ebxsLQ0O4F2`~Uy| diff --git a/src/plugins/debugger/images/interrupt_overlay_small@2x.png b/src/plugins/debugger/images/interrupt_overlay_small@2x.png deleted file mode 100644 index 2d686964bf17127f0988dc77e4c0532d123e7347..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 97 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;IMrH;E2G1=owlgp=um$*pxH2#>{Qv)d>CO3f y85kJEJY5_^IHHq(@U!qt5w8C+bEVe-A2x<}+Y=_f4BuG90MhH~=d#Wzp$PzrtQ@QW diff --git a/src/plugins/debugger/images/stop_overlay_small.png b/src/plugins/debugger/images/stop_overlay_small.png deleted file mode 100644 index 8350ba9eec5f398920a609cd85a8d79dca5b636f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 94 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRdMrH;E236Z!B?bltwg8_HR|W=#|Ns9ly*d9b w0|SGwr;B3t;{X5v diff --git a/src/plugins/debugger/images/stop_overlay_small@2x.png b/src/plugins/debugger/images/stop_overlay_small@2x.png deleted file mode 100644 index f0fb92f67062381d105f447fdbae3fcb628aa677..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 97 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;IMrH;E2G1=owlgp=um$*pxH2#>{Qv)d>CO3f y85kJEJY5_^IHHq(@U!qt5w4e*vC`{+4;#Y)|M-PZ3wzfyfb_chxvXgTe~DWM4flgk&? literal 0 HcmV?d00001 diff --git a/src/plugins/projectexplorer/images/continue_1_small@2x.png b/src/plugins/projectexplorer/images/continue_1_small@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..f683251b925b8eb58940d9b8b105a3ff11ae87ce GIT binary patch literal 96 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;IMrH;E2G1=owlgp=um$*pxH2#>{Qv)d>CO3f x85kHuJzX3_IHHq(@U!q_9AW?0sJLMVD?`YV^qEhYr*|@dw7UAataD0e0svUp8#Vv{ literal 0 HcmV?d00001 diff --git a/src/plugins/projectexplorer/images/continue_2_small.png b/src/plugins/projectexplorer/images/continue_2_small.png new file mode 100644 index 0000000000000000000000000000000000000000..876cb829bf5650dd22533a89401575b5541b2e13 GIT binary patch literal 136 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdu#id_r6q7#PaS%j@gw8yXt^ z|Nnn)weLR$1_l#P7sn8e=;VS%CN_~a<(`KMOvwg^BzTkz*pzz?DljF_aF9G>ped}; lEV=A1%c+7x8$?(bG9SynajaR=!oa}5;OXk;vd$@?2>{AIDFpxk literal 0 HcmV?d00001 diff --git a/src/plugins/projectexplorer/images/continue_2_small@2x.png b/src/plugins/projectexplorer/images/continue_2_small@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..5794fa039ed45f85a371f951735f6b08e6cc8b47 GIT binary patch literal 161 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I7G?$phQ^Te;|vT8`~f~8t_%ze<>lq|_4N%6 z4gdfDzqi`=9|Hq}ucwP+h(_?zGlske90Zshqn8y3$Q^PtsQ1ylv}c=7Oy8PN!@rG+ zGZrY$_z;(8;OGoRiY=@y7g?7yz>)Kd^a_SKF~ylBjZ0Y=7#J8lUHx3vIVCg!0P8w5 ArvLx| literal 0 HcmV?d00001 diff --git a/src/plugins/projectexplorer/images/debugger_beetle_mask.png b/src/plugins/projectexplorer/images/debugger_beetle_mask.png index 359b6cc425bdcf4bf466c39cfebe51acb0a89124..b041005b3ae1af80fc43b2a1b63dc6e7992d0047 100644 GIT binary patch delta 170 zcmcc1c#Ls^N`0@Vi(`n!#N;3S%mzJP4hQzD|KH$MQ{ol6ufRaD1 ciHr;_vL9pAe{;WPU|?YIboFyt=akR{0At`yBLDyZ delta 193 zcmX@cc$aa4O8pW~7sn8d^T|K@nGFOcSiC*)wuG(wNTeSd8{4|#8A8i_8-&!B2db{( z+q221Zr6#Li<4bmn^$KG2(cfTA|X*R>%VD%v4KXntdmie9y7-uw#nQR-mY+;l;Jk5 zz+qB>qlZpng2SYQgow@y5BpUFdvdPWsC2rX5IQd?)U$qq%0DZY69-gNlKv^E)%Lz_9%F!SIqVml!6z`z!gcp8ZdavcmgS_l_GD zn0#BMCu#C&pV*bguIDNfWLxg$S)5RMSRuM#9qVSP35*PzJPB3hp8Sv{^*RQ6S zxJlQ8GB>SlGD|I3)>JI16Qt##>+*p~^g$^92klqc<_%AtYgLF_Z&=X8l=@)BgDl<` zs~6}u|6aoNEl>4=;e^d=;N=Rz>S?n`VPKeuA7}R2T>Hh_--zt`+xtGe8 ptGt{ZeaP!!O{p0_tHM+1e@~AbR+;-wgMop8!PC{xWt~$(69BjYnfCwy delta 410 zcmaFLw1s(sN`1Abi(`n#@#G)=N(mBQq{@DJdHi^%7IiqKsLqMfb(9b#gn@@O!|99Z;l zDqpjowDApHwra;D>(YZV&-{4Vnz!Hh^C5`+Vf6n0^?L+tn$2(6{tc2|`0PJFOZ0!< zbpc)n)+sWlZ_rA(zM#?juru2mDT#THE*Qv9ZxgjJQF(A_LZ@#tGc%XNMFti*38^z5 zvkMM9TVfO=^{U{}(9Us2;Q zyFxYxt0>R+PwyYV!Z diff --git a/src/plugins/projectexplorer/images/debugger_overlay_small.png b/src/plugins/projectexplorer/images/debugger_overlay_small.png index deb68239db4977af1688ab8471b47e60935b614c..809bf347326d98316d86250ee6985560de9bc19a 100644 GIT binary patch delta 142 zcmZ3qAi)*NYL##- wkT0x*gPEO~e@0zopr0C(3f5C8xG delta 153 zcmbQoxRP;#L_G%s0|SHAj0Jlc7#IpXT^vIs!jpgWvq>Cy(rv0Az~cAW_{020?mrcu z|JMjOU-}AZsW1%w6)rI|=4HZ85 z9Iy(nFSxVNX~lvjC5hd6XBtHl&Ngr+{9=&fm?XlG&%o}`!(g#F$va`PkAb?u?1psK z`i3nk8$8r3W=qScX`K7AU^QP_uDZHydm?mY;3aEO7e?|*^D zkI=K6lb)~n*Shk-K{bWK58o%7s2#iTdp|#u zw;C0BA`gZycrCHB;aL0s|MGlGc1TD{dT+lo2Ia4{Wqxj zI9)iB@whw>Yk9!h9nGs682JKj9?@oKGS@l5H6uQmZL91irs^|0Dze(v9C)L-t10x* zio6H&J69#hGB?Mp*6?Y}SS`bR*h+-;|DsEFf9t2S1q%Fn_5b>(4fR_*w(I`QHff@M!%m@Gvkqwhttsu(8X8Gsf-V2AS!_g%twf f6Ikq2m2NOboc^%RX4c}jAk#fv{an^LB{Ts515hc% diff --git a/src/plugins/projectexplorer/images/debugger_run_mask@2x.png b/src/plugins/projectexplorer/images/debugger_run_mask@2x.png deleted file mode 100644 index 978d099a9c51654af8893b3feac4a5dfeb937f80..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 197 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4h9AWhN8@6(F_a>J)SO(As)w*fA}jUNL)2o zl^DXzYx2WJDUg}@f6M+QnF$FSc6lvgW4rcA9>fW_>Ar}K?bwa&AkKsc*F|h>Y*Pf( z+?c&MgqJc}wsc-;;7Cj|J>Wc}g7<=enj^DHOXkYP5cP>KGJ~3@9_dgv&73gfhlkI- tC20ymn>ALpGISp0S;-pt;BuqZUdGV$!#h43f7b-L&(qb+2UTTzK)~#Vc2?Jb(WD`}gnv{{8#^|Nr6SS4SBb81y_{978yw zlYj8D@+>jhx2E05u48Vyk%Y-RXGxxE?-%m4RhbCRkeab>{qKpsYz!y*@(nt_uBu~T PU|{fc^>bP0l+XkKsJc87 diff --git a/src/plugins/projectexplorer/images/run_overlay_small@2x.png b/src/plugins/projectexplorer/images/run_overlay_small@2x.png deleted file mode 100644 index a5ec8416b6983488ddd3b8886e80051e36136ea3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 156 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4h9AWhA=@@4F(2=WKS2z5R22vKl~XCdbA`I zSoOp?H4+lKYWw0DnVHM~mjB_BkVp~xcX)k6fgbN~PV diff --git a/src/plugins/projectexplorer/projectexplorer.qrc b/src/plugins/projectexplorer/projectexplorer.qrc index e8d0044e3ff..ba19731f8da 100644 --- a/src/plugins/projectexplorer/projectexplorer.qrc +++ b/src/plugins/projectexplorer/projectexplorer.qrc @@ -9,8 +9,6 @@ images/debugger_start@2x.png images/debugger_beetle_mask.png images/debugger_beetle_mask@2x.png - images/debugger_run_mask.png - images/debugger_run_mask@2x.png images/mode_project.png images/mode_project@2x.png images/mode_project_mask.png @@ -26,8 +24,6 @@ images/run_small@2x.png images/debugger_overlay_small.png images/debugger_overlay_small@2x.png - images/run_overlay_small.png - images/run_overlay_small@2x.png images/session.png images/targetrunselected.png images/targetrunselected@2x.png @@ -58,6 +54,10 @@ images/stop_small@2x.png images/interrupt_small.png images/interrupt_small@2x.png + images/continue_1_small.png + images/continue_1_small@2x.png + images/continue_2_small.png + images/continue_2_small@2x.png images/buildstepdisable.png images/buildstepdisable@2x.png images/buildstepmovedown.png diff --git a/src/plugins/projectexplorer/projectexplorericons.h b/src/plugins/projectexplorer/projectexplorericons.h index 05a2ce3c364..49227f3fc6f 100644 --- a/src/plugins/projectexplorer/projectexplorericons.h +++ b/src/plugins/projectexplorer/projectexplorericons.h @@ -55,11 +55,11 @@ const Utils::Icon DEBUG_START( QLatin1String(":/projectexplorer/images/debugger_start.png")); const Utils::Icon DEBUG_START_FLAT({ - {QLatin1String(":/projectexplorer/images/debugger_beetle_mask.png"), Utils::Theme::IconsDebugColor}, - {QLatin1String(":/projectexplorer/images/debugger_run_mask.png"), Utils::Theme::IconsRunColor}}); + {QLatin1String(":/projectexplorer/images/run_mask.png"), Utils::Theme::IconsRunColor}, + {QLatin1String(":/projectexplorer/images/debugger_beetle_mask.png"), Utils::Theme::IconsDebugColor}}); const Utils::Icon DEBUG_START_SMALL({ - {QLatin1String(":/projectexplorer/images/debugger_overlay_small.png"), Utils::Theme::IconsDebugColor}, - {QLatin1String(":/projectexplorer/images/run_overlay_small.png"), Utils::Theme::IconsRunColor}}); + {QLatin1String(":/projectexplorer/images/run_small.png"), Utils::Theme::IconsRunColor}, + {QLatin1String(":/projectexplorer/images/debugger_overlay_small.png"), Utils::Theme::IconsDebugColor}}); const Utils::Icon BUILDSTEP_MOVEUP({ {QLatin1String(":/projectexplorer/images/buildstepmoveup.png"), Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint); diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index e325bb9ab5a..dabc31ac651 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -625,11 +625,11 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="8" - inkscape:cx="93.473168" - inkscape:cy="23.946208" + inkscape:zoom="4" + inkscape:cx="407.31417" + inkscape:cy="170.08332" inkscape:document-units="px" - inkscape:current-layer="layer3" + inkscape:current-layer="g4718" showgrid="true" showguides="true" inkscape:guide-bbox="true" @@ -2213,95 +2213,6 @@ x="274" y="570" /> - - - - - - - - - - - - - - - - - - @@ -2314,25 +2225,33 @@ id="rect4959-4" /> + transform="translate(2,0.625)"> + d="m 466.5,575.875 c -1.2497,0 -1.25,1.125 -1.25,1.5 l 2.5,0 c 0,-0.375 -3e-4,-1.5 -1.25,-1.5 z" + sodipodi:nodetypes="zccz" /> + d="m 463.27023,577.37502 -0.15225,1 1.36286,0 -0.24267,0.99998 -1.23817,0 0,1 1.23817,0 0.27709,1.00002 -1.39728,0 0.15225,1 1.13211,0 0.88226,-0.5 0.7154,0.49998 0,-4.5 -0.75,0 0,-0.5 z" + sodipodi:nodetypes="ccccccccccccccccc" /> + + d="m 481,576 0,7 7,0 0,-1 -6,0 0,-6 z m 2,0 0,1 5,0 0,-1 z m 0,2 0,1 3,0 0,-1 z m 0,2 0,1 1,0 0,-1 z" + style="fill:#000000;fill-opacity:1;stroke:none" + sodipodi:nodetypes="cccccccccccccccccccccc" /> + + + + + + + + - - - - - - - + + + + + + width="7" + height="18" + x="753" + y="52" /> + width="7" + height="18" + x="763" + y="52" /> + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" + transform="translate(-340,305)" + style="display:inline"> + y="50" + width="24" + height="24" + id="rect4791-9" + inkscape:export-filename="c:\Users\aportale\ownprojects\stuff\experiments\iconrecoloring\icon.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + + + + -