From 6dc96420513b577c7710ce75aeb9334f1624f8dd Mon Sep 17 00:00:00 2001
From: Jim Evins <evins@snaught.com>
Date: Sun, 22 Jan 2017 20:18:45 -0500
Subject: [PATCH] Updated some of the built-in drawing icons.

---
 .gitignore                                    |   1 +
 glabels/Icons.h                               |  21 ++++++++-----
 glabels/ObjectEditor.cpp                      |  10 +++----
 glabels/icons.qrc                             |  28 +++++++++++++-----
 glabels/icons/22x22/actions/glabels-arrow.svg |   7 +++++
 .../icons/22x22/actions/glabels-barcode.svg   |  24 +++++++++++++++
 glabels/icons/22x22/actions/glabels-box.svg   |   7 +++++
 .../icons/22x22/actions/glabels-ellipse.svg   |   7 +++++
 glabels/icons/22x22/actions/glabels-image.svg |  12 ++++++++
 glabels/icons/22x22/actions/glabels-line.svg  |   7 +++++
 glabels/icons/22x22/actions/glabels-text.svg  |   7 +++++
 glabels/icons/24x24/actions/glabels-arrow.png | Bin 367 -> 0 bytes
 glabels/icons/24x24/actions/glabels-arrow.svg |   7 +++++
 .../icons/24x24/actions/glabels-barcode.png   | Bin 241 -> 0 bytes
 .../icons/24x24/actions/glabels-barcode.svg   |  24 +++++++++++++++
 glabels/icons/24x24/actions/glabels-box.png   | Bin 320 -> 0 bytes
 glabels/icons/24x24/actions/glabels-box.svg   |   7 +++++
 .../icons/24x24/actions/glabels-ellipse.png   | Bin 744 -> 0 bytes
 .../icons/24x24/actions/glabels-ellipse.svg   |   7 +++++
 glabels/icons/24x24/actions/glabels-image.png | Bin 704 -> 0 bytes
 glabels/icons/24x24/actions/glabels-image.svg |  12 ++++++++
 glabels/icons/24x24/actions/glabels-line.png  | Bin 325 -> 0 bytes
 glabels/icons/24x24/actions/glabels-line.svg  |   7 +++++
 glabels/icons/24x24/actions/glabels-text.png  | Bin 285 -> 0 bytes
 glabels/icons/24x24/actions/glabels-text.svg  |   7 +++++
 25 files changed, 183 insertions(+), 19 deletions(-)
 create mode 100644 glabels/icons/22x22/actions/glabels-arrow.svg
 create mode 100644 glabels/icons/22x22/actions/glabels-barcode.svg
 create mode 100644 glabels/icons/22x22/actions/glabels-box.svg
 create mode 100644 glabels/icons/22x22/actions/glabels-ellipse.svg
 create mode 100644 glabels/icons/22x22/actions/glabels-image.svg
 create mode 100644 glabels/icons/22x22/actions/glabels-line.svg
 create mode 100644 glabels/icons/22x22/actions/glabels-text.svg
 delete mode 100644 glabels/icons/24x24/actions/glabels-arrow.png
 create mode 100644 glabels/icons/24x24/actions/glabels-arrow.svg
 delete mode 100644 glabels/icons/24x24/actions/glabels-barcode.png
 create mode 100644 glabels/icons/24x24/actions/glabels-barcode.svg
 delete mode 100644 glabels/icons/24x24/actions/glabels-box.png
 create mode 100644 glabels/icons/24x24/actions/glabels-box.svg
 delete mode 100644 glabels/icons/24x24/actions/glabels-ellipse.png
 create mode 100644 glabels/icons/24x24/actions/glabels-ellipse.svg
 delete mode 100644 glabels/icons/24x24/actions/glabels-image.png
 create mode 100644 glabels/icons/24x24/actions/glabels-image.svg
 delete mode 100644 glabels/icons/24x24/actions/glabels-line.png
 create mode 100644 glabels/icons/24x24/actions/glabels-line.svg
 delete mode 100644 glabels/icons/24x24/actions/glabels-text.png
 create mode 100644 glabels/icons/24x24/actions/glabels-text.svg

