aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout/tools-list.reel/tools-list.html
diff options
context:
space:
mode:
authorJon Reid2012-05-15 11:24:53 -0700
committerJon Reid2012-05-15 11:24:53 -0700
commit3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch)
treed6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/components/layout/tools-list.reel/tools-list.html
parent53a604d0ccb1315576b94406cf3b0b958162307b (diff)
parente33a4e58c271a9507082694a5268b840fdd05968 (diff)
downloadninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz
Merge branch 'timeline-local' into timeline-multiselect
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js resolved using theirs. (selectLayers)
Diffstat (limited to 'js/components/layout/tools-list.reel/tools-list.html')
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.html87
1 files changed, 31 insertions, 56 deletions
diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html
index 5996e446..9aa05e5d 100755
--- a/js/components/layout/tools-list.reel/tools-list.html
+++ b/js/components/layout/tools-list.reel/tools-list.html
@@ -1,4 +1,4 @@
1<!DOCTYPE HTML> 1<!DOCTYPE HTML>
2<!-- <copyright> 2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,8 +11,7 @@
11 <script type="text/montage-serialization"> 11 <script type="text/montage-serialization">
12 { 12 {
13 "toolbutton1": { 13 "toolbutton1": {
14 "module": "js/components/layout/tool-button.reel", 14 "prototype": "js/components/layout/tool-button.reel",
15 "name": "ToolButton",
16 "properties": { 15 "properties": {
17 "element": {"#": "toolbutton"} 16 "element": {"#": "toolbutton"}
18 }, 17 },
@@ -26,8 +25,7 @@
26 }, 25 },
27 26
28 "groupLine": { 27 "groupLine": {
29 "module": "montage/ui/condition.reel", 28 "prototype": "montage/ui/condition.reel",
30 "name": "Condition",
31 "properties": { 29 "properties": {
32 "element": {"#": "groupLine"} 30 "element": {"#": "groupLine"}
33 }, 31 },
@@ -41,8 +39,7 @@
41 }, 39 },
42 40
43 "repetition1": { 41 "repetition1": {
44 "module": "montage/ui/repetition.reel", 42 "prototype": "montage/ui/repetition.reel",
45 "name": "Repetition",
46 "properties": { 43 "properties": {
47 "element": {"#": "toolscontainer"} 44 "element": {"#": "toolscontainer"}
48 }, 45 },
@@ -56,89 +53,68 @@
56 }, 53 },
57 54
58 "SelectionTool1": { 55 "SelectionTool1": {
59 "module": "js/tools/SelectionTool", 56 "prototype": "js/tools/SelectionTool"
60 "name": "SelectionTool"
61 }, 57 },
62 "SubselectionTool1": { 58 "SubselectionTool1": {
63 "module": "js/tools/SubSelectTool", 59 "prototype": "js/tools/SubSelectTool"
64 "name": "SubSelectTool"
65 }, 60 },
66 "Rotate3DTool1": { 61 "Rotate3DTool1": {
67 "module": "js/tools/RotateObject3DTool", 62 "prototype": "js/tools/RotateObject3DTool"
68 "name": "RotateObject3DTool"
69 }, 63 },
70 "Translate3DTool1": { 64 "Translate3DTool1": {
71 "module": "js/tools/TranslateObject3DTool", 65 "prototype": "js/tools/TranslateObject3DTool"
72 "name": "TranslateObject3DTool"
73 }, 66 },
74 "TagTool1": { 67 "TagTool1": {
75 "module": "js/tools/TagTool", 68 "prototype": "js/tools/TagTool"
76 "name": "TagTool"
77 }, 69 },
78 "PenTool1": { 70 "PenTool1": {
79 "module": "js/tools/PenTool", 71 "prototype": "js/tools/PenTool"
80 "name": "PenTool"
81 }, 72 },
82 "TextTool1": { 73 "TextTool1": {
83 "module": "js/tools/TextTool", 74 "prototype": "js/tools/TextTool"
84 "name": "TextTool"
85 }, 75 },
86 "ShapeTool1": { 76 "ShapeTool1": {
87 "module": "js/tools/ShapeTool", 77 "prototype": "js/tools/ShapeTool"
88 "name": "ShapeTool"
89 }, 78 },
90 "OvalTool1": { 79 "OvalTool1": {
91 "module": "js/tools/OvalTool", 80 "prototype": "js/tools/OvalTool"
92 "name": "OvalTool"
93 }, 81 },
94 "RectTool1": { 82 "RectTool1": {
95 "module": "js/tools/RectTool", 83 "prototype": "js/tools/RectTool"
96 "name": "RectTool"
97 }, 84 },
98 "LineTool1": { 85 "LineTool1": {
99 "module": "js/tools/LineTool", 86 "prototype": "js/tools/LineTool"
100 "name": "LineTool"
101 }, 87 },
102 "PencilTool1": { 88 "PencilTool1": {
103 "module": "js/tools/PencilTool", 89 "prototype": "js/tools/PencilTool"
104 "name": "PencilTool"
105 }, 90 },
106 "BrushTool1": { 91 "BrushTool1": {
107 "module": "js/tools/BrushTool", 92 "prototype": "js/tools/BrushTool"
108 "name": "BrushTool"
109 }, 93 },
110 "FillTool1": { 94 "FillTool1": {
111 "module": "js/tools/FillTool", 95 "prototype": "js/tools/FillTool"
112 "name": "FillTool"
113 }, 96 },
114 "InkBottleTool1": { 97 "InkBottleTool1": {
115 "module": "js/tools/InkBottleTool", 98 "prototype": "js/tools/InkBottleTool"
116 "name": "InkBottleTool"
117 }, 99 },
118 "EyedropperTool1": { 100 "EyedropperTool1": {
119 "module": "js/tools/EyedropperTool", 101 "prototype": "js/tools/EyedropperTool"
120 "name": "EyedropperTool"
121 }, 102 },
122 "EraserTool1": { 103 "EraserTool1": {
123 "module": "js/tools/EraserTool", 104 "prototype": "js/tools/EraserTool"
124 "name": "EraserTool"
125 }, 105 },
126 "RotateStageTool3D1": { 106 "RotateStageTool3D1": {
127 "module": "js/tools/RotateStage3DTool", 107 "prototype": "js/tools/RotateStage3DTool"
128 "name": "RotateStage3DTool"
129 }, 108 },
130 "PanTool1": { 109 "PanTool1": {
131 "module": "js/tools/PanTool", 110 "prototype": "js/tools/PanTool"
132 "name": "PanTool"
133 }, 111 },
134 "ZoomTool1": { 112 "ZoomTool1": {
135 "module": "js/tools/ZoomTool", 113 "prototype": "js/tools/ZoomTool"
136 "name": "ZoomTool"
137 }, 114 },
138 115
139 "disable": { 116 "disable": {
140 "module": "montage/ui/condition.reel", 117 "prototype": "montage/ui/condition.reel",
141 "name": "Condition",
142 "properties": { 118 "properties": {
143 "element": {"#": "disabledCondition"} 119 "element": {"#": "disabledCondition"}
144 }, 120 },
@@ -152,8 +128,7 @@
152 }, 128 },
153 129
154 "owner": { 130 "owner": {
155 "module": "js/components/layout/tools-list.reel", 131 "prototype": "js/components/layout/tools-list.reel",
156 "name": "ToolsList",
157 "properties": { 132 "properties": {
158 "element": {"#": "toolsList"}, 133 "element": {"#": "toolsList"},
159 "SelectionTool": {"@": "SelectionTool1"}, 134 "SelectionTool": {"@": "SelectionTool1"},
@@ -187,16 +162,16 @@
187 </head> 162 </head>
188 163
189 <body> 164 <body>
190 <div id="toolsList" class="toolsList"> 165 <div data-montage-id="toolsList" class="toolsList">
191 <div id="toolscontainer" class="toolscontainer"> 166 <div data-montage-id="toolscontainer" class="toolscontainer">
192 <div id="toolbutton" class="toolbutton"></div> 167 <div data-montage-id="toolbutton" class="toolbutton"></div>
193 <div id="groupLine"> 168 <div data-montage-id="groupLine">
194 <hr /> 169 <hr />
195 </div> 170 </div>
196 </div> 171 </div>
197 <!-- TODO: Remove and add as a component --> 172 <!-- TODO: Remove and add as a component -->
198 <div id="colortoolbar"></div> 173 <div id="colortoolbar"></div>
199 <div id="disabledCondition" class="panelDisabled"></div> 174 <div data-montage-id="disabledCondition" class="panelDisabled"></div>
200 </div> 175 </div>
201