diff options
Diffstat (limited to 'js/components/tools-properties')
3 files changed, 136 insertions, 456 deletions
diff --git a/js/components/tools-properties/text-properties.reel/text-properties.css b/js/components/tools-properties/text-properties.reel/text-properties.css index 6aa61812..d581c6c3 100755 --- a/js/components/tools-properties/text-properties.reel/text-properties.css +++ b/js/components/tools-properties/text-properties.reel/text-properties.css | |||
@@ -5,33 +5,29 @@ | |||
5 | </copyright> */ | 5 | </copyright> */ |
6 | 6 | ||
7 | .optionsTextTool { | 7 | .optionsTextTool { |
8 | padding: 6px; | 8 | display: -webkit-box; |
9 | -webkit-box-orient:horizontal; | ||
10 | -webkit-box-align: stretch; | ||
11 | padding: 5px; | ||
9 | } | 12 | } |
10 | 13 | ||
11 | .optionsTextTool .btnGroup { | ||
12 | padding: 0px 8px; | ||
13 | } | ||
14 | 14 | ||
15 | .optionsTextTool > *, .optionsTextTool .btnGroup > * { | 15 | .optionsTextTool > * { |
16 | float:left; | 16 | -webkit-box-flex:0; |
17 | } | 17 | } |
18 | 18 | ||
19 | .optionsTextTool button { | 19 | .optionsTextTool .button { |
20 | width: auto; | 20 | width: auto; |
21 | padding: 4px 8px !important; | 21 | |
22 | margin-left:4px; | 22 | } |
23 | |||
24 | .optionsTextTool .hottextunit { | ||
25 | padding-top:5px; | ||
23 | } | 26 | } |
24 | 27 | ||
25 | .optionsTextTool .label, .optionsTextTool .hottextunit { | 28 | .optionsTextTool .label, .optionsTextTool .hottextunit { |
29 | float:none; | ||
26 | font-size:11px; | 30 | font-size:11px; |
27 | } | 31 | } |
28 | 32 | ||
29 | .optionsTextTool .fontSelection { | ||
30 | width:100px; | ||
31 | } | ||
32 | 33 | ||
33 | .optionsTextTool .fontColor { | ||
34 | width: 20px; | ||
35 | height: 18px; | ||
36 | margin: 2px 6px; | ||
37 | } \ No newline at end of file | ||
diff --git a/js/components/tools-properties/text-properties.reel/text-properties.html b/js/components/tools-properties/text-properties.reel/text-properties.html index 7ded1236..fb57c06d 100755 --- a/js/components/tools-properties/text-properties.reel/text-properties.html +++ b/js/components/tools-properties/text-properties.reel/text-properties.html | |||
@@ -33,8 +33,8 @@ | |||
33 | "alignCenter": {"@": "alignCenter"}, | 33 | "alignCenter": {"@": "alignCenter"}, |
34 | "alignRight": {"@": "alignRight"}, | 34 | "alignRight": {"@": "alignRight"}, |
35 | "alignJustify": {"@": "alignJustify"}, | 35 | "alignJustify": {"@": "alignJustify"}, |
36 | "indent": {"@": "indent"}, | 36 | "indentRight": {"@": "indentRight"}, |
37 | "outdent": {"@": "outdent"}, | 37 | "indentLeft": {"@": "indentLeft"}, |
38 | "numberedList": {"@": "numberedList"}, | 38 | "numberedList": {"@": "numberedList"}, |
39 | "bulletedList": {"@": "bulletedList"} | 39 | "bulletedList": {"@": "bulletedList"} |
40 | } | 40 | } |
@@ -57,16 +57,8 @@ | |||
57 | "module": "js/components/combobox.reel", | 57 | "module": "js/components/combobox.reel", |
58 | "name": "Combobox", | 58 | "name": "Combobox", |
59 | "properties": { | 59 | "properties": { |
60 | "element": {"#": "fontSelection"}, | 60 | "element": {"#": "fontSelection"} |
61 | "identifier": "fontSelection" | 61 | } |
62 | }, | ||
63 | "listeners": [ | ||
64 | { | ||
65 | "type": "change", | ||
66 | "listener": {"@": "owner"} | ||
67 | } | ||
68 | ] | ||
69 | |||
70 | }, | 62 | }, |
71 | "fontSettings": { | 63 | "fontSettings": { |
72 | "module": "js/components/button.reel", | 64 | "module": "js/components/button.reel", |
@@ -77,226 +69,131 @@ | |||
77 | }, | 69 | }, |
78 | 70 | ||
79 | "fontSize": { | 71 | "fontSize": { |
80 | "module": "js/components/combobox.reel", | 72 | "module": "js/components/hottextunit.reel", |
81 | "name": "Combobox", | 73 | "name": "HotTextUnit", |
82 | "properties": { | 74 | "properties": { |
83 | "element": {"#": "fontSize"}, | 75 | "element": {"#": "fontSize"} |
84 | "identifier": "fontSize" | 76 | } |
85 | }, | 77 | }, |
86 | "listeners": [ | ||
87 | { | ||
88 | "type": "change", | ||
89 | "listener": {"@": "owner"} | ||
90 | } | ||
91 | ] | ||
92 | 78 | ||
79 | "fontColor": { | ||
80 | "module": "js/components/button.reel", | ||
81 | "name": "Button", | ||
82 | "properties": { | ||
83 | "element": {"#": "fontColor"} | ||
84 | } | ||
93 | }, | 85 | }, |
94 | |||
95 | "btnBold": { | 86 | "btnBold": { |
96 | "module": "montage/ui/toggle-button.reel", | 87 | "module": "js/components/button.reel", |
97 | "name": "ToggleButton", | 88 | "name": "Button", |
98 | "properties": { | 89 | "properties": { |
99 | "element": {"#": "btnBold"}, | 90 | "element": {"#": "btnBold"}, |
100 | "pressedClass": "active", | 91 | "_isToggleButton": true |
101 | "preventFocus": true, | 92 | } |
102 | "identifier": "btnBold", | ||
103 | "label": "B" | ||
104 | }, | ||
105 | "listeners": [ | ||
106 | { | ||
107 | "type": "action", | ||
108 | "listener": {"@": "owner"} | ||
109 | } | ||
110 | ] | ||
111 | }, | 93 | }, |
112 | "btnItalic": { | 94 | "btnItalic": { |
113 | "module": "montage/ui/toggle-button.reel", | 95 | "module": "js/components/button.reel", |
114 | "name": "ToggleButton", | 96 | "name": "Button", |
115 | "properties": { | 97 | "properties": { |
116 | "element": {"#": "btnItalic"}, | 98 | "element": {"#": "btnItalic"}, |
117 | "pressedClass": "active", | 99 | "_isToggleButton": true |
118 | "preventFocus": true, | 100 | } |
119 | "identifier": "btnItalic", | ||
120 | "label": "I" | ||
121 | }, | ||
122 | "listeners": [ | ||
123 | { | ||
124 | "type": "action", | ||
125 | "listener": {"@": "owner"} | ||
126 | } | ||
127 | ] | ||
128 | }, | 101 | }, |
129 | "btnUnderline": { | 102 | "btnUnderline": { |
130 | "module": "montage/ui/toggle-button.reel", | 103 | "module": "js/components/button.reel", |
131 | "name": "ToggleButton", | 104 | "name": "Button", |
132 | "properties": { | 105 | "properties": { |
133 | "element": {"#": "btnUnderline"}, | 106 | "element": {"#": "btnUnderline"}, |
134 | "pressedClass": "active", | 107 | "_isToggleButton": true |
135 | "preventFocus": true, | 108 | } |
136 | "identifier": "btnUnderline", | ||
137 | "label": "U" | ||
138 | }, | ||
139 | "listeners": [ | ||
140 | { | ||
141 | "type": "action", | ||
142 | "listener": {"@": "owner"} | ||
143 | } | ||
144 | ] | ||
145 | }, | 109 | }, |
146 | "btnStrikethrough": { | 110 | "btnStrikethrough": { |
147 | "module": "montage/ui/toggle-button.reel", | 111 | "module": "js/components/button.reel", |
148 | "name": "ToggleButton", | 112 | "name": "Button", |
149 | "properties": { | 113 | "properties": { |
150 | "element": {"#": "btnStrikethrough"}, | 114 | "element": {"#": "btnStrikethrough"}, |