From b2378b4fad886acd2c036a55b51acfa53cf93fc7 Mon Sep 17 00:00:00 2001
From: dismine <dismine@gmail.com>
Date: Mon, 23 Dec 2013 13:13:28 +0200
Subject: [PATCH] Cursor and icon for tool "Union details".

--HG--
branch : feature
---
 share/resources/cursor.qrc              |   1 +
 share/resources/cursor/union_cursor.png | Bin 0 -> 1359 bytes
 share/resources/icon.qrc                |   1 +
 share/resources/icon/32x32/union.png    | Bin 0 -> 796 bytes
 src/mainwindow.ui                       |  28 ++++++++++++++++++++----
 5 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 share/resources/cursor/union_cursor.png
 create mode 100644 share/resources/icon/32x32/union.png

diff --git a/share/resources/cursor.qrc b/share/resources/cursor.qrc
index 0af6dcf3b..4e9cd2b99 100644
--- a/share/resources/cursor.qrc
+++ b/share/resources/cursor.qrc
@@ -17,5 +17,6 @@
         <file>cursor/pointofintersect_cursor.png</file>
         <file>cursor/spline_cut_point_cursor.png</file>
         <file>cursor/splinepath_cut_point_cursor.png</file>
+        <file>cursor/union_cursor.png</file>
     </qresource>
 </RCC>
