Commit graph

17407 commits

Author SHA1 Message Date
Dmitri Ovodok
43573a9edd
Merge pull request #5741 from mattmcclinch/301414-paste-tie
fix #301414: Corrupt tie created on paste of tied note that requires additional tie
2020-02-27 14:54:48 +02:00
Dmitri Ovodok
ed32c5b9ec
Merge pull request #5758 from mattmcclinch/301605-add-slur
fix #301605: Undoing slur addition to a range only removes one slur
2020-02-27 12:02:15 +02:00
Dmitri Ovodok
8e00f8bbe2 Fix restricting dragging text elements to page boundaries 2020-02-27 09:38:29 +02:00
Dmitri Ovodok
a4bb2d0beb Remove unused SpannerEditData 2020-02-27 09:35:51 +02:00
Matt McClinch
7e185d280e fix #301605: Undoing slur addition to a range only removes one slur
Resolves: https://musescore.org/en/node/301605.

Prior to this commit, ScoreView::cmdAddSlur() could be called multiple times from within ScoreView::addSlur(), resulting in the need for multiple "undo" commands to completely undo a single "add-slur" command. This commit swaps the names of these two functions, and, more importantly, only calls Score::startCmd() and Score::endCmd() once for the entire operation.
2020-02-25 11:08:45 -05:00
Dmitri Ovodok
9eec241511
Merge pull request #5751 from Jojo-Schmitz/cimbassso
fix #301529: Change Cimbasso sound from Tuba to Trombone
2020-02-25 09:50:49 +02:00
Dmitri Ovodok
c607ece1a7
Merge pull request #5753 from mattmcclinch/301478-readTextProperties206
fix #301478: Relative text position inside a frame is not saved for scores imported from 2.x
2020-02-25 09:49:53 +02:00
Dmitri Ovodok
4bb2643fde
Merge pull request #5756 from Spire42/301543-view-selection-filter-unchecked-on-startup
Fix #301543: Selection Filter's Checkbox Not Checked After Restart
2020-02-25 09:46:27 +02:00
J. Edward Sanchez
423ad3b1e4 Fix #301543: Selection Filter's Checkbox Not Checked After Restart
Fixed a problem that caused the “Selection Filter” item in the “View Menu” to be unchecked at application startup when the “Selection Filter” panel was in fact visible.
2020-02-24 03:14:29 -08:00
Joachim Schmitz
85c2cd8d70 fix #301529: Change Cimbasso sound from Tuba to Trombone 2020-02-24 10:43:38 +01:00
Matt McClinch
2baa558a12 fix #301478: Relative text position inside a frame is not saved for scores imported from 2.x
Resolves: https://musescore.org/en/node/301478.

When importing scores from 1.x or 2.x, the property flags for styled properties must be set to UNSTYLED. Otherwise, the properties will not be written when the score is saved. ScoreElement::readProperty() should be used wherever possible, since it takes care of setting the property flags correctly. When it is not possible to use ScoreElement::readProperty(), ScoreElement::setPropertyFlags() must be called after setting the property.
2020-02-23 13:00:44 -05:00
Dmitri Ovodok
66c38772dc
Merge pull request #5739 from Jojo-Schmitz/compiler-warning
fix MSVC compiler warning
2020-02-22 14:40:23 +02:00
Dmitri Ovodok
8641f285aa Fixup for 9f90b895b: fix removal of newly added empty text 2020-02-22 13:04:37 +02:00
Dmitri Ovodok
5a5af39ff6
Merge pull request #5742 from MarcSabatella/301436-last-element-mm
fix #301436: invalid selection when navigating with mmrests
2020-02-22 11:28:42 +02:00
Dmitri Ovodok
9f90b895bf Fix a crash on leaving text edit mode without editing text
Fixup for 5b2853bf92
2020-02-22 11:20:00 +02:00
MarcSabatella
0919317037 add test 2020-02-21 15:29:23 -07:00
MarcSabatella
b5d53248ab fix #301436: invalid selection when navigating with mmrests
Resolves: https://musescore.org/en/node/301436

