diff --git a/glabels/CMakeLists.txt b/glabels/CMakeLists.txt index 65c54b5..8243a48 100644 --- a/glabels/CMakeLists.txt +++ b/glabels/CMakeLists.txt @@ -136,16 +136,16 @@ target_link_libraries (glabels-qt #======================================= install (TARGETS glabels-qt RUNTIME DESTINATION bin) -install (FILES icons/scalable/apps/glabels.svg DESTINATION share/icons/hicolor/scalable/apps) -install (FILES icons/16x16/apps/glabels.svg DESTINATION share/icons/hicolor/16x16/apps) -install (FILES icons/22x22/apps/glabels.svg DESTINATION share/icons/hicolor/22x22/apps) -install (FILES icons/32x32/apps/glabels.svg DESTINATION share/icons/hicolor/32x32/apps) -install (FILES icons/48x48/apps/glabels.svg DESTINATION share/icons/hicolor/48x48/apps) +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/scalable/mimetypes/x-glabels-project.svg DESTINATION share/icons/hicolor/scalable/mimetypes) -install (FILES icons/16x16/mimetypes/x-glabels-project.svg DESTINATION share/icons/hicolor/16x16/mimetypes) -install (FILES icons/22x22/mimetypes/x-glabels-project.svg DESTINATION share/icons/hicolor/22x22/mimetypes) -install (FILES icons/24x24/mimetypes/x-glabels-project.svg DESTINATION share/icons/hicolor/24x24/mimetypes) +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) +install (FILES icons/mimetypes/22x22/x-glabels-project.svg DESTINATION share/icons/hicolor/22x22/mimetypes) +install (FILES icons/mimetypes/24x24/x-glabels-project.svg DESTINATION share/icons/hicolor/24x24/mimetypes) # # Windows Runtime diff --git a/glabels/Icons.h b/glabels/Icons.h index 7d5acf1..5f02ed2 100644 --- a/glabels/Icons.h +++ b/glabels/Icons.h @@ -39,9 +39,9 @@ namespace glabels public: Arrow() { - addPixmap( QPixmap( ":icons/16x16/actions/glabels-arrow.svg" ) ); - addPixmap( QPixmap( ":icons/22x22/actions/glabels-arrow.svg" ) ); - addPixmap( QPixmap( ":icons/24x24/actions/glabels-arrow.svg" ) ); + addPixmap( QPixmap( ":icons/flat/16x16/glabels-arrow.svg" ) ); + addPixmap( QPixmap( ":icons/flat/22x22/glabels-arrow.svg" ) ); + addPixmap( QPixmap( ":icons/flat/24x24/glabels-arrow.svg" ) ); } }; @@ -51,9 +51,9 @@ namespace glabels public: Barcode() { - addPixmap( QPixmap( ":icons/16x16/actions/glabels-barcode.svg" ) ); - addPixmap( QPixmap( ":icons/22x22/actions/glabels-barcode.svg" ) ); - addPixmap( QPixmap( ":icons/24x24/actions/glabels-barcode.svg" ) ); + addPixmap( QPixmap( ":icons/flat/16x16/glabels-barcode.svg" ) ); + addPixmap( QPixmap( ":icons/flat/22x22/glabels-barcode.svg" ) ); + addPixmap( QPixmap( ":icons/flat/24x24/glabels-barcode.svg" ) ); } }; @@ -63,9 +63,9 @@ namespace glabels public: Box() { - addPixmap( QPixmap( ":icons/16x16/actions/glabels-box.svg" ) ); - addPixmap( QPixmap( ":icons/22x22/actions/glabels-box.svg" ) ); - addPixmap( QPixmap( ":icons/24x24/actions/glabels-box.svg" ) ); + addPixmap( QPixmap( ":icons/flat/16x16/glabels-box.svg" ) ); + addPixmap( QPixmap( ":icons/flat/22x22/glabels-box.svg" ) ); + addPixmap( QPixmap( ":icons/flat/24x24/glabels-box.svg" ) ); } }; @@ -75,9 +75,9 @@ namespace glabels public: Ellipse() { - addPixmap( QPixmap( ":icons/16x16/actions/glabels-ellipse.svg" ) ); - addPixmap( QPixmap( ":icons/22x22/actions/glabels-ellipse.svg" ) ); - addPixmap( QPixmap( ":icons/24x24/actions/glabels-ellipse.svg" ) ); + addPixmap( QPixmap( ":icons/flat/16x16/glabels-ellipse.svg" ) ); + addPixmap( QPixmap( ":icons/flat/22x22/glabels-ellipse.svg" ) ); + addPixmap( QPixmap( ":icons/flat/24x24/glabels-ellipse.svg" ) ); } }; @@ -87,9 +87,9 @@ namespace glabels public: Image() { - addPixmap( QPixmap( ":icons/16x16/actions/glabels-image.svg" ) ); - addPixmap( QPixmap( ":icons/22x22/actions/glabels-image.svg" ) ); - addPixmap( QPixmap( ":icons/24x24/actions/glabels-image.svg" ) ); + addPixmap( QPixmap( ":icons/flat/16x16/glabels-image.svg" ) ); + addPixmap( QPixmap( ":icons/flat/22x22/glabels-image.svg" ) ); + addPixmap( QPixmap( ":icons/flat/24x24/glabels-image.svg" ) ); } }; @@ -99,9 +99,9 @@ namespace glabels public: Line() { - addPixmap( QPixmap( ":icons/16x16/actions/glabels-line.svg" ) ); - addPixmap( QPixmap( ":icons/22x22/actions/glabels-line.svg" ) ); - addPixmap( QPixmap( ":icons/24x24/actions/glabels-line.svg" ) ); + addPixmap( QPixmap( ":icons/flat/16x16/glabels-line.svg" ) ); + addPixmap( QPixmap( ":icons/flat/22x22/glabels-line.svg" ) ); + addPixmap( QPixmap( ":icons/flat/24x24/glabels-line.svg" ) ); } }; @@ -111,9 +111,9 @@ namespace glabels public: Text() { - addPixmap( QPixmap( ":icons/16x16/actions/glabels-text.svg" ) ); - addPixmap( QPixmap( ":icons/22x22/actions/glabels-text.svg" ) ); - addPixmap( QPixmap( ":icons/24x24/actions/glabels-text.svg" ) ); + addPixmap( QPixmap( ":icons/flat/16x16/glabels-text.svg" ) ); + addPixmap( QPixmap( ":icons/flat/22x22/glabels-text.svg" ) ); + addPixmap( QPixmap( ":icons/flat/24x24/glabels-text.svg" ) ); } }; @@ -123,7 +123,7 @@ namespace glabels public: ObjectProperties() { - addPixmap( QPixmap( ":icons/24x24/actions/glabels-object-properties.svg" ) ); + addPixmap( QPixmap( ":icons/flat/24x24/glabels-object-properties.svg" ) ); } }; @@ -133,7 +133,7 @@ namespace glabels public: AlignLeft() { - addPixmap( QPixmap( ":icons/16x16/actions/glabels-align-left.svg" ) ); + addPixmap( QPixmap( ":icons/flat/16x16/glabels-align-left.svg" ) ); } }; @@ -143,7 +143,7 @@ namespace glabels public: AlignHCenter() { - addPixmap( QPixmap( ":icons/16x16/actions/glabels-align-hcenter.svg" ) ); + addPixmap( QPixmap( ":icons/flat/16x16/glabels-align-hcenter.svg" ) ); } }; @@ -153,7 +153,7 @@ namespace glabels public: AlignRight() { - addPixmap( QPixmap( ":icons/16x16/actions/glabels-align-right.svg" ) ); + addPixmap( QPixmap( ":icons/flat/16x16/glabels-align-right.svg" ) ); } }; @@ -163,7 +163,7 @@ namespace glabels public: AlignBottom() { - addPixmap( QPixmap( ":icons/16x16/actions/glabels-align-bottom.svg" ) ); + addPixmap( QPixmap( ":icons/flat/16x16/glabels-align-bottom.svg" ) ); } }; @@ -173,7 +173,7 @@ namespace glabels public: AlignVCenter() { - addPixmap( QPixmap( ":icons/16x16/actions/glabels-align-vcenter.svg" ) ); + addPixmap( QPixmap( ":icons/flat/16x16/glabels-align-vcenter.svg" ) ); } }; @@ -183,7 +183,7 @@ namespace glabels public: AlignTop() { - addPixmap( QPixmap( ":icons/16x16/actions/glabels-align-top.svg" ) ); + addPixmap( QPixmap( ":icons/flat/16x16/glabels-align-top.svg" ) ); } }; @@ -193,7 +193,7 @@ namespace glabels public: CenterHoriz() { - addPixmap( QPixmap( ":icons/16x16/actions/glabels-center-horiz.svg" ) ); + addPixmap( QPixmap( ":icons/flat/16x16/glabels-center-horiz.svg" ) ); } }; @@ -203,7 +203,7 @@ namespace glabels public: CenterVert() { - addPixmap( QPixmap( ":icons/16x16/actions/glabels-center-vert.svg" ) ); + addPixmap( QPixmap( ":icons/flat/16x16/glabels-center-vert.svg" ) ); } }; @@ -213,7 +213,7 @@ namespace glabels public: FlipHoriz() { - addPixmap( QPixmap( ":icons/16x16/actions/glabels-flip-horiz.svg" ) ); + addPixmap( QPixmap( ":icons/flat/16x16/glabels-flip-horiz.svg" ) ); } }; @@ -223,7 +223,7 @@ namespace glabels public: FlipVert() { - addPixmap( QPixmap( ":icons/16x16/actions/glabels-flip-vert.svg" ) ); + addPixmap( QPixmap( ":icons/flat/16x16/glabels-flip-vert.svg" ) ); } }; @@ -233,7 +233,7 @@ namespace glabels public: RotateLeft() { - addPixmap( QPixmap( ":icons/16x16/actions/glabels-rotate-left.svg" ) ); + addPixmap( QPixmap( ":icons/flat/16x16/glabels-rotate-left.svg" ) ); } }; @@ -243,7 +243,7 @@ namespace glabels public: RotateRight() { - addPixmap( QPixmap( ":icons/16x16/actions/glabels-rotate-right.svg" ) ); + addPixmap( QPixmap( ":icons/flat/16x16/glabels-rotate-right.svg" ) ); } }; @@ -253,7 +253,7 @@ namespace glabels public: OrderBottom() { - addPixmap( QPixmap( ":icons/16x16/actions/glabels-order-bottom.svg" ) ); + addPixmap( QPixmap( ":icons/flat/16x16/glabels-order-bottom.svg" ) ); } }; @@ -263,7 +263,7 @@ namespace glabels public: OrderTop() { - addPixmap( QPixmap( ":icons/16x16/actions/glabels-order-top.svg" ) ); + addPixmap( QPixmap( ":icons/flat/16x16/glabels-order-top.svg" ) ); } }; @@ -273,8 +273,8 @@ namespace glabels public: AlignTextLeft() { - addPixmap( QPixmap( ":icons/22x22/actions/glabels-align-text-left.svg" ) ); - addPixmap( QPixmap( ":icons/24x24/actions/glabels-align-text-left.svg" ) ); + addPixmap( QPixmap( ":icons/flat/22x22/glabels-align-text-left.svg" ) ); + addPixmap( QPixmap( ":icons/flat/24x24/glabels-align-text-left.svg" ) ); } }; @@ -284,8 +284,8 @@ namespace glabels public: AlignTextCenter() { - addPixmap( QPixmap( ":icons/22x22/actions/glabels-align-text-center.svg" ) ); - addPixmap( QPixmap( ":icons/24x24/actions/glabels-align-text-center.svg" ) ); + addPixmap( QPixmap( ":icons/flat/22x22/glabels-align-text-center.svg" ) ); + addPixmap( QPixmap( ":icons/flat/24x24/glabels-align-text-center.svg" ) ); } }; @@ -295,8 +295,8 @@ namespace glabels public: AlignTextRight() { - addPixmap( QPixmap( ":icons/22x22/actions/glabels-align-text-right.svg" ) ); - addPixmap( QPixmap( ":icons/24x24/actions/glabels-align-text-right.svg" ) ); + addPixmap( QPixmap( ":icons/flat/22x22/glabels-align-text-right.svg" ) ); + addPixmap( QPixmap( ":icons/flat/24x24/glabels-align-text-right.svg" ) ); } }; @@ -306,8 +306,8 @@ namespace glabels public: AlignTextBottom() { - addPixmap( QPixmap( ":icons/22x22/actions/glabels-valign-text-bottom.svg" ) ); - addPixmap( QPixmap( ":icons/24x24/actions/glabels-valign-text-bottom.svg" ) ); + addPixmap( QPixmap( ":icons/flat/22x22/glabels-valign-text-bottom.svg" ) ); + addPixmap( QPixmap( ":icons/flat/24x24/glabels-valign-text-bottom.svg" ) ); } }; @@ -317,8 +317,8 @@ namespace glabels public: AlignTextMiddle() { - addPixmap( QPixmap( ":icons/22x22/actions/glabels-valign-text-middle.svg" ) ); - addPixmap( QPixmap( ":icons/24x24/actions/glabels-valign-text-middle.svg" ) ); + addPixmap( QPixmap( ":icons/flat/22x22/glabels-valign-text-middle.svg" ) ); + addPixmap( QPixmap( ":icons/flat/24x24/glabels-valign-text-middle.svg" ) ); } }; @@ -328,8 +328,8 @@ namespace glabels public: AlignTextTop() { - addPixmap( QPixmap( ":icons/22x22/actions/glabels-valign-text-top.svg" ) ); - addPixmap( QPixmap( ":icons/24x24/actions/glabels-valign-text-top.svg" ) ); + addPixmap( QPixmap( ":icons/flat/22x22/glabels-valign-text-top.svg" ) ); + addPixmap( QPixmap( ":icons/flat/24x24/glabels-valign-text-top.svg" ) ); } }; @@ -339,11 +339,21 @@ namespace glabels public: Glabels() { - addFile( ":icons/16x16/apps/glabels.svg" ); - addFile( ":icons/22x22/apps/glabels.svg" ); - addFile( ":icons/32x32/apps/glabels.svg" ); - addFile( ":icons/48x48/apps/glabels.svg" ); - addFile( ":icons/scalable/apps/glabels.svg" ); + 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" ) ); } }; @@ -353,9 +363,9 @@ namespace glabels public: EditCopy() { - addPixmap( QPixmap( ":icons/16x16/actions/edit-copy.svg" ) ); - addPixmap( QPixmap( ":icons/22x22/actions/edit-copy.svg" ) ); - addPixmap( QPixmap( ":icons/24x24/actions/edit-copy.svg" ) ); + 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" ) ); } }; @@ -365,9 +375,9 @@ namespace glabels public: EditCut() { - addPixmap( QPixmap( ":icons/16x16/actions/edit-cut.svg" ) ); - addPixmap( QPixmap( ":icons/22x22/actions/edit-cut.svg" ) ); - addPixmap( QPixmap( ":icons/24x24/actions/edit-cut.svg" ) ); + 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" ) ); } }; @@ -377,9 +387,9 @@ namespace glabels public: EditPaste() { - addPixmap( QPixmap( ":icons/16x16/actions/edit-paste.svg" ) ); - addPixmap( QPixmap( ":icons/22x22/actions/edit-paste.svg" ) ); - addPixmap( QPixmap( ":icons/24x24/actions/edit-paste.svg" ) ); + 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" ) ); } }; @@ -389,9 +399,9 @@ namespace glabels public: FileNew() { - addPixmap( QPixmap( ":icons/16x16/actions/file-new.svg" ) ); - addPixmap( QPixmap( ":icons/22x22/actions/file-new.svg" ) ); - addPixmap( QPixmap( ":icons/24x24/actions/file-new.svg" ) ); + 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" ) ); } }; @@ -401,9 +411,9 @@ namespace glabels public: FileOpen() { - addPixmap( QPixmap( ":icons/16x16/actions/file-open.svg" ) ); - addPixmap( QPixmap( ":icons/22x22/actions/file-open.svg" ) ); - addPixmap( QPixmap( ":icons/24x24/actions/file-open.svg" ) ); + 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" ) ); } }; @@ -413,7 +423,8 @@ namespace glabels public: FilePrint() { - addPixmap( QPixmap( ":icons/32x32/actions/print.svg" ) ); + addPixmap( QPixmap( ":icons/flat/32x32/glabels-print.svg" ) ); + addPixmap( QPixmap( ":icons/flat/48x48/glabels-print.svg" ) ); } }; @@ -423,9 +434,9 @@ namespace glabels public: FileSave() { - addPixmap( QPixmap( ":icons/16x16/actions/file-save.svg" ) ); - addPixmap( QPixmap( ":icons/22x22/actions/file-save.svg" ) ); - addPixmap( QPixmap( ":icons/24x24/actions/file-save.svg" ) ); + 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" ) ); } }; @@ -435,9 +446,29 @@ namespace glabels public: FileSaveAs() { - addPixmap( QPixmap( ":icons/16x16/actions/file-save-as.svg" ) ); - addPixmap( QPixmap( ":icons/22x22/actions/file-save-as.svg" ) ); - addPixmap( QPixmap( ":icons/24x24/actions/file-save-as.svg" ) ); + 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" ) ); } }; @@ -447,8 +478,8 @@ namespace glabels public: ZoomBestFit() { - addPixmap( QPixmap( ":icons/16x16/actions/glabels-zoom-to-fit.svg" ) ); - addPixmap( QPixmap( ":icons/22x22/actions/glabels-zoom-to-fit.svg" ) ); + addPixmap( QPixmap( ":icons/flat/16x16/glabels-zoom-to-fit.svg" ) ); + addPixmap( QPixmap( ":icons/flat/22x22/glabels-zoom-to-fit.svg" ) ); } }; @@ -458,8 +489,8 @@ namespace glabels public: ZoomIn() { - addPixmap( QPixmap( ":icons/16x16/actions/glabels-zoom-in.svg" ) ); - addPixmap( QPixmap( ":icons/22x22/actions/glabels-zoom-in.svg" ) ); + addPixmap( QPixmap( ":icons/flat/16x16/glabels-zoom-in.svg" ) ); + addPixmap( QPixmap( ":icons/flat/22x22/glabels-zoom-in.svg" ) ); } }; @@ -469,8 +500,8 @@ namespace glabels public: ZoomOriginal() { - addPixmap( QPixmap( ":icons/16x16/actions/glabels-zoom-one-to-one.svg" ) ); - addPixmap( QPixmap( ":icons/22x22/actions/glabels-zoom-one-to-one.svg" ) ); + addPixmap( QPixmap( ":icons/flat/16x16/glabels-zoom-one-to-one.svg" ) ); + addPixmap( QPixmap( ":icons/flat/22x22/glabels-zoom-one-to-one.svg" ) ); } }; @@ -480,8 +511,8 @@ namespace glabels public: ZoomOut() { - addPixmap( QPixmap( ":icons/16x16/actions/glabels-zoom-out.svg" ) ); - addPixmap( QPixmap( ":icons/22x22/actions/glabels-zoom-out.svg" ) ); + addPixmap( QPixmap( ":icons/flat/16x16/glabels-zoom-out.svg" ) ); + addPixmap( QPixmap( ":icons/flat/22x22/glabels-zoom-out.svg" ) ); } }; diff --git a/glabels/MainWindow.cpp b/glabels/MainWindow.cpp index beb402f..cef404e 100644 --- a/glabels/MainWindow.cpp +++ b/glabels/MainWindow.cpp @@ -43,14 +43,26 @@ #include +namespace +{ + enum PageIndex + { + WELCOME_PAGE_INDEX = 0, + EDITOR_PAGE_INDEX = 1, + PROPERTIES_PAGE_INDEX = 2, + MERGE_PAGE_INDEX = 3, + PRINT_PAGE_INDEX = 4, + }; +} + + namespace glabels { /// /// Constructor /// - MainWindow::MainWindow() - : mModel(nullptr) + MainWindow::MainWindow() : mModel(nullptr) { setWindowIcon( Icons::Glabels() ); @@ -67,57 +79,83 @@ namespace glabels QWidget* printPage = createPrintPage(); // Table of contents widget - mContents = new QListWidget(); - mContents->setViewMode(QListView::ListMode); - mContents->setMovement(QListView::Static); - mContents->setSpacing(6); - + mContents = new QToolBar(); + mContents->setOrientation( Qt::Vertical ); + mContents->setIconSize( QSize(48,48) ); + mContents->setSizePolicy( QSizePolicy::MinimumExpanding, + QSizePolicy::Preferred ); + mContents->setStyleSheet( "* { background: #CCCCCC }" ); + + // Table of contents button group + auto group = new QButtonGroup( this ); + group->setExclusive( true ); + // Pages widget mPages = new QStackedWidget(); // Add "Welcome" page mPages->addWidget( welcomePage ); - mWelcomeButton = new QListWidgetItem(mContents); - mWelcomeButton->setText(tr("Welcome")); - mWelcomeButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); - + mWelcomeButton = new QToolButton( this ); + mWelcomeButton->setIcon( Icons::Glabels() ); + mWelcomeButton->setText( tr("Welcome") ); + mWelcomeButton->setToolButtonStyle( Qt::ToolButtonTextUnderIcon ); + mWelcomeButton->setCheckable( true ); + mWelcomeButton->setSizePolicy( QSizePolicy::MinimumExpanding, + QSizePolicy::Preferred ); + mWelcomeAction = mContents->addWidget( mWelcomeButton ); + group->addButton( mWelcomeButton ); + // Add "Editor" page mPages->addWidget( editorPage ); - mEditorButton = new QListWidgetItem(mContents); - mEditorButton->setText(tr("Edit")); - mEditorButton->setToolTip( tr("Select Edit mode") ); - mEditorButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); + mEditorButton = new QToolButton( this ); + mEditorButton->setIcon( Icons::Edit() ); + mEditorButton->setText( tr("Edit") ); + mEditorButton->setToolButtonStyle( Qt::ToolButtonTextUnderIcon ); + mEditorButton->setCheckable( true ); + mEditorButton->setSizePolicy( QSizePolicy::MinimumExpanding, + QSizePolicy::Preferred ); + mEditorAction = mContents->addWidget( mEditorButton ); + group->addButton( mEditorButton ); // Add "Properties" page mPages->addWidget( propertiesPage ); - mPropertiesButton = new QListWidgetItem(mContents); - mPropertiesButton->setText(tr("Properties")); - mPropertiesButton->setToolTip( tr("Select Properties mode") ); - mPropertiesButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); + mPropertiesButton = new QToolButton( this ); + mPropertiesButton->setIcon( Icons::Properties() ); + mPropertiesButton->setText( tr("Properties") ); + mPropertiesButton->setToolButtonStyle( Qt::ToolButtonTextUnderIcon ); + mPropertiesButton->setCheckable( true ); + mPropertiesButton->setSizePolicy( QSizePolicy::MinimumExpanding, + QSizePolicy::Preferred ); + mPropertiesAction = mContents->addWidget( mPropertiesButton ); + group->addButton( mPropertiesButton ); // Add "Merge" page mPages->addWidget( mergePage ); - mMergeButton = new QListWidgetItem(mContents); - mMergeButton->setText(tr("Merge")); - mMergeButton->setToolTip( tr("Select Merge mode") ); - mMergeButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); + mMergeButton = new QToolButton( this ); + mMergeButton->setIcon( Icons::Merge() ); + mMergeButton->setText( tr("Merge") ); + mMergeButton->setToolButtonStyle( Qt::ToolButtonTextUnderIcon ); + mMergeButton->setCheckable( true ); + mMergeButton->setSizePolicy( QSizePolicy::MinimumExpanding, + QSizePolicy::Preferred ); + mMergeAction = mContents->addWidget( mMergeButton ); + group->addButton( mMergeButton ); // Add "Print" page mPages->addWidget( printPage ); - mPrintButton = new QListWidgetItem(mContents); - mPrintButton->setText(tr("Print")); - mPrintButton->setToolTip( tr("Select Print mode") ); - mPrintButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); - - // Adjust width of list view based on its contents - mContents->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); - mContents->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); - mContents->setMinimumWidth( mContents->sizeHintForColumn(0) + 24 ); - mContents->setMaximumWidth( mContents->sizeHintForColumn(0) + 24 ); + mPrintButton = new QToolButton( this ); + mPrintButton->setIcon( Icons::FilePrint() ); + mPrintButton->setText( tr("Print") ); + mPrintButton->setToolButtonStyle( Qt::ToolButtonTextUnderIcon ); + mPrintButton->setCheckable( true ); + mPrintButton->setSizePolicy( QSizePolicy::MinimumExpanding, + QSizePolicy::Preferred ); + mPrintAction = mContents->addWidget( mPrintButton ); + group->addButton( mPrintButton ); // Set initial page selection - mWelcomeButton->setSelected( true ); - mPages->setCurrentIndex(mContents->row(mWelcomeButton)); + mWelcomeButton->setChecked( true ); + mPages->setCurrentIndex( WELCOME_PAGE_INDEX ); // Create central widget QWidget *centralWidget = new QWidget(); @@ -125,17 +163,22 @@ namespace glabels hLayout->setContentsMargins( 0, 0, 0, 0 ); hLayout->addWidget( mContents ); hLayout->addWidget( mPages ); + hLayout->setStretch( 0, 0 ); + hLayout->setStretch( 1, 1 ); centralWidget->setLayout( hLayout ); setCentralWidget( centralWidget ); setDocVerbsEnabled( false ); + setSelectionVerbsEnabled( false ); setPasteVerbsEnabled( false ); setWelcomeMode( true ); setTitle(); // Connect - connect( mContents, SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)), - this, SLOT(changePage(QListWidgetItem*,QListWidgetItem*))); + connect( mEditorButton, SIGNAL(toggled(bool)), this, SLOT(changePage(bool))); + connect( mPropertiesButton, SIGNAL(toggled(bool)), this, SLOT(changePage(bool))); + connect( mMergeButton, SIGNAL(toggled(bool)), this, SLOT(changePage(bool))); + connect( mPrintButton, SIGNAL(toggled(bool)), this, SLOT(changePage(bool))); connect( mLabelEditor, SIGNAL(zoomChanged()), this, SLOT(onZoomChanged()) ); connect( QApplication::clipboard(), SIGNAL(dataChanged()), this, SLOT(clipboardChanged()) ); #if 0 @@ -180,8 +223,8 @@ namespace glabels mMergeView->setModel( mModel , mUndoRedoModel ); mPrintView->setModel( mModel ); - mContents->setCurrentItem( mEditorButton ); - mPages->setCurrentIndex(mContents->row(mEditorButton)); + mEditorButton->setChecked( true ); + mPages->setCurrentIndex( EDITOR_PAGE_INDEX ); setDocVerbsEnabled( true ); setSelectionVerbsEnabled( false ); @@ -774,11 +817,16 @@ namespace glabels /// void MainWindow::setWelcomeMode( bool enabled ) { - mWelcomeButton->setHidden( !enabled ); - mPropertiesButton->setHidden( enabled ); - mEditorButton->setHidden( enabled ); - mMergeButton->setHidden( enabled ); - mPrintButton->setHidden( enabled ); + mWelcomeAction->setVisible( enabled ); + mEditorAction->setVisible( !enabled ); + mPropertiesAction->setVisible( !enabled ); + mMergeAction->setVisible( !enabled ); + mPrintAction->setVisible( !enabled ); + + fileShowEditorPageAction->setEnabled( !enabled && !mEditorButton->isChecked() ); + fileShowPropertiesPageAction->setEnabled( !enabled && !mPropertiesButton->isChecked() ); + fileShowMergePageAction->setEnabled( !enabled && !mMergeButton->isChecked() ); + fileShowPrintPageAction->setEnabled( !enabled && !mPrintButton->isChecked() ); } @@ -1005,28 +1053,50 @@ namespace glabels /// /// Change page /// - void MainWindow::changePage(QListWidgetItem *current, QListWidgetItem *previous) + void MainWindow::changePage( bool checked ) { - if (!current) + if ( checked ) { - current = previous; + setWelcomeMode( false ); + + if ( mEditorButton->isChecked() ) + { + mPages->setCurrentIndex( EDITOR_PAGE_INDEX ); + + setDocVerbsEnabled( true ); + setSelectionVerbsEnabled( !mModel->isSelectionEmpty() ); + setMultiSelectionVerbsEnabled( !mModel->isSelectionEmpty() && + !mModel->isSelectionAtomic() ); + setPasteVerbsEnabled( mModel->canPaste() ); + } + else if ( mPropertiesButton->isChecked() ) + { + mPages->setCurrentIndex( PROPERTIES_PAGE_INDEX ); + + setDocVerbsEnabled( false ); + setSelectionVerbsEnabled( false ); + setMultiSelectionVerbsEnabled( false ); + setPasteVerbsEnabled( false ); + } + else if ( mMergeButton->isChecked() ) + { + mPages->setCurrentIndex( MERGE_PAGE_INDEX ); + + setDocVerbsEnabled( false ); + setSelectionVerbsEnabled( false ); + setMultiSelectionVerbsEnabled( false ); + setPasteVerbsEnabled( false ); + } + else if ( mPrintButton->isChecked() ) + { + mPages->setCurrentIndex( PRINT_PAGE_INDEX ); + + setDocVerbsEnabled( false ); + setSelectionVerbsEnabled( false ); + setMultiSelectionVerbsEnabled( false ); + setPasteVerbsEnabled( false ); + } } - - int row = mContents->row(current); - - mPages->setCurrentIndex(row); - bool isEditorPage = ( row == mContents->row(mEditorButton) ); - - setDocVerbsEnabled( isEditorPage ); - setSelectionVerbsEnabled( isEditorPage && !mModel->isSelectionEmpty() ); - setMultiSelectionVerbsEnabled( isEditorPage && !mModel->isSelectionEmpty() && !mModel->isSelectionAtomic() ); - setPasteVerbsEnabled( isEditorPage && mModel->canPaste() ); - - bool isWelcome = ( current == mWelcomeButton ); - fileShowEditorPageAction->setEnabled( !isWelcome && (current != mEditorButton) ); - fileShowPropertiesPageAction->setEnabled( !isWelcome && (current != mPropertiesButton) ); - fileShowMergePageAction->setEnabled( !isWelcome && (current != mMergeButton) ); - fileShowPrintPageAction->setEnabled( !isWelcome && (current != mPrintButton) ); } @@ -1080,7 +1150,7 @@ namespace glabels /// void MainWindow::fileShowEditorPage() { - mContents->setCurrentItem( mEditorButton ); + mEditorButton->setChecked( true ); } @@ -1089,7 +1159,7 @@ namespace glabels /// void MainWindow::fileShowPropertiesPage() { - mContents->setCurrentItem( mPropertiesButton ); + mPropertiesButton->setChecked( true ); } @@ -1098,7 +1168,7 @@ namespace glabels /// void MainWindow::fileShowMergePage() { - mContents->setCurrentItem( mMergeButton ); + mMergeButton->setChecked( true ); } @@ -1107,7 +1177,7 @@ namespace glabels /// void MainWindow::fileShowPrintPage() { - mContents->setCurrentItem( mPrintButton ); + mPrintButton->setChecked( true ); } diff --git a/glabels/MainWindow.h b/glabels/MainWindow.h index 1c934b7..4e6afaa 100644 --- a/glabels/MainWindow.h +++ b/glabels/MainWindow.h @@ -33,6 +33,7 @@ #include #include #include +#include namespace glabels @@ -84,7 +85,7 @@ namespace glabels // Slots ///////////////////////////////////// private slots: - void changePage(QListWidgetItem *current, QListWidgetItem *previous); + void changePage( bool checked ); void clipboardChanged(); @@ -167,8 +168,8 @@ namespace glabels void createStatusBar(); QWidget* createWelcomePage(); - QWidget* createPropertiesPage(); QWidget* createEditorPage(); + QWidget* createPropertiesPage(); QWidget* createMergePage(); QWidget* createPrintPage(); @@ -216,19 +217,25 @@ namespace glabels model::Model* mModel; UndoRedoModel* mUndoRedoModel; - QListWidget* mContents; - QListWidgetItem* mWelcomeButton; - QListWidgetItem* mPropertiesButton; - QListWidgetItem* mEditorButton; - QListWidgetItem* mMergeButton; - QListWidgetItem* mPrintButton; + QToolBar* mContents; + QToolButton* mWelcomeButton; + QToolButton* mEditorButton; + QToolButton* mPropertiesButton; + QToolButton* mMergeButton; + QToolButton* mPrintButton; + + QAction* mWelcomeAction; + QAction* mEditorAction; + QAction* mPropertiesAction; + QAction* mMergeAction; + QAction* mPrintAction; QStackedWidget* mPages; StartupView* mWelcomeView; - PropertiesView* mPropertiesView; QScrollArea* mLabelEditorScrollArea; LabelEditor* mLabelEditor; ObjectEditor* mObjectEditor; + PropertiesView* mPropertiesView; MergeView* mMergeView; PrintView* mPrintView; diff --git a/glabels/ObjectEditor.cpp b/glabels/ObjectEditor.cpp index fd40e43..d5eae14 100644 --- a/glabels/ObjectEditor.cpp +++ b/glabels/ObjectEditor.cpp @@ -358,7 +358,7 @@ namespace glabels if ( dynamic_cast(mObject) ) { - titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-box.svg") ); + titleImageLabel->setPixmap( QPixmap(":icons/flat/24x24/glabels-box.svg") ); titleLabel->setText( tr("Box object properties") ); notebook->addTab( lineFillPage, tr("line/fill") ); @@ -379,7 +379,7 @@ namespace glabels } else if ( dynamic_cast(mObject) ) { - titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-ellipse.svg") ); + titleImageLabel->setPixmap( QPixmap(":icons/flat/24x24/glabels-ellipse.svg") ); titleLabel->setText( tr("Ellipse object properties") ); notebook->addTab( lineFillPage, tr("line/fill") ); @@ -400,7 +400,7 @@ namespace glabels } else if ( dynamic_cast(mObject) ) { - titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-image.svg") ); + titleImageLabel->setPixmap( QPixmap(":icons/flat/24x24/glabels-image.svg") ); titleLabel->setText( tr("Image object properties") ); notebook->addTab( imagePage, tr("image") ); @@ -420,7 +420,7 @@ namespace glabels } else if ( dynamic_cast(mObject) ) { - titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-line.svg") ); + titleImageLabel->setPixmap( QPixmap(":icons/flat/24x24/glabels-line.svg") ); titleLabel->setText( tr("Line object properties") ); notebook->addTab( lineFillPage, tr("line/fill") ); @@ -441,7 +441,7 @@ namespace glabels } else if ( dynamic_cast(mObject) ) { - titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-text.svg") ); + titleImageLabel->setPixmap( QPixmap(":icons/flat/24x24/glabels-text.svg") ); titleLabel->setText( tr("Text object properties") ); notebook->addTab( textPage, tr("text") ); @@ -460,7 +460,7 @@ namespace glabels } else if ( dynamic_cast(mObject) ) { - titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-barcode.svg") ); + titleImageLabel->setPixmap( QPixmap(":icons/flat/24x24/glabels-barcode.svg") ); titleLabel->setText( tr("Barcode object properties") ); notebook->addTab( barcodePage, tr("barcode") ); @@ -488,7 +488,7 @@ namespace glabels { mObject = nullptr; - titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-object-properties.svg") ); + titleImageLabel->setPixmap( QPixmap(":icons/flat/24x24/glabels-object-properties.svg") ); titleLabel->setText( tr("Object properties") ); setEnabled( false ); } diff --git a/glabels/TemplateDesigner.cpp b/glabels/TemplateDesigner.cpp index f6b8fe6..ae0cac5 100644 --- a/glabels/TemplateDesigner.cpp +++ b/glabels/TemplateDesigner.cpp @@ -109,7 +109,7 @@ namespace glabels : mIsBasedOnCopy(false), QWizard(parent) { setWindowTitle( tr("Product Template Designer") ); - setPixmap( QWizard::LogoPixmap, QPixmap( ":icons/48x48/apps/glabels.svg" ) ); + setPixmap( QWizard::LogoPixmap, QPixmap( ":icons/apps/48x48/glabels.svg" ) ); setWizardStyle( QWizard::ModernStyle ); setOption( QWizard::IndependentPages, false ); setOption( QWizard::NoBackButtonOnStartPage, true ); diff --git a/glabels/icons.qrc b/glabels/icons.qrc index bc12df6..8d4f777 100644 --- a/glabels/icons.qrc +++ b/glabels/icons.qrc @@ -3,106 +3,110 @@ - icons/16x16/actions/edit-clear.svg - icons/16x16/actions/edit-copy.svg - icons/16x16/actions/edit-cut.svg - icons/16x16/actions/edit-paste.svg - icons/16x16/actions/file-new.svg - icons/16x16/actions/file-open.svg - icons/16x16/actions/file-save.svg - icons/16x16/actions/file-save-as.svg - icons/16x16/actions/glabels-align-bottom.svg - icons/16x16/actions/glabels-align-hcenter.svg - icons/16x16/actions/glabels-align-left.svg - icons/16x16/actions/glabels-align-right.svg - icons/16x16/actions/glabels-align-top.svg - icons/16x16/actions/glabels-align-vcenter.svg - icons/16x16/actions/glabels-arrow.svg - icons/16x16/actions/glabels-barcode.svg - icons/16x16/actions/glabels-box.svg - icons/16x16/actions/glabels-center-horiz.svg - icons/16x16/actions/glabels-center-vert.svg - icons/16x16/actions/glabels-ellipse.svg - icons/16x16/actions/glabels-flip-horiz.svg - icons/16x16/actions/glabels-flip-vert.svg - icons/16x16/actions/glabels-image.svg - icons/16x16/actions/glabels-line.svg - icons/16x16/actions/glabels-order-bottom.svg - icons/16x16/actions/glabels-order-top.svg - icons/16x16/actions/glabels-rotate-left.svg - icons/16x16/actions/glabels-rotate-right.svg - icons/16x16/actions/glabels-text.svg - icons/16x16/actions/glabels-zoom-in.svg - icons/16x16/actions/glabels-zoom-one-to-one.svg - icons/16x16/actions/glabels-zoom-out.svg - icons/16x16/actions/glabels-zoom-to-fit.svg - icons/16x16/apps/glabels.svg + 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-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-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/22x22/actions/edit-copy.svg - icons/22x22/actions/edit-cut.svg - icons/22x22/actions/edit-paste.svg - icons/22x22/actions/file-new.svg - icons/22x22/actions/file-open.svg - icons/22x22/actions/file-save.svg - icons/22x22/actions/file-save-as.svg - icons/22x22/actions/glabels-align-text-center.svg - icons/22x22/actions/glabels-align-text-left.svg - icons/22x22/actions/glabels-align-text-right.svg - icons/22x22/actions/glabels-arrow.svg - icons/22x22/actions/glabels-barcode.svg - icons/22x22/actions/glabels-box.svg - icons/22x22/actions/glabels-ellipse.svg - icons/22x22/actions/glabels-format-text-bold.svg - icons/22x22/actions/glabels-format-text-italic.svg - icons/22x22/actions/glabels-format-text-underline.svg - icons/22x22/actions/glabels-image.svg - icons/22x22/actions/glabels-line.svg - icons/22x22/actions/glabels-text.svg - icons/22x22/actions/glabels-valign-text-bottom.svg - icons/22x22/actions/glabels-valign-text-middle.svg - icons/22x22/actions/glabels-valign-text-top.svg - icons/22x22/actions/glabels-zoom-in.svg - icons/22x22/actions/glabels-zoom-one-to-one.svg - icons/22x22/actions/glabels-zoom-out.svg - icons/22x22/actions/glabels-zoom-to-fit.svg - icons/22x22/apps/glabels.svg + icons/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-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-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/24x24/actions/edit-copy.svg - icons/24x24/actions/edit-cut.svg - icons/24x24/actions/edit-paste.svg - icons/24x24/actions/file-new.svg - icons/24x24/actions/file-open.svg - icons/24x24/actions/file-save.svg - icons/24x24/actions/file-save-as.svg - icons/24x24/actions/glabels-align-text-center.svg - icons/24x24/actions/glabels-align-text-left.svg - icons/24x24/actions/glabels-align-text-right.svg - icons/24x24/actions/glabels-arrow.svg - icons/24x24/actions/glabels-barcode.svg - icons/24x24/actions/glabels-box.svg - icons/24x24/actions/glabels-ellipse.svg - icons/24x24/actions/glabels-format-text-bold.svg - icons/24x24/actions/glabels-format-text-italic.svg - icons/24x24/actions/glabels-format-text-underline.svg - icons/24x24/actions/glabels-image.svg - icons/24x24/actions/glabels-line.svg - icons/24x24/actions/glabels-object-properties.svg - icons/24x24/actions/glabels-text.svg - icons/24x24/actions/glabels-valign-text-bottom.svg - icons/24x24/actions/glabels-valign-text-middle.svg - icons/24x24/actions/glabels-valign-text-top.svg + icons/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-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/32x32/actions/label-orientation-horiz.svg - icons/32x32/actions/label-orientation-vert.svg - icons/32x32/actions/print.svg - icons/32x32/actions/select-product.svg - icons/32x32/apps/glabels.svg + icons/flat/32x32/glabels-label-orientation-horiz.svg + icons/flat/32x32/glabels-label-orientation-vert.svg + icons/flat/32x32/glabels-print.svg + icons/flat/32x32/glabels-select-product.svg + icons/apps/32x32/glabels.svg - icons/48x48/apps/glabels.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/apps/48x48/glabels.svg - icons/128x128/apps/glabels.svg + icons/apps/128x128/glabels.svg - icons/scalable/apps/glabels.svg + icons/apps/scalable/glabels.svg diff --git a/glabels/icons/128x128/apps/glabels.svg b/glabels/icons/apps/128x128/glabels.svg similarity index 100% rename from glabels/icons/128x128/apps/glabels.svg rename to glabels/icons/apps/128x128/glabels.svg diff --git a/glabels/icons/16x16/apps/glabels.svg b/glabels/icons/apps/16x16/glabels.svg similarity index 100% rename from glabels/icons/16x16/apps/glabels.svg rename to glabels/icons/apps/16x16/glabels.svg diff --git a/glabels/icons/22x22/apps/glabels.svg b/glabels/icons/apps/22x22/glabels.svg similarity index 100% rename from glabels/icons/22x22/apps/glabels.svg rename to glabels/icons/apps/22x22/glabels.svg diff --git a/glabels/icons/32x32/apps/glabels.svg b/glabels/icons/apps/32x32/glabels.svg similarity index 100% rename from glabels/icons/32x32/apps/glabels.svg rename to glabels/icons/apps/32x32/glabels.svg diff --git a/glabels/icons/48x48/apps/glabels.svg b/glabels/icons/apps/48x48/glabels.svg similarity index 100% rename from glabels/icons/48x48/apps/glabels.svg rename to glabels/icons/apps/48x48/glabels.svg diff --git a/glabels/icons/scalable/apps/glabels.svg b/glabels/icons/apps/scalable/glabels.svg similarity index 100% rename from glabels/icons/scalable/apps/glabels.svg rename to glabels/icons/apps/scalable/glabels.svg diff --git a/glabels/icons/16x16/actions/glabels-align-bottom.svg b/glabels/icons/flat/16x16/glabels-align-bottom.svg similarity index 100% rename from glabels/icons/16x16/actions/glabels-align-bottom.svg rename to glabels/icons/flat/16x16/glabels-align-bottom.svg diff --git a/glabels/icons/16x16/actions/glabels-align-hcenter.svg b/glabels/icons/flat/16x16/glabels-align-hcenter.svg similarity index 100% rename from glabels/icons/16x16/actions/glabels-align-hcenter.svg rename to glabels/icons/flat/16x16/glabels-align-hcenter.svg diff --git a/glabels/icons/16x16/actions/glabels-align-left.svg b/glabels/icons/flat/16x16/glabels-align-left.svg similarity index 100% rename from glabels/icons/16x16/actions/glabels-align-left.svg rename to glabels/icons/flat/16x16/glabels-align-left.svg diff --git a/glabels/icons/16x16/actions/glabels-align-right.svg b/glabels/icons/flat/16x16/glabels-align-right.svg similarity index 100% rename from glabels/icons/16x16/actions/glabels-align-right.svg rename to glabels/icons/flat/16x16/glabels-align-right.svg diff --git a/glabels/icons/16x16/actions/glabels-align-top.svg b/glabels/icons/flat/16x16/glabels-align-top.svg similarity index 100% rename from glabels/icons/16x16/actions/glabels-align-top.svg rename to glabels/icons/flat/16x16/glabels-align-top.svg diff --git a/glabels/icons/16x16/actions/glabels-align-vcenter.svg b/glabels/icons/flat/16x16/glabels-align-vcenter.svg similarity index 100% rename from glabels/icons/16x16/actions/glabels-align-vcenter.svg rename to glabels/icons/flat/16x16/glabels-align-vcenter.svg diff --git a/glabels/icons/16x16/actions/glabels-arrow.svg b/glabels/icons/flat/16x16/glabels-arrow.svg similarity index 100% rename from glabels/icons/16x16/actions/glabels-arrow.svg rename to glabels/icons/flat/16x16/glabels-arrow.svg diff --git a/glabels/icons/16x16/actions/glabels-barcode.svg b/glabels/icons/flat/16x16/glabels-barcode.svg similarity index 100% rename from glabels/icons/16x16/actions/glabels-barcode.svg rename to glabels/icons/flat/16x16/glabels-barcode.svg diff --git a/glabels/icons/16x16/actions/glabels-box.svg b/glabels/icons/flat/16x16/glabels-box.svg similarity index 100% rename from glabels/icons/16x16/actions/glabels-box.svg rename to glabels/icons/flat/16x16/glabels-box.svg diff --git a/glabels/icons/16x16/actions/glabels-center-horiz.svg b/glabels/icons/flat/16x16/glabels-center-horiz.svg similarity index 100% rename from glabels/icons/16x16/actions/glabels-center-horiz.svg rename to glabels/icons/flat/16x16/glabels-center-horiz.svg diff --git a/glabels/icons/16x16/actions/glabels-center-vert.svg b/glabels/icons/flat/16x16/glabels-center-vert.svg similarity index 100% rename from glabels/icons/16x16/actions/glabels-center-vert.svg rename to glabels/icons/flat/16x16/glabels-center-vert.svg diff --git a/glabels/icons/16x16/actions/edit-clear.svg b/glabels/icons/flat/16x16/glabels-edit-clear.svg similarity index 100% rename from glabels/icons/16x16/actions/edit-clear.svg rename to glabels/icons/flat/16x16/glabels-edit-clear.svg diff --git a/glabels/icons/16x16/actions/edit-copy.svg b/glabels/icons/flat/16x16/glabels-edit-copy.svg similarity index 100% rename from glabels/icons/16x16/actions/edit-copy.svg rename to glabels/icons/flat/16x16/glabels-edit-copy.svg diff --git a/glabels/icons/16x16/actions/edit-cut.svg b/glabels/icons/flat/16x16/glabels-edit-cut.svg similarity index 100% rename from glabels/icons/16x16/actions/edit-cut.svg rename to glabels/icons/flat/16x16/glabels-edit-cut.svg diff --git a/glabels/icons/16x16/actions/edit-paste.svg b/glabels/icons/flat/16x16/glabels-edit-paste.svg similarity index 100% rename from glabels/icons/16x16/actions/edit-paste.svg rename to glabels/icons/flat/16x16/glabels-edit-paste.svg diff --git a/glabels/icons/16x16/actions/glabels-ellipse.svg b/glabels/icons/flat/16x16/glabels-ellipse.svg similarity index 100% rename from glabels/icons/16x16/actions/glabels-ellipse.svg rename to glabels/icons/flat/16x16/glabels-ellipse.svg diff --git a/glabels/icons/16x16/actions/file-new.svg b/glabels/icons/flat/16x16/glabels-file-new.svg similarity index 100% rename from glabels/icons/16x16/actions/file-new.svg rename to glabels/icons/flat/16x16/glabels-file-new.svg diff --git a/glabels/icons/16x16/actions/file-open.svg b/glabels/icons/flat/16x16/glabels-file-open.svg similarity index 100% rename from glabels/icons/16x16/actions/file-open.svg rename to glabels/icons/flat/16x16/glabels-file-open.svg diff --git a/glabels/icons/16x16/actions/file-save-as.svg b/glabels/icons/flat/16x16/glabels-file-save-as.svg similarity index 100% rename from glabels/icons/16x16/actions/file-save-as.svg rename to glabels/icons/flat/16x16/glabels-file-save-as.svg diff --git a/glabels/icons/16x16/actions/file-save.svg b/glabels/icons/flat/16x16/glabels-file-save.svg similarity index 100% rename from glabels/icons/16x16/actions/file-save.svg rename to glabels/icons/flat/16x16/glabels-file-save.svg diff --git a/glabels/icons/16x16/actions/glabels-flip-horiz.svg b/glabels/icons/flat/16x16/glabels-flip-horiz.svg similarity index 100% rename from glabels/icons/16x16/actions/glabels-flip-horiz.svg rename to glabels/icons/flat/16x16/glabels-flip-horiz.svg diff --git a/glabels/icons/16x16/actions/glabels-flip-vert.svg b/glabels/icons/flat/16x16/glabels-flip-vert.svg similarity index 100% rename from glabels/icons/16x16/actions/glabels-flip-vert.svg rename to glabels/icons/flat/16x16/glabels-flip-vert.svg diff --git a/glabels/icons/16x16/actions/glabels-image.svg b/glabels/icons/flat/16x16/glabels-image.svg similarity index 100% rename from glabels/icons/16x16/actions/glabels-image.svg rename to glabels/icons/flat/16x16/glabels-image.svg diff --git a/glabels/icons/16x16/actions/glabels-line.svg b/glabels/icons/flat/16x16/glabels-line.svg similarity index 100% rename from glabels/icons/16x16/actions/glabels-line.svg rename to glabels/icons/flat/16x16/glabels-line.svg diff --git a/glabels/icons/16x16/actions/glabels-order-bottom.svg b/glabels/icons/flat/16x16/glabels-order-bottom.svg similarity index 100% rename from glabels/icons/16x16/actions/glabels-order-bottom.svg rename to glabels/icons/flat/16x16/glabels-order-bottom.svg diff --git a/glabels/icons/16x16/actions/glabels-order-top.svg b/glabels/icons/flat/16x16/glabels-order-top.svg similarity index 100% rename from glabels/icons/16x16/actions/glabels-order-top.svg rename to glabels/icons/flat/16x16/glabels-order-top.svg diff --git a/glabels/icons/16x16/actions/glabels-rotate-left.svg b/glabels/icons/flat/16x16/glabels-rotate-left.svg similarity index 100% rename from glabels/icons/16x16/actions/glabels-rotate-left.svg rename to glabels/icons/flat/16x16/glabels-rotate-left.svg diff --git a/glabels/icons/16x16/actions/glabels-rotate-right.svg b/glabels/icons/flat/16x16/glabels-rotate-right.svg similarity index 100% rename from glabels/icons/16x16/actions/glabels-rotate-right.svg rename to glabels/icons/flat/16x16/glabels-rotate-right.svg diff --git a/glabels/icons/16x16/actions/glabels-text.svg b/glabels/icons/flat/16x16/glabels-text.svg similarity index 100% rename from glabels/icons/16x16/actions/glabels-text.svg rename to glabels/icons/flat/16x16/glabels-text.svg diff --git a/glabels/icons/16x16/actions/glabels-zoom-in.svg b/glabels/icons/flat/16x16/glabels-zoom-in.svg similarity index 100% rename from glabels/icons/16x16/actions/glabels-zoom-in.svg rename to glabels/icons/flat/16x16/glabels-zoom-in.svg diff --git a/glabels/icons/16x16/actions/glabels-zoom-one-to-one.svg b/glabels/icons/flat/16x16/glabels-zoom-one-to-one.svg similarity index 100% rename from glabels/icons/16x16/actions/glabels-zoom-one-to-one.svg rename to glabels/icons/flat/16x16/glabels-zoom-one-to-one.svg diff --git a/glabels/icons/16x16/actions/glabels-zoom-out.svg b/glabels/icons/flat/16x16/glabels-zoom-out.svg similarity index 100% rename from glabels/icons/16x16/actions/glabels-zoom-out.svg rename to glabels/icons/flat/16x16/glabels-zoom-out.svg diff --git a/glabels/icons/16x16/actions/glabels-zoom-to-fit.svg b/glabels/icons/flat/16x16/glabels-zoom-to-fit.svg similarity index 100% rename from glabels/icons/16x16/actions/glabels-zoom-to-fit.svg rename to glabels/icons/flat/16x16/glabels-zoom-to-fit.svg diff --git a/glabels/icons/22x22/actions/glabels-align-text-center.svg b/glabels/icons/flat/22x22/glabels-align-text-center.svg similarity index 100% rename from glabels/icons/22x22/actions/glabels-align-text-center.svg rename to glabels/icons/flat/22x22/glabels-align-text-center.svg diff --git a/glabels/icons/22x22/actions/glabels-align-text-left.svg b/glabels/icons/flat/22x22/glabels-align-text-left.svg similarity index 100% rename from glabels/icons/22x22/actions/glabels-align-text-left.svg rename to glabels/icons/flat/22x22/glabels-align-text-left.svg diff --git a/glabels/icons/22x22/actions/glabels-align-text-right.svg b/glabels/icons/flat/22x22/glabels-align-text-right.svg similarity index 100% rename from glabels/icons/22x22/actions/glabels-align-text-right.svg rename to glabels/icons/flat/22x22/glabels-align-text-right.svg diff --git a/glabels/icons/22x22/actions/glabels-arrow.svg b/glabels/icons/flat/22x22/glabels-arrow.svg similarity index 100% rename from glabels/icons/22x22/actions/glabels-arrow.svg rename to glabels/icons/flat/22x22/glabels-arrow.svg diff --git a/glabels/icons/22x22/actions/glabels-barcode.svg b/glabels/icons/flat/22x22/glabels-barcode.svg similarity index 100% rename from glabels/icons/22x22/actions/glabels-barcode.svg rename to glabels/icons/flat/22x22/glabels-barcode.svg diff --git a/glabels/icons/22x22/actions/glabels-box.svg b/glabels/icons/flat/22x22/glabels-box.svg similarity index 100% rename from glabels/icons/22x22/actions/glabels-box.svg rename to glabels/icons/flat/22x22/glabels-box.svg diff --git a/glabels/icons/22x22/actions/edit-copy.svg b/glabels/icons/flat/22x22/glabels-edit-copy.svg similarity index 100% rename from glabels/icons/22x22/actions/edit-copy.svg rename to glabels/icons/flat/22x22/glabels-edit-copy.svg diff --git a/glabels/icons/22x22/actions/edit-cut.svg b/glabels/icons/flat/22x22/glabels-edit-cut.svg similarity index 100% rename from glabels/icons/22x22/actions/edit-cut.svg rename to glabels/icons/flat/22x22/glabels-edit-cut.svg diff --git a/glabels/icons/22x22/actions/edit-paste.svg b/glabels/icons/flat/22x22/glabels-edit-paste.svg similarity index 100% rename from glabels/icons/22x22/actions/edit-paste.svg rename to glabels/icons/flat/22x22/glabels-edit-paste.svg diff --git a/glabels/icons/22x22/actions/glabels-ellipse.svg b/glabels/icons/flat/22x22/glabels-ellipse.svg similarity index 100% rename from glabels/icons/22x22/actions/glabels-ellipse.svg rename to glabels/icons/flat/22x22/glabels-ellipse.svg diff --git a/glabels/icons/22x22/actions/file-new.svg b/glabels/icons/flat/22x22/glabels-file-new.svg similarity index 100% rename from glabels/icons/22x22/actions/file-new.svg rename to glabels/icons/flat/22x22/glabels-file-new.svg diff --git a/glabels/icons/22x22/actions/file-open.svg b/glabels/icons/flat/22x22/glabels-file-open.svg similarity index 100% rename from glabels/icons/22x22/actions/file-open.svg rename to glabels/icons/flat/22x22/glabels-file-open.svg diff --git a/glabels/icons/22x22/actions/file-save-as.svg b/glabels/icons/flat/22x22/glabels-file-save-as.svg similarity index 100% rename from glabels/icons/22x22/actions/file-save-as.svg rename to glabels/icons/flat/22x22/glabels-file-save-as.svg diff --git a/glabels/icons/22x22/actions/file-save.svg b/glabels/icons/flat/22x22/glabels-file-save.svg similarity index 100% rename from glabels/icons/22x22/actions/file-save.svg rename to glabels/icons/flat/22x22/glabels-file-save.svg diff --git a/glabels/icons/22x22/actions/glabels-format-text-bold.svg b/glabels/icons/flat/22x22/glabels-format-text-bold.svg similarity index 100% rename from glabels/icons/22x22/actions/glabels-format-text-bold.svg rename to glabels/icons/flat/22x22/glabels-format-text-bold.svg diff --git a/glabels/icons/22x22/actions/glabels-format-text-italic.svg b/glabels/icons/flat/22x22/glabels-format-text-italic.svg similarity index 100% rename from glabels/icons/22x22/actions/glabels-format-text-italic.svg rename to glabels/icons/flat/22x22/glabels-format-text-italic.svg diff --git a/glabels/icons/22x22/actions/glabels-format-text-underline.svg b/glabels/icons/flat/22x22/glabels-format-text-underline.svg similarity index 100% rename from glabels/icons/22x22/actions/glabels-format-text-underline.svg rename to glabels/icons/flat/22x22/glabels-format-text-underline.svg diff --git a/glabels/icons/22x22/actions/glabels-image.svg b/glabels/icons/flat/22x22/glabels-image.svg similarity index 100% rename from glabels/icons/22x22/actions/glabels-image.svg rename to glabels/icons/flat/22x22/glabels-image.svg diff --git a/glabels/icons/22x22/actions/glabels-line.svg b/glabels/icons/flat/22x22/glabels-line.svg similarity index 100% rename from glabels/icons/22x22/actions/glabels-line.svg rename to glabels/icons/flat/22x22/glabels-line.svg diff --git a/glabels/icons/22x22/actions/glabels-text.svg b/glabels/icons/flat/22x22/glabels-text.svg similarity index 100% rename from glabels/icons/22x22/actions/glabels-text.svg rename to glabels/icons/flat/22x22/glabels-text.svg diff --git a/glabels/icons/22x22/actions/glabels-valign-text-bottom.svg b/glabels/icons/flat/22x22/glabels-valign-text-bottom.svg similarity index 100% rename from glabels/icons/22x22/actions/glabels-valign-text-bottom.svg rename to glabels/icons/flat/22x22/glabels-valign-text-bottom.svg diff --git a/glabels/icons/22x22/actions/glabels-valign-text-middle.svg b/glabels/icons/flat/22x22/glabels-valign-text-middle.svg similarity index 100% rename from glabels/icons/22x22/actions/glabels-valign-text-middle.svg rename to glabels/icons/flat/22x22/glabels-valign-text-middle.svg diff --git a/glabels/icons/22x22/actions/glabels-valign-text-top.svg b/glabels/icons/flat/22x22/glabels-valign-text-top.svg similarity index 100% rename from glabels/icons/22x22/actions/glabels-valign-text-top.svg rename to glabels/icons/flat/22x22/glabels-valign-text-top.svg diff --git a/glabels/icons/22x22/actions/glabels-zoom-in.svg b/glabels/icons/flat/22x22/glabels-zoom-in.svg similarity index 100% rename from glabels/icons/22x22/actions/glabels-zoom-in.svg rename to glabels/icons/flat/22x22/glabels-zoom-in.svg diff --git a/glabels/icons/22x22/actions/glabels-zoom-one-to-one.svg b/glabels/icons/flat/22x22/glabels-zoom-one-to-one.svg similarity index 100% rename from glabels/icons/22x22/actions/glabels-zoom-one-to-one.svg rename to glabels/icons/flat/22x22/glabels-zoom-one-to-one.svg diff --git a/glabels/icons/22x22/actions/glabels-zoom-out.svg b/glabels/icons/flat/22x22/glabels-zoom-out.svg similarity index 100% rename from glabels/icons/22x22/actions/glabels-zoom-out.svg rename to glabels/icons/flat/22x22/glabels-zoom-out.svg diff --git a/glabels/icons/22x22/actions/glabels-zoom-to-fit.svg b/glabels/icons/flat/22x22/glabels-zoom-to-fit.svg similarity index 100% rename from glabels/icons/22x22/actions/glabels-zoom-to-fit.svg rename to glabels/icons/flat/22x22/glabels-zoom-to-fit.svg diff --git a/glabels/icons/24x24/actions/glabels-align-text-center.svg b/glabels/icons/flat/24x24/glabels-align-text-center.svg similarity index 100% rename from glabels/icons/24x24/actions/glabels-align-text-center.svg rename to glabels/icons/flat/24x24/glabels-align-text-center.svg diff --git a/glabels/icons/24x24/actions/glabels-align-text-left.svg b/glabels/icons/flat/24x24/glabels-align-text-left.svg similarity index 100% rename from glabels/icons/24x24/actions/glabels-align-text-left.svg rename to glabels/icons/flat/24x24/glabels-align-text-left.svg diff --git a/glabels/icons/24x24/actions/glabels-align-text-right.svg b/glabels/icons/flat/24x24/glabels-align-text-right.svg similarity index 100% rename from glabels/icons/24x24/actions/glabels-align-text-right.svg rename to glabels/icons/flat/24x24/glabels-align-text-right.svg diff --git a/glabels/icons/24x24/actions/glabels-arrow.svg b/glabels/icons/flat/24x24/glabels-arrow.svg similarity index 100% rename from glabels/icons/24x24/actions/glabels-arrow.svg rename to glabels/icons/flat/24x24/glabels-arrow.svg diff --git a/glabels/icons/24x24/actions/glabels-barcode.svg b/glabels/icons/flat/24x24/glabels-barcode.svg similarity index 100% rename from glabels/icons/24x24/actions/glabels-barcode.svg rename to glabels/icons/flat/24x24/glabels-barcode.svg diff --git a/glabels/icons/24x24/actions/glabels-box.svg b/glabels/icons/flat/24x24/glabels-box.svg similarity index 100% rename from glabels/icons/24x24/actions/glabels-box.svg rename to glabels/icons/flat/24x24/glabels-box.svg diff --git a/glabels/icons/24x24/actions/edit-copy.svg b/glabels/icons/flat/24x24/glabels-edit-copy.svg similarity index 100% rename from glabels/icons/24x24/actions/edit-copy.svg rename to glabels/icons/flat/24x24/glabels-edit-copy.svg diff --git a/glabels/icons/24x24/actions/edit-cut.svg b/glabels/icons/flat/24x24/glabels-edit-cut.svg similarity index 100% rename from glabels/icons/24x24/actions/edit-cut.svg rename to glabels/icons/flat/24x24/glabels-edit-cut.svg diff --git a/glabels/icons/24x24/actions/edit-paste.svg b/glabels/icons/flat/24x24/glabels-edit-paste.svg similarity index 100% rename from glabels/icons/24x24/actions/edit-paste.svg rename to glabels/icons/flat/24x24/glabels-edit-paste.svg diff --git a/glabels/icons/24x24/actions/glabels-ellipse.svg b/glabels/icons/flat/24x24/glabels-ellipse.svg similarity index 100% rename from glabels/icons/24x24/actions/glabels-ellipse.svg rename to glabels/icons/flat/24x24/glabels-ellipse.svg diff --git a/glabels/icons/24x24/actions/file-new.svg b/glabels/icons/flat/24x24/glabels-file-new.svg similarity index 100% rename from glabels/icons/24x24/actions/file-new.svg rename to glabels/icons/flat/24x24/glabels-file-new.svg diff --git a/glabels/icons/24x24/actions/file-open.svg b/glabels/icons/flat/24x24/glabels-file-open.svg similarity index 100% rename from glabels/icons/24x24/actions/file-open.svg rename to glabels/icons/flat/24x24/glabels-file-open.svg diff --git a/glabels/icons/24x24/actions/file-save-as.svg b/glabels/icons/flat/24x24/glabels-file-save-as.svg similarity index 100% rename from glabels/icons/24x24/actions/file-save-as.svg rename to glabels/icons/flat/24x24/glabels-file-save-as.svg diff --git a/glabels/icons/24x24/actions/file-save.svg b/glabels/icons/flat/24x24/glabels-file-save.svg similarity index 100% rename from glabels/icons/24x24/actions/file-save.svg rename to glabels/icons/flat/24x24/glabels-file-save.svg diff --git a/glabels/icons/24x24/actions/glabels-format-text-bold.svg b/glabels/icons/flat/24x24/glabels-format-text-bold.svg similarity index 100% rename from glabels/icons/24x24/actions/glabels-format-text-bold.svg rename to glabels/icons/flat/24x24/glabels-format-text-bold.svg diff --git a/glabels/icons/24x24/actions/glabels-format-text-italic.svg b/glabels/icons/flat/24x24/glabels-format-text-italic.svg similarity index 100% rename from glabels/icons/24x24/actions/glabels-format-text-italic.svg rename to glabels/icons/flat/24x24/glabels-format-text-italic.svg diff --git a/glabels/icons/24x24/actions/glabels-format-text-underline.svg b/glabels/icons/flat/24x24/glabels-format-text-underline.svg similarity index 100% rename from glabels/icons/24x24/actions/glabels-format-text-underline.svg rename to glabels/icons/flat/24x24/glabels-format-text-underline.svg diff --git a/glabels/icons/24x24/actions/glabels-image.svg b/glabels/icons/flat/24x24/glabels-image.svg similarity index 100% rename from glabels/icons/24x24/actions/glabels-image.svg rename to glabels/icons/flat/24x24/glabels-image.svg diff --git a/glabels/icons/24x24/actions/glabels-line.svg b/glabels/icons/flat/24x24/glabels-line.svg similarity index 100% rename from glabels/icons/24x24/actions/glabels-line.svg rename to glabels/icons/flat/24x24/glabels-line.svg diff --git a/glabels/icons/24x24/actions/glabels-object-properties.svg b/glabels/icons/flat/24x24/glabels-object-properties.svg similarity index 100% rename from glabels/icons/24x24/actions/glabels-object-properties.svg rename to glabels/icons/flat/24x24/glabels-object-properties.svg diff --git a/glabels/icons/24x24/actions/glabels-text.svg b/glabels/icons/flat/24x24/glabels-text.svg similarity index 100% rename from glabels/icons/24x24/actions/glabels-text.svg rename to glabels/icons/flat/24x24/glabels-text.svg diff --git a/glabels/icons/24x24/actions/glabels-valign-text-bottom.svg b/glabels/icons/flat/24x24/glabels-valign-text-bottom.svg similarity index 100% rename from glabels/icons/24x24/actions/glabels-valign-text-bottom.svg rename to glabels/icons/flat/24x24/glabels-valign-text-bottom.svg diff --git a/glabels/icons/24x24/actions/glabels-valign-text-middle.svg b/glabels/icons/flat/24x24/glabels-valign-text-middle.svg similarity index 100% rename from glabels/icons/24x24/actions/glabels-valign-text-middle.svg rename to glabels/icons/flat/24x24/glabels-valign-text-middle.svg diff --git a/glabels/icons/24x24/actions/glabels-valign-text-top.svg b/glabels/icons/flat/24x24/glabels-valign-text-top.svg similarity index 100% rename from glabels/icons/24x24/actions/glabels-valign-text-top.svg rename to glabels/icons/flat/24x24/glabels-valign-text-top.svg diff --git a/glabels/icons/32x32/actions/label-orientation-horiz.svg b/glabels/icons/flat/32x32/glabels-label-orientation-horiz.svg similarity index 100% rename from glabels/icons/32x32/actions/label-orientation-horiz.svg rename to glabels/icons/flat/32x32/glabels-label-orientation-horiz.svg diff --git a/glabels/icons/32x32/actions/label-orientation-vert.svg b/glabels/icons/flat/32x32/glabels-label-orientation-vert.svg similarity index 100% rename from glabels/icons/32x32/actions/label-orientation-vert.svg rename to glabels/icons/flat/32x32/glabels-label-orientation-vert.svg diff --git a/glabels/icons/32x32/actions/print.svg b/glabels/icons/flat/32x32/glabels-print.svg similarity index 100% rename from glabels/icons/32x32/actions/print.svg rename to glabels/icons/flat/32x32/glabels-print.svg diff --git a/glabels/icons/32x32/actions/select-product.svg b/glabels/icons/flat/32x32/glabels-select-product.svg similarity index 100% rename from glabels/icons/32x32/actions/select-product.svg rename to glabels/icons/flat/32x32/glabels-select-product.svg diff --git a/glabels/icons/flat/48x48/glabels-edit.svg b/glabels/icons/flat/48x48/glabels-edit.svg new file mode 100644 index 0000000..01dfbf2 --- /dev/null +++ b/glabels/icons/flat/48x48/glabels-edit.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + diff --git a/glabels/icons/flat/48x48/glabels-merge.svg b/glabels/icons/flat/48x48/glabels-merge.svg new file mode 100644 index 0000000..55b75dc --- /dev/null +++ b/glabels/icons/flat/48x48/glabels-merge.svg @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/glabels/icons/flat/48x48/glabels-print.svg b/glabels/icons/flat/48x48/glabels-print.svg new file mode 100644 index 0000000..c2a45e7 --- /dev/null +++ b/glabels/icons/flat/48x48/glabels-print.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + diff --git a/glabels/icons/flat/48x48/glabels-properties.svg b/glabels/icons/flat/48x48/glabels-properties.svg new file mode 100644 index 0000000..27f5baa --- /dev/null +++ b/glabels/icons/flat/48x48/glabels-properties.svg @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/glabels/icons/16x16/mimetypes/x-glabels-project.svg b/glabels/icons/mimetypes/16x16/x-glabels-project.svg similarity index 100% rename from glabels/icons/16x16/mimetypes/x-glabels-project.svg rename to glabels/icons/mimetypes/16x16/x-glabels-project.svg diff --git a/glabels/icons/22x22/mimetypes/x-glabels-project.svg b/glabels/icons/mimetypes/22x22/x-glabels-project.svg similarity index 100% rename from glabels/icons/22x22/mimetypes/x-glabels-project.svg rename to glabels/icons/mimetypes/22x22/x-glabels-project.svg diff --git a/glabels/icons/24x24/mimetypes/x-glabels-project.svg b/glabels/icons/mimetypes/24x24/x-glabels-project.svg similarity index 100% rename from glabels/icons/24x24/mimetypes/x-glabels-project.svg rename to glabels/icons/mimetypes/24x24/x-glabels-project.svg diff --git a/glabels/icons/scalable/mimetypes/x-glabels-project.svg b/glabels/icons/mimetypes/scalable/x-glabels-project.svg similarity index 100% rename from glabels/icons/scalable/mimetypes/x-glabels-project.svg rename to glabels/icons/mimetypes/scalable/x-glabels-project.svg diff --git a/glabels/ui/ObjectEditor.ui b/glabels/ui/ObjectEditor.ui index c2d366d..3e0589e 100644 --- a/glabels/ui/ObjectEditor.ui +++ b/glabels/ui/ObjectEditor.ui @@ -46,7 +46,7 @@ - :/icons/24x24/actions/glabels-object-properties.png + :/icons/flat/24x24/glabels-object-properties.png @@ -107,7 +107,7 @@ - :/icons/22x22/actions/glabels-align-text-left.svg:/icons/22x22/actions/glabels-align-text-left.svg + :/icons/flat/22x22/glabels-align-text-left.svg:/icons/flat/22x22/glabels-align-text-left.svg @@ -133,7 +133,7 @@ - :/icons/22x22/actions/glabels-align-text-center.svg:/icons/22x22/actions/glabels-align-text-center.svg + :/icons/flat/22x22/glabels-align-text-center.svg:/icons/flat/22x22/glabels-align-text-center.svg @@ -156,7 +156,7 @@ - :/icons/22x22/actions/glabels-align-text-right.svg:/icons/22x22/actions/glabels-align-text-right.svg + :/icons/flat/22x22/glabels-align-text-right.svg:/icons/flat/22x22/glabels-align-text-right.svg @@ -186,7 +186,7 @@ - :/icons/22x22/actions/glabels-valign-text-top.svg:/icons/22x22/actions/glabels-valign-text-top.svg + :/icons/flat/22x22/glabels-valign-text-top.svg:/icons/flat/22x22/glabels-valign-text-top.svg @@ -212,7 +212,7 @@ - :/icons/22x22/actions/glabels-valign-text-middle.svg:/icons/22x22/actions/glabels-valign-text-middle.svg + :/icons/flat/22x22/glabels-valign-text-middle.svg:/icons/flat/22x22/glabels-valign-text-middle.svg @@ -235,7 +235,7 @@ - :/icons/22x22/actions/glabels-valign-text-bottom.svg:/icons/22x22/actions/glabels-valign-text-bottom.svg + :/icons/flat/22x22/glabels-valign-text-bottom.svg:/icons/flat/22x22/glabels-valign-text-bottom.svg @@ -389,7 +389,7 @@ - :/icons/22x22/actions/glabels-format-text-bold.svg:/icons/22x22/actions/glabels-format-text-bold.svg + :/icons/flat/22x22/glabels-format-text-bold.svg:/icons/flat/22x22/glabels-format-text-bold.svg @@ -412,7 +412,7 @@ - :/icons/22x22/actions/glabels-format-text-italic.svg:/icons/22x22/actions/glabels-format-text-italic.svg + :/icons/flat/22x22/glabels-format-text-italic.svg:/icons/flat/22x22/glabels-format-text-italic.svg @@ -432,7 +432,7 @@ - :/icons/22x22/actions/glabels-format-text-underline.svg:/icons/22x22/actions/glabels-format-text-underline.svg + :/icons/flat/22x22/glabels-format-text-underline.svg:/icons/flat/22x22/glabels-format-text-underline.svg diff --git a/glabels/ui/PrintView.ui b/glabels/ui/PrintView.ui index 5af900f..d4ea498 100644 --- a/glabels/ui/PrintView.ui +++ b/glabels/ui/PrintView.ui @@ -254,7 +254,7 @@ - :/icons/32x32/actions/print.svg:/icons/32x32/actions/print.svg + :/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 034618b..a44c4d6 100644 --- a/glabels/ui/PropertiesView.ui +++ b/glabels/ui/PropertiesView.ui @@ -244,7 +244,7 @@ - :/icons/32x32/actions/select-product.svg:/icons/32x32/actions/select-product.svg + :/icons/flat/32x32/glabels-select-product.svg:/icons/flat/32x32/glabels-select-product.svg @@ -294,7 +294,7 @@ - :/icons/32x32/actions/label-orientation-horiz.svg:/icons/32x32/actions/label-orientation-horiz.svg + :/icons/flat/32x32/glabels-label-orientation-horiz.svg:/icons/flat/32x32/glabels-label-orientation-horiz.svg @@ -303,7 +303,7 @@ - :/icons/32x32/actions/label-orientation-vert.svg:/icons/32x32/actions/label-orientation-vert.svg + :/icons/flat/32x32/glabels-label-orientation-vert.svg:/icons/flat/32x32/glabels-label-orientation-vert.svg diff --git a/glabels/ui/StartupView.ui b/glabels/ui/StartupView.ui index 58fc3f7..246e5c0 100644 --- a/glabels/ui/StartupView.ui +++ b/glabels/ui/StartupView.ui @@ -140,7 +140,7 @@ - :/icons/24x24/actions/file-new.svg:/icons/24x24/actions/file-new.svg + :/icons/flat/24x24/glabels-file-new.svg:/icons/flat/24x24/glabels-file-new.svg @@ -172,7 +172,7 @@ - :/icons/24x24/actions/file-open.svg:/icons/24x24/actions/file-open.svg + :/icons/flat/24x24/glabels-file-open.svg:/icons/flat/24x24/glabels-file-open.svg diff --git a/glabels/ui/TemplateDesignerOneLayoutPage.ui b/glabels/ui/TemplateDesignerOneLayoutPage.ui index 11a7bba..508cfd4 100644 --- a/glabels/ui/TemplateDesignerOneLayoutPage.ui +++ b/glabels/ui/TemplateDesignerOneLayoutPage.ui @@ -162,7 +162,7 @@ - :/icons/32x32/actions/print.svg:/icons/32x32/actions/print.svg + :/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 6483d3e..d7cc9dc 100644 --- a/glabels/ui/TemplateDesignerTwoLayoutPage.ui +++ b/glabels/ui/TemplateDesignerTwoLayoutPage.ui @@ -200,7 +200,7 @@ - :/icons/32x32/actions/print.svg:/icons/32x32/actions/print.svg + :/icons/flat/32x32/glabels-print.svg:/icons/flat/32x32/glabels-print.svg diff --git a/translations/glabels_C.ts b/translations/glabels_C.ts index 25c6f0e..7c68ef3 100644 --- a/translations/glabels_C.ts +++ b/translations/glabels_C.ts @@ -708,82 +708,82 @@ - + Product - + Vendor: - - - - - - + + + + + + TextLabel - + Part #: - + Description: - + Page size: - + Label size: - + Layout: - + <html><head/><body><p>Select another product for this gLabels project.</p></body></html> - + Change product - + Orientation - + Select horizontal or vertical orientation. - + Horizontal orientation - + Vertical orientation - + Similar Products @@ -1423,693 +1423,673 @@ glabels::MainWindow - + Welcome - + Properties - + Merge - + Print - - &New... - - - - - Create a new gLabels project - - - - - &Open... - - - - - Open an existing gLabels project - - - - - &Save - - - - - Save current gLabels project - - - - - Save &As... - - - - - Save current gLabels project to a different name - - - - - Select project Edit mode - - - - - P&roperties - - - - - Select project Properties mode - - - - - &Merge - - - - - Select project Merge mode - - - - - &Print - - - - - Select project Print mode - - - - - Product Template &Designer... - - - - - Create custom templates - - - - - &Close - - - - - Close the current window - - - - - E&xit - - - - - Exit glabels - - - - - - Undo - - - - - - Redo - - - - - - - Cut - - - - - - Cut the selection - - - - - - &Copy - - - - - - Copy the selection - - - - - - &Paste - - - - - - Paste the clipboard - - - - - - &Delete - - - - - - Delete the selected objects - - - - - Select &All - - - - - Select all objects - - - - - Un-select All - - - - - Remove all selections - - - - - Preferences - - - - - Configure the application - - - - - File - - - - - Change visibility of file toolbar in current window - - - - - Editor - - - - - Change visibility of editor toolbar in current window - - - - - Grid - - - - - Change visibility of the grid in current window - - - - - Markup - - - - - Change visibility of markup lines in current window - - - - - Zoom &In - - - - - Increase magnification - - - - - Zoom &Out - - - - - Decrease magnification - - - - - Zoom &1 to 1 - - - - - Restore scale to 100% - - - - - Zoom to &Fit - - - - - Set scale to fit window - - - - - Select Mode - - - - - Select, move and modify objects - - - - - Text - - - - - Create text object - - - - - Box - - - - - Create box object - - - - - Line - - - - - Create line object - - - - - Ellipse - - - - - Create ellipse/circle object - - - - - Image - - - - - Create image object - - - - - Barcode - - - - - Create barcode object - - - - - - Bring To Front - - - - - Raise selection to top - - - - - - Send To Back - - - - - Lower selection to bottom - - - - - - Rotate Left - - - - - Rotate object(s) 90 degrees counter-clockwise - - - - - - Rotate Right - - - - - Rotate object(s) 90 degrees clockwise - - - - - - Flip Horizontally - - - - - Flip object(s) horizontally - - - - - - Flip Vertically - - - - - Flip object(s) vertically - - - - - - Align Left - - - - - Align objects to left edges - - - - - - Align Center - - - - - Align objects to horizontal centers - - - - - - Align Right - - - - - Align objects to right edges - - - - - - Align Top - - - - - Align objects to top edges - - - - - - Align Middle - - - - - Align objects to vertical centers - - - - - - Align Bottom - - - - - Align objects to bottom edges - - - - - - Center Horizontally - - - - - Horizontally center objects in label - - - - - - Center Vertically - - - - - Vertically center objects in label - - - - - &Contents... - - - - - Open gLabels manual - - - - - &About... - - - - - About gLabels - - - - - - &File - - - - - - &Edit - - - - + Edit - - Select <b>Edit</b> mode + + &New... - - Select <b>Properties</b> mode + + Create a new gLabels project - - Select <b>Merge</b> mode + + &Open... - - Select <b>Print</b> mode + + Open an existing gLabels project - - &View + + &Save + + Save current gLabels project + + + + + Save &As... + + + + + Save current gLabels project to a different name + + + + + + &Edit + + + + + Select project Edit mode + + + + + P&roperties + + + + + Select project Properties mode + + + + + &Merge + + + + + Select project Merge mode + + + + + &Print + + + + + Select project Print mode + + + + + Product Template &Designer... + + + + + Create custom templates + + + + + &Close + + + + + Close the current window + + + + + E&xit + + + + + Exit glabels + + + + + + Undo + + + + + + Redo + + + + + + + Cut + + + + + + Cut the selection + + + + + + &Copy + + + + + + Copy the selection + + + + + + &Paste + + + + + + Paste the clipboard + + + + - Toolbars + &Delete + + + + + + Delete the selected objects + + + + + Select &All + + + + + Select all objects + + + + + Un-select All + + + + + Remove all selections + + + + + Preferences + + + + + Configure the application + + + + + File + + + + + Change visibility of file toolbar in current window + + + + + Editor + + + + + Change visibility of editor toolbar in current window + + + + + Grid + + + + + Change visibility of the grid in current window + + + + + Markup + + + + + Change visibility of markup lines in current window + + + + + Zoom &In + + + + + Increase magnification + + + + + Zoom &Out + + + + + Decrease magnification + + + + + Zoom &1 to 1 + + + + + Restore scale to 100% + + + + + Zoom to &Fit + + + + + Set scale to fit window + + + + + Select Mode + + + + + Select, move and modify objects + + + + + Text + + + + + Create text object + + + + + Box + + + + + Create box object + + + + + Line + + + + + Create line object + + + + + Ellipse + + + + + Create ellipse/circle object + + + + + Image + + + + + Create image object + + + + + Barcode + + + + + Create barcode object + + + + + + Bring To Front + + + + + Raise selection to top + + + + + + Send To Back + + + + + Lower selection to bottom + + + + + + Rotate Left + + + + + Rotate object(s) 90 degrees counter-clockwise + + + + + + Rotate Right + + + + + Rotate object(s) 90 degrees clockwise + + + + + + Flip Horizontally + + + + + Flip object(s) horizontally + + + + + + Flip Vertically + + + + + Flip object(s) vertically + + + + + + Align Left + + + + + Align objects to left edges + + + + + + Align Center + + + + + Align objects to horizontal centers + + + + + + Align Right + + + + + Align objects to right edges + + + + + + Align Top + + + + + Align objects to top edges + + + + + + Align Middle + + + + + Align objects to vertical centers + + + + + + Align Bottom + + + + + Align objects to bottom edges + + + + + + Center Horizontally + + + + + Horizontally center objects in label + + + + + + Center Vertically + + + + + Vertically center objects in label + + + + + &Contents... + + + + + Open gLabels manual + + + + + &About... + + + + + About gLabels - &Objects - - - - - &Create - - - - - - &Order - - - - - - &Rotate/Flip - - - - - - &Alignment - - - - - - Center + + &File + &View + + + + + Toolbars + + + + + &Objects + + + + + &Create + + + + + + &Order + + + + + + &Rotate/Flip + + + + + + &Alignment + + + + + + Center + + + + &Help - + &Editor - + (modified) - + Save changes to project "%1" before closing? - + Your changes will be lost if you don't save them. - + Save project? - + Paste - + Delete - + Create Text - + Create Box - + Create Line - + Create Ellipse - + Create Image - + Create Barcode diff --git a/translations/glabels_ar.ts b/translations/glabels_ar.ts index f8cc7b9..e0a636f 100644 --- a/translations/glabels_ar.ts +++ b/translations/glabels_ar.ts @@ -1174,34 +1174,18 @@ Edit - - Select <b>Edit</b> mode - - Properties - - Select <b>Properties</b> mode - - Merge - - Select <b>Merge</b> mode - - Print - - Select <b>Print</b> mode - - &New... diff --git a/translations/glabels_bs.ts b/translations/glabels_bs.ts index 44f16a6..91de289 100644 --- a/translations/glabels_bs.ts +++ b/translations/glabels_bs.ts @@ -1148,34 +1148,18 @@ Edit - - Select <b>Edit</b> mode - - Properties - - Select <b>Properties</b> mode - - Merge - - Select <b>Merge</b> mode - - Print - - Select <b>Print</b> mode - - &New... diff --git a/translations/glabels_ca.ts b/translations/glabels_ca.ts index 23e2ade..8220776 100644 --- a/translations/glabels_ca.ts +++ b/translations/glabels_ca.ts @@ -1148,34 +1148,18 @@ Edit - - Select <b>Edit</b> mode - - Properties - - Select <b>Properties</b> mode - - Merge - - Select <b>Merge</b> mode - - Print - - Select <b>Print</b> mode - - &New... diff --git a/translations/glabels_cs.ts b/translations/glabels_cs.ts index 8e2458d..2f36c8c 100644 --- a/translations/glabels_cs.ts +++ b/translations/glabels_cs.ts @@ -1148,34 +1148,18 @@ Edit - - Select <b>Edit</b> mode - - Properties - - Select <b>Properties</b> mode - - Merge - - Select <b>Merge</b> mode - - Print - - Select <b>Print</b> mode - - &New... diff --git a/translations/glabels_da.ts b/translations/glabels_da.ts index 0492d74..cb543bc 100644 --- a/translations/glabels_da.ts +++ b/translations/glabels_da.ts @@ -1148,34 +1148,18 @@ Edit - - Select <b>Edit</b> mode - - Properties - - Select <b>Properties</b> mode - - Merge - - Select <b>Merge</b> mode - - Print - - Select <b>Print</b> mode - - &New... diff --git a/translations/glabels_de.ts b/translations/glabels_de.ts index 839ccc6..3bf0ac8 100644 --- a/translations/glabels_de.ts +++ b/translations/glabels_de.ts @@ -708,82 +708,82 @@ Form - + Product Produkt - + Vendor: Anbieter: - - - - - - + + + + + + TextLabel TextLabel - + Part #: Bestellnummer: - + Description: Beschreibung: - + Page size: Seitengröße: - + Label size: Etikettgröße: - + Layout: Anordnung: - + <html><head/><body><p>Select another product for this gLabels project.</p></body></html> <html><head/><body><p>Wählen Sie ein anderes Produkt für dieses gLabels-Projekt.</p></body></html> - + Change product Produkt ändern - + Orientation Ausrichtung - + Select horizontal or vertical orientation. Wählen Sie die horizontale oder vertikale Ausrichtung. - + Horizontal orientation Horizontale Ausrichtung - + Vertical orientation Vertikale Ausrichtung - + Similar Products Ähnliche Produkte @@ -1423,695 +1423,675 @@ glabels::MainWindow - + Welcome Willkommen - + Properties Eigenschaften - + Merge Seriendokument - + Print Drucken - - &New... - &Neu … - - - - Create a new gLabels project - Ein neues gLabels-Projekt erstellen - - - - &Open... - Ö&ffnen … - - - - Open an existing gLabels project - Ein existierendes gLabels-Projekt öffnen - - - - &Save - &Speichern - - - - Save current gLabels project - Aktuelles gLabels-Projekt speichern - - - - Save &As... - Speichern &unter … - - - - Save current gLabels project to a different name - Aktuelles gLabels-Projekt unter einem anderen Namen speichern - - - - Select project Edit mode - Projektbearbeitungsmodus wählen - - - - P&roperties - &Eigenschaften - - - - Select project Properties mode - Projekteigenschaftsmodus wählen - - - - &Merge - &Mischen - - - - Select project Merge mode - Mischeinstellungsmodus wählen - - - - &Print - &Drucken - - - - Select project Print mode - Projektdruckmodus wählen - - - - Product Template &Designer... - Vorlagen-&Designer … - - - - Create custom templates - Benutzerdefinierte Vorlagen erstellen - - - - &Close - S&chließen - - - - Close the current window - Das aktuelle Fenster schließen - - - - E&xit - &Beenden - - - - Exit glabels - gLabels beenden - - - - - Undo - Rückgängig - - - - - Redo - Wiederholen - - - - - - Cut - Ausschneiden - - - - - Cut the selection - Die Auswahl ausschneiden - - - - - &Copy - &Kopieren - - - - - Copy the selection - Die Auswahl kopieren - - - - - &Paste - Ein&fügen - - - - - Paste the clipboard - Den Inhalt der Zwischenablage einfügen - - - - - &Delete - &Löschen - - - - - Delete the selected objects - Die ausgewählten Objekte löschen - - - - Select &All - &Alles auswählen - - - - Select all objects - Alle Objekte auswählen - - - - Un-select All - Alles abwählen - - - - Remove all selections - Alle Auswahlen aufheben - - - - Preferences - Einstellungen - - - - Configure the application - Die Anwendung einrichten - - - - File - Datei - - - - Change visibility of file toolbar in current window - Die Sichtbarkeit der Werkzeugleiste im aktuellen Fenster ändern - - - - Editor - Editor - - - - Change visibility of editor toolbar in current window - Die Sichtbarkeit des Editors im aktuellen Fenster ändern - - - - Grid - Gitter - - - - Change visibility of the grid in current window - Die Sichtbarkeit des Gitters im aktuellen Fenster ändern - - - - Markup - Markierungen - - - - Change visibility of markup lines in current window - Die Sichtbarkeit von Markierungslinien im aktuellen Fenster ändern - - - - Zoom &In - Ver&größern - - - - Increase magnification - Vergrößerungsstufe erhöhen - - - - Zoom &Out - Ver&kleinern - - - - Decrease magnification - Vergrößerungsstufe verringern - - - - Zoom &1 to 1 - Vergrößerung &1:1 - - - - Restore scale to 100% - Maßstab auf 100% wiederherstellen - - - - Zoom to &Fit - Ein&passen - - - - Set scale to fit window - In Fenster einpassen - - - - Select Mode - Modus auswählen - - - - Select, move and modify objects - Objekte auswählen, bewegen, ändern - - - - Text - Text - - - - Create text object - Ein Textobjekt erstellen - - - - Box - Rechteck - - - - Create box object - Ein Rechteck-Objekt erstellen - - - - Line - Linie - - - - Create line object - Ein Linienobjekt erstellen - - - - Ellipse - Ellipse - - - - Create ellipse/circle object - Ein Ein Ellipsen- oder Kreisobjekt erstellen - - - - Image - Bild - - - - Create image object - Ein Bildobjekt erstellen - - - - Barcode - Strichcode - - - - Create barcode object - Ein Barcode-Objekt erstellen - - - - - Bring To Front - Ganz nach vorn - - - - Raise selection to top - Auswahl ganz nach vorn bringen - - - - - Send To Back - Ganz nach hinten - - - - Lower selection to bottom - Auswahl ganz nach hinten bringen - - - - - Rotate Left - Links drehen - - - - Rotate object(s) 90 degrees counter-clockwise - Objekt um 90 Grad gegen den Uhrzeigersinn drehen - - - - - Rotate Right - Rechts drehen - - - - Rotate object(s) 90 degrees clockwise - Objekt um 90 Grad im Uhrzeigersinn drehen - - - - - Flip Horizontally - Horizontal spiegeln - - - - Flip object(s) horizontally - Objekt(e) horizontal spiegeln - - - - - Flip Vertically - Vertikal spiegeln - - - - Flip object(s) vertically - Objekt(e) vertikal spiegeln - - - - - Align Left - Links ausrichten - - - - Align objects to left edges - Objekte am linken Rand anordnen - - - - - Align Center - Zentral ausrichten - - - - Align objects to horizontal centers - Objekte an der horizontalen Mitte anordnen - - - - - Align Right - Rechts ausrichten - - - - Align objects to right edges - Objekte am rechten Rand anordnen - - - - - Align Top - Oben ausrichten - - - - Align objects to top edges - Objekte am oberen Rand anordnen - - - - - Align Middle - Mittig ausrichten - - - - Align objects to vertical centers - Objekte an der vertikalen Mitte anordnen - - - - - Align Bottom - Unten ausrichten - - - - Align objects to bottom edges - Objekte am unteren Rand anordnen - - - - - Center Horizontally - Horizontal zentrieren - - - - Horizontally center objects in label - Objekte auf dem Etikett horizontal zentrieren - - - - - Center Vertically - Vertikal zentrieren - - - - Vertically center objects in label - Objekte auf dem Etikett vertikal zentrieren - - - - &Contents... - &Inhalt … - - - - Open gLabels manual - Das gLabels-Handbuch öffnen - - - - &About... - In&fo … - - - - About gLabels - Info zu gLabels - - - - - &File - &Datei - - - - - &Edit - &Bearbeiten - - - + Edit Bearbeiten - - Select <b>Edit</b> mode - <b>Bearbeiten</b>-Modus auswählen + + &New... + &Neu … - - Select <b>Properties</b> mode - <b>Eigenschaften</b>-Modus auswählen + + Create a new gLabels project + Ein neues gLabels-Projekt erstellen - - Select <b>Merge</b> mode - <b>Mischen</b>-Modus auswählen + + &Open... + Ö&ffnen … - - Select <b>Print</b> mode - <b>Drucken</b>-Modus auswählen + + Open an existing gLabels project + Ein existierendes gLabels-Projekt öffnen - - &View - &Ansicht + + &Save + &Speichern + + Save current gLabels project + Aktuelles gLabels-Projekt speichern + + + + Save &As... + Speichern &unter … + + + + Save current gLabels project to a different name + Aktuelles gLabels-Projekt unter einem anderen Namen speichern + + + + + &Edit + &Bearbeiten + + + + Select project Edit mode + Projektbearbeitungsmodus wählen + + + + P&roperties + &Eigenschaften + + + + Select project Properties mode + Projekteigenschaftsmodus wählen + + + + &Merge + &Mischen + + + + Select project Merge mode + Mischeinstellungsmodus wählen + + + + &Print + &Drucken + + + + Select project Print mode + Projektdruckmodus wählen + + + + Product Template &Designer... + Vorlagen-&Designer … + + + + Create custom templates + Benutzerdefinierte Vorlagen erstellen + + + + &Close + &Schließen + + + + Close the current window + Das aktuelle Fenster schließen + + + + E&xit + &Beenden + + + + Exit glabels + gLabels beenden + + + + + Undo + Rückgängig + + + + + Redo + Wiederholen + + + + + + Cut + Ausschneiden + + + + + Cut the selection + Die Auswahl ausschneiden + + + + + &Copy + &Kopieren + + + + + Copy the selection + Die Auswahl kopieren + + + + + &Paste + Ein&fügen + + + + + Paste the clipboard + Den Inhalt der Zwischenablage einfügen + + + - Toolbars - Werkzeugleisten + &Delete + &Löschen + + + + + Delete the selected objects + Die ausgewählten Objekte löschen + + + + Select &All + &Alles auswählen + + + + Select all objects + Alle Objekte auswählen + + + + Un-select All + Alles abwählen + + + + Remove all selections + Alle Auswahlen aufheben + + + + Preferences + Einstellungen + + + + Configure the application + Die Anwendung einrichten + + + + File + Datei + + + + Change visibility of file toolbar in current window + Die Sichtbarkeit der Werkzeugleiste im aktuellen Fenster ändern + + + + Editor + Editor + + + + Change visibility of editor toolbar in current window + Die Sichtbarkeit des Editors im aktuellen Fenster ändern + + + + Grid + Gitter + + + + Change visibility of the grid in current window + Die Sichtbarkeit des Gitters im aktuellen Fenster ändern + + + + Markup + Markierungen + + + + Change visibility of markup lines in current window + Die Sichtbarkeit von Markierungslinien im aktuellen Fenster ändern + + + + Zoom &In + Ver&größern + + + + Increase magnification + Vergrößerungsstufe erhöhen + + + + Zoom &Out + Ver&kleinern + + + + Decrease magnification + Vergrößerungsstufe verringern + + + + Zoom &1 to 1 + Vergrößerung &1:1 + + + + Restore scale to 100% + Maßstab auf 100% wiederherstellen + + + + Zoom to &Fit + Ein&passen + + + + Set scale to fit window + In Fenster einpassen + + + + Select Mode + Modus auswählen + + + + Select, move and modify objects + Objekte auswählen, bewegen, ändern + + + + Text + Text + + + + Create text object + Ein Textobjekt erstellen + + + + Box + Rechteck + + + + Create box object + Ein Rechteck-Objekt erstellen + + + + Line + Linie + + + + Create line object + Ein Linienobjekt erstellen + + + + Ellipse + Ellipse + + + + Create ellipse/circle object + Ein Ein Ellipsen- oder Kreisobjekt erstellen + + + + Image + Bild + + + + Create image object + Ein Bildobjekt erstellen + + + + Barcode + Strichcode + + + + Create barcode object + Ein Barcode-Objekt erstellen + + + + + Bring To Front + Ganz nach vorn + + + + Raise selection to top + Auswahl ganz nach vorn bringen + + + + + Send To Back + Ganz nach hinten + + + + Lower selection to bottom + Auswahl ganz nach hinten bringen + + + + + Rotate Left + Links drehen + + + + Rotate object(s) 90 degrees counter-clockwise + Objekt um 90 Grad gegen den Uhrzeigersinn drehen + + + + + Rotate Right + Rechts drehen + + + + Rotate object(s) 90 degrees clockwise + Objekt um 90 Grad im Uhrzeigersinn drehen + + + + + Flip Horizontally + Horizontal spiegeln + + + + Flip object(s) horizontally + Objekt(e) horizontal spiegeln + + + + + Flip Vertically + Vertikal spiegeln + + + + Flip object(s) vertically + Objekt(e) vertikal spiegeln + + + + + Align Left + Links ausrichten + + + + Align objects to left edges + Objekte am linken Rand anordnen + + + + + Align Center + Zentral ausrichten + + + + Align objects to horizontal centers + Objekte an der horizontalen Mitte anordnen + + + + + Align Right + Rechts ausrichten + + + + Align objects to right edges + Objekte am rechten Rand anordnen + + + + + Align Top + Oben ausrichten + + + + Align objects to top edges + Objekte am oberen Rand anordnen + + + + + Align Middle + Mittig ausrichten + + + + Align objects to vertical centers + Objekte an der vertikalen Mitte anordnen + + + + + Align Bottom + Unten ausrichten + + + + Align objects to bottom edges + Objekte am unteren Rand anordnen + + + + + Center Horizontally + Horizontal zentrieren + + + + Horizontally center objects in label + Objekte auf dem Etikett horizontal zentrieren + + + + + Center Vertically + Vertikal zentrieren + + + + Vertically center objects in label + Objekte auf dem Etikett vertikal zentrieren + + + + &Contents... + &Inhalt … + + + + Open gLabels manual + Das gLabels-Handbuch öffnen + + + + &About... + In&fo … + + + + About gLabels + Info zu gLabels - &Objects - &Objekte - - - - &Create - Er&zeugen - - - - - &Order - &Anordnung - - - - - &Rotate/Flip - D&rehen/Spiegeln - - - - - &Alignment - &Ausrichtung - - - - - Center - Mitte + + &File + &Datei + &View + &Ansicht + + + + Toolbars + Werkzeugleisten + + + + &Objects + &Objekte + + + + &Create + Er&zeugen + + + + + &Order + &Anordnung + + + + + &Rotate/Flip + D&rehen/Spiegeln + + + + + &Alignment + &Ausrichtung + + + + + Center + Mitte + + + &Help - &Hilfe + &Hilfe - + &Editor - &Editor + &Editor - + (modified) - (geändert) + (geändert) - + Save changes to project "%1" before closing? - Änderungen am Dokument »%1« vor dem Schließen speichern? + Änderungen am Dokument »%1« vor dem Schließen speichern? - + Your changes will be lost if you don't save them. - Nicht gespeicherte Änderungen gehen verloren, wenn Sie nicht speichern. + Nicht gespeicherte Änderungen gehen verloren, wenn Sie nicht speichern. - + Save project? - Projekt speichern? + Projekt speichern? - + Paste - Einfügen + Einfügen - + Delete - Löschen + Löschen - + Create Text - Textobjekt erzeugen + Textobjekt erzeugen - + Create Box - Rechteck-Objekt erzeugen + Rechteck-Objekt erzeugen - + Create Line - Linienobjekt erzeugen + Linienobjekt erzeugen - + Create Ellipse - Ellipse erzeugen + Ellipse erzeugen - + Create Image - Bild erzeugen + Bild erzeugen - + Create Barcode - Strichcode erzeugen + Strichcode erzeugen diff --git a/translations/glabels_el.ts b/translations/glabels_el.ts index 7f8c5d0..1f431b3 100644 --- a/translations/glabels_el.ts +++ b/translations/glabels_el.ts @@ -1148,34 +1148,18 @@ Edit - - Select <b>Edit</b> mode - - Properties - - Select <b>Properties</b> mode - - Merge - - Select <b>Merge</b> mode - - Print - - Select <b>Print</b> mode - - &New... diff --git a/translations/glabels_en_GB.ts b/translations/glabels_en_GB.ts index b20ab36..76c5bc9 100644 --- a/translations/glabels_en_GB.ts +++ b/translations/glabels_en_GB.ts @@ -1148,34 +1148,18 @@ Edit - - Select <b>Edit</b> mode - - Properties - - Select <b>Properties</b> mode - - Merge - - Select <b>Merge</b> mode - - Print - - Select <b>Print</b> mode - - &New... diff --git a/translations/glabels_eo.ts b/translations/glabels_eo.ts index b61625e..32d9f5b 100644 --- a/translations/glabels_eo.ts +++ b/translations/glabels_eo.ts @@ -1156,34 +1156,18 @@ Edit - - Select <b>Edit</b> mode - - Properties - - Select <b>Properties</b> mode - - Merge - - Select <b>Merge</b> mode - - Print - - Select <b>Print</b> mode - - &New... diff --git a/translations/glabels_es.ts b/translations/glabels_es.ts index 7bd266e..72cde6e 100644 --- a/translations/glabels_es.ts +++ b/translations/glabels_es.ts @@ -1148,34 +1148,18 @@ Edit - - Select <b>Edit</b> mode - - Properties - - Select <b>Properties</b> mode - - Merge - - Select <b>Merge</b> mode - - Print - - Select <b>Print</b> mode - - &New... diff --git a/translations/glabels_fi.ts b/translations/glabels_fi.ts index 29a1406..ac198bd 100644 --- a/translations/glabels_fi.ts +++ b/translations/glabels_fi.ts @@ -1159,34 +1159,18 @@ Edit - - Select <b>Edit</b> mode - - Properties - - Select <b>Properties</b> mode - - Merge - - Select <b>Merge</b> mode - - Print - - Select <b>Print</b> mode - - &New... diff --git a/translations/glabels_fr.ts b/translations/glabels_fr.ts index 1048d07..2eb7ba9 100644 --- a/translations/glabels_fr.ts +++ b/translations/glabels_fr.ts @@ -1148,34 +1148,18 @@ Edit - - Select <b>Edit</b> mode - - Properties - - Select <b>Properties</b> mode - - Merge - - Select <b>Merge</b> mode - - Print - - Select <b>Print</b> mode - - &New... diff --git a/translations/glabels_gl.ts b/translations/glabels_gl.ts index adbf42c..ca6c0d6 100644 --- a/translations/glabels_gl.ts +++ b/translations/glabels_gl.ts @@ -1165,34 +1165,18 @@ Edit - - Select <b>Edit</b> mode - - Properties - - Select <b>Properties</b> mode - - Merge - - Select <b>Merge</b> mode - - Print - - Select <b>Print</b> mode - - &New... diff --git a/translations/glabels_hu.ts b/translations/glabels_hu.ts index 9328b02..4af2902 100644 --- a/translations/glabels_hu.ts +++ b/translations/glabels_hu.ts @@ -1148,34 +1148,18 @@ Edit - - Select <b>Edit</b> mode - - Properties - - Select <b>Properties</b> mode - - Merge - - Select <b>Merge</b> mode - - Print - - Select <b>Print</b> mode - - &New... diff --git a/translations/glabels_id.ts b/translations/glabels_id.ts index 83e021d..1afbe2e 100644 --- a/translations/glabels_id.ts +++ b/translations/glabels_id.ts @@ -1165,34 +1165,18 @@ Edit - - Select <b>Edit</b> mode - - Properties - - Select <b>Properties</b> mode - - Merge - - Select <b>Merge</b> mode - - Print - - Select <b>Print</b> mode - - &New... diff --git a/translations/glabels_it.ts b/translations/glabels_it.ts index 4ec1bc8..cdbd3f7 100644 --- a/translations/glabels_it.ts +++ b/translations/glabels_it.ts @@ -1170,34 +1170,18 @@ Edit - - Select <b>Edit</b> mode - - Properties - - Select <b>Properties</b> mode - - Merge - - Select <b>Merge</b> mode - - Print - - Select <b>Print</b> mode - - &New... diff --git a/translations/glabels_ja.ts b/translations/glabels_ja.ts index ddaa1ee..56f16b2 100644 --- a/translations/glabels_ja.ts +++ b/translations/glabels_ja.ts @@ -1148,34 +1148,18 @@ Edit - - Select <b>Edit</b> mode - - Properties - - Select <b>Properties</b> mode - - Merge - - Select <b>Merge</b> mode - - Print - - Select <b>Print</b> mode - - &New... diff --git a/translations/glabels_ko.ts b/translations/glabels_ko.ts index 728575e..3ed66e1 100644 --- a/translations/glabels_ko.ts +++ b/translations/glabels_ko.ts @@ -1158,34 +1158,18 @@ Edit - - Select <b>Edit</b> mode - - Properties - - Select <b>Properties</b> mode - - Merge - - Select <b>Merge</b> mode - - Print - - Select <b>Print</b> mode - - &New... diff --git a/translations/glabels_lv.ts b/translations/glabels_lv.ts index 06eb51b..241c733 100644 --- a/translations/glabels_lv.ts +++ b/translations/glabels_lv.ts @@ -1148,34 +1148,18 @@ Edit - - Select <b>Edit</b> mode - - Properties - - Select <b>Properties</b> mode - - Merge - - Select <b>Merge</b> mode - - Print - - Select <b>Print</b> mode - - &New... diff --git a/translations/glabels_nb.ts b/translations/glabels_nb.ts index d89e02d..e4cf48e 100644 --- a/translations/glabels_nb.ts +++ b/translations/glabels_nb.ts @@ -1176,34 +1176,18 @@ Edit - - Select <b>Edit</b> mode - - Properties - - Select <b>Properties</b> mode - - Merge - - Select <b>Merge</b> mode - - Print - - Select <b>Print</b> mode - - &New... diff --git a/translations/glabels_nl.ts b/translations/glabels_nl.ts index e6314a5..95fb14c 100644 --- a/translations/glabels_nl.ts +++ b/translations/glabels_nl.ts @@ -1148,34 +1148,18 @@ Edit - - Select <b>Edit</b> mode - - Properties - - Select <b>Properties</b> mode - - Merge - - Select <b>Merge</b> mode - - Print - - Select <b>Print</b> mode - - &New... diff --git a/translations/glabels_oc.ts b/translations/glabels_oc.ts index 49b1e78..7a24fc0 100644 --- a/translations/glabels_oc.ts +++ b/translations/glabels_oc.ts @@ -1148,34 +1148,18 @@ Edit - - Select <b>Edit</b> mode - - Properties - - Select <b>Properties</b> mode - - Merge - - Select <b>Merge</b> mode - - Print - - Select <b>Print</b> mode - - &New... diff --git a/translations/glabels_pt.ts b/translations/glabels_pt.ts index 4721a2f..13bad35 100644 --- a/translations/glabels_pt.ts +++ b/translations/glabels_pt.ts @@ -1148,34 +1148,18 @@ Edit - - Select <b>Edit</b> mode - - Properties - - Select <b>Properties</b> mode - - Merge - - Select <b>Merge</b> mode - - Print - - Select <b>Print</b> mode - - &New... diff --git a/translations/glabels_pt_BR.ts b/translations/glabels_pt_BR.ts index d93c9c2..46600b4 100644 --- a/translations/glabels_pt_BR.ts +++ b/translations/glabels_pt_BR.ts @@ -1148,34 +1148,18 @@ Edit - - Select <b>Edit</b> mode - - Properties - - Select <b>Properties</b> mode - - Merge - - Select <b>Merge</b> mode - - Print - - Select <b>Print</b> mode - - &New... diff --git a/translations/glabels_ro.ts b/translations/glabels_ro.ts index 9d4a751..457ee7a 100644 --- a/translations/glabels_ro.ts +++ b/translations/glabels_ro.ts @@ -1152,34 +1152,18 @@ Edit - - Select <b>Edit</b> mode - - Properties - - Select <b>Properties</b> mode - - Merge - - Select <b>Merge</b> mode - - Print - - Select <b>Print</b> mode - - &New... diff --git a/translations/glabels_ru.ts b/translations/glabels_ru.ts index 1880b83..6dc5241 100644 --- a/translations/glabels_ru.ts +++ b/translations/glabels_ru.ts @@ -1148,34 +1148,18 @@ Edit - - Select <b>Edit</b> mode - - Properties - - Select <b>Properties</b> mode - - Merge - - Select <b>Merge</b> mode - - Print - - Select <b>Print</b> mode - - &New... diff --git a/translations/glabels_sk.ts b/translations/glabels_sk.ts index ec05f2f..aadbb07 100644 --- a/translations/glabels_sk.ts +++ b/translations/glabels_sk.ts @@ -1149,34 +1149,18 @@ Edit - - Select <b>Edit</b> mode - - Properties - - Select <b>Properties</b> mode - - Merge - - Select <b>Merge</b> mode - - Print - - Select <b>Print</b> mode - - &New... diff --git a/translations/glabels_sl.ts b/translations/glabels_sl.ts index a651642..00d6086 100644 --- a/translations/glabels_sl.ts +++ b/translations/glabels_sl.ts @@ -1148,34 +1148,18 @@ Edit - - Select <b>Edit</b> mode - - Properties - - Select <b>Properties</b> mode - - Merge - - Select <b>Merge</b> mode - - Print - - Select <b>Print</b> mode - - &New... diff --git a/translations/glabels_sr.ts b/translations/glabels_sr.ts index 940aea9..45a1e9b 100644 --- a/translations/glabels_sr.ts +++ b/translations/glabels_sr.ts @@ -1148,34 +1148,18 @@ Edit - - Select <b>Edit</b> mode - - Properties - - Select <b>Properties</b> mode - - Merge - - Select <b>Merge</b> mode - - Print - - Select <b>Print</b> mode - - &New... diff --git a/translations/glabels_sr@latin.ts b/translations/glabels_sr@latin.ts index b78bb1f..707cb84 100644 --- a/translations/glabels_sr@latin.ts +++ b/translations/glabels_sr@latin.ts @@ -1148,34 +1148,18 @@ Edit - - Select <b>Edit</b> mode - - Properties - - Select <b>Properties</b> mode - - Merge - - Select <b>Merge</b> mode - - Print - - Select <b>Print</b> mode - - &New... diff --git a/translations/glabels_sv.ts b/translations/glabels_sv.ts index 64bf633..c18549c 100644 --- a/translations/glabels_sv.ts +++ b/translations/glabels_sv.ts @@ -1148,34 +1148,18 @@ Edit - - Select <b>Edit</b> mode - - Properties - - Select <b>Properties</b> mode - - Merge - - Select <b>Merge</b> mode - - Print - - Select <b>Print</b> mode - - &New... diff --git a/translations/glabels_tr.ts b/translations/glabels_tr.ts index 5a1d834..582d5e5 100644 --- a/translations/glabels_tr.ts +++ b/translations/glabels_tr.ts @@ -1148,34 +1148,18 @@ Edit - - Select <b>Edit</b> mode - - Properties - - Select <b>Properties</b> mode - - Merge - - Select <b>Merge</b> mode - - Print - - Select <b>Print</b> mode - - &New... diff --git a/translations/glabels_uk.ts b/translations/glabels_uk.ts index d3c0899..8887b41 100644 --- a/translations/glabels_uk.ts +++ b/translations/glabels_uk.ts @@ -708,82 +708,82 @@ - + Product - + Vendor: - - - - - - + + + + + + TextLabel - + Part #: - + Description: - + Page size: - + Label size: - + Layout: - + <html><head/><body><p>Select another product for this gLabels project.</p></body></html> - + Change product - + Orientation - + Select horizontal or vertical orientation. - + Horizontal orientation - + Vertical orientation - + Similar Products @@ -1423,693 +1423,673 @@ glabels::MainWindow - + Welcome - + Properties - + Merge - + Print - - &New... - - - - - Create a new gLabels project - - - - - &Open... - - - - - Open an existing gLabels project - - - - - &Save - - - - - Save current gLabels project - - - - - Save &As... - - - - - Save current gLabels project to a different name - - - - - Select project Edit mode - - - - - P&roperties - - - - - Select project Properties mode - - - - - &Merge - - - - - Select project Merge mode - - - - - &Print - - - - - Select project Print mode - - - - - Product Template &Designer... - - - - - Create custom templates - - - - - &Close - - - - - Close the current window - - - - - E&xit - - - - - Exit glabels - - - - - - Undo - - - - - - Redo - - - - - - - Cut - - - - - - Cut the selection - - - - - - &Copy - - - - - - Copy the selection - - - - - - &Paste - - - - - - Paste the clipboard - - - - - - &Delete - - - - - - Delete the selected objects - - - - - Select &All - - - - - Select all objects - - - - - Un-select All - - - - - Remove all selections - - - - - Preferences - - - - - Configure the application - - - - - File - - - - - Change visibility of file toolbar in current window - - - - - Editor - - - - - Change visibility of editor toolbar in current window - - - - - Grid - - - - - Change visibility of the grid in current window - - - - - Markup - - - - - Change visibility of markup lines in current window - - - - - Zoom &In - - - - - Increase magnification - - - - - Zoom &Out - - - - - Decrease magnification - - - - - Zoom &1 to 1 - - - - - Restore scale to 100% - - - - - Zoom to &Fit - - - - - Set scale to fit window - - - - - Select Mode - - - - - Select, move and modify objects - - - - - Text - - - - - Create text object - - - - - Box - - - - - Create box object - - - - - Line - - - - - Create line object - - - - - Ellipse - - - - - Create ellipse/circle object - - - - - Image - - - - - Create image object - - - - - Barcode - - - - - Create barcode object - - - - - - Bring To Front - - - - - Raise selection to top - - - - - - Send To Back - - - - - Lower selection to bottom - - - - - - Rotate Left - - - - - Rotate object(s) 90 degrees counter-clockwise - - - - - - Rotate Right - - - - - Rotate object(s) 90 degrees clockwise - - - - - - Flip Horizontally - - - - - Flip object(s) horizontally - - - - - - Flip Vertically - - - - - Flip object(s) vertically - - - - - - Align Left - - - - - Align objects to left edges - - - - - - Align Center - - - - - Align objects to horizontal centers - - - - - - Align Right - - - - - Align objects to right edges - - - - - - Align Top - - - - - Align objects to top edges - - - - - - Align Middle - - - - - Align objects to vertical centers - - - - - - Align Bottom - - - - - Align objects to bottom edges - - - - - - Center Horizontally - - - - - Horizontally center objects in label - - - - - - Center Vertically - - - - - Vertically center objects in label - - - - - &Contents... - - - - - Open gLabels manual - - - - - &About... - - - - - About gLabels - - - - - - &File - - - - - - &Edit - - - - + Edit - - Select <b>Edit</b> mode + + &New... - - Select <b>Properties</b> mode + + Create a new gLabels project - - Select <b>Merge</b> mode + + &Open... - - Select <b>Print</b> mode + + Open an existing gLabels project - - &View + + &Save + + Save current gLabels project + + + + + Save &As... + + + + + Save current gLabels project to a different name + + + + + + &Edit + + + + + Select project Edit mode + + + + + P&roperties + + + + + Select project Properties mode + + + + + &Merge + + + + + Select project Merge mode + + + + + &Print + + + + + Select project Print mode + + + + + Product Template &Designer... + + + + + Create custom templates + + + + + &Close + + + + + Close the current window + + + + + E&xit + + + + + Exit glabels + + + + + + Undo + + + + + + Redo + + + + + + + Cut + + + + + + Cut the selection + + + + + + &Copy + + + + + + Copy the selection + + + + + + &Paste + + + + + + Paste the clipboard + + + + - Toolbars + &Delete + + + + + + Delete the selected objects + + + + + Select &All + + + + + Select all objects + + + + + Un-select All + + + + + Remove all selections + + + + + Preferences + + + + + Configure the application + + + + + File + + + + + Change visibility of file toolbar in current window + + + + + Editor + + + + + Change visibility of editor toolbar in current window + + + + + Grid + + + + + Change visibility of the grid in current window + + + + + Markup + + + + + Change visibility of markup lines in current window + + + + + Zoom &In + + + + + Increase magnification + + + + + Zoom &Out + + + + + Decrease magnification + + + + + Zoom &1 to 1 + + + + + Restore scale to 100% + + + + + Zoom to &Fit + + + + + Set scale to fit window + + + + + Select Mode + + + + + Select, move and modify objects + + + + + Text + + + + + Create text object + + + + + Box + + + + + Create box object + + + + + Line + + + + + Create line object + + + + + Ellipse + + + + + Create ellipse/circle object + + + + + Image + + + + + Create image object + + + + + Barcode + + + + + Create barcode object + + + + + + Bring To Front + + + + + Raise selection to top + + + + + + Send To Back + + + + + Lower selection to bottom + + + + + + Rotate Left + + + + + Rotate object(s) 90 degrees counter-clockwise + + + + + + Rotate Right + + + + + Rotate object(s) 90 degrees clockwise + + + + + + Flip Horizontally + + + + + Flip object(s) horizontally + + + + + + Flip Vertically + + + + + Flip object(s) vertically + + + + + + Align Left + + + + + Align objects to left edges + + + + + + Align Center + + + + + Align objects to horizontal centers + + + + + + Align Right + + + + + Align objects to right edges + + + + + + Align Top + + + + + Align objects to top edges + + + + + + Align Middle + + + + + Align objects to vertical centers + + + + + + Align Bottom + + + + + Align objects to bottom edges + + + + + + Center Horizontally + + + + + Horizontally center objects in label + + + + + + Center Vertically + + + + + Vertically center objects in label + + + + + &Contents... + + + + + Open gLabels manual + + + + + &About... + + + + + About gLabels - &Objects - - - - - &Create - - - - - - &Order - - - - - - &Rotate/Flip - - - - - - &Alignment - - - - - - Center + + &File + &View + + + + + Toolbars + + + + + &Objects + + + + + &Create + + + + + + &Order + + + + + + &Rotate/Flip + + + + + + &Alignment + + + + + + Center + + + + &Help - + &Editor - + (modified) - + Save changes to project "%1" before closing? - + Your changes will be lost if you don't save them. - + Save project? - + Paste - + Delete - + Create Text - + Create Box - + Create Line - + Create Ellipse - + Create Image - + Create Barcode diff --git a/translations/glabels_zh_CN.ts b/translations/glabels_zh_CN.ts index 2512ff8..e0d3c64 100644 --- a/translations/glabels_zh_CN.ts +++ b/translations/glabels_zh_CN.ts @@ -1150,34 +1150,18 @@ Edit - - Select <b>Edit</b> mode - - Properties - - Select <b>Properties</b> mode - - Merge - - Select <b>Merge</b> mode - - Print - - Select <b>Print</b> mode - - &New... diff --git a/translations/glabels_zh_HK.ts b/translations/glabels_zh_HK.ts index 56fa22b..8e4f4d6 100644 --- a/translations/glabels_zh_HK.ts +++ b/translations/glabels_zh_HK.ts @@ -1148,34 +1148,18 @@ Edit - - Select <b>Edit</b> mode - - Properties - - Select <b>Properties</b> mode - - Merge - - Select <b>Merge</b> mode - - Print - - Select <b>Print</b> mode - - &New... diff --git a/translations/glabels_zh_TW.ts b/translations/glabels_zh_TW.ts index 4c94d82..09c3ce7 100644 --- a/translations/glabels_zh_TW.ts +++ b/translations/glabels_zh_TW.ts @@ -1148,34 +1148,18 @@ Edit - - Select <b>Edit</b> mode - - Properties - - Select <b>Properties</b> mode - - Merge - - Select <b>Merge</b> mode - - Print - - Select <b>Print</b> mode - - &New...