diff --git a/share/resources/cursor/union_cursor.png b/share/resources/cursor/union_cursor.png
new file mode 100644
index 0000000000000000000000000000000000000000..687d2ca5921dfeafe05867413343ef81d66cd7e2
GIT binary patch
literal 1359
zcmV-V1+e;wP)<h;3K|Lk000e1NJLTq0018V001Be1^@s6>Vl&|00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-3%8C3Kt(ErP=@h06}y`
zSad^gZEa<4bO1wAML|?gQaT`KWG!lNWoICEF)lD5D0OpbZf77#N=G0{P(?=|b~Z98
zEFf`pVQgu1c_2L?IWP*aMOc#n00fUoL_t(Y$HkUyXq9Cc$A9<p;&yhn(azAF=7@o^
z64WdPZKQqJgfW=8O^u}ng#;a#np7i_guVre28Kiw2!)fz*b-@x!Z^O9#Xf|nAxxdM
zMSD3m&7HQL`?;?^>^$Raot;uQyWoQ7zMuPfuIu{$ua_JCPuaV7?~L`19Xr$`bzsk)
zJ-1e^S|xRLbs{1w9;xx#+S*Hil$Di9>V8j8&w|=@0362w;P&m?5{X2_bzN4kUL7ef
zFaKo0Bj2!L!zDm$+ZLsi0MgRZ(!S7kt<;6*d5BCQKQJ(`eAljBZ??3wR6UZ&{pfvF
zN=a2!m9)3FKek|;r;0HK01?5mEQ*SXXl!g8T`<^{nksFj)bz9ONNZ~=N+}74!%|sU
znX_P=`+TR0QVPd$5D_k1xDfaEJ3Bkog2A3DT5Dplm^3vtiPoB?rY7p^>*vRKx`=(T
zZ5z+?0Mzm0#{sCRshNM+(?PDaMnn*i>1K5O`gMTN+O=y-=e5*Q)o(aTscH4!Wo2ba
zNlA%3H0-GvK34)NrDm)rCML+q$srnzF6-{@&Re%`-9UA9_3%R_Tsr8}Iii%Jx3`x_
zB+@%NI!b<i{#(GodE<O8XG8>J3?jnSt5+Eu93&o(Px@yrUcC6<jc3aCbd)%bGlK?W
z45v<=`k<kq;pWk!NBb)(DjuG5-?7=wX|4ZpCK`=~fKWIbez1hIZF{=OD5WsQke8Py
z<>lpSY;0^s$J1KlI1ah_xfo-JkHtYL);zNYAa8aIKmZudm~j3;F~*>jlIrSe)6vn9
zDKXCilgS^eb7#&1d^Wpr0{K8Qa5HU(Gsa+979t{+WsMtSMvXC}ZEbD2TefVuH;3`%
zz;598<o{ARQpvr)l9jNu@79f*2M!(K<Btx^ggpth2JSXDH=i#qE^ZBlLO*3N4Dbig
zJsZ--`i)jrc9ywwXN+K80c~G>X#+1UTUK^Xl0iDNhKlF9?wv#;(VLr_+qrMwzMjIu
z!hzD#Qq|YjH&;nWGQw%uy>lo1{kP0-zxES7|2?*C1JnQqJ*|6zZHt#I`N085BoY8p
zP*8Ah`}XZW9zJ~d!$cx+O>522(2#K)$I8jcF_V*%7-J+mJDWftKr9yXjq9WX0x%LA
zQ5|2O^wAU%!M5#TrPM20>*s(shKGhm6u|oR>o1)?efp`DD_0I(zI?ePZ9|yKg&AvO
zj1rMwfco|`9oOvaMV|3Iv29yv?aAinH;#)4+1UY#7KaFh3JEVQrR$p$n}BEitMhw6
z{*^0N?jAdKY{k~CTYvtyIq!KMj^l{d+6CU<^g_c3;H4ZX0NR4VVB5sR1Vh6yKv?8v
z0Sp3V4>XMefdIB``-%Dl@OV;-lNtspflq;ArPTC!*L49ZfY0yCnCrS&mX)#f0(|#v
z7b2p72v7~!fZBg#zpbV|dL4K=<5ega3^G1GKHcroU9skp7wc*{akA@4;8mbES?h~{
z62N=;wQUD8PPKSE?s}eQX|3<ma1AF;cJb~zZ(jqxNb<itNyiP~kp6Rg;%~SE4cOG`
RWl{hD002ovPDHLkV1mmLdsqMf

literal 0
HcmV?d00001

diff --git a/share/resources/icon.qrc b/share/resources/icon.qrc
index 85c2c0ddf..8ba3c5058 100644
--- a/share/resources/icon.qrc
+++ b/share/resources/icon.qrc
@@ -39,5 +39,6 @@
         <file>icon/32x32/point_of_intersection.png</file>
         <file>icon/32x32/spline_cut_point.png</file>
         <file>icon/32x32/splinePath_cut_point.png</file>
+        <file>icon/32x32/union.png</file>
     </qresource>
 </RCC>
diff --git a/share/resources/icon/32x32/union.png b/share/resources/icon/32x32/union.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c8ad9c88bbd265e5b44d8b819be2b1ec3dccc68
GIT binary patch
literal 796
zcmV+%1LOROP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-3%8C2s<CmtGfUI0;x$v
zK~z}7?UzqTR8bVhe{W_?b97{g40@Pi2D#|@z(|N9qIPXu1Q9_*B!Mk#VeMK)?L=CH
z=%%2Ji$Jhwp$iEY6-7O631w0`dBMbK%288i#@FUNn1zmi=1l~7;Bw#M+<U(JopZi>
zA8gzIZU%4}xBxr`MuChE`<4Jl9j!V7DdU$_b0{Z(6c7SjU|HsTEeI3=T|jFt$B;N@
zfN>!16SL(&Jy7jv6|_w&lMBEC5ChITT7C2*x@}q~f&Pu8GbCx40)E)0wd4~6DVbN+
za|}q%4WElUE&J}bO{?0`YDa8wVom2cU<j!45kQ?3bXwTBEA>$7x-RkAcwqs2o*o6L
z0c-)1lr+D1H=)V^5_5@yG5|pT@DqTVNJXR)Xa**L0id?6qqXn=vdz&d0=xmnfG>_#
z;h_)D3H&X|jh2?pI$E8$a;>EaSg}p(Vl)~p@fa8^Gy?!JJ%*!I5pZ8xv^gZLcp5nD
zXysLg3oO{C<@yO=pIPT=#E?jIg9l&<IBT0$W0sIiNd>QVf0O_bpbz*IPkv`t`JT;S
zS&~B@^wcUN!4|VdO8R)Uk&$)tK+_h;I3@e{gn-);FqS2q-YJbW7$^qz0+)b!M=N8K
z>GFKtkfYU|t-JwlTy2jIJ{@QTZoV3R*#;ywu{<dter~y-x_f(~z%Af)cW+PheSB=)
z`{ZjP=6$vRlfdzOgvAgLUBCl?$;FwCEUlLUZ*a5<=BsW+z;$_3)H_-kIeY^^HSiYb
zbhHYNd{cycxOSfbM}R)tv^s^_-vX)>2m@8NX(fSszzonC-cgo0u)Ee5jjsUC0gr$Y
z37(c-PfKUHGPeWA9IcA8TPj}w1`xJQYp1*e&d8fE4NObmN?_d4>LIXfn^tQ3hh*FS
a8T$h-hx-LH+r7U40000<MNUMnLSTaQ^G#j=

literal 0
HcmV?d00001

diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index 9c7943fb8..674702e62 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -40,14 +40,14 @@
        <string/>
       </property>
       <property name="currentIndex">
-       <number>4</number>
+       <number>3</number>
       </property>
       <widget class="QWidget" name="page">
        <property name="geometry">
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>150</width>
+         <width>144</width>
          <height>150</height>
         </rect>
        </property>
@@ -302,7 +302,7 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>150</width>
+         <width>100</width>
          <height>58</height>
         </rect>
        </property>
@@ -378,7 +378,7 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>150</width>
+         <width>100</width>
          <height>104</height>
         </rect>
        </property>
@@ -596,6 +596,26 @@
           </property>
          </widget>
         </item>
+        <item row="0" column="1">
+         <widget class="QToolButton" name="toolButton">
+          <property name="text">
+           <string>...</string>
+          </property>
+          <property name="icon">
+           <iconset resource="../share/resources/icon.qrc">
+            <normaloff>:/icon/32x32/union.png</normaloff>:/icon/32x32/union.png</iconset>
+          </property>
+          <property name="iconSize">
+           <size>
+            <width>32</width>
+            <height>32</height>
+           </size>
+          </property>
+          <property name="checkable">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
        </layout>
       </widget>
      </widget>