summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Jonsson <spamatica@gmail.com>2012-10-01 19:32:22 +0000
committerRobert Jonsson <spamatica@gmail.com>2012-10-01 19:32:22 +0000
commit179e91299cb95ad6b24d2f2c9b59b1c0874f4238 (patch)
treeffdc067791b59ff0ae19ea2a3c38e6df72031869
parente1a3d5b87883b5faadbd43326326d4c5aadc871d (diff)
drum editor fixes
-rw-r--r--muse2/ChangeLog4
-rw-r--r--muse2/muse/midiedit/drumedit.cpp4
2 files changed, 7 insertions, 1 deletions
diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index a7c185c1..eaf58019 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -1,3 +1,7 @@
+01.10.2012:
+ - Fixed Step shortcuts 0,9 in drum editor so they actually update
+ the step size and fixed update of controller view when stepping
+ up and down (rj)
30.09.2012:
- Added part creation from wave editor - to make this really usable
more functions to set tempo etc, are needed (rj)
diff --git a/muse2/muse/midiedit/drumedit.cpp b/muse2/muse/midiedit/drumedit.cpp
index dc403d33..4d7fa906 100644
--- a/muse2/muse/midiedit/drumedit.cpp
+++ b/muse2/muse/midiedit/drumedit.cpp
@@ -438,7 +438,7 @@ DrumEdit::DrumEdit(MusECore::PartList* pl, QWidget* parent, const char* name, un
stepLenWidget->addItem("16");
stepLenWidget->setCurrentIndex(0);
stepLenWidget->setFocusPolicy(Qt::TabFocus);
- connect(stepLenWidget, SIGNAL(activated(QString)), SLOT(setStep(QString)));
+ connect(stepLenWidget, SIGNAL(currentIndexChanged(QString)), SLOT(setStep(QString)));
cursorToolbar->addWidget(stepLenWidget);
addToolBarBreak();
@@ -1366,12 +1366,14 @@ void DrumEdit::keyPressEvent(QKeyEvent* event)
dlist->setCurDrumInstrument(dlist->getSelectedInstrument()-1);
dlist->redraw();
((DrumCanvas*)canvas)->selectCursorEvent(((DrumCanvas*)canvas)->getEventAtCursorPos());
+ MusEGlobal::song->update(SC_DRUMMAP);
return;
}
else if (key == shortcuts[SHRT_INSTRUMENT_STEP_DOWN].key) {
dlist->setCurDrumInstrument(dlist->getSelectedInstrument()+1);
dlist->redraw();
((DrumCanvas*)canvas)->selectCursorEvent(((DrumCanvas*)canvas)->getEventAtCursorPos());
+ MusEGlobal::song->update(SC_DRUMMAP);
return;
}