Commit graph

188 commits

Author SHA1 Message Date
Matt McClinch
a368d41c95 fix #270990: Unable to add fermatas to bar lines 2019-02-07 08:59:50 -05:00
anatoly-os
740467d1d1
Merge pull request #4596 from ericfont/281910-ottava-206-import
fix #281910 ottava import 2.x
2019-02-07 10:40:26 +02:00
Joachim Schmitz
1e24b4d60d fix MSVC/MinGW compiler warnings 2019-02-05 12:13:16 +01:00
anatoly-os
98fe77b066
Merge pull request #4568 from jthistle/281269-barline-not-read
fix #281269: barlines in the middle of bars don't appear 2.x->3.0
2019-01-29 11:17:52 +02:00
anatoly-os
b87ab5a842
Merge pull request #4621 from julianclem/fix-280885
fix #280885: Re-instate persistence of "First page number" setting
2019-01-29 11:14:51 +02:00
Julian Clementson
5a3d59f8e3 fix #280885: Re-instate persistence of "First page number" setting 2019-01-28 10:14:30 +00:00
Eric Fontaine
1d1ae55827 fix #281910 ottava import 2.x
While all the properties of ottavas saved in 2.x files were actually imported into 3.0, however the properties which are affected by the style defaults weren't actually applied, so it seemed as if ottavas with subtype property other than 8va weren't properly imported.  Indeed performing any operation which triggered applying the style defaults would reveal that yes the ottavas subtype property was indeed imported, but not apparent.