The accessibility navigation commands
(Alt+Left/Right, also Ctrl+Alt+Shift+Left/Right)
were not properly checking for mmrests,
resulting in selection of elements in the underlying measures
that were not valid in the current layout.
This adds the necessary checks.
Mostly just a matter of adding "MM" to various function calls.
In a couple of places, the appropriate function did not exist,
so I added it.
Also corrected errors in Ctrl+Alt+Shift+Left/Right
that occurs when going past the end of a staff,
the code to wrap around to the next staff this case well.
In part this is because the implementation of barlines changed
since the code was written.
Barlines are per-staff now even when spanned,
so the use and management of prevTrack is no longer appropriate.
2020-02-21 12:23:26 -07:00
Matt McClinch
2341f8192b fix #301414: Corrupt tie created on paste of tied note that requires additional tie
Resolves: https://musescore.org/en/node/301414.

During paste, if a note has a tie, that tie is remembered as a pending connector which is later added to the score when XmlReader::checkConnectors() is called. If a note is too long to fit in the measure, it is split up into a series of tied notes, but the pending tie needs to be adjusted to begin at the last tied note in the series, instead of at the original note.
2020-02-21 13:15:06 -05:00
Dmitri Ovodok
52f357df83 Remove Unix executable attribute from some icons and source files 2020-02-21 14:39:28 +02:00
Dmitri Ovodok
3f67f80b1a
Merge pull request #5740 from AntonioBL/fixvtests
Fix generation of vtests
2020-02-21 14:15:41 +02:00
AntonioBL
314f8ac625 Fix generation of vtests 2020-02-21 12:11:41 +01:00
Joachim Schmitz
680d464fc2 fix MSVC compiler warning 2020-02-21 10:44:00 +01:00
Dmitri Ovodok
6631fee136
Merge pull request #5718 from Howard-C/cross-staff-offset
fix #284682: position offset when moving cross-beam notes with the mouse
2020-02-20 13:45:21 +02:00
Dmitri Ovodok
180762c858
Merge pull request #5714 from Howard-C/system-text-properties
Display "Properties" button in inspector too for system texts
2020-02-20 13:42:45 +02:00
Dmitri Ovodok
1dec4002ee
Merge pull request #5736 from jthistle/pr-template-update
make checklist instruction a hidden comment in PR template
2020-02-20 13:39:10 +02:00
Dmitri Ovodok
b5772acf88
Merge pull request #5588 from njvdberg/issue-293593
fix #293593 - Issues with ottavas
2020-02-20 13:38:13 +02:00
Dmitri Ovodok
a00781f5b2
Merge pull request #5570 from dmitrio95/295544-endedit-text-undoes-changes
fix #295544: fix reverting non-textual changes made in text editing mode
2020-02-20 13:29:34 +02:00
James Thistlewood
521941df21 make checklist instruction a hidden comment in PR template 2020-02-20 08:54:01 +00:00
Dmitri Ovodok
5732889108
Merge pull request #5734 from jthistle/301340-dynamics-repeats
fix #301340: dynamic playback after repeats does not match with score
2020-02-20 10:02:17 +02:00
James Thistlewood
0dcbf2af0f fix #301340: dynamic playback after repeats does not match with score 2020-02-19 21:31:07 +00:00
Niek van den Berg
66be5a18fa fix #293593 - Issues with ottavas
Corrects first problem: Status doesn't display the pitch of note that have an
ottave line. This is solved in Note::tpcUserName().

Solves the second problem in issue 293593: Accidentals do apply if 8va sign is added.
This is solved in Note::updateAccidental(). All calculations are based on the
effective pitch of the a note rather than the actual pitch. The solution now
takes to ottava signs into account by using the actual pitch.

