aboutsummaryrefslogtreecommitdiff
path: root/js/data
diff options
context:
space:
mode:
Diffstat (limited to 'js/data')
-rw-r--r--js/data/menu-data.js41
-rw-r--r--js/data/pi/pi-data.js52
2 files changed, 64 insertions, 29 deletions
diff --git a/js/data/menu-data.js b/js/data/menu-data.js
index e9e47dc0..34adc82d 100644
--- a/js/data/menu-data.js
+++ b/js/data/menu-data.js
@@ -10,7 +10,7 @@ exports.MenuData = Montage.create( Montage, {
10 topLevelMenu: { 10 topLevelMenu: {
11 value: [ 11 value: [
12 { 12 {
13 "header": "FILE", 13 "header": "File",
14 "entries": [ 14 "entries": [
15 { 15 {
16 "displayText" : "New Project", 16 "displayText" : "New Project",
@@ -71,7 +71,7 @@ exports.MenuData = Montage.create( Montage, {
71 ] 71 ]
72 }, 72 },
73 { 73 {
74 "header": "EDIT", 74 "header": "Edit",
75 "entries": [ 75 "entries": [
76 { 76 {
77 "displayText" : "Undo", 77 "displayText" : "Undo",
@@ -111,7 +111,7 @@ exports.MenuData = Montage.create( Montage, {
111 ] 111 ]
112 }, 112 },
113 { 113 {
114 "header": "VIEW", 114 "header": "View",
115 "entries": [ 115 "entries": [
116 { 116 {
117 "displayText" : "Zoom In", 117 "displayText" : "Zoom In",
@@ -282,7 +282,7 @@ exports.MenuData = Montage.create( Montage, {
282 ] 282 ]
283 }, 283 },
284 { 284 {
285 "header": "WINDOW", 285 "header": "Window",
286 "entries": [ 286 "entries": [
287 { 287 {
288 "displayText" : "Tools", 288 "displayText" : "Tools",
@@ -356,41 +356,34 @@ exports.MenuData = Montage.create( Montage, {
356 ] 356 ]
357 }, 357 },
358 { 358 {
359 "header": "HELP", 359 "header": "Help",
360 "entries": [ 360 "entries": [
361 { 361 {
362 "displayText" : "About", 362 "displayText" : "Ninja FAQ",
363 "hasSubMenu" : false, 363 "hasSubMenu" : false,
364 "enabled": true 364 "enabled": true,
365 "action": "executeHelpFAQ"
365 }, 366 },
366 { 367 {
367 "displayText" : "FAQ", 368 "displayText" : "Ninja Forums",
368 "hasSubMenu" : false, 369 "hasSubMenu" : false,
369 "enabled": true 370 "enabled": true,
371 "action": "executeHelpForums"
370 }, 372 },
371 { 373 {
372 "displayText" : "Forums", 374 "displayText" : "Help Topics",
373 "hasSubMenu" : false, 375 "hasSubMenu" : false,
374 "enabled": true 376 "enabled": true,
375 } 377 "action": "executeHelpTopics"
376 ]
377 },
378 {
379 "header": "TEST",
380 "entries": [
381 {
382 "displayText" : "Open CSS View",
383 "hasSubMenu" : false,
384 "enabled": true
385 }, 378 },
386 { 379 {
387 "displayText" : "Open JS View", 380 "displayText" : "About Ninja...",
388 "hasSubMenu" : false, 381 "hasSubMenu" : false,
389 "enabled": true 382 "enabled": true,
383 "action": "executeHelpAbout"
390 } 384 }
391 ] 385 ]
392 } 386 }
393
394 ] 387 ]
395 } 388 }
396}); 389});
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index dd75e255..8ffd0ec7 100644
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -369,12 +369,24 @@ exports.PiData = Montage.create( Montage, {
369 Section: [ 369 Section: [
370 [ 370 [
371 { 371 {
372 type: "checkbox",
373 id: "useWebGl",
374 prop: "useWebGl",
375 defaultValue: false,
376 value: "Use WebGL",
377 checked: false
378 }
379 ],
380 [
381 {
372 type: "dropdown", 382 type: "dropdown",
373 id: "strokeMaterial", 383 id: "strokeMaterial",
374 prop: "strokeMaterial", 384 prop: "strokeMaterial",
375 label: "Stroke", 385 label: "Stroke",
376 labelField: "_name", 386 labelField: "_name",
387 dataField: "_name",
377 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, 388 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
389 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" },
378 divider : true 390 divider : true
379 } 391 }
380 ], 392 ],
@@ -385,7 +397,9 @@ exports.PiData = Montage.create( Montage, {
385 prop: "fillMaterial", 397 prop: "fillMaterial",
386 label: "Fill", 398 label: "Fill",
387 labelField: "_name", 399 labelField: "_name",
388 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" } 400 dataField: "_name",
401 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
402 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
389 } 403 }
390 ] 404 ]
391 ] 405 ]
@@ -434,11 +448,25 @@ exports.PiData = Montage.create( Montage, {
434 Section: [ 448 Section: [
435 [ 449 [
436 { 450 {
451 type: "checkbox",
452 id: "useWebGl",
453 prop: "useWebGl",
454 defaultValue: false,
455 value: "Use WebGL",
456 checked: false
457 }
458 ],
459 [
460 {
437 type: "dropdown", 461 type: "dropdown",
438 id: "stroke", 462 id: "strokeMaterial",
463 prop: "strokeMaterial",
439 label: "Stroke", 464 label: "Stroke",
440 labelField: "_name", 465 labelField: "_name",
441 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" } 466 dataField: "_name",
467 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
468 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" },
469 divider : true
442 } 470 }
443 ] 471 ]
444 ] 472 ]
@@ -507,12 +535,24 @@ exports.PiData = Montage.create( Montage, {
507 Section: [ 535 Section: [
508 [ 536 [
509 { 537 {
538 type: "checkbox",
539 id: "useWebGl",
540 prop: "useWebGl",
541 defaultValue: false,
542 value: "Use WebGL",
543 checked: false
544 }
545 ],
546 [
547 {
510 type: "dropdown", 548 type: "dropdown",
511 id: "strokeMaterial", 549 id: "strokeMaterial",
512 prop: "strokeMaterial", 550 prop: "strokeMaterial",
513 label: "Stroke", 551 label: "Stroke",
514 labelFunction: function(item) { return item.getName(); }, 552 labelField: "_name",
553 dataField: "_name",
515 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, 554 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
555 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" },
516 divider : true 556 divider : true
517 } 557 }
518 ], 558 ],
@@ -523,7 +563,9 @@ exports.PiData = Montage.create( Montage, {
523 prop: "fillMaterial", 563 prop: "fillMaterial",
524 label: "Fill", 564 label: "Fill",
525 labelField: "_name", 565 labelField: "_name",
526 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" } 566 dataField: "_name",
567 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
568 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
527 } 569 }
528 ] 570 ]
529 ] 571 ]
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 09:09:49 +0000