This fixes the problem by calling styleChanged() at the end of read206.cpp's readOttava() to now trigger these properties to be set according to the style defaults for the particular ottava subtype.  So now the different types of ottavas actually get their style applied during import.
2019-01-17 00:15:01 -05:00
James Thistlewood
567e29d3e3 fix #281805: add compatibility for more user styles than possible 2019-01-16 07:46:55 +00:00
anatoly-os
96dfd55c80
Merge pull request #4528 from mattmcclinch/280523-spatium-dependent
fix #280523: Switch size changes with staff space settings does not affect styles individually
2019-01-14 13:59:03 +02:00
James Thistlewood
f565b5e8cb fix #279585: frame gap not imported correctly 2.x->3.0 2019-01-13 12:33:57 +00:00
James Thistlewood
31cba4cd64 fix #281269: barlines in the middle of bars don't appear 2.x->3.0 2019-01-12 09:46:10 +00:00
MarcSabatella
a19355f785 fix #281312, fix #280609, fix #280400: loss of placement info after 2.x import 2019-01-08 14:34:06 -07:00
Matt McClinch
32a0d0223d fix #280523: Switch size changes with staff space settings does not affect styles individually 2019-01-02 23:39:24 -05:00
anatoly-os
806e4d94dc
Merge pull request #4444 from dmitrio95/tremolo-crash-and-copypaste
fix #278964: rework duration types handling with tremolo
2018-12-21 16:03:34 +02:00
anatoly-os
d32f837e1d
Merge pull request #4438 from mattmcclinch/273302-fermata-placement
fix #273302: Fermata loses assignment to voice and direction
2018-12-21 16:02:46 +02:00
anatoly-os
afcc8069a4
Merge pull request #4440 from jthistle/279832-206text-offsets-not-read
fix reading style for 206 text
2018-12-21 15:38:50 +02:00
Matt McClinch
34f261df2a fix #273302: Fermata loses assignment to voice and direction 2018-12-20 06:13:51 -05:00
Werner Schweer
ce6d22e298
Merge pull request #4442 from pthvogt/tremolo-crash
fix #280012: Crash fix for reading old MuseScore 206 files with tremo…
2018-12-19 14:56:33 +01:00
Dmitri Ovodok
62f5d132bf fix #280095, fix #278964: rework duration types hanling with tremolo 2018-12-19 15:42:47 +02:00
James Thistlewood
95e2daef1b fix reading style for 206 text 2018-12-19 10:44:11 +00:00
Dr. Hermann Vogt
fd96abaacb fix #280012: Crash fix for reading old MuseScore 206 files with tremolos.
Don't call createPlayEvents() at the end at of readScore() in read206.cpp anymore.
2018-12-19 10:52:38 +01:00
James Thistlewood
a94a48724a fix #279832: subtitle wrongly positioned, offsets ignored 2.x->3 2018-12-18 20:26:41 +00:00
anatoly-os
316566fa85
Merge pull request #4093 from mattmcclinch/276461-user-text-styles
fix #276461: Custom text styles in previous versions of MS changed to User-1, User-2 etc.
2018-12-17 20:22:27 +02:00
Dmitri Ovodok
bb81e1048c fix #278918, fix #279284: a quick fix for crash on parts export to various formats 2018-12-13 18:17:10 +02:00
Dmitri Ovodok
3a10013012 fix #276235: make it possible to enable readahead for XmlReader
Also actually use that possibility for correct importing of 2.X
system/staff text for both compressed and uncompressed files.
2018-12-12 18:29:53 +02:00
anatoly-os
aefc2603f9
Merge pull request #4338 from MarcSabatella/277500-dynamics-low
fix #277500: adjust offsets/placements for text on 2.x import
2018-12-10 17:08:58 +02:00
anatoly-os
7d5499a7dc
Merge pull request #4339 from MarcSabatella/277786-tpc-corruption-206
fix #277786: tpc corruption on instrument change from 2.x
2018-12-10 17:08:18 +02:00
Matt McClinch
bfbae7f6aa fix #276461: Custom text styles in previous versions of MS changed to User-1, User-2 etc. 2018-12-08 11:55:16 -05:00
ws
e61e522e20 fix update for preview in page settings 2018-12-07 15:06:15 +01:00
MarcSabatella
a3ec8abc0f fix #277786: tpc corruption on instrument change from 2.x 2018-12-06 22:44:55 -07:00
MarcSabatella
491734cb4d fix #277500: adjust offsets/placements for text on 2.x import 2018-12-06 18:41:03 -07:00
anatoly-os
599c33eb0a
Merge pull request #4304 from dmitrio95/279172-read206-timestretch-crash
fix #279172: skip <timeStretch> correctly if not handled on 2.X import
2018-12-05 15:17:00 +02:00
ws
584e193e7d fix #278366 Slides: user positions set in 2.x are lost 2018-12-04 14:24:45 +01:00
Dmitri Ovodok
f4d8604865 fix #279172: skip <timeStretch> correctly if not handled on 2.X import 2018-12-04 15:00:42 +02:00
ws
f15c2361a4 fix #278937 Hairpin: vertical offset has changed dramatically, horizontal offset less so 2018-12-04 13:29:11 +01:00
ws
7416874dcd fix #277706 Text lines: manually-adjusted "Vertical offset" has been lost 2018-12-03 15:42:11 +01:00
ws
f32ed063a3 add separate style options for chord symbol styles a/b offset 2018-11-30 18:34:02 +01:00
anatoly-os
f290089c5d
Merge pull request #4227 from Jojo-Schmitz/i18n
fix/add/remove more strings
2018-11-30 13:23:24 +02:00
ws
ca4c4df1d0 fix #277705 Chord symbols: "Default vertical position" has been lost.
This commit adds another style value for the position of Chord Symbols below a staff.
2018-11-30 12:04:19 +01:00
Joachim Schmitz
1bf01544d9 fix/add/remove more strings 2018-11-30 11:28:36 +01:00
ws
38974d9291 fix #278038 System collisions 2018-11-29 18:28:18 +01:00
ws
ffdab67a9d fix handling of custom formatted text and values in inspector:
- replace properties "BOLD ITALIC UNDERLINE" by one property FONT_STYLE
- if text is custom fomatted (has size/fontface changes, contains parts in bold/italic etc.
  then the appropriate property values are set to "unstyled". This enables the reset button
  in the inspector.
- pressing reset for some text properties strips changes of this property in the text
  Example: text contains a part in italic: pressing reset removes the italic formatting
- the "remove custom formatting" button is only enabled if there is some custom formatting
2018-11-26 21:17:19 +01:00
Dmitri Ovodok
f42943e90b fix #278722: do not delete spanner segments but reuse them 2018-11-26 01:59:02 +02:00
Dmitri Ovodok
83ef19bc45 Fix an infinite loop on barline span handling on 2.X import 2018-11-23 11:45:58 +02:00
Dmitri Ovodok
c74eb802b4 fix #277648: try to distinguish between StaffText and SystemText on 2.X import
Initial issue is about swing playback which was imported as staff
text and hence did not apply to all staves. The fix tries to handle
system-wideness properly by looking at the style name of the text.
It is better to retrieve an actual value of "system flag" property
for the given style but it is unclear currently whether it is possible
to do so.

Concerning compared style names:
"Tempo" is the style name for the swing text in the original issue
"System" is the style name for system text elements
Other names are put just by assumption based on which elements in
MuseScore 3 are system-wide by default.
2018-11-19 16:14:53 +02:00
Mark McKay
fdeb795e34 fix #275313: rework mixer ui 2
Moving PartEditBase into separate file.  Creating new files for
building mixer.

Creating art assets/UI design for new components.

Styling the track control.

Adding track area.

Separating out score from update.

Creating instances of mixer UI.

Creating part per voice now.

Can click on tracks to select them now.

Can now switch bwtewwn tracks.

Setting patch channel now.

Setting enabled off when no track selected.

Improving slider ui.

Turning Channel into a class and adding listener to it.

Somewhat stabalized sharing track objects between interfaces.

Can now apply volume changes to both expanded and collapsed tracks.

Pan knob is now working.

Encapsulating the rest of the fields in Channel.

Mute and solo now working.

Reverb and chorus now working.

Drumkit checkbox now working.  Port and channel somewhat working.

Adding support for colors per track.

Part name change now working.

Separating out MixerTrackItem

Finishing moving MixerTrackItem to new file.

Cleaning up code.

Moving PartEditBase into separate file.  Creating new files for
building mixer.

Creating art assets/UI design for new components.

Styling the track control.

Adding track area.

Separating out score from update.

Creating instances of mixer UI.

Creating part per voice now.

Can click on tracks to select them now.

Can now switch bwtewwn tracks.

Setting patch channel now.

Setting enabled off when no track selected.

Improving slider ui.

Turning Channel into a class and adding listener to it.

Somewhat stabalized sharing track objects between interfaces.

Can now apply volume changes to both expanded and collapsed tracks.

Pan knob is now working.

Encapsulating the rest of the fields in Channel.

Mute and solo now working.

Reverb and chorus now working.

Drumkit checkbox now working.  Port and channel somewhat working.

Adding support for colors per track.

Part name change now working.

Separating out MixerTrackItem

Finishing moving MixerTrackItem to new file.

Cleaning up code.

Setting color in collapsed mode now affects all channels.

Using shared_ptr to track MixerTrackItem.  Part changes now affect
all instruments.

Creating new track UI object to handle parts.

Using shard_ptr to track MixerTrackItem objects.

setting port and channel data now.

Changing to horizontal layout.

Fixing knob display.  Chaning track control appearance.

Setting init slider window size.

Switchong back to vertical orientation.  Fixing a few UI bugs in
the slider.

Tracks now left aligned.

Moving details panel above mixer.  Now changing track selection when
user clicks on sliders.

Pan and volume controls now reflect track color.

Showing volume and pan values in tooltips.

Creating a new slider control for mixer.

Switching Channel's volume, pan, reverb and chorus and chaning them
to doubles with a decimal range.

No longer writing out vol, pan, chor, reverb when at default values.

Nolonger writing vol, pan, chorus, reverb as controler values in
output file.

Now testing against default values on write.

More export fixes.

Manually editing test files to reflect new channel parameters.

Manually editing more test files to reflect new channel parameters.

Manually editing more test files to reflect new channel parameters.

More test changes to make Travis happy.

More test changes to make Travis happy.

Importing MusicXML now matches new volume, pan ranges.

Changing range of pan.  Fixing a few bugs with calculating MIDI.
Altering test files for Travis.

fix #275313: rework-mixer-ui-2

Moving PartEditBase into separate file. Creating new files for
building mixer.

Creating art assets/UI design for new components.

Styling the track control.

Adding track area.

Separating out score from update.

Creating instances of mixer UI.

Creating part per voice now.

Can click on tracks to select them now.

Can now switch bwtewwn tracks.

Setting patch channel now.

Setting enabled off when no track selected.

Improving slider ui.

Turning Channel into a class and adding listener to it.

Somewhat stabalized sharing track objects between interfaces.

Can now apply volume changes to both expanded and collapsed tracks.

Pan knob is now working.

Encapsulating the rest of the fields in Channel.

Mute and solo now working.

Reverb and chorus now working.

Drumkit checkbox now working.  Port and channel somewhat working.

Adding support for colors per track.

Part name change now working.

Separating out MixerTrackItem

Finishing moving MixerTrackItem to new file.

Cleaning up code.

Moving PartEditBase into separate file.  Creating new files for
building mixer.

Creating art assets/UI design for new components.

Styling the track control.

Adding track area.

Separating out score from update.

Creating instances of mixer UI.

Creating part per voice now.

Can click on tracks to select them now.

Can now switch bwtewwn tracks.

Setting patch channel now.

Setting enabled off when no track selected.

Improving slider ui.

Turning Channel into a class and adding listener to it.

Somewhat stabalized sharing track objects between interfaces.

Can now apply volume changes to both expanded and collapsed tracks.

Pan knob is now working.

Encapsulating the rest of the fields in Channel.

Mute and solo now working.

Reverb and chorus now working.

Drumkit checkbox now working.  Port and channel somewhat working.

Adding support for colors per track.

Part name change now working.

Separating out MixerTrackItem

Finishing moving MixerTrackItem to new file.

Cleaning up code.

Setting color in collapsed mode now affects all channels.

Using shared_ptr to track MixerTrackItem.  Part changes now affect
all instruments.

Creating new track UI object to handle parts.

Using shard_ptr to track MixerTrackItem objects.

setting port and channel data now.

Changing to horizontal layout.

Fixing knob display.  Chaning track control appearance.

Setting init slider window size.

Switchong back to vertical orientation.  Fixing a few UI bugs in
the slider.

Tracks now left aligned.

Moving details panel above mixer.  Now changing track selection when
user clicks on sliders.

Pan and volume controls now reflect track color.

Showing volume and pan values in tooltips.

Creating a new slider control for mixer.

Switching Channel's volume, pan, reverb and chorus and chaning them
to doubles with a decimal range.

No longer writing out vol, pan, chor, reverb when at default values.

Nolonger writing vol, pan, chorus, reverb as controler values in
output file.

Now testing against default values on write.

More export fixes.

Manually editing test files to reflect new channel parameters.

Manually editing more test files to reflect new channel parameters.

Manually editing more test files to reflect new channel parameters.

More test changes to make Travis happy.

More test changes to make Travis happy.

Importing MusicXML now matches new volume, pan ranges.

Changing range of pan.  Fixing a few bugs with calculating MIDI.
Altering test files for Travis.

Restoring the volume, pan, chorus, reverb to original char data type
& range.  UI now shows different 'user friendly' ranges.

Overwriting tests with versions from master.

mtest/libmscore/compat114/clef_missing_first-ref.mscx
mtest/libmscore/compat114/hor_frame_and_mmrest-ref.mscx
mtest/musicxml/io/testInstrumentChangeMIDIportExport_ref.xml
mtest/musicxml/io/testUninitializedDivisions_ref.xml

Restoring test files to original state.

Restoring test files to original state.

Restoring old values for importing files.

Restoring part methods.

mtest/importmidi/simplify_8th_dotted_no_staccato.mscx
mtest/libmscore/compat114/clef_missing_first-ref.mscx
mtest/libmscore/compat114/hor_frame_and_mmrest-ref.mscx
mtest/musicxml/io/testInstrumentChangeMIDIportExport_ref.xml
mtest/musicxml/io/testUninitializedDivisions_ref.xml

Rearranging UI components for better feel.

Improving UI.  Fixed crash when changing part name.

Adding support for two lighting modes.  Showing part name over
channel expansion.

Adding master gain control to mixer.

Changing color of gain slider.

Adapting to latest source in main.

Changing master gain slider to use decibel calculation.

CSS now set on tracks whenever a Paint event received.

Restoring mixer slider values to refect MIDI ranges.  Fixing crash when drumkit checked.

Fixing crash when closing score.

Fixing alignment in mixer details.

Tweaking UI for better appearance.
2018-11-13 12:43:19 -05:00
James Thistlewood
926b3517ef fix #277639: frames and frame attributes not read correctly from MS2 2018-11-03 09:55:58 +00:00
Dmitri Ovodok
e04f632997 fix #277614: remove a link for a deleted element on double articulations conversion 2018-10-30 18:10:11 +02:00
ws
afd4c432a5 remove unused old code for ledger line collision detection 2018-10-30 12:18:24 +01:00
ws
a31736d7b7 fix 'sizeIsSpatiumDependent' flag on import from 2.x scores 2018-10-29 10:14:10 +01:00