From 77f68653b045802e76a30ec8703533757cf5e288 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@qt.io>
Date: Wed, 26 Oct 2016 11:08:44 +0200
Subject: [PATCH] ScxmlEditor: Themable "Pan" icon

Change-Id: I2041801fb8d300515c3bea26bccda0c606cd2abe
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 src/plugins/scxmleditor/common/common.qrc     |   1 +
 .../scxmleditor/common/images/icon-pan.png    | Bin 783 -> 199 bytes
 .../scxmleditor/common/images/icon-pan@2x.png | Bin 0 -> 240 bytes
 .../plugin_interface/actionhandler.cpp        |   2 +-
 src/tools/icons/qtcreatoricons.svg            |  45 ++++++++++++++++++
 5 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 src/plugins/scxmleditor/common/images/icon-pan@2x.png

diff --git a/src/plugins/scxmleditor/common/common.qrc b/src/plugins/scxmleditor/common/common.qrc
index 78c35d708e9..df4997beca5 100644
--- a/src/plugins/scxmleditor/common/common.qrc
+++ b/src/plugins/scxmleditor/common/common.qrc
@@ -26,6 +26,7 @@
         <file>images/icon-export-canvas.png</file>
         <file>images/icon-export-canvas@2x.png</file>
         <file>images/icon-pan.png</file>
+        <file>images/icon-pan@2x.png</file>
         <file>images/initial.png</file>
         <file>images/more_colors.png</file>
         <file>images/navigator.png</file>
