diff options
author | hwc487 | 2012-04-26 13:04:25 -0700 |
---|---|---|
committer | hwc487 | 2012-04-26 13:04:25 -0700 |
commit | 37f2d5230175c0fb9a4792f5e3d804f7604442e1 (patch) | |
tree | c8260f151270c6bdbe08869ebaeb837777c28d1b /js/components/tools-properties/ink-bottle-properties.reel | |
parent | f13d0f45f6b449764898e99db309c43b51a33476 (diff) | |
parent | 902dc18296fc78f3b8e67d952c42981d926bb2fc (diff) | |
download | ninja-37f2d5230175c0fb9a4792f5e3d804f7604442e1.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/components/tools-properties/ink-bottle-properties.reel')
3 files changed, 179 insertions, 31 deletions
diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css index 7f1b0f7f..a926a0b4 100755 --- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css +++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css | |||
@@ -4,3 +4,27 @@ | |||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
5 | </copyright> */ | 5 | </copyright> */ |
6 | 6 | ||
7 | .inkBottleProperties input[type="checkbox"].nj-skinned { | ||
8 | float:left; | ||
9 | margin-top:5px; | ||
10 | } | ||
11 | |||
12 | .inkBottleProperties select.nj-skinned { | ||
13 | float:left; | ||
14 | margin:2px 5px 0 0; | ||
15 | } | ||
16 | |||
17 | .inkBottleProperties label.disabled { | ||
18 | color:#999999; | ||
19 | } | ||
20 | |||
21 | .inkBottleProperties label.disabled:hover { | ||
22 | color:#999999; | ||
23 | background-color: transparent; | ||
24 | cursor:default; | ||
25 | } | ||
26 | |||
27 | .inkBottleProperties div.disabled:hover { | ||
28 | background-color: transparent; | ||
29 | cursor:default; | ||
30 | } \ No newline at end of file | ||
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 |