aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
diff options
context:
space:
mode:
authorJonathan Duran2012-04-26 10:26:16 -0700
committerJonathan Duran2012-04-26 10:26:16 -0700
commit264fc5978053478220c6bb496f31ffb07d16d0ae (patch)
tree8f1cc7aa4b3364b53859045ae32283a987ee4c7d /js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
parent3fe0eb59a58db8812260fef57710326f8e660d7a (diff)
parentbcc8f8616f5ad4bf310928da6cbc01da12f6e468 (diff)
downloadninja-264fc5978053478220c6bb496f31ffb07d16d0ae.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html')
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html137
1 files changed, 121 insertions, 16 deletions
diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
index 1602e793..81facc49 100755
--- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
+++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
@@ -11,6 +11,30 @@
11 11
12 <script type="text/montage-serialization"> 12 <script type="text/montage-serialization">
13 { 13 {
14 "borderWidthCh": {
15 "prototype": "montage/ui/checkbox.reel",
16 "properties": {
17 "element": {"#": "useBorderWidthCh"},
18 "identifier": "useBorderWidth",
19 "checked": true
20 },
21 "listeners": [
22 {
23 "type": "action",
24 "listener": {"@": "owner"},
25 "capture": false
26 }
27 ]
28 },
29
30 "borderWidthLabel": {
31 "prototype": "montage/ui/dynamic-text.reel",
32 "properties": {
33 "element": {"#": "borderWidthLabel"},
34 "value": "Border:"
35 }
36 },
37
14 "borderWidthHT": { 38 "borderWidthHT": {
15 "module": "js/components/hottextunit.reel", 39 "module": "js/components/hottextunit.reel",
16 "name": "HotTextUnit", 40 "name": "HotTextUnit",
@@ -23,6 +47,54 @@
23 } 47 }
24 }, 48 },
25 49
50 "borderStyleCh": {
51 "prototype": "montage/ui/checkbox.reel",
52 "properties": {
53 "element": {"#": "useBorderStyleCh"},
54 "identifier": "useBorderStyle",
55 "checked": true
56 },
57 "listeners": [
58 {
59 "type": "action",
60 "listener": {"@": "owner"},
61 "capture": false
62 }
63 ]
64 },
65
66 "borderStyleLabel": {
67 "prototype": "montage/ui/dynamic-text.reel",
68 "properties": {
69 "element": {"#": "borderStyleLabel"},
70 "value": "Style:"
71 }
72 },
73
74 "strokeSizeCh": {
75 "prototype": "montage/ui/checkbox.reel",
76 "properties": {
77 "element": {"#": "useStrokeSizeCh"},
78 "identifier": "useStrokeSize",
79 "checked": true
80 },
81 "listeners": [
82 {
83 "type": "action",
84 "listener": {"@": "owner"},
85 "capture": false
86 }
87 ]
88 },
89
90 "strokeSizeLabel": {
91 "prototype": "montage/ui/dynamic-text.reel",
92 "properties": {
93 "element": {"#": "strokeSizeLabel"},
94 "value": "Stroke:"
95 }
96 },
97
26 "strokeSizeHT": { 98 "strokeSizeHT": {
27 "module": "js/components/hottextunit.reel", 99 "module": "js/components/hottextunit.reel",
28 "name": "HotTextUnit", 100 "name": "HotTextUnit",
@@ -36,6 +108,22 @@
36 } 108 }
37 }, 109 },
38 110
111 "webGlCh": {
112 "prototype": "montage/ui/checkbox.reel",
113 "properties": {
114 "element": {"#": "useWebGLCHIB"},
115 "identifier": "useWebGl",
116 "checked": true
117 },
118 "listeners": [
119 {
120 "type": "action",
121 "listener": {"@": "owner"},
122 "capture": false
123 }
124 ]
125 },
126
39 "_strokeMaterialCB": { 127 "_strokeMaterialCB": {
40 "module": "js/components/combobox.reel", 128 "module": "js/components/combobox.reel",
41 "name": "Combobox", 129 "name": "Combobox",
@@ -52,12 +140,19 @@
52 "properties": { 140 "properties": {
53 "element": {"#": "inkBottleProperties"}, 141 "element": {"#": "inkBottleProperties"},
54 142
143 "useBorderWidth": {"@": "borderWidthCh"},
144 "borderWidthLabel": {"@": "borderWidthLabel"},
55 "_borderWidth": {"@": "borderWidthHT"}, 145 "_borderWidth": {"@": "borderWidthHT"},
146
147 "useBorderStyle": {"@": "borderStyleCh"},
148 "borderStyleLabel": {"@": "borderStyleLabel"},
56 "_borderStyle": {"#": "borderStyleCB"}, 149 "_borderStyle": {"#": "borderStyleCB"},
57 150
151 "useStrokeSize": {"@": "strokeSizeCh"},
152 "strokeSizeLabel": {"@": "strokeSizeLabel"},
58 "_strokeSize": {"@": "strokeSizeHT"}, 153 "_strokeSize": {"@": "strokeSizeHT"},
59 154
60 "_useWebGL": {"#": "useWebGLCHIB"}, 155 "_useWebGL": {"@": "webGlCh"},
61 "_materialsContainer": {"#": "materialsContainerIB"}, 156 "_materialsContainer": {"#": "materialsContainerIB"},
62 "_strokeMaterial": {"@": "_strokeMaterialCB"} 157 "_strokeMaterial": {"@": "_strokeMaterialCB"}
63 } 158 }
@@ -68,13 +163,15 @@
68 </head> 163 </head>
69 164
70 <body> 165 <body>
71 <div id="inkBottleProperties" class="subToolHolderPanel"> 166 <div data-montage-id="inkBottleProperties" class="subToolHolderPanel inkBottleProperties">
72 167
73 <div id="bordersContainer" class="leftLabel" style="padding-top: 3px;"> 168 <div data-montage-id="elementInkOptions" class="leftLabel" style="padding-top: 3px;">
74 <label class="label"> Border:</label> 169 <input data-montage-id="useBorderWidthCh" type="checkbox" name="useBorderWidthControl" class="nj-skinned" title="Apply border-width"/>
75 <div id="borderWidth" class="label"></div> 170 <label data-montage-id="borderWidthLabel" class="label"> Border:</label>
76 <label class="label"> Style:</label> 171 <div data-montage-id="borderWidth" class="label"></div>
77 <select id="borderStyleCB" class="nj-skinned"> 172 <input data-montage-id="useBorderStyleCh" type="checkbox" name="useBorderStyleControl" class="nj-skinned" title="Apply border-style"/>
173 <label data-montage-id="borderStyleLabel" class="label"> Style:</label>
174 <select data-montage-id="borderStyleCB" class="nj-skinned">
78 <option value="none">none</option> 175 <option value="none">none</option>
79 <option value="solid" selected>solid</option> 176 <option value="solid" selected>solid</option>
80 <option value="hidden">hidden</option> 177 <option value="hidden">hidden</option>
@@ -88,18 +185,26 @@
88 </select> 185 </select>
89 </div> 186 </div>
90 187
91 <div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;"> 188 <div class="nj-divider divider-vertical" style="margin:8px 20px; float: left;">&nbsp;</div>
92 <label class="label"> Stroke:</label> 189
93 <div id="strokeSize" class="label"></div> 190 <div data-montage-id="shapeInkOptions" class="leftLabel" style="margin-top: 5px;">
191 <input data-montage-id="useStrokeSizeCh" type="checkbox" name="useStrokeControl" class="nj-skinned" title="Apply stroke size"/>
192 <label data-montage-id="strokeSizeLabel" class="label"> Stroke:</label>
193 <div data-montage-id="strokeSize" class="label"></div>
94 </div>