From ffd634075fac468107271f601d96bae7e17d721b Mon Sep 17 00:00:00 2001 From: Jaye Evins Date: Mon, 25 Aug 2025 23:44:40 -0400 Subject: [PATCH] Reorganize icon data as an embedded icon theme (#226) --- glabels/CMakeLists.txt | 11 +- glabels/Icons.cpp | 21 - glabels/Icons.h | 579 ------------------ glabels/MainWindow.cpp | 90 +-- glabels/ObjectEditor.cpp | 14 +- glabels/SelectProductDialog.cpp | 9 +- glabels/StartupView.cpp | 1 + glabels/TemplateDesigner.cpp | 2 +- glabels/icons.qrc | 250 ++++---- .../128x128/apps}/glabels.svg | 0 .../16x16/actions}/glabels-align-bottom.svg | 0 .../16x16/actions}/glabels-align-hcenter.svg | 0 .../16x16/actions}/glabels-align-left.svg | 0 .../16x16/actions}/glabels-align-right.svg | 0 .../16x16/actions}/glabels-align-top.svg | 0 .../16x16/actions}/glabels-align-vcenter.svg | 0 .../16x16/actions}/glabels-arrow.svg | 0 .../16x16/actions}/glabels-barcode.svg | 0 .../16x16/actions}/glabels-box.svg | 0 .../16x16/actions}/glabels-center-horiz.svg | 0 .../16x16/actions}/glabels-center-vert.svg | 0 .../16x16/actions}/glabels-center.svg | 0 .../16x16/actions}/glabels-edit-clear.svg | 0 .../16x16/actions}/glabels-edit-copy.svg | 0 .../16x16/actions}/glabels-edit-cut.svg | 0 .../16x16/actions}/glabels-edit-paste.svg | 0 .../16x16/actions}/glabels-ellipse.svg | 0 .../16x16/actions}/glabels-file-new.svg | 0 .../16x16/actions}/glabels-file-open.svg | 0 .../16x16/actions}/glabels-file-recent.svg | 0 .../16x16/actions}/glabels-file-save-as.svg | 0 .../16x16/actions}/glabels-file-save.svg | 0 .../16x16/actions}/glabels-flip-horiz.svg | 0 .../16x16/actions}/glabels-flip-vert.svg | 0 .../16x16/actions}/glabels-image.svg | 0 .../16x16/actions}/glabels-line.svg | 0 .../16x16/actions}/glabels-order-bottom.svg | 0 .../16x16/actions}/glabels-order-top.svg | 0 .../16x16/actions}/glabels-rotate-left.svg | 0 .../16x16/actions}/glabels-rotate-right.svg | 0 .../16x16/actions}/glabels-text.svg | 0 .../16x16/actions}/glabels-zoom-in.svg | 0 .../actions}/glabels-zoom-one-to-one.svg | 0 .../16x16/actions}/glabels-zoom-out.svg | 0 .../16x16/actions}/glabels-zoom-to-fit.svg | 0 .../16x16/apps}/glabels.svg | 0 .../actions}/glabels-align-text-center.svg | 0 .../actions}/glabels-align-text-left.svg | 0 .../actions}/glabels-align-text-right.svg | 0 .../22x22/actions}/glabels-arrow.svg | 0 .../22x22/actions}/glabels-barcode.svg | 0 .../22x22/actions}/glabels-box.svg | 0 .../22x22/actions}/glabels-edit-copy.svg | 0 .../22x22/actions}/glabels-edit-cut.svg | 0 .../22x22/actions}/glabels-edit-paste.svg | 0 .../22x22/actions}/glabels-ellipse.svg | 0 .../22x22/actions}/glabels-file-new.svg | 0 .../22x22/actions}/glabels-file-open.svg | 0 .../22x22/actions}/glabels-file-recent.svg | 0 .../22x22/actions}/glabels-file-save-as.svg | 0 .../22x22/actions}/glabels-file-save.svg | 0 .../actions}/glabels-format-text-bold.svg | 0 .../actions}/glabels-format-text-italic.svg | 0 .../glabels-format-text-underline.svg | 0 .../22x22/actions}/glabels-image.svg | 0 .../22x22/actions}/glabels-line.svg | 0 .../22x22/actions}/glabels-text.svg | 0 .../actions}/glabels-valign-text-bottom.svg | 0 .../actions}/glabels-valign-text-middle.svg | 0 .../actions}/glabels-valign-text-top.svg | 0 .../22x22/actions}/glabels-view-grid.svg | 0 .../22x22/actions}/glabels-view-list.svg | 0 .../22x22/actions}/glabels-zoom-in.svg | 0 .../actions}/glabels-zoom-one-to-one.svg | 0 .../22x22/actions}/glabels-zoom-out.svg | 0 .../22x22/actions}/glabels-zoom-to-fit.svg | 0 .../22x22/apps}/glabels.svg | 0 .../actions}/glabels-align-text-center.svg | 0 .../actions}/glabels-align-text-left.svg | 0 .../actions}/glabels-align-text-right.svg | 0 .../24x24/actions}/glabels-arrow.svg | 0 .../24x24/actions}/glabels-barcode.svg | 0 .../24x24/actions}/glabels-box.svg | 0 .../24x24/actions}/glabels-edit-copy.svg | 0 .../24x24/actions}/glabels-edit-cut.svg | 0 .../24x24/actions}/glabels-edit-paste.svg | 0 .../24x24/actions}/glabels-ellipse.svg | 0 .../24x24/actions}/glabels-file-new.svg | 0 .../24x24/actions}/glabels-file-open.svg | 0 .../24x24/actions}/glabels-file-recent.svg | 0 .../24x24/actions}/glabels-file-save-as.svg | 0 .../24x24/actions}/glabels-file-save.svg | 0 .../actions}/glabels-format-text-bold.svg | 0 .../actions}/glabels-format-text-italic.svg | 0 .../glabels-format-text-underline.svg | 0 .../24x24/actions}/glabels-image.svg | 0 .../24x24/actions}/glabels-line.svg | 0 .../actions}/glabels-object-properties.svg | 0 .../24x24/actions}/glabels-text.svg | 0 .../actions}/glabels-valign-text-bottom.svg | 0 .../actions}/glabels-valign-text-middle.svg | 0 .../actions}/glabels-valign-text-top.svg | 0 .../32x32/actions}/glabels-collated.svg | 0 .../32x32/actions}/glabels-file-new.svg | 0 .../32x32/actions}/glabels-file-open.svg | 0 .../32x32/actions}/glabels-file-recent.svg | 0 .../glabels-label-orientation-horiz.svg | 0 .../glabels-label-orientation-vert.svg | 0 .../glabels-merge-group-contiguous.svg | 0 .../actions}/glabels-merge-group-page.svg | 0 .../32x32/actions}/glabels-print.svg | 0 .../32x32/actions}/glabels-select-product.svg | 0 .../32x32/actions}/glabels-uncollated.svg | 0 .../32x32/apps}/glabels.svg | 0 .../48x48/actions}/glabels-edit.svg | 0 .../48x48/actions}/glabels-merge.svg | 0 .../48x48/actions}/glabels-print.svg | 0 .../48x48/actions}/glabels-properties.svg | 0 .../48x48/actions}/glabels-variables.svg | 0 .../48x48/apps}/glabels.svg | 0 glabels/icons/glabels-flat/index.theme | 64 ++ .../scalable/apps}/glabels.svg | 0 glabels/main.cpp | 3 + glabels/ui/ObjectEditor.ui | 42 +- glabels/ui/PrintView.ui | 15 +- glabels/ui/PropertiesView.ui | 9 +- glabels/ui/ReportBugDialog.ui | 3 +- glabels/ui/SelectProductDialog.ui | 3 +- glabels/ui/StartupView.ui | 9 +- glabels/ui/TemplateDesignerOneLayoutPage.ui | 3 +- glabels/ui/TemplateDesignerTwoLayoutPage.ui | 3 +- glabels/windows-icon/build-windows-icon.sh | 8 +- 132 files changed, 305 insertions(+), 834 deletions(-) delete mode 100644 glabels/Icons.cpp delete mode 100644 glabels/Icons.h rename glabels/icons/{apps/128x128 => glabels-flat/128x128/apps}/glabels.svg (100%) rename glabels/icons/{flat/16x16 => glabels-flat/16x16/actions}/glabels-align-bottom.svg (100%) rename glabels/icons/{flat/16x16 => glabels-flat/16x16/actions}/glabels-align-hcenter.svg (100%) rename glabels/icons/{flat/16x16 => glabels-flat/16x16/actions}/glabels-align-left.svg (100%) rename glabels/icons/{flat/16x16 => glabels-flat/16x16/actions}/glabels-align-right.svg (100%) rename glabels/icons/{flat/16x16 => glabels-flat/16x16/actions}/glabels-align-top.svg (100%) rename glabels/icons/{flat/16x16 => glabels-flat/16x16/actions}/glabels-align-vcenter.svg (100%) rename glabels/icons/{flat/16x16 => glabels-flat/16x16/actions}/glabels-arrow.svg (100%) rename glabels/icons/{flat/16x16 => glabels-flat/16x16/actions}/glabels-barcode.svg (100%) rename glabels/icons/{flat/16x16 => glabels-flat/16x16/actions}/glabels-box.svg (100%) rename glabels/icons/{flat/16x16 => glabels-flat/16x16/actions}/glabels-center-horiz.svg (100%) rename glabels/icons/{flat/16x16 => glabels-flat/16x16/actions}/glabels-center-vert.svg (100%) rename glabels/icons/{flat/16x16 => glabels-flat/16x16/actions}/glabels-center.svg (100%) rename glabels/icons/{flat/16x16 => glabels-flat/16x16/actions}/glabels-edit-clear.svg (100%) rename glabels/icons/{flat/16x16 => glabels-flat/16x16/actions}/glabels-edit-copy.svg (100%) rename glabels/icons/{flat/16x16 => glabels-flat/16x16/actions}/glabels-edit-cut.svg (100%) rename glabels/icons/{flat/16x16 => glabels-flat/16x16/actions}/glabels-edit-paste.svg (100%) rename glabels/icons/{flat/16x16 => glabels-flat/16x16/actions}/glabels-ellipse.svg (100%) rename glabels/icons/{flat/16x16 => glabels-flat/16x16/actions}/glabels-file-new.svg (100%) rename glabels/icons/{flat/16x16 => glabels-flat/16x16/actions}/glabels-file-open.svg (100%) rename glabels/icons/{flat/16x16 => glabels-flat/16x16/actions}/glabels-file-recent.svg (100%) rename glabels/icons/{flat/16x16 => glabels-flat/16x16/actions}/glabels-file-save-as.svg (100%) rename glabels/icons/{flat/16x16 => glabels-flat/16x16/actions}/glabels-file-save.svg (100%) rename glabels/icons/{flat/16x16 => glabels-flat/16x16/actions}/glabels-flip-horiz.svg (100%) rename glabels/icons/{flat/16x16 => glabels-flat/16x16/actions}/glabels-flip-vert.svg (100%) rename glabels/icons/{flat/16x16 => glabels-flat/16x16/actions}/glabels-image.svg (100%) rename glabels/icons/{flat/16x16 => glabels-flat/16x16/actions}/glabels-line.svg (100%) rename glabels/icons/{flat/16x16 => glabels-flat/16x16/actions}/glabels-order-bottom.svg (100%) rename glabels/icons/{flat/16x16 => glabels-flat/16x16/actions}/glabels-order-top.svg (100%) rename glabels/icons/{flat/16x16 => glabels-flat/16x16/actions}/glabels-rotate-left.svg (100%) rename glabels/icons/{flat/16x16 => glabels-flat/16x16/actions}/glabels-rotate-right.svg (100%) rename glabels/icons/{flat/16x16 => glabels-flat/16x16/actions}/glabels-text.svg (100%) rename glabels/icons/{flat/16x16 => glabels-flat/16x16/actions}/glabels-zoom-in.svg (100%) rename glabels/icons/{flat/16x16 => glabels-flat/16x16/actions}/glabels-zoom-one-to-one.svg (100%) rename glabels/icons/{flat/16x16 => glabels-flat/16x16/actions}/glabels-zoom-out.svg (100%) rename glabels/icons/{flat/16x16 => glabels-flat/16x16/actions}/glabels-zoom-to-fit.svg (100%) rename glabels/icons/{apps/16x16 => glabels-flat/16x16/apps}/glabels.svg (100%) rename glabels/icons/{flat/22x22 => glabels-flat/22x22/actions}/glabels-align-text-center.svg (100%) rename glabels/icons/{flat/22x22 => glabels-flat/22x22/actions}/glabels-align-text-left.svg (100%) rename glabels/icons/{flat/22x22 => glabels-flat/22x22/actions}/glabels-align-text-right.svg (100%) rename glabels/icons/{flat/22x22 => glabels-flat/22x22/actions}/glabels-arrow.svg (100%) rename glabels/icons/{flat/22x22 => glabels-flat/22x22/actions}/glabels-barcode.svg (100%) rename glabels/icons/{flat/22x22 => glabels-flat/22x22/actions}/glabels-box.svg (100%) rename glabels/icons/{flat/22x22 => glabels-flat/22x22/actions}/glabels-edit-copy.svg (100%) rename glabels/icons/{flat/22x22 => glabels-flat/22x22/actions}/glabels-edit-cut.svg (100%) rename glabels/icons/{flat/22x22 => glabels-flat/22x22/actions}/glabels-edit-paste.svg (100%) rename glabels/icons/{flat/22x22 => glabels-flat/22x22/actions}/glabels-ellipse.svg (100%) rename glabels/icons/{flat/22x22 => glabels-flat/22x22/actions}/glabels-file-new.svg (100%) rename glabels/icons/{flat/22x22 => glabels-flat/22x22/actions}/glabels-file-open.svg (100%) rename glabels/icons/{flat/22x22 => glabels-flat/22x22/actions}/glabels-file-recent.svg (100%) rename glabels/icons/{flat/22x22 => glabels-flat/22x22/actions}/glabels-file-save-as.svg (100%) rename glabels/icons/{flat/22x22 => glabels-flat/22x22/actions}/glabels-file-save.svg (100%) rename glabels/icons/{flat/22x22 => glabels-flat/22x22/actions}/glabels-format-text-bold.svg (100%) rename glabels/icons/{flat/22x22 => glabels-flat/22x22/actions}/glabels-format-text-italic.svg (100%) rename glabels/icons/{flat/22x22 => glabels-flat/22x22/actions}/glabels-format-text-underline.svg (100%) rename glabels/icons/{flat/22x22 => glabels-flat/22x22/actions}/glabels-image.svg (100%) rename glabels/icons/{flat/22x22 => glabels-flat/22x22/actions}/glabels-line.svg (100%) rename glabels/icons/{flat/22x22 => glabels-flat/22x22/actions}/glabels-text.svg (100%) rename glabels/icons/{flat/22x22 => glabels-flat/22x22/actions}/glabels-valign-text-bottom.svg (100%) rename glabels/icons/{flat/22x22 => glabels-flat/22x22/actions}/glabels-valign-text-middle.svg (100%) rename glabels/icons/{flat/22x22 => glabels-flat/22x22/actions}/glabels-valign-text-top.svg (100%) rename glabels/icons/{flat/22x22 => glabels-flat/22x22/actions}/glabels-view-grid.svg (100%) rename glabels/icons/{flat/22x22 => glabels-flat/22x22/actions}/glabels-view-list.svg (100%) rename glabels/icons/{flat/22x22 => glabels-flat/22x22/actions}/glabels-zoom-in.svg (100%) rename glabels/icons/{flat/22x22 => glabels-flat/22x22/actions}/glabels-zoom-one-to-one.svg (100%) rename glabels/icons/{flat/22x22 => glabels-flat/22x22/actions}/glabels-zoom-out.svg (100%) rename glabels/icons/{flat/22x22 => glabels-flat/22x22/actions}/glabels-zoom-to-fit.svg (100%) rename glabels/icons/{apps/22x22 => glabels-flat/22x22/apps}/glabels.svg (100%) rename glabels/icons/{flat/24x24 => glabels-flat/24x24/actions}/glabels-align-text-center.svg (100%) rename glabels/icons/{flat/24x24 => glabels-flat/24x24/actions}/glabels-align-text-left.svg (100%) rename glabels/icons/{flat/24x24 => glabels-flat/24x24/actions}/glabels-align-text-right.svg (100%) rename glabels/icons/{flat/24x24 => glabels-flat/24x24/actions}/glabels-arrow.svg (100%) rename glabels/icons/{flat/24x24 => glabels-flat/24x24/actions}/glabels-barcode.svg (100%) rename glabels/icons/{flat/24x24 => glabels-flat/24x24/actions}/glabels-box.svg (100%) rename glabels/icons/{flat/24x24 => glabels-flat/24x24/actions}/glabels-edit-copy.svg (100%) rename glabels/icons/{flat/24x24 => glabels-flat/24x24/actions}/glabels-edit-cut.svg (100%) rename glabels/icons/{flat/24x24 => glabels-flat/24x24/actions}/glabels-edit-paste.svg (100%) rename glabels/icons/{flat/24x24 => glabels-flat/24x24/actions}/glabels-ellipse.svg (100%) rename glabels/icons/{flat/24x24 => glabels-flat/24x24/actions}/glabels-file-new.svg (100%) rename glabels/icons/{flat/24x24 => glabels-flat/24x24/actions}/glabels-file-open.svg (100%) rename glabels/icons/{flat/24x24 => glabels-flat/24x24/actions}/glabels-file-recent.svg (100%) rename glabels/icons/{flat/24x24 => glabels-flat/24x24/actions}/glabels-file-save-as.svg (100%) rename glabels/icons/{flat/24x24 => glabels-flat/24x24/actions}/glabels-file-save.svg (100%) rename glabels/icons/{flat/24x24 => glabels-flat/24x24/actions}/glabels-format-text-bold.svg (100%) rename glabels/icons/{flat/24x24 => glabels-flat/24x24/actions}/glabels-format-text-italic.svg (100%) rename glabels/icons/{flat/24x24 => glabels-flat/24x24/actions}/glabels-format-text-underline.svg (100%) rename glabels/icons/{flat/24x24 => glabels-flat/24x24/actions}/glabels-image.svg (100%) rename glabels/icons/{flat/24x24 => glabels-flat/24x24/actions}/glabels-line.svg (100%) rename glabels/icons/{flat/24x24 => glabels-flat/24x24/actions}/glabels-object-properties.svg (100%) rename glabels/icons/{flat/24x24 => glabels-flat/24x24/actions}/glabels-text.svg (100%) rename glabels/icons/{flat/24x24 => glabels-flat/24x24/actions}/glabels-valign-text-bottom.svg (100%) rename glabels/icons/{flat/24x24 => glabels-flat/24x24/actions}/glabels-valign-text-middle.svg (100%) rename glabels/icons/{flat/24x24 => glabels-flat/24x24/actions}/glabels-valign-text-top.svg (100%) rename glabels/icons/{flat/32x32 => glabels-flat/32x32/actions}/glabels-collated.svg (100%) rename glabels/icons/{flat/32x32 => glabels-flat/32x32/actions}/glabels-file-new.svg (100%) rename glabels/icons/{flat/32x32 => glabels-flat/32x32/actions}/glabels-file-open.svg (100%) rename glabels/icons/{flat/32x32 => glabels-flat/32x32/actions}/glabels-file-recent.svg (100%) rename glabels/icons/{flat/32x32 => glabels-flat/32x32/actions}/glabels-label-orientation-horiz.svg (100%) rename glabels/icons/{flat/32x32 => glabels-flat/32x32/actions}/glabels-label-orientation-vert.svg (100%) rename glabels/icons/{flat/32x32 => glabels-flat/32x32/actions}/glabels-merge-group-contiguous.svg (100%) rename glabels/icons/{flat/32x32 => glabels-flat/32x32/actions}/glabels-merge-group-page.svg (100%) rename glabels/icons/{flat/32x32 => glabels-flat/32x32/actions}/glabels-print.svg (100%) rename glabels/icons/{flat/32x32 => glabels-flat/32x32/actions}/glabels-select-product.svg (100%) rename glabels/icons/{flat/32x32 => glabels-flat/32x32/actions}/glabels-uncollated.svg (100%) rename glabels/icons/{apps/32x32 => glabels-flat/32x32/apps}/glabels.svg (100%) rename glabels/icons/{flat/48x48 => glabels-flat/48x48/actions}/glabels-edit.svg (100%) rename glabels/icons/{flat/48x48 => glabels-flat/48x48/actions}/glabels-merge.svg (100%) rename glabels/icons/{flat/48x48 => glabels-flat/48x48/actions}/glabels-print.svg (100%) rename glabels/icons/{flat/48x48 => glabels-flat/48x48/actions}/glabels-properties.svg (100%) rename glabels/icons/{flat/48x48 => glabels-flat/48x48/actions}/glabels-variables.svg (100%) rename glabels/icons/{apps/48x48 => glabels-flat/48x48/apps}/glabels.svg (100%) create mode 100644 glabels/icons/glabels-flat/index.theme rename glabels/icons/{apps/scalable => glabels-flat/scalable/apps}/glabels.svg (100%) diff --git a/glabels/CMakeLists.txt b/glabels/CMakeLists.txt index eb5e9a7..89ad357 100644 --- a/glabels/CMakeLists.txt +++ b/glabels/CMakeLists.txt @@ -19,7 +19,6 @@ set (glabels_sources FieldButton.cpp File.cpp Help.cpp - Icons.cpp LabelEditor.cpp MainWindow.cpp MergeView.cpp @@ -145,11 +144,11 @@ target_link_libraries (glabels-qt #======================================= install (TARGETS glabels-qt RUNTIME DESTINATION bin) -install (FILES icons/apps/scalable/glabels.svg DESTINATION share/icons/hicolor/scalable/apps) -install (FILES icons/apps/16x16/glabels.svg DESTINATION share/icons/hicolor/16x16/apps) -install (FILES icons/apps/22x22/glabels.svg DESTINATION share/icons/hicolor/22x22/apps) -install (FILES icons/apps/32x32/glabels.svg DESTINATION share/icons/hicolor/32x32/apps) -install (FILES icons/apps/48x48/glabels.svg DESTINATION share/icons/hicolor/48x48/apps) +install (FILES icons/glabels-flat/scalable/apps/glabels.svg DESTINATION share/icons/hicolor/scalable/apps) +install (FILES icons/glabels-flat/16x16/apps/glabels.svg DESTINATION share/icons/hicolor/16x16/apps) +install (FILES icons/glabels-flat/22x22/apps/glabels.svg DESTINATION share/icons/hicolor/22x22/apps) +install (FILES icons/glabels-flat/32x32/apps/glabels.svg DESTINATION share/icons/hicolor/32x32/apps) +install (FILES icons/glabels-flat/48x48/apps/glabels.svg DESTINATION share/icons/hicolor/48x48/apps) install (FILES icons/mimetypes/scalable/x-glabels-project.svg DESTINATION share/icons/hicolor/scalable/mimetypes) install (FILES icons/mimetypes/16x16/x-glabels-project.svg DESTINATION share/icons/hicolor/16x16/mimetypes) diff --git a/glabels/Icons.cpp b/glabels/Icons.cpp deleted file mode 100644 index 66b25ff..0000000 --- a/glabels/Icons.cpp +++ /dev/null @@ -1,21 +0,0 @@ -/* Icons.cpp - * - * Copyright (C) 2017 Jaye Evins - * - * This file is part of gLabels-qt. - * - * gLabels-qt is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * gLabels-qt is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with gLabels-qt. If not, see . - */ - -#include "Icons.h" diff --git a/glabels/Icons.h b/glabels/Icons.h deleted file mode 100644 index ae59383..0000000 --- a/glabels/Icons.h +++ /dev/null @@ -1,579 +0,0 @@ -/* Icons.h - * - * Copyright (C) 2013 Jaye Evins - * - * This file is part of gLabels-qt. - * - * gLabels-qt is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * gLabels-qt is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with gLabels-qt. If not, see . - */ - -#ifndef Icons_h -#define Icons_h - - -#include - - -namespace glabels -{ - - /// - /// Glabels Icons - /// - namespace Icons - { - - class Arrow : public QIcon - { - public: - Arrow() - { - addPixmap( QPixmap( ":icons/flat/16x16/glabels-arrow.svg" ) ); - addPixmap( QPixmap( ":icons/flat/22x22/glabels-arrow.svg" ) ); - addPixmap( QPixmap( ":icons/flat/24x24/glabels-arrow.svg" ) ); - } - }; - - - class Barcode : public QIcon - { - public: - Barcode() - { - addPixmap( QPixmap( ":icons/flat/16x16/glabels-barcode.svg" ) ); - addPixmap( QPixmap( ":icons/flat/22x22/glabels-barcode.svg" ) ); - addPixmap( QPixmap( ":icons/flat/24x24/glabels-barcode.svg" ) ); - } - }; - - - class Box : public QIcon - { - public: - Box() - { - addPixmap( QPixmap( ":icons/flat/16x16/glabels-box.svg" ) ); - addPixmap( QPixmap( ":icons/flat/22x22/glabels-box.svg" ) ); - addPixmap( QPixmap( ":icons/flat/24x24/glabels-box.svg" ) ); - } - }; - - - class Ellipse : public QIcon - { - public: - Ellipse() - { - addPixmap( QPixmap( ":icons/flat/16x16/glabels-ellipse.svg" ) ); - addPixmap( QPixmap( ":icons/flat/22x22/glabels-ellipse.svg" ) ); - addPixmap( QPixmap( ":icons/flat/24x24/glabels-ellipse.svg" ) ); - } - }; - - - class Image : public QIcon - { - public: - Image() - { - addPixmap( QPixmap( ":icons/flat/16x16/glabels-image.svg" ) ); - addPixmap( QPixmap( ":icons/flat/22x22/glabels-image.svg" ) ); - addPixmap( QPixmap( ":icons/flat/24x24/glabels-image.svg" ) ); - } - }; - - - class Line : public QIcon - { - public: - Line() - { - addPixmap( QPixmap( ":icons/flat/16x16/glabels-line.svg" ) ); - addPixmap( QPixmap( ":icons/flat/22x22/glabels-line.svg" ) ); - addPixmap( QPixmap( ":icons/flat/24x24/glabels-line.svg" ) ); - } - }; - - - class Text : public QIcon - { - public: - Text() - { - addPixmap( QPixmap( ":icons/flat/16x16/glabels-text.svg" ) ); - addPixmap( QPixmap( ":icons/flat/22x22/glabels-text.svg" ) ); - addPixmap( QPixmap( ":icons/flat/24x24/glabels-text.svg" ) ); - } - }; - - - class ObjectProperties : public QIcon - { - public: - ObjectProperties() - { - addPixmap( QPixmap( ":icons/flat/24x24/glabels-object-properties.svg" ) ); - } - }; - - - class AlignLeft : public QIcon - { - public: - AlignLeft() - { - addPixmap( QPixmap( ":icons/flat/16x16/glabels-align-left.svg" ) ); - } - }; - - - class AlignHCenter : public QIcon - { - public: - AlignHCenter() - { - addPixmap( QPixmap( ":icons/flat/16x16/glabels-align-hcenter.svg" ) ); - } - }; - - - class AlignRight : public QIcon - { - public: - AlignRight() - { - addPixmap( QPixmap( ":icons/flat/16x16/glabels-align-right.svg" ) ); - } - }; - - - class AlignBottom : public QIcon - { - public: - AlignBottom() - { - addPixmap( QPixmap( ":icons/flat/16x16/glabels-align-bottom.svg" ) ); - } - }; - - - class AlignVCenter : public QIcon - { - public: - AlignVCenter() - { - addPixmap( QPixmap( ":icons/flat/16x16/glabels-align-vcenter.svg" ) ); - } - }; - - - class AlignTop : public QIcon - { - public: - AlignTop() - { - addPixmap( QPixmap( ":icons/flat/16x16/glabels-align-top.svg" ) ); - } - }; - - - class Center : public QIcon - { - public: - Center() - { - addPixmap( QPixmap( ":icons/flat/16x16/glabels-center.svg" ) ); - } - }; - - - class CenterHoriz : public QIcon - { - public: - CenterHoriz() - { - addPixmap( QPixmap( ":icons/flat/16x16/glabels-center-horiz.svg" ) ); - } - }; - - - class CenterVert : public QIcon - { - public: - CenterVert() - { - addPixmap( QPixmap( ":icons/flat/16x16/glabels-center-vert.svg" ) ); - } - }; - - - class FlipHoriz : public QIcon - { - public: - FlipHoriz() - { - addPixmap( QPixmap( ":icons/flat/16x16/glabels-flip-horiz.svg" ) ); - } - }; - - - class FlipVert : public QIcon - { - public: - FlipVert() - { - addPixmap( QPixmap( ":icons/flat/16x16/glabels-flip-vert.svg" ) ); - } - }; - - - class RotateLeft : public QIcon - { - public: - RotateLeft() - { - addPixmap( QPixmap( ":icons/flat/16x16/glabels-rotate-left.svg" ) ); - } - }; - - - class RotateRight : public QIcon - { - public: - RotateRight() - { - addPixmap( QPixmap( ":icons/flat/16x16/glabels-rotate-right.svg" ) ); - } - }; - - - class OrderBottom : public QIcon - { - public: - OrderBottom() - { - addPixmap( QPixmap( ":icons/flat/16x16/glabels-order-bottom.svg" ) ); - } - }; - - - class OrderTop : public QIcon - { - public: - OrderTop() - { - addPixmap( QPixmap( ":icons/flat/16x16/glabels-order-top.svg" ) ); - } - }; - - - class AlignTextLeft : public QIcon - { - public: - AlignTextLeft() - { - addPixmap( QPixmap( ":icons/flat/22x22/glabels-align-text-left.svg" ) ); - addPixmap( QPixmap( ":icons/flat/24x24/glabels-align-text-left.svg" ) ); - } - }; - - - class AlignTextCenter : public QIcon - { - public: - AlignTextCenter() - { - addPixmap( QPixmap( ":icons/flat/22x22/glabels-align-text-center.svg" ) ); - addPixmap( QPixmap( ":icons/flat/24x24/glabels-align-text-center.svg" ) ); - } - }; - - - class AlignTextRight : public QIcon - { - public: - AlignTextRight() - { - addPixmap( QPixmap( ":icons/flat/22x22/glabels-align-text-right.svg" ) ); - addPixmap( QPixmap( ":icons/flat/24x24/glabels-align-text-right.svg" ) ); - } - }; - - - class AlignTextBottom : public QIcon - { - public: - AlignTextBottom() - { - addPixmap( QPixmap( ":icons/flat/22x22/glabels-valign-text-bottom.svg" ) ); - addPixmap( QPixmap( ":icons/flat/24x24/glabels-valign-text-bottom.svg" ) ); - } - }; - - - class AlignTextMiddle : public QIcon - { - public: - AlignTextMiddle() - { - addPixmap( QPixmap( ":icons/flat/22x22/glabels-valign-text-middle.svg" ) ); - addPixmap( QPixmap( ":icons/flat/24x24/glabels-valign-text-middle.svg" ) ); - } - }; - - - class AlignTextTop : public QIcon - { - public: - AlignTextTop() - { - addPixmap( QPixmap( ":icons/flat/22x22/glabels-valign-text-top.svg" ) ); - addPixmap( QPixmap( ":icons/flat/24x24/glabels-valign-text-top.svg" ) ); - } - }; - - - class Glabels : public QIcon - { - public: - Glabels() - { - addFile( ":icons/apps/16x16/glabels.svg" ); - addFile( ":icons/apps/22x22/glabels.svg" ); - addFile( ":icons/apps/32x32/glabels.svg" ); - addFile( ":icons/apps/48x48/glabels.svg" ); - addFile( ":icons/apps/scalable/glabels.svg" ); - } - }; - - - class Edit : public QIcon - { - public: - Edit() - { - addPixmap( QPixmap( ":icons/flat/48x48/glabels-edit.svg" ) ); - } - }; - - - class EditCopy : public QIcon - { - public: - EditCopy() - { - addPixmap( QPixmap( ":icons/flat/16x16/glabels-edit-copy.svg" ) ); - addPixmap( QPixmap( ":icons/flat/22x22/glabels-edit-copy.svg" ) ); - addPixmap( QPixmap( ":icons/flat/24x24/glabels-edit-copy.svg" ) ); - } - }; - - - class EditCut : public QIcon - { - public: - EditCut() - { - addPixmap( QPixmap( ":icons/flat/16x16/glabels-edit-cut.svg" ) ); - addPixmap( QPixmap( ":icons/flat/22x22/glabels-edit-cut.svg" ) ); - addPixmap( QPixmap( ":icons/flat/24x24/glabels-edit-cut.svg" ) ); - } - }; - - - class EditPaste : public QIcon - { - public: - EditPaste() - { - addPixmap( QPixmap( ":icons/flat/16x16/glabels-edit-paste.svg" ) ); - addPixmap( QPixmap( ":icons/flat/22x22/glabels-edit-paste.svg" ) ); - addPixmap( QPixmap( ":icons/flat/24x24/glabels-edit-paste.svg" ) ); - } - }; - - - class FileNew : public QIcon - { - public: - FileNew() - { - addPixmap( QPixmap( ":icons/flat/16x16/glabels-file-new.svg" ) ); - addPixmap( QPixmap( ":icons/flat/22x22/glabels-file-new.svg" ) ); - addPixmap( QPixmap( ":icons/flat/24x24/glabels-file-new.svg" ) ); - addPixmap( QPixmap( ":icons/flat/32x32/glabels-file-new.svg" ) ); - } - }; - - - class FileOpen : public QIcon - { - public: - FileOpen() - { - addPixmap( QPixmap( ":icons/flat/16x16/glabels-file-open.svg" ) ); - addPixmap( QPixmap( ":icons/flat/22x22/glabels-file-open.svg" ) ); - addPixmap( QPixmap( ":icons/flat/24x24/glabels-file-open.svg" ) ); - addPixmap( QPixmap( ":icons/flat/32x32/glabels-file-open.svg" ) ); - } - }; - - - class FileRecent : public QIcon - { - public: - FileRecent() - { - addPixmap( QPixmap( ":icons/flat/16x16/glabels-file-recent.svg" ) ); - addPixmap( QPixmap( ":icons/flat/22x22/glabels-file-recent.svg" ) ); - addPixmap( QPixmap( ":icons/flat/24x24/glabels-file-recent.svg" ) ); - addPixmap( QPixmap( ":icons/flat/32x32/glabels-file-recent.svg" ) ); - } - }; - - - class FilePrint : public QIcon - { - public: - FilePrint() - { - addPixmap( QPixmap( ":icons/flat/32x32/glabels-print.svg" ) ); - addPixmap( QPixmap( ":icons/flat/48x48/glabels-print.svg" ) ); - } - }; - - - class FileSave : public QIcon - { - public: - FileSave() - { - addPixmap( QPixmap( ":icons/flat/16x16/glabels-file-save.svg" ) ); - addPixmap( QPixmap( ":icons/flat/22x22/glabels-file-save.svg" ) ); - addPixmap( QPixmap( ":icons/flat/24x24/glabels-file-save.svg" ) ); - } - }; - - - class FileSaveAs : public QIcon - { - public: - FileSaveAs() - { - addPixmap( QPixmap( ":icons/flat/16x16/glabels-file-save-as.svg" ) ); - addPixmap( QPixmap( ":icons/flat/22x22/glabels-file-save-as.svg" ) ); - addPixmap( QPixmap( ":icons/flat/24x24/glabels-file-save-as.svg" ) ); - } - }; - - - class Merge : public QIcon - { - public: - Merge() - { - addPixmap( QPixmap( ":icons/flat/48x48/glabels-merge.svg" ) ); - } - }; - - - class Properties : public QIcon - { - public: - Properties() - { - addPixmap( QPixmap( ":icons/flat/48x48/glabels-properties.svg" ) ); - } - }; - - - class Variables : public QIcon - { - public: - Variables() - { - addPixmap( QPixmap( ":icons/flat/48x48/glabels-variables.svg" ) ); - } - }; - - - class ZoomBestFit : public QIcon - { - public: - ZoomBestFit() - { - addPixmap( QPixmap( ":icons/flat/16x16/glabels-zoom-to-fit.svg" ) ); - addPixmap( QPixmap( ":icons/flat/22x22/glabels-zoom-to-fit.svg" ) ); - } - }; - - - class ZoomIn : public QIcon - { - public: - ZoomIn() - { - addPixmap( QPixmap( ":icons/flat/16x16/glabels-zoom-in.svg" ) ); - addPixmap( QPixmap( ":icons/flat/22x22/glabels-zoom-in.svg" ) ); - } - }; - - - class ZoomOriginal : public QIcon - { - public: - ZoomOriginal() - { - addPixmap( QPixmap( ":icons/flat/16x16/glabels-zoom-one-to-one.svg" ) ); - addPixmap( QPixmap( ":icons/flat/22x22/glabels-zoom-one-to-one.svg" ) ); - } - }; - - - class ZoomOut : public QIcon - { - public: - ZoomOut() - { - addPixmap( QPixmap( ":icons/flat/16x16/glabels-zoom-out.svg" ) ); - addPixmap( QPixmap( ":icons/flat/22x22/glabels-zoom-out.svg" ) ); - } - }; - - - class ViewGrid : public QIcon - { - public: - ViewGrid() - { - addPixmap( QPixmap( ":icons/flat/22x22/glabels-view-grid.svg" ) ); - } - }; - - - class ViewList : public QIcon - { - public: - ViewList() - { - addPixmap( QPixmap( ":icons/flat/22x22/glabels-view-list.svg" ) ); - } - }; - - } - -} - - -#endif // Icons_h diff --git a/glabels/MainWindow.cpp b/glabels/MainWindow.cpp index e52f9b3..ec2b9f6 100644 --- a/glabels/MainWindow.cpp +++ b/glabels/MainWindow.cpp @@ -22,7 +22,6 @@ #include "File.h" #include "Help.h" -#include "Icons.h" #include "LabelEditor.h" #include "MergeView.h" #include "ObjectEditor.h" @@ -66,7 +65,7 @@ namespace glabels /// MainWindow::MainWindow() : mModel(nullptr), mUndoRedoModel(nullptr) { - setWindowIcon( Icons::Glabels() ); + setWindowIcon( QIcon::fromTheme( "glabels" ) ); createActions(); createMenus(); @@ -99,7 +98,7 @@ namespace glabels // Add "Welcome" page mPages->addWidget( welcomePage ); mWelcomeButton = new QToolButton( this ); - mWelcomeButton->setIcon( Icons::Glabels() ); + mWelcomeButton->setIcon( QIcon::fromTheme( "glabels" ) ); mWelcomeButton->setText( tr("Welcome") ); mWelcomeButton->setToolButtonStyle( Qt::ToolButtonTextUnderIcon ); mWelcomeButton->setCheckable( true ); @@ -111,7 +110,7 @@ namespace glabels // Add "Editor" page mPages->addWidget( editorPage ); mEditorButton = new QToolButton( this ); - mEditorButton->setIcon( Icons::Edit() ); + mEditorButton->setIcon( QIcon::fromTheme( "glabels-edit" ) ); mEditorButton->setText( tr("Edit") ); mEditorButton->setToolButtonStyle( Qt::ToolButtonTextUnderIcon ); mEditorButton->setCheckable( true ); @@ -123,7 +122,7 @@ namespace glabels // Add "Properties" page mPages->addWidget( propertiesPage ); mPropertiesButton = new QToolButton( this ); - mPropertiesButton->setIcon( Icons::Properties() ); + mPropertiesButton->setIcon( QIcon::fromTheme( "glabels-properties" ) ); mPropertiesButton->setText( tr("Properties") ); mPropertiesButton->setToolButtonStyle( Qt::ToolButtonTextUnderIcon ); mPropertiesButton->setCheckable( true ); @@ -135,7 +134,7 @@ namespace glabels // Add "Merge" page mPages->addWidget( mergePage ); mMergeButton = new QToolButton( this ); - mMergeButton->setIcon( Icons::Merge() ); + mMergeButton->setIcon( QIcon::fromTheme( "glabels-merge" ) ); mMergeButton->setText( tr("Merge") ); mMergeButton->setToolButtonStyle( Qt::ToolButtonTextUnderIcon ); mMergeButton->setCheckable( true ); @@ -147,7 +146,7 @@ namespace glabels // Add "Variables" page mPages->addWidget( variablesPage ); mVariablesButton = new QToolButton( this ); - mVariablesButton->setIcon( Icons::Variables() ); + mVariablesButton->setIcon( QIcon::fromTheme( "glabels-variables" ) ); mVariablesButton->setText( tr("Variables") ); mVariablesButton->setToolButtonStyle( Qt::ToolButtonTextUnderIcon ); mVariablesButton->setCheckable( true ); @@ -159,7 +158,7 @@ namespace glabels // Add "Print" page mPages->addWidget( printPage ); mPrintButton = new QToolButton( this ); - mPrintButton->setIcon( Icons::FilePrint() ); + mPrintButton->setIcon( QIcon::fromTheme( "glabels-print" ) ); mPrintButton->setText( tr("Print") ); mPrintButton->setToolButtonStyle( Qt::ToolButtonTextUnderIcon ); mPrintButton->setCheckable( true ); @@ -295,13 +294,13 @@ namespace glabels { /* File actions */ fileNewAction = new QAction( tr("&New..."), this ); - fileNewAction->setIcon( Icons::FileNew() ); + fileNewAction->setIcon( QIcon::fromTheme( "glabels-file-new" ) ); fileNewAction->setShortcut( QKeySequence::New ); fileNewAction->setStatusTip( tr("Create a new gLabels project") ); connect( fileNewAction, SIGNAL(triggered()), this, SLOT(fileNew()) ); fileOpenAction = new QAction( tr("&Open..."), this ); - fileOpenAction->setIcon( Icons::FileOpen() ); + fileOpenAction->setIcon( QIcon::fromTheme( "glabels-file-open" ) ); fileOpenAction->setShortcut( QKeySequence::Open ); fileOpenAction->setStatusTip( tr("Open an existing gLabels project") ); connect( fileOpenAction, SIGNAL(triggered()), this, SLOT(fileOpen()) ); @@ -309,19 +308,20 @@ namespace glabels for ( int i = 0; i < model::Settings::maxRecentFiles(); i++ ) { auto* action = new QAction( this ); + action->setIcon( QIcon::fromTheme( "glabels" ) ); action->setVisible( false ); fileRecentActionList.append( action ); connect( action, SIGNAL(triggered()), this, SLOT(fileOpenRecent()) ); } fileSaveAction = new QAction( tr("&Save"), this ); - fileSaveAction->setIcon( Icons::FileSave() ); + fileSaveAction->setIcon( QIcon::fromTheme( "glabels-file-save" ) ); fileSaveAction->setShortcut( QKeySequence::Save ); fileSaveAction->setStatusTip( tr("Save current gLabels project") ); connect( fileSaveAction, SIGNAL(triggered()), this, SLOT(fileSave()) ); fileSaveAsAction = new QAction( tr("Save &As..."), this ); - fileSaveAsAction->setIcon( Icons::FileSaveAs() ); + fileSaveAsAction->setIcon( QIcon::fromTheme( "glabels-file-save-as" ) ); fileSaveAsAction->setShortcut( QKeySequence::SaveAs ); fileSaveAsAction->setStatusTip( tr("Save current gLabels project to a different name") ); connect( fileSaveAsAction, SIGNAL(triggered()), this, SLOT(fileSaveAs()) ); @@ -382,19 +382,19 @@ namespace glabels connect( editRedoAction, SIGNAL(triggered()), this, SLOT(editRedo()) ); editCutAction = new QAction( tr("Cut"), this ); - editCutAction->setIcon( Icons::EditCut() ); + editCutAction->setIcon( QIcon::fromTheme( "glabels-edit-cut" ) ); editCutAction->setShortcut( QKeySequence::Cut ); editCutAction->setStatusTip( tr("Cut the selection") ); connect( editCutAction, SIGNAL(triggered()), this, SLOT(editCut()) ); editCopyAction = new QAction( tr("&Copy"), this ); - editCopyAction->setIcon( Icons::EditCopy() ); + editCopyAction->setIcon( QIcon::fromTheme( "glabels-edit-copy" ) ); editCopyAction->setShortcut( QKeySequence::Copy ); editCopyAction->setStatusTip( tr("Copy the selection") ); connect( editCopyAction, SIGNAL(triggered()), this, SLOT(editCopy()) ); editPasteAction = new QAction( tr("&Paste"), this ); - editPasteAction->setIcon( Icons::EditPaste() ); + editPasteAction->setIcon( QIcon::fromTheme( "glabels-edit-paste" ) ); editPasteAction->setShortcut( QKeySequence::Paste ); editPasteAction->setStatusTip( tr("Paste the clipboard") ); connect( editPasteAction, SIGNAL(triggered()), this, SLOT(editPaste()) ); @@ -446,136 +446,136 @@ namespace glabels connect( viewMarkupAction, SIGNAL(toggled(bool)), this, SLOT(viewMarkup(bool)) ); viewZoomInAction = new QAction( tr("Zoom &In"), this ); - viewZoomInAction->setIcon( Icons::ZoomIn() ); + viewZoomInAction->setIcon( QIcon::fromTheme( "glabels-zoom-in" ) ); viewZoomInAction->setShortcut( QKeySequence::ZoomIn ); viewZoomInAction->setStatusTip( tr("Increase magnification") ); connect( viewZoomInAction, SIGNAL(triggered()), this, SLOT(viewZoomIn()) ); viewZoomOutAction = new QAction( tr("Zoom &Out"), this ); - viewZoomOutAction->setIcon( Icons::ZoomOut() ); + viewZoomOutAction->setIcon( QIcon::fromTheme( "glabels-zoom-out" ) ); viewZoomOutAction->setShortcut( QKeySequence::ZoomOut ); viewZoomOutAction->setStatusTip( tr("Decrease magnification") ); connect( viewZoomOutAction, SIGNAL(triggered()), this, SLOT(viewZoomOut()) ); viewZoom1To1Action = new QAction( tr("Zoom &1 to 1"), this ); - viewZoom1To1Action->setIcon( Icons::ZoomOriginal() ); + viewZoom1To1Action->setIcon( QIcon::fromTheme( "glabels-zoom-one-to-one" ) ); viewZoom1To1Action->setStatusTip( tr("Restore scale to 100%") ); connect( viewZoom1To1Action, SIGNAL(triggered()), this, SLOT(viewZoom1To1()) ); viewZoomToFitAction = new QAction( tr("Zoom to &Fit"), this ); - viewZoomToFitAction->setIcon( Icons::ZoomBestFit() ); + viewZoomToFitAction->setIcon( QIcon::fromTheme( "glabels-zoom-to-fit" ) ); viewZoomToFitAction->setStatusTip( tr("Set scale to fit window") ); connect( viewZoomToFitAction, SIGNAL(triggered()), this, SLOT(viewZoomToFit()) ); /* Object actions */ objectsArrowModeAction = new QAction( tr("Select Mode"), this ); - objectsArrowModeAction->setIcon( Icons::Arrow() ); + objectsArrowModeAction->setIcon( QIcon::fromTheme( "glabels-arrow" ) ); objectsArrowModeAction->setStatusTip( tr("Select, move and modify objects") ); connect( objectsArrowModeAction, SIGNAL(triggered()), this, SLOT(objectsArrowMode()) ); objectsCreateTextAction = new QAction( tr("Text"), this ); - objectsCreateTextAction->setIcon( Icons::Text() ); + objectsCreateTextAction->setIcon( QIcon::fromTheme( "glabels-text" ) ); objectsCreateTextAction->setStatusTip( tr("Create text object") ); connect( objectsCreateTextAction, SIGNAL(triggered()), this, SLOT(objectsCreateText()) ); objectsCreateBoxAction = new QAction( tr("Box"), this ); - objectsCreateBoxAction->setIcon( Icons::Box() ); + objectsCreateBoxAction->setIcon( QIcon::fromTheme( "glabels-box" ) ); objectsCreateBoxAction->setStatusTip( tr("Create box object") ); connect( objectsCreateBoxAction, SIGNAL(triggered()), this, SLOT(objectsCreateBox()) ); objectsCreateLineAction = new QAction( tr("Line"), this ); - objectsCreateLineAction->setIcon( Icons::Line() ); + objectsCreateLineAction->setIcon( QIcon::fromTheme( "glabels-line" ) ); objectsCreateLineAction->setStatusTip( tr("Create line object") ); connect( objectsCreateLineAction, SIGNAL(triggered()), this, SLOT(objectsCreateLine()) ); objectsCreateEllipseAction = new QAction( tr("Ellipse"), this ); - objectsCreateEllipseAction->setIcon( Icons::Ellipse() ); + objectsCreateEllipseAction->setIcon( QIcon::fromTheme( "glabels-ellipse" ) ); objectsCreateEllipseAction->setStatusTip( tr("Create ellipse/circle object") ); connect( objectsCreateEllipseAction, SIGNAL(triggered()), this, SLOT(objectsCreateEllipse()) ); objectsCreateImageAction = new QAction( tr("Image"), this ); - objectsCreateImageAction->setIcon( Icons::Image() ); + objectsCreateImageAction->setIcon( QIcon::fromTheme( "glabels-image" ) ); objectsCreateImageAction->setStatusTip( tr("Create image object") ); connect( objectsCreateImageAction, SIGNAL(triggered()), this, SLOT(objectsCreateImage()) ); objectsCreateBarcodeAction = new QAction( tr("Barcode"), this ); - objectsCreateBarcodeAction->setIcon( Icons::Barcode() ); + objectsCreateBarcodeAction->setIcon( QIcon::fromTheme( "glabels-barcode" ) ); objectsCreateBarcodeAction->setStatusTip( tr("Create barcode object") ); connect( objectsCreateBarcodeAction, SIGNAL(triggered()), this, SLOT(objectsCreateBarcode()) ); objectsOrderRaiseAction = new QAction( tr("Bring To Front"), this ); - objectsOrderRaiseAction->setIcon( Icons::OrderTop() ); + objectsOrderRaiseAction->setIcon( QIcon::fromTheme( "glabels-order-top" ) ); objectsOrderRaiseAction->setStatusTip( tr("Raise selection to top") ); connect( objectsOrderRaiseAction, SIGNAL(triggered()), this, SLOT(objectsOrderRaise()) ); objectsOrderLowerAction = new QAction( tr("Send To Back"), this ); - objectsOrderLowerAction->setIcon( Icons::OrderBottom() ); + objectsOrderLowerAction->setIcon( QIcon::fromTheme( "glabels-order-bottom" ) ); objectsOrderLowerAction->setStatusTip( tr("Lower selection to bottom") ); connect( objectsOrderLowerAction, SIGNAL(triggered()), this, SLOT(objectsOrderLower()) ); objectsXformRotateLeftAction = new QAction( tr("Rotate Left"), this ); - objectsXformRotateLeftAction->setIcon( Icons::RotateLeft() ); + objectsXformRotateLeftAction->setIcon( QIcon::fromTheme( "glabels-rotate-left" ) ); objectsXformRotateLeftAction->setStatusTip( tr("Rotate object(s) 90 degrees counter-clockwise") ); connect( objectsXformRotateLeftAction, SIGNAL(triggered()), this, SLOT(objectsXformRotateLeft()) ); objectsXformRotateRightAction = new QAction( tr("Rotate Right"), this ); - objectsXformRotateRightAction->setIcon( Icons::RotateRight() ); + objectsXformRotateRightAction->setIcon( QIcon::fromTheme( "glabels-rotate-right" ) ); objectsXformRotateRightAction->setStatusTip( tr("Rotate object(s) 90 degrees clockwise") ); connect( objectsXformRotateRightAction, SIGNAL(triggered()), this, SLOT(objectsXformRotateRight()) ); objectsXformFlipHorizAction = new QAction( tr("Flip Horizontally"), this ); - objectsXformFlipHorizAction->setIcon( Icons::FlipHoriz() ); + objectsXformFlipHorizAction->setIcon( QIcon::fromTheme( "glabels-flip-horiz" ) ); objectsXformFlipHorizAction->setStatusTip( tr("Flip object(s) horizontally") ); connect( objectsXformFlipHorizAction, SIGNAL(triggered()), this, SLOT(objectsXformFlipHoriz()) ); objectsXformFlipVertAction = new QAction( tr("Flip Vertically"), this ); - objectsXformFlipVertAction->setIcon( Icons::FlipVert() ); + objectsXformFlipVertAction->setIcon( QIcon::fromTheme( "glabels-flip-vert" ) ); objectsXformFlipVertAction->setStatusTip( tr("Flip object(s) vertically") ); connect( objectsXformFlipVertAction, SIGNAL(triggered()), this, SLOT(objectsXformFlipVert()) ); objectsAlignLeftAction = new QAction( tr("Align Left"), this ); - objectsAlignLeftAction->setIcon( Icons::AlignLeft() ); + objectsAlignLeftAction->setIcon( QIcon::fromTheme( "glabels-align-left" ) ); objectsAlignLeftAction->setStatusTip( tr("Align objects to left edges") ); connect( objectsAlignLeftAction, SIGNAL(triggered()), this, SLOT(objectsAlignLeft()) ); objectsAlignHCenterAction = new QAction( tr("Align Center"), this ); - objectsAlignHCenterAction->setIcon( Icons::AlignHCenter() ); + objectsAlignHCenterAction->setIcon( QIcon::fromTheme( "glabels-align-center" ) ); objectsAlignHCenterAction->setStatusTip( tr("Align objects to horizontal centers") ); connect( objectsAlignHCenterAction, SIGNAL(triggered()), this, SLOT(objectsAlignHCenter()) ); objectsAlignRightAction = new QAction( tr("Align Right"), this ); - objectsAlignRightAction->setIcon( Icons::AlignRight() ); + objectsAlignRightAction->setIcon( QIcon::fromTheme( "glabels-align-right" ) ); objectsAlignRightAction->setStatusTip( tr("Align objects to right edges") ); connect( objectsAlignRightAction, SIGNAL(triggered()), this, SLOT(objectsAlignRight()) ); objectsAlignTopAction = new QAction( tr("Align Top"), this ); - objectsAlignTopAction->setIcon( Icons::AlignTop() ); + objectsAlignTopAction->setIcon( QIcon::fromTheme( "glabels-align-top" ) ); objectsAlignTopAction->setStatusTip( tr("Align objects to top edges") ); connect( objectsAlignTopAction, SIGNAL(triggered()), this, SLOT(objectsAlignTop()) ); objectsAlignVCenterAction = new QAction( tr("Align Middle"), this ); - objectsAlignVCenterAction->setIcon( Icons::AlignVCenter() ); + objectsAlignVCenterAction->setIcon( QIcon::fromTheme( "glabels-align-vcenter" ) ); objectsAlignVCenterAction->setStatusTip( tr("Align objects to vertical centers") ); connect( objectsAlignVCenterAction, SIGNAL(triggered()), this, SLOT(objectsAlignVCenter()) ); objectsAlignBottomAction = new QAction( tr("Align Bottom"), this ); - objectsAlignBottomAction->setIcon( Icons::AlignBottom() ); + objectsAlignBottomAction->setIcon( QIcon::fromTheme( "glabels-align-bottom" ) ); objectsAlignBottomAction->setStatusTip( tr("Align objects to bottom edges") ); connect( objectsAlignBottomAction, SIGNAL(triggered()), this, SLOT(objectsAlignBottom()) ); objectsCenterHorizAction = new QAction( tr("Center Horizontally"), this ); - objectsCenterHorizAction->setIcon( Icons::CenterHoriz() ); + objectsCenterHorizAction->setIcon( QIcon::fromTheme( "glabels-center-horiz" ) ); objectsCenterHorizAction->setStatusTip( tr("Horizontally center objects in label") ); connect( objectsCenterHorizAction, SIGNAL(triggered()), this, SLOT(objectsCenterHoriz()) ); objectsCenterVertAction = new QAction( tr("Center Vertically"), this ); - objectsCenterVertAction->setIcon( Icons::CenterVert() ); + objectsCenterVertAction->setIcon( QIcon::fromTheme( "glabels-center-vert" ) ); objectsCenterVertAction->setStatusTip( tr("Vertically center objects in label") ); connect( objectsCenterVertAction, SIGNAL(triggered()), this, SLOT(objectsCenterVert()) ); objectsCenterAction = new QAction( tr("Center Both"), this ); - objectsCenterAction->setIcon( Icons::Center() ); + objectsCenterAction->setIcon( QIcon::fromTheme( "glabels-center" ) ); objectsCenterAction->setStatusTip( tr("Center objects in label") ); connect( objectsCenterAction, SIGNAL(triggered()), this, SLOT(objectsCenter()) ); @@ -599,17 +599,17 @@ namespace glabels /* Context menu version of edit actions */ contextCutAction = new QAction( tr("Cut"), this ); - contextCutAction->setIcon( Icons::EditCut() ); + contextCutAction->setIcon( QIcon::fromTheme( "glabels-edit-cut" ) ); contextCutAction->setStatusTip( tr("Cut the selection") ); connect( contextCutAction, SIGNAL(triggered()), this, SLOT(editCut()) ); contextCopyAction = new QAction( tr("&Copy"), this ); - contextCopyAction->setIcon( Icons::EditCopy() ); + contextCopyAction->setIcon( QIcon::fromTheme( "glabels-edit-copy" ) ); contextCopyAction->setStatusTip( tr("Copy the selection") ); connect( contextCopyAction, SIGNAL(triggered()), this, SLOT(editCopy()) ); contextPasteAction = new QAction( tr("&Paste"), this ); - contextPasteAction->setIcon( Icons::EditPaste() ); + contextPasteAction->setIcon( QIcon::fromTheme( "glabels-edit-paste" ) ); contextPasteAction->setStatusTip( tr("Paste the clipboard") ); connect( contextPasteAction, SIGNAL(triggered()), this, SLOT(editContextPaste()) ); @@ -628,7 +628,7 @@ namespace glabels fileMenu = menuBar()->addMenu( tr("&File") ); fileMenu->addAction( fileNewAction ); fileMenu->addAction( fileOpenAction ); - fileRecentMenu = fileMenu->addMenu( Icons::FileRecent(), tr("Open Recent") ); + fileRecentMenu = fileMenu->addMenu( QIcon::fromTheme( "glabels-file-recent" ), tr("Open Recent") ); for ( auto* action : fileRecentActionList ) { fileRecentMenu->addAction( action ); diff --git a/glabels/ObjectEditor.cpp b/glabels/ObjectEditor.cpp index 5280f4b..6613c16 100644 --- a/glabels/ObjectEditor.cpp +++ b/glabels/ObjectEditor.cpp @@ -364,7 +364,7 @@ namespace glabels if ( dynamic_cast(mObject) ) { - titleImageLabel->setPixmap( QPixmap(":icons/flat/24x24/glabels-box.svg") ); + titleImageLabel->setPixmap( QIcon::fromTheme( "glabels-box" ).pixmap( 24 ) ); titleLabel->setText( tr("Box object properties") ); notebook->addTab( lineFillPage, tr("line/fill") ); @@ -385,7 +385,7 @@ namespace glabels } else if ( dynamic_cast(mObject) ) { - titleImageLabel->setPixmap( QPixmap(":icons/flat/24x24/glabels-ellipse.svg") ); + titleImageLabel->setPixmap( QIcon::fromTheme( "glabels-ellipse" ).pixmap( 24 ) ); titleLabel->setText( tr("Ellipse object properties") ); notebook->addTab( lineFillPage, tr("line/fill") ); @@ -406,7 +406,7 @@ namespace glabels } else if ( dynamic_cast(mObject) ) { - titleImageLabel->setPixmap( QPixmap(":icons/flat/24x24/glabels-image.svg") ); + titleImageLabel->setPixmap( QIcon::fromTheme( "glabels-image" ).pixmap( 24 ) ); titleLabel->setText( tr("Image object properties") ); notebook->addTab( imagePage, tr("image") ); @@ -426,7 +426,7 @@ namespace glabels } else if ( dynamic_cast(mObject) ) { - titleImageLabel->setPixmap( QPixmap(":icons/flat/24x24/glabels-line.svg") ); + titleImageLabel->setPixmap( QIcon::fromTheme( "glabels-line" ).pixmap( 24 ) ); titleLabel->setText( tr("Line object properties") ); notebook->addTab( lineFillPage, tr("line/fill") ); @@ -447,7 +447,7 @@ namespace glabels } else if ( dynamic_cast(mObject) ) { - titleImageLabel->setPixmap( QPixmap(":icons/flat/24x24/glabels-text.svg") ); + titleImageLabel->setPixmap( QIcon::fromTheme( "glabels-text" ).pixmap( 24 ) ); titleLabel->setText( tr("Text object properties") ); notebook->addTab( textPage, tr("text") ); @@ -467,7 +467,7 @@ namespace glabels } else if ( dynamic_cast(mObject) ) { - titleImageLabel->setPixmap( QPixmap(":icons/flat/24x24/glabels-barcode.svg") ); + titleImageLabel->setPixmap( QIcon::fromTheme( "glabels-barcode" ).pixmap( 24 ) ); titleLabel->setText( tr("Barcode object properties") ); notebook->addTab( barcodePage, tr("barcode") ); @@ -496,7 +496,7 @@ namespace glabels { mObject = nullptr; - titleImageLabel->setPixmap( QPixmap(":icons/flat/24x24/glabels-object-properties.svg") ); + titleImageLabel->setPixmap( QIcon::fromTheme( "glabels-object-properties" ).pixmap( 24 ) ); titleLabel->setText( tr("Object properties") ); setEnabled( false ); } diff --git a/glabels/SelectProductDialog.cpp b/glabels/SelectProductDialog.cpp index 2d9a261..f33df5e 100644 --- a/glabels/SelectProductDialog.cpp +++ b/glabels/SelectProductDialog.cpp @@ -21,7 +21,6 @@ #include "SelectProductDialog.h" -#include "Icons.h" #include "NotebookUtil.h" #include "TemplatePickerItem.h" @@ -70,12 +69,12 @@ namespace glabels if ( templatePicker->mode() == QListView::IconMode ) { - viewModeButton->setIcon( Icons::ViewList() ); + viewModeButton->setIcon( QIcon::fromTheme( "glabels-view-list" ) ); viewModeButton->setToolTip( tr( "List View" ) ); } else { - viewModeButton->setIcon( Icons::ViewGrid() ); + viewModeButton->setIcon( QIcon::fromTheme( "glabels-view-grid" ) ); viewModeButton->setToolTip( tr( "Grid View" ) ); } @@ -212,14 +211,14 @@ namespace glabels { templatePicker->setMode( QListView::ListMode ); - viewModeButton->setIcon( Icons::ViewList() ); + viewModeButton->setIcon( QIcon::fromTheme( "glabels-view-list" ) ); viewModeButton->setToolTip( tr( "List View" ) ); } else { templatePicker->setMode( QListView::IconMode ); - viewModeButton->setIcon( Icons::ViewGrid() ); + viewModeButton->setIcon( QIcon::fromTheme( "glabels-view-grid" ) ); viewModeButton->setToolTip( tr( "Grid View" ) ); } } diff --git a/glabels/StartupView.cpp b/glabels/StartupView.cpp index ed12ed4..aae09a3 100644 --- a/glabels/StartupView.cpp +++ b/glabels/StartupView.cpp @@ -52,6 +52,7 @@ namespace glabels { QString basename = QFileInfo( filename ).completeBaseName(); auto* action = new QAction( basename, this ); + action->setIcon( QIcon::fromTheme( "glabels" ) ); action->setData( filename ); connect( action, SIGNAL(triggered()), this, SLOT(onOpenRecentAction()) ); recentMenu->addAction( action ); diff --git a/glabels/TemplateDesigner.cpp b/glabels/TemplateDesigner.cpp index ca0c0ab..2f6ca80 100644 --- a/glabels/TemplateDesigner.cpp +++ b/glabels/TemplateDesigner.cpp @@ -113,7 +113,7 @@ namespace glabels : QWizard(parent) { setWindowTitle( tr("Product Template Designer") ); - setPixmap( QWizard::LogoPixmap, QPixmap( ":icons/apps/48x48/glabels.svg" ) ); + setPixmap( QWizard::LogoPixmap, QIcon::fromTheme( "glabels" ).pixmap( 48 ) ); setWizardStyle( QWizard::ModernStyle ); setOption( QWizard::IndependentPages, false ); setOption( QWizard::NoBackButtonOnStartPage, true ); diff --git a/glabels/icons.qrc b/glabels/icons.qrc index 4c7d369..734b006 100644 --- a/glabels/icons.qrc +++ b/glabels/icons.qrc @@ -3,124 +3,144 @@ - icons/flat/16x16/glabels-align-bottom.svg - icons/flat/16x16/glabels-align-hcenter.svg - icons/flat/16x16/glabels-align-left.svg - icons/flat/16x16/glabels-align-right.svg - icons/flat/16x16/glabels-align-top.svg - icons/flat/16x16/glabels-align-vcenter.svg - icons/flat/16x16/glabels-arrow.svg - icons/flat/16x16/glabels-barcode.svg - icons/flat/16x16/glabels-box.svg - icons/flat/16x16/glabels-center.svg - icons/flat/16x16/glabels-center-horiz.svg - icons/flat/16x16/glabels-center-vert.svg - icons/flat/16x16/glabels-edit-clear.svg - icons/flat/16x16/glabels-edit-copy.svg - icons/flat/16x16/glabels-edit-cut.svg - icons/flat/16x16/glabels-edit-paste.svg - icons/flat/16x16/glabels-ellipse.svg - icons/flat/16x16/glabels-file-new.svg - icons/flat/16x16/glabels-file-open.svg - icons/flat/16x16/glabels-file-recent.svg - icons/flat/16x16/glabels-file-save.svg - icons/flat/16x16/glabels-file-save-as.svg - icons/flat/16x16/glabels-flip-horiz.svg - icons/flat/16x16/glabels-flip-vert.svg - icons/flat/16x16/glabels-image.svg - icons/flat/16x16/glabels-line.svg - icons/flat/16x16/glabels-order-bottom.svg - icons/flat/16x16/glabels-order-top.svg - icons/flat/16x16/glabels-rotate-left.svg - icons/flat/16x16/glabels-rotate-right.svg - icons/flat/16x16/glabels-text.svg - icons/flat/16x16/glabels-zoom-in.svg - icons/flat/16x16/glabels-zoom-one-to-one.svg - icons/flat/16x16/glabels-zoom-out.svg - icons/flat/16x16/glabels-zoom-to-fit.svg - icons/apps/16x16/glabels.svg - - icons/flat/22x22/glabels-align-text-center.svg - icons/flat/22x22/glabels-align-text-left.svg - icons/flat/22x22/glabels-align-text-right.svg - icons/flat/22x22/glabels-arrow.svg - icons/flat/22x22/glabels-barcode.svg - icons/flat/22x22/glabels-box.svg - icons/flat/22x22/glabels-edit-copy.svg - icons/flat/22x22/glabels-edit-cut.svg - icons/flat/22x22/glabels-edit-paste.svg - icons/flat/22x22/glabels-ellipse.svg - icons/flat/22x22/glabels-file-new.svg - icons/flat/22x22/glabels-file-open.svg - icons/flat/22x22/glabels-file-recent.svg - icons/flat/22x22/glabels-file-save.svg - icons/flat/22x22/glabels-file-save-as.svg - icons/flat/22x22/glabels-format-text-bold.svg - icons/flat/22x22/glabels-format-text-italic.svg - icons/flat/22x22/glabels-format-text-underline.svg - icons/flat/22x22/glabels-image.svg - icons/flat/22x22/glabels-line.svg - icons/flat/22x22/glabels-text.svg - icons/flat/22x22/glabels-valign-text-bottom.svg - icons/flat/22x22/glabels-valign-text-middle.svg - icons/flat/22x22/glabels-valign-text-top.svg - icons/flat/22x22/glabels-view-grid.svg - icons/flat/22x22/glabels-view-list.svg - icons/flat/22x22/glabels-zoom-in.svg - icons/flat/22x22/glabels-zoom-one-to-one.svg - icons/flat/22x22/glabels-zoom-out.svg - icons/flat/22x22/glabels-zoom-to-fit.svg - icons/apps/22x22/glabels.svg - - icons/flat/24x24/glabels-align-text-center.svg - icons/flat/24x24/glabels-align-text-left.svg - icons/flat/24x24/glabels-align-text-right.svg - icons/flat/24x24/glabels-arrow.svg - icons/flat/24x24/glabels-barcode.svg - icons/flat/24x24/glabels-box.svg - icons/flat/24x24/glabels-edit-copy.svg - icons/flat/24x24/glabels-edit-cut.svg - icons/flat/24x24/glabels-edit-paste.svg - icons/flat/24x24/glabels-ellipse.svg - icons/flat/24x24/glabels-file-new.svg - icons/flat/24x24/glabels-file-open.svg - icons/flat/24x24/glabels-file-recent.svg - icons/flat/24x24/glabels-file-save.svg - icons/flat/24x24/glabels-file-save-as.svg - icons/flat/24x24/glabels-format-text-bold.svg - icons/flat/24x24/glabels-format-text-italic.svg - icons/flat/24x24/glabels-format-text-underline.svg - icons/flat/24x24/glabels-image.svg - icons/flat/24x24/glabels-line.svg - icons/flat/24x24/glabels-object-properties.svg - icons/flat/24x24/glabels-text.svg - icons/flat/24x24/glabels-valign-text-bottom.svg - icons/flat/24x24/glabels-valign-text-middle.svg - icons/flat/24x24/glabels-valign-text-top.svg + + icons/glabels-flat/index.theme - icons/flat/32x32/glabels-collated.svg - icons/flat/32x32/glabels-file-new.svg - icons/flat/32x32/glabels-file-open.svg - icons/flat/32x32/glabels-file-recent.svg - icons/flat/32x32/glabels-label-orientation-horiz.svg - icons/flat/32x32/glabels-label-orientation-vert.svg - icons/flat/32x32/glabels-merge-group-contiguous.svg - icons/flat/32x32/glabels-merge-group-page.svg - icons/flat/32x32/glabels-print.svg - icons/flat/32x32/glabels-select-product.svg - icons/flat/32x32/glabels-uncollated.svg - icons/apps/32x32/glabels.svg + + icons/glabels-flat/16x16/actions/glabels-align-bottom.svg + icons/glabels-flat/16x16/actions/glabels-align-hcenter.svg + icons/glabels-flat/16x16/actions/glabels-align-left.svg + icons/glabels-flat/16x16/actions/glabels-align-right.svg + icons/glabels-flat/16x16/actions/glabels-align-top.svg + icons/glabels-flat/16x16/actions/glabels-align-vcenter.svg + icons/glabels-flat/16x16/actions/glabels-arrow.svg + icons/glabels-flat/16x16/actions/glabels-barcode.svg + icons/glabels-flat/16x16/actions/glabels-box.svg + icons/glabels-flat/16x16/actions/glabels-center-horiz.svg + icons/glabels-flat/16x16/actions/glabels-center.svg + icons/glabels-flat/16x16/actions/glabels-center-vert.svg + icons/glabels-flat/16x16/actions/glabels-edit-clear.svg + icons/glabels-flat/16x16/actions/glabels-edit-copy.svg + icons/glabels-flat/16x16/actions/glabels-edit-cut.svg + icons/glabels-flat/16x16/actions/glabels-edit-paste.svg + icons/glabels-flat/16x16/actions/glabels-ellipse.svg + icons/glabels-flat/16x16/actions/glabels-file-new.svg + icons/glabels-flat/16x16/actions/glabels-file-open.svg + icons/glabels-flat/16x16/actions/glabels-file-recent.svg + icons/glabels-flat/16x16/actions/glabels-file-save-as.svg + icons/glabels-flat/16x16/actions/glabels-file-save.svg + icons/glabels-flat/16x16/actions/glabels-flip-horiz.svg + icons/glabels-flat/16x16/actions/glabels-flip-vert.svg + icons/glabels-flat/16x16/actions/glabels-image.svg + icons/glabels-flat/16x16/actions/glabels-line.svg + icons/glabels-flat/16x16/actions/glabels-order-bottom.svg + icons/glabels-flat/16x16/actions/glabels-order-top.svg + icons/glabels-flat/16x16/actions/glabels-rotate-left.svg + icons/glabels-flat/16x16/actions/glabels-rotate-right.svg + icons/glabels-flat/16x16/actions/glabels-text.svg + icons/glabels-flat/16x16/actions/glabels-zoom-in.svg + icons/glabels-flat/16x16/actions/glabels-zoom-one-to-one.svg + icons/glabels-flat/16x16/actions/glabels-zoom-out.svg + icons/glabels-flat/16x16/actions/glabels-zoom-to-fit.svg - icons/flat/48x48/glabels-edit.svg - icons/flat/48x48/glabels-merge.svg - icons/flat/48x48/glabels-print.svg - icons/flat/48x48/glabels-properties.svg - icons/flat/48x48/glabels-variables.svg - icons/apps/48x48/glabels.svg + icons/glabels-flat/16x16/apps/glabels.svg - icons/apps/128x128/glabels.svg - - icons/apps/scalable/glabels.svg + + icons/glabels-flat/22x22/actions/glabels-align-text-center.svg + icons/glabels-flat/22x22/actions/glabels-align-text-left.svg + icons/glabels-flat/22x22/actions/glabels-align-text-right.svg + icons/glabels-flat/22x22/actions/glabels-arrow.svg + icons/glabels-flat/22x22/actions/glabels-barcode.svg + icons/glabels-flat/22x22/actions/glabels-box.svg + icons/glabels-flat/22x22/actions/glabels-edit-copy.svg + icons/glabels-flat/22x22/actions/glabels-edit-cut.svg + icons/glabels-flat/22x22/actions/glabels-edit-paste.svg + icons/glabels-flat/22x22/actions/glabels-ellipse.svg + icons/glabels-flat/22x22/actions/glabels-file-new.svg + icons/glabels-flat/22x22/actions/glabels-file-open.svg + icons/glabels-flat/22x22/actions/glabels-file-recent.svg + icons/glabels-flat/22x22/actions/glabels-file-save-as.svg + icons/glabels-flat/22x22/actions/glabels-file-save.svg + icons/glabels-flat/22x22/actions/glabels-format-text-bold.svg + icons/glabels-flat/22x22/actions/glabels-format-text-italic.svg + icons/glabels-flat/22x22/actions/glabels-format-text-underline.svg + icons/glabels-flat/22x22/actions/glabels-image.svg + icons/glabels-flat/22x22/actions/glabels-line.svg + icons/glabels-flat/22x22/actions/glabels-text.svg + icons/glabels-flat/22x22/actions/glabels-valign-text-bottom.svg + icons/glabels-flat/22x22/actions/glabels-valign-text-middle.svg + icons/glabels-flat/22x22/actions/glabels-valign-text-top.svg + icons/glabels-flat/22x22/actions/glabels-view-grid.svg + icons/glabels-flat/22x22/actions/glabels-view-list.svg + icons/glabels-flat/22x22/actions/glabels-zoom-in.svg + icons/glabels-flat/22x22/actions/glabels-zoom-one-to-one.svg + icons/glabels-flat/22x22/actions/glabels-zoom-out.svg + icons/glabels-flat/22x22/actions/glabels-zoom-to-fit.svg + + icons/glabels-flat/22x22/apps/glabels.svg + + + icons/glabels-flat/24x24/actions/glabels-align-text-center.svg + icons/glabels-flat/24x24/actions/glabels-align-text-left.svg + icons/glabels-flat/24x24/actions/glabels-align-text-right.svg + icons/glabels-flat/24x24/actions/glabels-arrow.svg + icons/glabels-flat/24x24/actions/glabels-barcode.svg + icons/glabels-flat/24x24/actions/glabels-box.svg + icons/glabels-flat/24x24/actions/glabels-edit-copy.svg + icons/glabels-flat/24x24/actions/glabels-edit-cut.svg + icons/glabels-flat/24x24/actions/glabels-edit-paste.svg + icons/glabels-flat/24x24/actions/glabels-ellipse.svg + icons/glabels-flat/24x24/actions/glabels-file-new.svg + icons/glabels-flat/24x24/actions/glabels-file-open.svg + icons/glabels-flat/24x24/actions/glabels-file-recent.svg + icons/glabels-flat/24x24/actions/glabels-file-save-as.svg + icons/glabels-flat/24x24/actions/glabels-file-save.svg + icons/glabels-flat/24x24/actions/glabels-format-text-bold.svg + icons/glabels-flat/24x24/actions/glabels-format-text-italic.svg + icons/glabels-flat/24x24/actions/glabels-format-text-underline.svg + icons/glabels-flat/24x24/actions/glabels-image.svg + icons/glabels-flat/24x24/actions/glabels-line.svg + icons/glabels-flat/24x24/actions/glabels-object-properties.svg + icons/glabels-flat/24x24/actions/glabels-text.svg + icons/glabels-flat/24x24/actions/glabels-valign-text-bottom.svg + icons/glabels-flat/24x24/actions/glabels-valign-text-middle.svg + icons/glabels-flat/24x24/actions/glabels-valign-text-top.svg + + + icons/glabels-flat/32x32/actions/glabels-collated.svg + icons/glabels-flat/32x32/actions/glabels-file-new.svg + icons/glabels-flat/32x32/actions/glabels-file-open.svg + icons/glabels-flat/32x32/actions/glabels-file-recent.svg + icons/glabels-flat/32x32/actions/glabels-label-orientation-horiz.svg + icons/glabels-flat/32x32/actions/glabels-label-orientation-vert.svg + icons/glabels-flat/32x32/actions/glabels-merge-group-contiguous.svg + icons/glabels-flat/32x32/actions/glabels-merge-group-page.svg + icons/glabels-flat/32x32/actions/glabels-print.svg + icons/glabels-flat/32x32/actions/glabels-select-product.svg + icons/glabels-flat/32x32/actions/glabels-uncollated.svg + + icons/glabels-flat/32x32/apps/glabels.svg + + + icons/glabels-flat/48x48/actions/glabels-edit.svg + icons/glabels-flat/48x48/actions/glabels-merge.svg + icons/glabels-flat/48x48/actions/glabels-print.svg + icons/glabels-flat/48x48/actions/glabels-properties.svg + icons/glabels-flat/48x48/actions/glabels-variables.svg + + icons/glabels-flat/48x48/apps/glabels.svg + + + icons/glabels-flat/128x128/apps/glabels.svg + + + icons/glabels-flat/scalable/apps/glabels.svg + + + icons/mimetypes/16x16/x-glabels-project.svg + icons/mimetypes/22x22/x-glabels-project.svg + icons/mimetypes/24x24/x-glabels-project.svg + icons/mimetypes/scalable/x-glabels-project.svg diff --git a/glabels/icons/apps/128x128/glabels.svg b/glabels/icons/glabels-flat/128x128/apps/glabels.svg similarity index 100% rename from glabels/icons/apps/128x128/glabels.svg rename to glabels/icons/glabels-flat/128x128/apps/glabels.svg diff --git a/glabels/icons/flat/16x16/glabels-align-bottom.svg b/glabels/icons/glabels-flat/16x16/actions/glabels-align-bottom.svg similarity index 100% rename from glabels/icons/flat/16x16/glabels-align-bottom.svg rename to glabels/icons/glabels-flat/16x16/actions/glabels-align-bottom.svg diff --git a/glabels/icons/flat/16x16/glabels-align-hcenter.svg b/glabels/icons/glabels-flat/16x16/actions/glabels-align-hcenter.svg similarity index 100% rename from glabels/icons/flat/16x16/glabels-align-hcenter.svg rename to glabels/icons/glabels-flat/16x16/actions/glabels-align-hcenter.svg diff --git a/glabels/icons/flat/16x16/glabels-align-left.svg b/glabels/icons/glabels-flat/16x16/actions/glabels-align-left.svg similarity index 100% rename from glabels/icons/flat/16x16/glabels-align-left.svg rename to glabels/icons/glabels-flat/16x16/actions/glabels-align-left.svg diff --git a/glabels/icons/flat/16x16/glabels-align-right.svg b/glabels/icons/glabels-flat/16x16/actions/glabels-align-right.svg similarity index 100% rename from glabels/icons/flat/16x16/glabels-align-right.svg rename to glabels/icons/glabels-flat/16x16/actions/glabels-align-right.svg diff --git a/glabels/icons/flat/16x16/glabels-align-top.svg b/glabels/icons/glabels-flat/16x16/actions/glabels-align-top.svg similarity index 100% rename from glabels/icons/flat/16x16/glabels-align-top.svg rename to glabels/icons/glabels-flat/16x16/actions/glabels-align-top.svg diff --git a/glabels/icons/flat/16x16/glabels-align-vcenter.svg b/glabels/icons/glabels-flat/16x16/actions/glabels-align-vcenter.svg similarity index 100% rename from glabels/icons/flat/16x16/glabels-align-vcenter.svg rename to glabels/icons/glabels-flat/16x16/actions/glabels-align-vcenter.svg diff --git a/glabels/icons/flat/16x16/glabels-arrow.svg b/glabels/icons/glabels-flat/16x16/actions/glabels-arrow.svg similarity index 100% rename from glabels/icons/flat/16x16/glabels-arrow.svg rename to glabels/icons/glabels-flat/16x16/actions/glabels-arrow.svg diff --git a/glabels/icons/flat/16x16/glabels-barcode.svg b/glabels/icons/glabels-flat/16x16/actions/glabels-barcode.svg similarity index 100% rename from glabels/icons/flat/16x16/glabels-barcode.svg rename to glabels/icons/glabels-flat/16x16/actions/glabels-barcode.svg diff --git a/glabels/icons/flat/16x16/glabels-box.svg b/glabels/icons/glabels-flat/16x16/actions/glabels-box.svg similarity index 100% rename from glabels/icons/flat/16x16/glabels-box.svg rename to glabels/icons/glabels-flat/16x16/actions/glabels-box.svg diff --git a/glabels/icons/flat/16x16/glabels-center-horiz.svg b/glabels/icons/glabels-flat/16x16/actions/glabels-center-horiz.svg similarity index 100% rename from glabels/icons/flat/16x16/glabels-center-horiz.svg rename to glabels/icons/glabels-flat/16x16/actions/glabels-center-horiz.svg diff --git a/glabels/icons/flat/16x16/glabels-center-vert.svg b/glabels/icons/glabels-flat/16x16/actions/glabels-center-vert.svg similarity index 100% rename from glabels/icons/flat/16x16/glabels-center-vert.svg rename to glabels/icons/glabels-flat/16x16/actions/glabels-center-vert.svg diff --git a/glabels/icons/flat/16x16/glabels-center.svg b/glabels/icons/glabels-flat/16x16/actions/glabels-center.svg similarity index 100% rename from glabels/icons/flat/16x16/glabels-center.svg rename to glabels/icons/glabels-flat/16x16/actions/glabels-center.svg diff --git a/glabels/icons/flat/16x16/glabels-edit-clear.svg b/glabels/icons/glabels-flat/16x16/actions/glabels-edit-clear.svg similarity index 100% rename from glabels/icons/flat/16x16/glabels-edit-clear.svg rename to glabels/icons/glabels-flat/16x16/actions/glabels-edit-clear.svg diff --git a/glabels/icons/flat/16x16/glabels-edit-copy.svg b/glabels/icons/glabels-flat/16x16/actions/glabels-edit-copy.svg similarity index 100% rename from glabels/icons/flat/16x16/glabels-edit-copy.svg rename to glabels/icons/glabels-flat/16x16/actions/glabels-edit-copy.svg diff --git a/glabels/icons/flat/16x16/glabels-edit-cut.svg b/glabels/icons/glabels-flat/16x16/actions/glabels-edit-cut.svg similarity index 100% rename from glabels/icons/flat/16x16/glabels-edit-cut.svg rename to glabels/icons/glabels-flat/16x16/actions/glabels-edit-cut.svg diff --git a/glabels/icons/flat/16x16/glabels-edit-paste.svg b/glabels/icons/glabels-flat/16x16/actions/glabels-edit-paste.svg similarity index 100% rename from glabels/icons/flat/16x16/glabels-edit-paste.svg rename to glabels/icons/glabels-flat/16x16/actions/glabels-edit-paste.svg diff --git a/glabels/icons/flat/16x16/glabels-ellipse.svg b/glabels/icons/glabels-flat/16x16/actions/glabels-ellipse.svg similarity index 100% rename from glabels/icons/flat/16x16/glabels-ellipse.svg rename to glabels/icons/glabels-flat/16x16/actions/glabels-ellipse.svg diff --git a/glabels/icons/flat/16x16/glabels-file-new.svg b/glabels/icons/glabels-flat/16x16/actions/glabels-file-new.svg similarity index 100% rename from glabels/icons/flat/16x16/glabels-file-new.svg rename to glabels/icons/glabels-flat/16x16/actions/glabels-file-new.svg diff --git a/glabels/icons/flat/16x16/glabels-file-open.svg b/glabels/icons/glabels-flat/16x16/actions/glabels-file-open.svg similarity index 100% rename from glabels/icons/flat/16x16/glabels-file-open.svg rename to glabels/icons/glabels-flat/16x16/actions/glabels-file-open.svg diff --git a/glabels/icons/flat/16x16/glabels-file-recent.svg b/glabels/icons/glabels-flat/16x16/actions/glabels-file-recent.svg similarity index 100% rename from glabels/icons/flat/16x16/glabels-file-recent.svg rename to glabels/icons/glabels-flat/16x16/actions/glabels-file-recent.svg diff --git a/glabels/icons/flat/16x16/glabels-file-save-as.svg b/glabels/icons/glabels-flat/16x16/actions/glabels-file-save-as.svg similarity index 100% rename from glabels/icons/flat/16x16/glabels-file-save-as.svg rename to glabels/icons/glabels-flat/16x16/actions/glabels-file-save-as.svg diff --git a/glabels/icons/flat/16x16/glabels-file-save.svg b/glabels/icons/glabels-flat/16x16/actions/glabels-file-save.svg similarity index 100% rename from glabels/icons/flat/16x16/glabels-file-save.svg rename to glabels/icons/glabels-flat/16x16/actions/glabels-file-save.svg diff --git a/glabels/icons/flat/16x16/glabels-flip-horiz.svg b/glabels/icons/glabels-flat/16x16/actions/glabels-flip-horiz.svg similarity index 100% rename from glabels/icons/flat/16x16/glabels-flip-horiz.svg rename to glabels/icons/glabels-flat/16x16/actions/glabels-flip-horiz.svg diff --git a/glabels/icons/flat/16x16/glabels-flip-vert.svg b/glabels/icons/glabels-flat/16x16/actions/glabels-flip-vert.svg similarity index 100% rename from glabels/icons/flat/16x16/glabels-flip-vert.svg rename to glabels/icons/glabels-flat/16x16/actions/glabels-flip-vert.svg diff --git a/glabels/icons/flat/16x16/glabels-image.svg b/glabels/icons/glabels-flat/16x16/actions/glabels-image.svg similarity index 100% rename from glabels/icons/flat/16x16/glabels-image.svg rename to glabels/icons/glabels-flat/16x16/actions/glabels-image.svg diff --git a/glabels/icons/flat/16x16/glabels-line.svg b/glabels/icons/glabels-flat/16x16/actions/glabels-line.svg similarity index 100% rename from glabels/icons/flat/16x16/glabels-line.svg rename to glabels/icons/glabels-flat/16x16/actions/glabels-line.svg diff --git a/glabels/icons/flat/16x16/glabels-order-bottom.svg b/glabels/icons/glabels-flat/16x16/actions/glabels-order-bottom.svg similarity index 100% rename from glabels/icons/flat/16x16/glabels-order-bottom.svg rename to glabels/icons/glabels-flat/16x16/actions/glabels-order-bottom.svg diff --git a/glabels/icons/flat/16x16/glabels-order-top.svg b/glabels/icons/glabels-flat/16x16/actions/glabels-order-top.svg similarity index 100% rename from glabels/icons/flat/16x16/glabels-order-top.svg rename to glabels/icons/glabels-flat/16x16/actions/glabels-order-top.svg diff --git a/glabels/icons/flat/16x16/glabels-rotate-left.svg b/glabels/icons/glabels-flat/16x16/actions/glabels-rotate-left.svg similarity index 100% rename from glabels/icons/flat/16x16/glabels-rotate-left.svg rename to glabels/icons/glabels-flat/16x16/actions/glabels-rotate-left.svg diff --git a/glabels/icons/flat/16x16/glabels-rotate-right.svg b/glabels/icons/glabels-flat/16x16/actions/glabels-rotate-right.svg similarity index 100% rename from glabels/icons/flat/16x16/glabels-rotate-right.svg rename to glabels/icons/glabels-flat/16x16/actions/glabels-rotate-right.svg diff --git a/glabels/icons/flat/16x16/glabels-text.svg b/glabels/icons/glabels-flat/16x16/actions/glabels-text.svg similarity index 100% rename from glabels/icons/flat/16x16/glabels-text.svg rename to glabels/icons/glabels-flat/16x16/actions/glabels-text.svg diff --git a/glabels/icons/flat/16x16/glabels-zoom-in.svg b/glabels/icons/glabels-flat/16x16/actions/glabels-zoom-in.svg similarity index 100% rename from glabels/icons/flat/16x16/glabels-zoom-in.svg rename to glabels/icons/glabels-flat/16x16/actions/glabels-zoom-in.svg diff --git a/glabels/icons/flat/16x16/glabels-zoom-one-to-one.svg b/glabels/icons/glabels-flat/16x16/actions/glabels-zoom-one-to-one.svg similarity index 100% rename from glabels/icons/flat/16x16/glabels-zoom-one-to-one.svg rename to glabels/icons/glabels-flat/16x16/actions/glabels-zoom-one-to-one.svg diff --git a/glabels/icons/flat/16x16/glabels-zoom-out.svg b/glabels/icons/glabels-flat/16x16/actions/glabels-zoom-out.svg similarity index 100% rename from glabels/icons/flat/16x16/glabels-zoom-out.svg rename to glabels/icons/glabels-flat/16x16/actions/glabels-zoom-out.svg diff --git a/glabels/icons/flat/16x16/glabels-zoom-to-fit.svg b/glabels/icons/glabels-flat/16x16/actions/glabels-zoom-to-fit.svg similarity index 100% rename from glabels/icons/flat/16x16/glabels-zoom-to-fit.svg rename to glabels/icons/glabels-flat/16x16/actions/glabels-zoom-to-fit.svg diff --git a/glabels/icons/apps/16x16/glabels.svg b/glabels/icons/glabels-flat/16x16/apps/glabels.svg similarity index 100% rename from glabels/icons/apps/16x16/glabels.svg rename to glabels/icons/glabels-flat/16x16/apps/glabels.svg diff --git a/glabels/icons/flat/22x22/glabels-align-text-center.svg b/glabels/icons/glabels-flat/22x22/actions/glabels-align-text-center.svg similarity index 100% rename from glabels/icons/flat/22x22/glabels-align-text-center.svg rename to glabels/icons/glabels-flat/22x22/actions/glabels-align-text-center.svg diff --git a/glabels/icons/flat/22x22/glabels-align-text-left.svg b/glabels/icons/glabels-flat/22x22/actions/glabels-align-text-left.svg similarity index 100% rename from glabels/icons/flat/22x22/glabels-align-text-left.svg rename to glabels/icons/glabels-flat/22x22/actions/glabels-align-text-left.svg diff --git a/glabels/icons/flat/22x22/glabels-align-text-right.svg b/glabels/icons/glabels-flat/22x22/actions/glabels-align-text-right.svg similarity index 100% rename from glabels/icons/flat/22x22/glabels-align-text-right.svg rename to glabels/icons/glabels-flat/22x22/actions/glabels-align-text-right.svg diff --git a/glabels/icons/flat/22x22/glabels-arrow.svg b/glabels/icons/glabels-flat/22x22/actions/glabels-arrow.svg similarity index 100% rename from glabels/icons/flat/22x22/glabels-arrow.svg rename to glabels/icons/glabels-flat/22x22/actions/glabels-arrow.svg diff --git a/glabels/icons/flat/22x22/glabels-barcode.svg b/glabels/icons/glabels-flat/22x22/actions/glabels-barcode.svg similarity index 100% rename from glabels/icons/flat/22x22/glabels-barcode.svg rename to glabels/icons/glabels-flat/22x22/actions/glabels-barcode.svg diff --git a/glabels/icons/flat/22x22/glabels-box.svg b/glabels/icons/glabels-flat/22x22/actions/glabels-box.svg similarity index 100% rename from glabels/icons/flat/22x22/glabels-box.svg rename to glabels/icons/glabels-flat/22x22/actions/glabels-box.svg diff --git a/glabels/icons/flat/22x22/glabels-edit-copy.svg b/glabels/icons/glabels-flat/22x22/actions/glabels-edit-copy.svg similarity index 100% rename from glabels/icons/flat/22x22/glabels-edit-copy.svg rename to glabels/icons/glabels-flat/22x22/actions/glabels-edit-copy.svg diff --git a/glabels/icons/flat/22x22/glabels-edit-cut.svg b/glabels/icons/glabels-flat/22x22/actions/glabels-edit-cut.svg similarity index 100% rename from glabels/icons/flat/22x22/glabels-edit-cut.svg rename to glabels/icons/glabels-flat/22x22/actions/glabels-edit-cut.svg diff --git a/glabels/icons/flat/22x22/glabels-edit-paste.svg b/glabels/icons/glabels-flat/22x22/actions/glabels-edit-paste.svg similarity index 100% rename from glabels/icons/flat/22x22/glabels-edit-paste.svg rename to glabels/icons/glabels-flat/22x22/actions/glabels-edit-paste.svg diff --git a/glabels/icons/flat/22x22/glabels-ellipse.svg b/glabels/icons/glabels-flat/22x22/actions/glabels-ellipse.svg similarity index 100% rename from glabels/icons/flat/22x22/glabels-ellipse.svg rename to glabels/icons/glabels-flat/22x22/actions/glabels-ellipse.svg diff --git a/glabels/icons/flat/22x22/glabels-file-new.svg b/glabels/icons/glabels-flat/22x22/actions/glabels-file-new.svg similarity index 100% rename from glabels/icons/flat/22x22/glabels-file-new.svg rename to glabels/icons/glabels-flat/22x22/actions/glabels-file-new.svg diff --git a/glabels/icons/flat/22x22/glabels-file-open.svg b/glabels/icons/glabels-flat/22x22/actions/glabels-file-open.svg similarity index 100% rename from glabels/icons/flat/22x22/glabels-file-open.svg rename to glabels/icons/glabels-flat/22x22/actions/glabels-file-open.svg diff --git a/glabels/icons/flat/22x22/glabels-file-recent.svg b/glabels/icons/glabels-flat/22x22/actions/glabels-file-recent.svg similarity index 100% rename from glabels/icons/flat/22x22/glabels-file-recent.svg rename to glabels/icons/glabels-flat/22x22/actions/glabels-file-recent.svg diff --git a/glabels/icons/flat/22x22/glabels-file-save-as.svg b/glabels/icons/glabels-flat/22x22/actions/glabels-file-save-as.svg similarity index 100% rename from glabels/icons/flat/22x22/glabels-file-save-as.svg rename to glabels/icons/glabels-flat/22x22/actions/glabels-file-save-as.svg diff --git a/glabels/icons/flat/22x22/glabels-file-save.svg b/glabels/icons/glabels-flat/22x22/actions/glabels-file-save.svg similarity index 100% rename from glabels/icons/flat/22x22/glabels-file-save.svg rename to glabels/icons/glabels-flat/22x22/actions/glabels-file-save.svg diff --git a/glabels/icons/flat/22x22/glabels-format-text-bold.svg b/glabels/icons/glabels-flat/22x22/actions/glabels-format-text-bold.svg similarity index 100% rename from glabels/icons/flat/22x22/glabels-format-text-bold.svg rename to glabels/icons/glabels-flat/22x22/actions/glabels-format-text-bold.svg diff --git a/glabels/icons/flat/22x22/glabels-format-text-italic.svg b/glabels/icons/glabels-flat/22x22/actions/glabels-format-text-italic.svg similarity index 100% rename from glabels/icons/flat/22x22/glabels-format-text-italic.svg rename to glabels/icons/glabels-flat/22x22/actions/glabels-format-text-italic.svg diff --git a/glabels/icons/flat/22x22/glabels-format-text-underline.svg b/glabels/icons/glabels-flat/22x22/actions/glabels-format-text-underline.svg similarity index 100% rename from glabels/icons/flat/22x22/glabels-format-text-underline.svg rename to glabels/icons/glabels-flat/22x22/actions/glabels-format-text-underline.svg diff --git a/glabels/icons/flat/22x22/glabels-image.svg b/glabels/icons/glabels-flat/22x22/actions/glabels-image.svg similarity index 100% rename from glabels/icons/flat/22x22/glabels-image.svg rename to glabels/icons/glabels-flat/22x22/actions/glabels-image.svg diff --git a/glabels/icons/flat/22x22/glabels-line.svg b/glabels/icons/glabels-flat/22x22/actions/glabels-line.svg similarity index 100% rename from glabels/icons/flat/22x22/glabels-line.svg rename to glabels/icons/glabels-flat/22x22/actions/glabels-line.svg diff --git a/glabels/icons/flat/22x22/glabels-text.svg b/glabels/icons/glabels-flat/22x22/actions/glabels-text.svg similarity index 100% rename from glabels/icons/flat/22x22/glabels-text.svg rename to glabels/icons/glabels-flat/22x22/actions/glabels-text.svg diff --git a/glabels/icons/flat/22x22/glabels-valign-text-bottom.svg b/glabels/icons/glabels-flat/22x22/actions/glabels-valign-text-bottom.svg similarity index 100% rename from glabels/icons/flat/22x22/glabels-valign-text-bottom.svg rename to glabels/icons/glabels-flat/22x22/actions/glabels-valign-text-bottom.svg diff --git a/glabels/icons/flat/22x22/glabels-valign-text-middle.svg b/glabels/icons/glabels-flat/22x22/actions/glabels-valign-text-middle.svg similarity index 100% rename from glabels/icons/flat/22x22/glabels-valign-text-middle.svg rename to glabels/icons/glabels-flat/22x22/actions/glabels-valign-text-middle.svg diff --git a/glabels/icons/flat/22x22/glabels-valign-text-top.svg b/glabels/icons/glabels-flat/22x22/actions/glabels-valign-text-top.svg similarity index 100% rename from glabels/icons/flat/22x22/glabels-valign-text-top.svg rename to glabels/icons/glabels-flat/22x22/actions/glabels-valign-text-top.svg diff --git a/glabels/icons/flat/22x22/glabels-view-grid.svg b/glabels/icons/glabels-flat/22x22/actions/glabels-view-grid.svg similarity index 100% rename from glabels/icons/flat/22x22/glabels-view-grid.svg rename to glabels/icons/glabels-flat/22x22/actions/glabels-view-grid.svg diff --git a/glabels/icons/flat/22x22/glabels-view-list.svg b/glabels/icons/glabels-flat/22x22/actions/glabels-view-list.svg similarity index 100% rename from glabels/icons/flat/22x22/glabels-view-list.svg rename to glabels/icons/glabels-flat/22x22/actions/glabels-view-list.svg diff --git a/glabels/icons/flat/22x22/glabels-zoom-in.svg b/glabels/icons/glabels-flat/22x22/actions/glabels-zoom-in.svg similarity index 100% rename from glabels/icons/flat/22x22/glabels-zoom-in.svg rename to glabels/icons/glabels-flat/22x22/actions/glabels-zoom-in.svg diff --git a/glabels/icons/flat/22x22/glabels-zoom-one-to-one.svg b/glabels/icons/glabels-flat/22x22/actions/glabels-zoom-one-to-one.svg similarity index 100% rename from glabels/icons/flat/22x22/glabels-zoom-one-to-one.svg rename to glabels/icons/glabels-flat/22x22/actions/glabels-zoom-one-to-one.svg diff --git a/glabels/icons/flat/22x22/glabels-zoom-out.svg b/glabels/icons/glabels-flat/22x22/actions/glabels-zoom-out.svg similarity index 100% rename from glabels/icons/flat/22x22/glabels-zoom-out.svg rename to glabels/icons/glabels-flat/22x22/actions/glabels-zoom-out.svg diff --git a/glabels/icons/flat/22x22/glabels-zoom-to-fit.svg b/glabels/icons/glabels-flat/22x22/actions/glabels-zoom-to-fit.svg similarity index 100% rename from glabels/icons/flat/22x22/glabels-zoom-to-fit.svg rename to glabels/icons/glabels-flat/22x22/actions/glabels-zoom-to-fit.svg diff --git a/glabels/icons/apps/22x22/glabels.svg b/glabels/icons/glabels-flat/22x22/apps/glabels.svg similarity index 100% rename from glabels/icons/apps/22x22/glabels.svg rename to glabels/icons/glabels-flat/22x22/apps/glabels.svg diff --git a/glabels/icons/flat/24x24/glabels-align-text-center.svg b/glabels/icons/glabels-flat/24x24/actions/glabels-align-text-center.svg similarity index 100% rename from glabels/icons/flat/24x24/glabels-align-text-center.svg rename to glabels/icons/glabels-flat/24x24/actions/glabels-align-text-center.svg diff --git a/glabels/icons/flat/24x24/glabels-align-text-left.svg b/glabels/icons/glabels-flat/24x24/actions/glabels-align-text-left.svg similarity index 100% rename from glabels/icons/flat/24x24/glabels-align-text-left.svg rename to glabels/icons/glabels-flat/24x24/actions/glabels-align-text-left.svg diff --git a/glabels/icons/flat/24x24/glabels-align-text-right.svg b/glabels/icons/glabels-flat/24x24/actions/glabels-align-text-right.svg similarity index 100% rename from glabels/icons/flat/24x24/glabels-align-text-right.svg rename to glabels/icons/glabels-flat/24x24/actions/glabels-align-text-right.svg diff --git a/glabels/icons/flat/24x24/glabels-arrow.svg b/glabels/icons/glabels-flat/24x24/actions/glabels-arrow.svg similarity index 100% rename from glabels/icons/flat/24x24/glabels-arrow.svg rename to glabels/icons/glabels-flat/24x24/actions/glabels-arrow.svg diff --git a/glabels/icons/flat/24x24/glabels-barcode.svg b/glabels/icons/glabels-flat/24x24/actions/glabels-barcode.svg similarity index 100% rename from glabels/icons/flat/24x24/glabels-barcode.svg rename to glabels/icons/glabels-flat/24x24/actions/glabels-barcode.svg diff --git a/glabels/icons/flat/24x24/glabels-box.svg b/glabels/icons/glabels-flat/24x24/actions/glabels-box.svg similarity index 100% rename from glabels/icons/flat/24x24/glabels-box.svg rename to glabels/icons/glabels-flat/24x24/actions/glabels-box.svg diff --git a/glabels/icons/flat/24x24/glabels-edit-copy.svg b/glabels/icons/glabels-flat/24x24/actions/glabels-edit-copy.svg similarity index 100% rename from glabels/icons/flat/24x24/glabels-edit-copy.svg rename to glabels/icons/glabels-flat/24x24/actions/glabels-edit-copy.svg diff --git a/glabels/icons/flat/24x24/glabels-edit-cut.svg b/glabels/icons/glabels-flat/24x24/actions/glabels-edit-cut.svg similarity index 100% rename from glabels/icons/flat/24x24/glabels-edit-cut.svg rename to glabels/icons/glabels-flat/24x24/actions/glabels-edit-cut.svg diff --git a/glabels/icons/flat/24x24/glabels-edit-paste.svg b/glabels/icons/glabels-flat/24x24/actions/glabels-edit-paste.svg similarity index 100% rename from glabels/icons/flat/24x24/glabels-edit-paste.svg rename to glabels/icons/glabels-flat/24x24/actions/glabels-edit-paste.svg diff --git a/glabels/icons/flat/24x24/glabels-ellipse.svg b/glabels/icons/glabels-flat/24x24/actions/glabels-ellipse.svg similarity index 100% rename from glabels/icons/flat/24x24/glabels-ellipse.svg rename to glabels/icons/glabels-flat/24x24/actions/glabels-ellipse.svg diff --git a/glabels/icons/flat/24x24/glabels-file-new.svg b/glabels/icons/glabels-flat/24x24/actions/glabels-file-new.svg similarity index 100% rename from glabels/icons/flat/24x24/glabels-file-new.svg rename to glabels/icons/glabels-flat/24x24/actions/glabels-file-new.svg diff --git a/glabels/icons/flat/24x24/glabels-file-open.svg b/glabels/icons/glabels-flat/24x24/actions/glabels-file-open.svg similarity index 100% rename from glabels/icons/flat/24x24/glabels-file-open.svg rename to glabels/icons/glabels-flat/24x24/actions/glabels-file-open.svg diff --git a/glabels/icons/flat/24x24/glabels-file-recent.svg b/glabels/icons/glabels-flat/24x24/actions/glabels-file-recent.svg similarity index 100% rename from glabels/icons/flat/24x24/glabels-file-recent.svg rename to glabels/icons/glabels-flat/24x24/actions/glabels-file-recent.svg diff --git a/glabels/icons/flat/24x24/glabels-file-save-as.svg b/glabels/icons/glabels-flat/24x24/actions/glabels-file-save-as.svg similarity index 100% rename from glabels/icons/flat/24x24/glabels-file-save-as.svg rename to glabels/icons/glabels-flat/24x24/actions/glabels-file-save-as.svg diff --git a/glabels/icons/flat/24x24/glabels-file-save.svg b/glabels/icons/glabels-flat/24x24/actions/glabels-file-save.svg similarity index 100% rename from glabels/icons/flat/24x24/glabels-file-save.svg rename to glabels/icons/glabels-flat/24x24/actions/glabels-file-save.svg diff --git a/glabels/icons/flat/24x24/glabels-format-text-bold.svg b/glabels/icons/glabels-flat/24x24/actions/glabels-format-text-bold.svg similarity index 100% rename from glabels/icons/flat/24x24/glabels-format-text-bold.svg rename to glabels/icons/glabels-flat/24x24/actions/glabels-format-text-bold.svg diff --git a/glabels/icons/flat/24x24/glabels-format-text-italic.svg b/glabels/icons/glabels-flat/24x24/actions/glabels-format-text-italic.svg similarity index 100% rename from glabels/icons/flat/24x24/glabels-format-text-italic.svg rename to glabels/icons/glabels-flat/24x24/actions/glabels-format-text-italic.svg diff --git a/glabels/icons/flat/24x24/glabels-format-text-underline.svg b/glabels/icons/glabels-flat/24x24/actions/glabels-format-text-underline.svg similarity index 100% rename from glabels/icons/flat/24x24/glabels-format-text-underline.svg rename to glabels/icons/glabels-flat/24x24/actions/glabels-format-text-underline.svg diff --git a/glabels/icons/flat/24x24/glabels-image.svg b/glabels/icons/glabels-flat/24x24/actions/glabels-image.svg similarity index 100% rename from glabels/icons/flat/24x24/glabels-image.svg rename to glabels/icons/glabels-flat/24x24/actions/glabels-image.svg diff --git a/glabels/icons/flat/24x24/glabels-line.svg b/glabels/icons/glabels-flat/24x24/actions/glabels-line.svg similarity index 100% rename from glabels/icons/flat/24x24/glabels-line.svg rename to glabels/icons/glabels-flat/24x24/actions/glabels-line.svg diff --git a/glabels/icons/flat/24x24/glabels-object-properties.svg b/glabels/icons/glabels-flat/24x24/actions/glabels-object-properties.svg similarity index 100% rename from glabels/icons/flat/24x24/glabels-object-properties.svg rename to glabels/icons/glabels-flat/24x24/actions/glabels-object-properties.svg diff --git a/glabels/icons/flat/24x24/glabels-text.svg b/glabels/icons/glabels-flat/24x24/actions/glabels-text.svg similarity index 100% rename from glabels/icons/flat/24x24/glabels-text.svg rename to glabels/icons/glabels-flat/24x24/actions/glabels-text.svg diff --git a/glabels/icons/flat/24x24/glabels-valign-text-bottom.svg b/glabels/icons/glabels-flat/24x24/actions/glabels-valign-text-bottom.svg similarity index 100% rename from glabels/icons/flat/24x24/glabels-valign-text-bottom.svg rename to glabels/icons/glabels-flat/24x24/actions/glabels-valign-text-bottom.svg diff --git a/glabels/icons/flat/24x24/glabels-valign-text-middle.svg b/glabels/icons/glabels-flat/24x24/actions/glabels-valign-text-middle.svg similarity index 100% rename from glabels/icons/flat/24x24/glabels-valign-text-middle.svg rename to glabels/icons/glabels-flat/24x24/actions/glabels-valign-text-middle.svg diff --git a/glabels/icons/flat/24x24/glabels-valign-text-top.svg b/glabels/icons/glabels-flat/24x24/actions/glabels-valign-text-top.svg similarity index 100% rename from glabels/icons/flat/24x24/glabels-valign-text-top.svg rename to glabels/icons/glabels-flat/24x24/actions/glabels-valign-text-top.svg diff --git a/glabels/icons/flat/32x32/glabels-collated.svg b/glabels/icons/glabels-flat/32x32/actions/glabels-collated.svg similarity index 100% rename from glabels/icons/flat/32x32/glabels-collated.svg rename to glabels/icons/glabels-flat/32x32/actions/glabels-collated.svg diff --git a/glabels/icons/flat/32x32/glabels-file-new.svg b/glabels/icons/glabels-flat/32x32/actions/glabels-file-new.svg similarity index 100% rename from glabels/icons/flat/32x32/glabels-file-new.svg rename to glabels/icons/glabels-flat/32x32/actions/glabels-file-new.svg diff --git a/glabels/icons/flat/32x32/glabels-file-open.svg b/glabels/icons/glabels-flat/32x32/actions/glabels-file-open.svg similarity index 100% rename from glabels/icons/flat/32x32/glabels-file-open.svg rename to glabels/icons/glabels-flat/32x32/actions/glabels-file-open.svg diff --git a/glabels/icons/flat/32x32/glabels-file-recent.svg b/glabels/icons/glabels-flat/32x32/actions/glabels-file-recent.svg similarity index 100% rename from glabels/icons/flat/32x32/glabels-file-recent.svg rename to glabels/icons/glabels-flat/32x32/actions/glabels-file-recent.svg diff --git a/glabels/icons/flat/32x32/glabels-label-orientation-horiz.svg b/glabels/icons/glabels-flat/32x32/actions/glabels-label-orientation-horiz.svg similarity index 100% rename from glabels/icons/flat/32x32/glabels-label-orientation-horiz.svg rename to glabels/icons/glabels-flat/32x32/actions/glabels-label-orientation-horiz.svg diff --git a/glabels/icons/flat/32x32/glabels-label-orientation-vert.svg b/glabels/icons/glabels-flat/32x32/actions/glabels-label-orientation-vert.svg similarity index 100% rename from glabels/icons/flat/32x32/glabels-label-orientation-vert.svg rename to glabels/icons/glabels-flat/32x32/actions/glabels-label-orientation-vert.svg diff --git a/glabels/icons/flat/32x32/glabels-merge-group-contiguous.svg b/glabels/icons/glabels-flat/32x32/actions/glabels-merge-group-contiguous.svg similarity index 100% rename from glabels/icons/flat/32x32/glabels-merge-group-contiguous.svg rename to glabels/icons/glabels-flat/32x32/actions/glabels-merge-group-contiguous.svg diff --git a/glabels/icons/flat/32x32/glabels-merge-group-page.svg b/glabels/icons/glabels-flat/32x32/actions/glabels-merge-group-page.svg similarity index 100% rename from glabels/icons/flat/32x32/glabels-merge-group-page.svg rename to glabels/icons/glabels-flat/32x32/actions/glabels-merge-group-page.svg diff --git a/glabels/icons/flat/32x32/glabels-print.svg b/glabels/icons/glabels-flat/32x32/actions/glabels-print.svg similarity index 100% rename from glabels/icons/flat/32x32/glabels-print.svg rename to glabels/icons/glabels-flat/32x32/actions/glabels-print.svg diff --git a/glabels/icons/flat/32x32/glabels-select-product.svg b/glabels/icons/glabels-flat/32x32/actions/glabels-select-product.svg similarity index 100% rename from glabels/icons/flat/32x32/glabels-select-product.svg rename to glabels/icons/glabels-flat/32x32/actions/glabels-select-product.svg diff --git a/glabels/icons/flat/32x32/glabels-uncollated.svg b/glabels/icons/glabels-flat/32x32/actions/glabels-uncollated.svg similarity index 100% rename from glabels/icons/flat/32x32/glabels-uncollated.svg rename to glabels/icons/glabels-flat/32x32/actions/glabels-uncollated.svg diff --git a/glabels/icons/apps/32x32/glabels.svg b/glabels/icons/glabels-flat/32x32/apps/glabels.svg similarity index 100% rename from glabels/icons/apps/32x32/glabels.svg rename to glabels/icons/glabels-flat/32x32/apps/glabels.svg diff --git a/glabels/icons/flat/48x48/glabels-edit.svg b/glabels/icons/glabels-flat/48x48/actions/glabels-edit.svg similarity index 100% rename from glabels/icons/flat/48x48/glabels-edit.svg rename to glabels/icons/glabels-flat/48x48/actions/glabels-edit.svg diff --git a/glabels/icons/flat/48x48/glabels-merge.svg b/glabels/icons/glabels-flat/48x48/actions/glabels-merge.svg similarity index 100% rename from glabels/icons/flat/48x48/glabels-merge.svg rename to glabels/icons/glabels-flat/48x48/actions/glabels-merge.svg diff --git a/glabels/icons/flat/48x48/glabels-print.svg b/glabels/icons/glabels-flat/48x48/actions/glabels-print.svg similarity index 100% rename from glabels/icons/flat/48x48/glabels-print.svg rename to glabels/icons/glabels-flat/48x48/actions/glabels-print.svg diff --git a/glabels/icons/flat/48x48/glabels-properties.svg b/glabels/icons/glabels-flat/48x48/actions/glabels-properties.svg similarity index 100% rename from glabels/icons/flat/48x48/glabels-properties.svg rename to glabels/icons/glabels-flat/48x48/actions/glabels-properties.svg diff --git a/glabels/icons/flat/48x48/glabels-variables.svg b/glabels/icons/glabels-flat/48x48/actions/glabels-variables.svg similarity index 100% rename from glabels/icons/flat/48x48/glabels-variables.svg rename to glabels/icons/glabels-flat/48x48/actions/glabels-variables.svg diff --git a/glabels/icons/apps/48x48/glabels.svg b/glabels/icons/glabels-flat/48x48/apps/glabels.svg similarity index 100% rename from glabels/icons/apps/48x48/glabels.svg rename to glabels/icons/glabels-flat/48x48/apps/glabels.svg diff --git a/glabels/icons/glabels-flat/index.theme b/glabels/icons/glabels-flat/index.theme new file mode 100644 index 0000000..b7a0d47 --- /dev/null +++ b/glabels/icons/glabels-flat/index.theme @@ -0,0 +1,64 @@ +[Icon Theme] +Name=glabels-flat +Comment=gLabels flat icon theme (light) +Directories=16x16/actions,16x16/apps,22x22/actions,22x22/apps,24x24/actions,24x24/apps,32x32/actions,32x32/apps,48x48/actions,48x48/apps,128x128/apps,scalable/apps + + +[16x16/actions] +Size=16 +Type=Fixed +Context=Actions + +[16x16/apps] +Size=16 +Type=Fixed +Context=Applications + +[22x22/actions] +Size=22 +Type=Fixed +Context=Actions + +[22x22/apps] +Size=22 +Type=Fixed +Context=Applications + +[24x24/actions] +Size=24 +Type=Fixed +Context=Actions + +[24x24/apps] +Size=24 +Type=Fixed +Context=Applications + +[32x32/actions] +Size=32 +Type=Fixed +Context=Actions + +[32x32/apps] +Size=32 +Type=Fixed +Context=Applications + +[48x48/actions] +Size=48 +Type=Fixed +Context=Actions + +[48x48/apps] +Size=48 +Type=Fixed +Context=Applications + +[128x128/apps] +Size=128 +Type=Fixed +Context=Actions + +[scalable/apps] +Type=Scalable +Context=Applications diff --git a/glabels/icons/apps/scalable/glabels.svg b/glabels/icons/glabels-flat/scalable/apps/glabels.svg similarity index 100% rename from glabels/icons/apps/scalable/glabels.svg rename to glabels/icons/glabels-flat/scalable/apps/glabels.svg diff --git a/glabels/main.cpp b/glabels/main.cpp index a8d1786..5b98a00 100644 --- a/glabels/main.cpp +++ b/glabels/main.cpp @@ -32,6 +32,7 @@ #include #include +#include #include #include #include @@ -47,6 +48,8 @@ int main( int argc, char **argv ) QCoreApplication::setApplicationName( "glabels-qt" ); QCoreApplication::setApplicationVersion( glabels::model::Version::LONG_STRING ); + QIcon::setThemeName( "glabels-flat" ); + // // Setup translators // diff --git a/glabels/ui/ObjectEditor.ui b/glabels/ui/ObjectEditor.ui index 29ca098..d2081b7 100644 --- a/glabels/ui/ObjectEditor.ui +++ b/glabels/ui/ObjectEditor.ui @@ -7,7 +7,7 @@ 0 0 400 - 648 + 675 @@ -46,7 +46,7 @@ - :/icons/flat/24x24/glabels-object-properties.png + :/icons/glabels-flat/24x24/actions/glabels-object-properties.png @@ -106,8 +106,7 @@ - - :/icons/flat/22x22/glabels-align-text-left.svg:/icons/flat/22x22/glabels-align-text-left.svg + @@ -132,8 +131,7 @@ - - :/icons/flat/22x22/glabels-align-text-center.svg:/icons/flat/22x22/glabels-align-text-center.svg + @@ -155,8 +153,7 @@ - - :/icons/flat/22x22/glabels-align-text-right.svg:/icons/flat/22x22/glabels-align-text-right.svg + @@ -185,8 +182,7 @@ - - :/icons/flat/22x22/glabels-valign-text-top.svg:/icons/flat/22x22/glabels-valign-text-top.svg + @@ -211,8 +207,7 @@ - - :/icons/flat/22x22/glabels-valign-text-middle.svg:/icons/flat/22x22/glabels-valign-text-middle.svg + @@ -234,8 +229,7 @@ - - :/icons/flat/22x22/glabels-valign-text-bottom.svg:/icons/flat/22x22/glabels-valign-text-bottom.svg + @@ -388,8 +382,7 @@ - - :/icons/flat/22x22/glabels-format-text-bold.svg:/icons/flat/22x22/glabels-format-text-bold.svg + @@ -411,8 +404,7 @@ - - :/icons/flat/22x22/glabels-format-text-italic.svg:/icons/flat/22x22/glabels-format-text-italic.svg + @@ -431,8 +423,7 @@ - - :/icons/flat/22x22/glabels-format-text-underline.svg:/icons/flat/22x22/glabels-format-text-underline.svg + @@ -1202,7 +1193,16 @@ 15 - + + 0 + + + 0 + + + 0 + + 0 diff --git a/glabels/ui/PrintView.ui b/glabels/ui/PrintView.ui index f061177..cdeef1a 100644 --- a/glabels/ui/PrintView.ui +++ b/glabels/ui/PrintView.ui @@ -263,8 +263,7 @@ Uncollated (e.g. 1,1,1 2,2,2 3,3,3) - - :/icons/flat/32x32/glabels-uncollated.svg:/icons/flat/32x32/glabels-uncollated.svg + @@ -272,8 +271,7 @@ Collated (e.g. 1,2,3 1,2,3 1,2,3) - - :/icons/flat/32x32/glabels-collated.svg:/icons/flat/32x32/glabels-collated.svg + @@ -294,8 +292,7 @@ Merge groups are contiguous - - :/icons/flat/32x32/glabels-merge-group-contiguous.svg:/icons/flat/32x32/glabels-merge-group-contiguous.svg + @@ -303,8 +300,7 @@ Merge groups start on a new page - - :/icons/flat/32x32/glabels-merge-group-page.svg:/icons/flat/32x32/glabels-merge-group-page.svg + @@ -452,8 +448,7 @@ Print... - - :/icons/flat/32x32/glabels-print.svg:/icons/flat/32x32/glabels-print.svg + diff --git a/glabels/ui/PropertiesView.ui b/glabels/ui/PropertiesView.ui index 6481733..dad9cb0 100644 --- a/glabels/ui/PropertiesView.ui +++ b/glabels/ui/PropertiesView.ui @@ -257,8 +257,7 @@ Change product - - :/icons/flat/32x32/glabels-select-product.svg:/icons/flat/32x32/glabels-select-product.svg + @@ -352,8 +351,7 @@ Horizontal orientation - - :/icons/flat/32x32/glabels-label-orientation-horiz.svg:/icons/flat/32x32/glabels-label-orientation-horiz.svg + @@ -361,8 +359,7 @@ Vertical orientation - - :/icons/flat/32x32/glabels-label-orientation-vert.svg:/icons/flat/32x32/glabels-label-orientation-vert.svg + diff --git a/glabels/ui/ReportBugDialog.ui b/glabels/ui/ReportBugDialog.ui index e06816d..56d7930 100644 --- a/glabels/ui/ReportBugDialog.ui +++ b/glabels/ui/ReportBugDialog.ui @@ -151,8 +151,7 @@ Copy - - :/icons/flat/24x24/glabels-edit-copy.svg:/icons/flat/24x24/glabels-edit-copy.svg + diff --git a/glabels/ui/SelectProductDialog.ui b/glabels/ui/SelectProductDialog.ui index 798cb5b..4bab450 100644 --- a/glabels/ui/SelectProductDialog.ui +++ b/glabels/ui/SelectProductDialog.ui @@ -478,8 +478,7 @@ - - :/icons/flat/22x22/glabels-view-grid.svg:/icons/flat/22x22/glabels-view-grid.svg + diff --git a/glabels/ui/StartupView.ui b/glabels/ui/StartupView.ui index f339483..b7359a4 100644 --- a/glabels/ui/StartupView.ui +++ b/glabels/ui/StartupView.ui @@ -139,8 +139,7 @@ New... - - :/icons/flat/32x32/glabels-file-new.svg:/icons/flat/32x32/glabels-file-new.svg + @@ -171,8 +170,7 @@ Browse... - - :/icons/flat/32x32/glabels-file-open.svg:/icons/flat/32x32/glabels-file-open.svg + @@ -197,8 +195,7 @@ Recent - - :/icons/flat/32x32/glabels-file-recent.svg:/icons/flat/32x32/glabels-file-recent.svg + diff --git a/glabels/ui/TemplateDesignerOneLayoutPage.ui b/glabels/ui/TemplateDesignerOneLayoutPage.ui index 315266d..a1eb19e 100644 --- a/glabels/ui/TemplateDesignerOneLayoutPage.ui +++ b/glabels/ui/TemplateDesignerOneLayoutPage.ui @@ -161,8 +161,7 @@ Print test sheet - - :/icons/flat/32x32/glabels-print.svg:/icons/flat/32x32/glabels-print.svg + diff --git a/glabels/ui/TemplateDesignerTwoLayoutPage.ui b/glabels/ui/TemplateDesignerTwoLayoutPage.ui index e3cc62a..5371c9d 100644 --- a/glabels/ui/TemplateDesignerTwoLayoutPage.ui +++ b/glabels/ui/TemplateDesignerTwoLayoutPage.ui @@ -199,8 +199,7 @@ Print test sheet - - :/icons/flat/32x32/glabels-print.svg:/icons/flat/32x32/glabels-print.svg + diff --git a/glabels/windows-icon/build-windows-icon.sh b/glabels/windows-icon/build-windows-icon.sh index 6c0952e..b3429af 100755 --- a/glabels/windows-icon/build-windows-icon.sh +++ b/glabels/windows-icon/build-windows-icon.sh @@ -1,9 +1,9 @@ #! /bin/sh -inkscape -f ../icons/16x16/apps/glabels.svg -w 16 -h 16 -e /tmp/glabels-016x016x32.png -inkscape -f ../icons/32x32/apps/glabels.svg -w 32 -h 32 -e /tmp/glabels-032x032x32.png -inkscape -f ../icons/48x48/apps/glabels.svg -w 48 -h 48 -e /tmp/glabels-048x048x32.png -inkscape -f ../icons/scalable/apps/glabels.svg -w 256 -h 256 -e /tmp/glabels-256x256x32.png +inkscape -f ../icons/glabels-flat/16x16/apps/glabels.svg -w 16 -h 16 -e /tmp/glabels-016x016x32.png +inkscape -f ../icons/glabels-flat/32x32/apps/glabels.svg -w 32 -h 32 -e /tmp/glabels-032x032x32.png +inkscape -f ../icons/glabels-flat/48x48/apps/glabels.svg -w 48 -h 48 -e /tmp/glabels-048x048x32.png +inkscape -f ../icons/glabels-flat/scalable/apps/glabels.svg -w 256 -h 256 -e /tmp/glabels-256x256x32.png convert /tmp/glabels-016x016x32.png -colors 256 -depth 8 /tmp/glabels-016x016x08.png convert /tmp/glabels-032x032x32.png -colors 256 -depth 8 /tmp/glabels-032x032x08.png