diff options
Diffstat (limited to 'muse2/muse/midiedit')
-rw-r--r-- | muse2/muse/midiedit/drumedit.cpp | 21 | ||||
-rw-r--r-- | muse2/muse/midiedit/pianoroll.cpp | 17 |
2 files changed, 5 insertions, 33 deletions
diff --git a/muse2/muse/midiedit/drumedit.cpp b/muse2/muse/midiedit/drumedit.cpp index acfd3a03..645dc349 100644 --- a/muse2/muse/midiedit/drumedit.cpp +++ b/muse2/muse/midiedit/drumedit.cpp @@ -223,18 +223,8 @@ DrumEdit::DrumEdit(PartList* pl, QWidget* parent, const char* name, unsigned ini // Toolbars //--------------------------------------------------- - //tools = new QToolBar(this, "drum-tools"); tools = addToolBar(tr("drum-tools")); - //new QToolButton(*openIcon, tr("Load Drummap"), - // QString::null, this, SLOT(load()), - // tools, "load drummap from file"); - - //new QToolButton(*saveIcon, tr("Store Drummap"), - // QString::null, - // this, SLOT(save()), - // tools, "store drummap to file"); - QToolButton *ldm = new QToolButton(); QToolTip::add(ldm, tr("Load Drummap")); ldm->setIcon(*openIcon); @@ -247,38 +237,31 @@ DrumEdit::DrumEdit(PartList* pl, QWidget* parent, const char* name, unsigned ini connect(sdm, SIGNAL(clicked()), SLOT(save())); tools->addWidget(sdm); - //Q3WhatsThis::whatsThisButton(tools); tools->addAction(QWhatsThis::createAction(this)); tools->addSeparator(); - //undoRedo->addTo(tools); tools->addActions(undoRedo->actions()); tools->addSeparator(); - //srec = new QToolButton(tools, "srec"); srec = new QToolButton(); QToolTip::add(srec, tr("Step Record")); srec->setIcon(*steprecIcon); - srec->setToggleButton(true); + srec->setCheckable(true); tools->addWidget(srec); - //midiin = new QToolButton(tools, "midiin"); midiin = new QToolButton(); QToolTip::add(midiin, tr("Midi Input")); midiin->setIcon(*midiinIcon); - midiin->setToggleButton(true); + midiin->setCheckable(true); tools->addWidget(midiin); tools2 = new EditToolBar(this, drumeditTools); addToolBar(tools2); QToolBar* panicToolbar = addToolBar(tr("panic")); - //panicAction->addTo(panicToolbar); panicToolbar->addAction(panicAction); - //QToolBar* transport = new QToolBar(this); QToolBar* transport = addToolBar(tr("transport")); - //transportAction->addTo(transport); transport->addActions(transportAction->actions()); addToolBarBreak(); diff --git a/muse2/muse/midiedit/pianoroll.cpp b/muse2/muse/midiedit/pianoroll.cpp index dbeda748..c9c4ec3f 100644 --- a/muse2/muse/midiedit/pianoroll.cpp +++ b/muse2/muse/midiedit/pianoroll.cpp @@ -178,51 +178,40 @@ PianoRoll::PianoRoll(PartList* pl, QWidget* parent, const char* name, unsigned i connect(menuFunctions, SIGNAL(activated(int)), SLOT(cmd(int))); //---------ToolBar---------------------------------- - //tools = new QToolBar(this, "pianoroll-tools"); tools = addToolBar(tr("pianoroll-tools")); - //undoRedo->addTo(tools); tools->addActions(undoRedo->actions()); tools->addSeparator(); - //srec = new QToolButton(tools, "srec"); // Does not like this, draws on top of other buttons! Must use QToolBar::addWidget() //srec = new QToolButton(tools); srec = new QToolButton(); QToolTip::add(srec, tr("Step Record")); srec->setIcon(*steprecIcon); - srec->setToggleButton(true); + srec->setCheckable(true); tools->addWidget(srec); - //midiin = new QToolButton(tools, "midiin"); midiin = new QToolButton(); QToolTip::add(midiin, tr("Midi Input")); midiin->setIcon(*midiinIcon); - midiin->setToggleButton(true); + midiin->setCheckable(true); tools->addWidget(midiin); - //speaker = new QToolButton(tools, "speaker"); speaker = new QToolButton(); QToolTip::add(speaker, tr("Play Events")); speaker->setIcon(*speakerIcon); - speaker->setToggleButton(true); + speaker->setCheckable(true); tools->addWidget(speaker); tools2 = new EditToolBar(this, pianorollTools); addToolBar(tools2); - //QToolBar* panicToolbar = new QToolBar(this); QToolBar* panicToolbar = addToolBar(tr("panic")); - //panicAction->addTo(panicToolbar); panicToolbar->addAction(panicAction); - //this->addToolBar(panicToolbar); //------------------------------------------------------------- // Transport Bar - //QToolBar* transport = new QToolBar(this); QToolBar* transport = addToolBar(tr("transport")); - //transportAction->addTo(transport); transport->addActions(transportAction->actions()); - //this->addToolBar(transport); addToolBarBreak(); toolbar = new Toolbar1(this, _rasterInit, _quantInit); |