diff options
| author | Florian Jung <flo@windfisch.org> | 2012-01-18 17:40:50 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2012-01-18 17:40:50 +0000 |
| commit | 4cb5a2b9feebffecd42789d529b3ca790e8206ac (patch) | |
| tree | 4da9ccd543216bc9d8c34127587644c073e5905b /muse2/muse/master | |
| parent | ba4e43028bf066d1bec367321d8e31aacc5ca530 (diff) | |
moved redundant toolbar generation into TopWin::TopWin
Diffstat (limited to 'muse2/muse/master')
| -rw-r--r-- | muse2/muse/master/lmaster.cpp | 12 | ||||
| -rw-r--r-- | muse2/muse/master/masteredit.cpp | 13 |
2 files changed, 0 insertions, 25 deletions
diff --git a/muse2/muse/master/lmaster.cpp b/muse2/muse/master/lmaster.cpp index f461e1d3..91ffdf7e 100644 --- a/muse2/muse/master/lmaster.cpp +++ b/muse2/muse/master/lmaster.cpp @@ -203,10 +203,6 @@ LMaster::LMaster() connect(signalMapper, SIGNAL(mapped(int)), SLOT(cmd(int))); // Toolbars --------------------------------------------------------- - QToolBar* undo_tools=addToolBar(tr("Undo/Redo tools")); - undo_tools->setObjectName("Undo/Redo tools"); - undo_tools->addActions(MusEGlobal::undoRedo->actions()); - QToolBar* edit = addToolBar(tr("Edit tools")); edit->setObjectName("Master List Edit Tools"); QToolButton* tempoButton = new QToolButton(); @@ -222,14 +218,6 @@ LMaster::LMaster() edit->addWidget(timeSigButton); edit->addWidget(keyButton); - QToolBar* panic_toolbar = addToolBar(tr("panic")); - panic_toolbar->setObjectName("panic"); - panic_toolbar->addAction(MusEGlobal::panicAction); - - QToolBar* transport_toolbar = addToolBar(tr("transport")); - transport_toolbar->setObjectName("transport"); - transport_toolbar->addActions(MusEGlobal::transportAction->actions()); - ///Q3Accel* qa = new Q3Accel(this); ///qa->connectItem(qa->insertItem(Qt::CTRL+Qt::Key_Z), song, SLOT(undo())); ///qa->connectItem(qa->insertItem(Qt::CTRL+Qt::Key_Y), song, SLOT(redo())); diff --git a/muse2/muse/master/masteredit.cpp b/muse2/muse/master/masteredit.cpp index f6169766..571d3c83 100644 --- a/muse2/muse/master/masteredit.cpp +++ b/muse2/muse/master/masteredit.cpp @@ -117,19 +117,6 @@ MasterEdit::MasterEdit() settingsMenu->addAction(fullscreenAction); // Toolbars --------------------------------------------------------- - QToolBar* undo_tools=addToolBar(tr("Undo/Redo tools")); - undo_tools->setObjectName("Undo/Redo tools"); - undo_tools->addActions(MusEGlobal::undoRedo->actions()); - - - QToolBar* panic_toolbar = addToolBar(tr("panic")); - panic_toolbar->setObjectName("panic"); - panic_toolbar->addAction(MusEGlobal::panicAction); - - QToolBar* transport_toolbar = addToolBar(tr("transport")); - transport_toolbar->setObjectName("transport"); - transport_toolbar->addActions(MusEGlobal::transportAction->actions()); - MusEGui::EditToolBar* tools2 = new MusEGui::EditToolBar(this, MusEGui::PointerTool | MusEGui::PencilTool | MusEGui::RubberTool); addToolBar(tools2); |