Commit graph

5139 commits

Author SHA1 Message Date
Joachim Schmitz
75623c53dc move ElementType to Element::Type
needed to make it available to the Plugin framework
2014-06-26 11:57:35 +02:00
Joachim Schmitz
e50bd46532 move enum Placement to Element::Placement
needed to make it available to the Plugin framework
2014-06-26 11:49:08 +02:00
Joachim Schmitz
b5c97a0636 change enum class SymId back to int
the memory saved is not worth the performance penalty
2014-06-26 11:49:07 +02:00
Joachim Schmitz
0e0350dd9c move enum DynamicRange to Dynamic::Range
needed to make it available to the Plugin framework
2014-06-26 11:49:06 +02:00
Joachim Schmitz
fe4fa356d1 rename enum Dynamic::DynamicType to Dynamic::Type 2014-06-26 11:49:05 +02:00
ws
f3caba78f6 fix #25600 2014-06-26 11:41:34 +02:00
Nicolas Froment
35f7889582 Merge pull request #1010 from mgavioli/Fix_reading_measures_with_custom_barline_type
Fix reading of measures with custom bar line sub-type.
2014-06-26 08:37:51 +02:00
Nicolas Froment
694bffbd60 Merge pull request #1012 from vgstef/ContinuousPanel
Fix measure number text and key signature superposition
2014-06-26 08:37:06 +02:00
Nicolas Froment
0603c87439 Merge pull request #1011 from lvinken/25193-musicxml-text-formatting-4
[MusicXML] export text formatting based on styles
2014-06-26 08:35:46 +02:00
vgstef
db2fb77a8b Fix measure number text and key signature superposition 2014-06-25 17:55:15 -04:00
Leon Vinken
07abb7ff2d export text formatting based on styles 2014-06-25 22:43:25 +02:00
Maurizio M. Gavioli
830c9f054c Add relevant test. 2014-06-25 11:03:57 +02:00
Maurizio M. Gavioli
396c3324a8 Fix reading of measures with custom bar line sub-type.
If a measure has, in one staff, a bar line with a custom sub-type, the sub-type is applied to the bar lines of all the staves of this measure.

Fixed in `Measure::read()`.
2014-06-25 10:19:37 +02:00
Nicolas Froment
4445b07163 Merge pull request #1008 from MarcSabatella/26746-german-chords
fix #26746: German chord mode compatibilty with 1.3
2014-06-25 08:26:40 +02:00
Nicolas Froment
256e3d7704 Merge pull request #1006 from Jojo-Schmitz/warnings
fix warning re. unused parameter
2014-06-25 08:13:40 +02:00
Nicolas Froment
98043332e7 Merge pull request #1007 from mgavioli/even-odd-page-distance
Fix even-odd page contiguous-ness.
2014-06-25 08:12:57 +02:00
Marc Sabatella
47a827ace3 add vtest 2014-06-24 19:25:25 -06:00
Marc Sabatella
8afca1722c fix #26746: german chord mode compatibility with 1.3 2014-06-24 19:06:36 -06:00
Maurizio M. Gavioli
bfb388d682 Fix even-odd page contiguous-ness.
In page view, the pages are shown in contiguous pairs, unconditionally starting with the second page, regardless of page numbering.

