diff --git a/glabels/MainWindow.cpp b/glabels/MainWindow.cpp index 112ae2d..beb402f 100644 --- a/glabels/MainWindow.cpp +++ b/glabels/MainWindow.cpp @@ -70,8 +70,6 @@ namespace glabels mContents = new QListWidget(); mContents->setViewMode(QListView::ListMode); mContents->setMovement(QListView::Static); - mContents->setMinimumWidth(96); - mContents->setMaximumWidth(96); mContents->setSpacing(6); // Pages widget @@ -86,27 +84,37 @@ namespace glabels // Add "Editor" page mPages->addWidget( editorPage ); mEditorButton = new QListWidgetItem(mContents); - mEditorButton->setText(tr("Home")); + mEditorButton->setText(tr("Edit")); + mEditorButton->setToolTip( tr("Select Edit mode") ); mEditorButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); // 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); // 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); // 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 ); + // Set initial page selection mWelcomeButton->setSelected( true ); mPages->setCurrentIndex(mContents->row(mWelcomeButton)); @@ -246,6 +254,26 @@ namespace glabels fileSaveAsAction->setStatusTip( tr("Save current gLabels project to a different name") ); connect( fileSaveAsAction, SIGNAL(triggered()), this, SLOT(fileSaveAs()) ); + fileShowEditorPageAction = new QAction( tr("&Edit") , this ); + fileShowEditorPageAction->setShortcut( QKeySequence( Qt::CTRL + Qt::Key_1 ) ); + fileShowEditorPageAction->setStatusTip( tr("Select project Edit mode") ); + connect( fileShowEditorPageAction, SIGNAL(triggered()), this, SLOT(fileShowEditorPage()) ); + + fileShowPropertiesPageAction = new QAction( tr("P&roperties") , this ); + fileShowPropertiesPageAction->setShortcut( QKeySequence( Qt::CTRL + Qt::Key_2 ) ); + fileShowPropertiesPageAction->setStatusTip( tr("Select project Properties mode") ); + connect( fileShowPropertiesPageAction, SIGNAL(triggered()), this, SLOT(fileShowPropertiesPage()) ); + + fileShowMergePageAction = new QAction( tr("&Merge") , this ); + fileShowMergePageAction->setShortcut( QKeySequence( Qt::CTRL + Qt::Key_3 ) ); + fileShowMergePageAction->setStatusTip( tr("Select project Merge mode") ); + connect( fileShowMergePageAction, SIGNAL(triggered()), this, SLOT(fileShowMergePage()) ); + + fileShowPrintPageAction = new QAction( tr("&Print") , this ); + fileShowPrintPageAction->setShortcut( QKeySequence::Print ); + fileShowPrintPageAction->setStatusTip( tr("Select project Print mode") ); + connect( fileShowPrintPageAction, SIGNAL(triggered()), this, SLOT(fileShowPrintPage()) ); + fileTemplateDesignerAction = new QAction( tr("Product Template &Designer..."), this ); fileTemplateDesignerAction->setStatusTip( tr("Create custom templates") ); connect( fileTemplateDesignerAction, SIGNAL(triggered()), this, SLOT(fileTemplateDesigner()) ); @@ -517,6 +545,11 @@ namespace glabels fileMenu->addAction( fileSaveAction ); fileMenu->addAction( fileSaveAsAction ); fileMenu->addSeparator(); + fileMenu->addAction( fileShowEditorPageAction ); + fileMenu->addAction( fileShowPropertiesPageAction ); + fileMenu->addAction( fileShowMergePageAction ); + fileMenu->addAction( fileShowPrintPageAction ); + fileMenu->addSeparator(); fileMenu->addAction( fileTemplateDesignerAction ); fileMenu->addSeparator(); fileMenu->addAction( fileCloseAction ); @@ -988,6 +1021,12 @@ namespace glabels 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) ); } @@ -1036,6 +1075,42 @@ namespace glabels } + /// + /// File->Show Editor Page + /// + void MainWindow::fileShowEditorPage() + { + mContents->setCurrentItem( mEditorButton ); + } + + + /// + /// File->Show Properties Page + /// + void MainWindow::fileShowPropertiesPage() + { + mContents->setCurrentItem( mPropertiesButton ); + } + + + /// + /// File->Show Merge Page + /// + void MainWindow::fileShowMergePage() + { + mContents->setCurrentItem( mMergeButton ); + } + + + /// + /// File->Show Print Page + /// + void MainWindow::fileShowPrintPage() + { + mContents->setCurrentItem( mPrintButton ); + } + + /// /// File->Template Designer Action /// diff --git a/glabels/MainWindow.h b/glabels/MainWindow.h index 80c286b..1c934b7 100644 --- a/glabels/MainWindow.h +++ b/glabels/MainWindow.h @@ -92,6 +92,10 @@ namespace glabels void fileOpen(); void fileSave(); void fileSaveAs(); + void fileShowEditorPage(); + void fileShowPropertiesPage(); + void fileShowMergePage(); + void fileShowPrintPage(); void fileTemplateDesigner(); void fileClose(); void fileExit(); @@ -235,6 +239,10 @@ namespace glabels QAction* fileOpenAction; QAction* fileSaveAction; QAction* fileSaveAsAction; + QAction* fileShowEditorPageAction; + QAction* fileShowPropertiesPageAction; + QAction* fileShowMergePageAction; + QAction* fileShowPrintPageAction; QAction* fileTemplateDesignerAction; QAction* fileCloseAction; QAction* fileExitAction; diff --git a/translations/glabels_C.ts b/translations/glabels_C.ts index 967ea58..1074633 100644 --- a/translations/glabels_C.ts +++ b/translations/glabels_C.ts @@ -1286,17 +1286,12 @@ glabels::MainWindow - + Welcome - - Home - - - - + Properties @@ -1306,617 +1301,678 @@ - + 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 - - - Product Template &Designer... - - - - - Create custom templates - - - - - &Close - - - - - Close the current window - - - E&xit + Select project Edit mode - Exit glabels + 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 + + + + + Select <b>Properties</b> mode + + + + + Select <b>Merge</b> mode + + + + + Select <b>Print</b> mode + + + + &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_de_DE.ts b/translations/glabels_de_DE.ts index 873a04d..02f8484 100644 --- a/translations/glabels_de_DE.ts +++ b/translations/glabels_de_DE.ts @@ -1286,17 +1286,12 @@ glabels::MainWindow - + Welcome Willkommen - - Home - Home - - - + Properties Eigenschaften @@ -1306,617 +1301,678 @@ 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 + + + + + P&roperties + + + + + Select project Properties mode + + + + + &Merge + + + + + Select project Merge mode + + + + + &Print + + + + + Select project Print mode + + + + 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 + + + + + Select <b>Edit</b> mode + + + + + Select <b>Properties</b> mode + + + + + Select <b>Merge</b> mode + + + + + Select <b>Print</b> mode + + + + &View &Ansicht - + Toolbars Werkzeugleisten - + &Objects &Objekte - + &Create Er&zeugen - - + + &Order &Anordnung - - + + &Rotate/Flip D&rehen/Spiegeln - - + + &Alignment &Ausrichtung - - + + Center Mitte - + &Help &Hilfe - + &Editor &Editor - + (modified) (geändert) - + Save changes to project "%1" before closing? Ä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. - + Save project? Projekt speichern? - + Paste Einfügen - + Delete Löschen - + Create Text Textobjekt erzeugen - + Create Box Rechteck-Objekt erzeugen - + Create Line Linienobjekt erzeugen - + Create Ellipse Ellipse erzeugen - + Create Image Bild erzeugen - + Create Barcode Strichcode erzeugen