diff --git a/glabels/MainWindow.cpp b/glabels/MainWindow.cpp index 9d4b654..dce81fd 100644 --- a/glabels/MainWindow.cpp +++ b/glabels/MainWindow.cpp @@ -185,12 +185,6 @@ namespace glabels fileSaveAsAction->setStatusTip( tr("Save current file to a different name") ); connect( fileSaveAsAction, SIGNAL(triggered()), this, SLOT(fileSaveAs()) ); - filePrintAction = new QAction( tr("&Print..."), this ); - filePrintAction->setIcon( QIcon::fromTheme( "document-print", Icons::Fallback::FilePrint() ) ); - filePrintAction->setShortcut( QKeySequence::Print ); - filePrintAction->setStatusTip( tr("Print the current file") ); - connect( filePrintAction, SIGNAL(triggered()), this, SLOT(filePrint()) ); - filePropertiesAction = new QAction( tr("Properties..."), this ); filePropertiesAction->setIcon( QIcon::fromTheme( "document-properties" ) ); filePropertiesAction->setStatusTip( tr("Modify document properties") ); @@ -419,11 +413,6 @@ namespace glabels objectsCenterVertAction->setStatusTip( tr("Vertically center objects in label") ); connect( objectsCenterVertAction, SIGNAL(triggered()), this, SLOT(objectsCenterVert()) ); - objectsMergePropertiesAction = new QAction( tr("Merge Properties..."), this ); - objectsMergePropertiesAction->setIcon( Icons::Merge() ); - objectsMergePropertiesAction->setStatusTip( tr("Edit merge properties") ); - connect( objectsMergePropertiesAction, SIGNAL(triggered()), this, SLOT(objectsMergeProperties()) ); - /* Help actions */ helpContentsAction = new QAction( tr("&Contents..."), this ); @@ -450,8 +439,6 @@ namespace glabels fileMenu->addAction( fileSaveAction ); fileMenu->addAction( fileSaveAsAction ); fileMenu->addSeparator(); - fileMenu->addAction( filePrintAction ); - fileMenu->addSeparator(); fileMenu->addAction( filePropertiesAction ); fileMenu->addAction( fileTemplateDesignerAction ); fileMenu->addSeparator(); @@ -514,8 +501,6 @@ namespace glabels objectsCenterMenu = objectsMenu->addMenu( tr("Center") ); objectsCenterMenu->addAction( objectsCenterHorizAction ); objectsCenterMenu->addAction( objectsCenterVertAction ); - objectsMenu->addSeparator(); - objectsMenu->addAction( objectsMergePropertiesAction ); helpMenu = menuBar()->addMenu( tr("&Help") ); helpMenu->addAction( helpContentsAction ); @@ -532,8 +517,6 @@ namespace glabels fileToolBar->addAction( fileNewAction ); fileToolBar->addAction( fileOpenAction ); fileToolBar->addAction( fileSaveAction ); - fileToolBar->addSeparator(); - fileToolBar->addAction( filePrintAction ); editorToolBar = new QToolBar( tr("&Editor") ); editorToolBar->addAction( objectsArrowModeAction ); @@ -634,7 +617,6 @@ namespace glabels filePropertiesAction->setEnabled( enabled ); fileSaveAction->setEnabled( enabled ); fileSaveAsAction->setEnabled( enabled ); - filePrintAction->setEnabled( enabled ); editUndoAction->setEnabled( enabled ); editRedoAction->setEnabled( enabled ); editCutAction->setEnabled( enabled ); @@ -675,7 +657,6 @@ namespace glabels objectsCenterMenu->setEnabled( enabled ); objectsCenterHorizAction->setEnabled( enabled ); objectsCenterVertAction->setEnabled( enabled ); - objectsMergePropertiesAction->setEnabled( enabled ); } @@ -837,15 +818,6 @@ namespace glabels } - /// - /// File->Print Action - /// - void MainWindow::filePrint() - { - File::print( this ); - } - - /// /// File->Properties Action /// @@ -1224,15 +1196,6 @@ namespace glabels } - /// - /// Objects->Merge Properties Action - /// - void MainWindow::objectsMergeProperties() - { - qDebug() << "ACTION: objects->Merge Properties..."; - } - - /// /// Help->Contents Action /// diff --git a/glabels/MainWindow.h b/glabels/MainWindow.h index 3bce470..d4754f7 100644 --- a/glabels/MainWindow.h +++ b/glabels/MainWindow.h @@ -82,7 +82,6 @@ namespace glabels void fileOpen(); void fileSave(); void fileSaveAs(); - void filePrint(); void fileProperties(); void fileTemplateDesigner(); void fileClose(); @@ -128,7 +127,6 @@ namespace glabels void objectsAlignBottom(); void objectsCenterHoriz(); void objectsCenterVert(); - void objectsMergeProperties(); void helpContents(); void helpAbout(); @@ -202,7 +200,6 @@ namespace glabels QAction* fileOpenAction; QAction* fileSaveAction; QAction* fileSaveAsAction; - QAction* filePrintAction; QAction* filePropertiesAction; QAction* fileTemplateDesignerAction; QAction* fileCloseAction; @@ -248,7 +245,6 @@ namespace glabels QAction* objectsAlignBottomAction; QAction* objectsCenterHorizAction; QAction* objectsCenterVertAction; - QAction* objectsMergePropertiesAction; QAction* helpContentsAction; QAction* helpAboutAction;