Removed unused SubSelect Tool

10 files changed, 60 insertions, 96 deletions

diff --git a/css/ninja.css b/css/ninja.css
index b619eee1..2acfcb5d 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -833,8 +833,6 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
 
 .SelectionTool { background-image: url("../images/tools/Tool-Selection.png"); }
 
-.SubselectionTool { background-image: url("../images/tools/Tool-Subselect.png"); }
-
 .RotateTool3D { background-image: url("../images/tools/Tool-3DRotate.png"); }
 
 .Translate3D { background-image: url("../images/tools/Tool-3DTranslate.png"); }
diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html
index 0c51aa9a..d5c33624 100755
--- a/js/components/layout/tools-list.reel/tools-list.html
+++ b/js/components/layout/tools-list.reel/tools-list.html
@@ -55,9 +55,6 @@
             "SelectionTool1": {
                 "prototype": "js/tools/SelectionTool"
             },
-            "SubselectionTool1": {
-                "prototype": "js/tools/SubSelectTool"
-            },
             "Rotate3DTool1": {
                 "prototype": "js/tools/RotateObject3DTool"
             },
@@ -126,7 +123,6 @@
                 "properties": {
                     "element": {"#": "toolsList"},
                     "SelectionTool":          {"@": "SelectionTool1"},
-                    "SubselectionTool":       {"@": "SubselectionTool1"},
                     "Rotate3DTool":           {"@": "Rotate3DTool1"},
                     "Translate3DTool":        {"@": "Translate3DTool1"},
                     "TagTool":                {"@": "TagTool1"},
diff --git a/js/components/layout/tools-list.reel/tools-list.js b/js/components/layout/tools-list.reel/tools-list.js
index ed4ee45f..a10b6c3e 100755
--- a/js/components/layout/tools-list.reel/tools-list.js
+++ b/js/components/layout/tools-list.reel/tools-list.js
@@ -10,7 +10,6 @@ var Component = require("montage/ui/component").Component;
 exports.ToolsList = Montage.create(Component, {
 
     SelectionTool:          { value: null },
-    SubselectionTool:       { value: null },
     Rotate3DTool:           { value: null },
     Translate3DTool:        { value: null },
     TagTool:                { value: null },
@@ -51,7 +50,6 @@ exports.ToolsList = Montage.create(Component, {
             this.PenTool.options = this.application.ninja.toolsProperties.shapeProperties.lineProperties;//this.application.Ninja.toolsProperties.penProperties;
 
             this.SelectionTool.options = this.application.ninja.toolsProperties.selectionProperties;
-            this.SubselectionTool.options = this.application.ninja.toolsProperties.subSelectionProperties;
 
             this.Rotate3DTool.options = this.application.ninja.toolsProperties.rotate3DProperties;
             this.Translate3DTool.options = this.application.ninja.toolsProperties.rotate3DProperties;
diff --git a/js/components/layout/tools-properties.reel/tools-properties.html b/js/components/layout/tools-properties.reel/tools-properties.html
index a24ce658..e7d1ac8b 100755
--- a/js/components/layout/tools-properties.reel/tools-properties.html
+++ b/js/components/layout/tools-properties.reel/tools-properties.html
@@ -18,12 +18,6 @@
                     "element": {"#": "selectionProperties"}
                 }
             },
-            "subSelectionProperties1": {
-                "prototype": "js/components/tools-properties/subselection-properties.reel[SubSelectionProperties]",
-                "properties": {
-                    "element": {"#": "subSelectionProperties"}
-                }
-            },
             "object3DProperties1": {
                 "prototype": "js/components/tools-properties/object3d-properties.reel[Object3DProperties]",
                 "properties": {
@@ -128,7 +122,6 @@
                 "properties": {
                     "element": {"#": "toolsProperties"},
                     "selectionProperties":          {"@": "selectionProperties1"},
-                    "subSelectionProperties":       {"@": "subSelectionProperties1"},
                     "rotate3DProperties":           {"@": "object3DProperties1"},
                     "translate3DProperties":        {"@": "object3DProperties1"},
                     "tagProperties":                {"@": "tagProperties1"},
@@ -159,7 +152,6 @@
     <body>
         <div data-montage-id="toolsProperties" class="panelBackground">
             <div data-montage-id="selectionProperties"></div>
-            <div data-montage-id="subSelectionProperties"></div>
             <div data-montage-id="object3DProperties"></div>
             <div data-montage-id="tagProperties"></div>
             <div data-montage-id="penProperties"></div>
diff --git a/js/components/tools-properties/subselection-properties.reel/subselection-properties.html b/js/components/tools-properties/subselection-properties.reel/subselection-properties.html
deleted file mode 100755
index bde47659..00000000
--- a/js/components/tools-properties/subselection-properties.reel/subselection-properties.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML>
-<!-- <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> -->
-<html>
-    <head>
-        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-
-        <!--<link rel="stylesheet" type="text/css" href="tools-properties.css">-->
-        <script type="text/montage-serialization">
-        {
-
-            "owner": {
-                "prototype": "js/components/tools-properties/subselection-properties.reel[SubSelectionProperties]",
-                "properties": {
-                    "element": {"#": "subSelectionProperties"}
-                }
-            }
-        }
-            </script>
-
-    </head>
-
-    <body>
-        <div data-montage-id="subSelectionProperties">
-            <div></div>
-        </div>
-    </body>
-
-</html>
\ No newline at end of file
diff --git a/js/components/tools-properties/subselection-properties.reel/subselection-properties.js b/js/components/tools-properties/subselection-properties.reel/subselection-properties.js
deleted file mode 100755
index bcd13642..00000000
--- a/js/components/tools-properties/subselection-properties.reel/subselection-properties.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/* <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;
-var Component = require("montage/ui/component").Component;
-var ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties;
-
-exports.SubSelectionProperties = Montage.create(ToolProperties, {
-
-
-});
\ No newline at end of file
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: {
+