From 3a754133dbc138390503341fd2e9beba3e43aa4b Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Fri, 27 Jan 2012 12:05:17 -0800 Subject: Merged old FileIO --- js/data/appdata.js | 0 js/data/menu-data.js | 13 +++++++------ js/data/pi/pi-data.js | 0 js/data/settings.js | 0 js/data/tools-data.js | 0 5 files changed, 7 insertions(+), 6 deletions(-) mode change 100644 => 100755 js/data/appdata.js mode change 100644 => 100755 js/data/menu-data.js mode change 100644 => 100755 js/data/pi/pi-data.js mode change 100644 => 100755 js/data/settings.js mode change 100644 => 100755 js/data/tools-data.js (limited to 'js/data') diff --git a/js/data/appdata.js b/js/data/appdata.js old mode 100644 new mode 100755 diff --git a/js/data/menu-data.js b/js/data/menu-data.js old mode 100644 new mode 100755 index e9e47dc0..bafc30da --- a/js/data/menu-data.js +++ b/js/data/menu-data.js @@ -15,7 +15,7 @@ exports.MenuData = Montage.create( Montage, { { "displayText" : "New Project", "hasSubMenu" : false, - "enabled": true, + "enabled": false, "action": "executeNewProject" }, { @@ -37,17 +37,18 @@ exports.MenuData = Montage.create( Montage, { { "displayText" : "Save", "hasSubMenu" : false, - "enabled": false + "enabled": true }, { "displayText" : "Save As", "hasSubMenu" : false, - "enabled": false + "enabled": true, + "action":"saveAs" }, { "displayText" : "Save All", "hasSubMenu" : false, - "enabled": false + "enabled": true }, { "displayText" : "", @@ -56,12 +57,12 @@ exports.MenuData = Montage.create( Montage, { { "displayText" : "Open Project", "hasSubMenu" : false, - "enabled": true + "enabled": false }, { "displayText" : "Open Recent", "hasSubMenu" : false, - "enabled": true + "enabled": false }, { "displayText" : "Close Project", diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js old mode 100644 new mode 100755 diff --git a/js/data/settings.js b/js/data/settings.js old mode 100644 new mode 100755 diff --git a/js/data/tools-data.js b/js/data/tools-data.js old mode 100644 new mode 100755 -- cgit v1.2.3 From 729bc48212d7244539c99ca206be673eed011115 Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Mon, 6 Feb 2012 16:07:46 -0800 Subject: integrated save for the document tabs, detect codemirror history to show document dirty indicator. Signed-off-by: Ananya Sen --- js/data/menu-data.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'js/data') diff --git a/js/data/menu-data.js b/js/data/menu-data.js index bafc30da..07337fa0 100755 --- a/js/data/menu-data.js +++ b/js/data/menu-data.js @@ -37,7 +37,8 @@ exports.MenuData = Montage.create( Montage, { { "displayText" : "Save", "hasSubMenu" : false, - "enabled": true + "enabled": true, + "action": "executeSave" }, { "displayText" : "Save As", @@ -48,7 +49,8 @@ exports.MenuData = Montage.create( Montage, { { "displayText" : "Save All", "hasSubMenu" : false, - "enabled": true + "enabled": true, + "action": "executeSaveAll" }, { "displayText" : "", -- cgit v1.2.3 From ad0ee69be3512325ede94738f23597086a141a3e Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Fri, 10 Feb 2012 01:55:30 -0800 Subject: file open and file new integrated again Signed-off-by: Ananya Sen --- js/data/menu-data.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/data') diff --git a/js/data/menu-data.js b/js/data/menu-data.js index 07337fa0..683be2dc 100755 --- a/js/data/menu-data.js +++ b/js/data/menu-data.js @@ -25,7 +25,7 @@ exports.MenuData = Montage.create( Montage, { "action": "executeNewFile" }, { - "displayText" : "Open...", + "displayText" : "Open File", "hasSubMenu" : false, "enabled": true, "action": "executeFileOpen" -- cgit v1.2.3 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 From d77deb60ade63d8526ce16d0b104285411218e14 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Tue, 14 Feb 2012 13:38:56 -0800 Subject: Get color under mouse point from image or canvas. Signed-off-by: Nivesh Rajbhandari --- js/data/tools-data.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/data') diff --git a/js/data/tools-data.js b/js/data/tools-data.js index de965dbc..f63d14ae 100644 --- a/js/data/tools-data.js +++ b/js/data/tools-data.js @@ -174,7 +174,7 @@ exports.ToolsData = Montage.create(Montage, { "spriteSheet": true, "action": "EyedropperTool", "toolTip": "Eyedropper Tool", - "cursor": "url('images/tools/eyedropper_down.png'), default", + "cursor": "url('images/tools/eyedropper_down.png') 6 20, default", "lastInGroup": false, "container": false, "selected": false -- cgit v1.2.3 From bb4da39a73cbd6fbe83f3b7c9ed5ae60fe58dd6b Mon Sep 17 00:00:00 2001 From: Armen Kesablyan Date: Wed, 15 Feb 2012 14:23:19 -0800 Subject: Tool Icons : New layout Signed-off-by: Armen Kesablyan --- js/data/tools-data.js | 66 +++++++++++++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) (limited to 'js/data') diff --git a/js/data/tools-data.js b/js/data/tools-data.js index de965dbc..8356c422 100644 --- a/js/data/tools-data.js +++ b/js/data/tools-data.js @@ -157,39 +157,39 @@ exports.ToolsData = Montage.create(Montage, { "container": false, "selected": false }, - { - "id": "InkBottleTool", - "properties": "inkbottleProperties", - "spriteSheet": true, - "action": "InkBottleTool", - "toolTip": "Ink Bottle Tool", - "cursor": "url('images/tools/inkbottle_down.png'), default", - "lastInGroup": false, - "container": false, - "selected": false - }, - { - "id": "EyedropperTool", - "properties": "eyedropperProperties", - "spriteSheet": true, - "action": "EyedropperTool", - "toolTip": "Eyedropper Tool", - "cursor": "url('images/tools/eyedropper_down.png'), default", - "lastInGroup": false, - "container": false, - "selected": false - }, - { - "id": "EraserTool", - "properties": "eraserProperties", - "spriteSheet": true, - "action": "EraserTool", - "toolTip": "Eraser Tool", - "cursor": "auto", - "lastInGroup": false, - "container": false, - "selected": false - }, +// { +// "id": "InkBottleTool", +// "properties": "inkbottleProperties", +// "spriteSheet": true, +// "action": "InkBottleTool", +// "toolTip": "Ink Bottle Tool", +// "cursor": "url('images/tools/inkbottle_down.png'), default", +// "lastInGroup": false, +// "container": false, +// "selected": false +// }, +// { +// "id": "EyedropperTool", +// "properties": "eyedropperProperties", +// "spriteSheet": true, +// "action": "EyedropperTool", +// "toolTip": "Eyedropper Tool", +// "cursor": "url('images/tools/eyedropper_down.png'), default", +// "lastInGroup": false, +// "container": false, +// "selected": false +// }, +// { +// "id": "EraserTool", +// "properties": "eraserProperties", +// "spriteSheet": true, +// "action": "EraserTool", +// "toolTip": "Eraser Tool", +// "cursor": "auto", +// "lastInGroup": false, +// "container": false, +// "selected": false +// }, { "id": "RotateStageTool3D", "properties": "rotateStageProperties", -- cgit v1.2.3 From 92873714dd6ffb259e6c5a27da2ade773d7b00f9 Mon Sep 17 00:00:00 2001 From: Armen Kesablyan Date: Wed, 15 Feb 2012 15:04:37 -0800 Subject: New Icons: Last set had imperfections Signed-off-by: Armen Kesablyan --- js/data/tools-data.js | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'js/data') diff --git a/js/data/tools-data.js b/js/data/tools-data.js index 8356c422..4847fa7c 100644 --- a/js/data/tools-data.js +++ b/js/data/tools-data.js @@ -28,7 +28,7 @@ exports.ToolsData = Montage.create(Montage, { "action": "SubselectionTool", "toolTip": "Subselect Tool", "cursor": "auto", - "lastInGroup": false, + "lastInGroup": true, "container": false, "selected": false }, @@ -153,7 +153,7 @@ exports.ToolsData = Montage.create(Montage, { "action": "FillTool", "toolTip": "Fill Tool", "cursor": "url('images/tools/bucket_down.png'), default", - "lastInGroup": false, + "lastInGroup": true, "container": false, "selected": false }, @@ -168,17 +168,17 @@ exports.ToolsData = Montage.create(Montage, { // "container": false, // "selected": false // }, -// { -// "id": "EyedropperTool", -// "properties": "eyedropperProperties", -// "spriteSheet": true, -// "action": "EyedropperTool", -// "toolTip": "Eyedropper Tool", -// "cursor": "url('images/tools/eyedropper_down.png'), default", -// "lastInGroup": false, -// "container": false, -// "selected": false -// }, + { + "id": "EyedropperTool", + "properties": "eyedropperProperties", + "spriteSheet": true, + "action": "EyedropperTool", + "toolTip": "Eyedropper Tool", + "cursor": "url('images/tools/eyedropper_down.png'), default", + "lastInGroup": false, + "container": false, + "selected": false + }, // { // "id": "EraserTool", // "properties": "eraserProperties", @@ -219,7 +219,7 @@ exports.ToolsData = Montage.create(Montage, { "action": "ZoomTool", "toolTip": "Zoom Tool (Z)", "cursor": "url('images/cursors/zoom.png'),default", - "lastInGroup": false, + "lastInGroup": true, "container": false, "selected": false } -- cgit v1.2.3 From fa51b9cf6c034313c10cf2963e720feeeabcfc4a Mon Sep 17 00:00:00 2001 From: Eric Guzman Date: Thu, 16 Feb 2012 16:10:33 -0800 Subject: Presets Panel - Move to bottom, add to menu --- js/data/menu-data.js | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'js/data') diff --git a/js/data/menu-data.js b/js/data/menu-data.js index 3a065958..6503e776 100755 --- a/js/data/menu-data.js +++ b/js/data/menu-data.js @@ -351,6 +351,15 @@ exports.MenuData = Montage.create( Montage, { "boundProperty": "MaterialsPanel" } }, + { + "displayText" : "Presets", + "hasSubMenu" : false, + "enabled": true, + "checked": { + "value": true, + "boundProperty": "PresetsPanel" + } + }, { "displayText" : "Code", "hasSubMenu" : false, -- cgit v1.2.3 From d47c4c0f6053fb8390526f32c2ee08dee0bdec20 Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Fri, 17 Feb 2012 15:22:23 -0800 Subject: Chrome Preview --- js/data/menu-data.js | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'js/data') diff --git a/js/data/menu-data.js b/js/data/menu-data.js index 6503e776..7c3ca5d4 100755 --- a/js/data/menu-data.js +++ b/js/data/menu-data.js @@ -139,6 +139,15 @@ exports.MenuData = Montage.create( Montage, { "boundProperty": "livePreview" } }, + { + "displayText" : "Chrome Preview", + "hasSubMenu" : false, + "enabled": true, + "checked": { + "value": false, + "boundProperty": "chromePreview" + } + }, { "displayText" : "Layout View", "hasSubMenu" : false, -- cgit v1.2.3 From d4a110bf2c7a949c627966ed01db7a4d32d62757 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Fri, 24 Feb 2012 10:04:19 -0800 Subject: Adding back Ink Bottle tool in the tool bar so QE can test ink bottle functionality without having to wait for the new icon and location of the tool. Signed-off-by: Nivesh Rajbhandari --- js/data/tools-data.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'js/data') diff --git a/js/data/tools-data.js b/js/data/tools-data.js index 00de9236..96367203 100755 --- a/js/data/tools-data.js +++ b/js/data/tools-data.js @@ -157,17 +157,17 @@ exports.ToolsData = Montage.create(Montage, { "container": false, "selected": false }, -// { -// "id": "InkBottleTool", -// "properties": "inkbottleProperties", -// "spriteSheet": true, -// "action": "InkBottleTool", -// "toolTip": "Ink Bottle Tool", -// "cursor": "url('images/tools/inkbottle_down.png'), default", -// "lastInGroup": false, -// "container": false, -// "selected": false -// }, + { + "id": "InkBottleTool", + "properties": "inkbottleProperties", + "spriteSheet": true, + "action": "InkBottleTool", + "toolTip": "Ink Bottle Tool", + "cursor": "url('images/tools/inkbottle_down.png'), default", + "lastInGroup": false, + "container": false, + "selected": false + }, { "id": "EyedropperTool", "properties": "eyedropperProperties", -- cgit v1.2.3 From 6ad427c4975b9a30f87dfb8ad53614cd4b6e65b9 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Fri, 24 Feb 2012 10:12:16 -0800 Subject: Marking inkbottle as the final tool in the set. Signed-off-by: Nivesh Rajbhandari --- js/data/tools-data.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js/data') diff --git a/js/data/tools-data.js b/js/data/tools-data.js index 96367203..cf48757d 100755 --- a/js/data/tools-data.js +++ b/js/data/tools-data.js @@ -153,7 +153,7 @@ exports.ToolsData = Montage.create(Montage, { "action": "FillTool", "toolTip": "Fill Tool", "cursor": "url('images/tools/bucket_down.png'), default", - "lastInGroup": true, + "lastInGroup": false, "container": false, "selected": false }, @@ -164,7 +164,7 @@ exports.ToolsData = Montage.create(Montage, { "action": "InkBottleTool", "toolTip": "Ink Bottle Tool", "cursor": "url('images/tools/inkbottle_down.png'), default", - "lastInGroup": false, + "lastInGroup": true, "container": false, "selected": false }, -- cgit v1.2.3