Skip to content

Commit 893d16c

Browse files
Add print block to phrase maker widget stack for lyric (sugarlabs#4532)
* add print block to phrase maker widget stack * make it default in advanced mode * Make lyrics text translatable using _() * Update WidgetBlocks.js use lowercase for user-facing string --------- Co-authored-by: Walter Bender <[email protected]>
1 parent e68f05a commit 893d16c

File tree

1 file changed

+38
-1
lines changed

1 file changed

+38
-1
lines changed

js/blocks/WidgetBlocks.js

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1371,7 +1371,7 @@ function setupWidgetBlocks(activity) {
13711371

13721372
//.TRANS: assigns pitch to a sequence of beats to generate a melody
13731373
this.formBlock({ name: _("phrase maker"), canCollapse: true });
1374-
this.makeMacro((x, y) => [
1374+
activity.beginnerMode ? this.makeMacro((x, y) => [
13751375
[0, "matrix", x, y, [null, 1, 33]],
13761376
[1, "pitch", 0, 0, [0, 2, 3, 4]],
13771377
[2, ["solfege", { value: "ti" }], 0, 0, [1]],
@@ -1406,6 +1406,43 @@ function setupWidgetBlocks(activity) {
14061406
[31, ["number", { value: 1 }], 0, 0, [30]],
14071407
[32, ["number", { value: 2 }], 0, 0, [30]],
14081408
[33, "hiddennoflow", 0, 0, [0, null]]
1409+
]) : this.makeMacro((x, y) => [
1410+
[0, "matrix", x, y, [null, 1, 35]],
1411+
[1, "pitch", 0, 0, [0, 2, 3, 4]],
1412+
[2, ["solfege", { value: "ti" }], 0, 0, [1]],
1413+
[3, ["number", { value: 4 }], 0, 0, [1]],
1414+
[4, "pitch", 0, 0, [1, 5, 6, 7]],
1415+
[5, ["solfege", { value: "la" }], 0, 0, [4]],
1416+
[6, ["number", { value: 4 }], 0, 0, [4]],
1417+
[7, "pitch", 0, 0, [4, 8, 9, 10]],
1418+
[8, ["solfege", { value: "sol" }], 0, 0, [7]],
1419+
[9, ["number", { value: 4 }], 0, 0, [7]],
1420+
[10, "pitch", 0, 0, [7, 11, 12, 13]],
1421+
[11, ["solfege", { value: "mi" }], 0, 0, [10]],
1422+
[12, ["number", { value: 4 }], 0, 0, [10]],
1423+
[13, "pitch", 0, 0, [10, 14, 15, 16]],
1424+
[14, ["solfege", { value: "re" }], 0, 0, [13]],
1425+
[15, ["number", { value: 4 }], 0, 0, [13]],
1426+
[16, "playdrum", 0, 0, [13, 17, 18]],
1427+
[17, ["drumname", { value: "snare drum" }], 0, 0, [16]],
1428+
[18, "forward", 0, 0, [16, 19, 20]],
1429+
[19, ["number", { value: 100 }], 0, 0, [18]],
1430+
[20, "right", 0, 0, [18, 21, 22]],
1431+
[21, ["number", { value: 90 }], 0, 0, [20]],
1432+
[22, "print", 0, 0, [20, 23, 24]],
1433+
[23, ["text", { "value": _("lyrics") }], 0, 0, [22]],
1434+
[24, "rhythm2", 0, 0, [22, 25, 26, 29]],
1435+
[25, ["number", { value: 6 }], 0, 0, [24]],
1436+
[26, "divide", 0, 0, [24, 27, 28]],
1437+
[27, ["number", { value: 1 }], 0, 0, [26]],
1438+
[28, ["number", { value: 4 }], 0, 0, [26]],
1439+
[29, "vspace", 0, 0, [24, 30]],
1440+
[30, "rhythm2", 0, 0, [29, 31, 32, null]],
1441+
[31, ["number", { value: 1 }], 0, 0, [30]],
1442+
[32, "divide", 0, 0, [30, 33, 34]],
1443+
[33, ["number", { value: 1 }], 0, 0, [32]],
1444+
[34, ["number", { value: 2 }], 0, 0, [32]],
1445+
[35, "hiddennoflow", 0, 0, [0, null]]
14091446
]);
14101447
}
14111448

0 commit comments

Comments
 (0)