From 851ddabc40a45e79a4f87b73a758987bac544b05 Mon Sep 17 00:00:00 2001
From: Jim Evins <evins@snaught.com>
Date: Thu, 2 Feb 2017 22:51:24 -0500
Subject: [PATCH] Updated some 16x16 icons.

---
 glabels/Icons.h                               |  70 +++++++++---------
 glabels/icons.qrc                             |  14 ++--
 glabels/icons/16x16/actions/glabels-arrow.png | Bin 234 -> 0 bytes
 .../icons/16x16/actions/glabels-barcode.png   | Bin 293 -> 0 bytes
 glabels/icons/16x16/actions/glabels-box.png   | Bin 199 -> 0 bytes
 .../icons/16x16/actions/glabels-ellipse.png   | Bin 376 -> 0 bytes
 glabels/icons/16x16/actions/glabels-image.png | Bin 485 -> 0 bytes
 glabels/icons/16x16/actions/glabels-line.png  | Bin 252 -> 0 bytes
 glabels/icons/16x16/actions/glabels-text.png  | Bin 160 -> 0 bytes
 .../icons/22x22/actions/glabels-ellipse.svg   |   2 +-
 .../icons/24x24/actions/glabels-ellipse.svg   |   2 +-
 11 files changed, 44 insertions(+), 44 deletions(-)
 delete mode 100644 glabels/icons/16x16/actions/glabels-arrow.png
 delete mode 100644 glabels/icons/16x16/actions/glabels-barcode.png
 delete mode 100644 glabels/icons/16x16/actions/glabels-box.png
 delete mode 100644 glabels/icons/16x16/actions/glabels-ellipse.png
 delete mode 100644 glabels/icons/16x16/actions/glabels-image.png
 delete mode 100644 glabels/icons/16x16/actions/glabels-line.png
 delete mode 100644 glabels/icons/16x16/actions/glabels-text.png

diff --git a/glabels/Icons.h b/glabels/Icons.h
index a162738..1d9209f 100644
--- a/glabels/Icons.h
+++ b/glabels/Icons.h
@@ -39,9 +39,9 @@ namespace glabels
 		public:
 			Arrow()
 			{
-				addFile( ":icons/16x16/actions/glabels-arrow.png" );
-				addFile( ":icons/22x22/actions/glabels-arrow.svg" );
-				addFile( ":icons/24x24/actions/glabels-arrow.svg" );
+				addPixmap( QPixmap( ":icons/16x16/actions/glabels-arrow.svg" ) );
+				addPixmap( QPixmap( ":icons/22x22/actions/glabels-arrow.svg" ) );
+				addPixmap( QPixmap( ":icons/24x24/actions/glabels-arrow.svg" ) );
 			}
 		};
 
@@ -51,9 +51,9 @@ namespace glabels
 		public:
 			Barcode()
 			{
-				addFile( ":icons/16x16/actions/glabels-barcode.png" );
-				addFile( ":icons/22x22/actions/glabels-barcode.svg" );
-				addFile( ":icons/24x24/actions/glabels-barcode.svg" );
+				addPixmap( QPixmap( ":icons/16x16/actions/glabels-barcode.svg" ) );
+				addPixmap( QPixmap( ":icons/22x22/actions/glabels-barcode.svg" ) );
+				addPixmap( QPixmap( ":icons/24x24/actions/glabels-barcode.svg" ) );
 			}
 		};
 
@@ -63,9 +63,9 @@ namespace glabels
 		public:
 			Box()
 			{
-				addFile( ":icons/16x16/actions/glabels-box.png" );
-				addFile( ":icons/22x22/actions/glabels-box.svg" );
-				addFile( ":icons/24x24/actions/glabels-box.svg" );
+				addPixmap( QPixmap( ":icons/16x16/actions/glabels-box.svg" ) );
+				addPixmap( QPixmap( ":icons/22x22/actions/glabels-box.svg" ) );
+				addPixmap( QPixmap( ":icons/24x24/actions/glabels-box.svg" ) );
 			}
 		};
 
