Merge branch 'refs/heads/TimelineUberjd' into TimelineUber

Conflicts:
	js/panels/Timeline/Layer.reel/Layer.js

Signed-off-by: Kruti Shah <kruti.shah@motorola.com>

1 files changed, 55 insertions, 34 deletions

diff --git a/js/data/tools-data.js b/js/data/tools-data.js
index 4d009530..05455efe 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: [
             {
@@ -19,20 +60,10 @@ exports.ToolsData = Montage.create(Montage, {
                 "cursor":       "auto",
                 "lastInGroup":  false,
                 "container":    false,
+                "subtools":     [],
                 "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",
                 "spriteSheet":  true,
@@ -41,6 +72,7 @@ exports.ToolsData = Montage.create(Montage, {
                 "cursor":       "auto",
                 "lastInGroup":  false,
                 "container":    false,
+                "subtools":     [],
                 "selected":     false
             },
             {
@@ -52,6 +84,7 @@ exports.ToolsData = Montage.create(Montage, {
                 "cursor":       "auto",
                 "lastInGroup":  true,
                 "container":    false,
+                "subtools":     [],
                 "selected":     false
             },
             {
@@ -63,6 +96,7 @@ exports.ToolsData = Montage.create(Montage, {
                 "cursor":       "url('images/cursors/Crosshair.png') 8 8, default",
                 "lastInGroup":  false,
                 "container":    false,
+                "subtools":     [],
                 "selected":     false
             },
             {
@@ -74,6 +108,7 @@ exports.ToolsData = Montage.create(Montage, {
                 "cursor":       "auto",
                 "lastInGroup":  false,
                 "container":    false,
+                "subtools":     [],
                 "selected":     false
             },
             {
@@ -85,6 +120,7 @@ exports.ToolsData = Montage.create(Montage, {
                 "cursor":       "text",
                 "lastInGroup":  false,
                 "container":    false,
+                "subtools":     [],
                 "selected":     false
             },
             {
@@ -125,17 +161,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",
                 "spriteSheet":  true,
@@ -144,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
             },
             {
@@ -155,6 +181,7 @@ exports.ToolsData = Montage.create(Montage, {
                 "cursor":       "url('images/tools/bucket_down.png'), default",
                 "lastInGroup":  false,
                 "container":    false,
+                "subtools":     [],
                 "selected":     false
             },
             {
@@ -163,20 +190,10 @@ 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,
+                "subtools":     [],
                 "selected":     false
             },
 //            {
@@ -188,6 +205,7 @@ exports.ToolsData = Montage.create(Montage, {
 //                "cursor":       "auto",
 //                "lastInGroup":  false,
 //                "container":    false,
+//                "subtools":     [],
 //                "selected":     false
 //            },
             {
@@ -199,6 +217,7 @@ exports.ToolsData = Montage.create(Montage, {
                 "cursor":       "auto",
                 "lastInGroup":  false,
                 "container":    false,
+                "subtools":     [],
                 "selected":     false
             },
             {
@@ -210,6 +229,7 @@ exports.ToolsData = Montage.create(Montage, {
                 "cursor":       "url('images/tools/hand_down.png'), default",
                 "lastInGroup":  false,
                 "container":    false,
+                "subtools":     [],
                 "selected":     false
             },
             {
@@ -221,6 +241,7 @@ exports.ToolsData = Montage.create(Montage, {
                 "cursor":       "url('images/cursors/zoom.png'),default",
                 "lastInGroup":  true,
                 "container":    false,
+                "subtools":     [],
                 "selected":     false
             }
         ]