diff --git a/.gitignore b/.gitignore
index a504685..c526c9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@ gmon.out
 core
 *.safe
 *.sav*
+.directory
diff --git a/glabels/Icons.h b/glabels/Icons.h
index 9c9d995..194c444 100644
--- a/glabels/Icons.h
+++ b/glabels/Icons.h
@@ -40,7 +40,8 @@ namespace glabels
 			Arrow()
 			{
 				addFile( ":icons/16x16/actions/glabels-arrow.png" );
-				addFile( ":icons/24x24/actions/glabels-arrow.png" );
+				addFile( ":icons/22x22/actions/glabels-arrow.svg" );
+				addFile( ":icons/24x24/actions/glabels-arrow.svg" );
 			}
 		};
 
@@ -51,7 +52,8 @@ namespace glabels
 			Barcode()
 			{
 				addFile( ":icons/16x16/actions/glabels-barcode.png" );
-				addFile( ":icons/24x24/actions/glabels-barcode.png" );
+				addFile( ":icons/22x22/actions/glabels-barcode.svg" );
+				addFile( ":icons/24x24/actions/glabels-barcode.svg" );
 			}
 		};
 
@@ -62,7 +64,8 @@ namespace glabels
 			Box()
 			{
 				addFile( ":icons/16x16/actions/glabels-box.png" );
-				addFile( ":icons/24x24/actions/glabels-box.png" );
+				addFile( ":icons/22x22/actions/glabels-box.svg" );
+				addFile( ":icons/24x24/actions/glabels-box.svg" );
 			}
 		};
 
@@ -73,7 +76,8 @@ namespace glabels
 			Ellipse()
 			{
 				addFile( ":icons/16x16/actions/glabels-ellipse.png" );
-				addFile( ":icons/24x24/actions/glabels-ellipse.png" );
+				addFile( ":icons/22x22/actions/glabels-ellipse.svg" );
+				addFile( ":icons/24x24/actions/glabels-ellipse.svg" );
 			}
 		};
 
@@ -84,7 +88,8 @@ namespace glabels
 			Image()
 			{
 				addFile( ":icons/16x16/actions/glabels-image.png" );
-				addFile( ":icons/24x24/actions/glabels-image.png" );
+				addFile( ":icons/22x22/actions/glabels-image.svg" );
+				addFile( ":icons/24x24/actions/glabels-image.svg" );
 			}
 		};
 
@@ -95,7 +100,8 @@ namespace glabels
 			Line()
 			{
 				addFile( ":icons/16x16/actions/glabels-line.png" );
-				addFile( ":icons/24x24/actions/glabels-line.png" );
+				addFile( ":icons/22x22/actions/glabels-line.svg" );
+				addFile( ":icons/24x24/actions/glabels-line.svg" );
 			}
 		};
 
@@ -106,7 +112,8 @@ namespace glabels
 			Text()
 			{
 				addFile( ":icons/16x16/actions/glabels-text.png" );
-				addFile( ":icons/24x24/actions/glabels-text.png" );
+				addFile( ":icons/22x22/actions/glabels-text.svg" );
+				addFile( ":icons/24x24/actions/glabels-text.svg" );
 			}
 		};
 