@@ -75,9 +75,9 @@ namespace glabels
 		public:
 			Ellipse()
 			{
-				addFile( ":icons/16x16/actions/glabels-ellipse.png" );
-				addFile( ":icons/22x22/actions/glabels-ellipse.svg" );
-				addFile( ":icons/24x24/actions/glabels-ellipse.svg" );
+				addPixmap( QPixmap( ":icons/16x16/actions/glabels-ellipse.svg" ) );
+				addPixmap( QPixmap( ":icons/22x22/actions/glabels-ellipse.svg" ) );
+				addPixmap( QPixmap( ":icons/24x24/actions/glabels-ellipse.svg" ) );
 			}
 		};
 
@@ -87,9 +87,9 @@ namespace glabels
 		public:
 			Image()
 			{
-				addFile( ":icons/16x16/actions/glabels-image.png" );
-				addFile( ":icons/22x22/actions/glabels-image.svg" );
-				addFile( ":icons/24x24/actions/glabels-image.svg" );
+				addPixmap( QPixmap( ":icons/16x16/actions/glabels-image.svg" ) );
+				addPixmap( QPixmap( ":icons/22x22/actions/glabels-image.svg" ) );
+				addPixmap( QPixmap( ":icons/24x24/actions/glabels-image.svg" ) );
 			}
 		};
 
@@ -99,9 +99,9 @@ namespace glabels
 		public:
 			Line()
 			{
-				addFile( ":icons/16x16/actions/glabels-line.png" );
-				addFile( ":icons/22x22/actions/glabels-line.svg" );
-				addFile( ":icons/24x24/actions/glabels-line.svg" );
+				addPixmap( QPixmap( ":icons/16x16/actions/glabels-line.svg" ) );
+				addPixmap( QPixmap( ":icons/22x22/actions/glabels-line.svg" ) );
+				addPixmap( QPixmap( ":icons/24x24/actions/glabels-line.svg" ) );
 			}
 		};
 
@@ -111,9 +111,9 @@ namespace glabels
 		public:
 			Text()
 			{
-				addFile( ":icons/16x16/actions/glabels-text.png" );
-				addFile( ":icons/22x22/actions/glabels-text.svg" );
-				addFile( ":icons/24x24/actions/glabels-text.svg" );
+				addPixmap( QPixmap( ":icons/16x16/actions/glabels-text.svg" ) );
+				addPixmap( QPixmap( ":icons/22x22/actions/glabels-text.svg" ) );
+				addPixmap( QPixmap( ":icons/24x24/actions/glabels-text.svg" ) );
 			}
 		};
 
@@ -146,8 +146,8 @@ namespace glabels
 			AlignLeft()
 			{
 				addFile( ":icons/16x16/actions/glabels-align-left.png" );
-				addFile( ":icons/22x22/actions/glabels-align-left.svg" );
-				addFile( ":icons/24x24/actions/glabels-align-left.svg" );
+				addPixmap( QPixmap( ":icons/22x22/actions/glabels-align-left.svg" ) );
+				addPixmap( QPixmap( ":icons/24x24/actions/glabels-align-left.svg" ) );
 			}
 		};
 
@@ -287,8 +287,8 @@ namespace glabels
 		public:
 			AlignTextLeft()
 			{
-				addFile( ":icons/22x22/actions/glabels-align-text-left.svg" );
-				addFile( ":icons/24x24/actions/glabels-align-text-left.svg" );
+				addPixmap( QPixmap( ":icons/22x22/actions/glabels-align-text-left.svg" ) );
+				addPixmap( QPixmap( ":icons/24x24/actions/glabels-align-text-left.svg" ) );
 			}
 		};
 
@@ -298,8 +298,8 @@ namespace glabels
 		public:
 			AlignTextCenter()
 			{
-				addFile( ":icons/22x22/actions/glabels-align-text-center.svg" );
-				addFile( ":icons/24x24/actions/glabels-align-text-center.svg" );
+				addPixmap( QPixmap( ":icons/22x22/actions/glabels-align-text-center.svg" ) );
+				addPixmap( QPixmap( ":icons/24x24/actions/glabels-align-text-center.svg" ) );
 			}
 		};
 
