diff options
| author | Florian Jung <flo@windfisch.org> | 2011-08-24 18:55:20 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2011-08-24 18:55:20 +0000 |
| commit | 944f38cbb3f7f8f516b78b5b0e27770a74cda446 (patch) | |
| tree | 0705c9ebf89c7fd8ce384f830cc34e6cdb86c5f9 /muse2 | |
| parent | 97d78276a49d551ff908b99d343cd3c0960a539b (diff) | |
| parent | dc67f442dbb0cd812b96bb4b62831799e8ee003f (diff) | |
again merged with trunk ("list/score bugfix")
Diffstat (limited to 'muse2')
| -rw-r--r-- | muse2/muse/liste/listedit.cpp | 4 | ||||
| -rw-r--r-- | muse2/muse/midiedit/scoreedit.cpp | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/muse2/muse/liste/listedit.cpp b/muse2/muse/liste/listedit.cpp index 970d43c4..bc90433d 100644 --- a/muse2/muse/liste/listedit.cpp +++ b/muse2/muse/liste/listedit.cpp @@ -242,13 +242,13 @@ void ListEdit::songChanged(int type) else { curPart = 0; curTrack = 0; + liste->blockSignals(true); liste->clear(); for (iPart p = parts()->begin(); p != parts()->end(); ++p) { MidiPart* part = (MidiPart*) (p->second); if (part->sn() == curPartId) curPart = part; EventList* el = part->events(); - liste->blockSignals(true); // p4.0.18 for (iEvent i = el->begin(); i != el->end(); ++i) { EventListItem* item = new EventListItem(liste, i->second, part); for (int col = 0; col < liste->columnCount(); ++col) @@ -260,8 +260,8 @@ void ListEdit::songChanged(int type) liste->scrollToItem(item, QAbstractItemView::EnsureVisible); } } - liste->blockSignals(false); } + liste->blockSignals(false); } if(!curPart) diff --git a/muse2/muse/midiedit/scoreedit.cpp b/muse2/muse/midiedit/scoreedit.cpp index 9e16bb21..908dfa08 100644 --- a/muse2/muse/midiedit/scoreedit.cpp +++ b/muse2/muse/midiedit/scoreedit.cpp @@ -4438,8 +4438,6 @@ 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,6 +4447,7 @@ void staff_t::update_part_indices() * because after A (and B) got resized, the B-resize is invalid! * o when changing toolbarstate when sharing and immediately after that * changing "share" status, the changed state isn't stored + * o arranger window's state is incorrect when starting muse (too far left) * * CURRENT TODO * M o remove that ugly "bool initalizing" stuff. it's probably unneeded (watch out for the FINDMICH message) |