33 files changed, 651 insertions, 2447 deletions

diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index b9c033aa..640119c4 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -346,19 +346,24 @@ exports.ShapesController = Montage.create(CanvasController, {
             {
                 world = new GLWorld(el, true);
                 el.elementModel.shapeModel.GLWorld = world;
-                el.elementModel.shapeModel.GLGeomObj.setWorld(world);
                 el.elementModel.shapeModel.useWebGl = true;
+                world.import(worldData);
+                el.elementModel.shapeModel.GLGeomObj = world.getGeomRoot();
+
                 sm = Object.create(MaterialsLibrary.getMaterial("FlatMaterial"));
-                fm = Object.create(MaterialsLibrary.getMaterial("FlatMaterial"));
-                if(sm && fm)
+                if(sm)
                 {
                     el.elementModel.shapeModel.GLGeomObj.setStrokeMaterial(sm);
-                    el.elementModel.shapeModel.GLGeomObj.setFillMaterial(fm);
                     el.elementModel.shapeModel.strokeMaterial = sm;
+                }
+                fm = Object.create(MaterialsLibrary.getMaterial("FlatMaterial"));
+                // TODO - Use consts after GL code is converted to object literal notation
+//                if( fm && (el.elementModel.shapeModel.GLGeomObj.geomType() !== GLGeomObj.GEOM_TYPE_LINE) )
+                if( fm && (el.elementModel.shapeModel.GLGeomObj.geomType() !== 3) )
+                {
+                    el.elementModel.shapeModel.GLGeomObj.setFillMaterial(fm);
                     el.elementModel.shapeModel.fillMaterial = fm;
-                    el.elementModel.shapeModel.GLGeomObj.buildBuffers();
                 }
-                world.import(worldData);
             }
 
         }
@@ -378,13 +383,17 @@ exports.ShapesController = Montage.create(CanvasController, {
                 world = new GLWorld(el, false);
                 el.elementModel.shapeModel.GLWorld = world;
                 el.elementModel.shapeModel.useWebGl = false;
+                world.import(worldData);
+                el.elementModel.shapeModel.GLGeomObj = world.getGeomRoot();
                 el.elementModel.shapeModel.GLGeomObj.setStrokeMaterial(null);
-                el.elementModel.shapeModel.GLGeomObj.setFillMaterial(null);
                 el.elementModel.shapeModel.strokeMaterial = null;
-                el.elementModel.shapeModel.fillMaterial = null;
-                world.import(worldData);
+                // TODO - Use consts after GL code is converted to object literal notation
+                if(el.elementModel.shapeModel.GLGeomObj.geomType() !== 3)
+                {
+                    el.elementModel.shapeModel.GLGeomObj.setFillMaterial(null);
+                    el.elementModel.shapeModel.fillMaterial = null;
+                }
             }
-
         }
     }
 
diff --git a/js/controllers/main-menu-controller.js b/js/controllers/main-menu-controller.js
new file mode 100644
index 00000000..5e126617
--- /dev/null
+++ b/js/controllers/main-menu-controller.js
@@ -0,0 +1,43 @@
+/* <copyright>
+This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+</copyright> */
+
+
+var Montage = require("montage/core/core").Montage,
+    Component = require("montage/ui/component").Component;
+
+exports.MainMenuController = Montage.create(Component, {
+    deserializedFromTemplate:{
+        value:function () {
+            this.eventManager.addEventListener("executeHelpFAQ", this, false);
+            this.eventManager.addEventListener("executeHelpForums", this, false);
+            this.eventManager.addEventListener("executeHelpTopics", this, false);
+            this.eventManager.addEventListener("executeHelpAbout", this, false);
+        }
+    },
+
+    // Basic help menu handling methods
+    handleExecuteHelpFAQ:{
+        value:function () {
+            window.open('http://www.tetsubo.org/go/ninjafaq');
+        }
+    },
+    handleExecuteHelpForums:{
+        value:function () {
+            window.open('http://www.tetsubo.org/go/ninjaforums');
+        }
+    },
+    handleExecuteHelpTopics:{
+        value:function () {
+            window.open('http://www.tetsubo.org/go/ninjadocs');
+        }
+    },
+    handleExecuteHelpAbout:{
+        value:function () {
+            // TODO
+            console.log("Pull up the about popup");
+        }
+    }
+});
diff --git a/js/data/menu-data.js b/js/data/menu-data.js
index 683be2dc..3a065958 100755
--- 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",
@@ -74,7 +74,7 @@ exports.MenuData = Montage.create( Montage, {
                 ]
             },
             {
-                "header": "EDIT",
+                "header": "Edit",
                 "entries": [
                     {
                         "displayText" : "Undo",
@@ -114,7 +114,7 @@ exports.MenuData = Montage.create( Montage, {
                 ]
             },
             {
-                "header": "VIEW",
+                "header": "View",
                 "entries": [
                     {
                         "displayText" : "Zoom In",
@@ -285,7 +285,7 @@ exports.MenuData = Montage.create( Montage, {
                 ]
             },
             {
-                "header": "WINDOW",
+                "header": "Window",
                 "entries": [
                     {
                         "displayText" : "Tools",
@@ -359,41 +359,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,