From ce250a7ba6d14c0370ff81f4327b9a1e892ec2f0 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@digia.com>
Date: Fri, 13 Jun 2014 12:54:58 +0200
Subject: [PATCH] DiffEditor: Remake of the toolbar icons incl. @2x variants

The icons now have consistent positions and shadows, anti
alias and a HiDPI variant.

Change-Id: I7d3a9512113788c95a132a79a58c8f559f46d00e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
---
 src/plugins/diffeditor/diffeditor.qrc         |   3 +
 .../diffeditor/images/sidebysidediff.png      | Bin 257 -> 257 bytes
 .../diffeditor/images/sidebysidediff@2x.png   | Bin 0 -> 408 bytes
 src/plugins/diffeditor/images/topbar.png      | Bin 379 -> 125 bytes
 src/plugins/diffeditor/images/topbar@2x.png   | Bin 0 -> 129 bytes
 src/plugins/diffeditor/images/unifieddiff.png | Bin 258 -> 202 bytes
 .../diffeditor/images/unifieddiff@2x.png      | Bin 0 -> 256 bytes
 src/tools/icons/qtcreatoricons.svg            | 132 +++++++++++++++++-
 8 files changed, 133 insertions(+), 2 deletions(-)
 create mode 100644 src/plugins/diffeditor/images/sidebysidediff@2x.png
 create mode 100644 src/plugins/diffeditor/images/topbar@2x.png
 create mode 100644 src/plugins/diffeditor/images/unifieddiff@2x.png

diff --git a/src/plugins/diffeditor/diffeditor.qrc b/src/plugins/diffeditor/diffeditor.qrc
index d1a71197c72..e5eabcd9ae9 100644
--- a/src/plugins/diffeditor/diffeditor.qrc
+++ b/src/plugins/diffeditor/diffeditor.qrc
@@ -1,7 +1,10 @@
 <RCC>
     <qresource prefix="/diffeditor">
         <file>images/sidebysidediff.png</file>
+        <file>images/sidebysidediff@2x.png</file>
         <file>images/unifieddiff.png</file>
+        <file>images/unifieddiff@2x.png</file>
         <file>images/topbar.png</file>
