From 6b9bfb63f6bc22ef1095dc11816826bb83a2c408 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Mon, 26 Mar 2012 15:55:38 -0700 Subject: Cleanup of the components panel Renamed to naming convention. Deleted un-used file. Signed-off-by: Valerio Virgillito --- js/data/panels-data.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js/data') diff --git a/js/data/panels-data.js b/js/data/panels-data.js index 2422f5e7..7a2d817a 100644 --- a/js/data/panels-data.js +++ b/js/data/panels-data.js @@ -55,8 +55,8 @@ exports.PanelsData = Montage.create(Montage, { scrollable: true, collapsed: true, open: true, - modulePath: "js/panels/Components/ComponentsPanelBase.reel", - moduleName: "ComponentsPanelBase" + modulePath: "js/panels/components-panel.reel", + moduleName: "ComponentsPanel" }, // { // name: "Project/Assets", -- cgit v1.2.3 From c2e9ed5bc4cbef870283784fa2a91f43ff72cade Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Mon, 2 Apr 2012 11:14:46 -0700 Subject: IKNinja-1410 - Inner Radius should be restricted to 99%. Signed-off-by: Nivesh Rajbhandari --- js/data/pi/pi-data.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/data') diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js index 7edc90d8..07017f09 100755 --- a/js/data/pi/pi-data.js +++ b/js/data/pi/pi-data.js @@ -578,7 +578,7 @@ exports.PiData = Montage.create( Montage, { valueMutator: parseFloat, value : 0, min : 0, - max : 100, + max : 99, unit : "%", acceptableUnits: ["%"] -- cgit v1.2.3 From d5b429f4d1fad1f9b83e81d2d742d43ec39bd585 Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Wed, 4 Apr 2012 15:14:33 -0700 Subject: [CR] Keep Save related menu items always enabled, if there is an open document Signed-off-by: Ananya Sen --- js/data/menu-data.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'js/data') diff --git a/js/data/menu-data.js b/js/data/menu-data.js index 3333d209..a1fe2703 100755 --- a/js/data/menu-data.js +++ b/js/data/menu-data.js @@ -70,8 +70,12 @@ exports.MenuData = Montage.create( Montage, { "enabled": { "value": false, "boundObj": "documentController", - "boundProperty": "canSave", - "oneway": true + "boundProperty": "activeDocument", + "oneway": true, + "boundValueMutator": function(activeDocument){ + if(activeDocument !== null){return true;} + else{return false;} + } }, "action": "executeSave" }, @@ -96,10 +100,10 @@ exports.MenuData = Montage.create( Montage, { "enabled": { "value": false, "boundObj": "documentController", - "boundProperty": "canSaveAll", + "boundProperty": "activeDocument", "oneway": true, - "boundValueMutator": function(canSaveAll){ - if(canSaveAll === true){return true;} + "boundValueMutator": function(activeDocument){ + if(activeDocument !== null){return true;} else{return false;} } }, -- cgit v1.2.3 From 4900f2e6e346df18b1b5a2ac89da5019644ac98a Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Mon, 9 Apr 2012 16:47:35 -0700 Subject: adding a history panel Signed-off-by: Valerio Virgillito --- 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 7a2d817a..f613a3be 100644 --- a/js/data/panels-data.js +++ b/js/data/panels-data.js @@ -93,6 +93,18 @@ exports.PanelsData = Montage.create(Montage, { open: true, modulePath: "js/panels/presets/content.reel", moduleName: "content" + }, + { + name: "History", + minHeight: 100, + height: 100, + maxHeight: null, + flexible: true, + collapsed: true, + scrollable: true, + open: true, + modulePath: "js/panels/history-panel/history.reel", + moduleName: "History" } ] } -- cgit v1.2.3 From 77c6ab76ffe9fc380ed6fdb7b29ccd40acaee74d Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Thu, 12 Apr 2012 14:24:25 -0700 Subject: Fixing selection/tag layout drawing when canvas and image elements have borders. Signed-off-by: Nivesh Rajbhandari --- js/data/pi/pi-data.js | 2 ++ 1 file changed, 2 insertions(+) (limited to 'js/data') diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js index 07017f09..157c54ec 100755 --- a/js/data/pi/pi-data.js +++ b/js/data/pi/pi-data.js @@ -131,6 +131,8 @@ exports.PiData = Montage.create( Montage, { type : "hottext", id : "borderWidth", prop : "border-width", + defaultValue: 0, + valueMutator: parseFloat, label : "Border", min : 0, max : 100, -- cgit v1.2.3 From fe2ea22983e29b1e99dabe883e773c4949d3d6e2 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Fri, 13 Apr 2012 12:23:00 -0700 Subject: IKNinja-1022 - PaintBucket tooltip is incorrect. Also added kb shortcuts for PaintBucket, InkBottle and Eyedropper tools. Signed-off-by: Nivesh Rajbhandari --- js/data/tools-data.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'js/data') diff --git a/js/data/tools-data.js b/js/data/tools-data.js index faf3336f..4d009530 100755 --- a/js/data/tools-data.js +++ b/js/data/tools-data.js @@ -151,7 +151,7 @@ exports.ToolsData = Montage.create(Montage, { "properties": "fillProperties", "spriteSheet": true, "action": "FillTool", - "toolTip": "Fill Tool", + "toolTip": "Paint Bucket Tool (K)", "cursor": "url('images/tools/bucket_down.png'), default", "lastInGroup": false, "container": false, @@ -162,7 +162,7 @@ exports.ToolsData = Montage.create(Montage, { "properties": "inkbottleProperties", "spriteSheet": true, "action": "InkBottleTool", - "toolTip": "Ink Bottle Tool", + "toolTip": "Ink Bottle Tool (K)", "cursor": "url('images/tools/inkbottle_down.png'), default", "lastInGroup": true, "container": false, @@ -173,7 +173,7 @@ exports.ToolsData = Montage.create(Montage, { "properties": "eyedropperProperties", "spriteSheet": true, "action": "EyedropperTool", - "toolTip": "Eyedropper Tool", + "toolTip": "Eyedropper Tool (I)", "cursor": "url('images/tools/eyedropper_down.png') 6 20, default", "lastInGroup": false, "container": false, -- cgit v1.2.3