From 9e2ef9557a31deeb9221295e79f0ed4b28751c5b Mon Sep 17 00:00:00 2001 From: Florian Jung Date: Mon, 18 Apr 2011 18:42:57 +0000 Subject: added toolbar --- muse2/muse/midiedit/scoreedit.cpp | 52 ++++++++++++++++++++++++++++++++++----- muse2/muse/midiedit/scoreedit.h | 2 ++ 2 files changed, 48 insertions(+), 6 deletions(-) diff --git a/muse2/muse/midiedit/scoreedit.cpp b/muse2/muse/midiedit/scoreedit.cpp index b2b2e72c..a29337d5 100644 --- a/muse2/muse/midiedit/scoreedit.cpp +++ b/muse2/muse/midiedit/scoreedit.cpp @@ -162,6 +162,39 @@ ScoreEdit::ScoreEdit(PartList* pl, QWidget* parent, const char* name, unsigned i xscroll->setMinimum(0); yscroll->setMinimum(0); + + + + // Toolbars --------------------------------------------------------- + QToolBar* undo_tools=addToolBar(tr("Undo/Redo tools")); + undo_tools->setObjectName("Undo/Redo tools"); + undo_tools->addActions(undoRedo->actions()); + addToolBar(undo_tools); + + EditToolBar* edit_tools = new EditToolBar(this, PointerTool | PencilTool | RubberTool); + addToolBar(edit_tools); + edit_tools->set(PointerTool); + score_canvas->set_tool(PointerTool); + connect(edit_tools, SIGNAL(toolChanged(int)), score_canvas, SLOT(set_tool(int))); + + 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()); + + +/* TODO FINDMICHJETZT + addToolBarBreak(); + info = new NoteInfo(this); + addToolBar(info); +*/ + + + + score_canvas->song_changed(SC_EVENT_INSERTED); score_canvas->goto_tick(initPos,true); @@ -2989,7 +3022,17 @@ void ScoreCanvas::config_changed() redraw(); } - +void ScoreCanvas::set_tool(int tool) +{ + switch (tool) + { + case PointerTool: mouse_erases_notes=false; mouse_inserts_notes=false; break; + case RubberTool: mouse_erases_notes=true; mouse_inserts_notes=false; break; + case PencilTool: mouse_erases_notes=false; mouse_inserts_notes=true; break; + default: + cout << "THIS SHOULD NEVER HAPPEN: set_tool called with unknown tool ("<