LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Manually merged #6512 to master

Browse source
This commit is contained in:
anatoly-os 2020-09-01 22:37:35 +03:00
parent 4f6c4bbb8a
commit 5047986a98
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libmscore/utils.cpp
View file

@ -1053,6 +1053,8 @@ std::vector<SymId> toTimeSigString(const QString& s)
{ 40, SymId::timeSigParensLeftSmall }, // '('
{ 41, SymId::timeSigParensRightSmall }, // ')'
{ 162, SymId::timeSigCutCommon }, // '¢'
{ 189, SymId::timeSigFractionHalf },
{ 188, SymId::timeSigFractionQuarter },
{ 59664, SymId::mensuralProlation1 },
{ 79, SymId::mensuralProlation2 }, // 'O'
{ 59665, SymId::mensuralProlation2 },

2
mscore/timesigproperties.cpp
View file

@ -49,7 +49,7 @@ TimeSigProperties::TimeSigProperties(TimeSig* t, QWidget* parent)
nText->setText(timesig->denominatorString());
// set validators for numerator and denominator strings
// which only accept '+', '(', ')', digits and some time symb conventional representations
QRegExp rx("[0-9+CO()\\x00A2\\x00D8]*");
QRegExp rx("[0-9+CO()\\x00A2\\x00D8\\x00BD\\x00BC]*");
QValidator* validator = new QRegExpValidator(rx, this);
zText->setValidator(validator);
nText->setValidator(validator);