@@ -309,8 +309,8 @@ namespace glabels
 		public:
 			AlignTextRight()
 			{
-				addFile( ":icons/22x22/actions/glabels-align-text-right.svg" );
-				addFile( ":icons/24x24/actions/glabels-align-text-right.svg" );
+				addPixmap( QPixmap( ":icons/22x22/actions/glabels-align-text-right.svg" ) );
+				addPixmap( QPixmap( ":icons/24x24/actions/glabels-align-text-right.svg" ) );
 			}
 		};
 
@@ -320,8 +320,8 @@ namespace glabels
 		public:
 			AlignTextBottom()
 			{
-				addFile( ":icons/22x22/actions/glabels-valign-text-bottom.svg" );
-				addFile( ":icons/24x24/actions/glabels-valign-text-bottom.svg" );
+				addPixmap( QPixmap( ":icons/22x22/actions/glabels-valign-text-bottom.svg" ) );
+				addPixmap( QPixmap( ":icons/24x24/actions/glabels-valign-text-bottom.svg" ) );
 			}
 		};
 
@@ -331,8 +331,8 @@ namespace glabels
 		public:
 			AlignTextMiddle()
 			{
-				addFile( ":icons/22x22/actions/glabels-valign-text-middle.svg" );
-				addFile( ":icons/24x24/actions/glabels-valign-text-middle.svg" );
+				addPixmap( QPixmap( ":icons/22x22/actions/glabels-valign-text-middle.svg" ) );
+				addPixmap( QPixmap( ":icons/24x24/actions/glabels-valign-text-middle.svg" ) );
 			}
 		};
 
@@ -342,8 +342,8 @@ namespace glabels
 		public:
 			AlignTextTop()
 			{
-				addFile( ":icons/22x22/actions/glabels-valign-text-top.svg" );
-				addFile( ":icons/24x24/actions/glabels-valign-text-top.svg" );
+				addPixmap( QPixmap( ":icons/22x22/actions/glabels-valign-text-top.svg" ) );
+				addPixmap( QPixmap( ":icons/24x24/actions/glabels-valign-text-top.svg" ) );
 			}
 		};
 
diff --git a/glabels/icons.qrc b/glabels/icons.qrc
index 78790e6..38c18c5 100644
--- a/glabels/icons.qrc
+++ b/glabels/icons.qrc
@@ -11,17 +11,17 @@
 	<file>icons/16x16/actions/glabels-align-right.png</file>
 	<file>icons/16x16/actions/glabels-align-top.png</file>
 	<file>icons/16x16/actions/glabels-align-vcenter.png</file>
-	<file>icons/16x16/actions/glabels-arrow.png</file>
-	<file>icons/16x16/actions/glabels-barcode.png</file>
-	<file>icons/16x16/actions/glabels-box.png</file>
+	<file>icons/16x16/actions/glabels-arrow.svg</file>
+	<file>icons/16x16/actions/glabels-barcode.svg</file>
+	<file>icons/16x16/actions/glabels-box.svg</file>
 	<file>icons/16x16/actions/glabels-bucket-fill.png</file>
 	<file>icons/16x16/actions/glabels-center-horiz.png</file>
 	<file>icons/16x16/actions/glabels-center-vert.png</file>
-	<file>icons/16x16/actions/glabels-ellipse.png</file>
+	<file>icons/16x16/actions/glabels-ellipse.svg</file>
 	<file>icons/16x16/actions/glabels-flip-horiz.png</file>
 	<file>icons/16x16/actions/glabels-flip-vert.png</file>
-	<file>icons/16x16/actions/glabels-image.png</file>
-	<file>icons/16x16/actions/glabels-line.png</file>
+	<file>icons/16x16/actions/glabels-image.svg</file>
+	<file>icons/16x16/actions/glabels-line.svg</file>
 	<file>icons/16x16/actions/glabels-merge.png</file>
 	<file>icons/16x16/actions/glabels-object-properties.png</file>
 	<file>icons/16x16/actions/glabels-order-bottom.png</file>
@@ -29,7 +29,7 @@
 	<file>icons/16x16/actions/glabels-pencil.png</file>
 	<file>icons/16x16/actions/glabels-rotate-left.png</file>
 	<file>icons/16x16/actions/glabels-rotate-right.png</file>
-	<file>icons/16x16/actions/glabels-text.png</file>
+	<file>icons/16x16/actions/glabels-text.svg</file>
 	<file>icons/16x16/apps/glabels.png</file>
 	
 	<file>icons/22x22/actions/glabels-align-text-center.svg</file>
