From 93a6ecfb07646a9780b77a9be8d623b89c66098b Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Wed, 2 Dec 2015 12:06:56 +0100 Subject: [PATCH] Core: Improve themeing of LineEdit icons (search, clear, ...) ...by providing a specific theme color role PanelTextColorMid. Also, this fixes the opacity of editclear.png and magnifier.png Change-Id: I0293eaa397a0b64595ddd66f608bdfe9f7b8e705 Reviewed-by: Alessandro Portale --- share/qtcreator/themes/dark.creatortheme | 1 + share/qtcreator/themes/default.creatortheme | 1 + src/libs/utils/theme/theme.h | 1 + src/libs/utils/utilsicons.h | 2 +- src/plugins/coreplugin/coreicons.h | 2 +- src/plugins/coreplugin/images/editclear.png | Bin 317 -> 192 bytes src/plugins/coreplugin/images/editclear@2x.png | Bin 637 -> 375 bytes src/plugins/coreplugin/images/magnifier.png | Bin 248 -> 178 bytes src/plugins/coreplugin/images/magnifier@2x.png | Bin 696 -> 338 bytes src/tools/icons/qtcreatoricons.svg | 4 ++-- 10 files changed, 7 insertions(+), 4 deletions(-) diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme index 1211ebbd168..9eda6f21e32 100644 --- a/share/qtcreator/themes/dark.creatortheme +++ b/share/qtcreator/themes/dark.creatortheme @@ -83,6 +83,7 @@ PanelButtonToolBackgroundColorHover=hoverBackground PanelStatusBarBackgroundColor=shadowBackground PanelsWidgetSeparatorLineColor=0 PanelTextColorDark=text +PanelTextColorMid=ffa0a0a0 PanelTextColorLight=text ProgressBarColorError=error ProgressBarColorFinished=ff5aaa3c diff --git a/share/qtcreator/themes/default.creatortheme b/share/qtcreator/themes/default.creatortheme index 2346a5a13ea..b1de23c93f4 100644 --- a/share/qtcreator/themes/default.creatortheme +++ b/share/qtcreator/themes/default.creatortheme @@ -78,6 +78,7 @@ PanelButtonToolBackgroundColorHover=25ffffff PanelStatusBarBackgroundColor=ffff0000 PanelsWidgetSeparatorLineColor=ffbfbcb8 PanelTextColorDark=darkText +PanelTextColorMid=ff909090 PanelTextColorLight=brightText ProgressBarColorError=d2ff3c00 ProgressBarColorFinished=ff5aaa3c diff --git a/src/libs/utils/theme/theme.h b/src/libs/utils/theme/theme.h index e8103a2105c..66af442723d 100644 --- a/src/libs/utils/theme/theme.h +++ b/src/libs/utils/theme/theme.h @@ -112,6 +112,7 @@ public: PanelStatusBarBackgroundColor, PanelsWidgetSeparatorLineColor, PanelTextColorDark, + PanelTextColorMid, PanelTextColorLight, ProgressBarColorError, ProgressBarColorFinished, diff --git a/src/libs/utils/utilsicons.h b/src/libs/utils/utilsicons.h index a6ed51ea78a..06746a295ee 100644 --- a/src/libs/utils/utilsicons.h +++ b/src/libs/utils/utilsicons.h @@ -37,7 +37,7 @@ namespace Utils { namespace Icons { const Utils::Icon EDIT_CLEAR({ - {QLatin1String(":/core/images/editclear.png"), Utils::Theme::BackgroundColorHover}}, Utils::Icon::Style::Tinted); + {QLatin1String(":/core/images/editclear.png"), Utils::Theme::PanelTextColorMid}}, Utils::Icon::Style::Tinted); } // namespace Icons } // namespace Utils diff --git a/src/plugins/coreplugin/coreicons.h b/src/plugins/coreplugin/coreicons.h index 00075275303..5e835e8e2b4 100644 --- a/src/plugins/coreplugin/coreicons.h +++ b/src/plugins/coreplugin/coreicons.h @@ -90,7 +90,7 @@ const Utils::Icon NEXT({ const Utils::Icon PREV({ {QLatin1String(":/core/images/prev.png"), Utils::Theme::IconsNavigationArrowsColor}}); const Utils::Icon MAGNIFIER({ - {QLatin1String(":/core/images/magnifier.png"), Utils::Theme::BackgroundColorHover}}, Utils::Icon::Style::Tinted); + {QLatin1String(":/core/images/magnifier.png"), Utils::Theme::PanelTextColorMid}}, Utils::Icon::Style::Tinted); const Utils::Icon CLEAN_PANE({ {QLatin1String(":/core/images/clean_pane_small.png"), Utils::Theme::IconsBaseColor}}); const Utils::Icon RELOAD({ diff --git a/src/plugins/coreplugin/images/editclear.png b/src/plugins/coreplugin/images/editclear.png index 7a6fcb86acf4857700d8daf3c97899fc8aa6e984..aced84d1c6bf20b8b370868e026a80afae5223e9 100644 GIT binary patch delta 175 zcmdnXbbxV!WIY1|1B2C!1$!A77}`Bu9780+WBbqYHXDdE+w%#sbMyoy%;Y(I-oeF1 z=GHqAi9@z77dYR4PjAb5t)DGi f*Zy?R^=H2rLtGkGdTXq(2f5AD)z4*}Q$iB}{lZ8M delta 301 zcmX@WxR+^yWIZzj1A~Sxe=q|BLu`Ogi0l9V|L@(qcmMwVJ9qB%_xE>qclY%4#KgqJ z#>U3S$H&CP$ji$sDk{p!$;r#hb8v8Qa&oe>vvY88u(Pu>FfcGOGP1I=va_>?hlj6Q zw{F9R4O_Ns*}8S>wr$(~|NqbTEaNN#1A|COkYDi3g$oz$+Fif_FxN8{<6u(h~GuE;i!SX((4WHSqt(L z7-qfq_!T#+{@k{UaW3{p)gEnLWwt#3@$Z=itJkdk^y2$x-b-hBPT#N*nZ&@rz~JfX K=d#Wzp$Py9*n{E# diff --git a/src/plugins/coreplugin/images/editclear@2x.png b/src/plugins/coreplugin/images/editclear@2x.png index 5279b6d7076e8e7cc57e27fcc023d05a58c39631..1a4ab0b5149030ba880675f2bd132d50edef0eff 100644 GIT binary patch delta 359 zcmey%@||gdWIY1|14Edgss;lCqn)RVV~EA+xswkD9WoGT`>waM-_)abJ*0I7b`%P~C_r7#C&*7ia4`zjXd4~>s zuCR#Q%}{usb#a2)s{;%9MR`AIeW+nH-724(P|3u*HB5DaaY6lxz1JH8p3l$n=52Fg zEI0ArCM&g}#H-novFVfd5|yTdhW-A?hn?mz43k^)0p?SW38eEQ~0+3GjFo|eRAZ} z=Dt(YlD2cKso%GPf7dI91oh;(@s39%Uad?zo3Xzzt;^L;r(`GlyQ2P*olh^`HE7@T zG)&k1wCzpb-p=fS?83{1OQvPq1XTb delta 623 zcmey)^p|CVWIZzj1B1(wu44=g3?~D8LR|m;{rms_|1)RKoI7{!#EBE9PMzAZW5>>& zJGX4vvUTg$?c29+-n@DF^5rX6u3WWh)zYO)7cN}5Xwjnn{{G(H-v0jnuCA`0o}SLm z&cwvT`1tsQgoK!wnAq6Z`1p7&EiG+rZCzbmb#--BRaIqWWmQ$xdPzx1DJdywX=!nB zaR~_tUS3{qZf;&)UJecpc6N3M$;`~m!otG9z`(`D#m&tvDk>@=AyHmlUSD6|(9qD) z(Q)b0rEAx&UB7<)=FOY8Zr!?l`}Y6;|3z=5U1MNiFfIx53!XW1*|O!!*Q{B)cI~>2 z8#iv+ym{xYUAuShIbDC|%-OSNpFVy1{Kd~S2`u+EB3-7y=3=E70 zo-U3d7N_S1k# z4=$AWGyBZ_zf9Lu!iY8IQqA7TOA3B=85a~A0_(ChJ3E9mJ0GyfJWScheOg5=UX7c_ zOkl@F>C+|re>h4b_!;GOlC*W?nONiwsO88zu_#ThoTE2A`muA%0dK}1ry9~()Q&2f zwLRdtbMxQw4V=GD?t9w3^whMZaE>b(_4`&Z?|LPmu01#2Yfo~8`Q3 z{8Vn|Y1<1=*M;2W4L%*U&a!;VosD<5EPuKz_xbI6($D@nZv9eVWwZJC^K;v8zF@WK jswmj||NQaS*UbHYH*}oO^bP0l+XkK_;D%P diff --git a/src/plugins/coreplugin/images/magnifier.png b/src/plugins/coreplugin/images/magnifier.png index ba945dd6f1745ab59cc028a869bc05703b63a8c6..6a7af805b84dc02030db24cfc8f70d09affdde43 100644 GIT binary patch delta 161 zcmeytxQTIsWIY1|1H&F~%i9bL43(ZPjv*Y;$v^m6rq{NJ8sGol&cLQ%cXZ;;{Ka!m zrMGlsT2A;ae`Zy zt&~6UsLqbJ>q{iQ#5K>9<>BGsbr4i$yBi*GlW)R-`ZmorgGQmdKI;Vst05EqydH?_b delta 231 zcmdnQ_=9nRWIYQ51B0>Vx*i4whW(x{jv*4^$v^CcnZB^54g`r5B%_v^JUFSzlw!-!1es{NZ!OHS(LM#vh$`G~iR3+~fVhrxTr2+fC;s z2Oj$Jp2g{;ps$bW|8%W=eEV27dvMNn-7el)m-Od(UG2kXp4O%b^SkRSti^p#zIDCy zUgDqkKJyxuPh0etEq|{&rSkNL_;+vrwsIWonauOw(cmFZMCYUIw*Q;*-z#c1Xf|mu pXlYt1{g;YmEUO4 zPrO*(_+)11s^}e;P6}^%d@k8jz5IhfdGVRoPvmwLntOYypPz8!Q1Z||DQj9zJLGz<;#~>uU@@*^XAc` zM-Lx9ymsx{<;$0^UcGwm+__VyPMtn|dhOb^Yu2n;xpL*QWy@yHoH=XOtZCDx&6qJ` z^5n@ACr+F+X;N=*Z&z1WcXxMBPftfjM`veeTU%RudwWw;Q+<6sh^(uttFErDsi~=~ ztjy2PFDxv~&(BXyO-)Zv&&bF~OiWBpPL7X{Pe@3Jjg5_oi3tV+J3BiE2L~%FD;pad z3kwTNOG`5|Gjnru3kwTPO-)rWP*PG-R#ujgk&%{`mXVPW6B82`7Z(8o0RaI)K|x+# zUfz0MUQSL78WKZCT3=478VvpMn)zkCI$uuMn=YXJD&3l3=9z^L4LtAXU>{E zXWqO83l}e0vTXVC^&2*B+O}=`_8mKS?%KV3_ntj__wL)j|G>e6hmIaScJk!O)2Gjz zIeYHnrQ5gf-o1D4{{8#UU%Y(v>g~ICA3uKj{PpX%?>~S3ssH=;@4tT+buRw~+2-lu z7@~2$_Tu%hLk=RX4=um3l?gI#JlZ66v~Mrtq9o6zpP&EfKVmiPoO!Xmqnc~aM}$eufw&bEJLKe@;0?}b%!$`j6e{F-I)+RH`dx5otYiMmZeH+Zg8 zzA~M_c0JIP^Rks>YfSx}trizgvh*Ci%R1dkvOVX{-GIv{4W3LEmzADhEgBkZkgOo8 z(dJt}dD_d%(hqXKb#$c2aTG0@yj8#9*u<@|uMg}?WYD$~Xi5GPW7@Ov0n@!dcW!R} zT(;d>!-~^&(U!x^mM