[MU4 Issue] PRs from 3.x to be merged into / ported to master

[Jojo-Schmitz]

• fix mtests under Windows MSVC #6028
• fix #304906 Update Piano Levels Filter to shift to the new Fraction based note measurement system #6043
• fix #304979: Make changing voices in PRE undoable #6046
• Fix #304292 - Invisible beams influence lyrics distance from staff #6048
• Fix #304918: Channel lists contain bad values after an instrument change #6050
• [Regression] fix #304834: settings field for multimeasure rests is too small #6051 (may not be wanted due to the pending major design changes)
• Fix #277796: Inconsistent octave selection in note input mode #6052
• Fix #305123: Add (Concert) Cimbalom #6061
• fix 305130: misleading shortcut descriptions #6063
• fix #289952 : gliss. text is misplaced on exporting the score #6064
• Plugin API: add basic access to score style settings #6065
• fix man-page to mention changed default DPI setting for PNGs export #6066
• Fix #305209: ticks_f warnings when loading a custom workspace #6072
• Fix #305265: Bracket added from palette only spans one staff regardless of selection #6073
• fix compiler warnings #6076
• fix some translatable strings #6077
• fix #305705: part 3, Bouzouki uses metal strings (and some more) #6078
• fix 'normal' channel #6082
• Fix #305359: Support the older BMW format (of Bagpipe Music Writer) #6083
• Fix #305428 - TextLine doesn't cause a multi-measure break #6087
• Musicxml fixes 3.x #6088
• fix #305477: fix arrow keys behavior for moving elements #6089
• fix vtest artifact when failing to generate images and add the possib… #6092
• Fix #279773 - Articulations are duplicated on adding linked staves, c… #6093
• fix #291522 : Double-click on drum palette produces wrong note when t… #6094
• Fix #305705: Bouzouki uses G-clef #6101
• Fix #305705: part 2, gp[345] mtest failures #6103
• fix #305069: playback of chord symbols attached to fret diagrams #6104
• Fix #305814: Adding Intervals via "alt + number" command #6111

[ecstrema]

I am not sure I get it. If all PRs solve a bug or add functionality, shouldn't they all get merged into master?
In other words, what PRs should be excluded from this list?

[Jojo-Schmitz]

Probably none, but these specifically have been merged to 3.x but not yet into master, this issue here is nothing but a reminder

[Jojo-Schmitz]

@anatoly-os is using his own book-keeping, so this issue isn't needed

[shoogle]

List of PRs that have been merged into the 3.x branch:
https://github.com/musescore/MuseScore/pulls?q=is%3Apr+is%3Amerged+base%3A3.x

[Jojo-Schmitz]

Whow, 165... (minus the ~30 listed above) and counting

[Jojo-Schmitz]

@lvinken's PRs (4):

• Musicxml fixes 3.x #6088
• fix #306317: Multi-page scores yield invalid MusicXML #6175
• Trivial musicxml fixes 3.x #6256, ported to Trivial musicxml fixes master #6257 (needs a rebase though)
• fix #307242: [MusicXML import] Musescore crashes when loading .mxl fi… #6269, ported to fix #307242: [MusicXML import] Musescore crashes when loading .mxl fi… #6270

My PRs (36) (and their states) are:

• fix #304876: Piano roll editor: The “Stripe Pattern” options are not translatable. #6033
• fix #304880: wrong beam positions when changing spatium #6034 Ported to fix #304880: wrong beam positions when changing spatium #6370.
• fix some more translations #6038
• Fix #305123: Add (Concert) Cimbalom #6061
• fix 305130: misleading shortcut descriptions #6063
• fix man-page to mention changed default DPI setting for PNGs export #6066
• fix #305134: crash on chordsymbol playback #6071
• Reformating (otherwise commented out) Aeolus entry #6074
• fix compiler warnings #6076
• fix some translatable strings #6077
• fix #305705: part 3, Bouzouki uses metal strings (and some more) #6078
• fix 'normal' channel #6082
• Fix #305359: Support the older BMW format (of Bagpipe Music Writer) #6083
• fix #305676: Repeat barline tooltips in Repeats & Jumps palette are not getting translated #6096 Ported to fix #305613: add heavy, reverse end and heavy double barlines #6119.
• Fix #305705: Bouzouki uses G-clef #6101
• Fix #305705: part 2, gp[345] mtest failures #6103
• fix #293141: Missing ToolTip for timesig wizard pickup measure unit #6114 Merges cleanly into master.
• more comments in instruments.xml and better sound for lutes (with courses) #6117 Merges cleanly into master.
• add a missing caesura #6152 Still applies, should merge cleanly except for the formatting changes.
• fix #43906: add forgotten translations for 256th, 512th and 1024th #6155 Still applies, should merge cleanly except for the formatting changes.
• Fix #305676: fix barline translations #6166 Ported to fix #305613: add heavy, reverse end and heavy double barlines #6119.
• Fix MSVC compiler warnings #6171 Not needed in master.
• fix translatable texts #6176 Ported to fix translatable texts #6369.
• minor code cleanup #6194 Not needed in master.
• using elipsis rather than 3 dots #6201 There @SKefalidis' underlying PR fix #293203 + preference rework (PR #5922 for 4.0): improved responsiveness, ease of adding preferences, UI #6196, which is not yet in master, but now contains that fix too.
• Use "Merge matching rests" in the closed score SATB and barbershop templates #6203 Merges cleanly into master.
• fix #305069: Chord symbols attached to fret diagrams don't play back #6218 Merges cleanly into master.
• fix #306816: Crash when select Realize Chord Symbols by right clicking chord symbol with Fretboard Diagram #6222 Seems to be missing some underlying 3.x changes currently, I suspect one of @MarcSabatella's PRs is missing here, investigation needed.
• fix #306964: Crash when change the numerical value of Fretboard Diagram “Maximum shift above” #6236 Here @njvdberg's Fix #306750, Fix#306751 - Chord alignment #6219 (resp. its replacement Optimized chord symbol/fretboard alignment algorithm #6321) seems needed (unless the latter contains that fix already).
• fix translation of barline names in barlines inspector #6239 Most probably not needed due to new Inspector.
• fix compiler warnings #6250 Not needed in master.
• add missing translatability #6252 Here @AntonioBL's underlying PR fix #281616 : compile x86 Windows PortableApp at release time #5508 is missing in master that made this fix necessary in 3.x.
• fix a warning reg. a no longer existing tabStop #6267 Here @MarcSabatella's underlying PR fix #307005: chord playback default not consistent #6247 was missing in master that made this fix necessary in 3.x.
• fix AppVeyor build #6294 Ported to Changed appimage release path from continuous to 12 +collect_artifacts #6309.
• fix #307548: Lines palette: duplicate symbols #6296 Merges cleanly into master.
• fix #307593: prevent duplicated icon on Ubuntu #6300 Should merge cleanly into master.
• Make the check for the soundfont name case insensitive #6314 May not be needed anymore, now that the soundfont's internal has been fixed. Won't harm though either. Should merge cleanly except for the formatting changes.

To be continued (if and when more of my PRs get merged into 3.x), see #6079 (comment)

[shoogle]

We can make the list more manageable by each taking care of our own PRs. My PRs are:

• Screen Reader status messages #6173, rebase required (not just re-formatting)
• Restore status text and screen reader output #6210
• fix #306878 Retain focus for non-modal dialogs #6245
• AppImage: Bundle OpenSSL to fix Save Online on recent distros #6249, ported by [master] AppImage: Bundle OpenSSL to fix Save Online on recent distros #6325

I will edit this comment to add any future PRs on 3.x, and to add "ported by #xxxx" when I create the corresponding PR on master. I will tick the checkbox when the PR is merged into master, or when we decide it is not needed (in which case I will add a comment to explain why).

