From 33bd06cb5c9d08515bfde386f7183662f2953b90 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Thu, 7 Apr 2016 00:39:26 +0200 Subject: [PATCH] ProjectExplorer: Remove old "clean" icon. Re-use the new one. Change-Id: Ieee022d8cdcd55215bf7468d331320a24d421cbd Reviewed-by: Alessandro Portale --- src/plugins/projectexplorer/images/clean.png | Bin 1180 -> 0 bytes .../projectexplorer/images/clean_small.png | Bin 785 -> 0 bytes src/plugins/projectexplorer/projectexplorer.cpp | 4 +--- src/plugins/projectexplorer/projectexplorer.qrc | 2 -- .../projectexplorer/projectexplorericons.h | 6 ++---- 5 files changed, 3 insertions(+), 9 deletions(-) delete mode 100644 src/plugins/projectexplorer/images/clean.png delete mode 100644 src/plugins/projectexplorer/images/clean_small.png diff --git a/src/plugins/projectexplorer/images/clean.png b/src/plugins/projectexplorer/images/clean.png deleted file mode 100644 index ab5e07ef7970d80305ee12ebbad3fc17a61b23cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1180 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4mJh`h6m-gKNuJoSkfJR9T^y|-MHc(VZ^|| zAX(xXQ4*Y=R#Ki=l*-_klAn~S;F+74o*I;zm{M7IGS!BGfkn^L#WAGf)|zRNIU%7E z4g0IpUmD2H$h^7BM|Rn^Hr;K@v^u;vCO8B{DqUm<3>1#@F_bj)wgj9mS*TkwbEon4;_Z)THma#C^IoEEY5D!xpXa~N@4vU2 zLvhB%jm|f9c~*G}Iz9f-v+1Z`+4kJ?!q@j}3Ef)QU=i09kS-7>>HUlEX->35r+nTV zxnwirY251{m{&zh|FU=>1z+yZK?pjD_8X^DHF} z`$Y0y_q{h=X|3c=&t!$TB=aWo!WB>a%ua7e%@3bFMYCdQmhXp!?x!X9-8i)E)&9*N z!kTM~_E*kX=)=Hw^6B(<7jI5|wJxY@Th5e8nL;1q*45u__^ zwZCoYiI>%KE;DPkA5VS4wRc_S(#=&1dY*E&hpZQ4JMUC^nPsP{R#f?{J*j!S`r{6- zvSfZ+vad$fuW7jK`q`{qCyJ)flqu1-^u^^{z_r#SZKL#D_ZT}@J)i_2ACtbP6L;9Nne z{%^sLn%^-_o$SUpT}X_zZS8BZ-|R=8cwO1W<@B`f*%G&<^^3g~>lrQBE?)P3vAcx( z>l;y~%@2QziK{o)%}T8i>x-;9^JMbrvTduD%cQo(eXA2wT^e8KXz|>f>$%6ug1Ex& zUmA}Va9{lD=dmVSG|wz`(%Z>FVdQ&MBb@0P))|XaE2J diff --git a/src/plugins/projectexplorer/images/clean_small.png b/src/plugins/projectexplorer/images/clean_small.png deleted file mode 100644 index 6a6d16718ce731527886d566755fed963dc59d26..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 785 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^y|-MHc(VZ^|| zAX(xXQ4*Y=R#Ki=l*-_klAn~S;F+74o*I;zm{M7IGS!BGfoZX)i(^Q|t)3unkB~%> zfB$|<$jVz<8Q`L}e>bIZ>V-q>PI^imUQu5nuB>XEGMg#$;;QMKsojg3I$Szp zBqgVqN;z>E23aIbUSH&-nkgNsG6@&{?|6ZEwWHSWRbdZpTft3~w5Btf@I5JMkfJ@eSU0ey4W2m3D?z{OGps=(=nv zz#ox#&yp`OLFgaD1!1Fyd$St!Go2S(<*A;`HsXkrwKcX&W!jhdz)`=addAction(cmd, Constants::G_SESSION_REBUILD); // clean session - QIcon cleanIcon = Icons::CLEAN.icon(); - cleanIcon.addPixmap(Icons::CLEAN_SMALL.pixmap()); - dd->m_cleanSessionAction = new QAction(cleanIcon, tr("Clean All"), this); + dd->m_cleanSessionAction = new QAction(Icons::CLEAN.icon(), tr("Clean All"), this); cmd = ActionManager::registerAction(dd->m_cleanSessionAction, Constants::CLEANSESSION); mbuild->addAction(cmd, Constants::G_BUILD_CLEAN); msessionContextMenu->addAction(cmd, Constants::G_SESSION_REBUILD); diff --git a/src/plugins/projectexplorer/projectexplorer.qrc b/src/plugins/projectexplorer/projectexplorer.qrc index 1060cbc79f2..7338b5ce784 100644 --- a/src/plugins/projectexplorer/projectexplorer.qrc +++ b/src/plugins/projectexplorer/projectexplorer.qrc @@ -2,8 +2,6 @@ images/build_small.png images/category_buildrun.png - images/clean.png - images/clean_small.png images/closetab.png images/debugger_start.png images/debugger_start@2x.png diff --git a/src/plugins/projectexplorer/projectexplorericons.h b/src/plugins/projectexplorer/projectexplorericons.h index 0ddbd2548f7..2d1284cad5c 100644 --- a/src/plugins/projectexplorer/projectexplorericons.h +++ b/src/plugins/projectexplorer/projectexplorericons.h @@ -37,10 +37,8 @@ const Utils::Icon BUILD_FLAT({ {QLatin1String(":/projectexplorer/images/build_hammerhead_mask.png"), Utils::Theme::IconsBuildHammerHeadColor}}); const Utils::Icon BUILD_SMALL( QLatin1String(":/projectexplorer/images/build_small.png")); -const Utils::Icon CLEAN( - QLatin1String(":/projectexplorer/images/clean.png")); -const Utils::Icon CLEAN_SMALL( - QLatin1String(":/projectexplorer/images/clean_small.png")); +const Utils::Icon CLEAN({ + {QLatin1String(":/core/images/clean_pane_small.png"), Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint); const Utils::Icon REBUILD({ {QLatin1String(":/projectexplorer/images/rebuildhammerhandles.png"), Utils::Theme::IconsBuildHammerHandleColor}, {QLatin1String(":/projectexplorer/images/rebuildhammerheads.png"), Utils::Theme::IconsBuildHammerHeadColor}}, Utils::Icon::Tint);