Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Codeview-improvements

2 files changed, 144 insertions, 37 deletions

diff --git a/js/data/menu-data.js b/js/data/menu-data.js
index 12007f4a..3333d209 100755
--- a/js/data/menu-data.js
+++ b/js/data/menu-data.js
@@ -154,17 +154,17 @@ exports.MenuData = Montage.create( Montage, {
                         {
                             "displayText" : "Cut",
                             "hasSubMenu" : false,
-                            "enabled": true
+                            "enabled": false
                         },
                         {
                             "displayText" : "Copy",
                             "hasSubMenu" : false,
-                            "enabled": true
+                            "enabled": false
                         },
                         {
                             "displayText" : "Paste",
                             "hasSubMenu" : false,
-                            "enabled": true
+                            "enabled": false
                         }
                     ]
                 },
@@ -172,38 +172,6 @@ exports.MenuData = Montage.create( Montage, {
                     "header": "View",
                     "entries": [
                         {
-                            "displayText" : "Zoom In",
-                            "hasSubMenu" : false,
-                            "enabled": {
-                                "value": false,
-                                "boundObj": "documentController",
-                                "boundProperty": "activeDocument",
-                                "oneway": true,
-                                "boundValueMutator": function(activeDocument){
-                                    if((activeDocument !== null) && (activeDocument.currentView === "design")){return true;}
-                                    else{return false;}
-                                }
-                            }
-                        },
-                        {
-                            "displayText" : "Zoom Out",
-                            "hasSubMenu" : false,
-                            "enabled": {
-                                "value": false,
-                                "boundObj": "documentController",
-                                "boundProperty": "activeDocument",
-                                "oneway": true,
-                                "boundValueMutator": function(activeDocument){
-                                    if((activeDocument !== null) && (activeDocument.currentView === "design")){return true;}
-                                    else{return false;}
-                                }
-                            }
-                        },
-                        {
-                            "displayText" : "",
-                            "separator":    true
-                        },
-                        {
                             "displayText" : "Live Preview",
                             "hasSubMenu" : false,
                             "enabled": {
@@ -431,7 +399,7 @@ exports.MenuData = Montage.create( Montage, {
                         {
                             "displayText" : "Debug",
                             "hasSubMenu" : false,
-                            "enabled": true,
+                            "enabled": false,
                             "checked": {
                                 "value": true,
                                 "boundProperty": "debug"
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index 52360302..7edc90d8 100755
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -653,7 +653,146 @@ exports.PiData = Montage.create( Montage, {
                 ]
             }
         ]
-    }
+    },
+    SubpathPi: {
+        value: [
+            {
+                label: "Stroke",
+
+                Section: [
+                    [
+                        {
+                            type : "color",
+                            prop: "border",
+                            id : "stroke"
+                        },
+                        {
+                            type : "color",
+                            id : "fill",
+                            prop: "background",
+                            divider : true
+                        }
+                    ],
+                    [
+                        {
+                            type : "hottext",
+                            id : "strokeSize",
+                            prop : "strokeSize",
+                            label : "Stroke",
+                            valueMutator: parseFloat,
+                            min :   1,
+                            max :   100,
+                            value : 1,
+                            unit : "px",
+                            acceptableUnits: ["pt", "px"]
+                        }
+                    ]
+                ]
+            }
+        ]
+    },
+    BrushStrokePi: {
+        value: [
+            {
+                label: "Stroke",
+
+                Section: [
+                    [
+                        {
+                            type : "color",
+                            prop: "border",
+                            id : "stroke"
+                        },
+                        {
+                            type : "color",
+                            id : "fill",
+                            prop: "background",
+                            visible : false,
+                            divider : true
+                        }
+                    ],
+                    [
+                        {
+                            type : "hottext",
+                            id : "strokeSize",
+                            prop : "strokeSize",
+                            label : "Stroke",
+                            valueMutator: parseInt,
+                            min :   1,
+                            max :   100,
+                            value : 1,
+                            unit : "px",
+                            acceptableUnits: ["pt", "px"]
+                        },
+                        {
+                            type : "hottext",
+                            id : "strokeHardness",
+                            prop : "strokeHardness",
+                            label : "Hardness",
+                            valueMutator: parseInt,
+                            min :   0,
+                            max :   100,
+                            value : 100,
+                            unit : "%",
+                            acceptableUnits: ["%"]
+                        }
+                    ]
+                ]
+            },
+            {
+                label: "Smoothing",
+                Section: [
+                    [
+                        {
+                            type: "checkbox",
+                            id: "doSmoothing",
+                            prop: "doSmoothing",
+                            defaultValue: false,
+                            value: "Y/N",
+                            checked: false
+                        },
+                        {
+                            type : "hottext",
+                            id : "strokeSmoothing",
+                            prop : "strokeSmoothing",
+                            label : "Amount",
+                            valueMutator: parseFloat,
+                            min :   0,
+                            max :   100,
+                            value : 0
+                        }
+                    ]
+                ]
+            },
+            {
+                label: "Calligraphic",
+                Section: [
+                    [
+                        {
+                            type: "checkbox",
+                            id: "isCalligraphic",
+                            prop: "isCalligraphic",
+                            defaultValue: false,
+                            value: "Y/N",
+                            checked: false,
+                            divider : true
+                        },
+                        {
+                            type : "hottext",
+                            id : "strokeAngle",
+                            prop : "strokeAngle",
+                            label : "Angle",
+                            valueMutator: parseFloat,
+                            min :   -90,
+                            max :   90,
+                            value : 0,
+                            unit : "deg."
+                        }
+                    ]
+                ]
+            }
+        ] //value: [
+    } //BrushStrokePi: {
 });