diff options
author | Valerio Virgillito | 2012-06-05 21:43:48 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-06-05 21:43:48 -0700 |
commit | fb684fb27c2cef04251655d86e55eceed9da3132 (patch) | |
tree | a7773e4d8ee6cb3d047e5aa5f8c4f33403099574 /js/components/tools-properties/ink-bottle-properties.reel | |
parent | e28eb9158a50d7e6d97dbc68066e591ac600c241 (diff) | |
parent | 18e212dca48066d1ddaca96875a3f40adcc859b6 (diff) | |
download | ninja-fb684fb27c2cef04251655d86e55eceed9da3132.tar.gz |
Merge branch 'refs/heads/master' into element-model-fixes
Conflicts:
js/mediators/element-mediator.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/components/tools-properties/ink-bottle-properties.reel')
3 files changed, 59 insertions, 100 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 3dba17b6..dae64eb3 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 | |||
@@ -8,18 +8,3 @@ | |||
8 | .inkBottleOptions select.nj-skinned { | 8 | .inkBottleOptions select.nj-skinned { |
9 | margin-top: 2px; | 9 | margin-top: 2px; |
10 | } | 10 | } |
11 | |||
12 | .inkBottleOptions label.disabled { | ||
13 | color:#999999; | ||
14 | } | ||
15 | |||
16 | .inkBottleOptions label.disabled:hover { | ||
17 | color:#999999; | ||
18 | background-color: transparent; | ||
19 | cursor:default; | ||
20 | } | ||
21 | |||
22 | .inkBottleOptions div.disabled:hover { | ||
23 | background-color: transparent; | ||
24 | cursor:default; | ||
25 | } | ||
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 3ac0b261..5620eed8 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,12 +11,21 @@ | |||
11 | 11 | ||
12 | <script type="text/montage-serialization"> | 12 | <script type="text/montage-serialization"> |
13 | { | 13 | { |
14 | "borderWidthCh": { | 14 | "useStrokeColor": { |
15 | "prototype": "montage/ui/checkbox.reel", | 15 | "prototype": "montage/ui/checkbox.reel", |
16 | "properties": { | 16 | "properties": { |
17 | "element": {"#": "useBorderWidthCh"}, | 17 | "element": {"#": "useStrokeColor"}, |
18 | "identifier": "useBorderWidth", | 18 | "identifier": "useStrokeColor", |
19 | "checked": true | 19 | "checked": true |
20 | } | ||
21 | }, | ||
22 | |||
23 | "useBorderWidth": { | ||
24 | "prototype": "montage/ui/checkbox.reel", | ||
25 | "properties": { | ||
26 | "element": {"#": "useBorderWidth"}, | ||
27 | "identifier": "useBorderWidth", | ||
28 | "checked": false | ||
20 | }, | 29 | }, |
21 | "listeners": [ | 30 | "listeners": [ |
22 | { | 31 | { |
@@ -27,31 +36,24 @@ | |||
27 | ] | 36 | ] |
28 | }, | 37 | }, |
29 | 38 | ||
30 | "borderWidthLabel": { | 39 | "borderWidth": { |
31 | "prototype": "montage/ui/dynamic-text.reel", | ||
32 | "properties": { | ||
33 | "element": {"#": "borderWidthLabel"}, | ||
34 | "value": "Border:" | ||
35 | } | ||
36 | }, | ||
37 | |||
38 | "borderWidthHT": { | ||
39 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", | 40 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
40 | "properties": { | 41 | "properties": { |
41 | "element": {"#": "borderWidth"}, | 42 | "element": {"#": "borderWidth"}, |
42 | "minValue": 1, | 43 | "minValue": 1, |
43 | "maxValue": 100, | 44 | "maxValue": 100, |
44 | "value": 1, | 45 | "value": 1, |
45 | "acceptableUnits" : ["px", "pt"] | 46 | "acceptableUnits" : ["px", "pt"], |
47 | "enabled": false | ||
46 | } | 48 | } |
47 | }, | 49 | }, |
48 | 50 | ||
49 | "borderStyleCh": { | 51 | "useBorderStyle": { |
50 | "prototype": "montage/ui/checkbox.reel", | 52 | "prototype": "montage/ui/checkbox.reel", |
51 | "properties": { | 53 | "properties": { |
52 | "element": {"#": "useBorderStyleCh"}, | 54 | "element": {"#": "useBorderStyle"}, |
53 | "identifier": "useBorderStyle", | 55 | "identifier": "useBorderStyle", |
54 | "checked": true | 56 | "checked": false |
55 | }, | 57 | }, |
56 | "listeners": [ | 58 | "listeners": [ |
57 | { | 59 | { |
@@ -62,20 +64,12 @@ | |||
62 | ] | 64 | ] |
63 | }, | 65 | }, |
64 | 66 | ||
65 | "borderStyleLabel": { | 67 | "useStrokeSize": { |
66 | "prototype": "montage/ui/dynamic-text.reel", | ||
67 | "properties": { | ||
68 | "element": {"#": "borderStyleLabel"}, | ||
69 | "value": "Style:" | ||
70 | } | ||
71 | }, | ||
72 | |||
73 | "strokeSizeCh": { | ||
74 | "prototype": "montage/ui/checkbox.reel", | 68 | "prototype": "montage/ui/checkbox.reel", |
75 | "properties": { | 69 | "properties": { |
76 | "element": {"#": "useStrokeSizeCh"}, | 70 | "element": {"#": "useStrokeSize"}, |
77 | "identifier": "useStrokeSize", | 71 | "identifier": "useStrokeSize", |
78 | "checked": true | 72 | "checked": false |
79 | }, | 73 | }, |
80 | "listeners": [ | 74 | "listeners": [ |
81 | { | 75 | { |
@@ -86,15 +80,7 @@ | |||
86 | ] | 80 | ] |
87 | }, | 81 | }, |
88 | 82 | ||
89 | "strokeSizeLabel": { | 83 | "strokeSize": { |
90 | "prototype": "montage/ui/dynamic-text.reel", | ||
91 | "properties": { | ||
92 | "element": {"#": "strokeSizeLabel"}, | ||
93 | "value": "Stroke:" | ||
94 | } | ||
95 | }, | ||
96 | |||
97 | "strokeSizeHT": { | ||
98 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", | 84 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
99 | "properties": { | 85 | "properties": { |
100 | "element": {"#": "strokeSize"}, | 86 | "element": {"#": "strokeSize"}, |
@@ -102,16 +88,17 @@ | |||
102 | "maxValue": 100, | 88 | "maxValue": 100, |
103 | "value": 1, | 89 | "value": 1, |
104 | "decimalPlace": 10, | 90 | "decimalPlace": 10, |
105 | "acceptableUnits" : ["px", "pt"] | 91 | "acceptableUnits" : ["px", "pt"], |
92 | "enabled": false | ||
106 | } | 93 | } |
107 | }, | 94 | }, |
108 | 95 | ||
109 | "webGlCh": { | 96 | "useWebGL": { |
110 | "prototype": "montage/ui/checkbox.reel", | 97 | "prototype": "montage/ui/checkbox.reel", |
111 | "properties": { | 98 | "properties": { |
112 | "element": {"#": "useWebGLCHIB"}, | 99 | "element": {"#": "useWebGL"}, |
113 | "identifier": "useWebGl", | 100 | "identifier": "useWebGL", |
114 | "checked": true | 101 | "checked": false |
115 | }, | 102 | }, |
116 | "listeners": [ | 103 | "listeners": [ |
117 | { | 104 | { |
@@ -122,10 +109,10 @@ | |||
122 | ] | 109 | ] |
123 | }, | 110 | }, |
124 | 111 | ||
125 | "_strokeMaterialCB": { | 112 | "strokeMaterial": { |
126 | "prototype": "js/components/combobox.reel", | 113 | "prototype": "js/components/combobox.reel", |
127 | "properties": { |