This fix makes each even page contiguous with the odd page following it, according to page numbering, i.e. taking into account `_pageNumberOffset`.
2014-06-24 23:16:34 +02:00
Joachim Schmitz
a2f02ae43b fix warning re. unsued parameter 2014-06-24 17:08:07 +02:00
Werner Schweer
53f81b3571 Merge pull request #946 from Jojo-Schmitz/enum-class
convert as many "enum" as possible to "enum class", and make them ": char" in the due course #5
2014-06-24 16:24:42 +02:00
ws
0826e2ee01 fix mtest 2014-06-24 15:40:05 +02:00
Joachim Schmitz
a8549b5e09 addressing @lasconic's concerns 2014-06-24 14:47:13 +02:00
Joachim Schmitz
ed1cc8c7c4 fix #29810: workaround for Mac/Xcode bug 2014-06-24 14:47:11 +02:00
Joachim Schmitz
1cca34c72e rebase to fix conflict with f87cb01 2014-06-24 14:47:10 +02:00
Joachim Schmitz
e98297f100 formatting fixes 2014-06-24 14:47:08 +02:00
Joachim Schmitz
e8e0478b53 convert unnamed enum into global enum class Transport 2014-06-24 14:47:07 +02:00
Joachim Schmitz
19378438fa convert unnamed enum into enum class SeqMsgId 2014-06-24 14:47:05 +02:00
Joachim Schmitz
adebed3aa5 convert enum PaletteCommand into enum class 2014-06-24 14:47:04 +02:00
Joachim Schmitz
c815d95e9e convert enum GuitarProError into enum class 2014-06-24 14:47:02 +02:00
Joachim Schmitz
7709b6bf7a convert unnamed enum into enum class Icons 2014-06-24 14:47:01 +02:00
Joachim Schmitz
9433472fe9 convert unnamed enum into enum ImageControl
making it a class, just to cast back to int, is not worth the effort
2014-06-24 14:46:59 +02:00
Joachim Schmitz
605230bbb1 convert unnamed enum into enum AmbitusControl
making it a class, just to cast back to int, is not worth the effort
2014-06-24 14:46:58 +02:00
Joachim Schmitz
5099968eec convert unnamed enum into enum class State 2014-06-24 14:46:56 +02:00
Joachim Schmitz
7f343a3436 convert unnamed enum into enum Col
making it a class, just to cast back to int, is not worth the effort
2014-06-24 14:46:55 +02:00
Joachim Schmitz
a4a973b7b6 convert enum ArticulationShowIn into enum class 2014-06-24 14:46:53 +02:00
Joachim Schmitz
357ae948dd convert enum LayoutFlag into enum class 2014-06-24 14:46:52 +02:00
Joachim Schmitz
77a90bf153 convert enum ElementFlag into enum class 2014-06-24 14:46:50 +02:00
Joachim Schmitz
83a72f49d9 small step further in converting enum Repeat into enum class
not there yet, as at least overloaded operators for |, &, |=, &= and ~ would be needed to make this fully working. And even then it'd require lots of explict casting. This is most probably not be worth the price...
2014-06-24 14:46:48 +02:00
Joachim Schmitz
25b79d460b convert enum AlignmentFlag into enum class 2014-06-24 14:46:47 +02:00
Joachim Schmitz
e5f9542fd3 convert enum Hidden into global enum class
after having seen how it is done in e1b1246
2014-06-24 14:46:45 +02:00
Joachim Schmitz
992ebf38e0 make enum class SegmentType a ": short" 2014-06-24 14:46:43 +02:00
ws
83ead22c35 cleaner implem. for reading ties 2014-06-24 14:45:50 +02:00
ws
789e1418e9 update merge 2014-06-24 13:48:29 +02:00
ws
2225011fc5 Merge branch 'master' of github.com:musescore/MuseScore 2014-06-24 13:45:08 +02:00
Werner Schweer
c46d24ede5 Merge pull request #912 from vgstef/ContinuousPanel
Add continuous panel feature for continous view mode
2014-06-24 13:44:57 +02:00
ws
87ad7b4f25 SpannerMap key fix 2014-06-24 13:38:05 +02:00
ws
247a055c91 fix #26741 2014-06-24 13:18:37 +02:00
ws
1f9d7ebf0c change text layout, use boundingRect() instead of tightBoundingRect() 2014-06-24 12:49:03 +02:00
Werner Schweer
78c113c295 Merge pull request #1004 from mgavioli/Header_footer_vert_pos
Fix regression on header/footer vertical position.
2014-06-24 12:37:40 +02:00