diff options
author | Florian Jung <flo@windfisch.org> | 2011-08-15 12:37:39 +0000 |
---|---|---|
committer | Florian Jung <flo@windfisch.org> | 2011-08-15 12:37:39 +0000 |
commit | 23f3026199641b6e2a2af69e10353cbe304e5649 (patch) | |
tree | e6cd69a129b10ec59ba96b4fa01fc9c5875e0be1 /muse2/muse/marker | |
parent | 078e927639369928a6fa0483c82867dae6cbf9a2 (diff) |
added transport and panic toolbars to all TopWins
removed the Toplevel class, as the TopWin::type() function replaces it
Diffstat (limited to 'muse2/muse/marker')
-rw-r--r-- | muse2/muse/marker/markerview.cpp | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/muse2/muse/marker/markerview.cpp b/muse2/muse/marker/markerview.cpp index ff7c8c07..ad1e49d2 100644 --- a/muse2/muse/marker/markerview.cpp +++ b/muse2/muse/marker/markerview.cpp @@ -151,7 +151,7 @@ void MarkerView::closeEvent(QCloseEvent* e) //--------------------------------------------------------- MarkerView::MarkerView(QWidget* parent) - : TopWin(parent, "markerview", Qt::Window /*| WDestructiveClose*/) + : TopWin(TopWin::MARKER, parent, "markerview", Qt::Window /*| WDestructiveClose*/) { //setAttribute(Qt::WA_DeleteOnClose); @@ -178,14 +178,24 @@ MarkerView::MarkerView(QWidget* parent) settingsMenu->addAction(subwinAction); - //---------ToolBar---------------------------------- - tools = addToolBar(tr("marker-tools")); - tools->addActions(undoRedo->actions()); + // Toolbars --------------------------------------------------------- + QToolBar* undo_tools=addToolBar(tr("Undo/Redo tools")); + undo_tools->setObjectName("Undo/Redo tools"); + undo_tools->addActions(undoRedo->actions()); QToolBar* edit = addToolBar(tr("edit tools")); + edit->setObjectName("marker edit tools"); edit->addAction(markerAdd); edit->addAction(markerDelete); + QToolBar* panic_toolbar = addToolBar(tr("panic")); + panic_toolbar->setObjectName("panic"); + panic_toolbar->addAction(panicAction); + + QToolBar* transport_toolbar = addToolBar(tr("transport")); + transport_toolbar->setObjectName("transport"); + transport_toolbar->addActions(transportAction->actions()); + //--------------------------------------------------- // master //--------------------------------------------------- |