diff options
Diffstat (limited to 'muse2')
| -rw-r--r-- | muse2/ChangeLog | 4 | ||||
| -rw-r--r-- | muse2/muse/arranger/pcanvas.cpp | 7 | ||||
| -rw-r--r-- | muse2/muse/midiedit/scoreedit.cpp | 10 | ||||
| -rw-r--r-- | muse2/muse/widgets/canvas.cpp | 9 |
4 files changed, 12 insertions, 18 deletions
diff --git a/muse2/ChangeLog b/muse2/ChangeLog index 1af47f28..3092040e 100644 --- a/muse2/ChangeLog +++ b/muse2/ChangeLog @@ -1,9 +1,13 @@ +04.06.2011: + - changed behaviour of middle click in all canvases to "delete" (flo93) 02.06.2011: - the score editor now allows batch-movements, that is, you can transpose or move the whole selection and not only single notes (flo93) - the functions now return as boolean, if they have triggered undo (flo93) + - applied another patch from WillyFoobar: moved Q_OBJECT + to the top of each class definition, where it belongs (flo93) 30.05.2011: - implemented cut,copy'n'paste and the "select foo" entries in the score editor (flo93) - added select_foo() functions to functions.cpp (flo93) diff --git a/muse2/muse/arranger/pcanvas.cpp b/muse2/muse/arranger/pcanvas.cpp index d65b8957..7b63d9e9 100644 --- a/muse2/muse/arranger/pcanvas.cpp +++ b/muse2/muse/arranger/pcanvas.cpp @@ -214,9 +214,7 @@ void PartCanvas::returnPressed() newPart->setName(lineEditor->text()); // Indicate do undo, and do port controller values but not clone parts. - //audio->msgChangePart(oldPart, newPart); audio->msgChangePart(oldPart, newPart, true, true, false); - //printf("PartCanvas::returnPressed after msgChangePart oldPart refs:%d Arefs:%d newPart refs:%d Arefs:%d\n", oldPart->events()->refCount(), oldPart->events()->arefCount(), newPart->events()->refCount(), newPart->events()->arefCount()); editMode = false; } @@ -429,12 +427,10 @@ bool PartCanvas::moveItem(CItem* item, const QPoint& newpos, DragType t) if (dtrack->type() == Track::WAVE) { // Indicate no undo, and do not do port controller values and clone parts. - //audio->msgChangePart((WavePart*)spart, (WavePart*)dpart,false); audio->msgChangePart((WavePart*)spart, (WavePart*)dpart, false, false, false); } else { // Indicate no undo, and do port controller values but not clone parts. - //audio->msgChangePart(spart, dpart, false); audio->msgChangePart(spart, dpart, false, true, false); } spart->setSelected(false); @@ -794,10 +790,7 @@ void PartCanvas::itemPopup(CItem* item, int n, const QPoint& pt) } song->startUndo(); // Indicate no undo, and do port controller values but not clone parts. - //audio->msgChangePart(spart, dpart, false); audio->msgChangePart(spart, dpart, false, true, false); - //printf("PartCanvas::itemPopup: #2 spart %s %p next:%s %p prev:%s %p\n", spart->name().toLatin1().constData(), spart, spart->nextClone()->name().toLatin1().constData(), spart->nextClone(), spart->prevClone()->name().toLatin1().constData(), spart->prevClone()); - //printf("PartCanvas::itemPopup: #2 dpart %s %p next:%s %p prev:%s %p\n", dpart->name().toLatin1().constData(), dpart, dpart->nextClone()->name().toLatin1().constData(), dpart->nextClone(), dpart->prevClone()->name().toLatin1().constData(), dpart->prevClone()); song->endUndo(SC_PART_MODIFIED); break; // Has to be break here, right? diff --git a/muse2/muse/midiedit/scoreedit.cpp b/muse2/muse/midiedit/scoreedit.cpp index 0eb61554..e2b17dd3 100644 --- a/muse2/muse/midiedit/scoreedit.cpp +++ b/muse2/muse/midiedit/scoreedit.cpp @@ -4451,9 +4451,7 @@ void staff_t::update_part_indices() /* BUGS and potential bugs - * o quantize always quantizes length. make this selectable! * o when the keymap is not used, this will probably lead to a bug - * same when mastertrack is disabled * o tied notes don't work properly when there's a key-change in * between, for example, when a cis is tied to a des * @@ -4466,12 +4464,14 @@ void staff_t::update_part_indices() * o controller view in score editor * o deal with expanding parts * o fix sigedit boxes - * o mid-click in pianoroll: change to "delete", or initiate drag and drop between windows? - * - * * o drum list: scroll while dragging + * o remove functions for disabling key/sigmap + * o mastertrack editor: key-combobox is buggy + * o drum editor: channel-stuff * * IMPORTANT TODO + * o solo button + * o grand staff brace * o do partial recalculating; recalculating can take pretty long * (0,5 sec) when displaying a whole song in scores * o transpose etc. must also transpose key-pressure events diff --git a/muse2/muse/widgets/canvas.cpp b/muse2/muse/widgets/canvas.cpp index fc0b1b6f..3e9cb46e 100644 --- a/muse2/muse/widgets/canvas.cpp +++ b/muse2/muse/widgets/canvas.cpp @@ -569,12 +569,9 @@ void Canvas::viewMousePressEvent(QMouseEvent* event) } if (curItem && (event->button() == Qt::MidButton)) { - if (!curItem->isSelected()) { - selectItem(curItem, true); - updateSelection(); - redraw(); - } - startDrag(curItem, ctrl); + deleteItem(start); // changed from "start drag" to "delete" by flo93 + drag = DRAG_DELETE; + setCursor(); } else if (event->button() == Qt::RightButton) { if (curItem) { |