Commit graph

16715 commits

Author SHA1 Message Date
Joachim Schmitz
4f873bc83d fix #296298: Inspector: segment "Leading Space" input field topped at 10sp 2019-10-30 13:22:14 +01:00
anatoly-os
1f563d32f1
Merge pull request #5433 from mattmcclinch/296127-cmd-shift-drag
fix #296127: Can't use CMD+SHIFT+Drag to copy on Mac
2019-10-30 09:34:45 +02:00
Matt McClinch
48a2591bc3 fix #296127: Can't use CMD+SHIFT+Drag to copy on Mac
Resolves: https://musescore.org/en/node/296127.

ScoreView::dragEnterEvent() must call event->accept() if event->dropAction() == Qt::CopyAction, even if for some reason (event->possibleActions() & Qt::CopyAction) evaluates to false, as is the case on macOS.
2019-10-29 22:36:55 -04:00
anatoly-os
ff43723878
Merge pull request #5362 from lvinken/295176-musicxml-instrument-change
fix #295176 - [MusicXML] improve instrument change handling
2019-10-29 11:18:40 +02:00
anatoly-os
8bf7242d64
Merge pull request #5387 from Jojo-Schmitz/readme-rtf2html
Update thirdparty section of README.md
2019-10-29 11:17:35 +02:00
anatoly-os
e924baaa92
Merge pull request #5394 from dmitrio95/283943-delete-measure-end-glissando-crash
fix #283943: fix a crash on deleting a measure at glissando end
2019-10-29 11:16:50 +02:00
anatoly-os
a6210b61f4
Merge pull request #5403 from mattmcclinch/295898-delete-stafftypechange
fix #295898: Deleting a StaffTypeChange causes a crash in macOS
2019-10-29 11:15:50 +02:00
anatoly-os
61e7ffdc77
Merge pull request #5408 from mattmcclinch/295944-tuplet-dialog
fix #295944: Tuplet dialog does not default to style settings, and creates tuplets with bad property flags
2019-10-29 11:14:21 +02:00
anatoly-os
a74d51ea10
Merge pull request #5389 from Jojo-Schmitz/rtf2html
remove librtf2html.a and rtf2html binary from repository
2019-10-29 11:13:14 +02:00
anatoly-os
4f1be2b67c
Merge pull request #5392 from Jojo-Schmitz/rtf2html-sync
sync thirdparty/rtf2html with https://github.com/lvu/rtf2html
2019-10-29 11:12:52 +02:00
anatoly-os
40efae119b
Merge pull request #5428 from mattmcclinch/enter-rest
Ensure a valid duration in the input state when entering a rest.
2019-10-29 09:58:50 +02:00
anatoly-os
eefe09ddb8
Merge pull request #5426 from MarcSabatella/campania-mac
fix #296190: Campania not rendering correctly on some macOS systems
2019-10-29 09:25:56 +02:00
anatoly-os
447a32b887
Merge pull request #5429 from anatoly-os/moveToTop_5269
Implement "Move soundfont To Top" button for Fluid/Zerberus synths GUI
2019-10-29 09:25:25 +02:00
Marc Sabatella
809a68f63f fix #296190: Campania not rendering correctly on some macOS systems
The version of Campania we just updated to (2.008) works fine on Windows
but apparently fails on macOS, at least on some systems in some cases.
The version of Campania incldued here is still built from the same basic sources,
but it turns off the "Apple" option within FontForge and turns on "Old-style kern".
This appears to fix the problem.
2019-10-28 14:58:51 -06:00
anatoly-os
566833f353 Implement "Move soundfont To Top" button for Fluid/Zerberus synths GUI
- Reapply changes from https://github.com/musescore/MuseScore/pull/5269
- Add new icon
2019-10-28 13:04:44 +02:00
anatoly-os
a737b4e0d8
Merge pull request #5423 from lvinken/295348-musicxml-missing-hairpins
fix #295348 - [Musicxml Export] - Strange Missing Hairpins
2019-10-28 10:43:49 +02:00
Dmitri Ovodok
0c1de3d920
Merge pull request #5424 from dmitrio95/296171-spanner-trigger-layout-all
fix #296171: fix triggerLayoutAll() for spanners
2019-10-28 10:37:35 +02:00
anatoly-os
b6fac5eac5 Set current version for master to 3.3.1
Most of the new merged PRs will go to 3.3.1, not 3.3.0
2019-10-28 09:56:09 +02:00
Dmitri Ovodok
8bbdb51869 Don't rely on spanner's bbox when adjusting viewport to the last edited place 2019-10-28 09:47:29 +02:00
Matt McClinch
be737e6986 Ensure a valid duration in the input state when entering a rest.
This adds a check for valid duration in ScoreView::cmdEnterRest() that was never strictly necessary before #5376 was merged. But now it is possible that the input state's duration may be invalid or equal to V_MEASURE, even if the check for invalid state does not cause the function to return early. If this is the case, we must set a valid duration at this time. Otherwise, this will result in an assertion failure in Score::makeGap().
2019-10-27 22:24:21 -04:00
Dmitri Ovodok
83fe78e58a fix #296171: fix triggerLayoutAll() for spanners
Fixup for 99c7b0d746
triggerLayout() and triggerLayoutAll() implementations in Element
have an optimization that allows to avoid triggering layout for
elements not yet added to a score by checking the element's parent.
This optimization is not suitable for spanners since they don't have
a parent even when added to a score. This commit adds a missing
implementation of Spanner::triggerLayoutAll() that takes this into
account.
2019-10-28 00:08:45 +02:00
Leon Vinken
b096b42605 fix #295348 - [Musicxml Export] - Strange Missing Hairpins 2019-10-27 10:59:21 +01:00
Dmitri Ovodok
1ee87a70b8 Fix single-note dynamics on rendering scores via a command line 2019-10-26 11:43:53 +02:00
anatoly-os
9749b4defd
Merge pull request #5390 from MarcSabatella/campania-2006
fix #295675: RNA improvements
2019-10-26 10:10:42 +02:00
anatoly-os
d1411bbbb8
Merge pull request #5422 from dmitrio95/viewport
Adjust ScoreView's viewport to show last score changes
2019-10-26 10:06:24 +02:00
Dmitri Ovodok
710cd6a1a6 Restore list and range selection on undo if possible 2019-10-25 16:18:41 +02:00
Dmitri Ovodok
7dc8ca53b9 Move ScoreView's viewport to show the last score changes 2019-10-25 16:18:41 +02:00
Dmitri Ovodok
51e8517543 Trigger only local re-layout on changing notes duration 2019-10-25 16:18:41 +02:00
Dmitri Ovodok
99c7b0d746 Add more information to setLayout() 2019-10-25 16:18:41 +02:00
Dmitri Ovodok
0ca4abc0a2 Expose layout range information to plugins 2019-10-25 15:51:27 +02:00
Dmitri Ovodok
a88bc6707d Make layout range information available in MuseScore::endCmd()
Don't reset CmdState before MuseScore::endCmd is called
2019-10-25 15:51:01 +02:00
anatoly-os
37067ee8b9
Merge pull request #5417 from Howard-C/glissando-italic
fix #289908: cannot apply italic or underline to glissando text
2019-10-25 09:58:40 +02:00
anatoly-os
0c9804d29e
Merge pull request #5418 from MarcSabatella/296053-start-note-entry
fix #296053: improve algorithm for determing start point for note input
2019-10-25 09:50:06 +02:00
anatoly-os
f4b32f4960
Merge pull request #5419 from dmitrio95/remove-unused-2
Remove unused UndoCommand types
2019-10-25 09:18:49 +02:00
anatoly-os
362aa88975
Merge pull request #5420 from mattmcclinch/296065-toolbar-accidentals
fix #296065: Toolbar accidentals don't respect changes to previous notes
2019-10-25 09:17:00 +02:00
Marc Sabatella
e7e17a7cf8 fix test scripts to not rely on note input starting on first measure 2019-10-24 16:44:52 -06:00
Matt McClinch
50e964bca4 fix #296065: Toolbar accidentals don't respect changes to previous notes
Resolves: https://musescore.org/en/node/296065.

