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.

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

fix #291292: Add 3/2 time signature to advanced workspace and master palette #5166

Merged
merged 1 commit into from
Aug 19, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion mscore/menus.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1359,7 +1359,10 @@ Palette* MuseScore::newTimePalette()
{ 9, 8, TimeSigType::NORMAL, "9/8" },
{ 12, 8, TimeSigType::NORMAL, "12/8" },
{ 4, 4, TimeSigType::FOUR_FOUR, tr("4/4 common time") },
{ 2, 2, TimeSigType::ALLA_BREVE, tr("2/2 alla breve") }
{ 2, 2, TimeSigType::ALLA_BREVE, tr("2/2 alla breve") },
{ 2, 2, TimeSigType::NORMAL, "2/2" },
{ 3, 2, TimeSigType::NORMAL, "3/2" },
{ 4, 2, TimeSigType::NORMAL, "4/2" },
};

Palette* sp = new Palette;
Expand Down
9 changes: 8 additions & 1 deletion share/workspaces/Advanced.xml
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@
<gridWidth>42</gridWidth>
<gridHeight>38</gridHeight>
<mag>0.8</mag>
<moreElements>0</moreElements>
<moreElements>1</moreElements>
<Cell name="2/4">
<staff>1</staff>
<TimeSig>
Expand Down Expand Up @@ -372,6 +372,13 @@
<sigD>2</sigD>
</TimeSig>
</Cell>
<Cell name="3/2">
<staff>1</staff>
<TimeSig>
<sigN>3</sigN>
<sigD>2</sigD>
</TimeSig>
</Cell>
</Palette>
<Palette name="Brackets">
<gridWidth>40</gridWidth>
Expand Down
2 changes: 1 addition & 1 deletion share/workspaces/Basic.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
<gridWidth>42</gridWidth>
<gridHeight>38</gridHeight>
<mag>0.8</mag>
<moreElements>0</moreElements>
<moreElements>1</moreElements>
<Cell name="2/4">
<staff>1</staff>
<TimeSig>
Expand Down