From 4cb94be1b5912b2a1a9221d91d218f009cf02a25 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Fri, 10 Jun 2016 16:35:53 +0200 Subject: [PATCH] Core: New "Replace" icon HighDPI capable and themable. Change-Id: I12b598a081f2ed30dd31b138fd605e71b6f28c20 Reviewed-by: Alessandro Portale --- src/plugins/coreplugin/core.qrc | 5 +- src/plugins/coreplugin/coreicons.cpp | 3 ++ src/plugins/coreplugin/coreicons.h | 1 + src/plugins/coreplugin/images/replace.png | Bin 891 -> 0 bytes src/plugins/coreplugin/images/replace_a.png | Bin 0 -> 140 bytes .../coreplugin/images/replace_a@2x.png | Bin 0 -> 182 bytes src/plugins/coreplugin/images/replace_b.png | Bin 0 -> 146 bytes .../coreplugin/images/replace_b@2x.png | Bin 0 -> 229 bytes src/plugins/coreplugin/variablechooser.cpp | 4 +- src/tools/icons/qtcreatoricons.svg | 46 ++++++++++++++++++ 10 files changed, 57 insertions(+), 2 deletions(-) delete mode 100644 src/plugins/coreplugin/images/replace.png create mode 100644 src/plugins/coreplugin/images/replace_a.png create mode 100644 src/plugins/coreplugin/images/replace_a@2x.png create mode 100644 src/plugins/coreplugin/images/replace_b.png create mode 100644 src/plugins/coreplugin/images/replace_b@2x.png diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc index a2c3b8ee4b4..a8c2c0a76c9 100644 --- a/src/plugins/coreplugin/core.qrc +++ b/src/plugins/coreplugin/core.qrc @@ -40,7 +40,10 @@ images/plus.png images/plus@2x.png images/redo.png - images/replace.png + images/replace_a.png + images/replace_a@2x.png + images/replace_b.png + images/replace_b@2x.png images/reset.png images/sidebaricon.png images/sidebaricon@2x.png diff --git a/src/plugins/coreplugin/coreicons.cpp b/src/plugins/coreplugin/coreicons.cpp index 56fea1b9930..213492bcb04 100644 --- a/src/plugins/coreplugin/coreicons.cpp +++ b/src/plugins/coreplugin/coreicons.cpp @@ -152,6 +152,9 @@ const Icon EYE_OPEN_TOOLBAR({ {QLatin1String(":/core/images/eye_open.png"), Theme::IconsBaseColor}}); const Icon EYE_CLOSED_TOOLBAR({ {QLatin1String(":/core/images/eye_closed.png"), Theme::IconsBaseColor}}); +const Icon REPLACE({ + {QLatin1String(":/core/images/replace_a.png"), Theme::PanelTextColorMid}, + {QLatin1String(":/core/images/replace_b.png"), Theme::IconsInfoColor}}, Icon::Tint); const Icon MODE_EDIT_CLASSIC( QLatin1String(":/fancyactionbar/images/mode_Edit.png")); diff --git a/src/plugins/coreplugin/coreicons.h b/src/plugins/coreplugin/coreicons.h index dbf956e123c..c2837cb8ec6 100644 --- a/src/plugins/coreplugin/coreicons.h +++ b/src/plugins/coreplugin/coreicons.h @@ -92,6 +92,7 @@ CORE_EXPORT extern const Utils::Icon INTERRUPT_SMALL_TOOLBAR; CORE_EXPORT extern const Utils::Icon BOUNDING_RECT; CORE_EXPORT extern const Utils::Icon EYE_OPEN_TOOLBAR; CORE_EXPORT extern const Utils::Icon EYE_CLOSED_TOOLBAR; +CORE_EXPORT extern const Utils::Icon REPLACE; CORE_EXPORT extern const Utils::Icon MODE_EDIT_CLASSIC; CORE_EXPORT extern const Utils::Icon MODE_EDIT_FLAT; diff --git a/src/plugins/coreplugin/images/replace.png b/src/plugins/coreplugin/images/replace.png deleted file mode 100644 index baa05997bc332d209fa6ce4637bc535cec4500d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 891 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!BGftlCS#WAGf)|BAr9G*mx ze`#fD%Xeq*zB}vfw70FLzFRutGBh2f1q(d|o*vZw^2o8}L8FPBjlxF<6)){alR_SS zQYc+N#mzJ1qEgnEMB`IF8~w$}QW@I|5i=ZTXiXT(o!ZDP$VtmkgztlxN$#c%V> zwilcSCmuYsVEM9%5wHFWOtES+eDQu7gCdh%Z2u>vJS*40FZ+d_d~_3y%~ewT!DTnK z?XJ`F$rk22HyrW|u$s~EGqqu9Ux}>1pIH(MUhp0~v(ljGO2?f&rS3l#Ui)g3&#I`n zeQQ+1t)E{W7B>ET`(91gal?`sBFj!ZuynX&w5&(oTy6KRB2}At-&fp;=sTu;Hq?Cf zJGF_|w1jj6T;1E%Id(|=sujFq?soB-AnW?>19O%vUA?MH|DlGS`MqOzr@7Ctu4XH- z`WrPVd8y|or{#x>_WqR(KJ+?8Ca-hhGRx4M3Mp3ci3cx8E!U7zaT55?)@typ=I;}o z`kws(dzw;@m!B=X_d&dZf1A|(tJ|zwi+R^BGuBtHiMn;*p!tDq$3;XZsU&AT40-a* z=g8V+VlArm(kFXgPS}|6ecr1@InBELd%tY^P~0J@Kf_n^SZepR2tJdKvayWa+NZ5l z)QyW(tgNgRPjemXk?YpGK08sq#-GnngtcTB)4@l7bZ*}WEStUCzhmFqi8G!ZuZy{{ zJ?m0eZmC;qh(g<<9}oBs_#13q!t=7M-BTjgtY0nY#-^I%SKnQ~+t@E=yjWE-Lha;< zpt9MFd;ca)SUM&BqnMMTWZ|MIQ%sEbB^RkUaeVW#I(zv>bnx|W5299AZ@X=*5VY!3 zYS_I3Zs+4o)&6!Rn;#yy8M1fNjbr@{wz}LKXEcScr*BvPS1ODT*njFLdtl$q z6Z6ClU%aaFvr_3>EcZ#4!p>KmPAu~|m*g|?FqD4qdvxmlWIhH41_n=8KbLh*2~7b1 C(xQ|A diff --git a/src/plugins/coreplugin/images/replace_a.png b/src/plugins/coreplugin/images/replace_a.png new file mode 100644 index 0000000000000000000000000000000000000000..447db902d84d295949e89a29612e9b62a16b0cef GIT binary patch literal 140 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdu3Nd_r77f&v20&dwel9-f|_ zjg5^@pFVy6{{7#-fB*mgzww+GI|BoQrl*Tz2uF1C3{F-adO93>_nYF6msoXZ<< n>>PPb!7#JKqT^vI+ zf|Gyrvq@~=$}v9aCip||z=0e6It2l*-ziC^G&cPFU%yF-+hEWC|NMCt5e!|Pf((p* jm;!t{8Mq`KGBK>+xz!o2Tw1`uz`)??>gTe~DWM4ft#m$- literal 0 HcmV?d00001 diff --git a/src/plugins/coreplugin/images/replace_b.png b/src/plugins/coreplugin/images/replace_b.png new file mode 100644 index 0000000000000000000000000000000000000000..1088567fa02f271ce32204b92882c5ef0b526c98 GIT binary patch literal 146 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4h9AW2CEqh_A)RqM0&b7hDd}b|LA9vc%k}% z-}k{D@t%_h7VHz&NZ8AAVkdv#9{*4Fhx7aHJM`U&-EpA)^rh(c_Y6JmvSuc(VCCB5 yaWx<)DPcqV>IMmpE6qv_X3SaK5_j5nGc&Bozj5Z>ukZRG%RF8ET-G@yGywpcn>ITD literal 0 HcmV?d00001 diff --git a/src/plugins/coreplugin/images/replace_b@2x.png b/src/plugins/coreplugin/images/replace_b@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..55751aa8dd287d94b462c8e5e44fb78776f038b7 GIT binary patch literal 229 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4h9AWhA=@@4F(2=HJ&bxAr_~TfA}*P^k_-s zan%V0d1GBjOY&Nv_xaDq!}1FPwzCblal hcJ + #include // IconButton #include // IconButton #include @@ -87,7 +89,7 @@ public: void createIconButton() { m_iconButton = new IconButton; - m_iconButton->setPixmap(QPixmap(QLatin1String(":/core/images/replace.png"))); + m_iconButton->setPixmap(Core::Icons::REPLACE.pixmap()); m_iconButton->setToolTip(VariableChooser::tr("Insert Variable")); m_iconButton->hide(); connect(m_iconButton.data(), static_cast(&QAbstractButton::clicked), diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index 60fd6b64483..91940b62aad 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -3354,6 +3354,52 @@ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.29999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + + + + + + + + + +