summaryrefslogtreecommitdiff
path: root/muse2/muse/arranger
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2011-08-15 12:37:39 +0000
committerFlorian Jung <flo@windfisch.org>2011-08-15 12:37:39 +0000
commit23f3026199641b6e2a2af69e10353cbe304e5649 (patch)
treee6cd69a129b10ec59ba96b4fa01fc9c5875e0be1 /muse2/muse/arranger
parent078e927639369928a6fa0483c82867dae6cbf9a2 (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/arranger')
-rw-r--r--muse2/muse/arranger/arrangerview.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/muse2/muse/arranger/arrangerview.cpp b/muse2/muse/arranger/arrangerview.cpp
index 576cd7eb..9e6b5c11 100644
--- a/muse2/muse/arranger/arrangerview.cpp
+++ b/muse2/muse/arranger/arrangerview.cpp
@@ -310,7 +310,7 @@ QActionGroup* populateAddTrack(QMenu* addTrack)
//---------------------------------------------------------
ArrangerView::ArrangerView(QWidget* parent)
- : TopWin(parent, "arrangerview", Qt::Window)
+ : TopWin(TopWin::ARRANGER, parent, "arrangerview", Qt::Window)
{
//setAttribute(Qt::WA_DeleteOnClose);
setWindowTitle(tr("MusE: Arranger"));
@@ -333,7 +333,6 @@ ArrangerView::ArrangerView(QWidget* parent)
QToolBar* undo_tools=addToolBar(tr("Undo/Redo tools"));
undo_tools->setObjectName("Undo/Redo tools");
undo_tools->addActions(undoRedo->actions());
- addToolBar(undo_tools);
QToolBar* panic_toolbar = addToolBar(tr("panic"));
@@ -759,9 +758,9 @@ void ArrangerView::updateScoreMenus()
const ToplevelList* toplevels=muse->getToplevels();
for (ToplevelList::const_iterator it=toplevels->begin(); it!=toplevels->end(); it++)
- if (it->type()==Toplevel::SCORE)
+ if ((*it)->type()==TopWin::SCORE)
{
- ScoreEdit* score = (ScoreEdit*) it->object();
+ ScoreEdit* score = dynamic_cast<ScoreEdit*>(*it);
action=new QAction(score->get_name(), this);
connect(action, SIGNAL(activated()), scoreOneStaffPerTrackMapper, SLOT(map()));