Commit graph

17102 commits

Author SHA1 Message Date
Dmitri Ovodok
9b481e48c0 Splitting mscore/CMakeLists.txt: restore CMakeLists.txt 2019-12-04 11:05:22 +02:00
Dmitri Ovodok
354546e2ff Merge branch 'create_main_cmakelists_txt2' into mtest 2019-12-04 11:03:41 +02:00
Dmitri Ovodok
80fd2f5b91 Splitting mscore/CMakeLists.txt: temporarily rename CMakeLists.txt 2019-12-04 11:02:29 +02:00
Dmitri Ovodok
d359d4ffcb Splitting mscore/CMakeLists.txt: create main/CMakeLists.txt 2019-12-04 11:01:23 +02:00
Dmitri Ovodok
deaa3f3481 Split main() function
- Extract parseCommandLineArguments()
 - Extract initApplication()
 - Extract MuseScore::init()
2019-12-04 10:58:42 +02:00
anatoly-os
c7ab61ec08
Merge pull request #5510 from dmitrio95/298061-set-as-style-viewport-crash
fix #298061: fix a crash on "set as style" if score ends with a frame
2019-12-04 10:10:58 +02:00
Dmitri Ovodok
a96b72c2fe fix #298061: fix a crash on "set as style" if score ends with a frame
- Don't pass staff number to adjustCanvasPosition if trying to
   adjust viewport to a frame. This avoids a crash itself.
 - Implement a more robust approach to determine a measure relevant
   to the current edit operation in CmdState. This avoids trying to
   unnecessarily jump to the frame at the end of a score.
2019-12-04 02:22:55 +02:00
anatoly-os
541d86dd82 grab strings from 3.4 resources
Switch resource manager to 3.4 directories on S3
2019-12-03 15:21:54 +02:00
anatoly-os
912b65c03f update master to version 3.4.0 2019-12-03 15:16:37 +02:00
Dmitri Ovodok
431961b436
Merge pull request #5507 from Howard-C/courtesy-accidental
fix #292648: make courtesy accidentals stay if notes are changed using Ctrl+Up/Down
2019-12-03 12:35:28 +02:00
Dmitri Ovodok
2d140a341d Sort notes in a chord taking into account unison index of tied notes
Fixup to f6998a40e3: needed to avoid
a possibility to tie two different notes to one.
See https://github.com/musescore/MuseScore/pull/5506#issuecomment-560370517
2019-12-03 10:38:42 +02:00
Dmitri Ovodok
116f3eb8a9
Merge pull request #5506 from mattmcclinch/297957-search-tie-note
fix #297957: Ties extended in region after time signature change
2019-12-03 10:37:51 +02:00
Dmitri Ovodok
aedc6cf416
Merge pull request #5509 from lvinken/musicxml-fixes
Fix MusicXML header handling as requested by OpenScore Lieder Corpus project
2019-12-03 09:33:54 +02:00
Dmitri Ovodok
acd6f78608
Merge pull request #5480 from MarcSabatella/297287-palette-scale
fix #297287: scale palettes with monitor resolution +collect_artifacts
2019-12-03 09:33:34 +02:00
Howard-C
b258c85c58 fix #292648: make courtesy accidentals stay if notes are changed using Ctrl+Up/Down 2019-12-03 09:39:43 +08:00
MarcSabatella
543bd66e4e let default palette scale float between 0.75 and 1.0 2019-12-02 15:46:14 -07:00
MarcSabatella
9ac56a76e0 change default palette scale to 0.8 2019-12-02 10:52:56 -07:00
MarcSabatella
2438f34327 cleanup +collect_artifacts
The reimplementation of scaling for the old palettes works
by scalingreferences to extraMag and grid size.
I do this on the fly, when drawing the palette, working with position,
and when calculating absolute sizes.
But the main data structure continues to store the mag & grid
is in "logical" units, so no additional scaling needs to be done
on read/write.
This is more along the lines of how the QML palettes are handled,
except that code is much simpler because it all gets funneled
through a single function.
2019-12-02 06:59:07 -07:00
MarcSabatella
add7905b29 reimplement scaling of old palettes dynamically +collect_artifacts 2019-12-02 06:59:07 -07:00
MarcSabatella
66765c6c2a fix #297287: scale palettes with monitor resolution +collect_artifacts
MuseScore 2 used to scale the palettes according to screen resolution,
so they were the same physical size on all systems.
This was broken in MuseScore 3 development, so palettes are too small
on high DPI systems and too large on low DPI systems.
This fixes the issue by reinstating the code in palette.cpp
that scales the grid and mag by the global guiScaling setting
(same setting used to scale the score view itself).
That only affects places int he code where the "old" palettes
are still used - keysig and timedig dialogs, etc.
Similar but much code accomploishes the same in palettemodel.cpp
for the "new" palettes.

