diff --git a/glabels/Icons.h b/glabels/Icons.h
index 33fd99e..7d5acf1 100644
--- a/glabels/Icons.h
+++ b/glabels/Icons.h
@@ -118,16 +118,6 @@ namespace glabels
};
- class Merge : public QIcon
- {
- public:
- Merge()
- {
- addFile( ":icons/24x24/actions/glabels-merge.png" );
- }
- };
-
-
class ObjectProperties : public QIcon
{
public:
@@ -349,10 +339,10 @@ namespace glabels
public:
Glabels()
{
- addFile( ":icons/16x16/apps/glabels.png" );
- addFile( ":icons/24x24/apps/glabels.png" );
- addFile( ":icons/32x32/apps/glabels.png" );
- addFile( ":icons/48x48/apps/glabels.png" );
+ addFile( ":icons/16x16/apps/glabels.svg" );
+ addFile( ":icons/22x22/apps/glabels.svg" );
+ addFile( ":icons/32x32/apps/glabels.svg" );
+ addFile( ":icons/48x48/apps/glabels.svg" );
addFile( ":icons/scalable/apps/glabels.svg" );
}
};
diff --git a/glabels/MainWindow.cpp b/glabels/MainWindow.cpp
index c84eac5..aff3f26 100644
--- a/glabels/MainWindow.cpp
+++ b/glabels/MainWindow.cpp
@@ -61,6 +61,8 @@ namespace glabels
MainWindow::MainWindow()
: mModel(0)
{
+ setWindowIcon( Icons::Glabels() );
+
createActions();
createMenus();
createToolBars();
diff --git a/glabels/icons.qrc b/glabels/icons.qrc
index 2669126..2eb4de3 100644
--- a/glabels/icons.qrc
+++ b/glabels/icons.qrc
@@ -36,7 +36,7 @@
icons/16x16/actions/glabels-zoom-one-to-one.svg
icons/16x16/actions/glabels-zoom-out.svg
icons/16x16/actions/glabels-zoom-to-fit.svg
- icons/16x16/apps/glabels.png
+ icons/16x16/apps/glabels.svg
icons/22x22/actions/edit-copy.svg
icons/22x22/actions/edit-cut.svg
@@ -65,6 +65,7 @@
icons/22x22/actions/glabels-zoom-one-to-one.svg
icons/22x22/actions/glabels-zoom-out.svg
icons/22x22/actions/glabels-zoom-to-fit.svg
+ icons/22x22/apps/glabels.svg
icons/24x24/actions/edit-copy.svg
icons/24x24/actions/edit-cut.svg
@@ -90,15 +91,14 @@
icons/24x24/actions/glabels-valign-text-bottom.svg
icons/24x24/actions/glabels-valign-text-middle.svg
icons/24x24/actions/glabels-valign-text-top.svg
- icons/24x24/apps/glabels.png
icons/32x32/actions/label-orientation-horiz.svg
icons/32x32/actions/label-orientation-vert.svg
icons/32x32/actions/print.svg
icons/32x32/actions/select-product.svg
- icons/32x32/apps/glabels.png
+ icons/32x32/apps/glabels.svg
- icons/48x48/apps/glabels.png
+ icons/48x48/apps/glabels.svg
icons/scalable/apps/glabels.svg
diff --git a/glabels/icons/16x16/actions/file-save-as.svg b/glabels/icons/16x16/actions/file-save-as.svg
index 40b468c..33e25f9 100644
--- a/glabels/icons/16x16/actions/file-save-as.svg
+++ b/glabels/icons/16x16/actions/file-save-as.svg
@@ -1,7 +1,7 @@
diff --git a/glabels/icons/16x16/apps/glabels.png b/glabels/icons/16x16/apps/glabels.png
deleted file mode 100644
index 3c6abd8..0000000
Binary files a/glabels/icons/16x16/apps/glabels.png and /dev/null differ
diff --git a/glabels/icons/16x16/apps/glabels.svg b/glabels/icons/16x16/apps/glabels.svg
new file mode 100644
index 0000000..4032790
--- /dev/null
+++ b/glabels/icons/16x16/apps/glabels.svg
@@ -0,0 +1,43 @@
+
diff --git a/glabels/icons/22x22/actions/file-save-as.svg b/glabels/icons/22x22/actions/file-save-as.svg
index 4b8eed2..39dc182 100644
--- a/glabels/icons/22x22/actions/file-save-as.svg
+++ b/glabels/icons/22x22/actions/file-save-as.svg
@@ -1,7 +1,7 @@
diff --git a/glabels/icons/22x22/apps/glabels.svg b/glabels/icons/22x22/apps/glabels.svg
new file mode 100644
index 0000000..81d6a41
--- /dev/null
+++ b/glabels/icons/22x22/apps/glabels.svg
@@ -0,0 +1,43 @@
+
diff --git a/glabels/icons/24x24/actions/file-save-as.svg b/glabels/icons/24x24/actions/file-save-as.svg
index 42f8d71..f3db905 100644
--- a/glabels/icons/24x24/actions/file-save-as.svg
+++ b/glabels/icons/24x24/actions/file-save-as.svg
@@ -1,7 +1,7 @@
diff --git a/glabels/icons/24x24/apps/glabels.png b/glabels/icons/24x24/apps/glabels.png
deleted file mode 100644
index 3add4f6..0000000
Binary files a/glabels/icons/24x24/apps/glabels.png and /dev/null differ
diff --git a/glabels/icons/32x32/apps/glabels.png b/glabels/icons/32x32/apps/glabels.png
deleted file mode 100644
index 9c69e2c..0000000
Binary files a/glabels/icons/32x32/apps/glabels.png and /dev/null differ
diff --git a/glabels/icons/32x32/apps/glabels.svg b/glabels/icons/32x32/apps/glabels.svg
new file mode 100644
index 0000000..7b538c8
--- /dev/null
+++ b/glabels/icons/32x32/apps/glabels.svg
@@ -0,0 +1,43 @@
+
diff --git a/glabels/icons/48x48/apps/glabels.png b/glabels/icons/48x48/apps/glabels.png
deleted file mode 100644
index 9058e05..0000000
Binary files a/glabels/icons/48x48/apps/glabels.png and /dev/null differ
diff --git a/glabels/icons/48x48/apps/glabels.svg b/glabels/icons/48x48/apps/glabels.svg
new file mode 100644
index 0000000..1b5f314
--- /dev/null
+++ b/glabels/icons/48x48/apps/glabels.svg
@@ -0,0 +1,43 @@
+
diff --git a/glabels/icons/scalable/apps/glabels.svg b/glabels/icons/scalable/apps/glabels.svg
index 2671510..1b5f314 100644
--- a/glabels/icons/scalable/apps/glabels.svg
+++ b/glabels/icons/scalable/apps/glabels.svg
@@ -1,755 +1,43 @@
-
-
+