From 051ac9dd0ed2f0f1844919154b3182f5f64fadd3 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Fri, 1 Apr 2016 20:23:58 +0200 Subject: [PATCH] Core: New and themable locked/unlocked icon This change replaces the existing locked/unlocked icons with Diana's icons and makes them themable. Now, they fit much better into the UI. Especially in the dark theme. Change-Id: I51beb3be202af8f2f467e81701cd5f27a6837d1c Reviewed-by: Alessandro Portale --- src/plugins/coreplugin/core.qrc | 2 + src/plugins/coreplugin/coreicons.cpp | 9 +- src/plugins/coreplugin/images/locked.png | Bin 331 -> 175 bytes src/plugins/coreplugin/images/locked@2x.png | Bin 613 -> 187 bytes .../coreplugin/images/lockedbackground.png | Bin 0 -> 151 bytes .../coreplugin/images/lockedbackground@2x.png | Bin 0 -> 164 bytes src/plugins/coreplugin/images/unlocked.png | Bin 319 -> 179 bytes src/plugins/coreplugin/images/unlocked@2x.png | Bin 515 -> 189 bytes src/tools/icons/qtcreatoricons.svg | 103 +++++++++--------- 9 files changed, 61 insertions(+), 53 deletions(-) create mode 100644 src/plugins/coreplugin/images/lockedbackground.png create mode 100644 src/plugins/coreplugin/images/lockedbackground@2x.png diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc index 291038d870f..b5a3a862b38 100644 --- a/src/plugins/coreplugin/core.qrc +++ b/src/plugins/coreplugin/core.qrc @@ -24,6 +24,8 @@ images/linkicon@2x.png images/locked.png images/locked@2x.png + images/lockedbackground.png + images/lockedbackground@2x.png images/magnifier.png images/magnifier@2x.png images/minus.png diff --git a/src/plugins/coreplugin/coreicons.cpp b/src/plugins/coreplugin/coreicons.cpp index 3b1d2793344..d0f88817fa3 100644 --- a/src/plugins/coreplugin/coreicons.cpp +++ b/src/plugins/coreplugin/coreicons.cpp @@ -52,10 +52,11 @@ const Icon RESET( QLatin1String(":/core/images/reset.png")); const Icon DARK_CLOSE( QLatin1String(":/core/images/darkclose.png")); -const Icon LOCKED( - QLatin1String(":/core/images/locked.png")); -const Icon UNLOCKED( - QLatin1String(":/core/images/unlocked.png")); +const Icon LOCKED({ + {QLatin1String(":/core/images/lockedbackground.png"), Theme::PanelStatusBarBackgroundColor}, + {QLatin1String(":/core/images/locked.png"), Theme::IconsBaseColor}}, Icon::Tint); +const Icon UNLOCKED({ + {QLatin1String(":/core/images/unlocked.png"), Theme::IconsDisabledColor}}, Icon::Tint); const Icon FIND_CASE_INSENSITIVELY( QLatin1String(":/find/images/casesensitively.png")); const Icon FIND_WHOLE_WORD( diff --git a/src/plugins/coreplugin/images/locked.png b/src/plugins/coreplugin/images/locked.png index ad832b5846afee1747c88cdd8c3e722cc93bd64e..7ce4f1f35995bbe847956c6e5e9a285f724e8f42 100644 GIT binary patch delta 159 zcmX@jw4QN-L_G^L0|Ud`yN`kx7#Iu!d_r6q7#JiaC8eaKJUu+9-{G-~Z?CsRj&;Qq7wgPd%8$kh($K;6Z>yPntD@om@O;UF7bs Q3=9kmp00i_>zopr0JoS%HUIzs literal 331 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QUcKY#w* zxpNyfY*@d3{nDjNXV0EJZQ8WSlP6D{II*UtrnI!QxVSh!KR+)oFDWT0K0ZD+HZ~$6 z;=|K>pBNYzluCm9f*BZDd4wg@3~Ze|y#r$7(~7HW`ue9YSiEfI!PDoiTzmcgi*ads z5(5K6zNd?0h(vhqxtn4R3IYue13FB;&As&7eo3*>wjb}G?Vcg&^zW1Nyi}Vn=Wlwi z3S7C-%cf<;wc5ZhyZQt!ZSBA6)qya+5=ayU614 zH$F2iv6dD68iJb-9H}|N(#?8c?-!<+Z}KOqCTcY*yqdB=HEW8pf}+aWP;J0S3F7 zYm68e7@SLj{DK)+Sh;z4`2@@ zPMR@q!IBM|cAYwZ`RcX%4<0>z_Wb3WPv3w1E7MtfjDdlX)zif>#NzbYN!N>-0z_PO zZ)l6{*(JD9MbJd5bK(ut-~az>@>@J>Vo6WBc6;VlxpTT3Z`4oHxi;%<+2$~xwpTt| zo4My^J-fC%`i0-L-=8b@&nda+#a_FI@$~_2cJAH^g#bgFLTl-n&oZ_>&E&ZHzSy9= zq$Hp9?!$8~=fp(}o*r|sob8cv+Q4kiq6gew5e0o+<{<{pnN;Hgj(3@Tx;LTytmvzK z4i8S)1>KwAG~b=$rZxj7r%-^3{voE1!7C(o^E~KVy81%FV^8s0rVJ8HAEqbd^4>Y| zfU}~Pr>Y{-o$dUOj(ZPd&F8!buGx1po?rI!^at-k@7L7CI*xSSPh_)Vy)_6a)L3-G-tyQxY7QgyaoHz8EcNh~r_swt{Po zp~#2Eqs;Mpxmb)V3`HDF?Ee1$ui4V-%&65Z!pakIU`10P>l5t-3gyfUu4kpSbge`G PfUNg)^>bP0l+XkKH?A}8 literal 0 HcmV?d00001 diff --git a/src/plugins/coreplugin/images/unlocked.png b/src/plugins/coreplugin/images/unlocked.png index 3b8a5b660f8b0016345ca27b6516e6b716c7457a..a281db1a8c92657873f32a3f4a776aa040bb98b9 100644 GIT binary patch delta 163 zcmdnbw3%^&L_G^L0|Ud`yN`kx7#Iu!d_r6q7#JiaC8eaKJUu+9QUlpinR(g8$%zH2dih1^v)|cB zF)%QA1o(uw{{R0!G&I!D&o3e(A~ZBKDk>^8G&DRsJR%|jnT&vea4?9BjD!h5>4%1~ zH4F?4;w3?T!3>h|!3G8f1~*R^#}J9j$q5Ts z3_f;sa2Y6bekj;%RLrT!$+6kMz@ST!v*R#l3ZsF5NIR3`3=tUx&Vmh#IX8S<$oZjo j5$A##jfvb`3=GAS+3uRWn=iz`z`)??>gTe~DWM4fzMW;g diff --git a/src/plugins/coreplugin/images/unlocked@2x.png b/src/plugins/coreplugin/images/unlocked@2x.png index 2935eddf7d101984800b90c2381efaef60548e8f..4867e1568eb1be2f8d0b6dc54050690bfa92182a 100644 GIT binary patch delta 172 zcmZo>*~>UVvYvr~fgwy#RfBV)Nr?gW7|K5 b=d}!KdmMkUAGy~48{{xgS3j3^P6O>_%)lVM9)ua=q$bKRFfd4#xJHx&=ckpFCl;kLl$V$5W#(lUCnpx9>g5-u&wghk z#lXNYKfou%_5c6>3=9kn4Gp28p`Mi0-Fe23c@%tA$SD?1A|FPkY6wZBNH<_ z7mu{8f~J;^skx<K2 diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index 21bfa82a241..b55acf4ef92 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -1964,71 +1964,76 @@ style="" /> + transform="translate(0,16)"> - - - - + y="552" + x="297" + style="fill:#ffffff;fill-opacity:1" /> - + d="m 304.999,554 c -1.656,0 -2.999,1.343 -2.999,3 l 0,3 1,0 0,-3 c 0,-1.103 0.896,-2 1.999,-2 1.103,0 2.001,0.897 2.001,2 l 0,3 1,0 0,-3 c 0,-1.657 -1.343,-3 -3.001,-3 z" + id="lockbow" /> + + id="src/plugins/coreplugin/images/lockedbackground" + transform="translate(0,16)"> + y="552" + x="313" + style="fill:#ffffff;fill-opacity:1" /> + sodipodi:nodetypes="ccczcccccc" /> + + + + + xlink:href="#lockbow" + id="use6038" + width="100%" + height="100%" /> +