Only add a *forced* accidental if there is an accidental selected in the toolbar and the note value is the same as it would be without an accidental.
2019-10-24 18:36:19 -04:00
Marc Sabatella
c86f09c145 update Campania to 2.008 +collect_artifacts 2019-10-24 14:35:01 -06:00
Dmitri Ovodok
ac3e4e5db0 Remove unused UndoCommand types 2019-10-24 20:42:26 +02:00
Marc Sabatella
563cd5d76d fix #273256, fix #273266: special characters dialog fixes
A number of small issues prevent the special characters dialog
from working properly, especially for chord symbols.
Drag and drop only works with some symbols because FSYMBOL was missing
in the switch statements in dragdrop.cpp.
Text elements can handle drop of FSYMBOL (which is why double-click works),
but they weren't getting to chance during drag&drop.
Fix was just adding those case statements.

For Harmony objects, we also needed to add the handlers
in acceptDrop() and drop() (the latter just passing through to TextBase).
However, accidentals require special handling in Harmony::endEdit() in order to parse.
Code was added recently to do this, but it didn't actually work
(I suspect it did when written, but things changed between then and when it was merged).
I rearranged the code in in Harmony::endEdit() a bit - and added comments to explain.
Basically, setHarmony() needs to be called *after* the back-substitution
(replacing flat with "b", sharp with "#"),
but the back-substitution needs to happen after TextBase::endEdit() finalizes the text
(actually, if it were possible to substitute before, that would be better,
but do to the way the undo records are munged in TextBase::endEdit(),
it seemed to dangerous to even try).
Bottom line: I do the TextBase::endEdit(), then the back-substitution,
then the setHarmony().
I needed to be sure to trigger a layout, which required a startCmd/endCmd pair
(since TextBase::endEdit() already called endCmd).
2019-10-24 12:24:45 -06:00
Marc Sabatella
b7824c8f4b fix #295778: incorrect handling of HTML escapes in chord symbols
We pre-populate the text of a chord symbol when commencing edit,
and process the text again upon completion of the edit.
But sometimes we used xmltext and other times we use plaintext.
It needs to be plaintext always for the conversion to work right:
we need to use plainText() when calling setHarmony(),
and we need to call setPlainText() when setting the text from the harmonyName().
2019-10-24 12:24:45 -06:00
Marc Sabatella
31cf21a4a5 fix #295675: support RNA without root
Most of the rendering for RNA is handled by the Campania font,
so the main part of this change is just including the latest version of that font.
But I also needed to update some of the pre-processing of the RNA elements
to skip the special handling of parentheses and equals sign
(these too are handled directly by Campania).
2019-10-24 12:24:45 -06:00
Marc Sabatella
8f7580eb70 fix #296053: improve algorithm for determing start point for note input
Resolves: https://musescore.org/en/node/296053

