From c465a25edc0c9e5b76e1757491023cdbb02ef0de Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@qt.io>
Date: Tue, 18 Oct 2016 19:21:04 +0200
Subject: [PATCH] ScxmlEditor: Themable, HighDPI-able export-canvas icon

Change-Id: I966dee7c22903921d814141bc749b39dec7cf8d7
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 src/plugins/scxmleditor/common/common.qrc     |   1 +
 .../common/images/icon-export-canvas.png      | Bin 856 -> 164 bytes
 .../common/images/icon-export-canvas@2x.png   | Bin 0 -> 256 bytes
 .../plugin_interface/actionhandler.cpp        |   2 +-
 src/tools/icons/qtcreatoricons.svg            |  54 ++++++++++++++++++
 5 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 src/plugins/scxmleditor/common/images/icon-export-canvas@2x.png

diff --git a/src/plugins/scxmleditor/common/common.qrc b/src/plugins/scxmleditor/common/common.qrc
index d0fdb605dd1..49ee31ce666 100644
--- a/src/plugins/scxmleditor/common/common.qrc
+++ b/src/plugins/scxmleditor/common/common.qrc
@@ -15,6 +15,7 @@
         <file>images/fullnamespace.png</file>
         <file>images/history.png</file>
         <file>images/icon-export-canvas.png</file>
+        <file>images/icon-export-canvas@2x.png</file>
         <file>images/icon-fit-screen.png</file>
         <file>images/icon-pan.png</file>
         <file>images/icon-zoom-in.png</file>
