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

fix #28366: more replacement of unicode* with met* glyphs

Browse source
This commit is contained in:
Joachim Schmitz 2015-05-29 09:28:30 +02:00
parent 9341f4ea4f
commit e878225ffa
6 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libmscore/read114.cpp
View file

@ -736,7 +736,7 @@ Score::FileError Score::read114(XmlReader& e)
qreal tempo = i->second.tempo;
if (tempomap()->tempo(tick) != tempo) {
TempoText* tt = new TempoText(this);
tt->setXmlText(QString("<sym>unicodeNoteQuarterUp</sym> = %1").arg(qRound(tempo*60)));
tt->setXmlText(QString("<sym>metNoteQuarterUp</sym> = %1").arg(qRound(tempo*60)));
tt->setTempo(tempo);
tt->setTrack(0);
tt->setVisible(false);

2
libmscore/tempotext.cpp
View file

@ -73,7 +73,7 @@ void TempoText::read(XmlReader& e)
}
// check sanity
if (xmlText().isEmpty()) {
setXmlText(QString("<sym>unicodeNoteQuarterUp</sym> = %1").arg(lrint(60 * _tempo)));
setXmlText(QString("<sym>metNoteQuarterUp</sym> = %1").arg(lrint(60 * _tempo)));
setVisible(false);
}
}

2
mscore/file.cpp
View file

@ -732,7 +732,7 @@ void MuseScore::newFile()
if (newWizard->createTempo()) {
double tempo = newWizard->tempo();
TempoText* tt = new TempoText(score);
tt->setXmlText(QString("<sym>unicodeNoteQuarterUp</sym> = %1").arg(tempo));
tt->setXmlText(QString("<sym>metNoteQuarterUp</sym> = %1").arg(tempo));
tempo /= 60; // bpm -> bps
tt->setTempo(tempo);

2
mscore/importgtp.cpp
View file

@ -1028,7 +1028,7 @@ void GuitarPro::setTempo(int tempo, Measure* measure)
{
TempoText* tt = new TempoText(score);
tt->setTempo(double(tempo)/60.0);
tt->setXmlText(QString("<sym>unicodeNoteQuarterUp</sym> = %1").arg(tempo));
tt->setXmlText(QString("<sym>metNoteQuarterUp</sym> = %1").arg(tempo));
tt->setTrack(0);
Segment* segment = measure->getSegment(Segment::Type::ChordRest, measure->tick());

2
mscore/importmidi/importmidi_tempo.cpp
View file

@ -55,7 +55,7 @@ void setTempoToScore(Score *score, int tick, double beatsPerSecond)
TempoText *tempoText = new TempoText(score);
tempoText->setTempo(beatsPerSecond);
tempoText->setXmlText(QString("<sym>unicodeNoteQuarterUp</sym> = %1").arg(tempoInBpm));
tempoText->setXmlText(QString("<sym>metNoteQuarterUp</sym> = %1").arg(tempoInBpm));
tempoText->setTrack(0);
Measure *measure = score->tick2measure(tick);

24
mscore/menus.cpp
View file

@ -1257,40 +1257,40 @@ void MuseScore::addTempo()
SigEvent event = cs->sigmap()->timesig(cr->tick());
Fraction f = event.nominal();
QString text("<sym>unicodeNoteQuarterUp</sym> = 80");
QString text("<sym>metNoteQuarterUp</sym> = 80");
switch (f.denominator()) {
case 1:
text = "<sym>unicodeNoteWhole</sym> = 80";
text = "<sym>metNoteWhole</sym> = 80";
break;
case 2:
text = "<sym>unicodeNoteHalfUp</sym> = 80";
text = "<sym>metNoteHalfUp</sym> = 80";
break;
case 4:
text = "<sym>unicodeNoteQuarterUp</sym> = 80";
text = "<sym>metNoteQuarterUp</sym> = 80";
break;
case 8:
if(f.numerator() % 3 == 0)
text = "<sym>unicodeNoteQuarterUp</sym><sym>space</sym><sym>unicodeAugmentationDot</sym> = 80";
text = "<sym>metNoteQuarterUp</sym><sym>space</sym><sym>metAugmentationDot</sym> = 80";
else
text = "<sym>unicodeNote8thUp</sym> = 80";
text = "<sym>metNote8thUp</sym> = 80";
break;
case 16:
if(f.numerator() % 3 == 0)
text = text = "<sym>unicodeNote8thUp</sym><sym>unicodeAugmentationDot</sym> = 80";
text = text = "<sym>metNote8thUp</sym><sym>metAugmentationDot</sym> = 80";
else
text = "<sym>unicodeNote16thUp</sym> = 80";
text = "<sym>metNote16thUp</sym> = 80";
break;
case 32:
if(f.numerator() % 3 == 0)
text = "<sym>unicodeNote16thUp</sym><sym>unicodeAugmentationDot</sym> = 80";
text = "<sym>metNote16thUp</sym><sym>metAugmentationDot</sym> = 80";
else
text = "<sym>unicodeNote32thUp</sym> = 80";
text = "<sym>metNote32thUp</sym> = 80";
break;
case 64:
if(f.numerator() % 3 == 0)
text = "<sym>unicodeNote32thUp</sym><sym>unicodeAugmentationDot</sym> = 80";
text = "<sym>metNote32thUp</sym><sym>metAugmentationDot</sym> = 80";
else
text = "<sym>unicodeNote64thUp</sym> = 80";
text = "<sym>metNote64thUp</sym> = 80";
break;
default:
break;