Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[MU3] Fix #319584: Many percussions elements/sounds are not getting translated in status bar and Edit Drumset dialog #7891

Closed
wants to merge 1 commit into from
Closed

[MU3] Fix #319584: Many percussions elements/sounds are not getting translated in status bar and Edit Drumset dialog #7891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion importexport/guitarpro/importgtp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ void GuitarPro::initGuitarProDrumset()
gpDrumset->drum(81) = DrumInstrument(QT_TRANSLATE_NOOP("drumset", "Open Triangle"), NoteHead::Group::HEAD_NORMAL, 3, Direction::UP);
gpDrumset->drum(82) = DrumInstrument(QT_TRANSLATE_NOOP("drumset", "Shaker"), NoteHead::Group::HEAD_NORMAL, 3, Direction::UP);
gpDrumset->drum(83) = DrumInstrument(QT_TRANSLATE_NOOP("drumset", "Sleigh Bell"), NoteHead::Group::HEAD_NORMAL, 3, Direction::UP);
gpDrumset->drum(84) = DrumInstrument(QT_TRANSLATE_NOOP("drumset", "Bell Tree"), NoteHead::Group::HEAD_NORMAL, 3, Direction::UP);
gpDrumset->drum(84) = DrumInstrument(QT_TRANSLATE_NOOP("drumset", "Mark Tree"), NoteHead::Group::HEAD_NORMAL, 3, Direction::UP);
gpDrumset->drum(85) = DrumInstrument(QT_TRANSLATE_NOOP("drumset", "Castanets"), NoteHead::Group::HEAD_NORMAL, 3, Direction::UP);
gpDrumset->drum(86) = DrumInstrument(QT_TRANSLATE_NOOP("drumset", "Mute Surdo"), NoteHead::Group::HEAD_NORMAL, 3, Direction::UP);
gpDrumset->drum(87) = DrumInstrument(QT_TRANSLATE_NOOP("drumset", "Open Surdo"), NoteHead::Group::HEAD_NORMAL, 3, Direction::UP);
Expand Down
4 changes: 2 additions & 2 deletions mtest/guitarpro/all-percussion.gp5-ref.mscx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@
<head>normal</head>
<line>3</line>
<voice>0</voice>
<name>Bell Tree</name>
<name>Mark Tree</name>
<stem>1</stem>
</Drum>
<Drum pitch="85">
Expand Down Expand Up @@ -1694,7 +1694,7 @@
<head>normal</head>
<line>3</line>
<voice>0</voice>
<name>Bell Tree</name>
<name>Mark Tree</name>
<stem>1</stem>
</Drum>
<Drum pitch="85">
Expand Down
4 changes: 2 additions & 2 deletions mtest/libmscore/midimapping/test14-ref.mscx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@
<head>normal</head>
<line>3</line>
<voice>0</voice>
<name>Bell Tree</name>
<name>Mark Tree</name>
<stem>1</stem>
</Drum>
<Drum pitch="85">
Expand Down Expand Up @@ -1698,7 +1698,7 @@
<head>normal</head>
<line>3</line>
<voice>0</voice>
<name>Bell Tree</name>
<name>Mark Tree</name>
<stem>1</stem>
</Drum>
<Drum pitch="85">
Expand Down
4 changes: 2 additions & 2 deletions mtest/libmscore/midimapping/test15-ref.mscx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,7 @@
<head>normal</head>
<line>3</line>
<voice>0</voice>
<name>Bell Tree</name>
<name>Mark Tree</name>
<stem>1</stem>
</Drum>
<Drum pitch="85">
Expand Down Expand Up @@ -1721,7 +1721,7 @@
<head>normal</head>
<line>3</line>
<voice>0</voice>
<name>Bell Tree</name>
<name>Mark Tree</name>
<stem>1</stem>
</Drum>
<Drum pitch="85">
Expand Down
4 changes: 2 additions & 2 deletions mtest/libmscore/midimapping/test16-ref.mscx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,7 @@
<head>normal</head>
<line>3</line>
<voice>0</voice>
<name>Bell Tree</name>
<name>Mark Tree</name>
<stem>1</stem>
</Drum>
<Drum pitch="85">
Expand Down Expand Up @@ -1680,7 +1680,7 @@
<head>normal</head>
<line>3</line>
<voice>0</voice>
<name>Bell Tree</name>
<name>Mark Tree</name>
<stem>1</stem>
</Drum>
<Drum pitch="85">
Expand Down
4 changes: 2 additions & 2 deletions mtest/libmscore/midimapping/test17-ref.mscx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,7 +679,7 @@
<head>normal</head>
<line>3</line>
<voice>0</voice>
<name>Bell Tree</name>
<name>Mark Tree</name>
<stem>1</stem>
</Drum>
<Drum pitch="85">
Expand Down Expand Up @@ -2317,7 +2317,7 @@
<head>normal</head>
<line>3</line>
<voice>0</voice>
<name>Bell Tree</name>
<name>Mark Tree</name>
<stem>1</stem>
</Drum>
<Drum pitch="85">
Expand Down
71 changes: 39 additions & 32 deletions share/instruments/instruments.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5853,7 +5853,7 @@
<head>normal</head>
<line>0</line>
<voice>0</voice>
<name>Snare Drum 2</name>
<name>Electric Snare</name>
<stem>2</stem>
<shortcut>B</shortcut>
</Drum>
Expand Down Expand Up @@ -5909,42 +5909,42 @@
<head>normal</head>
<line>6</line>
<voice>0</voice>
<name>Low Tom 2</name>
<name>Low Floor Tom</name>
<stem>1</stem>
</Drum>
<Drum pitch="43"> <!--Low Tom 1-->
<head>normal</head>
<line>5</line>
<voice>0</voice>
<name>Low Tom 1</name>
<name>High Floor Tom</name>
<stem>1</stem>
</Drum>
<Drum pitch="45"> <!--Mid Tom 2-->
<head>normal</head>
<line>4</line>
<voice>0</voice>
<name>Mid Tom 2</name>
<name>Low Tom</name>
<stem>1</stem>
</Drum>
<Drum pitch="47"> <!--Mid Tom 1-->
<head>normal</head>
<line>2</line>
<voice>0</voice>
<name>Mid Tom 1</name>
<name>Low-Mid Tom</name>
<stem>1</stem>
</Drum>
<Drum pitch="48"> <!--High Tom 2-->
<head>normal</head>
<line>1</line>
<voice>0</voice>
<name>High Tom 2</name>
<name>Hi-Mid Tom</name>
<stem>1</stem>
</Drum>
<Drum pitch="50"> <!--High Tom 1-->
<head>normal</head>
<line>0</line>
<voice>0</voice>
<name>High Tom 1</name>
<name>High Tom</name>
<stem>1</stem>
</Drum>
<Channel>
Expand Down Expand Up @@ -5995,7 +5995,7 @@
<head>normal</head>
<line>-1</line>
<voice>0</voice>
<name>High Bongo</name>
<name>Hi Bongo</name>
<stem>1</stem>
<shortcut>A</shortcut>
</Drum>
Expand Down Expand Up @@ -6033,15 +6033,15 @@
<head>cross</head>
<line>-1</line>
<voice>0</voice>
<name>Mute High Conga</name>
<name>Mute Hi Conga</name>
<stem>1</stem>
<shortcut>B</shortcut>
</Drum>
<Drum pitch="63"> <!--Open High Conga-->
<head>normal</head>
<line>0</line>
<voice>0</voice>
<name>High Conga</name>
<name>Open Hi Conga</name>
<stem>1</stem>
<shortcut>C</shortcut>
</Drum>
Expand Down Expand Up @@ -6113,7 +6113,7 @@
<head>normal</head>
<line>0</line>
<voice>0</voice>
<name>MiTom 2</name>
<name>Low Tom</name>
<stem>1</stem>
<shortcut>A</shortcut>
</Drum>
Expand All @@ -6137,7 +6137,7 @@
<head>normal</head>
<line>-1</line>
<voice>0</voice>
<name>Mute High Conga</name>
<name>Mute Hi Conga</name>
<stem>1</stem>
<shortcut>A</shortcut>
</Drum>
Expand Down Expand Up @@ -6316,7 +6316,7 @@
<head>normal</head>
<line>0</line>
<voice>0</voice>
<name>Cabasa</name>
<name>Sleigh Bell</name>
<stem>1</stem>
<shortcut>A</shortcut>
</Drum>
Expand All @@ -6341,7 +6341,7 @@
<head>normal</head>
<line>0</line>
<voice>0</voice>
<name>Vibra Slap</name>
<name>Vibraslap</name>
<stem>1</stem>
<shortcut>A</shortcut>
</Drum>
Expand Down Expand Up @@ -6555,7 +6555,7 @@
<head>normal</head>
<line>-1</line>
<voice>0</voice>
<name>High Wood Block</name>
<name>Hi Wood Block</name>
<stem>1</stem>
<shortcut>A</shortcut>
</Drum>
Expand Down Expand Up @@ -6592,7 +6592,7 @@
<head>normal</head>
<line>-1</line>
<voice>0</voice>
<name>High Wood Block</name>
<name>Hi Wood Block</name>
<stem>1</stem>
<shortcut>A</shortcut>
</Drum>
Expand Down Expand Up @@ -6986,7 +6986,7 @@
<head>normal</head>
<line>0</line>
<voice>0</voice>
<name>Vibra Slap</name>
<name>Vibraslap</name>
<stem>1</stem>
<shortcut>A</shortcut>
</Drum>
Expand Down Expand Up @@ -7036,7 +7036,7 @@
<head>normal</head>
<line>0</line>
<voice>0</voice>
<name>High Wood Block</name>
<name>Hi Wood Block</name>
<stem>1</stem>
<shortcut>A</shortcut>
</Drum>
Expand Down Expand Up @@ -7337,37 +7337,37 @@
<head>cross</head>
<line>0</line>
<voice>0</voice>
<name>Ride</name>
<name>Ride Cymbal 1</name>
<stem>1</stem>
</Drum>
<Drum pitch="36">
<head>normal</head>
<line>7</line>
<voice>1</voice>
<name>Concert Bass Drum</name>
<name>Bass Drum 1</name>
<stem>2</stem>
<shortcut>B</shortcut>
</Drum>
<Drum pitch="37">
<head>cross</head>
<line>3</line>
<voice>0</voice>
<name>Snare Side Stick</name>
<name>Side Stick</name>
<stem>1</stem>
</Drum>
<Drum pitch="38">
<head>normal</head>
<line>3</line>
<voice>0</voice>
<name>Concert Snare Drum</name>
<name>Acoustic Snare</name>
<stem>1</stem>
<shortcut>A</shortcut>
</Drum>
<Drum pitch="39">
<head>normal</head>
<line>1</line>
<voice>0</voice>
<name>Castanets</name>
<name>Hand Clap</name>
<stem>1</stem>
</Drum>
<Drum pitch="54">
Expand Down Expand Up @@ -7402,22 +7402,22 @@
<head>cross</head>
<line>-2</line>
<voice>0</voice>
<name>Concert Cymbal</name>
<name>Ride Cymbal 2</name>
<stem>1</stem>
<shortcut>C</shortcut>
</Drum>
<Drum pitch="62">
<head>cross</head>
<line>2</line>
<voice>0</voice>
<name>Mute High Conga </name>
<name>Mute Hi Conga</name>
<stem>1</stem>
</Drum>
<Drum pitch="63">
<head>cross</head>
<line>4</line>
<voice>0</voice>
<name>Open High Conga</name>
<name>Open Hi Conga</name>
<stem>1</stem>
</Drum>
<Drum pitch="64">
Expand Down Expand Up @@ -7463,6 +7463,13 @@
<name>Mark Tree</name>
<stem>1</stem>
</Drum>
<Drum pitch="85">
<head>normal</head>
<line>1</line>
<voice>0</voice>
<name>Castanets</name>
<stem>1</stem>
</Drum>
<Channel>
<controller ctrl="0" value="1"/>
<program value="48"/> <!--Orchestra Kit-->
Expand Down Expand Up @@ -7545,7 +7552,7 @@
<head>cross</head>
<line>1</line>
<voice>2</voice>
<name>Ride Cymbal</name>
<name>Ride Cymbal 1</name>
</Drum>
<Drum pitch="74">
<head>xcircle</head>
Expand Down Expand Up @@ -8071,11 +8078,11 @@
<barlineSpan>1</barlineSpan>
<drumset>1</drumset>
<singleNoteDynamics>0</singleNoteDynamics>
<Drum pitch="41">
<Drum pitch="28">
<head>normal</head>
<line>0</line>
<voice>0</voice>
<name>Low Tom 2</name>
<name>Slap</name>
<stem>1</stem>
<shortcut>A</shortcut>
</Drum>
Expand All @@ -8102,7 +8109,7 @@
<head>normal</head>
<line>0</line>
<voice>0</voice>
<name>Bass Drum 2</name>
<name>Acoustic Bass Drum</name>
<stem>1</stem>
<shortcut>A</shortcut>
</Drum>
Expand Down Expand Up @@ -9784,7 +9791,7 @@ Aeolus organ synthesizer, currently disabled -->
<longName>Percussion Synthesizer</longName>
<shortName>Perc. Syn.</shortName>
<description>Percussion Synthesizer</description>
<musicXMLid>drum.tom-tom.synth</musicXMLid>
<musicXMLid>drum.snare-drum.electric</musicXMLid>
<clef>PERC</clef>
<stafftype staffTypePreset="perc1Line">percussion</stafftype>
<barlineSpan>1</barlineSpan>
Expand All @@ -9793,7 +9800,7 @@ Aeolus organ synthesizer, currently disabled -->
<head>normal</head>
<line>4</line>
<voice>0</voice>
<name>Snare Drum 2</name>
<name>Electric Snare</name>
<stem>1</stem>
<shortcut>A</shortcut>
</Drum>
Expand Down