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

add repeat barlines to Repeats Palette and fix translations #2628

Merged
merged 2 commits into from
May 25, 2016
Merged

add repeat barlines to Repeats Palette and fix translations #2628

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4584c38
fix #112611: add repeat barlines to Repeats palette
Jojo-Schmitz May 25, 2016
d7ed91e
fix translation for barlines, broken since 492709f
Jojo-Schmitz May 25, 2016
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
37 changes: 28 additions & 9 deletions mscore/menus.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,28 +325,28 @@ Palette* MuseScore::newBarLinePalette(bool basic)
const BarLineTableItem* bti = BarLine::barLineTableItem(i);
if (!bti)
break;
BarLine* b = new BarLine(gscore);
BarLine* b = new BarLine(gscore);
b->setBarLineType(bti->type);
sp->append(b, qApp->translate("Palette", bti->name));
sp->append(b, BarLine::userTypeName(bti->type));
}

if (!basic) {
// bar line spans
struct {
int from, to;
const char* name;
} span[] = {
const char* userName;
} spans[] = {
{ BARLINE_SPAN_TICK1_FROM, BARLINE_SPAN_TICK1_TO, QT_TRANSLATE_NOOP("Palette", "Tick 1 span") },
{ BARLINE_SPAN_TICK2_FROM, BARLINE_SPAN_TICK2_TO, QT_TRANSLATE_NOOP("Palette", "Tick 2 span") },
{ BARLINE_SPAN_SHORT1_FROM,BARLINE_SPAN_SHORT1_TO,QT_TRANSLATE_NOOP("Palette", "Short 1 span") },
{ BARLINE_SPAN_SHORT2_FROM,BARLINE_SPAN_SHORT2_TO,QT_TRANSLATE_NOOP("Palette", "Short 2 span") },
};
for (unsigned i = 0; i < sizeof(span)/sizeof(*span); ++i) {
BarLine* b = new BarLine(gscore);
for (auto span : spans) {
BarLine* b = new BarLine(gscore);
b->setBarLineType(BarLineType::NORMAL);
b->setSpanFrom(span[i].from);
b->setSpanTo(span[i].to);
sp->append(b, qApp->translate("Palette", span[i].name));
b->setSpanFrom(span.from);
b->setSpanTo(span.to);
sp->append(b, qApp->translate("Palette", span.userName));
}
}
return sp;
Expand Down Expand Up @@ -382,6 +382,25 @@ Palette* MuseScore::newRepeatsPalette()
sp->append(jp, qApp->translate("jumpType", jumpTypeTable[i].userText.toUtf8().constData()));
}

for (unsigned i = 0;; ++i) {
const BarLineTableItem* bti = BarLine::barLineTableItem(i);
if (!bti)
break;
switch (bti->type) {
case BarLineType::START_REPEAT:
case BarLineType::END_REPEAT:
case BarLineType::END_START_REPEAT:
break;
default:
continue;
}

BarLine* b = new BarLine(gscore);
b->setBarLineType(bti->type);
PaletteCell* cell= sp->append(b, BarLine::userTypeName(bti->type));
cell->drawStaff = false;
}

return sp;
}

Expand Down