summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2011-08-24 17:54:58 +0000
committerFlorian Jung <flo@windfisch.org>2011-08-24 17:54:58 +0000
commit97d78276a49d551ff908b99d343cd3c0960a539b (patch)
tree041aa7bfe52e879329ae089f56b7d10cbf13a2dc
parent71a196c4e2db4bf5ab618b13c4e21f8d15106298 (diff)
parent2387d77ad58f25983c47d36264f228f4f8078a37 (diff)
merged with trunk: fetched pianoroll/drumedit bug fix
-rw-r--r--muse2/muse/midiedit/dcanvas.cpp4
-rw-r--r--muse2/muse/midiedit/prcanvas.cpp2
-rw-r--r--muse2/muse/midiedit/scoreedit.cpp6
3 files changed, 3 insertions, 9 deletions
diff --git a/muse2/muse/midiedit/dcanvas.cpp b/muse2/muse/midiedit/dcanvas.cpp
index 615653b3..6abaaa51 100644
--- a/muse2/muse/midiedit/dcanvas.cpp
+++ b/muse2/muse/midiedit/dcanvas.cpp
@@ -242,10 +242,6 @@ UndoOp DrumCanvas::moveItem(CItem* item, const QPoint& pos, DragType dtype)
newEvent.setPitch(npitch);
newEvent.setTick(ntick);
- // msgAddEvent and msgChangeEvent (below) will set these, but set them here first?
- //item->setPart(part);
- item->setEvent(newEvent);
-
// Added by T356, removed by flo93: with operation groups, it happens that the
// part is too short right now, even if it's queued for being extended
//if(((int)newEvent.endTick() - (int)part->lenTick()) > 0)
diff --git a/muse2/muse/midiedit/prcanvas.cpp b/muse2/muse/midiedit/prcanvas.cpp
index 82a6a215..43edc7f5 100644
--- a/muse2/muse/midiedit/prcanvas.cpp
+++ b/muse2/muse/midiedit/prcanvas.cpp
@@ -465,8 +465,6 @@ UndoOp PianoCanvas::moveItem(CItem* item, const QPoint& pos, DragType dtype)
newEvent.setTick(ntick);
newEvent.setLenTick(event.lenTick());
- item->setEvent(newEvent);
-
// Added by T356, removed by flo93: with operation groups, it happens that the
// part is too short right now, even if it's queued for being extended
//if(((int)newEvent.endTick() - (int)part->lenTick()) > 0)
diff --git a/muse2/muse/midiedit/scoreedit.cpp b/muse2/muse/midiedit/scoreedit.cpp
index 56b85df2..9e16bb21 100644
--- a/muse2/muse/midiedit/scoreedit.cpp
+++ b/muse2/muse/midiedit/scoreedit.cpp
@@ -4438,6 +4438,8 @@ void staff_t::update_part_indices()
/* BUGS and potential bugs
* o THIS SHOULD NEVER HAPPEN: could not split note (found by tim)
+ * o when moving or resizing notes in score edit while list edit is open
+ * only one movement is possible
*
* 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
@@ -4449,12 +4451,10 @@ void staff_t::update_part_indices()
* changing "share" status, the changed state isn't stored
*
* CURRENT TODO
+ * M o remove that ugly "bool initalizing" stuff. it's probably unneeded (watch out for the FINDMICH message)
* m o shortcuts, especially for fullscreen
- * m o arranger's size hint sucks oO
- * maybe related: windows -> tile doesn't work, overrides scrollbarpolicy
* o fix saving muse main win settings in global config dialog
* o strange sizes of toolbars oO?
- * o remove that ugly "bool initalizing" stuff. it's probably unneeded (watch out for the FINDMICH message)
* o mirror most menus to an additional right-click context menu to avoid the long mouse pointer
* journey to the menu bar. try to find a way which does not involve duplicate code!
* o shortcuts for "pencil" etc don't work when only mdiwin has focus and not the mainwin inside