diff --git a/src/plugins/scxmleditor/common/images/icon-export-canvas.png b/src/plugins/scxmleditor/common/images/icon-export-canvas.png
index 4c0eca55602892540165377a6a6f92f5c23e1182..d2d47205a8f2df6cb40ad5e12472455d0fe12d17 100644
GIT binary patch
literal 164
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4h9AW2CEqh_A)RqWP7?ehDc0J{?X4SVZc(C
z5hA+Lkb&`a-HI;lm20ja)Y-V#Kv&Rc{p-dxhZ6)RG&t^5o51w4i7Voofx&@XhQ#Ux
zPwIbHRqt?M_t+-KAvqyr;fjV8_y5a#GOVck|L1>(*1!Mmrp&Gkd>ej>G5j&y`|PP^
Q;XRP`p00i_>zopr0LSh;yZ`_I

literal 856
zcmeAS@N?(olHy`uVBq!ia0y~yU{C>J4rT@hhHLjSRxvOz&JOSiab;j&U}k2Pl9Dnu
zHkLvKT3T8V0X;oEGzIGF>QYits;a7(y42Oxjg5_EWo4zLq#(+qq@?8K<&BMvO-)VB
z&CM+>Ev>AqY;0_7oLp^fZSCyr9GqPo9UUDbQ=P*T-2%hi-Q7JsJw3x>eFB2~60`l|
z)BP*^f|IjDqT)i+^26ej!^6YFdzME=Mn;#lM7Pb2NzaWbtcjhpF0OHM%FL~)4SlII
zx2CsE%b2u0Gcz-D&bF+o#_a6uoT;mF7VasmZ7G_xxVW~tWaW{vC40)}tgoE1uxkFM
z>gwv6jc00WYisAOYiMX_oW8Je&7r2Irsf@2S~nbRo4u@U$EEh2S339J=-zOo`@o&v
z-rl~wSNi8H?w_}O!r{A<PduJEbLPymFXrqxKIhn-B}<kpTefWV>eXx4uHAI`@s=%H
zwr<_J_0*M}J9qBhz5B?KBNs1TynOlcjT<-a-@pIh!GkAHo;-W@?A5DRZ{NQC`0?ZC
z&!4}1`C{t2gr9+dL9ryrFBlX_Y@GaZD%$o=zJ7ionKM_cUbAt_;bSLn-+uDy?YEyB
zX64UiU|{t2ba4!^=uJ*oV3%;^5LbX`=GCjojBYDdZMkKguz>U2s}%=Up4cvVZq1>k
zD{gJvwV3&hLWt{`nnka)+{yx<>dMOInniweaFtEy2{@vrlq@)J#{8KQ8B4`32fPW%
zY+2didP~PdoU7<g$kxZFe6kEhI3+c-v!$w+ENOPkDym8hklQue;^|Zo(bUQk(>KBk
z6jX0>C-FH=Y*@5tk%)D3SaQqCcoi0r6<f<1c$>6^!a}AzW?*+*xysu>Vo7A!;+ZNd
zSDfJHT`t9&UoXJH+2J0nvQC4I`;3`1d$>S>zmZe0%8C=b!6A#@^Dtht`nsa)hiJsY
zt|*?fxrzra@8Sp*oXn#0&gjdbq=g5Li-!s_i-!d6U1h|yVr$kzU)BJJV%Mk(5v<w=
zeM$mc3z)YU2+OWg(%sQ0GQ*{3_6CMqnnqd2nR+gG^W+@pX#B^(Q1VIhUFnlUdl?uQ
O7(8A5T-G@yGywoA|6_>&

diff --git a/src/plugins/scxmleditor/common/images/icon-export-canvas@2x.png b/src/plugins/scxmleditor/common/images/icon-export-canvas@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..bdc82b7ade6b4af26d989f7af0c0a84b07751c5c
GIT binary patch
literal 256
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4h9AWhA=@@4F(2=<DM>#Ar_~TfA}*PTySkn
zJ@)Q@p$`wof{#3|2bC90D16VUsUm8nALwIoonwm0zg7V!L*_Sa@^g83>g)x$N+yOl
z$nKocsVL`h)mdbZQxIcl!0xWuiSPbbv2`^4_t09vC6T6+_&`6UL91bhNGRj&{|pl}
zCNZ&vur~eY7HkUWo*-Hvzb^g2>V*CBXChd77b!60=`)9j_%cSlNz`(<;m68)L$>qH
zzyG`udph6Ld5M}ZFe(cFdmPjtByF+Rb03qB!z?DQPihP`Z+`?TD3*DFyyofZ=d#Wz
Gp$Py*S6EO0

literal 0
HcmV?d00001

diff --git a/src/plugins/scxmleditor/plugin_interface/actionhandler.cpp b/src/plugins/scxmleditor/plugin_interface/actionhandler.cpp
index 9024bc1f340..076be01876b 100644
--- a/src/plugins/scxmleditor/plugin_interface/actionhandler.cpp
+++ b/src/plugins/scxmleditor/plugin_interface/actionhandler.cpp
@@ -56,7 +56,7 @@ ActionHandler::ActionHandler(QObject *parent)
         { Utils::Icon({{":/utils/images/editcut.png",  Utils::Theme::IconsBaseColor}}), AH::tr("Cut"), AH::tr("Cut (Ctrl + X)"), "Ctrl+X", false },
         { Utils::Icon({{":/utils/images/editpaste.png",  Utils::Theme::IconsBaseColor}}), AH::tr("Paste"), AH::tr("Paste (Ctrl + V)"), "Ctrl+V", false },
         { Utils::Icons::SNAPSHOT_TOOLBAR, AH::tr("Screenshot"), AH::tr("Screenshot (Ctrl + Shift + C)"), "Ctrl+Shift+C", false },
-        { Utils::Icon(":/scxmleditor/images/icon-export-canvas.png"), AH::tr("Export to Image"), AH::tr("Export to Image"), "Ctrl+Shift+E", false },
+        { Utils::Icon({{":/scxmleditor/images/icon-export-canvas.png",  Utils::Theme::IconsBaseColor}}), AH::tr("Export to Image"), AH::tr("Export to Image"), "Ctrl+Shift+E", false },
         { Utils::Icon(":/scxmleditor/images/fullnamespace.png"), AH::tr("Toggle Full Namespace"), AH::tr("Toggle Full Namespace"), "Ctrl+Shift+N", true },
 
         { Utils::Icon(":/scxmleditor/images/align_left.png"), AH::tr("Align Left"), AH::tr("Align Left (Ctrl+L,1)"), "Ctrl+L,1", false },
diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg
index 2dfab39db74..7002b7fd402 100644
--- a/src/tools/icons/qtcreatoricons.svg
+++ b/src/tools/icons/qtcreatoricons.svg
@@ -3680,6 +3680,60 @@
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="cc" />
     </g>
+    <g
+       transform="translate(128,0)"
+       style="display:inline"
+       id="src/plugins/scxmleditor/common/images/icon-export-canvas">
+      <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" />
+      <path
+         style="display:inline;fill:#ffffff;stroke:#000000"
+         d="m 1231.5,570.5 6,0 3,3 0,9 -9,0 z"
+         id="path5168-9-0"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccc" />
+      <path
+         id="path5395"
+         style="fill:none;stroke:#ffffff;stroke-width:0.5"
+         d="m 1230.5,570.19616 c 0.7537,0.30603 1.4871,0.80218 2.1105,1.42819 m -2.5289,0.0848 c 0.9971,0.19177 2.056,1.54867 2.4887,2.36904 l -2.0781,2.1718 3.0078,0"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccc" />
+      <path
+         style="display:inline;fill:none;stroke:#000000"
+         d="m 1237.5,570.5 0,3 3,0"
+         id="path5172-7-3"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccc" />
+      <path
+         style="fill:none;stroke:#000000"
+         d="m 1229,570.5 c 3.1056,0.69368 3.8892,2.71353 5,4.5"
+         id="path4741-3"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:#000000"
+         d="m 1235,576 -4,0 4,-4 z"
+         id="path4743-2"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc" />
+      <path
+         id="rect5364-4"
+         style="fill:none;stroke:#000000;stroke-width:0.5"
+         d="m 1233.25,578.25 2.5,0 0,2.5 -2.5,0 z m 3,-3 2.5,0 0,2.5 -2.5,0 z"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccccc" />
+      <path
+         sodipodi:nodetypes="ccc"
+         inkscape:connector-curvature="0"
+         id="path5391"
+         d="m 1236,579.75 1.75,0 0,-1.75"
+         style="fill:none;stroke:#808080;stroke-width:0.5" />
+    </g>
   </g>
   <g
      inkscape:groupmode="layer"