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
Maurizio M. Gavioli
d5b96dda59
Fix regression on header/footer vertical position.
...
The Y offset parameter in header/footer textual styles no longer has any effect. As a consequence, header is always positioned at page top margin and footer at page bottom margin.
Fixed in Page::drawHeaderFooter() function.
2014-06-24 12:15:28 +02:00
ws
ab1ecd740c
fix #25923
2014-06-24 09:29:30 +02:00
lasconic
a818188986
fix #26591 : Wrong clef / staff lines on MusicXML import
2014-06-23 23:14:19 +02:00
lasconic
729d822179
fix: drum note entry using shortcut doesn't honor voice setting from drumset
2014-06-23 22:49:45 +02:00
lasconic
2920b2bf97
fix crash when loading 1.3 files with unknown style tags
2014-06-23 22:26:13 +02:00
Nicolas Froment
685583ac3a
Merge pull request #990 from Jojo-Schmitz/check-for-merge-conflicts
...
check for merge conflicts
2014-06-23 19:41:49 +02:00
Nicolas Froment
5f68171112
Merge pull request #992 from MarcSabatella/26516-repitch
...
fix #26516 : crash on repitch
2014-06-23 19:41:08 +02:00
Joachim Schmitz
bb41ea00ad
check for merge conflicts
...
coloring doesn't seem to work on Travis (it doesn't harm either), but
should on a plain Linux or Mac shell prompt
2014-06-23 19:18:18 +02:00
Nicolas Froment
c0de4b3465
Merge pull request #1002 from lasconic/testonmac
...
Ability to compile and run tests on Mac OSX
2014-06-23 16:38:47 +02:00
lasconic
ed26bdca3e
Ability to compile and run tests on Mac OSX
2014-06-23 16:07:33 +02:00
Marc Sabatella
be38679c7b
add comments
2014-06-23 07:55:24 -06:00
Nicolas Froment
aadd86ef5f
Merge pull request #998 from MarcSabatella/26521-tuplet-cursor
...
fix #26521 tuplet cursor
2014-06-23 15:03:24 +02:00
Marc Sabatella
c6cf052a79
fix #26521 : move cursor after tuplet creation
...
move cursor after tuplet dialog too
2014-06-23 06:59:26 -06:00
Nicolas Froment
cd9dfe02be
Merge pull request #994 from mgavioli/Remove_merge_conflict_leftover_from_clef_cpp
...
Remove merge conflict left-over from clef.cpp
2014-06-23 10:37:44 +02:00
Nicolas Froment
da3412314c
Merge pull request #995 from mgavioli/Incomplete_relayout_on_staff_group_change
...
Incomplete re-layout when the group of a staff is changed.
2014-06-23 10:36:58 +02:00
Nicolas Froment
0acc08d3cb
Merge pull request #999 from MarkRS-UK/#25598TextSpacingIncorrectOnLoad
...
Fix #25598 - Text spacing incorrect on load
2014-06-23 10:27:24 +02:00
Nicolas Froment
cb22c68ae6
Merge pull request #1000 from Jojo-Schmitz/warnings
...
fix compiler warnings reg. unused parameters
2014-06-23 10:11:59 +02:00
Joachim Schmitz
eaf73abf29
fix compiler warnings reg. unused parameters
2014-06-23 09:36:31 +02:00
ws
7fb713bbf4
fix #26691
2014-06-23 08:46:53 +02:00
Mark Stanton
5a3a0dd7eb
Fix for issue #25598 - Text spacing incorrect on load
2014-06-22 21:56:15 +01:00
Marc Sabatella
738afd110b
fix ties & rests on MIDI input
2014-06-21 20:00:03 -06:00
Marc Sabatella
68e15a580f
break ties into selected note
2014-06-21 19:59:00 -06:00