diff --git a/glabels/ObjectEditor.cpp b/glabels/ObjectEditor.cpp
index dbc569f..ae3eff4 100644
--- a/glabels/ObjectEditor.cpp
+++ b/glabels/ObjectEditor.cpp
@@ -313,7 +313,7 @@ namespace glabels
 
 				if ( dynamic_cast<LabelModelBoxObject*>(mObject) )
 				{
-					titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-box.png") );
+					titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-box.svg") );
 					titleLabel->setText( tr("Box object properties") );
 
 					notebook->addTab( lineFillPage, "line/fill" );
@@ -334,7 +334,7 @@ namespace glabels
 				}
 				else if ( dynamic_cast<LabelModelEllipseObject*>(mObject) )
 				{
-					titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-ellipse.png") );
+					titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-ellipse.svg") );
 					titleLabel->setText( tr("Ellipse object properties") );
 
 					notebook->addTab( lineFillPage, "line/fill" );
@@ -355,7 +355,7 @@ namespace glabels
 				}
 				else if ( dynamic_cast<LabelModelImageObject*>(mObject) )
 				{
-					titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-image.png") );
+					titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-image.svg") );
 					titleLabel->setText( tr("Image object properties") );
 
 					notebook->addTab( imagePage, "image" );
@@ -375,7 +375,7 @@ namespace glabels
 				}
 				else if ( dynamic_cast<LabelModelLineObject*>(mObject) )
 				{
-					titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-line.png") );
+					titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-line.svg") );
 					titleLabel->setText( tr("Line object properties") );
 
 					notebook->addTab( lineFillPage, "line/fill" );
@@ -396,7 +396,7 @@ namespace glabels
 				}
 				else if ( dynamic_cast<LabelModelTextObject*>(mObject) )
 				{
-					titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-text.png") );
+					titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-text.svg") );
 					titleLabel->setText( tr("Text object properties") );
 
 					notebook->addTab( textPage, "text" );
diff --git a/glabels/icons.qrc b/glabels/icons.qrc
index 8729ca3..b1e0494 100644
--- a/glabels/icons.qrc
+++ b/glabels/icons.qrc
@@ -2,6 +2,7 @@
 
 <RCC version="1.0">
 <qresource>
+
 	<file>icons/16x16/actions/edit-clear.png</file>
 	<file>icons/16x16/actions/edit-find.png</file>
 	<file>icons/16x16/actions/glabels-align-bottom.png</file>
@@ -30,25 +31,34 @@
 	<file>icons/16x16/actions/glabels-rotate-right.png</file>
 	<file>icons/16x16/actions/glabels-text.png</file>
 	<file>icons/16x16/apps/glabels.png</file>
+	
+	<file>icons/22x22/actions/glabels-arrow.svg</file>
+	<file>icons/22x22/actions/glabels-barcode.svg</file>
+	<file>icons/22x22/actions/glabels-box.svg</file>
+	<file>icons/22x22/actions/glabels-ellipse.svg</file>
+	<file>icons/22x22/actions/glabels-image.svg</file>
+	<file>icons/22x22/actions/glabels-line.svg</file>
+	<file>icons/22x22/actions/glabels-text.svg</file>
+	
 	<file>icons/24x24/actions/edit-clear.png</file>
 	<file>icons/24x24/actions/edit-find.png</file>
 	<file>icons/24x24/actions/glabels-align-text-center.png</file>
 	<file>icons/24x24/actions/glabels-align-text-left.png</file>
 	<file>icons/24x24/actions/glabels-align-text-right.png</file>
-	<file>icons/24x24/actions/glabels-arrow.png</file>
-	<file>icons/24x24/actions/glabels-barcode.png</file>
-	<file>icons/24x24/actions/glabels-box.png</file>
+	<file>icons/24x24/actions/glabels-arrow.svg</file>
+	<file>icons/24x24/actions/glabels-barcode.svg</file>
+	<file>icons/24x24/actions/glabels-box.svg</file>
 	<file>icons/24x24/actions/glabels-bucket-fill.png</file>
-	<file>icons/24x24/actions/glabels-ellipse.png</file>
+	<file>icons/24x24/actions/glabels-ellipse.svg</file>
 	<file>icons/24x24/actions/glabels-format-text-bold.png</file>
 	<file>icons/24x24/actions/glabels-format-text-italic.png</file>
 	<file>icons/24x24/actions/glabels-format-text-underline.png</file>
-	<file>icons/24x24/actions/glabels-image.png</file>
-	<file>icons/24x24/actions/glabels-line.png</file>
+	<file>icons/24x24/actions/glabels-image.svg</file>
+	<file>icons/24x24/actions/glabels-line.svg</file>
 	<file>icons/24x24/actions/glabels-merge.png</file>
 	<file>icons/24x24/actions/glabels-object-properties.png</file>
 	<file>icons/24x24/actions/glabels-pencil.png</file>
-	<file>icons/24x24/actions/glabels-text.png</file>
+	<file>icons/24x24/actions/glabels-text.svg</file>
 	<file>icons/24x24/actions/glabels-valign-text-bottom.png</file>
 	<file>icons/24x24/actions/glabels-valign-text-middle.png</file>
 	<file>icons/24x24/actions/glabels-valign-text-top.png</file>
@@ -65,12 +75,16 @@
 	<file>icons/24x24/actions/zoom-original.png</file>
 	<file>icons/24x24/actions/zoom-out.png</file>
 	<file>icons/24x24/apps/glabels.png</file>
+
 	<file>icons/32x32/apps/glabels.png</file>
 	<file>icons/32x32/actions/file-print.png</file>
 	<file>icons/32x32/actions/horizontal-orientation.png</file>
 	<file>icons/32x32/actions/select-product.png</file>
 	<file>icons/32x32/actions/vertical-orientation.png</file>
+
 	<file>icons/48x48/apps/glabels.png</file>
+
 	<file>icons/scalable/apps/glabels.svg</file>
+
 </qresource>
 </RCC>
diff --git a/glabels/icons/22x22/actions/glabels-arrow.svg b/glabels/icons/22x22/actions/glabels-arrow.svg
new file mode 100644
index 0000000..5432256
--- /dev/null
+++ b/glabels/icons/22x22/actions/glabels-arrow.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="22" height="22" >
+
+    <path
+       style="fill:#333333;fill-opacity:1;stroke:none"
+       d="M 7,5 7,17 11,13 17,13 Z" />
+
+</svg>
diff --git a/glabels/icons/22x22/actions/glabels-barcode.svg b/glabels/icons/22x22/actions/glabels-barcode.svg
new file mode 100644
index 0000000..b6bc783
--- /dev/null
+++ b/glabels/icons/22x22/actions/glabels-barcode.svg
@@ -0,0 +1,24 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="22" height="22" >
+
+  <rect x="3" y="4" width="1" height="14"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <rect x="5" y="4" width="2" height="14"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <rect x="8" y="4" width="3" height="14"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <rect x="12" y="4" width="1" height="14"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <rect x="14" y="4" width="1" height="14"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <rect x="16" y="4" width="2" height="14"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <rect x="19" y="4" width="1" height="14"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+</svg>
diff --git a/glabels/icons/22x22/actions/glabels-box.svg b/glabels/icons/22x22/actions/glabels-box.svg
new file mode 100644
index 0000000..4f64e21
--- /dev/null
+++ b/glabels/icons/22x22/actions/glabels-box.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="22" height="22" >
+
+  <rect
+     style="fill:#f6e04a;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     width="15" height="15" x="3.5" y="3.5" />
+
+</svg>
diff --git a/glabels/icons/22x22/actions/glabels-ellipse.svg b/glabels/icons/22x22/actions/glabels-ellipse.svg
new file mode 100644
index 0000000..1c83912
--- /dev/null
+++ b/glabels/icons/22x22/actions/glabels-ellipse.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="22" height="22" >
+
+  <circle
+     style="fill:#f6e04a;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     r="8" cx="10.5" cy="10.5" />
+
+</svg>
diff --git a/glabels/icons/22x22/actions/glabels-image.svg b/glabels/icons/22x22/actions/glabels-image.svg
new file mode 100644
index 0000000..8d16202
--- /dev/null
+++ b/glabels/icons/22x22/actions/glabels-image.svg
@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="22" height="22" >
+
+  <rect x="2.5" y="2.5" width="17" height="17"
+     style="fill:none;stroke:#333333;stroke-width:1;stroke-opacity:1" />
+
+  <path d="M 9,8 4,18 9,18 18,18 14,11 12,14 Z "
+     style="fill:#65a9f2;fill-opacity:1;stroke:none" />
+
+  <circle r="2" cx="14" cy="7"
+     style="fill:#fc8200;fill-opacity:1;stroke:none" />
+
+</svg>
diff --git a/glabels/icons/22x22/actions/glabels-line.svg b/glabels/icons/22x22/actions/glabels-line.svg
new file mode 100644
index 0000000..090f9de
--- /dev/null
+++ b/glabels/icons/22x22/actions/glabels-line.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="22" height="22" >
+
+  <line
+     style="stroke:#333333;stroke-width:1.5;stroke-opacity:1"
+     x1="2.5" y1="19.5" x2="19.5" y2="2.5" />
+
+</svg>
diff --git a/glabels/icons/22x22/actions/glabels-text.svg b/glabels/icons/22x22/actions/glabels-text.svg
new file mode 100644
index 0000000..da58f45
--- /dev/null
+++ b/glabels/icons/22x22/actions/glabels-text.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="22" width="22" >
+
+  <path
+       style="fill:#333333;fill-opacity:1"
+       d="M 8,19 8,18 10,18 10,4 6,4 5,7 4,7 4,3 19,3 19,7 18,7 17,4 13,4 13,18 15,18 15,19 9,19 z" />
+  
+</svg>
diff --git a/glabels/icons/24x24/actions/glabels-arrow.png b/glabels/icons/24x24/actions/glabels-arrow.png
deleted file mode 100644
index 6e0e26af77b6b1159ee30fd7801c24e11ae6c2e5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 367
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4%caKYZ?lYt_f1s;*b
z3=G_YAk0{w5<d|r$X?><>&kwKlaon;Q@Zlp8=%l1PZ!6KiaBqu?)GAKlsNkFewC*~
zK+c|tUOJDMBX0jnTKV?KtxM@2I9UX17`eFvT_%WL(J0g@YwAurdF)Kq<3?s<p5lL>
z&$d1kpXxgOcW}0v>k0p<4`trIaARN;kI3Z`T6BIxQ&@0AgZCQm7|#!~o2ChU5}hDp
z#5F-Ah?Qf<YUY`<8NM_Lzj-WKIk&Sk?vp5Aay9>KLmT(~&zQ7Jdvo6$IncmdqEaP%
zx~ulxg6GBmcSm?JW=!AH%6{j8g!Bw~aRckLnt)HqJa4sDSsm5Aw~TR$>7H4;Ee`E{
z)bpz_XNlV1kf?|wO^a5^_*eL|o)CF%xaZz_!H~#<`~StsXDNCgzdi9$7%&_dJYD@<
J);T3K0RTr_k*xp#

diff --git a/glabels/icons/24x24/actions/glabels-arrow.svg b/glabels/icons/24x24/actions/glabels-arrow.svg
new file mode 100644
index 0000000..09f54e9
--- /dev/null
+++ b/glabels/icons/24x24/actions/glabels-arrow.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="24" height="24" >
+
+    <path
+       style="fill:#333333;fill-opacity:1;stroke:none"
+       d="M 8,6 8,18 12,14 18,14 Z" />
+
+</svg>
diff --git a/glabels/icons/24x24/actions/glabels-barcode.png b/glabels/icons/24x24/actions/glabels-barcode.png
deleted file mode 100644
index 9699c8dd58d6e9ea9fec19aa69b8ba1b04133085..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 241
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4%caKYZ?lYt_f1s;*b
z3=G_YAk0{w5<d|r$X?><>&kwKlatAu`+4^CwLqadPZ!6KiaBqmY~*S%;BlGncXq|%
z|Nm>PUWrZTdYUmuN9)V9-IEsgmvNX}V|eh+Tl>I`SC6hgX-F+kSe3#ZW6kze-^+EL
zwk7Mjxgv~fP6Vq)Ke)vi|6zsI0%joE#~|^fCiie;ck4Bq@audBmNjI5RZEhsT(?fP
f;qS9~^IxzO?UKxx5XiRy=n@7`S3j3^P6<r_A^upm

diff --git a/glabels/icons/24x24/actions/glabels-barcode.svg b/glabels/icons/24x24/actions/glabels-barcode.svg
new file mode 100644
index 0000000..3c81f82
--- /dev/null
+++ b/glabels/icons/24x24/actions/glabels-barcode.svg
@@ -0,0 +1,24 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="24" height="24" >
+
+  <rect x="4" y="5" width="1" height="14"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <rect x="6" y="5" width="2" height="14"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <rect x="9" y="5" width="3" height="14"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <rect x="13" y="5" width="1" height="14"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <rect x="15" y="5" width="1" height="14"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <rect x="17" y="5" width="2" height="14"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <rect x="20" y="5" width="1" height="14"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+</svg>
diff --git a/glabels/icons/24x24/actions/glabels-box.png b/glabels/icons/24x24/actions/glabels-box.png
deleted file mode 100644
index 9f8e06f845543db2caef697c06778bc67a073278..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 320
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4%caKYZ?lYt_f1s;*b
z3=G_YAk0{w5<d|r$X?><>&kweOGHfHqGTdtK2Year;B5V$MLsQ{kfVPMB43(#Y7!5
z+cPe2o9yB;{e?lSlG3igtvz9?tr}+gG8gM!;n+0k0Q+GBo<IA(SNvbFZPnRRd(O6(
z#44~bP5nF5=lIeo*H`;;S%@+*OymAL?MKeP3B?Tz7UuirHcJKADqLsZwrOWh`-|Ix
z7wwK6k>H$Hy`oCv>cLI7O4zNFWSM&!m<vu!T`A}+@=owA^QTMB7v&~?W9Z;sWz8-i
z=o0^0<v(A5Mfb16_I(F@`+|eM&+)k&vv_MmTG8~43b7Xd_fLL*KEdvO!kyqspvM?I
MUHx3vIVCg!0J3d-BLDyZ

