aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.css4
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.html193
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.js359
-rwxr-xr-xjs/tools/TextTool.js1
4 files changed, 205 insertions, 352 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 586cdcd5..7ab3ae9a 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.css
+++ b/js/components/tools-properties/text-properties.reel/text-properties.css
@@ -39,6 +39,10 @@
39 width: 160px; 39 width: 160px;
40} 40}
41 41
42.optionsTextTool .montage-button:hover {
43 color:#FFF;
44}
45
42.fontColorChipContainer { 46.fontColorChipContainer {
43 margin-left: 10px !important; 47 margin-left: 10px !important;
44 margin-right: 0px; 48 margin-right: 0px;
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 8899ff3c..e0edfdd6 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.html
+++ b/js/components/tools-properties/text-properties.reel/text-properties.html
@@ -11,79 +11,87 @@
11 11
12 <script type="text/montage-serialization"> 12 <script type="text/montage-serialization">
13 { 13 {
14
15 "owner": { 14 "owner": {
16 "prototype": "js/components/tools-properties/text-properties.reel", 15 "prototype": "js/components/tools-properties/text-properties.reel",
17 "properties": { 16 "properties": {
18 "element": {"#": "textProperties"}, 17 "element": {"#": "textProperties"},
19 "className": {"@": "className"}, 18
20 "tagType": {"@": "tagType"}, 19 "fontName": {"@": "fontname"},
21 "fontSelection": {"@": "fontSelection"}, 20 "fontSize": {"@": "fontsize"},
22 "fontSettings": {"@": "fontSettings"},
23 "fontSize": {"@": "fontSize"},
24 "fontColor": {"#": "fontColorCtrl"}, 21 "fontColor": {"#": "fontColorCtrl"},
22
25 "btnBold": {"@": "btnBold"}, 23 "btnBold": {"@": "btnBold"},
26 "btnItalic": {"@": "btnItalic"}, 24 "btnItalic": {"@": "btnItalic"},
27 "btnUnderline": {"@": "btnUnderline"}, 25 "btnUnderline": {"@": "btnUnderline"},
28 "btnStrikethrough": {"@": "btnStrikethrough"}, 26 "btnStrikethrough": {"@": "btnStrikethrough"},
27
29 "alignLeft": {"@": "alignLeft"}, 28 "alignLeft": {"@": "alignLeft"},
30 "alignCenter": {"@": "alignCenter"}, 29 "alignCenter": {"@": "alignCenter"},
31 "alignRight": {"@": "alignRight"}, 30 "alignRight": {"@": "alignRight"},
32 "alignJustify": {"@": "alignJustify"}, 31 "alignJustify": {"@": "alignJustify"},
32
33 "indent": {"@": "indent"}, 33 "indent": {"@": "indent"},
34 "outdent": {"@": "outdent"}, 34 "outdent": {"@": "outdent"},
35
35 "numberedList": {"@": "numberedList"}, 36 "numberedList": {"@": "numberedList"},
36 "bulletedList": {"@": "bulletedList"} 37 "bulletedList": {"@": "bulletedList"}
37 } 38 }
38 }, 39 },
39 "className": { 40
40 "prototype": "js/components/textfield.reel[TextField]", 41 "fontname": {
42 "prototype": "montage/ui/native/select.reel",
41 "properties": { 43 "properties": {
42 "element": {"#": "className"} 44 "element": {"#": "fontname"},
45 "preventFocus": true,
46 "contentController": {"@": "fontnameController"}
43 } 47 }
44 }, 48 },
45 "tagType": { 49
46 "prototype": "js/components/combobox.reel", 50 "fontnameController": {
51 "prototype": "montage/ui/controller/array-controller",
47 "properties": { 52 "properties": {
48 "element": {"#": "tagType"} 53 "selectObjectsOnAddition": false,
54 "content": [
55 {"text" : "Arial", "value": "Arial"},
56 {"text" : "Arial Black", "value": "Arial Black"},
57 {"text" : "Courier New", "value": "Courier New"},
58 {"text" : "Garamond", "value": "Garamond"},
59 {"text" : "Georgia", "value": "Georgia"},
60 {"text" : "Open Sans", "value": "Open Sans"},
61 {"text" : "Tahoma", "value": "Tahoma"},
62 {"text" : "Times New Roman", "value": "Times New Roman"},
63 {"text" : "Times", "value": "Times"},
64 {"text" : "Trebuchet", "value": "Trebuchet MS"},
65 {"text" : "Verdana", "value": "Verdana"}
66 ]
49 } 67 }
50 }, 68 },
51 "fontSelection": {
52 "prototype": "js/components/combobox.reel",
53 "properties": {
54 "element": {"#": "fontSelection"},
55 "identifier": "fontSelection"
56 },
57 "listeners": [
58 {
59 "type": "change",
60 "listener": {"@": "owner"}
61 }
62 ]
63 69
64 }, 70 "fontsize": {
65 "fontSettings": { 71 "prototype": "montage/ui/native/select.reel",
66 "prototype": "montage/ui/button.reel",
67 "properties": { 72 "properties": {
68 "element": {"#": "fontSettings"} 73 "element": {"#": "fontSize"},
74 "preventFocus" : true,
75 "contentController" : {"@": "fontsizeController"}
69 } 76 }
70 }, 77 },
71 78
72 "fontSize": { 79 "fontsizeController": {
73 "prototype": "js/components/combobox.reel", 80 "prototype": "montage/ui/controller/array-controller",
74 "properties": { 81 "properties": {
75 "element": {"#": "fontSize"}, 82 "selectObjectsOnAddition": false,
76 "identifier": "fontSize" 83 "content": [
77 }, 84 {"text" : "8pt", "value": "1"},
78 "listeners": [ 85 {"text" : "10pt", "value": "2"},
79 { 86 {"text" : "12pt", "value": "3"},
80 "type": "change", 87 {"text" : "14pt", "value": "4"},
81 "listener": {"@": "owner"} 88 {"text" : "18pt", "value": "5"},
82 } 89 {"text" : "24pt", "value": "6"},
83 ] 90 {"text" : "36pt", "value": "7"}
84 91 ]
92 }
85 }, 93 },
86 94
87 "btnBold": { 95 "btnBold": {
88 "prototype": "montage/ui/toggle-button.reel", 96 "prototype": "montage/ui/toggle-button.reel",
89 "properties": { 97 "properties": {
@@ -103,13 +111,7 @@
103 "identifier": "btnItalic", 111 "identifier": "btnItalic",
104 "pressedLabel": "I", 112 "pressedLabel": "I",
105 "unpressedLabel": "I" 113 "unpressedLabel": "I"
106 }, 114 }
107 "listeners": [
108 {
109 "type": "action",
110 "listener": {"@": "owner"}
111 }
112 ]
113 }, 115 },
114 "btnUnderline": { 116 "btnUnderline": {
115 "prototype": "montage/ui/toggle-button.reel", 117 "prototype": "montage/ui/toggle-button.reel",
@@ -119,13 +121,7 @@
119 "identifier": "btnUnderline", 121 "identifier": "btnUnderline",
120 "pressedLabel": "U", 122 "pressedLabel": "U",
121 "unpressedLabel": "U" 123 "unpressedLabel": "U"
122 }, 124 }
123 "listeners": [
124 {
125 "type": "action",
126 "listener": {"@": "owner"}
127 }
128 ]
129 }, 125 },
130 "btnStrikethrough": { 126 "btnStrikethrough": {
131 "prototype": "montage/ui/toggle-button.reel", 127 "prototype": "montage/ui/toggle-button.reel",
@@ -135,13 +131,7 @@
135 "identifier": "btnStrikethrough", 131 "identifier": "btnStrikethroug