Skip to content

Commit

Permalink
change names in menus.cpp
Browse files Browse the repository at this point in the history
  • Loading branch information
@krkartikay
krkartikay committed Apr 29, 2020
1 parent 6286d64 commit f124760
Show file tree
Hide file tree
Showing 8 changed files with 78 additions and 56 deletions.
9 changes: 9 additions & 0 deletions libmscore/arpeggio.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,15 @@

namespace Ms {

const std::array<const char*, 6> Arpeggio::arpeggioTypeNames = {
QT_TRANSLATE_NOOP("Palette", "Arpeggio"),
QT_TRANSLATE_NOOP("Palette", "Up Arpgeggio"),
QT_TRANSLATE_NOOP("Palette", "Down arpeggio"),
QT_TRANSLATE_NOOP("Palette", "Bracket arpeggio"),
QT_TRANSLATE_NOOP("Palette", "Up arpeggio straight"),
QT_TRANSLATE_NOOP("Palette", "Down arpeggio straight")
};

//---------------------------------------------------------
// Arpeggio
//---------------------------------------------------------
Expand Down
3 changes: 3 additions & 0 deletions libmscore/arpeggio.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ class Arpeggio final : public Element {
QVector<QLineF> gripAnchorLines(Grip) const override;
void startEdit(EditData&) override;

static const std::array<const char*, 6> arpeggioTypeNames;

public:
Arpeggio(Score* s);

Expand All @@ -56,6 +58,7 @@ class Arpeggio final : public Element {

ArpeggioType arpeggioType() const { return _arpeggioType; }
void setArpeggioType(ArpeggioType v) { _arpeggioType = v; }
QString arpeggioTypeName() { return qApp->translate("Palette", arpeggioTypeNames[int(_arpeggioType)]); }

Chord* chord() const { return (Chord*)parent(); }

Expand Down
16 changes: 8 additions & 8 deletions libmscore/barline.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,14 +194,14 @@ class BarLineEditData : public ElementEditData {
//---------------------------------------------------------

const std::vector<BarLineTableItem> BarLine::barLineTable {
{ BarLineType::NORMAL, QT_TRANSLATE_NOOP("Palette", "Normal barline"), "normal" },
{ BarLineType::DOUBLE, QT_TRANSLATE_NOOP("Palette", "Double barline"), "double" },
{ BarLineType::START_REPEAT, QT_TRANSLATE_NOOP("Palette", "Start repeat"), "start-repeat" },
{ BarLineType::END_REPEAT, QT_TRANSLATE_NOOP("Palette", "End repeat"), "end-repeat" },
{ BarLineType::BROKEN, QT_TRANSLATE_NOOP("Palette", "Dashed barline"), "dashed" },
{ BarLineType::END, QT_TRANSLATE_NOOP("Palette", "Final barline"), "end" },
{ BarLineType::END_START_REPEAT, QT_TRANSLATE_NOOP("Palette", "End-start repeat"), "end-start-repeat" },
{ BarLineType::DOTTED, QT_TRANSLATE_NOOP("Palette", "Dotted barline"), "dotted" },
{ BarLineType::NORMAL, QT_TRANSLATE_NOOP("Palette", "Normal barline"), "normal" },
{ BarLineType::DOUBLE, QT_TRANSLATE_NOOP("Palette", "Double barline"), "double" },
{ BarLineType::START_REPEAT, QT_TRANSLATE_NOOP("Palette", "Start repeat barline"), "start-repeat" },
{ BarLineType::END_REPEAT, QT_TRANSLATE_NOOP("Palette", "End repeat barline"), "end-repeat" },
{ BarLineType::BROKEN, QT_TRANSLATE_NOOP("Palette", "Dashed barline"), "dashed" },
{ BarLineType::END, QT_TRANSLATE_NOOP("Palette", "Final barline"), "end" },
{ BarLineType::END_START_REPEAT, QT_TRANSLATE_NOOP("Palette", "End-start repeat barline"), "end-start-repeat" },
{ BarLineType::DOTTED, QT_TRANSLATE_NOOP("Palette", "Dotted barline"), "dotted" },
};

//---------------------------------------------------------
Expand Down
5 changes: 5 additions & 0 deletions libmscore/glissando.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@ static const ElementStyle glissandoElementStyle {
static const qreal GLISS_PALETTE_WIDTH = 4.0;
static const qreal GLISS_PALETTE_HEIGHT = 4.0;

const std::array<const char *, 2> Glissando::glissandoTypeNames = {
QT_TRANSLATE_NOOP("Palette", "Straight glissando"),
QT_TRANSLATE_NOOP("Palette", "Wavy glissando")
};

//---------------------------------------------------------
// GlisandoSegment
//---------------------------------------------------------
Expand Down
4 changes: 4 additions & 0 deletions libmscore/glissando.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,17 @@ class Glissando final : public SLine {
M_PROPERTY(bool, playGlissando, setPlayGlissando)
M_PROPERTY(FontStyle, fontStyle, setFontStyle)

static const std::array<const char *, 2> glissandoTypeNames;

public:
Glissando(Score* s);
Glissando(const Glissando&);

static Note* guessInitialNote(Chord* chord);
static Note* guessFinalNote(Chord* chord);

QString glissandoTypeName() { return qApp->translate("Palette", glissandoTypeNames[int(glissandoType())]); }

// overridden inherited methods
Glissando* clone() const override { return new Glissando(*this); }
ElementType type() const override { return ElementType::GLISSANDO; }
Expand Down
2 changes: 1 addition & 1 deletion libmscore/sym.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3331,7 +3331,7 @@ const std::array<const char*, int(SymId::lastSym)+1> Sym::symUserNames = { {
"Smooth lift, short",
QT_TRANSLATE_NOOP("symUserNames", "Muted (closed)"),
"Half-muted (half-closed)",
QT_TRANSLATE_NOOP("symUserNames", "Open"),
QT_TRANSLATE_NOOP("symUserNames", "Opened"),
"Plop",
"Scoop",
"Smear",
Expand Down
93 changes: 47 additions & 46 deletions mscore/menus.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -332,14 +332,15 @@ void MuseScore::showPalette(bool visible)

struct TempoPattern {
QString pattern;
const char* name;
double f;
bool relative;
bool italian;
bool followText;
bool basic;
bool masterOnly;

TempoPattern(const QString& s, double v, bool r, bool i, bool f, bool b, bool m) : pattern(s), f(v), relative(r), italian(i), followText(f), basic(b), masterOnly(m) {}
TempoPattern(const QString& s, const char* n, double v, bool r, bool i, bool f, bool b, bool m) : pattern(s), name(n), f(v), relative(r), italian(i), followText(f), basic(b), masterOnly(m) {}
};

//---------------------------------------------------------
Expand Down Expand Up @@ -878,7 +879,7 @@ PalettePanel* MuseScore::newNoteHeadsPalettePanel()
QAction* action = s->action();
QIcon icon(action->icon());
ik->setAction("add-parentheses", icon);
sp->append(ik, s->help());
sp->append(ik, tr("Add parentheses to notehead"));
return sp;
}

Expand Down Expand Up @@ -1099,10 +1100,10 @@ PalettePanel* MuseScore::newBracketsPalettePanel()
sp->setDrawGrid(true);

for (auto t : std::array<std::pair<BracketType,const char*>, 4> {
{{ BracketType::NORMAL, QT_TRANSLATE_NOOP("Palette", "Bracket") },
{ BracketType::BRACE, QT_TRANSLATE_NOOP("Palette", "Brace") },
{ BracketType::SQUARE, QT_TRANSLATE_NOOP("Palette", "Square") },
{ BracketType::LINE, QT_TRANSLATE_NOOP("Palette", "Line") }}
{{ BracketType::NORMAL, QT_TRANSLATE_NOOP("Palette", "Bracket") },
{ BracketType::BRACE, QT_TRANSLATE_NOOP("Palette", "Brace") },
{ BracketType::SQUARE, QT_TRANSLATE_NOOP("Palette", "Square") },
{ BracketType::LINE, QT_TRANSLATE_NOOP("Palette", "Straight Line") }}
} ) {
Bracket* b1 = new Bracket(gscore);
BracketItem* bi1 = new BracketItem(gscore);
Expand Down Expand Up @@ -1148,12 +1149,12 @@ PalettePanel* MuseScore::newArpeggioPalettePanel()
for (int i = 0; i < 6; ++i) {
Arpeggio* a = new Arpeggio(gscore);
a->setArpeggioType(ArpeggioType(i));
sp->append(a, QT_TRANSLATE_NOOP("Palette", "Arpeggio"));
sp->append(a, a->arpeggioTypeName());
}
for (int i = 0; i < 2; ++i) {
Glissando* a = new Glissando(gscore);
a->setGlissandoType(GlissandoType(i));
sp->append(a, QT_TRANSLATE_NOOP("Palette", "Glissando"));
sp->append(a, a->glissandoTypeName());
}

//fall and doits
Expand Down Expand Up @@ -1414,39 +1415,39 @@ PalettePanel* MuseScore::newLinesPalettePanel()
pedal->setBeginText("<sym>keyboardPedalPed</sym>");
pedal->setContinueText("(<sym>keyboardPedalPed</sym>)");
pedal->setEndHookType(HookType::HOOK_90);
sp->append(pedal, QT_TRANSLATE_NOOP("Palette", "Pedal"));
sp->append(pedal, QT_TRANSLATE_NOOP("Palette", "Pedal (with ped and line)"));

pedal = new Pedal(gscore);
pedal->setLen(w);
pedal->setBeginText("<sym>keyboardPedalPed</sym>");
pedal->setContinueText("(<sym>keyboardPedalPed</sym>)");
pedal->setEndText("<sym>keyboardPedalUp</sym>");
pedal->setLineVisible(false);
sp->append(pedal, QT_TRANSLATE_NOOP("Palette", "Pedal"));
sp->append(pedal, QT_TRANSLATE_NOOP("Palette", "Pedal (with ped and asterisk)"));

pedal = new Pedal(gscore);
pedal->setLen(w);
pedal->setBeginHookType(HookType::HOOK_90);
pedal->setEndHookType(HookType::HOOK_90);
sp->append(pedal, QT_TRANSLATE_NOOP("Palette", "Pedal"));
sp->append(pedal, QT_TRANSLATE_NOOP("Palette", "Pedal (straight hooks)"));

pedal = new Pedal(gscore);
pedal->setLen(w);
pedal->setBeginHookType(HookType::HOOK_90);
pedal->setEndHookType(HookType::HOOK_45);
sp->append(pedal, QT_TRANSLATE_NOOP("Palette", "Pedal"));
sp->append(pedal, QT_TRANSLATE_NOOP("Palette", "Pedal (angled end hook)"));

pedal = new Pedal(gscore);
pedal->setLen(w);
pedal->setBeginHookType(HookType::HOOK_45);
pedal->setEndHookType(HookType::HOOK_45);
sp->append(pedal, QT_TRANSLATE_NOOP("Palette", "Pedal"));
sp->append(pedal, QT_TRANSLATE_NOOP("Palette", "Pedal (both hooks angled)"));

pedal = new Pedal(gscore);
pedal->setLen(w);
pedal->setBeginHookType(HookType::HOOK_45);
pedal->setEndHookType(HookType::HOOK_90);
sp->append(pedal, QT_TRANSLATE_NOOP("Palette", "Pedal"));
sp->append(pedal, QT_TRANSLATE_NOOP("Palette", "Pedal (angled start hook)"));

for (int i = 0; i < trillTableSize(); i++) {
Trill* trill = new Trill(gscore);
Expand Down Expand Up @@ -1503,51 +1504,51 @@ PalettePanel* MuseScore::newTempoPalettePanel(bool defaultPalettePanel)
sp->setDrawGrid(true);

static const TempoPattern tps[] = {
TempoPattern("<sym>metNoteHalfUp</sym> = 80", 80.0/ 30.0, false, false, true, true, false), // 1/2
TempoPattern("<sym>metNoteQuarterUp</sym> = 80", 80.0/ 60.0, false, false, true, true, false), // 1/4
TempoPattern("<sym>metNote8thUp</sym> = 80", 80.0/120.0, false, false, true, true, false), // 1/8
TempoPattern("<sym>metNoteHalfUp</sym><sym>space</sym><sym>metAugmentationDot</sym> = 80", 120/ 30.0, false, false, true, false, false), // dotted 1/2
TempoPattern("<sym>metNoteQuarterUp</sym><sym>space</sym><sym>metAugmentationDot</sym> = 80", 120/ 60.0, false, false, true, true, false), // dotted 1/4
TempoPattern("<sym>metNote8thUp</sym><sym>space</sym><sym>metAugmentationDot</sym> = 80", 120/120.0, false, false, true, false, false), // dotted 1/8

TempoPattern("Grave", 35.0/60.0, false, true, false, false, false),
TempoPattern("Largo", 50.0/60.0, false, true, false, false, false),
TempoPattern("Lento", 52.5/60.0, false, true, false, false, false),
TempoPattern("Larghetto", 63.0/60.0, false, true, false, false, true),
TempoPattern("Adagio", 71.0/60.0, false, true, false, false, false),
TempoPattern("Andante", 92.0/60.0, false, true, false, false, false),
TempoPattern("Andantino", 94.0/60.0, false, true, false, false, true),
TempoPattern("Moderato", 114.0/60.0, false, true, false, false, false),
TempoPattern("Allegretto", 116.0/60.0, false, true, false, false, false),
TempoPattern("Allegro moderato", 118.0/60.0, false, true, false, false, true),
TempoPattern("Allegro", 144.0/60.0, false, true, false, false, false),
TempoPattern("Vivace", 172.0/60.0, false, true, false, false, false),
TempoPattern("Presto", 187.0/60.0, false, true, false, false, false),
TempoPattern("Prestissimo", 200.0/60.0, false, true, false, false, true),

TempoPattern("<sym>metNoteQuarterUp</sym> = <sym>metNoteQuarterUp</sym><sym>space</sym><sym>metAugmentationDot</sym>", 3.0/2.0, true, false, true, false, false),
TempoPattern("<sym>metNoteQuarterUp</sym><sym>space</sym><sym>metAugmentationDot</sym> = <sym>metNoteQuarterUp</sym>", 2.0/3.0, true, false, true, false, false),
TempoPattern("<sym>metNoteHalfUp</sym> = <sym>metNoteQuarterUp</sym>", 1.0/2.0, true, false, true, false, false),
TempoPattern("<sym>metNoteQuarterUp</sym> = <sym>metNoteHalfUp</sym>", 2.0/1.0, true, false, true, false, false),
TempoPattern("<sym>metNote8thUp</sym> = <sym>metNote8thUp</sym>", 1.0/1.0, true, false, true, false, false),
TempoPattern("<sym>metNoteQuarterUp</sym> = <sym>metNoteQuarterUp</sym>", 1.0/1.0, true, false, true, false, false),
TempoPattern("<sym>metNote8thUp</sym><sym>space</sym><sym>metAugmentationDot</sym> = <sym>metNoteQuarterUp</sym>", 2.0/3.0, true, false, true, false, false),
TempoPattern("<sym>metNoteHalfUp</sym> = 80", QT_TRANSLATE_NOOP("Palette", "Half note = 80 BPM"), 80.0/ 30.0, false, false, true, true, false), // 1/2
TempoPattern("<sym>metNoteQuarterUp</sym> = 80", QT_TRANSLATE_NOOP("Palette", "Quarter note = 80 BPM"), 80.0/ 60.0, false, false, true, true, false), // 1/4
TempoPattern("<sym>metNote8thUp</sym> = 80", QT_TRANSLATE_NOOP("Palette", "Eighth note = 80 BPM"), 80.0/120.0, false, false, true, true, false), // 1/8
TempoPattern("<sym>metNoteHalfUp</sym><sym>space</sym><sym>metAugmentationDot</sym> = 80", QT_TRANSLATE_NOOP("Palette", "Dotted half note = 80 BPM"), 120/ 30.0, false, false, true, false, false), // dotted 1/2
TempoPattern("<sym>metNoteQuarterUp</sym><sym>space</sym><sym>metAugmentationDot</sym> = 80", QT_TRANSLATE_NOOP("Palette", "Dotted quarter note = 80 BPM"), 120/ 60.0, false, false, true, true, false), // dotted 1/4
TempoPattern("<sym>metNote8thUp</sym><sym>space</sym><sym>metAugmentationDot</sym> = 80", QT_TRANSLATE_NOOP("Palette", "Dotted eighth note = 80 BPM"), 120/120.0, false, false, true, false, false), // dotted 1/8

TempoPattern("Grave", "Grave", 35.0/60.0, false, true, false, false, false),
TempoPattern("Largo", "Largo", 50.0/60.0, false, true, false, false, false),
TempoPattern("Lento", "Lento", 52.5/60.0, false, true, false, false, false),
TempoPattern("Larghetto", "Larghetto", 63.0/60.0, false, true, false, false, true),
TempoPattern("Adagio", "Adagio", 71.0/60.0, false, true, false, false, false),
TempoPattern("Andante", "Andante", 92.0/60.0, false, true, false, false, false),
TempoPattern("Andantino", "Andantino", 94.0/60.0, false, true, false, false, true),
TempoPattern("Moderato", "Moderato", 114.0/60.0, false, true, false, false, false),
TempoPattern("Allegretto", "Allegretto", 116.0/60.0, false, true, false, false, false),
TempoPattern("Allegro moderato", "Allegro moderato", 118.0/60.0, false, true, false, false, true),
TempoPattern("Allegro", "Allegro", 144.0/60.0, false, true, false, false, false),
TempoPattern("Vivace", "Vivace", 172.0/60.0, false, true, false, false, false),
TempoPattern("Presto", "Presto", 187.0/60.0, false, true, false, false, false),
TempoPattern("Prestissimo", "Prestissimo", 200.0/60.0, false, true, false, false, true),

TempoPattern("<sym>metNoteQuarterUp</sym> = <sym>metNoteQuarterUp</sym><sym>space</sym><sym>metAugmentationDot</sym>", QT_TRANSLATE_NOOP("Palette", "Quarter note = dotted quarter note metric modulation"), 3.0/2.0, true, false, true, false, false),
TempoPattern("<sym>metNoteQuarterUp</sym><sym>space</sym><sym>metAugmentationDot</sym> = <sym>metNoteQuarterUp</sym>", QT_TRANSLATE_NOOP("Palette", "Dotted quarter note = quarter note metric modulation"), 2.0/3.0, true, false, true, false, false),
TempoPattern("<sym>metNoteHalfUp</sym> = <sym>metNoteQuarterUp</sym>", QT_TRANSLATE_NOOP("Palette", "Half note = quarter note metric modulation"), 1.0/2.0, true, false, true, false, false),
TempoPattern("<sym>metNoteQuarterUp</sym> = <sym>metNoteHalfUp</sym>", QT_TRANSLATE_NOOP("Palette", "Quarter note = half note metric modulation"), 2.0/1.0, true, false, true, false, false),
TempoPattern("<sym>metNote8thUp</sym> = <sym>metNote8thUp</sym>", QT_TRANSLATE_NOOP("Palette", "Eighth note = eighth note metric modulation"), 1.0/1.0, true, false, true, false, false),
TempoPattern("<sym>metNoteQuarterUp</sym> = <sym>metNoteQuarterUp</sym>", QT_TRANSLATE_NOOP("Palette", "Quarter note = quarter note metric modulation"), 1.0/1.0, true, false, true, false, false),
TempoPattern("<sym>metNote8thUp</sym><sym>space</sym><sym>metAugmentationDot</sym> = <sym>metNoteQuarterUp</sym>", QT_TRANSLATE_NOOP("Palette", "Dotted eighth note = quarter note metric modulation"), 2.0/3.0, true, false, true, false, false),
};
for (TempoPattern tp : tps) {
TempoText* tt = new TempoText(gscore);
tt->setFollowText(tp.followText);
tt->setXmlText(tp.pattern);
if (tp.relative) {
tt->setRelative(tp.f);
sp->append(tt, QT_TRANSLATE_NOOP("Palette", "Metric modulation"), QString(), 1.5);
sp->append(tt, qApp->translate("Palette", tp.name), QString(), 1.5);
}
else if (tp.italian) {
tt->setTempo(tp.f);
sp->append(tt, QT_TRANSLATE_NOOP("Palette", "Tempo text"), QString(), 1.3);
sp->append(tt, tp.name, QString(), 1.3);
}
else {
tt->setTempo(tp.f);
sp->append(tt, QT_TRANSLATE_NOOP("Palette", "Tempo text"), QString(), 1.5);
sp->append(tt, qApp->translate("Palette", tp.name), QString(), 1.5);
}
}
sp->setMoreElements(false);
Expand Down
2 changes: 1 addition & 1 deletion share/workspaces/Basic.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,7 @@
<text><sym>metNote8thUp</sym> = 80</text>
</Tempo>
</Cell>
<Cell name="Dotted Quarter note = 80 BPM">
<Cell name="Dotted quarter note = 80 BPM">
<mag>1.5</mag>
<Tempo>
<tempo>2</tempo>
Expand Down

0 comments on commit f124760

Please sign in to comment.