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/master/masteredit.cpp | |
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/master/masteredit.cpp')
-rw-r--r-- | muse2/muse/master/masteredit.cpp | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/muse2/muse/master/masteredit.cpp b/muse2/muse/master/masteredit.cpp index edc1a702..30e95dbd 100644 --- a/muse2/muse/master/masteredit.cpp +++ b/muse2/muse/master/masteredit.cpp @@ -82,7 +82,7 @@ void MasterEdit::songChanged(int type) //--------------------------------------------------------- MasterEdit::MasterEdit() - : MidiEditor(_rasterInit, 0) + : MidiEditor(TopWin::MASTER, _rasterInit, 0) { setWindowTitle(tr("MusE: Mastertrack")); _raster = 0; // measure @@ -96,10 +96,19 @@ MasterEdit::MasterEdit() QMenu* settingsMenu = menuBar()->addMenu(tr("&Settings")); settingsMenu->addAction(subwinAction); - //---------ToolBar---------------------------------- - - tools = addToolBar(tr("Master 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* 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()); EditToolBar* tools2 = new EditToolBar(this, PointerTool | PencilTool | RubberTool); addToolBar(tools2); |