From 0de2cc17aa4dcda6f05909758ecba284d306ecb0 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Thu, 7 Apr 2016 12:38:45 +0200 Subject: [PATCH] ProjectExplorer: New "rebuild" icon Change-Id: Ia628347f1f38b126b9dd16de4653f8654ebc4ec8 Reviewed-by: hjk --- .../projectexplorer/images/rebuild.png | Bin 1319 -> 0 bytes .../projectexplorer/images/rebuild_small.png | Bin 689 -> 0 bytes .../images/rebuildhammerhandles.png | Bin 0 -> 189 bytes .../images/rebuildhammerhandles@2x.png | Bin 0 -> 267 bytes .../images/rebuildhammerheads.png | Bin 0 -> 180 bytes .../images/rebuildhammerheads@2x.png | Bin 0 -> 169 bytes .../projectexplorer/projectexplorer.cpp | 4 +- .../projectexplorer/projectexplorer.qrc | 6 +- .../projectexplorer/projectexplorericons.h | 7 +- src/tools/icons/qtcreatoricons.svg | 62 ++++++++++++++++++ 10 files changed, 70 insertions(+), 9 deletions(-) delete mode 100644 src/plugins/projectexplorer/images/rebuild.png delete mode 100644 src/plugins/projectexplorer/images/rebuild_small.png create mode 100644 src/plugins/projectexplorer/images/rebuildhammerhandles.png create mode 100644 src/plugins/projectexplorer/images/rebuildhammerhandles@2x.png create mode 100644 src/plugins/projectexplorer/images/rebuildhammerheads.png create mode 100644 src/plugins/projectexplorer/images/rebuildhammerheads@2x.png diff --git a/src/plugins/projectexplorer/images/rebuild.png b/src/plugins/projectexplorer/images/rebuild.png deleted file mode 100644 index 2888e90539210b22da3c1f0a264554b423087444..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1319 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4mJh`h6m-gKNuKT-g&w>hIsI94XO4C4wtZh z?&Y0*+gn>Vgmt0AOsC}>UK0$rC$=>O&oP#coTlnh;(TLT?##ShnI?gcr~TcSsxi~} z_u-a}KP4t;oZh5qcIs3%-{PhNIU8H2PIIb$xJ~4lt#$ln@2>Yp->9hHFW>+E`;O;@ z`f4o;{ujI0bXDZ$=I)7F8~3bi_fww33zjTd;!s~-U+wAH`8ToV&j!(u&`?=FPtVF! zGg-6Qy@s>TcFf{%b#<+4Km4)Q)%EB$_L+BzS?90syxBkT0B`D4?wQ@bPlHxY*|K%( z!&$RteeCPw3keHb7NQ|CF>39$n&a#I*KCw^muQms_IG~F?sq1$H#Y56)9Ll=ygPTA z(B9SQNp@UIL^z90q?T>nDjFIdZq4F&gNvzX=bzV?E?wI3=1q=?k(Jho-{*{0ZelFi zdw%o%%jR41&xaamN*N{zbs32q?Ei3j%^{{E(p&*cLQa{Onohi2%9|XrrzJ04`HX`? z0F&tpMz#%#d{32D39hruoiKa0w)~k}S|8K**3}r59(M8Z(aFlrc0W5^?-A45^^>{c zg*qoV^Hw!5>J&6^OD#}Ma%PiA_DxB7QYfW+si^qrzm;!PTa$21cahrqRUxags#rt)mVb8Vy0xRc^;hcO zn5!2<7WZA%@o=wmZ2fiXyt4iCr)_f@b*t+>|8uBZ{Bkj2|Fz`))^}!m5zK6HrMN_H(HyH4 zosadHH!>D}c3KmaGNWE`_lAm>FV@OEdbPh%SUh85QJ&GvNyi>sJND~z?6t=9zS7AX z3*sv5YJCrPPuQP(BxhM>;NefEN4+KM8a&k64W4te{QeblP%v7&P3j8+^9}2tk2Y6y zA9)^dr`vGy2PY@*srug7$N@UVr=q-^Mxe88_TAe${^>p2(8=a~Y}M9dD<8@|`fl+d-tT_P?W3XZ@}BiI9@rOCwpp+3 zZ`L|HFEeYaK94OcfAq(n|59X@&G*;0r)BmTgBzJgcKt~8mg_* zGfnPty5AvYvyu}_*>q-aKUATr`~K$j-Fo>Ht zaGNaW-M4j8XUm!Ad{O$dm+x5U_~v8J!P)!2Z@gK};=nHj%LuHq6y^RJOt8=vKOO(8 zWa_k#G_8B0+5J+D!jFP_3(jrX5pm|y0`;SR_8+S*T+aW~@%9Icy}#>D_A5)B`^#Qi Xa6?j%x9SN40|SGntDnm{r-UW|w*h;a diff --git a/src/plugins/projectexplorer/images/rebuild_small.png b/src/plugins/projectexplorer/images/rebuild_small.png deleted file mode 100644 index 85d3bcd68115c4ef871819989a9807e2955c8994..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 689 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!toDm+~rLo5W7|NQ@N&#cHq&aC(p01_#Vc$B*4MrM_^*zIu(0;{>4w$vhswlvoXuG`twl7qmR?Y#oe9T z?pnu_zX=mQfBbzuo@ch%n$$HLAKG)6{L$xVzM)_^LB@mEL)U}fL;nWrrcImpot>SZ z-nen&-}?ByvkH?YC^WBGCwutbR_W`_B9`pG+3oh#bST!}t!_JT;lls@b$^p$_Evpe ze7s-&bTe;4O3IW8)28iH*V8*!`R>lnBYNo%6N-ynePp%mQMUi*&z$;cf6)J- zXh^S3NH0SN|Dgv43@_P=?Ed`z?l0wGKSyZQ&g;kQ1HOFQd!1+fdYP0BCErC@I~$)Y z$g*qr(!g+sfn$1OV%Cgrj?U82%f%gf=iC3iQU3GQ=2`_a4;~fvVD`liFLDUYkXl#o zbNk4RPiK1<^L&@zXB)8Vd9Sj^p4+Y|`xoum(A?2xdibhwdVl)*JsGS*?2J1YjTiO! zuYQp+bI;z&riT|dm%DqH@88;}(KzAmx^6GE^8-vUKR5#v$h$9RP3=E#GelF{r5}E)yoja5O diff --git a/src/plugins/projectexplorer/images/rebuildhammerhandles.png b/src/plugins/projectexplorer/images/rebuildhammerhandles.png new file mode 100644 index 0000000000000000000000000000000000000000..d0c117da13885e8b9d203343566c12d860c79ad8 GIT binary patch literal 189 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdsSyd_r6q7#LVtS*4_;WMyUL z1tN`-7Pqv1Qb$p#;oR_`>PnyK6JP=GN}CV3Xev?gt~Ne*Tc0tITn pzY8lGcYhPc)I$ztaD0e0svR*KNtW2 literal 0 HcmV?d00001 diff --git a/src/plugins/projectexplorer/images/rebuildhammerhandles@2x.png b/src/plugins/projectexplorer/images/rebuildhammerhandles@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..9ea2b3a8710ae489e179904efa511d474463b71d GIT binary patch literal 267 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I7G?$phQ^Te;|vT8S^+*Gt_%zeqN1W=Vqy{! z66NLP_4V})4GoQrjU62w8#Zj%xpU{GOP8)+zyAOK|6Yf73kC*;Ii4<#AsWGF`w#Lu zDGIP2Z%N=irk2yv(w+K;$;T$3TRi$h9(0TV}lI}WY?w4GOEr-^;cg) zl$0zjE$i#+8yXrqIyz>~oO$Tbq2tGo-@SYH;lqdj|Nr-#v(}h_fx*es#W92iG~1?EDjeHf g>2XUliGg9u{p52#bCNolZl}QOA;r$ukc9! zk=pGmx9rd-_QU_5U%K%`QA=fBLrviv+1WN8tgjV4EY7SsF30=T_@&g{#awMoObjzG V2mbrYlxPQXgQu&X%Q~loCIDJ^Jb?fJ literal 0 HcmV?d00001 diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index 0448ad2e151..f860f51e702 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -847,9 +847,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er msessionContextMenu->addAction(cmd, Constants::G_SESSION_BUILD); // rebuild session action - QIcon rebuildIcon = Icons::REBUILD.icon(); - rebuildIcon.addPixmap(Icons::REBUILD_SMALL.pixmap()); - dd->m_rebuildSessionAction = new QAction(rebuildIcon, tr("Rebuild All"), this); + dd->m_rebuildSessionAction = new QAction(Icons::REBUILD.icon(), tr("Rebuild All"), this); cmd = ActionManager::registerAction(dd->m_rebuildSessionAction, Constants::REBUILDSESSION); mbuild->addAction(cmd, Constants::G_BUILD_REBUILD); msessionContextMenu->addAction(cmd, Constants::G_SESSION_REBUILD); diff --git a/src/plugins/projectexplorer/projectexplorer.qrc b/src/plugins/projectexplorer/projectexplorer.qrc index ba19731f8da..1060cbc79f2 100644 --- a/src/plugins/projectexplorer/projectexplorer.qrc +++ b/src/plugins/projectexplorer/projectexplorer.qrc @@ -14,8 +14,10 @@ images/mode_project_mask.png images/mode_project_mask@2x.png images/projectexplorer.png - images/rebuild.png - images/rebuild_small.png + images/rebuildhammerhandles.png + images/rebuildhammerhandles@2x.png + images/rebuildhammerheads.png + images/rebuildhammerheads@2x.png images/run.png images/run@2x.png images/run_mask.png diff --git a/src/plugins/projectexplorer/projectexplorericons.h b/src/plugins/projectexplorer/projectexplorericons.h index 49227f3fc6f..0ddbd2548f7 100644 --- a/src/plugins/projectexplorer/projectexplorericons.h +++ b/src/plugins/projectexplorer/projectexplorericons.h @@ -41,10 +41,9 @@ const Utils::Icon CLEAN( QLatin1String(":/projectexplorer/images/clean.png")); const Utils::Icon CLEAN_SMALL( QLatin1String(":/projectexplorer/images/clean_small.png")); -const Utils::Icon REBUILD( - QLatin1String(":/projectexplorer/images/rebuild.png")); -const Utils::Icon REBUILD_SMALL( - QLatin1String(":/projectexplorer/images/rebuild_small.png")); +const Utils::Icon REBUILD({ + {QLatin1String(":/projectexplorer/images/rebuildhammerhandles.png"), Utils::Theme::IconsBuildHammerHandleColor}, + {QLatin1String(":/projectexplorer/images/rebuildhammerheads.png"), Utils::Theme::IconsBuildHammerHeadColor}}, Utils::Icon::Tint); const Utils::Icon RUN( QLatin1String(":/projectexplorer/images/run.png")); const Utils::Icon RUN_FLAT({ diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index dabc31ac651..da438b13cd1 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -3140,6 +3140,68 @@ d="m 52,564 c 8,-8 8,-8 8,-8" style="fill:none;stroke:#000000;stroke-width:1.42;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1.0;stroke-dasharray:none" /> + + + + + + + + + + + +