diff --git a/glabels/icons/16x16/actions/glabels-arrow.png b/glabels/icons/16x16/actions/glabels-arrow.png
deleted file mode 100644
index 0ae5f36825ef0b889fba6eb3181a58b8daadd61d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 234
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G_YAk0{w5<d|r$X?><>&kwKlara1^Xc^y$ALoSo-U3d6?3kh+sJt+K&0&=vtn(O
zZqB8ht;~@Y4II-R2}vH(HR`OL<W^%=nXq_5`Nj{c-`DT>vmjW+!@|9hv7KXr!9xi~
zqfPw`oXUEt2bgWQWlUqbE4?Mk=$wNszj07V?`xhncCw-I4eIYAlAEJns^`A^;9te~
Y>6l`$$@Ek6flgrXboFyt=akR{0E4Vf-2eap

diff --git a/glabels/icons/16x16/actions/glabels-barcode.png b/glabels/icons/16x16/actions/glabels-barcode.png
deleted file mode 100644
index 6e0e2890a2f8d5ce4df3c722d6f6932cd8eb08b2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 293
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G_YAk0{w5<d|r$X?><>&kwKlZ!!#``~*nOQ6suPZ!6KiaARsZ4_iu6mb0?C)#%I
zMiXm5)6Ddet+6U;(+XH4ni}WUG(Q%YCR(5p86nr78o}6bQMkT8B<XBvibLB0!_JVM
zIsdD~7#5tEC4E7nZc0w=&Zp;1Szjs^W!~Lb^zY=_kTz!@mMuHhH2q%udQnq%)8&o+
z3wCPUkp0CntD8xEQ6$3woBf-%KC|1u;Y;X(ooVtum-p@ZU(8w(|H*Md^v;~GlZ>@C
jJc}-23l^TR=9u{|&ajn*LFJ!;u4nLc^>bP0l+XkKEMIX!

diff --git a/glabels/icons/16x16/actions/glabels-box.png b/glabels/icons/16x16/actions/glabels-box.png
deleted file mode 100644
index c141c9d50dea78b38a8de17bf53ea4e0ca84eb40..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 199
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G_YAk0{w5<d|r$X?><>&kweOO%OIhmXzbKTs&d)5S5w;&gI?M8*M*r86ZZB>o93
z{3p)L%q+br&Q0Z<eUVPOqxj#?m*m&$iGA$Vs8RDe+`y@;bHc1)Y7q0kz^nuEUc3ns
m2Fw$j|Jz$u&6H@fVPJTs$SEPHZOsWZpTX1B&t;ucLK6UuOE+}@

diff --git a/glabels/icons/16x16/actions/glabels-ellipse.png b/glabels/icons/16x16/actions/glabels-ellipse.png
deleted file mode 100644
index 9652562e0d3d9b6c8bb7a9db0e2fa9f3a7712bf7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 376
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G_YAk0{w5<d|r$X?><>&kweOO%O6m!<5V4g&)ttEY=&h{frxlNECgIf%6F59(vF
z+^pF&W9=NJ#G*wVU0ghim@Icn9y!7ic}#?9@2QhZ6{9)inw1?m92a)YQG7Y;&Y7um
zB7!+SOiF+E_y7NQ`@i#@6HtA?I)h>2sZJ~H)QPjZ6oQR{W`t~FS&|)X^uboLy|2gF
zoo%0b?CndfWlC*jZ$%a6$-mFA75V@6Lf!38S0ow!FkL@zD`cx!!RuRMcdwrgslVEl
zU?qHJx^(bO$!8&J*&bZYH;Ruqe5Hh2P~p*qo7p};SD!!Prda;wjBq3Cf$QI0)f^A&
zlr-8M_<h_W*x~ROMjzj|b^Gqjs9fx`RVnEBjnD3#|Jgnie^HuSGS&anOujz*WlM_e
U4R=m528I!Xr>mdKI;Vst08DtAHvj+t

diff --git a/glabels/icons/16x16/actions/glabels-image.png b/glabels/icons/16x16/actions/glabels-image.png
deleted file mode 100644
index ee9ed3d2c39cce27df3f8f612f845c5a72a42229..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 485
zcmV<B0UG{^P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv00000
z008+zyMF)x010qNS#tmY3lRVS3lRZ-WM7d0000McNliru(g_LxEdoEQu2KL10dh%1
zK~#90rIWu)LQxdQKQ{!4SJDrZhU*puChfXtn}f9}PW=Hngl<h01Z}ywwM2vH646jJ
z^c>>31%X0K2s-r>UKt3%Yq<Je{#x|F<s8nr=X<{Ad$};7iH^6%?RRyfRADqme*KWM
z&j8!=HFh5N0Vt%@?5R;r-3tI$Z4bNQByYZ(fqSn0#Ls(^%d{WM(h)+CDp<tbCY45l
z)$cVLz7jNt04&UOC#z<_23fwd_;`k=l^pkTNw{?Y>=l9%@^OcDt!4tSxFk8+5CkPm
zzW@eMbpY&Fxc*Wi#%6`h06>T+-5S8@MHWmbrE~EA6=Ivt^m6%?NW@FM-WsTR`!sVz
zJm~nSa;?@cUa#A(g*vpiN^p_@^ga!!0%~n^-9Xb^Xqv*$l)y06(Sf!(L<7zN=`iTA
zW5BP%P!$Xhut%>3$d1<`BQu0Np&ktBmQ>6NS()w0I}G$8lluUQfg<6Duu3SVV&cy<
bW}jn!x@K;K>bqBS00000NkvXXu0mjf!>-Kq

diff --git a/glabels/icons/16x16/actions/glabels-line.png b/glabels/icons/16x16/actions/glabels-line.png
deleted file mode 100644
index cf0e040657d01983025057a3adc9e2ff776177f3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 252
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE<hRxemd{22U45`9+AZi
z4BUbs%vhfiKM^R%UgGKN%6^HHi$Pzs&(BjFDAeic;uumf=jf!<oDBv7tm=+OvWhM$
zU2=c5iU0KmX~AChaL&4EGrGAgTW5Y36RVS8c3Ge+>QcFTt^6?^t%~#p(@e&Ovn_9h
z=co!)FurKN81p~W@x!`n384zs{!)LmJj$;<aBoyuy)~Zo;BGDRpK24H{N%3Tx}^M*
qiTTE)Ti4lmFHAjf++?Z30k-RU`V)V1KK1}Qiow&>&t;ucLK6Vm2~)oS

