aboutsummaryrefslogtreecommitdiff
path: root/js/data
diff options
context:
space:
mode:
Diffstat (limited to 'js/data')
-rwxr-xr-xjs/data/pi/pi-data.js6
-rwxr-xr-xjs/data/tools-data.js76
2 files changed, 45 insertions, 37 deletions
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, {
100 } 100 }
101 ] 101 ]
102 }, 102 },
103 imagePi: { 103 imgPi: {
104 value: [ 104 value: [
105 { 105 {
106 label: "Image Properties", 106 label: "Image Properties",
@@ -807,8 +807,8 @@ exports.PiData = Montage.create( Montage, {
807 ] 807 ]
808 ] 808 ]
809 } 809 }
810 ] //value: [ 810 ]
811 } //BrushStrokePi: { 811 }
812}); 812});
813 813
814 814
diff --git a/js/data/tools-data.js b/js/data/tools-data.js
index 4d009530..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
7var Montage = require("montage/core/core").Montage; 7var Montage = require("montage/core/core").Montage;
8 8
9exports.ToolsData = Montage.create(Montage, { 9exports.ToolsData = Montage.create(Montage, {
10 selectionToolIndex : {
11 value: 0
12 },
13 rotate3DToolIndex: {
14 value: 1
15 },
16 translate3DToolIndex: {
17 value: 2
18 },
19 tagToolIndex: {
20 value: 3
21 },
22 penToolIndex: {
23 value: 4
24 },
25 textToolIndex: {
26 value: 5
27 },
28 shapeToolIndex: {
29 value: 6
30 },
31 brushToolIndex: {
32 value: 7
33 },
34 fillToolIndex: {
35 value: 8
36 },
37 inkBottleToolIndex: {
38 value: 9
39 },
40 rotateStage3DToolIndex: {
41 value: 10
42 },
43 panToolIndex: {
44 value: 11
45 },
46 zoomToolIndex: {
47 value: 12
48 },
10 49
50 // NOTE: additions or removal of any tools, or any changes in the order of these entries requires updating the constant index properties above.
51 // Code in the keyboard mediator and ninja.js accesses the array below through the index constants above
11 defaultToolsData: { 52 defaultToolsData: {
12 value: [ 53 value: [
13 { 54 {
@@ -22,17 +63,6 @@ exports.ToolsData = Montage.create(Montage, {
22 "selected": true 63 "selected": true
23 }, 64 },
24 { 65 {
25 "id": "SubselectionTool",
26 "properties": "subSelectionProperties",
27 "spriteSheet": true,
28 "action": "SubselectionTool",
29 "toolTip": "Subselect Tool",
30 "cursor": "auto",
31 "lastInGroup": true,
32 "container": false,
33 "selected": false
34 },
35 {
36 "id": "RotateTool3D", 66 "id": "RotateTool3D",
37 "properties": "rotate3DProperties", 67 "properties": "rotate3DProperties",
38 "spriteSheet": true, 68 "spriteSheet": true,
@@ -125,17 +155,6 @@ exports.ToolsData = Montage.create(Montage, {
125 "selected": false 155 "selected": false
126 }, 156 },
127 { 157 {
128 "id": "PencilTool",
129 "properties": "pencilProperties",
130 "spriteSheet": true,
131 "action": "PencilTool",
132 "toolTip": "Pencil Tool",
133 "cursor": "auto",
134 "lastInGroup": false,
135 "container": false,
136 "selected": false
137 },
138 {
139 "id": "BrushTool", 158 "id": "BrushTool",
140 "properties": "brushProperties", 159 "properties": "brushProperties",
141 "spriteSheet": true, 160 "spriteSheet": true,
@@ -163,22 +182,11 @@ exports.ToolsData = Montage.create(Montage, {
163 "spriteSheet": true, 182 "spriteSheet": true,
164 "action": "InkBottleTool", 183 "action": "InkBottleTool",
165 "toolTip": "Ink Bottle Tool (K)", 184 "toolTip": "Ink Bottle Tool (K)",
166 "cursor": "url('images/tools/inkbottle_down.png'), default", 185 "cursor": "url('images/tools/inkbottle_cursor.png'), default",
167 "lastInGroup": true, 186 "lastInGroup": true,
168 "container": false, 187 "container": false,
169 "selected": false 188 "selected": false
170 }, 189 },
171 {
172 "id": "EyedropperTool",
173 "properties": "eyedropperProperties",
174 "spriteSheet": true,
175 "action": "EyedropperTool",
176 "toolTip": "Eyedropper Tool (I)",
177 "cursor": "url('images/tools/eyedropper_down.png') 6 20, default",
178 "lastInGroup": false,
179 "container": false,
180 "selected": false
181 },
182// { 190// {
183// "id": "EraserTool", 191// "id": "EraserTool",
184// "properties": "eraserProperties", 192// "properties": "eraserProperties",