From fafc12be471809cb574de825dbf6f92514bc2f39 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Thu, 14 Apr 2016 15:25:11 +0200 Subject: [PATCH] Core: Fresh filesave icon Change-Id: Ide9d92fb6cb7b6e6af457eb8680960e2ddc5ef77 Reviewed-by: Alessandro Portale --- src/plugins/coreplugin/core.qrc | 1 + src/plugins/coreplugin/coreicons.cpp | 6 ++- src/plugins/coreplugin/coreicons.h | 1 + src/plugins/coreplugin/images/filesave.png | Bin 1980 -> 130 bytes src/plugins/coreplugin/images/filesave@2x.png | Bin 0 -> 129 bytes src/plugins/imageviewer/imageviewer.cpp | 2 +- src/tools/icons/qtcreatoricons.svg | 37 ++++++++++++++++++ 7 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 src/plugins/coreplugin/images/filesave@2x.png diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc index 6d8c5faa584..4780a273c47 100644 --- a/src/plugins/coreplugin/core.qrc +++ b/src/plugins/coreplugin/core.qrc @@ -12,6 +12,7 @@ images/filenew.png images/fileopen.png images/filesave.png + images/filesave@2x.png images/logo/128/QtProject-qtcreator.png images/logo/32/QtProject-qtcreator.png images/inputfield.png diff --git a/src/plugins/coreplugin/coreicons.cpp b/src/plugins/coreplugin/coreicons.cpp index 43952524c49..fbaf2a9a7b1 100644 --- a/src/plugins/coreplugin/coreicons.cpp +++ b/src/plugins/coreplugin/coreicons.cpp @@ -34,8 +34,10 @@ const Icon NEWFILE( QLatin1String(":/core/images/filenew.png")); const Icon OPENFILE( QLatin1String(":/core/images/fileopen.png")); -const Icon SAVEFILE( - QLatin1String(":/core/images/filesave.png")); +const Icon SAVEFILE({ + {QLatin1String(":/core/images/filesave.png"), Theme::PanelTextColorMid}}, Icon::Tint); +const Icon SAVEFILE_TOOLBAR({ + {QLatin1String(":/core/images/filesave.png"), Theme::IconsBaseColor}}); const Icon UNDO( QLatin1String(":/core/images/undo.png")); const Icon REDO( diff --git a/src/plugins/coreplugin/coreicons.h b/src/plugins/coreplugin/coreicons.h index 93669f49060..537a3492718 100644 --- a/src/plugins/coreplugin/coreicons.h +++ b/src/plugins/coreplugin/coreicons.h @@ -36,6 +36,7 @@ namespace Icons { CORE_EXPORT extern const Utils::Icon NEWFILE; CORE_EXPORT extern const Utils::Icon OPENFILE; CORE_EXPORT extern const Utils::Icon SAVEFILE; +CORE_EXPORT extern const Utils::Icon SAVEFILE_TOOLBAR; CORE_EXPORT extern const Utils::Icon UNDO; CORE_EXPORT extern const Utils::Icon REDO; CORE_EXPORT extern const Utils::Icon COPY; diff --git a/src/plugins/coreplugin/images/filesave.png b/src/plugins/coreplugin/images/filesave.png index 604ee3b83426560e5608d0746adb846a9aab00e2..0766a538812962266dd2c9fccda3aa3a7589d209 100644 GIT binary patch literal 130 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdqsCd_r6q7#I{36qJ;dHgDei z@ZrP%|Np%DiH)V1k*9$tOu)V&ge}IJdGp4Nj4cOw5;+b? f_!+S6ddtAvB)9d_PVZL?3=9mOu6{1-oD!MpwDfB2h8Lewa`;cW9GJLnRn*JcM*FU756WT9~$~cd*r4vA1Q%E=?5moAXOdKew(m@4HaZU#5Gz zQy*w1RL3(Mm$R+=^xM8V?BB=v!aqMsuivm`(a)p)^_`z5sBvD)h>CQZrKWN%q1QFL zHHb@-#fd{;!B)p?*T~AcudmFe-?uv6{4saUdXWt_sd-Y{8E;62KRuoAdu#vy-=f>j z&w0G_@x=GF&v(bfM<<)e1x^#*^L@vzWwU%Z6a|u1S{jP;%8yDcPnh!b#=_(^vb9}d zp%2&1V-z^MOWL7FP@d_Wd%(1NXBpS;|E6_4FDK}_siE7FDH6#Sq84v;(`0qvU}Vr# zy%u%rt=Za{mS5QCZMo`H*?Qakz;;FfrY)0H+#1D}WFC95f4lyED~ zdd}kH#iB6vNQU#YWh<7nPD>V2H4s{*&&0r_${OY=Fwt-K*-N$V64OmnEf=m+=Y2ZS zL*X%=u_mqC)&CB`9q4?&~ zY!%L95^J_bEEaT{kSZDEH6g8XRYm1j!L~w3tx#H8he_tmulTDtE4UgZU->*%@SAGmsSmLD7JMA*FXI5hmqpDVqv|yLuPrv@88;7roZg%h6 zSo1&7Xmv+d^A<%3)|H_gk{6FT73?rle`Y=9XG4+20-5hKd)R*zwR~dDm7S5F&3Arl z#g}=K)BMg9ykA)POpHlCFS=*ajANSo2}dVH^=h-P`TJV`$!mF|*_nK2m#jInJ<`tT z_@kQk)|rcCBIl%M7S5|qv);0aMN{=$^`}KC=_Y9wvo=TxcP&`K_lS9tX2Y2%v+CD2 zmH9{4&;QSPJwK=5@h_>@uU~)p75j|C=F0(QmCP=Yroza;YjTP#hR2RgVh(gr4{eE> zB+tUY%WQVBV|ApPzsD80Xd_S)Ee^Iwg`% zY~sm&dquGKrft`LfrhCnN2etKG3n~Cp*sENzkOnfH<1%~#`Hb1`c zwrp2k`GJDvPae(eSDRl~^zTo_o{v%mY(Hk$UcMRYW^%dd>0tv48+WO+6|cI2m&-kW zaKB zOph_W@q1(79pxpr86;Nc8lI~B%CBGW_ttWoO*Q#@{#;a>9}_9Q_g+U`y-f99+3kDp zYXAPb_F}>XSsu3Ny>WxLQ%{i~YQj2wz$ z4Z;UvHcx(dFZRwvjSu!6){GhonSU1M3Az63|Cm4Bu-fcLp#UQT0|SGntDnm{r-UW| D+We(f diff --git a/src/plugins/coreplugin/images/filesave@2x.png b/src/plugins/coreplugin/images/filesave@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..b1eefab6132a7c987a91852b615dee64b574390d GIT binary patch literal 129 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;ICT0c(20oEV=?n}EJOMr-t_%ze9UUE;H*fy` z|GzkMwG#sagMp`uV~E7mYC5_-4| hj)_Y&Z@AAmXV=coCvp#q7#J8BJYD@<);T3K0RS>$Ckp@o literal 0 HcmV?d00001 diff --git a/src/plugins/imageviewer/imageviewer.cpp b/src/plugins/imageviewer/imageviewer.cpp index 4122794176d..f3121d62d0c 100644 --- a/src/plugins/imageviewer/imageviewer.cpp +++ b/src/plugins/imageviewer/imageviewer.cpp @@ -101,7 +101,7 @@ void ImageViewer::ctor() d->toolbar = new QWidget(); d->ui_toolbar.setupUi(d->toolbar); d->ui_toolbar.toolButtonExportImage->setIcon(QIcon::fromTheme(QLatin1String("document-save"), - Core::Icons::SAVEFILE.icon())); + Core::Icons::SAVEFILE_TOOLBAR.icon())); const Utils::Icon backgroundIcon({ {QLatin1String(":/core/images/desktopdevicesmall.png"), Utils::Theme::IconsBaseColor}}); d->ui_toolbar.toolButtonBackground->setIcon(backgroundIcon.icon()); diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index e6e92070754..68647b9c9e0 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -5029,5 +5029,42 @@ transform="matrix(0.5,0,0,0.5,285,189.5)" width="100%" height="100%" /> + + + + + + +