aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/ink-bottle-properties.reel
diff options
context:
space:
mode:
authorPushkar Joshi2012-04-27 15:05:38 -0700
committerPushkar Joshi2012-04-27 15:05:38 -0700
commitc8fc8e1bd1c394f433b4fc1677f4bc596e7cc2cc (patch)
tree74fcb9818a917d4f8ddb0db0c78a8cff9af86339 /js/components/tools-properties/ink-bottle-properties.reel
parent28d1594b868e3c08e5603adbd5b29df1e24d57e9 (diff)
parentc8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff)
downloadninja-c8fc8e1bd1c394f433b4fc1677f4bc596e7cc2cc.tar.gz
Merge branch 'master' into pentool
Diffstat (limited to 'js/components/tools-properties/ink-bottle-properties.reel')
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css24
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html151
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js49
3 files changed, 184 insertions, 40 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..010e77b2 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
@@ -1,4 +1,4 @@
1<!DOCTYPE HTML> 1<!DOCTYPE HTML>
2<!-- <copyright> 2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,9 +11,32 @@
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 "prototype": "js/components/hottextunit.reel[HotTextUnit]",
16 "name": "HotTextUnit",
17 "properties": { 40 "properties": {
18 "element": {"#": "borderWidth"}, 41 "element": {"#": "borderWidth"},
19 "minValue": 1, 42 "minValue": 1,
@@ -23,9 +46,56 @@
23 } 46 }
24 }, 47 },
25 48
49 "borderStyleCh": {
50 "prototype": "montage/ui/checkbox.reel",
51 "properties": {
52 "element": {"#": "useBorderStyleCh"},
53 "identifier": "useBorderStyle",
54 "checked": true
55 },
56 "listeners": [
57 {
58 "type": "action",
59 "listener": {"@": "owner"},
60 "capture": false
61 }
62 ]
63 },
64
65 "borderStyleLabel": {
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",
75 "properties": {
76 "element": {"#": "useStrokeSizeCh"},
77 "identifier": "useStrokeSize",
78 "checked": true
79 },
80 "listeners": [
81 {
82 "type": "action",
83 "listener": {"@": "owner"},
84 "capture": false
85 }
86 ]
87 },
88
89 "strokeSizeLabel": {
90 "prototype": "montage/ui/dynamic-text.reel",
91 "properties": {
92 "element": {"#": "strokeSizeLabel"},
93 "value": "Stroke:"
94 }
95 },
96
26 "strokeSizeHT": { 97 "strokeSizeHT": {
27 "module": "js/components/hottextunit.reel", 98 "prototype": "js/components/hottextunit.reel[HotTextUnit]",
28 "name": "HotTextUnit",
29 "properties": { 99 "properties": {
30 "element": {"#": "strokeSize"}, 100 "element": {"#": "strokeSize"},
31 "minValue": 1, 101 "minValue": 1,
@@ -36,9 +106,24 @@
36 } 106 }
37 }, 107 },
38 108
109 "webGlCh": {
110 "prototype": "montage/ui/checkbox.reel",
111 "properties": {
112 "element": {"#": "useWebGLCHIB"},
113 "identifier": "useWebGl",
114 "checked": true
115 },
116 "listeners": [
117 {
118 "type": "action",
119 "listener": {"@": "owner"},
120 "capture": false
121 }
122 ]
123 },
124
39 "_strokeMaterialCB": { 125 "_strokeMaterialCB": {
40 "module": "js/components/combobox.reel", 126 "prototype": "js/components/combobox.reel",
41 "name": "Combobox",
42 "properties": { 127 "properties": {
43 "element": {"#": "strokeMaterialIBCB"}, 128 "element": {"#": "strokeMaterialIBCB"},
44 "labelField": "_name", 129 "labelField": "_name",
@@ -47,17 +132,23 @@
47 }, 132 },
48 133
49 "owner": { 134 "owner": {
50 "module": "js/components/tools-properties/ink-bottle-properties.reel", 135 "prototype": "js/components/tools-properties/ink-bottle-properties.reel",
51 "name": "InkBottleProperties",
52 "properties": { 136 "properties": {
53 "element": {"#": "inkBottleProperties"}, 137 "element": {"#": "inkBottleProperties"},
54 138
139 "useBorderWidth": {"@": "borderWidthCh"},
140 "borderWidthLabel": {"@": "borderWidthLabel"},
55 "_borderWidth": {"@": "borderWidthHT"}, 141 "_borde