That leaves these PRs that are not mine (and these are not mine or Jojo's). Anybody can view their own PRs here.

[SKefalidis]

Ready to be merged to master (ported):

• fix #306234: added teleportation to smooth scrolling, for dealing with repeats + improved comments #6191 looks like a pretty innocent merge :-)
• fix #293203 + preference rework (PR #5922 for 4.0): improved responsiveness, ease of adding preferences, UI #6196 needs reviewing (but please don't make me rebase again after somebody adds more preferences)

Waiting to be ported to master:

• fix #307721: blank lines ignored at top of text elements #6328

[Jojo-Schmitz]

@SKefalidis what about your #6198? Seems embedded into #6196, right?

[SKefalidis]

@SKefalidis what about your #6198? Seems embedded into #6196, right?

Yes

[Jojo-Schmitz]

We'd still need to check the PRs from

• @MarcSabatella: PRs
  • followup to PR #6315 #6318
  • fix #276141: no space for lyrics in continuous view #6307
  • fix #288962: continue text customizations not saved #6297 (not a trivial transfer since the changes touch the old inspector codebase)
  • fix #307430: jazz override does not work in Realize Chord Symbols #6281
  • fix #307428: don't disable "remove selected range" #6280
  • fix #302710: change default for harmony channel to piano #6268
  • fix #307005: chord playback default not consistent #6247
  • Rhythm note input mode fixes and improvements #6232
  • fix #306612: insert horizontal frame in front of frame using palette #6207
  • fix #305293: crash on load of score with missing drumset #6184
  • fix #306371: wrong input position if last selected cR in voice >1 #6179
  • fix #306438: wrong default offset for chord symbols on fret diagrams #6178
  • fix #304051: repeat single note in normal mode #6140
  • fix #297423: allow ctrl+click to modify range selection #6139
  • fix #297446: shift+click empty space clears selection #6138
  • fix #279926: shift+click to select similar #6137
  • fix #305745: playback of "add" chords #6107
  • fix #305069: playback of chord symbols attached to fret diagrams #6104
  • fix #304353: melisma line overlaps next syllable | collect_artifacts #6081
• @mattmcclinch: PRs
  • Fix #307741 images attached to measures don't propagate between score and existing parts #6330
  • Fix #307623: Y offsets change when stave space is changed #6315
  • Fix #306917: Crash on tie in score with parts #6242
  • Fix #299214: Reimplement Shift+L/R for leading space while in edit mode upon notehead #6204
  • Fix #4867: Filling measure with rests be affected by time signature #6123
  • Fix #305869: MuseScore crashes when playing MusicXML file with chord symbols #6115
  • Fix #305814: Adding Intervals via "alt + number" command #6111
  • Fix #305487: Invisible accidentals take space #6100
  • Fix #305209: ticks_f warnings when loading a custom workspace #6072
  • Fix #305125: Crash in debug build when dragging selected notes #6069
  • fix #304957: moving headers/footers causes a crash #6054
  • Fix #277796: Inconsistent octave selection in note input mode #6052
  • Fix #304918: Channel lists contain bad values after an instrument change #6050
  • Fix #303619: MuseScore crashing when entering font name #6039
• @igorkorsukov: PRs
  • Changed appimage release path from continuous to 12 +collect_artifacts #6309
  • fix #306517 assert on fotodrag #6189
• @rettinghaus: PRs
  • [MusicXML] Add missing Gould arrow quartertone accidentals #6263
• @worldwideweary: PRs
  • Fix #307323: Vertical-frame dragging with vertical-scrolling performs… #6308
  • Fix #307077: Dragging element(s) with keyboard modifiers were retaini… #6260
  • Fix #306807: Crash on [Go to first empty trailing measure] command with specific circumstance #6223
• @Spire42: PRs
  • Fix #307121: Revert default zoom type to “100%” #6258
  • Fix #306598: Canvas: impossible to choose a custom zoom default, difficult to override in toolbar #6213
  • Fix #306560: Toolbar zoom box does nothing #6199
  • Fix #306524: Control playback speed with the keyboard #6190
  • Fix #306512: Improvements to the splash screen #6187
  • Fix #306509: Improvements to zoom functionality #6186
  • Fix #306502: Toolbar item states are incorrect after applying preferences #6185
  • Fix #306370: Status bar should display playback pitch of selected note #6168
  • Fix #305724: Disable save prompt for empty scores #6106
  • Fix #305106: Crash when applying preferences with no scores open #6057
• @AntonioBL: PRs
  • fix #307075 : Bold and underlined text is not displayed properly unde… #6246
  • fix #291522 : Double-click on drum palette produces wrong note when t… #6094
  • fix vtest artifact when failing to generate images and add the possib… #6092
  • fix #280244 : [Workaround] User fonts not visible to MuseScore 3 (Windows 10) #6084
  • fix #286144 : no or wrong style assigned to texts in parts of 2.x scores #6075
  • fix #289952 : gliss. text is misplaced on exporting the score #6064
  • fix #305078 : Crash on attempting to playback or rewind score #6062
  • fix mtests under Windows MSVC #6028
  • fix #303983 : MuseScore takes very long on opening some 2.x scores; w… #5969
  • fix #281601 and fix #284218 [workaround]: broken on-screen rendering … #5794
  • fix #292393 : Pasting tremolo between dotted notes leads to wrong rhythm #5774
  • fix #281616 : compile x86 Windows PortableApp at release time #5508
• @tobik: PRs
  • Fix #306821: For compatibility of existing scores apply automatic col… #6243
  • Fix #306821: TAB and number of lines in collision avoidance of rests #6224
  • fix #278538: Implement collision avoidance between rests and notes #5897
  • fix #138266: Merge matching rests in multiple voices #5896
  • fix #85876: Breath marks for voices > 1 #4220
• @Howard-C: PRs
  • Partially fix #294768: tremolos don't have cue size #6265
  • [Regression] fix #307047: a problem with stem layout with tremolo #6240
  • Fix two problems with ambiti #6122
  • [Regression] fix #304834: settings field for multimeasure rests is too small #6051
  • [Regression] fix #305007: fix an error of single-note tremolo layout #6045
  • fix #301834: crash when changing local time signature to another one with same duration #5773
• @Marr11317: PRs
  • fix #306603: Measure number vertical offset interpreted incorrectly #6208
  • fix #287047, fix #290968: update mmrest bbox including the number #6105 similar change are being made in GSoC 2020: add style options for multimeasure rests #6211
  • remove forgotten comment #6031
• @dmitrio95: PRs
  • fix #298820: fix inability to minimize MuseScore on Linux with Gnome-based desktop environments #6206
  • fix #306551: make symbols accessible to plugins #6205
  • fix #304959: fix clipping and scaling of Key Signatures palette in New Score wizard #6167
  • fix #306096: fix incorrect anchor lines coordinates for some element types #6156
  • fix #305253: fix assertion failure on adding text frame with no text #6141
  • fix #293017: add a possibility to change selection from plugins #6091
  • Instruments and channels API for plugins #6090 see Manually merged #6090 to master #6393 instead
  • fix #305477: fix arrow keys behavior for moving elements #6089
  • Plugin API: add support for tuplets, add Cursor.addRest() #6085
  • Plugin API: add basic access to score style settings #6065
  • fix #305018: fix a crash on adding a note with unrewound Cursor #6059
  • fix #305017: Cursor.addNote fails to add notes to existing chords in INPUT_STATE_INDEPENDENT mode #6058
  • Document initial version for notehead scheme properties in plugins API #5961
• @blackears: PRs
  • fix# 306180: Adding notes to a tuplet now adds them with respect to t… #6153
  • fix #305876: Display note drag overlay property for all tools in PRE. #6113
  • fix #305871: Tuplets submenu has been added to right click menu. #6112
  • Now keeping length, ontime and velocity data when copying notes. #6099
  • fix #304979: Make changing voices in PRE undoable #6046
  • Changing flats to sharps #6044
  • fix #304906 Update Piano Levels Filter to shift to the new Fraction based note measurement system #6043
• @IsaacWeiss: PRs
  • Fix #305265: Bracket added from palette only spans one staff regardless of selection #6073
  • Fix #306092: Adding bracket when nothing selected sets its span to 0 #6151
• @jthistle: PRs
  • fix #305717: chord symbols attached to fret diagrams don't link to parts #6109
• @anatoly-os : PRs
  • fix #305253: Crash on adding text on a text frame (MS 3.5 Alpha, debu… #6127 is not needed after merging fix #305253: fix assertion failure on adding text frame with no text #6141
  • fix #305739: Realize chord symbols dialog won't open, even though the… #6128

[lvinken]

Like some other developers, I also maintain a private list of PRs to be synced to master. As I typically only work on MusicXML import/export, all my PRs apply equally well to master as to the current release.

As was mentioned before, having a public agreement on how we maintain such list could make the process more uniform and transparent.

[shoogle]

@lvinken, let's not overthink this. I suggested a system that seems as good as any, but really it's enough to know that you plan to take care of your own PRs.