diff --git a/glabels/icons/16x16/actions/glabels-text.png b/glabels/icons/16x16/actions/glabels-text.png
deleted file mode 100644
index c539bf1ece1cffa4d5fc4cebcff1d35b9cf62f36..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 160
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4G&t}!%lNpmCvMK}vQ
zB8wRqxCKF&u|6e!B2bXM#M9T6{Sqe^qloToo02x5kglhTV@SoE<OGRN4T9Y_>W#iU
zFnM4vX6MOpmx1Si%c{=BY!@yvxUq3PuIFH6V4Kd#`6|3%Hc%sjr>mdKI;Vst0O<oM
AF8}}l

diff --git a/glabels/icons/22x22/actions/glabels-ellipse.svg b/glabels/icons/22x22/actions/glabels-ellipse.svg
index 1c83912..a948295 100644
--- a/glabels/icons/22x22/actions/glabels-ellipse.svg
+++ b/glabels/icons/22x22/actions/glabels-ellipse.svg
@@ -2,6 +2,6 @@
 
   <circle
      style="fill:#f6e04a;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
-     r="8" cx="10.5" cy="10.5" />
+     r="8" cx="11" cy="11" />
 
 </svg>
diff --git a/glabels/icons/24x24/actions/glabels-ellipse.svg b/glabels/icons/24x24/actions/glabels-ellipse.svg
index c52539d..95da070 100644
--- a/glabels/icons/24x24/actions/glabels-ellipse.svg
+++ b/glabels/icons/24x24/actions/glabels-ellipse.svg
@@ -2,6 +2,6 @@
 
   <circle
      style="fill:#f6e04a;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
-     r="8" cx="11.5" cy="11.5" />
+     r="8" cx="12" cy="12" />
 
 </svg>