For easily find out wheather an ottava is applied, a new method ottavaCapoFret()
is added which returns the pitch offset by an ottava (or capo fret). To prevent
code dublication, ppitch() also use this new ottavaCapoFret() method.
2020-02-18 11:44:04 +01:00
Dmitri Ovodok
6bea8e24ae
Merge pull request #5724 from mattmcclinch/score-cmd
Fix compiler warnings resulting from restructure of ScoreView::cmd(), and make cmdList in Score::cmd() a static vector..
2020-02-17 14:38:05 +02:00
Matt McClinch
82858514a3 Made cmdList a static vector in Score::cmd(), just like the one in ScoreView::cmd().
Also, fixed the compiler warnings about the unused parameter to the lambda functions in ScoreView::cmd().
2020-02-17 04:53:24 -05:00
Dmitri Ovodok
384f90490b
Merge pull request #5584 from mattmcclinch/restructure-scoreview-cmd
Restructure ScoreView::cmd(const char* s) to get rid of all of the nested else if statements.
2020-02-17 11:30:46 +02:00
Dmitri Ovodok
13acb3be28 Remove redundant includes 2020-02-17 11:06:30 +02:00
Dmitri Ovodok
4aea84c512
Merge pull request #5713 from Howard-C/invisible-articulation
fix #301115: invisible articulations affect layout of other articulations
2020-02-17 10:21:27 +02:00
Dmitri Ovodok
85fab590d5
Merge pull request #5606 from lvinken/291758-musicxml-tbox-vbox-export
fix #291758 - [Musicxml Export] - Tbox and Vbox after measure 1 don't export
2020-02-17 10:10:25 +02:00
Dmitri Ovodok
d9a7ffd95d
Merge pull request #5721 from mattmcclinch/301174-restore-selection
fix #301174: Undo selects an extra measure
2020-02-17 09:59:11 +02:00
Dmitri Ovodok
15bf101087
Merge pull request #5707 from AntonioBL/prartifacts
Optimize commit message retrieval when building artifacts + collect_a…
2020-02-17 09:56:24 +02:00
Dmitri Ovodok
df48b304ea
Merge pull request #5708 from Jojo-Schmitz/notename
small extension to the notenames plugin
2020-02-17 09:27:42 +02:00
Leon Vinken
8e36f3985a fix #301200 - Cleanup MusicXML tests (mtest/musicxml/io/tst_mxml_io.cpp) 2020-02-16 15:55:53 +01:00
Leon Vinken
f9af60f3f9 fix #291758 - [Musicxml Export] - Tbox and Vbox after measure 1 don't export 2020-02-16 15:55:53 +01:00
Matt McClinch
40191074a3 fix #301174: Undo selects an extra measure
Resolves: https://musescore.org/en/node/301174.

When restoring a range selection that ends on the last tick of a measure, make sure that it is not extended to the first tick of the next measure.
2020-02-15 13:42:29 -05:00
Howard-C
cd342246f6 fix #284682: position offset when moving cross-beam notes with the mouse
The staff index did not count `staffMove()` in, which resulted in possibly getting the wrong clef for `line2pitch()`. This commit uses `chord->vStaffIdx()` to get the right staff index.
2020-02-15 20:23:43 +08:00
Dmitri Ovodok
fa199bddee
Merge pull request #5712 from Howard-C/note-events
fix #301116: don't write default note event values along with non-default ones
2020-02-15 11:33:18 +02:00
Matt McClinch
7feecd3164 Fixed the indentation of the cmdList vector, since making it static meant changing almost every line of code in the lambda functions anyway. 2020-02-14 11:29:57 -05:00
Matt McClinch
3ac32e57c1 Made cmdList a static vector, passing the ScoreView to the lambda function. Since some functions handle multiple commands, the command string is passed to the lambda function as well. 2020-02-14 11:05:28 -05:00
Howard-C
e327c103c2 Display "Properties" button in inspector too for system texts 2020-02-14 20:44:01 +08:00
Howard-C
d83b768f87 fix #301116: don't write default note event values along with non-default ones 2020-02-14 20:26:34 +08:00
Dmitri Ovodok
4737fe9bab
Merge pull request #5706 from Howard-C/text-line-scaling
Fix some spanner segments not scaled after spatium change
2020-02-14 13:36:30 +02:00