The algorithm for finding a start point for note input works well in most cases,
in particular, if a measure or a note or reset is selected.
The cases were nothing is selected, or an element other than a note or rest is selected,
are sometimes good, sometimes we give up too easily
and select the first (or first visible) measure.

This change improves the no selection case by using the last-selected CR if it is in view
(using the recently-added code for remembering the last selected position).
It improves the case of soemthing other than a note or rest select
by using the actual tick of the element
rather than trying to guess a tick by looking for a parent measure.
That works for elements that are ultimately parented by a measure,
but fails for things like spanners, which are children of the system.
It turns out that SpannerSegment had no tick() function, so this failed at first,
but I added an override, which may well fix some other bug somewhere.

Another side benefit of the change is that if select an element not at the start of the measure
(for examplea mid-measure staff text), input starts at that tick,
not at the beginning of the measure.
2019-10-24 12:11:55 -06:00
Howard-C
146f6cf639 fix #289908: cannot apply italic or underline to glissando text
The font style property is being converted from `FontStyle` to `bool` instead of `int`, so bold, italic and underline are all the same.

This commit fixes that.
2019-10-25 00:27:37 +08:00
anatoly-os
44d2b20c2d
Merge pull request #5376 from mattmcclinch/note-input-redesign
Redesign note input workflow based on Tantacrul's suggestions
2019-10-24 11:04:40 +02:00
anatoly-os
6c636b7440
Merge pull request #5411 from heuchi/295957-Pedal-SaveContinueText
fix #295957 Pedal continueText not saved
2019-10-24 10:06:25 +02:00
heuchi
832864d80c fix #295957 Pedal continueText not saved 2019-10-23 08:12:19 +02:00
anatoly-os
3b4f620cc1 stop pushing strings to Transifex
String freeze
2019-10-22 18:54:06 +02:00
anatoly-os
c86513eec3
Merge pull request #5409 from anatoly-os/workspace_fixes_22102019
fix remaining bugs with workspaces
2019-10-22 18:37:04 +02:00
anatoly-os
dfba411eb3 address review made in #5409
Plus:

- fix incorrect list of workspaces appeared in the View->Workspaces menu
- fix not updating the workspace combobox on removing workspaces and saving edited workspaces
2019-10-22 17:55:42 +02:00