aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/shape-properties.reel
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/tools-properties/shape-properties.reel
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/tools-properties/shape-properties.reel')
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.html53
1 files changed, 22 insertions, 31 deletions
diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.html b/js/components/tools-properties/shape-properties.reel/shape-properties.html
index 64840b17..6d58fe80 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.html
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.html
@@ -13,8 +13,7 @@
13 { 13 {
14 14
15 "ovalProperties1": { 15 "ovalProperties1": {
16 "module": "js/components/tools-properties/oval-properties.reel", 16 "prototype": "js/components/tools-properties/oval-properties.reel",
17 "name": "OvalProperties",
18 "properties": { 17 "properties": {
19 "element": {"#": "ovalProperties"}, 18 "element": {"#": "ovalProperties"},
20 "base": {"@": "owner"} 19 "base": {"@": "owner"}
@@ -22,8 +21,7 @@
22 }, 21 },
23 22
24 "rectProperties1": { 23 "rectProperties1": {
25 "module": "js/components/tools-properties/rect-properties.reel", 24 "prototype": "js/components/tools-properties/rect-properties.reel",
26 "name": "RectProperties",
27 "properties": { 25 "properties": {
28 "element": {"#": "rectProperties"}, 26 "element": {"#": "rectProperties"},
29 "base": {"@": "owner"} 27 "base": {"@": "owner"}
@@ -31,8 +29,7 @@
31 }, 29 },
32 30
33 "lineProperties1": { 31 "lineProperties1": {
34 "module": "js/components/tools-properties/line-properties.reel", 32 "prototype": "js/components/tools-properties/line-properties.reel",
35 "name": "LineProperties",
36 "properties": { 33 "properties": {
37 "element": {"#": "lineProperties"}, 34 "element": {"#": "lineProperties"},
38 "base": {"@": "owner"} 35 "base": {"@": "owner"}
@@ -40,8 +37,7 @@
40 }, 37 },
41 38
42 "_strokeSize1": { 39 "_strokeSize1": {
43 "module": "js/components/hottextunit.reel", 40 "prototype": "js/components/hottextunit.reel[HotTextUnit]",
44 "name": "HotTextUnit",
45 "properties": { 41 "properties": {
46 "element": {"#": "strokeControl"}, 42 "element": {"#": "strokeControl"},
47 "minValue": 1, 43 "minValue": 1,
@@ -54,8 +50,7 @@
54 }, 50 },
55 51
56 "_strokeMaterial1": { 52 "_strokeMaterial1": {
57 "module": "js/components/combobox.reel", 53 "prototype": "js/components/combobox.reel",
58 "name": "Combobox",
59 "properties": { 54 "properties": {
60 "element": {"#": "strokeMaterialCB"}, 55 "element": {"#": "strokeMaterialCB"},
61 "labelField": "_name", 56 "labelField": "_name",
@@ -64,8 +59,7 @@
64 }, 59 },
65 60
66 "_fillMaterial1": { 61 "_fillMaterial1": {
67 "module": "js/components/combobox.reel", 62 "prototype": "js/components/combobox.reel",
68 "name": "Combobox",
69 "properties": { 63 "properties": {
70 "element": {"#": "fillMaterialCB"}, 64 "element": {"#": "fillMaterialCB"},
71 "labelField": "_name", 65 "labelField": "_name",
@@ -74,8 +68,7 @@
74 }, 68 },
75 69
76 "toolbutton1": { 70 "toolbutton1": {
77 "module": "js/components/layout/subtool-button.reel", 71 "prototype": "js/components/layout/subtool-button.reel[SubToolButton]",
78 "name": "SubToolButton",
79 "properties": { 72 "properties": {
80 "element": {"#": "toolbutton"} 73 "element": {"#": "toolbutton"}
81 }, 74 },
@@ -89,8 +82,7 @@
89 }, 82 },
90 83
91 "repetition1": { 84 "repetition1": {
92 "module": "montage/ui/repetition.reel", 85 "prototype": "montage/ui/repetition.reel",
93 "name": "Repetition",
94 "properties": { 86 "properties": {
95 "element": {"#": "shapeToolsList"} 87 "element": {"#": "shapeToolsList"}
96 }, 88 },
@@ -105,8 +97,7 @@
105 97
106 98
107 "owner": { 99 "owner": {
108 "module": "js/components/tools-properties/shape-properties.reel", 100 "prototype": "js/components/tools-properties/shape-properties.reel",
109 "name": "ShapeProperties",
110 "properties": { 101 "properties": {
111 "element": {"#": "shapeProperties"}, 102 "element": {"#": "shapeProperties"},
112 "_strokeMaterial": {"@": "_strokeMaterial1"}, 103 "_strokeMaterial": {"@": "_strokeMaterial1"},
@@ -136,30 +127,30 @@
136 </head> 127 </head>
137 128
138 <body> 129 <body>
139 <div id="shapeProperties" class="subToolHolderPanel"> 130 <div data-montage-id="shapeProperties" class="subToolHolderPanel">
140 <div id="shapeToolsList"> 131 <div data-montage-id="shapeToolsList">
141 <div id="toolbutton"></div> 132 <div data-montage-id="toolbutton"></div>
142 </div> 133 </div>
143 134
144 <label class="label">Stroke:</label> 135 <label class="label">Stroke:</label>
145 <div id="strokeControl" class="label"></div> 136 <div data-montage-id="strokeControl" class="label"></div>
146 137
147 <div id="customProperties"> 138 <div id="customProperties">
148 <div id="ovalProperties" class="label"></div> 139 <div data-montage-id="ovalProperties" class="label"></div>
149 <div id="rectProperties" class="label"></div> 140 <div data-montage-id="rectProperties" class="label"></div>
150 <div id="lineProperties" class="label"></div> 141 <div data-montage-id="lineProperties" class="label"></div>
151 </div> 142 </div>
152 143
153 <label class="label subOption optionLabel"><input id="useWebGLCH" type="checkbox" name="useWebGLControl" class="checkBoxAlign"/>Use WebGL</label> 144 <label class="label subOption optionLabel"><input data-montage-id="useWebGLCH" type="checkbox" name="useWebGLControl" class="checkBoxAlign"/>Use WebGL</label>
154 145
155 <label id="materialLabel" class="label">Material:</label> 146 <label data-montage-id="materialLabel" class="label">Material:</label>
156 <div id="strokeIcon" class="pencilToolUp" style="float: left;"></div> 147 <div data-montage-id="strokeIcon" class="pencilToolUp" style="float: left;"></div>
157 148
158 <select class="selectBox" id="strokeMaterialCB"> 149 <select class="selectBox" data-montage-id="strokeMaterialCB">
159 </select> 150 </select>
160 151
161 <div id="fillIcon" class="bucketToolUp" style="float: left;"></div> 152 <div data-montage-id="fillIcon" class="bucketToolUp" style="float: left;"></div>
162 <select class="selectBox" id="fillMaterialCB"> 153 <select class="selectBox" data-montage-id="fillMaterialCB">
163 </select> 154 </select>
164 155
165 156
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-18 17:00:39 +0000