From d6c8a974296acb7fe083380ee1a409569bb653ac Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Mon, 24 Oct 2016 17:13:49 +0200 Subject: [PATCH] ImageViewer, ScxmlEditor: Use the new "Zoom In"/"Zoom Out" icons Change-Id: Ib01060918924644b57d35083a4269614fba900c5 Reviewed-by: Alessandro Portale --- src/plugins/imageviewer/imageviewer.cpp | 4 ++-- src/plugins/scxmleditor/common/common.qrc | 2 -- .../scxmleditor/common/images/icon-zoom-in.png | Bin 1119 -> 0 bytes .../scxmleditor/common/images/icon-zoom-out.png | Bin 1053 -> 0 bytes .../plugin_interface/actionhandler.cpp | 4 ++-- 5 files changed, 4 insertions(+), 6 deletions(-) delete mode 100644 src/plugins/scxmleditor/common/images/icon-zoom-in.png delete mode 100644 src/plugins/scxmleditor/common/images/icon-zoom-out.png diff --git a/src/plugins/imageviewer/imageviewer.cpp b/src/plugins/imageviewer/imageviewer.cpp index 02a6c9dca24..069e1a36225 100644 --- a/src/plugins/imageviewer/imageviewer.cpp +++ b/src/plugins/imageviewer/imageviewer.cpp @@ -107,8 +107,8 @@ void ImageViewer::ctor() {QLatin1String(":/utils/images/desktopdevicesmall.png"), Utils::Theme::IconsBaseColor}}); d->ui_toolbar.toolButtonBackground->setIcon(backgroundIcon.icon()); d->ui_toolbar.toolButtonOutline->setIcon(Utils::Icons::BOUNDING_RECT.icon()); - d->ui_toolbar.toolButtonZoomIn->setIcon(Utils::Icons::PLUS_TOOLBAR.icon()); - d->ui_toolbar.toolButtonZoomOut->setIcon(Utils::Icons::MINUS.icon()); + d->ui_toolbar.toolButtonZoomIn->setIcon(Utils::Icons::ZOOMIN_TOOLBAR.icon()); + d->ui_toolbar.toolButtonZoomOut->setIcon(Utils::Icons::ZOOMIN_TOOLBAR.icon()); d->ui_toolbar.toolButtonFitToScreen->setIcon(Utils::Icons::ZOOM_TOOLBAR.icon()); d->ui_toolbar.toolButtonOriginalSize->setIcon(Utils::Icons::EYE_OPEN_TOOLBAR.icon()); // icons update - try to use system theme diff --git a/src/plugins/scxmleditor/common/common.qrc b/src/plugins/scxmleditor/common/common.qrc index 49ee31ce666..b3b7bd9664f 100644 --- a/src/plugins/scxmleditor/common/common.qrc +++ b/src/plugins/scxmleditor/common/common.qrc @@ -18,8 +18,6 @@ images/icon-export-canvas@2x.png images/icon-fit-screen.png images/icon-pan.png - images/icon-zoom-in.png - images/icon-zoom-out.png images/initial.png images/more_colors.png images/navigator.png diff --git a/src/plugins/scxmleditor/common/images/icon-zoom-in.png b/src/plugins/scxmleditor/common/images/icon-zoom-in.png deleted file mode 100644 index b8679e7ec5d0e95469342d945641b04ad5f508b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1119 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4rT@hhU+WOo?>8N3JvfHab;s;`~Uwx+h7G8 z9PAvN?3`R|Tp+~G#m&ym&B@Kf#>30W%ge>b&nY0xCMd)$B+4c%#vv*uAR)~oDI*{) z$1kTKCa27)q$;VbDy5>ut*R-Zp(m_m#HnS(t!>P!ZNi~r%&%)AXlTu2Vl8Q6BWh}? zVrr#mYAbARqiSWR;p8js62#{kB;*w#<{zOO7;YUDX%!M<8WOJ+mZ%q&#U7p^8Ih(K zoh=ueVHlgKmyqt5T%?(jXP;VZlv*K^S!$hGshwS;lUrq*SLUBrYn0zElHbXb-^E_o zB~a98QPd$-*6dc+;#AfvRnZt&(Wg+^;$77i&^k}KYrc8+e7o*NhP?~z`&P+MTBAE@ zE622*eA5@_Okd?cV@2eQtr|0TiOgP=Fnf>G>;rsrHhRz5VmEh>(!7Hr^Y>{kSf9M$ zu=K)BaSONkF5Kz9XnpRYtx<~)8ZADgwdAPs^6lx%4_hriuDxPg>55%REB1x2JP^3@ zgz@TACTmaGtlL+({z&5bGq#(~xotVrxb0%VuFH{oPB-nlmbCv`=D~|i2XAB@y;Xet zM%VFMjVJHcoVwL>>Q3{S`z>ehcAmdK<@|&0i;pH=c`}_%b@>zq1_qOoAirP+24*%+ zAyElwMRhG*1A8Y|4{yJy*o5S?%>1H?>c*D#uHFfgr_J1Q;PA;a=WpD8_~iMwpW?Sx z+-G25Z1r?;4AD5BoN$Cug2SU@mGtZxFHUVVR$%amh_PPz{=>%P*{5Sf0#%;u4VSUq zReyBbV)ySVt2ZgAEZI{g7b%duB=^C^iWeU1xMG@aR{cFFW*itQ>?=6+#a?!$BMCx6 zn!l$-eO_Vqe)gJ^3+C+4-zMhcl>Y9WhbQaSU3Y~|u2%Slzx(#I&BI{kyBi5B0z&o| zTyOhTWxe!LZ092ZPQLAL|3>{S*(`RJ?~(q;a1rNOFcIa!xe1U}z3xjThZ>)_j6Ik7vq z_)o|OeUp_o7JXbJLC6}vuc2=a~CQ;mKnjs6#H@7R_|$NI6|6Otrt(&Rh$tsXZgG>4X#J$SOzmqNf7Gk$!QW2ig8%i z;QIB<%*lVIN=#TJmb83=>(eVM_d3={2=O>Q3$=a8w`PVA&ml9vt~oprDiRSl8dw-g YOiB*CdKQq+z`(%Z>FVdQ&MBb@03|k(r2qf` diff --git a/src/plugins/scxmleditor/common/images/icon-zoom-out.png b/src/plugins/scxmleditor/common/images/icon-zoom-out.png deleted file mode 100644 index d492a2e8c4a6acd757f88837323826fa96afd88e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1053 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4rT@hhU+WOo?>8N(hKkjab;s;`~Uwx+u#En z9PAvN?3`R|Tp+~G#m&ym&B@Kf#>30W%ge>b&nY0xCMd)$B+4c%#vv*uAR)~oDI*{) z$1kTKCa27)q$;VbDy5>ut*R-Zp(m_m#HnS(t!>P!ZNi~r%&%)AXlTu2Vl8Q6BWh}? zVrr#mYAbARqiSWR;p8js62#{kB;*w#<{zOO7;YUDX%!M<8WOJ+mZ%q&#U7p^8Ih(K zoh=ueVHlgKmyqt5T%?(jXP;VZlv*K^S!$hGshwM8n^)$a-!78h$&=s3Uf3m2)M!!E zAywAmRMsn1(HL0Kr%=@v&^k}Kd%j)wBE!B_@{`u+PTI;bZ71LK#W~Yg`Ony@F>{y5 z>^)Mm5Ae;|VmEh>(!7Hr^Y>{kSf9M$u=K)BaSONkF5Kz9XnpSDgGP%FX)QUbynK85 z^21ikk87{kR=Q$W(u#fID^D1&K4r4@l+C(*h3k(bu0LbD>73h^Lyg-m2JE^Vx#x7# zzH3SQuVo&**mUql*3nzV$8U5Uztwp1Zq2D%J*Vz8pSj<1_HO6-`%}(8=)U-9;*}@U zxn4=1V_;w~DhcunW?*1u;}jB=kXBUJ(lxMma`o``i%m#Q%gisTsBUa&@9Lc}dD_e^ z2Tqlzqzq7^V}&}>uc((HYlj5*j~$-FO|Ar<@2!3rPbSvVw!FiU7Thm zEV!UF=F~)Kv-ZwIDn}-po!jz+ac6U*qh|SI7Ty^x*Ort%6#BF(;Xt-c`CM~zm!^{y zUz2KoHfb4b2-Jy^)@Pgepdj+@!k661vFFySiuQ0--zSHjA}s6*s7;@s_yTbo3fkJzq4x{P?<4h&#LqWhu}4p zPkSWy{_EP1kS-Eb%+uFdczvRff%Z&`ji>zu)efFGp{AjCj`a!GjH%zhmj2Q*QgGEh z;-|Rz(z|!p80>gB*%U8tnigUm=EKRBsLjsm$EG91qm$#n#Bi}M%{keu?