From 9e40945a5bf4330d1088b56b8011ee625b1adab9 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Fri, 10 Feb 2012 10:23:48 -0800 Subject: Support export/import of GLLine data. Signed-off-by: Nivesh Rajbhandari --- js/data/pi/pi-data.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'js/data') diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js index 10b33a0e..8ffd0ec7 100644 --- a/js/data/pi/pi-data.js +++ b/js/data/pi/pi-data.js @@ -459,12 +459,14 @@ exports.PiData = Montage.create( Montage, { [ { type: "dropdown", - id: "stroke", + id: "strokeMaterial", + prop: "strokeMaterial", label: "Stroke", labelField: "_name", dataField: "_name", items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, - enabled: { boundObject: "this.controls", boundProperty: "useWebGl" } + enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }, + divider : true } ] ] -- cgit v1.2.3 From cde1dd9a9156b9682fdf85ce2cd4acdd94124c37 Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Fri, 10 Feb 2012 16:00:35 -0800 Subject: -Changed the capitalization of all main top level menus from all caps -Added new main-menu-controller to be the default generic handler for menu item calls that do not need to call to a specific controller -Removed the test menu item -Finalized the help submenu items and hooked them up to the main-menu-controller --- js/data/menu-data.js | 41 +++++++++++++++++------------------------ 1 file changed, 17 insertions(+), 24 deletions(-) (limited to 'js/data') 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, { topLevelMenu: { value: [ { - "header": "FILE", + "header": "File", "entries": [ { "displayText" : "New Project", @@ -71,7 +71,7 @@ exports.MenuData = Montage.create( Montage, { ] }, { - "header": "EDIT", + "header": "Edit", "entries": [ { "displayText" : "Undo", @@ -111,7 +111,7 @@ exports.MenuData = Montage.create( Montage, { ] }, { - "header": "VIEW", + "header": "View", "entries": [ { "displayText" : "Zoom In", @@ -282,7 +282,7 @@ exports.MenuData = Montage.create( Montage, { ] }, { - "header": "WINDOW", + "header": "Window", "entries": [ { "displayText" : "Tools", @@ -356,41 +356,34 @@ exports.MenuData = Montage.create( Montage, { ] }, { - "header": "HELP", + "header": "Help", "entries": [ { - "displayText" : "About", + "displayText" : "Ninja FAQ", "hasSubMenu" : false, - "enabled": true + "enabled": true, + "action": "executeHelpFAQ" }, { - "displayText" : "FAQ", + "displayText" : "Ninja Forums", "hasSubMenu" : false, - "enabled": true + "enabled": true, + "action": "executeHelpForums" }, { - "displayText" : "Forums", + "displayText" : "Help Topics", "hasSubMenu" : false, - "enabled": true - } - ] - }, - { - "header": "TEST", - "entries": [ - { - "displayText" : "Open CSS View", - "hasSubMenu" : false, - "enabled": true + "enabled": true, + "action": "executeHelpTopics" }, { - "displayText" : "Open JS View", + "displayText" : "About Ninja...", "hasSubMenu" : false, - "enabled": true + "enabled": true, + "action": "executeHelpAbout" } ] } - ] } }); -- cgit v1.2.3 From a30d76ff641ce89686cf5fbd9f04ac9ab4e9c830 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Fri, 10 Feb 2012 17:21:28 -0800 Subject: initial color chip for the stage Signed-off-by: Valerio Virgillito --- js/data/pi/pi-data.js | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'js/data') diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js index 10b33a0e..a6811a20 100644 --- a/js/data/pi/pi-data.js +++ b/js/data/pi/pi-data.js @@ -10,7 +10,21 @@ var Montage = require("montage/core/core").Montage, exports.PiData = Montage.create( Montage, { stagePi: { - value: [] + value: [ + { + label: "Style", + + Section: [ + [ + { + type : "chip", + id : "background", + prop: "background" + } + ] + ] + } + ] }, blockPi: { -- cgit v1.2.3