diff --git a/glabels/icons/24x24/actions/glabels-box.svg b/glabels/icons/24x24/actions/glabels-box.svg
new file mode 100644
index 0000000..e3ea92c
--- /dev/null
+++ b/glabels/icons/24x24/actions/glabels-box.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="24" height="24" >
+
+  <rect
+     style="fill:#f6e04a;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     width="15" height="15" x="4.5" y="4.5" />
+
+</svg>
diff --git a/glabels/icons/24x24/actions/glabels-ellipse.png b/glabels/icons/24x24/actions/glabels-ellipse.png
deleted file mode 100644
index 12f0468fc4414a1fd4289079ee22137bdc78196e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 744
zcmV<E0vG*>P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3lRVS3lRZ-WM7d0000McNliru*9sICG&VXP=kfpm0(D75
zK~zY`-Ih&AR8bVif6tko%!nBoI+BR!q=<(0K{G83YQ{du(278+jRkGp1%V)lIm@hV
zyNIYwU=W1SEXo?cphyQ(@e7l5MnlIbv*yihbKmePo!-pS3m4AeocsTudp_QMu-#V~
z(5@&-pQ@^>Hk(b@?Y4;3YV8Nwr9J6VlGwU{7J%H`-Q?xxp=lb{9afe?ON2sU-S0kd
zBNc)I;3?pCI!n3Ibd0*%5-LiE$jOGUD=<8MfY<%Abod?splRALa0>Whh9CgAy&e~L
zI~pl3>D%&(Zw9OJ-Frn(&s%^IpcYt3M$iSccs(v&JaU*W)alEM3=9T|MAn`FO-7r=
zSWs0}AC@{xxYKc-LdSw>g6gW{_<QFFg~C<9FfgjyG7NrKi;IhBsCVP8`H)hp?JpnX
zV&f5AJqI{8BdAj|Gif+kmR3KXJ+V(0U4Zi+0!2|OqR};KDu&V`I9S=Qi$y@Tu2>TU
z8A^`bZfD~sXzTBY{R*1~R}>37_tfiZmJv50AXuHAn#qZM8v~0-DS9C^R>R%8`rX)_
zi4?`-@zM45AIvV_PAf%|p-x?#1H@)UehKj0Kam!J;oN&5w%MSS0b>BcfDcFZEz{r&
zYd$KECj74f6F~3ZgSHIp1rCkRM7eZk-Za7Wn^C5w=K-F{Jqbj&^8W}3ug4{V0iReN
zVapv1_=MNv5;EtX01t5Ze*qQ9aTkDSYi$+-{?0#u2mGC)t+iPP*1?+qx7l0o0v;Ox
zlI?C8xm%ty{onvxklz-UoX{-U=X0`KdVq0Y0~kv6MblS4P$-8oE~8dti^qV^z~c7(
aYxoVw#^h6s!*nMA0000<MNUMnLSTaMfJ}V=

diff --git a/glabels/icons/24x24/actions/glabels-ellipse.svg b/glabels/icons/24x24/actions/glabels-ellipse.svg
new file mode 100644
index 0000000..c52539d
--- /dev/null
+++ b/glabels/icons/24x24/actions/glabels-ellipse.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="24" height="24" >
+
+  <circle
+     style="fill:#f6e04a;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     r="8" cx="11.5" cy="11.5" />
+
+</svg>
diff --git a/glabels/icons/24x24/actions/glabels-image.png b/glabels/icons/24x24/actions/glabels-image.png
deleted file mode 100644
index 093c8ad9bc827c347e1f6862bed3f93d2f7e61b1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 704
zcmV;x0zdtUP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3lRVS3lRZ-WM7d0000McNliru*9sID1Ou`te-!`#0!>Lo
zK~zY`)s;_Z6G0Tlf3v$uv-#H~1TBIwN-5GqP!bVEA<$#N3PLLg77yydgI*F(dJsWK
zMbx7?1q7=nQP68HJvE9b^&ld36-5x@KTKL<#zT|sZn8-i41xp0EN|a@-}~O1Hv|9s
z5SDK_SYRclqSQ63@#Nia0|772gpo9(4VqQ$Z-8!1hXFWs&oQtlP*>bW)C;`xyK^Y6
z<jQgvi8bmT3INdDfCETbMu@PjPFCRJbeKa$FAqMf_ExYdsxgrc5g*oU;HA>CNm85%
z<M$~XNQDUMDii6D2@XKHPm0EqIuD=1+*G`8+HOn*S$G9|$Nju8Fu^;c@9Km3*Xylt
zbX1rMY#T%ttDotATdYUFwq}5jwi@h@yE~pve#SXTqAW1(OA-;`oT5ZTusyEW9NPJB
zuWdi4nQi@ZJVlx=xb$*2LI_kvkWW;4DkvBkNBg7W6$(biw%1h9s7bzmZSbjDbKE>T
zn{>42T41>z0ohVCzwm~ow_jNK^?SoQv;jpH+uCo)6OTvbnaWOiWjQTdx2xkU7#VqS
zX_p*1;*}SkrDR}Im9k|gYx<>uEoMd3At6UD>zqD3hN>uNng9g(#3FO=_H;#a=h|oX
zP5Ky)dGHP?=mCwZXP=Y1nc{r%iFr&-g3V(-d91X9aKwwpBT$sJncr5~Q2O=v2U%^_
zSgAMh>1w;kc7m34e*A0@&{c#Gu6iQ3brHa((n`>En+E-wYw%9sfBIxPT@|s`D-<0N
mK^3T33ECZ29}qzesQm$P7R{m3`S0=o0000<MNUMnLSTXw*D;U)

diff --git a/glabels/icons/24x24/actions/glabels-image.svg b/glabels/icons/24x24/actions/glabels-image.svg
new file mode 100644
index 0000000..3a372c9
--- /dev/null
+++ b/glabels/icons/24x24/actions/glabels-image.svg
@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="24" height="24" >
+
+  <rect x="3.5" y="3.5" width="17" height="17"
+     style="fill:none;stroke:#333333;stroke-width:1;stroke-opacity:1" />
+
+  <path d="M 10,9 5,19 10,19 19,19 15,12 13,15 Z "
+     style="fill:#65a9f2;fill-opacity:1;stroke:none" />
+
+  <circle r="2" cx="15" cy="8"
+     style="fill:#fc8200;fill-opacity:1;stroke:none" />
+
+</svg>
diff --git a/glabels/icons/24x24/actions/glabels-line.png b/glabels/icons/24x24/actions/glabels-line.png
deleted file mode 100644
index 7bb65234073ab65a9b32f7c225702be38467a03e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 325
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4%caKYZ?lYt_f1s;*b
z3=G_YAk0{w5<d|r$X?><>&kwKlat9vHt)o>oj{>Wo-U3d6?5KRHOxEYAky-X-(aFf
zhK7bE<MWff#j*lRI$at}vNx{bo$*!Mc+%6Udw-?h^Z52@z4$EFO=>%mTGwyc$MPxm
z^45b=#WUC%Za>*@RH@$bTEeTa!)AB)7amzzD$i^${=v5F$4T?6FOoUt?BZ10we`!P
z%KD~#=j0FFHgWzM_Q~d=fT`&Rv#Z*ns`6O|T<1P_t;*IEwhQ|AGyLGo`3pLmF3(*s
z@t>mLhf4`<_dO~y1;V`7{c(wYXl!fka$x8DgqLLzGRhB@9<+&`f2w!uFJ|WVo_k9_
SzFG+M9fPN<pUXO@geCy%P=~Gn

diff --git a/glabels/icons/24x24/actions/glabels-line.svg b/glabels/icons/24x24/actions/glabels-line.svg
new file mode 100644
index 0000000..83c9285
--- /dev/null
+++ b/glabels/icons/24x24/actions/glabels-line.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="24" height="24" >
+
+  <line
+     style="stroke:#333333;stroke-width:1.5;stroke-opacity:1"
+     x1="3.5" y1="20.5" x2="20.5" y2="3.5" />
+
+</svg>
diff --git a/glabels/icons/24x24/actions/glabels-text.png b/glabels/icons/24x24/actions/glabels-text.png
deleted file mode 100644
index b9e5511acfb75cd179e5e805e230e901647a9f93..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 285
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4%caKYZ?lYt_f1s;*b
z3=G_YAk0{w5<d|r$X?><>&kwKlaoooXz$zE#z3J}o-U3d6?5KR*~@jvK*H^zd*Ow%
zRh(VTk3@G?KID7X^eD;tWx^4m-^ni)-C%AsiN8E~$)1JJXYW+q!t;1lKTos@`x?Xk
zW9AVpRz8NFqB0w~h1mmjxgSTzIPEWDU(9xJlgUe&tLrQh`==f^j16YB?7E<zbx*U&
zV}c6ztrf99CvTg7XJ*_7>n4kgkHzV$-p$`R>&vvvQ;st^)8eK_z1uveM(2TTKriF#
bpUUqlA86#6)eEfxx|+e$)z4*}Q$iB}qVH~K

diff --git a/glabels/icons/24x24/actions/glabels-text.svg b/glabels/icons/24x24/actions/glabels-text.svg
new file mode 100644
index 0000000..5420118
--- /dev/null
+++ b/glabels/icons/24x24/actions/glabels-text.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="24" width="24" >
+
+  <path
+       style="fill:#333333;fill-opacity:1"
+       d="M 9,20 9,19 11,19 11,5 7,5 6,8 5,8 5,4 20,4 20,8 19,8 18,5 14,5 14,19 16,19 16,20 10,20 z" />
+  
+</svg>