+        <file>images/topbar@2x.png</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/diffeditor/images/sidebysidediff.png b/src/plugins/diffeditor/images/sidebysidediff.png
index 55c6f2802d9d7882eae683d6d1935f3006457571..f0b2e4584486c2af021655eaa41bf3de592ea0d0 100644
GIT binary patch
delta 240
zcmZo<YGj%qS<lSCz@VYaAI!kO;1u8!;`$#97?8lNTel7#JlNCIbNlw~*|TTQm@#AO
z)Tz67@4j*4#`Wvh@7%d_<;s=Yw{PD9gWI=n-z?CSVqjnpEeY}qW?<yuH#GJRk50+V
zFPwbs`i)!PzW-dPwL^x1fg#e<#W5sPLUQgw&mbm75r>T?pHjsF?)_b_b#z^~Y$yK~
zx6haMxbSVi?fB|@^plPE?Uz{o)tP8ETV?leq0S|{I=-l!{kh9!mglD3`V&1~z1J}6
hIg_*BCHu@Q^Z$}-IpVGB@?Ai_@O1TaS?83{1OV26acuwq

delta 240
zcmZo<YGj%qS<lA6z##wme<A||17mTJyA#8@b22X(7#P@+yxm<G{)6Cxy~`&vFfecy
zctjR6FmMZlFeAgPIT8#E4D2PIzOL+dIb^xyE%Wy$O=4hRX!LY(46!(UHOP_gfC2~e
z<M3bJHZS#mOOzLK7Us;nohT{J=^EXo6yHASjlX^-^97qpVx|+eX#2Qim2KU$nsLG6
zv~`h6I=jVxpEE0(`=l*`>&n!^Yt|9FvL!sbr#w9%VO>}wcaV>ZVT<wga5oKY<s}KW
qLOBj|cfInw_wUHFnXCR7nbl46*p*%;wVQ!~fx*+&&t;ucLK6Vz&Q~!2

diff --git a/src/plugins/diffeditor/images/sidebysidediff@2x.png b/src/plugins/diffeditor/images/sidebysidediff@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..41476fffcd5ad088bd48a5edf454973700843654
GIT binary patch
literal 408
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4rT@h2A3sW#~2tGDgt~$T>t<7&wvCjUcAV_
zz;ONgb%@xVJ9i)qR#sLuHMPRR!hnE)s;a7lgoKQYjKadgJ9qBfzI}W5?%lU;-MVq(
z#_{9FZ``<X`}Xa#XV0EKefsw8+gGn%g{ZlC^X6?ZfGAiRxbZ6k1A}@=kY6wZ6Du1h
zw}gVCwvK_ZiH)tZt4Cm1L_zoRmD_jjI(+ono%_#UzI^{lL2wty4=X%f978Pp?_Rvk
z*JQxM_Moe4`JxI2n*|+<YX6&Gu~L&gw##MxpUI}#KbT%K{OFz_W#6Fm_8k8m?@8gI
z^RC=|eD~-LyT_Ae@h@Y#kgDL|87Y$<64hXF_i_}&A`U~N-M>P-tt=IInl>;p%(a{=
z%aC+@_5Q_cnJlg!RW~SZ*n8u-2>Y!S4^p|RH|8(TXqNXWjNxT<NI7t|WR7Pz`{KCI
iySM&e2zkuB?;P*q7zdxAx{nJ$A?WGq=d#Wzp$P!hZnMb%

literal 0
HcmV?d00001

diff --git a/src/plugins/diffeditor/images/topbar.png b/src/plugins/diffeditor/images/topbar.png
index 40d0fd842edbd7c8b2df1fffc4285af073fff582..7a15c16cabe62929b2a9204791a35f63285cb901 100644
GIT binary patch
literal 125
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRdCT0c(hNQXTpBNYzI0Jk_T>t<7&%nTN`}XY~
zhZGhD1_q{*AirP+<CD&7^cWZz6g^!WLpY+76C7B5R)?7;s5?0~vM@8NF-}V5;Vor&
b&CU>(&#&_K$&URD3=9mOu6{1-oD!M<4eKBz

literal 379
zcmeAS@N?(olHy`uVBq!ia0y~yVBlk5VBqIqV_;yoBJ!_<fq{Xg*vT`5gM)*kh9jke
zfq~J;)5S4FW8&0__p=TeNF1%tw6l+v%{kh5J!p@_BJsF4lHXb$&CWS*xL4*4Z_D4t
zlC{2Nlf6<W=dn8p9nydP<cNstM-#dJ>wf~z?L1TcKE*`pZvOV$G7h1P9+OmJn8H_2
zja+}-@6@I}L7~eoX9k4ce;yG!mDS^t$=^TOXYyt}u@4Bpq!)5^dTOSt3WJGn@-5@+
z-0x?f@yzj2E87^cVAcESF>{Kq|Nd*YC4phZYpaU){k!kJV_fmrf=Nt*q4{aiPmVhb
z9fr$Yjx4&T6ml%GLFB?U76&H|Muj+m1~sP85|wvv*FP<pazt?>M`z&qx(7TW6Km||
z+b_@jb@7<du^AFvf+y=6+7BPhH<O;7I+MZD)@o|-^{sQyruoW0*t?x!nMT+8hXp^f
n*6w}V%&=-zRpzW`@1%7mrA2aG4ByPaz`)??>gTe~DWM4fHnF3$

diff --git a/src/plugins/diffeditor/images/topbar@2x.png b/src/plugins/diffeditor/images/topbar@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a1c15c1bc3ec7a3d51cecb0e1527fb5e986756e
GIT binary patch
literal 129
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;ICT0c(20oEV=?n}EoB=)|uK)l4XJBBsefxHg
zLkbH60|Qe@kY6x^@k!@3dJGH<s-7;6Arj%q2@3oLYnhr@O%hv}7`2#F6ip>0$~HEw
f;c!S>z|8QF#iaa~BU3H|0|SGntDnm{r-UW|LNXu|

literal 0
HcmV?d00001

diff --git a/src/plugins/diffeditor/images/unifieddiff.png b/src/plugins/diffeditor/images/unifieddiff.png
index 254b1877441671e9eb08ef7174b6f07cbad31a2a..70975187e9aca6d37dfd77de895bbd939a585a3d 100644
GIT binary patch
delta 186
zcmZo-I>k6aqMn7Bfq~)e-A6$T3=E0^J|V9E|Nm!TV7PYe8Uq7EW@e_hxA)DPHxC>*
zaP#KP8#iv;zI}W8lV?&43=CW)L4LsutdhpY?vs{&__()ojUodBgP*61V+coda>4=L
zFvkN-ZAXtCJGLyiSKOdMAzG2SW#L1HMGc=`GAXouOj<0))*)gXz&Rsv!NaXtj2#Cj
t=;h=vBpEPHWzgJl@|ZvZ!**c?gLdWe>udI`VPIfj@O1TaS?83{1OPh3OJM*2

delta 242
zcmX@b*u*qJqMn0|fq_B(^Z!H!1_s9BAa^H*b?0PWGB7Z(C3(BMF#HF>1$&oIW?*38
zEbxddW?<kJ24O~qS#u;97#P?~Jbhi+?{dhosj_fhTvouqz|iFB;uvCa`f89RAB!T7
zvGTr0@oijnFOR24PuRp!)|a+rU60W02Ml|9RZh;&?($rA$8)##w3KFx1}Uz(iw795
zBnPkWex}-Y!$e9o^1;8?otA7&3%oWday%-^x)8{4V@6ZT>%^OL{+(k`3End^Wu|fG
t^F6oUCvB4aCi*Dae&f=s_x^Ls_lJ1hUH8^*0RsaAgQu&X%Q~loCIHhhUCaOg

diff --git a/src/plugins/diffeditor/images/unifieddiff@2x.png b/src/plugins/diffeditor/images/unifieddiff@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd7826f4e1b45bf55a010bf220c831250c3fa8b0
GIT binary patch
literal 256
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I7G?$phQ^Te;|vT8DgizruK)l4XJBC1zkfdi
z1A~Bo00RR9A0OYXTelW3UVQuZ?JHNV+`fJLd$0O51_lQ1k|4ie21XWPePgqPhC7eD
zp7OCXFfcTDx;TbtOiWH#z<r~aYXfJCljDt7*DeI4G<L+U6kufINV{++ks<9M>#FG-
z3pfnU=A}6ZCft9@A>0tbZpIYJki+7_kP(@oafCyKu|v?K&8f#hs6m2Jn1gjEQ;tat
zLk7zxh8r9c*aev!lml26tZR_w`pOZ~kT9cd5t9xR3nRl{%NC2og`uw*7#J8lUHx3v
IIVCg!07&pr-T(jq

literal 0
HcmV?d00001

diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg
index b50eab9d0a5..9f5e4f1fee8 100644
--- a/src/tools/icons/qtcreatoricons.svg
+++ b/src/tools/icons/qtcreatoricons.svg
@@ -342,6 +342,50 @@
          id="rect3206"
          style="fill:none;stroke:none" />
     </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath3218">
+      <rect
+         style="fill:none;stroke:none"
+         id="rect3220"
+         width="16"
+         height="16"
+         x="169"
+         y="568" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4031">
+      <rect
+         y="568"
+         x="185"
+         height="16"
+         width="16"
+         id="rect4033"
+         style="fill:none;stroke:none" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath3233">
+      <rect
+         y="568"
+         x="201"
+         height="16"
+         width="16"
+         id="rect3235"
+         style="fill:none;stroke:none" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath3237">
+      <rect
+         style="fill:none;stroke:none"
+         id="rect3239"
+         width="16"
+         height="16"
+         x="218"
+         y="568" />
+    </clipPath>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -541,6 +585,33 @@
          x="155"
          y="584" />
     </g>
+    <g
+       style="display:inline"
+       id="src/plugins/coreplugin/images/sidebaricon"
+       clip-path="url(#clipPath3237)"
+       transform="translate(-142,16)">
+      <use
+         height="600"
+         width="800"
+         transform="matrix(0,-1,1,0,-351,785)"
+         id="use3223"
+         xlink:href="#rect3233"
+         y="0"
+         x="0" />
+      <rect
+         style="fill:none;stroke:none"
+         id="rect3216"
+         width="16"
+         height="16"
+         x="218"
+         y="568" />
+      <path
+         id="rect3241-1"
+         style="fill:none;stroke:#292929;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         d="m 225.5,572.5 4,0 0,7 -4,0 z m -6,-2 12,0 0,11 -12,0 z"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccccc" />
+    </g>
   </g>
   <g
      inkscape:groupmode="layer"
@@ -864,7 +935,7 @@
     <g
        style="display:inline"
        id="src/plugins/coreplugin/images/locked"
-       transform="translate(-428,-16)">
+       transform="translate(-300,-16)">
       <rect
          y="584"
          x="597"
@@ -886,7 +957,7 @@
     </g>
     <g
        style="display:inline"
-       transform="translate(-412,-16)"
+       transform="translate(-284,-16)"
        id="src/plugins/coreplugin/images/unlocked">
       <rect
          y="584"
@@ -909,6 +980,63 @@
          width="800"
          height="600" />
     </g>
+    <g
+       id="src/plugins/diffeditor/images/unifieddiff"
+       clip-path="url(#clipPath3218)">
+      <g
+         style="stroke:#dbdbdb;stroke-opacity:1;filter:url(#1_pixel_shadow)"
+         id="g3203">
+        <path
+           id="path3429"
+           style="fill:none;stroke:#dbdbdb;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 178,578.5 4,0 m -7,3 5,-10 m -9,4 5,0 m -2.5,-2.5 0,5 m -4,-6.5 14,0 0,10 -14,0 z"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccccccc" />
+        <rect
+           y="568"
+           x="169"
+           height="16"
+           width="16"
+           id="rect3203"
+           style="fill:none;stroke:none" />
+      </g>
+    </g>
+    <g
+       id="src/plugins/diffeditor/images/sidebysidediff"
+       clip-path="url(#clipPath4031)"
+       style="filter:url(#1_pixel_shadow)">
+      <path
+         id="rect4001"
+         style="fill:none;stroke:#dbdbdb;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+         d="m 185.5,571.5 14,0 0,10 -14,0 z m 9,5 2,0 c 0,0 1,0.5 1,1.5 0,1 -1,1.5 -1,1.5 l -2,0 0,-6 2,0 c 0,0 1,0.5 1,1.5 0,1 -1,1.5 -1,1.5 m -9,1 3,0 m -3,2.5 c 0,-1.83333 0,-4 0,-5.5 0,0 0,-1 1.5,-1 1.5,0 1.5,1 1.5,1 l 0,5.5 0,0 m 2,-8.5 0,10"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccsccccscccccsccccc" />
+      <rect
+         style="fill:none;stroke:none"
+         id="rect4023"
+         width="16"
+         height="16"
+         x="185"
+         y="568" />
+    </g>
+    <g
+       id="src/plugins/diffeditor/images/topbar"
+       style="filter:url(#1_pixel_shadow)"
+       clip-path="url(#clipPath3233)">
+      <path
+         sodipodi:nodetypes="cccccccccc"
+         inkscape:connector-curvature="0"
+         id="rect3233"
+         d="m 204,571 0,11 10,0 0,-11 z m 1,5 8,0 0,5 -8,0 z"
+         style="fill:#dbdbdb;fill-opacity:1;stroke:none" />
+      <rect
+         y="568"
+         x="201"
+         height="16"
+         width="16"
+         id="rect3219"
+         style="fill:none;stroke:none" />
+    </g>
   </g>
   <g
      inkscape:groupmode="layer"