Skip to content
Permalink
Browse files

fix #295202: Filters (F6) for Lyrics and Chord Symbols are mixed up i…

…n 3.3 RC

Figured Bass and Slurs too, culprit being commit 7443719
  • Loading branch information...
Jojo-Schmitz committed Oct 3, 2019
1 parent 03f6d89 commit 265a7a1e8199437b1f5a67384c48a01c84ef84f4
Showing with 7 additions and 5 deletions.
  1. +2 −1 libmscore/select.h
  2. +5 −4 mscore/selectionwindow.cpp
@@ -76,7 +76,8 @@ enum class SelState : char {

//---------------------------------------------------------
// SelectionFilterType
// see also `static const char* labels[]` in selectionwindow.cpp
// see also `static const char* labels[]` in mscore/selectionwindow.cpp
// need to keep those in sync!
//---------------------------------------------------------

enum class SelectionFilterType {
@@ -26,8 +26,9 @@

namespace Ms {

// see `SelectionFilter::canSelect()` in select.cpp
// and `enum class SelectionFilterType` in select.h
// see `SelectionFilter::canSelect()` in libmscore/select.cpp
// and `enum class SelectionFilterType` in libmscore/select.h,
// keep in sync with the latter!
static const char* labels[] = {
QT_TRANSLATE_NOOP("selectionfilter", "All"),
QT_TRANSLATE_NOOP("selectionfilter", "Voice 1"),
@@ -36,12 +37,12 @@ static const char* labels[] = {
QT_TRANSLATE_NOOP("selectionfilter", "Voice 4"),
QT_TRANSLATE_NOOP("selectionfilter", "Dynamics & Hairpins"),
QT_TRANSLATE_NOOP("selectionfilter", "Fingerings"),
QT_TRANSLATE_NOOP("selectionfilter", "Chord Symbols"),
QT_TRANSLATE_NOOP("selectionfilter", "Lyrics"),
QT_TRANSLATE_NOOP("selectionfilter", "Chord Symbols"),
QT_TRANSLATE_NOOP("selectionfilter", "Other Text"),
QT_TRANSLATE_NOOP("selectionfilter", "Articulations & Ornaments"),
QT_TRANSLATE_NOOP("selectionfilter", "Figured Bass"),
QT_TRANSLATE_NOOP("selectionfilter", "Slurs"),
QT_TRANSLATE_NOOP("selectionfilter", "Figured Bass"),
QT_TRANSLATE_NOOP("selectionfilter", "Ottavas"),
QT_TRANSLATE_NOOP("selectionfilter", "Pedal Lines"),
QT_TRANSLATE_NOOP("selectionfilter", "Other Lines"),

0 comments on commit 265a7a1

Please sign in to comment.
You can’t perform that action at this time.