Merge branch 'refs/heads/master' into new-tool-icons

5 files changed, 28 insertions, 7 deletions

diff --git a/js/data/appdata.js b/js/data/appdata.js
index 0a6c4976..0a6c4976 100644..100755
--- a/js/data/appdata.js
+++ b/js/data/appdata.js
diff --git a/js/data/menu-data.js b/js/data/menu-data.js
index 34adc82d..7c3ca5d4 100644..100755
--- 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"
                     },
                     {
@@ -25,7 +25,7 @@ exports.MenuData = Montage.create( Montage, {
                         "action":   "executeNewFile"
                     },
                     {
-                        "displayText" : "Open...",
+                        "displayText" : "Open File",
                         "hasSubMenu" : false,
                         "enabled": true,
                         "action": "executeFileOpen"
@@ -37,17 +37,20 @@ exports.MenuData = Montage.create( Montage, {
                     {
                         "displayText" : "Save",
                         "hasSubMenu" : false,
-                        "enabled": false
+                        "enabled": true,
+                        "action": "executeSave"
                     },
                     {
                         "displayText" : "Save As",
                         "hasSubMenu" : false,
-                        "enabled": false
+                        "enabled": true,
+                        "action":"saveAs"
                     },
                     {
                         "displayText" : "Save All",
                         "hasSubMenu" : false,
-                        "enabled": false
+                        "enabled": true,
+                        "action": "executeSaveAll"
                     },
                     {
                         "displayText" : "",
@@ -56,12 +59,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",
@@ -137,6 +140,15 @@ exports.MenuData = Montage.create( Montage, {
                         }
                     },
                     {
+                        "displayText" : "Chrome Preview",
+                        "hasSubMenu" : false,
+                        "enabled": true,
+                        "checked": {
+                            "value": false,
+                            "boundProperty": "chromePreview"
+                        }
+                    },
+                    {
                         "displayText" : "Layout View",
                         "hasSubMenu" : false,
                         "enabled": true,
@@ -349,6 +361,15 @@ exports.MenuData = Montage.create( Montage, {
                         }
                     },
                     {
+                        "displayText" : "Presets",
+                        "hasSubMenu" : false,
+                        "enabled": true,
+                        "checked": {
+                            "value": true,
+                            "boundProperty": "PresetsPanel"
+                        }
+                    },
+                    {
                         "displayText" : "Code",
                         "hasSubMenu" : false,
                         "enabled": true
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index ba03c347..ba03c347 100644..100755
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
diff --git a/js/data/settings.js b/js/data/settings.js
index ffea2075..ffea2075 100644..100755
--- a/js/data/settings.js
+++ b/js/data/settings.js
diff --git a/js/data/tools-data.js b/js/data/tools-data.js
index 4847fa7c..4847fa7c 100644..100755
--- a/js/data/tools-data.js
+++ b/js/data/tools-data.js