diff --git a/src/plugins/scxmleditor/common/images/icon-pan.png b/src/plugins/scxmleditor/common/images/icon-pan.png
index e157880417dd0a7feb217604c65e65815f01072b..753b3bf02ba1d4338fa20e07a2ef799bb581343e 100644
GIT binary patch
literal 199
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdmW!d_r6q7#KuFMa9I#_U_%g
zZ{NQC`}ZF_c<|7nLx&F^zI*rXy?giW-@pIh!Gq7AKY#i1<^TWx*}D&}VPIeg@^o<w
z;fPND!OzO0@W^(`$54?|94S5Q#&zAByqYC{fB*d6o<F5#>c8{<gJn)=Z2Euxzx~Pi
z57#p=bG$J8lh4#Ca?|;0$Dxw7?uP7nMu+q^yk(fVHimEdrC4nS1_lOCS3j3^P6<r_
DP!d>q

literal 783
zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4rT@hhU+WOo?>8NYzXiPab;s;`~Uwx8;t=6
z2Rk<}8xJo#FE1A_A2+`MH@_f<fB>(!44b4JyNtY$tP+osiny|>l(MR{vL>I3rhuBZ
zn7X!vww{cxp`5M-tDXhBv8Ak;otU|es)e1rm9w~=lb&k`ziSw)UzAEnyjEnIW^|@n
zY^Gj9x?^I2Mrt*GTE263vq)L5R7Iac)daQLNxHSOd72jpb<A|{n&sOwJ*js_eD9p#
z-t`=P%XRuU@=jQ#GjYAblnv_B_i)VEtUq&2=<HPqv$vYhKEO9;UD&*XA`1>nFFC5b
z^nlg!!&b|WYp>WBzIuP$>Qg3bcUP=Gn700C)cP~F8}`<2JRY;@oZGgG0ozX&?zkAS
z>vH72Ye@%hWF5WId-PWE$-6bD?lhmd-*Wyz_r*sOy~URuU|?WSED7=pW?*3B<QEc^
zQ_(drvv+b$NY2d3uc&TpY44gmZT^bYTOM-V(V4@*z$okK;uxYaF*%`ynaz%m%_1Si
z!K350BuCO@fh+5E0v;cn^5E*3mFxMZrMgW|n99A9naNzUgfsAbl)#FO&m5;FJTo%Y
zUb(K%{PN=jw`l?aq0fU(tX;)5^?5+}Q+JP!*D5m$v{FJtSWXttI`Xo^Q8i*|4%g{k
zQBmX5r<p}XdryDXSvtc(NaxbJrKuVVu6RnRC_akmVU%HYw3>3K`$7YE1iSL?ExA?u
zCN4^Hs@pez(W1b*SyN4<uY^w8HL-0D*T$PS_kEhv_HdUFM?J^Nj13wt=_x->Y|dE0
zvFOJf_b@{()2q>evsxuh*QD$XI&dIPKv$r03iG7K1I}#9b}U<!g@pf3-D#K{a7IbZ
u$D1K~j<@BE?nGZ6pF=e_f;qJq7z+G7toP2yTfxA<z~JfX=d#Wzp$Pz*!3!b)

diff --git a/src/plugins/scxmleditor/common/images/icon-pan@2x.png b/src/plugins/scxmleditor/common/images/icon-pan@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..11c02fc16236a89b0119227347b77c33af130d43
GIT binary patch
literal 240
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4h9AWhA=@@4F(2=?Vc`<Ar`0CPLAX|WWeL{
z+(J~VX?9afRN<i|ZTA))Q9S1+X7=BuH{MqH_Q7kMf8-Uin79935XI1Yz@xO`vt*;r
zc~K#zPCGW<4-2~v9NEtllcD8(X4w`-vsv6iMV#fuvB3wXmmXj}ZpyZ1zeGft#T{mW
zPjOBhDV6*jjQ95kNyz6m{8kdunqIK$;1Vy!kD|4!BtGoR?zKAUv3jlD<>iN~((hb*
sS)BN#T>E<bt$(*}w=b@*uG0U=!1~1Q_5FTkU65BiUHx3vIVCg!061)3TmS$7

literal 0
HcmV?d00001

diff --git a/src/plugins/scxmleditor/plugin_interface/actionhandler.cpp b/src/plugins/scxmleditor/plugin_interface/actionhandler.cpp
index 9a2ff761c22..dfa715be8e7 100644
--- a/src/plugins/scxmleditor/plugin_interface/actionhandler.cpp
+++ b/src/plugins/scxmleditor/plugin_interface/actionhandler.cpp
@@ -47,7 +47,7 @@ ActionHandler::ActionHandler(QObject *parent)
         { Utils::Icons::ZOOMIN_TOOLBAR, AH::tr("Zoom In"), AH::tr("Zoom In (Ctrl + + / Ctrl + Wheel)"), "Ctrl++", false },
         { Utils::Icons::ZOOMOUT_TOOLBAR, AH::tr("Zoom Out"), AH::tr("Zoom Out (Ctrl + - / Ctrl + Wheel)"), "Ctrl+-", false },
         { Utils::Icons::FITTOVIEW_TOOLBAR, AH::tr("Fit to View"), AH::tr("Fit to View (F11)"), "F11", false },
-        { Utils::Icon(":/scxmleditor/images/icon-pan.png"), AH::tr("Panning"), AH::tr("Panning (Shift)"), "Shift", true },
+        { Utils::Icon({{":/scxmleditor/images/icon-pan.png", Utils::Theme::IconsBaseColor}}), AH::tr("Panning"), AH::tr("Panning (Shift)"), "Shift", true },
 
         { Utils::Icons::ZOOM_TOOLBAR, AH::tr("Magnifier"), AH::tr("Magnifier Tool (Alt)"), "Alt", true },
         { Utils::Icon(":/scxmleditor/images/navigator.png"), AH::tr("Navigator"), AH::tr("Navigator (Ctrl+E)"), "Ctrl+E", true },
diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg
index b3f436cf257..e0f41d12d98 100644
--- a/src/tools/icons/qtcreatoricons.svg
+++ b/src/tools/icons/qtcreatoricons.svg
@@ -4007,6 +4007,51 @@
          d="m 1234,579.5 -2.5,0 0,-2.5 m 9,0 0,2.5 -2.5,0 m 0,-7 2.5,0 0,2.5 m -9,0 0,-2.5 2.5,0 m -4.5,-2 13,0 0,11 -13,0 z"
          inkscape:connector-curvature="0" />
     </g>
+    <g
+       transform="translate(336,0)"
+       style="display:inline"
+       id="src/plugins/scxmleditor/common/images/icon-pan">
+      <rect
+         style="fill:#ffffff;fill-opacity:1"
+         x="1228"
+         y="568"
+         width="16"
+         height="16"
+         id="rect6782-96-0-0-7-8-1-0-4-0-1-7-9-1-9-5-6-3-0-4" />
+      <path
+         id="path5290"
+         style="stroke:#000000;stroke-width:1px;fill:none"
+         d="m 1236.5,570.5 0,6.5 m -2.5,-4 2.5,-2.5 2.5,2.5"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <use
+         style="display:inline"
+         x="0"
+         y="0"
+         xlink:href="#path5290"
+         id="use5293"
+         transform="matrix(0,1,-1,0,1812.9931,-659.99311)"
+         width="100%"
+         height="100%" />
+      <use
+         style="display:inline"
+         x="0"
+         y="0"
+         xlink:href="#path5290"
+         id="use5295"
+         transform="matrix(-1,0,0,-1,2473,1153)"
+         width="100%"
+         height="100%" />
+      <use
+         style="display:inline"
+         x="0"
+         y="0"
+         xlink:href="#use5293"
+         id="use5297"
+         transform="matrix(-1,0,0,1,2472.9931,-0.006937)"
+         width="100%"
+         height="100%" />
+    </g>
   </g>
   <g
      inkscape:groupmode="layer"