From d2a5fcbaed6b3c3377edecbc27e6a2818b79be40 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Wed, 2 May 2012 15:34:49 -0700
Subject: Nesting absolute element in the Tag tool. Refactoring element
 creation and element models

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/data/pi/pi-data.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'js/data')

diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index 65161b4f..d1dc9f34 100755
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -100,7 +100,7 @@ exports.PiData = Montage.create( Montage, {
             }
         ]
     },
-    imagePi: {
+    imgPi: {
         value: [
             {
                 label: "Image Properties",
@@ -807,8 +807,8 @@ exports.PiData = Montage.create( Montage, {
                     ]
                 ]
             }
-        ] //value: [
-    } //BrushStrokePi: {
+        ]
+    }
 });
 
 
-- 
cgit v1.2.3


From 29ad6355ef60cfb3b3fc7f780504f3ed30845883 Mon Sep 17 00:00:00 2001
From: John Mayhew
Date: Mon, 7 May 2012 14:30:47 -0700
Subject: More implementation of moving color chips to the individual subtools.

Removed the tool color bar
Added new icons for inkbottle
Removed Pencil tool
Removed Inkbottle tool
Added chips to the pen, brush and tag tools
Aligned controls in several subtools
---
 js/data/tools-data.js | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

(limited to 'js/data')

diff --git a/js/data/tools-data.js b/js/data/tools-data.js
index 4d009530..ac6fe6e5 100755
--- a/js/data/tools-data.js
+++ b/js/data/tools-data.js
@@ -124,17 +124,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",
@@ -163,22 +152,11 @@ 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,
-                "selected":     false
-            },
 //            {
 //                "id":           "EraserTool",
 //                "properties":   "eraserProperties",
-- 
cgit v1.2.3


From dd663d8fe9191cc57c9cebe6d425562cb45982c2 Mon Sep 17 00:00:00 2001
From: John Mayhew
Date: Tue, 8 May 2012 07:25:09 -0700
Subject: Removed unused SubSelect Tool

---
 js/data/tools-data.js | 52 ++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 41 insertions(+), 11 deletions(-)

(limited to 'js/data')

diff --git a/js/data/tools-data.js b/js/data/tools-data.js
index ac6fe6e5..32eaf24d 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: [
             {
@@ -21,17 +62,6 @@ exports.ToolsData = Montage.create(Montage, {
                 "container":    false,
                 "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",
-- 
cgit v1.2.3