Skip to content

Commit 96a1126

Browse files
walterbenderwalterbender
committed
make separate palette for volume blocks -- reference #778 
1 parent bc2915b commit 96a1126

File tree

3 files changed

+109
-103
lines changed

3 files changed

+109
-103
lines changed

‎js/artwork.js‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎js/basicblocks.js‎

Lines changed: 102 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -1009,14 +1009,6 @@ function initBasicProtoBlocks(palettes, blocks) {
10091009
slurFactor.adjustWidthToLabel();
10101010
slurFactor.parameterBlock();
10111011

1012-
var notevolumeFactor = new ProtoBlock('notevolumefactor');
1013-
notevolumeFactor.palette = palettes.dict['tone'];
1014-
blocks.protoBlockDict['notevolumefactor'] = notevolumeFactor;
1015-
//.TRANS: the volume at which notes are played
1016-
notevolumeFactor.staticLabels.push(_('note volume'));
1017-
notevolumeFactor.adjustWidthToLabel();
1018-
notevolumeFactor.parameterBlock();
1019-
10201012
var keyBlock = new ProtoBlock('key');
10211013
keyBlock.palette = palettes.dict['tone'];
10221014
blocks.protoBlockDict['key'] = keyBlock;
@@ -1174,99 +1166,6 @@ function initBasicProtoBlocks(palettes, blocks) {
11741166
voiceBlock.defaults.push(_('violin'));
11751167
voiceBlock.hidden = true;
11761168

1177-
var articulationBlock = new ProtoBlock('articulation');
1178-
articulationBlock.palette = palettes.dict['tone'];
1179-
blocks.protoBlockDict['articulation'] = articulationBlock;
1180-
//.TRANS: set an articulation (change in volume)
1181-
articulationBlock.staticLabels.push(_('set relative volume'));
1182-
articulationBlock.adjustWidthToLabel();
1183-
articulationBlock.flowClampOneArgBlock();
1184-
articulationBlock.defaults.push(25);
1185-
1186-
var pppBlock = new ProtoBlock('ppp');
1187-
pppBlock.palette = palettes.dict['tone'];
1188-
blocks.protoBlockDict['ppp'] = pppBlock;
1189-
pppBlock.staticLabels.push('ppp');
1190-
pppBlock.adjustWidthToLabel();
1191-
pppBlock.zeroArgBlock();
1192-
1193-
var ppBlock = new ProtoBlock('pp');
1194-
ppBlock.palette = palettes.dict['tone'];
1195-
blocks.protoBlockDict['pp'] = ppBlock;
1196-
ppBlock.staticLabels.push('pp');
1197-
ppBlock.adjustWidthToLabel();
1198-
ppBlock.zeroArgBlock();
1199-
1200-
var pBlock = new ProtoBlock('p');
1201-
pBlock.palette = palettes.dict['tone'];
1202-
blocks.protoBlockDict['p'] = pBlock;
1203-
pBlock.staticLabels.push('p');
1204-
pBlock.adjustWidthToLabel();
1205-
pBlock.zeroArgBlock();
1206-
1207-
var mpBlock = new ProtoBlock('mp');
1208-
mpBlock.palette = palettes.dict['tone'];
1209-
blocks.protoBlockDict['mp'] = mpBlock;
1210-
mpBlock.staticLabels.push('mp');
1211-
mpBlock.adjustWidthToLabel();
1212-
mpBlock.zeroArgBlock();
1213-
1214-
var mfBlock = new ProtoBlock('mf');
1215-
mfBlock.palette = palettes.dict['tone'];
1216-
blocks.protoBlockDict['mf'] = mfBlock;
1217-
mfBlock.staticLabels.push('mf');
1218-
mfBlock.adjustWidthToLabel();
1219-
mfBlock.zeroArgBlock();
1220-
1221-
var fBlock = new ProtoBlock('f');
1222-
fBlock.palette = palettes.dict['tone'];
1223-
blocks.protoBlockDict['f'] = fBlock;
1224-
fBlock.staticLabels.push('f');
1225-
fBlock.adjustWidthToLabel();
1226-
fBlock.zeroArgBlock();
1227-
1228-
var ffBlock = new ProtoBlock('ff');
1229-
ffBlock.palette = palettes.dict['tone'];
1230-
blocks.protoBlockDict['ff'] = ffBlock;
1231-
ffBlock.staticLabels.push('ff');
1232-
ffBlock.adjustWidthToLabel();
1233-
ffBlock.zeroArgBlock();
1234-
1235-
var fffBlock = new ProtoBlock('fff');
1236-
fffBlock.palette = palettes.dict['tone'];
1237-
blocks.protoBlockDict['fff'] = fffBlock;
1238-
fffBlock.staticLabels.push('fff');
1239-
fffBlock.adjustWidthToLabel();
1240-
fffBlock.zeroArgBlock();
1241-
1242-
var noteVolumeBlock = new ProtoBlock('setnotevolume');
1243-
noteVolumeBlock.palette = palettes.dict['tone'];
1244-
blocks.protoBlockDict['setnotevolume'] = noteVolumeBlock;
1245-
//.TRANS: set the loudness level
1246-
noteVolumeBlock.staticLabels.push(_('set volume'));
1247-
noteVolumeBlock.adjustWidthToLabel();
1248-
noteVolumeBlock.oneArgBlock();
1249-
noteVolumeBlock.defaults.push(50);
1250-
1251-
var noteVolumeBlock2 = new ProtoBlock('setnotevolume2');
1252-
noteVolumeBlock2.palette = palettes.dict['tone'];
1253-
blocks.protoBlockDict['setnotevolume2'] = noteVolumeBlock2;
1254-
//.TRANS: set the loudness level
1255-
noteVolumeBlock2.staticLabels.push(_('set volume'));
1256-
noteVolumeBlock2.adjustWidthToLabel();
1257-
noteVolumeBlock2.flowClampOneArgBlock();
1258-
noteVolumeBlock2.defaults.push(50);
1259-
noteVolumeBlock2.hidden = true;
1260-
1261-
var crescendoBlock = new ProtoBlock('crescendo');
1262-
crescendoBlock.palette = palettes.dict['tone'];
1263-
blocks.protoBlockDict['crescendo'] = crescendoBlock;
1264-
//.TRANS: a gradual increase in loudness
1265-
crescendoBlock.staticLabels.push(_('crescendo') + ' +/-');
1266-
crescendoBlock.adjustWidthToLabel();
1267-
crescendoBlock.flowClampOneArgBlock();
1268-
crescendoBlock.defaults.push(5);
1269-
12701169
var slurBlock = new ProtoBlock('slur');
12711170
slurBlock.palette = palettes.dict['tone'];
12721171
blocks.protoBlockDict['slur'] = slurBlock;
@@ -3171,6 +3070,108 @@ function initBasicProtoBlocks(palettes, blocks) {
31713070
setTurtleName2.dockTypes[1] = 'anyin';
31723071
setTurtleName2.defaults.push(_('Mr. Mouse'));
31733072

3073+
// Volume palette
3074+
var notevolumeFactor = new ProtoBlock('notevolumefactor');
3075+
notevolumeFactor.palette = palettes.dict['volume'];
3076+
blocks.protoBlockDict['notevolumefactor'] = notevolumeFactor;
3077+
//.TRANS: the volume at which notes are played
3078+
notevolumeFactor.staticLabels.push(_('note volume'));
3079+
notevolumeFactor.adjustWidthToLabel();
3080+
notevolumeFactor.parameterBlock();
3081+
3082+
var pppBlock = new ProtoBlock('ppp');
3083+
pppBlock.palette = palettes.dict['volume'];
3084+
blocks.protoBlockDict['ppp'] = pppBlock;
3085+
pppBlock.staticLabels.push('ppp');
3086+
pppBlock.adjustWidthToLabel();
3087+
pppBlock.zeroArgBlock();
3088+
3089+
var ppBlock = new ProtoBlock('pp');
3090+
ppBlock.palette = palettes.dict['volume'];
3091+
blocks.protoBlockDict['pp'] = ppBlock;
3092+
ppBlock.staticLabels.push('pp');
3093+
ppBlock.adjustWidthToLabel();
3094+
ppBlock.zeroArgBlock();
3095+
3096+
var pBlock = new ProtoBlock('p');
3097+
pBlock.palette = palettes.dict['volume'];
3098+
blocks.protoBlockDict['p'] = pBlock;
3099+
pBlock.staticLabels.push('p');
3100+
pBlock.adjustWidthToLabel();
3101+
pBlock.zeroArgBlock();
3102+
3103+
var mpBlock = new ProtoBlock('mp');
3104+
mpBlock.palette = palettes.dict['volume'];
3105+
blocks.protoBlockDict['mp'] = mpBlock;
3106+
mpBlock.staticLabels.push('mp');
3107+
mpBlock.adjustWidthToLabel();
3108+
mpBlock.zeroArgBlock();
3109+
3110+
var mfBlock = new ProtoBlock('mf');
3111+
mfBlock.palette = palettes.dict['volume'];
3112+
blocks.protoBlockDict['mf'] = mfBlock;
3113+
mfBlock.staticLabels.push('mf');
3114+
mfBlock.adjustWidthToLabel();
3115+
mfBlock.zeroArgBlock();
3116+
3117+
var fBlock = new ProtoBlock('f');
3118+
fBlock.palette = palettes.dict['volume'];
3119+
blocks.protoBlockDict['f'] = fBlock;
3120+
fBlock.staticLabels.push('f');
3121+
fBlock.adjustWidthToLabel();
3122+
fBlock.zeroArgBlock();
3123+
3124+
var ffBlock = new ProtoBlock('ff');
3125+
ffBlock.palette = palettes.dict['volume'];
3126+
blocks.protoBlockDict['ff'] = ffBlock;
3127+
ffBlock.staticLabels.push('ff');
3128+
ffBlock.adjustWidthToLabel();
3129+
ffBlock.zeroArgBlock();
3130+
3131+
var fffBlock = new ProtoBlock('fff');
3132+
fffBlock.palette = palettes.dict['volume'];
3133+
blocks.protoBlockDict['fff'] = fffBlock;
3134+
fffBlock.staticLabels.push('fff');
3135+
fffBlock.adjustWidthToLabel();
3136+
fffBlock.zeroArgBlock();
3137+
3138+
var noteVolumeBlock = new ProtoBlock('setnotevolume');
3139+
noteVolumeBlock.palette = palettes.dict['volume'];
3140+
blocks.protoBlockDict['setnotevolume'] = noteVolumeBlock;
3141+
//.TRANS: set the loudness level
3142+
noteVolumeBlock.staticLabels.push(_('set volume'));
3143+
noteVolumeBlock.adjustWidthToLabel();
3144+
noteVolumeBlock.oneArgBlock();
3145+
noteVolumeBlock.defaults.push(50);
3146+
3147+
var noteVolumeBlock2 = new ProtoBlock('setnotevolume2');
3148+
noteVolumeBlock2.palette = palettes.dict['volume'];
3149+
blocks.protoBlockDict['setnotevolume2'] = noteVolumeBlock2;
3150+
//.TRANS: set the loudness level
3151+
noteVolumeBlock2.staticLabels.push(_('set volume'));
3152+
noteVolumeBlock2.adjustWidthToLabel();
3153+
noteVolumeBlock2.flowClampOneArgBlock();
3154+
noteVolumeBlock2.defaults.push(50);
3155+
noteVolumeBlock2.hidden = true;
3156+
3157+
var articulationBlock = new ProtoBlock('articulation');
3158+
articulationBlock.palette = palettes.dict['volume'];
3159+
blocks.protoBlockDict['articulation'] = articulationBlock;
3160+
//.TRANS: set an articulation (change in volume)
3161+
articulationBlock.staticLabels.push(_('set relative volume'));
3162+
articulationBlock.adjustWidthToLabel();
3163+
articulationBlock.flowClampOneArgBlock();
3164+
articulationBlock.defaults.push(25);
3165+
3166+
var crescendoBlock = new ProtoBlock('crescendo');
3167+
crescendoBlock.palette = palettes.dict['volume'];
3168+
blocks.protoBlockDict['crescendo'] = crescendoBlock;
3169+
//.TRANS: a gradual increase in loudness
3170+
crescendoBlock.staticLabels.push(_('crescendo') + ' +/-');
3171+
crescendoBlock.adjustWidthToLabel();
3172+
crescendoBlock.flowClampOneArgBlock();
3173+
crescendoBlock.defaults.push(5);
3174+
31743175
// Push protoblocks onto their palettes.
31753176
for (var protoblock in blocks.protoBlockDict) {
31763177
if (blocks.protoBlockDict[protoblock].palette != null) {

‎js/turtledefs.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ const DEFAULTPALETTE = 'rhythm';
1616

1717
// We don't include 'extras' since we want to be able to delete
1818
// plugins from the extras palette.
19-
BUILTINPALETTES = ['rhythm', 'pitch', 'meter', 'tone', 'intervals', 'drum', 'flow', 'action', 'boxes', 'widgets', 'mouse', 'pen', 'number', 'boolean', 'media', 'sensors', 'heap', 'mice', 'extras'];
19+
BUILTINPALETTES = ['rhythm', 'pitch', 'meter', 'tone', 'intervals', 'volume', 'drum', 'flow', 'action', 'boxes', 'widgets', 'mouse', 'pen', 'number', 'boolean', 'media', 'sensors', 'heap', 'mice', 'extras'];
2020

21-
const BUILTINPALETTESFORL23N = [_('rhythm'), _('pitch'), _('meter'), _('tone'), _('intervals'), _('drum'), _('flow'), _('action'), _('boxes'), _('widgets'), _('mouse'), _('pen'), _('number'), _('boolean'), _('media'), _('sensors'), _('heap'), _('mice'), _('extras')];
21+
const BUILTINPALETTESFORL23N = [_('rhythm'), _('pitch'), _('meter'), _('tone'), _('intervals'), _('volume'), _('drum'), _('flow'), _('action'), _('boxes'), _('widgets'), _('mouse'), _('pen'), _('number'), _('boolean'), _('media'), _('sensors'), _('heap'), _('mice'), _('extras')];
2222

2323

2424
function getMainToolbarButtonNames(name) {

0 commit comments

Comments
 (0)