aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/shape-properties.reel/shape-properties.html
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-08 22:15:41 -0800
committerValerio Virgillito2012-02-08 22:15:41 -0800
commitc7df002135328edac03e72a1e4b331b2c72667f8 (patch)
treeee50509df494b069d1769b7b54afd83fd0178e64 /js/components/tools-properties/shape-properties.reel/shape-properties.html
parent725c54ff4af40f70b7dbd4508da34d2909cea8bd (diff)
parent35ad4d6d2fac4432046141c63c0209cf3d00be5c (diff)
downloadninja-c7df002135328edac03e72a1e4b331b2c72667f8.tar.gz
Merge branch 'refs/heads/master' into components
Diffstat (limited to 'js/components/tools-properties/shape-properties.reel/shape-properties.html')
-rw-r--r--js/components/tools-properties/shape-properties.reel/shape-properties.html35
1 files changed, 23 insertions, 12 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 52502d47..64840b17 100644
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.html
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.html
@@ -53,6 +53,26 @@
53 } 53 }
54 }, 54 },
55 55
56 "_strokeMaterial1": {
57 "module": "js/components/combobox.reel",
58 "name": "Combobox",
59 "properties": {
60 "element": {"#": "strokeMaterialCB"},
61 "labelField": "_name",
62 "dataField": "_name"
63 }
64 },
65
66 "_fillMaterial1": {
67 "module": "js/components/combobox.reel",
68 "name": "Combobox",
69 "properties": {
70 "element": {"#": "fillMaterialCB"},
71 "labelField": "_name",
72 "dataField": "_name"
73 }
74 },
75
56 "toolbutton1": { 76 "toolbutton1": {
57 "module": "js/components/layout/subtool-button.reel", 77 "module": "js/components/layout/subtool-button.reel",
58 "name": "SubToolButton", 78 "name": "SubToolButton",
@@ -89,10 +109,9 @@
89 "name": "ShapeProperties", 109 "name": "ShapeProperties",
90 "properties": { 110 "properties": {
91 "element": {"#": "shapeProperties"}, 111 "element": {"#": "shapeProperties"},
92 "_strokeStyle": {"#": "strokeStyleCB"}, 112 "_strokeMaterial": {"@": "_strokeMaterial1"},
93 "_strokeMaterial": {"#": "strokeMaterialCB"},
94 "_fillIcon": {"#": "fillIcon"}, 113 "_fillIcon": {"#": "fillIcon"},
95 "_fillMaterial": {"#": "fillMaterialCB"}, 114 "_fillMaterial": {"@": "_fillMaterial1"},
96 115
97 "_useWebGL": {"#": "useWebGLCH"}, 116 "_useWebGL": {"#": "useWebGLCH"},
98 "_materialLabel": {"#": "materialLabel"}, 117 "_materialLabel": {"#": "materialLabel"},
@@ -125,14 +144,6 @@
125 <label class="label">Stroke:</label> 144 <label class="label">Stroke:</label>
126 <div id="strokeControl" class="label"></div> 145 <div id="strokeControl" class="label"></div>
127 146
128 <label class="label">Style:</label>
129 <select id="strokeStyleCB" class="selectBox">
130 <option value="0">Hairline</option>
131 <option value="1" selected>Solid</option>
132 <option value="2">Dashed</option>
133 <option value="3">Dotted</option>
134 </select>
135
136 <div id="customProperties"> 147 <div id="customProperties">
137 <div id="ovalProperties" class="label"></div> 148 <div id="ovalProperties" class="label"></div>
138 <div id="rectProperties" class="label"></div> 149 <div id="rectProperties" class="label"></div>
@@ -142,7 +153,7 @@
142 <label class="label subOption optionLabel"><input id="useWebGLCH" type="checkbox" name="useWebGLControl" class="checkBoxAlign"/>Use WebGL</label> 153 <label class="label subOption optionLabel"><input id="useWebGLCH" type="checkbox" name="useWebGLControl" class="checkBoxAlign"/>Use WebGL</label>
143 154
144 <label id="materialLabel" class="label">Material:</label> 155 <label id="materialLabel" class="label">Material:</label>
145 <div id="strokeIcon" class="pencilToolUp"></div> 156 <div id="strokeIcon" class="pencilToolUp" style="float: left;"></div>
146 157
147 <select class="selectBox" id="strokeMaterialCB"> 158 <select class="selectBox" id="strokeMaterialCB">
148 </select> 159 </select>