Seth/sethLabels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Added toolbars to main window.

Browse Source
This commit is contained in:
Jim Evins
2013-10-26 10:40:49 -04:00
parent 03d28b8c42
commit 9b5bc45e5a
2 changed files with 102 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/MainWindow.cpp
+86 -14
View File
@@ -38,6 +38,7 @@ namespace gLabels
createActions(); createActions();
createMenus(); createMenus();
createToolBars();
} }
@@ -159,15 +160,29 @@ namespace gLabels
/* View actions */ /* View actions */
viewMainToolbarAction = new QAction( tr("Main Toolbar"), this ); viewFileToolBarAction = new QAction( tr("File"), this );
viewMainToolbarAction->setCheckable( true ); viewFileToolBarAction->setCheckable( true );
viewMainToolbarAction->setStatusTip( tr("Change visibility of main toolbar in current window") ); viewFileToolBarAction->setChecked( true );
connect( viewMainToolbarAction, SIGNAL(triggered()), this, SLOT(viewMainToolbar()) ); viewFileToolBarAction->setStatusTip( tr("Change visibility of file toolbar in current window") );
connect( viewFileToolBarAction, SIGNAL(triggered()), this, SLOT(viewFileToolBar()) );
viewDrawingToolbarAction = new QAction( tr("Drawing Toolbar"), this ); viewObjectsToolBarAction = new QAction( tr("Objects"), this );
viewDrawingToolbarAction->setCheckable( true ); viewObjectsToolBarAction->setCheckable( true );
viewDrawingToolbarAction->setStatusTip( tr("Change visibility of drawing toolbar in current window") ); viewObjectsToolBarAction->setChecked( true );
connect( viewDrawingToolbarAction, SIGNAL(triggered()), this, SLOT(viewDrawingToolbar()) ); viewObjectsToolBarAction->setStatusTip( tr("Change visibility of objects toolbar in current window") );
connect( viewObjectsToolBarAction, SIGNAL(triggered()), this, SLOT(viewObjectsToolBar()) );
viewEditToolBarAction = new QAction( tr("Edit"), this );
viewEditToolBarAction->setCheckable( true );
viewEditToolBarAction->setChecked( true );
viewEditToolBarAction->setStatusTip( tr("Change visibility of edit toolbar in current window") );
connect( viewEditToolBarAction, SIGNAL(triggered()), this, SLOT(viewEditToolBar()) );
viewViewToolBarAction = new QAction( tr("View"), this );
viewViewToolBarAction->setCheckable( true );
viewViewToolBarAction->setChecked( true );
viewViewToolBarAction->setStatusTip( tr("Change visibility of view toolbar in current window") );
connect( viewViewToolBarAction, SIGNAL(triggered()), this, SLOT(viewViewToolBar()) );
viewGridAction = new QAction( tr("Grid"), this ); viewGridAction = new QAction( tr("Grid"), this );
viewGridAction->setCheckable( true ); viewGridAction->setCheckable( true );
@@ -359,8 +374,11 @@ namespace gLabels
editMenu->addAction( editPreferencesAction ); editMenu->addAction( editPreferencesAction );
viewMenu = menuBar()->addMenu( tr("&View") ); viewMenu = menuBar()->addMenu( tr("&View") );
viewMenu->addAction( viewMainToolbarAction ); viewToolBarsMenu = viewMenu->addMenu( tr("Toolbars") );
viewMenu->addAction( viewDrawingToolbarAction ); viewToolBarsMenu->addAction( viewFileToolBarAction );
viewToolBarsMenu->addAction( viewObjectsToolBarAction );
viewToolBarsMenu->addAction( viewEditToolBarAction );
viewToolBarsMenu->addAction( viewViewToolBarAction );
viewMenu->addSeparator(); viewMenu->addSeparator();
viewMenu->addAction( viewGridAction ); viewMenu->addAction( viewGridAction );
viewMenu->addAction( viewMarkupAction ); viewMenu->addAction( viewMarkupAction );
@@ -408,6 +426,44 @@ namespace gLabels
} }
void MainWindow::createToolBars()
{
fileToolBar = addToolBar( tr("&File") );
fileToolBar->addAction( fileNewAction );
fileToolBar->addAction( fileOpenAction );
fileToolBar->addAction( fileSaveAction );
fileToolBar->addSeparator();
fileToolBar->addAction( filePrintAction );
/* TODO: restore visibility from saved state. */
objectsToolBar = addToolBar( tr("&Objects") );
objectsToolBar->addAction( objectsArrowModeAction );
objectsToolBar->addSeparator();
objectsToolBar->addAction( objectsCreateTextAction );
objectsToolBar->addAction( objectsCreateBoxAction );
objectsToolBar->addAction( objectsCreateLineAction );
objectsToolBar->addAction( objectsCreateEllipseAction );
objectsToolBar->addAction( objectsCreateImageAction );
objectsToolBar->addAction( objectsCreateBarcodeAction );
objectsToolBar->addSeparator();
objectsToolBar->addAction( objectsMergePropertiesAction );
/* TODO: restore visibility from saved state. */
editToolBar = addToolBar( tr("&Edit") );
editToolBar->addAction( editCutAction );
editToolBar->addAction( editCopyAction );
editToolBar->addAction( editPasteAction );
/* TODO: restore visibility from saved state. */
viewToolBar = addToolBar( tr("&View") );
viewToolBar->addAction( viewZoomInAction );
viewToolBar->addAction( viewZoomOutAction );
viewToolBar->addAction( viewZoom1to1Action );
viewToolBar->addAction( viewZoomToFitAction );
/* TODO: restore visibility from saved state. */
}
void MainWindow::fileNew() void MainWindow::fileNew()
{ {
std::cout << "ACTION: file->New" << std::endl; std::cout << "ACTION: file->New" << std::endl;
@@ -516,15 +572,31 @@ namespace gLabels
} }
void MainWindow::viewMainToolbar() void MainWindow::viewFileToolBar()
{ {
std::cout << "ACTION: edit->Main Toolbar" << std::endl; fileToolBar->setVisible( viewFileToolBarAction->isChecked() );
/* TODO: save state. */
} }
void MainWindow::viewDrawingToolbar() void MainWindow::viewObjectsToolBar()
{ {
std::cout << "ACTION: edit->Drawing Toolbar" << std::endl; objectsToolBar->setVisible( viewObjectsToolBarAction->isChecked() );
/* TODO: save state. */
}
void MainWindow::viewEditToolBar()
{
editToolBar->setVisible( viewEditToolBarAction->isChecked() );
/* TODO: save state. */
}
void MainWindow::viewViewToolBar()
{
viewToolBar->setVisible( viewViewToolBarAction->isChecked() );
/* TODO: save state. */
} }
app/MainWindow.h
+16 -4
View File
@@ -26,6 +26,7 @@
#include <QCloseEvent> #include <QCloseEvent>
#include <QMenuBar> #include <QMenuBar>
#include <QMenu> #include <QMenu>
#include <QToolBar>
namespace gLabels namespace gLabels
@@ -64,8 +65,10 @@ namespace gLabels
void editUnSelectAll(); void editUnSelectAll();
void editPreferences(); void editPreferences();
void viewMainToolbar(); void viewFileToolBar();
void viewDrawingToolbar(); void viewObjectsToolBar();
void viewEditToolBar();
void viewViewToolBar();
void viewGrid(); void viewGrid();
void viewMarkup(); void viewMarkup();
void viewZoomIn(); void viewZoomIn();
@@ -103,10 +106,12 @@ namespace gLabels
private: private:
void createActions(); void createActions();
void createMenus(); void createMenus();
void createToolBars();
QMenu *fileMenu; QMenu *fileMenu;
QMenu *editMenu; QMenu *editMenu;
QMenu *viewMenu; QMenu *viewMenu;
QMenu *viewToolBarsMenu;
QMenu *objectsMenu; QMenu *objectsMenu;
QMenu *objectsCreateMenu; QMenu *objectsCreateMenu;
QMenu *objectsOrderMenu; QMenu *objectsOrderMenu;
@@ -115,6 +120,11 @@ namespace gLabels
QMenu *objectsCenterMenu; QMenu *objectsCenterMenu;
QMenu *helpMenu; QMenu *helpMenu;
QToolBar *fileToolBar;
QToolBar *objectsToolBar;
QToolBar *editToolBar;
QToolBar *viewToolBar;
QAction *fileNewAction; QAction *fileNewAction;
QAction *fileOpenAction; QAction *fileOpenAction;
QAction *fileSaveAction; QAction *fileSaveAction;
@@ -135,8 +145,10 @@ namespace gLabels
QAction *editUnSelectAllAction; QAction *editUnSelectAllAction;
QAction *editPreferencesAction; QAction *editPreferencesAction;
QAction *viewMainToolbarAction; QAction *viewFileToolBarAction;
QAction *viewDrawingToolbarAction; QAction *viewObjectsToolBarAction;
QAction *viewEditToolBarAction;
QAction *viewViewToolBarAction;
QAction *viewGridAction; QAction *viewGridAction;
QAction *viewMarkupAction; QAction *viewMarkupAction;
QAction *viewZoomInAction; QAction *viewZoomInAction;