In addition, because users may *prefer* larger or smaller palettes,
I added an advanced preference to specify global palette scaling
(applied on top of the automatic DPI scaling).
This value is factored in to the main palette scaling.
2019-12-02 06:59:07 -07:00
Dmitri Ovodok
3d9c900d32
Merge pull request #5481 from Jojo-Schmitz/segment-violation
fix #297326: Crash on opening Musescore 2.x file that uses leading space setting on the initial clef
2019-12-02 13:52:04 +02:00
Dmitri Ovodok
c8a27535c2 fix #297468: fix a crash on reading a corrupted score with linear layout mode in part
In a corrupted score tick values may sometimes be not synchronized
between master score and parts. This may lead to incorrect setting
of layoutAll flag as ticks from different scores are compared.
Ensuring that only master score ticks are compared fixes layoutAll
flag for scores corrupted that way and prevents a crash due to not
making a full layout on score loading. This change makes no
difference for correctly saved scores.
2019-12-02 12:24:41 +02:00
Dmitri Ovodok
cf80fd34df fix #297614: fix moving viewport to irrelevant position when editing spanner segment 2019-12-02 12:23:47 +02:00
Dmitri Ovodok
ed4949c72d fix #296682: disable desktop OpenGL for Windows 7
Native OpenGL implementation often leads to QtQuick-based views
(such as QML-based Palettes) render incorrectly on Windows 7.
2019-12-02 12:21:58 +02:00
Dmitri Ovodok
fee73cadb8 Plugin API: allow Cursor.addNote() add a note to existing chord 2019-12-02 12:18:42 +02:00
Dmitri Ovodok
c28a04909d Plugin API: add Cursor.prev() function 2019-12-02 12:18:07 +02:00
Dmitri Ovodok
44f95aed16
Merge pull request #5152 from Sonny-Klotz/291085-pluginaddnote
fix #291085 : cursor.addNote update internal segment reference
2019-12-02 12:15:21 +02:00
Leon Vinken
297dbcc3de cleanup doCredits() 2019-12-02 07:55:52 +01:00
Matt McClinch
f6998a40e3 fix #297957: Ties extended in region after time signature change
Resolves: https://musescore.org/en/node/297957.

When searching for a note to complete a tie, what matters is not so much that the note doesn't already have a tieBack(), but rather that the two notes have the same unisonIndex().
2019-12-01 22:45:48 -05:00
Git-Lior
75df39e413 fix #297549: Selecting notes by duration only matches durationType (Eighth, 16th) and ignores tuplets
This commit fixes the "Same duration" field's bug by adding an additional field - same note length. The original field matches note's `actualDurationType` and the new one matches the `actualTicks` value
2019-12-01 23:43:38 +02:00
Leon Vinken
cece90327c fix #297893 - [MusicXML import] subtitle placed incorrectly 2019-12-01 22:27:38 +01:00
Leon Vinken
c028857c44 fix #297688 - MusicXML: problems with generated MusicXML when Title frame has a Dedication field 2019-12-01 21:36:22 +01:00
Dmitri Ovodok
3941e27926
Merge pull request #5501 from Howard-C/follow-up-pr-5330
fix a small mistake in tst_timesig.cpp (follow-up for PR #5330)
2019-11-30 14:25:42 +02:00
Howard-C
d74327c53b fix a small mistake in tst_timesig.cpp (follow-up for PR #5330) 2019-11-28 22:22:00 +08:00
Dmitri Ovodok
89eb7ee0a2
Merge pull request #5495 from shoogle/patch-1
Add .jsc (compiled JavaScript) to .gitignore
2019-11-27 11:52:38 +02:00
anatoly-os
1385a0dba5 fix macOS build
Reinstalling wget and python2 fixes the issue with not found openssl@1.1
2019-11-26 09:31:12 +02:00
AntonioBL
fb55f7e856 fix #288576 : strange results when changing time signature with tremolo between two notes 2019-11-25 16:05:23 +01:00
anatoly-os
bbb25ef72e another attempt to fix wget on macOS build 2019-11-25 14:35:32 +02:00
anatoly-os
92a390973e upgrade brew to fix wget dependencies 2019-11-25 13:55:51 +02:00
anatoly-os
56f5846f64 try to fix macOS build
Apply the arguments we use when wgetting the bottles
2019-11-25 12:00:22 +02:00
Dmitri Ovodok
13fe4182e7
Merge pull request #5485 from mirabilos/appstream-fix
fix appstream validator warning
2019-11-25 11:49:58 +02:00
Dmitri Ovodok
d2ef3214db
Merge pull request #5498 from Jojo-Schmitz/master-timesigs
fix #297626: 2/2, 3/2 and 4/2 have gotten lost from master timesig palette
2019-11-25 11:48:31 +02:00
Dmitri Ovodok
8a789db0aa
Merge pull request #5491 from Howard-C/4-4-to-alla-breve
fix #297477: apply alla breve to 4/4 changes to 2/2 instead
2019-11-25 11:46:05 +02:00
Dmitri Ovodok
3f65eb100e
Merge pull request #5490 from Jojo-Schmitz/warning
Fix MinGW and MSVC compiler warnings
2019-11-25 11:42:46 +02:00
Dmitri Ovodok
62412f2650
Merge pull request #5492 from dmitrio95/palettes-fixes
Miscellaneous visual and UX fixes
2019-11-25 11:41:53 +02:00
Dmitri Ovodok
fb09b011b8
Merge pull request #5486 from dmitrio95/cannot-paste-into-tuplet
fix #52906, fix #279990, fix #288019: relax restrictions on pasting to tuplets
2019-11-25 11:41:34 +02:00
Dmitri Ovodok
1e22383d06
Merge pull request #5493 from Git-Lior/bugfix-paste-stickings
fix #297514: Cannot copy and paste stickings
2019-11-25 11:38:31 +02:00
Dmitri Ovodok
05eaa3fae7
Merge pull request #5496 from mattmcclinch/297544-nested-beams
fix #297544: Nested beams created
2019-11-25 11:34:17 +02:00
Joachim Schmitz
af4d32a06b fix #297626: 2/2, 3/2 and 4/2 have gotten lost from master timesig palette 2019-11-25 10:25:07 +01:00
anatoly-os
ad9e973066
Merge pull request #5497 from AntonioBL/musejazzfont
fix #279563 : MacOS X - Export pdf with MuseJazz Text all garbled and…
2019-11-25 09:31:10 +02:00