From 4979ee361a11225f19b991810ca8d8c429a22620 Mon Sep 17 00:00:00 2001 From: Eric Guzman Date: Tue, 13 Mar 2012 15:51:17 -0700 Subject: CSS Panel - Add new panel to panel data --- js/data/panels-data.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'js/data') diff --git a/js/data/panels-data.js b/js/data/panels-data.js index 2422f5e7..84ec9c3c 100644 --- a/js/data/panels-data.js +++ b/js/data/panels-data.js @@ -82,6 +82,18 @@ exports.PanelsData = Montage.create(Montage, { modulePath: "js/panels/CSSPanel/CSSPanelBase.reel", moduleName: "CSSPanelBase" }, + { + name: "CSSPanel", + height: 200, + minHeight: 200, + maxHeight: null, + flexible: true, + scrollable: false, + collapsed: false, + open: true, + modulePath: "js/panels/css-panel/css-panel.reel", + moduleName: "CSSPanelNew" + }, { name: "Presets", minHeight: 100, -- cgit v1.2.3 From df3f96beb749951162bb60ec88363340e3ef6d95 Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Tue, 1 May 2012 15:59:47 -0700 Subject: More clean up, updating menu items --- js/data/menu-data.js | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'js/data') diff --git a/js/data/menu-data.js b/js/data/menu-data.js index 9e8bf945..1cde3e8d 100755 --- a/js/data/menu-data.js +++ b/js/data/menu-data.js @@ -22,13 +22,13 @@ exports.MenuData = Montage.create( Montage, { "displayText" : "New File", "hasSubMenu" : false, "enabled": true, - "action": "executeNewFile" + "action": "executeNewWebpage" }, { "displayText" : "Open File", "hasSubMenu" : false, "enabled": true, - "action": "executeFileOpen" + "action": "executeWebpageOpen" }, { "displayText" : "Close File", @@ -130,18 +130,6 @@ exports.MenuData = Montage.create( Montage, { { "displayText" : "", "separator": true - }, - { - "displayText" : "New Webpage", - "hasSubMenu" : false, - "enabled": true, - "action": "executeNewWebpage" - }, - { - "displayText" : "Open Webpage", - "hasSubMenu" : false, - "enabled": true, - "action": "executeWebpageOpen" } ] }, -- cgit v1.2.3 From 29ad6355ef60cfb3b3fc7f780504f3ed30845883 Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Mon, 7 May 2012 14:30:47 -0700 Subject: More implementation of moving color chips to the individual subtools. Removed the tool color bar Added new icons for inkbottle Removed Pencil tool Removed Inkbottle tool Added chips to the pen, brush and tag tools Aligned controls in several subtools --- js/data/tools-data.js | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) (limited to 'js/data') diff --git a/js/data/tools-data.js b/js/data/tools-data.js index 4d009530..ac6fe6e5 100755 --- a/js/data/tools-data.js +++ b/js/data/tools-data.js @@ -124,17 +124,6 @@ exports.ToolsData = Montage.create(Montage, { }], "selected": false }, - { - "id": "PencilTool", - "properties": "pencilProperties", - "spriteSheet": true, - "action": "PencilTool", - "toolTip": "Pencil Tool", - "cursor": "auto", - "lastInGroup": false, - "container": false, - "selected": false - }, { "id": "BrushTool", "properties": "brushProperties", @@ -163,22 +152,11 @@ exports.ToolsData = Montage.create(Montage, { "spriteSheet": true, "action": "InkBottleTool", "toolTip": "Ink Bottle Tool (K)", - "cursor": "url('images/tools/inkbottle_down.png'), default", + "cursor": "url('images/tools/inkbottle_cursor.png'), default", "lastInGroup": true, "container": false, "selected": false }, - { - "id": "EyedropperTool", - "properties": "eyedropperProperties", - "spriteSheet": true, - "action": "EyedropperTool", - "toolTip": "Eyedropper Tool (I)", - "cursor": "url('images/tools/eyedropper_down.png') 6 20, default", - "lastInGroup": false, - "container": false, - "selected": false - }, // { // "id": "EraserTool", // "properties": "eraserProperties", -- cgit v1.2.3 From dd663d8fe9191cc57c9cebe6d425562cb45982c2 Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Tue, 8 May 2012 07:25:09 -0700 Subject: Removed unused SubSelect Tool --- js/data/tools-data.js | 52 ++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 41 insertions(+), 11 deletions(-) (limited to 'js/data') diff --git a/js/data/tools-data.js b/js/data/tools-data.js index ac6fe6e5..32eaf24d 100755 --- a/js/data/tools-data.js +++ b/js/data/tools-data.js @@ -7,7 +7,48 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot var Montage = require("montage/core/core").Montage; exports.ToolsData = Montage.create(Montage, { + selectionToolIndex : { + value: 0 + }, + rotate3DToolIndex: { + value: 1 + }, + translate3DToolIndex: { + value: 2 + }, + tagToolIndex: { + value: 3 + }, + penToolIndex: { + value: 4 + }, + textToolIndex: { + value: 5 + }, + shapeToolIndex: { + value: 6 + }, + brushToolIndex: { + value: 7 + }, + fillToolIndex: { + value: 8 + }, + inkBottleToolIndex: { + value: 9 + }, + rotateStage3DToolIndex: { + value: 10 + }, + panToolIndex: { + value: 11 + }, + zoomToolIndex: { + value: 12 + }, + // NOTE: additions or removal of any tools, or any changes in the order of these entries requires updating the constant index properties above. + // Code in the keyboard mediator and ninja.js accesses the array below through the index constants above defaultToolsData: { value: [ { @@ -21,17 +62,6 @@ exports.ToolsData = Montage.create(Montage, { "container": false, "selected": true }, - { - "id": "SubselectionTool", - "properties": "subSelectionProperties", - "spriteSheet": true, - "action": "SubselectionTool", - "toolTip": "Subselect Tool", - "cursor": "auto", - "lastInGroup": true, - "container": false, - "selected": false - }, { "id": "RotateTool3D", "properties": "rotate3DProperties", -- cgit v1.2.3 From 8f8eb57f4506987942745c3325492e939ed3caa8 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Mon, 14 May 2012 17:27:32 -0700 Subject: fixing the body pi Signed-off-by: Valerio Virgillito --- js/data/pi/pi-data.js | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'js/data') diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js index d1dc9f34..157cbc64 100755 --- a/js/data/pi/pi-data.js +++ b/js/data/pi/pi-data.js @@ -10,20 +10,6 @@ var Montage = require("montage/core/core").Montage, exports.PiData = Montage.create( Montage, { bodyPi: { - value: [ - { - label: "Style", - - Section: [ - [ - - ] - ] - } - ] - }, - - stagePi: { value: [ { label: "Style", @@ -31,8 +17,8 @@ exports.PiData = Montage.create( Montage, { Section: [ [ { - type : "chip", - id : "background", + type: "chip", + id: "background", prop: "background" } ] -- cgit v1.2.3 From 0ebb822b0535bf1bb100b3f3cb396c8b6d3383f1 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Wed, 16 May 2012 11:23:12 -0700 Subject: fixing some of the document bindings. Signed-off-by: Valerio Virgillito --- js/data/menu-data.js | 35 ++++++++++------------------------- 1 file changed, 10 insertions(+), 25 deletions(-) (limited to 'js/data') diff --git a/js/data/menu-data.js b/js/data/menu-data.js index 1cde3e8d..7cf40a8a 100755 --- a/js/data/menu-data.js +++ b/js/data/menu-data.js @@ -36,11 +36,8 @@ exports.MenuData = Montage.create( Montage, { "enabled": { "value": false, "boundObj": "documentController", - "boundProperty": "activeDocument", - "oneway": true, - "boundValueMutator": function(activeDocument){ - return activeDocument !== null; - } + "boundProperty": "_documents.count()", + "oneway": true }, "action": "executeFileClose" }, @@ -50,11 +47,8 @@ exports.MenuData = Montage.create( Montage, { "enabled": { "value": false, "boundObj": "documentController", - "boundProperty": "activeDocument", - "oneway": true, - "boundValueMutator": function(activeDocument){ - return activeDocument !== null; - } + "boundProperty": "_documents.count()", + "oneway": true }, "action": "executeFileCloseAll" }, @@ -68,11 +62,8 @@ exports.MenuData = Montage.create( Montage, { "enabled": { "value": false, "boundObj": "documentController", - "boundProperty": "activeDocument", - "oneway": true, - "boundValueMutator": function(activeDocument){ - return activeDocument !== null; - } + "boundProperty": "_documents.count()", + "oneway": true }, "action": "executeSave" }, @@ -82,11 +73,8 @@ exports.MenuData = Montage.create( Montage, { "enabled": { "value": false, "boundObj": "documentController", - "boundProperty": "activeDocument", - "oneway": true, - "boundValueMutator": function(activeDocument) { - return activeDocument !== null; - } + "boundProperty": "_documents.count()", + "oneway": true }, "action":"executeSaveAs" }, @@ -96,11 +84,8 @@ exports.MenuData = Montage.create( Montage, { "enabled": { "value": false, "boundObj": "documentController", - "boundProperty": "activeDocument", - "oneway": true, - "boundValueMutator": function(activeDocument){ - return activeDocument !== null; - } + "boundProperty": "_documents.count()", + "oneway": true }, "action": "executeSaveAll" }, -- cgit v1.2.3 From c26de5fa7b909a53b103b72027b5cbe7c3e1c49f Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Wed, 16 May 2012 22:48:39 -0700 Subject: code cleanup and refactoring of the document controller and stage view Signed-off-by: Valerio Virgillito --- js/data/menu-data.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js/data') diff --git a/js/data/menu-data.js b/js/data/menu-data.js index 7cf40a8a..aeb95ccc 100755 --- a/js/data/menu-data.js +++ b/js/data/menu-data.js @@ -22,13 +22,13 @@ exports.MenuData = Montage.create( Montage, { "displayText" : "New File", "hasSubMenu" : false, "enabled": true, - "action": "executeNewWebpage" + "action": "executeNewFile" }, { "displayText" : "Open File", "hasSubMenu" : false, "enabled": true, - "action": "executeWebpageOpen" + "action": "executeFileOpen" }, { "displayText" : "Close File", -- cgit v1.2.3 From 8247cddcc7ddce25a6282e97d304cad9a0f0c4f3 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Fri, 18 May 2012 01:06:31 -0700 Subject: fixed the shape subtool not refreshing the icon Signed-off-by: Valerio Virgillito --- js/data/tools-data.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'js/data') diff --git a/js/data/tools-data.js b/js/data/tools-data.js index 32eaf24d..05455efe 100755 --- a/js/data/tools-data.js +++ b/js/data/tools-data.js @@ -60,6 +60,7 @@ exports.ToolsData = Montage.create(Montage, { "cursor": "auto", "lastInGroup": false, "container": false, + "subtools": [], "selected": true }, { @@ -71,6 +72,7 @@ exports.ToolsData = Montage.create(Montage, { "cursor": "auto", "lastInGroup": false, "container": false, + "subtools": [], "selected": false }, { @@ -82,6 +84,7 @@ exports.ToolsData = Montage.create(Montage, { "cursor": "auto", "lastInGroup": true, "container": false, + "subtools": [], "selected": false }, { @@ -93,6 +96,7 @@ exports.ToolsData = Montage.create(Montage, { "cursor": "url('images/cursors/Crosshair.png') 8 8, default", "lastInGroup": false, "container": false, + "subtools": [], "selected": false }, { @@ -104,6 +108,7 @@ exports.ToolsData = Montage.create(Montage, { "cursor": "auto", "lastInGroup": false, "container": false, + "subtools": [], "selected": false }, { @@ -115,6 +120,7 @@ exports.ToolsData = Montage.create(Montage, { "cursor": "text", "lastInGroup": false, "container": false, + "subtools": [], "selected": false }, { @@ -163,6 +169,7 @@ exports.ToolsData = Montage.create(Montage, { "cursor": "url('images/tools/brush_down.png') 9 17, default", "lastInGroup": false, "container": false, + "subtools": [], "selected": false }, { @@ -174,6 +181,7 @@ exports.ToolsData = Montage.create(Montage, { "cursor": "url('images/tools/bucket_down.png'), default", "lastInGroup": false, "container": false, + "subtools": [], "selected": false }, { @@ -185,6 +193,7 @@ exports.ToolsData = Montage.create(Montage, { "cursor": "url('images/tools/inkbottle_cursor.png'), default", "lastInGroup": true, "container": false, + "subtools": [], "selected": false }, // { @@ -196,6 +205,7 @@ exports.ToolsData = Montage.create(Montage, { // "cursor": "auto", // "lastInGroup": false, // "container": false, +// "subtools": [], // "selected": false // }, { @@ -207,6 +217,7 @@ exports.ToolsData = Montage.create(Montage, { "cursor": "auto", "lastInGroup": false, "container": false, + "subtools": [], "selected": false }, { @@ -218,6 +229,7 @@ exports.ToolsData = Montage.create(Montage, { "cursor": "url('images/tools/hand_down.png'), default", "lastInGroup": false, "container": false, + "subtools": [], "selected": false }, { @@ -229,6 +241,7 @@ exports.ToolsData = Montage.create(Montage, { "cursor": "url('images/cursors/zoom.png'),default", "lastInGroup": true, "container": false, + "subtools": [], "selected": false } ] -- cgit v1.2.3 From a237dfaad38bb9efac803db83a28099f6f74dde8 Mon Sep 17 00:00:00 2001 From: Eric Guzman Date: Mon, 21 May 2012 15:10:51 -0700 Subject: Remove Old CSS Panel --- js/data/panels-data.js | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'js/data') diff --git a/js/data/panels-data.js b/js/data/panels-data.js index 7ab40f11..ed346196 100644 --- a/js/data/panels-data.js +++ b/js/data/panels-data.js @@ -72,18 +72,6 @@ exports.PanelsData = Montage.create(Montage, { // }, { name: "CSS", - minHeight: 195, - height: 195, - maxHeight: null, - flexible: true, - scrollable: true, - collapsed: true, - open: true, - modulePath: "js/panels/CSSPanel/CSSPanelBase.reel", - moduleName: "CSSPanelBase" - }, - { - name: "CSSPanel", height: 200, minHeight: 200, maxHeight: null, -- cgit v1.2.3 From 1c3da2901f454ad2c18e20216bb2517740a1c080 Mon Sep 17 00:00:00 2001 From: Eric Guzman Date: Tue, 22 May 2012 14:28:00 -0700 Subject: CSS Panel - Update components to use new serialization format --- js/data/panels-data.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/data') diff --git a/js/data/panels-data.js b/js/data/panels-data.js index ed346196..ffc76782 100644 --- a/js/data/panels-data.js +++ b/js/data/panels-data.js @@ -80,7 +80,7 @@ exports.PanelsData = Montage.create(Montage, { collapsed: false, open: true, modulePath: "js/panels/css-panel/css-panel.reel", - moduleName: "CSSPanelNew" + moduleName: "CssPanel" }, { name: "Presets", -- cgit v1.2.3