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.js357
-rwxr-xr-xjs/tools/TextTool.js1
4 files changed, 204 insertions, 351 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 60317304..9e562f68 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.css
+++ b/js/components/tools-properties/text-properties.reel/text-properties.css
@@ -63,6 +63,10 @@ POSSIBILITY OF SUCH DAMAGE.
63 width: 160px; 63 width: 160px;
64} 64}
65 65
66.optionsTextTool .montage-button:hover {
67 color:#FFF;
68}
69
66.fontColorChipContainer { 70.fontColorChipContainer {
67 margin-left: 10px !important; 71 margin-left: 10px !important;
68 margin-right: 0px; 72 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 6784e41c..676745ba 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.html
+++ b/js/components/tools-properties/text-properties.reel/text-properties.html
@@ -35,79 +35,87 @@ POSSIBILITY OF SUCH DAMAGE.
35 35
36 <script type="text/montage-serialization"> 36 <script type="text/montage-serialization">
37 { 37 {
38
39 "owner": { 38 "owner": {
40 "prototype": "js/components/tools-properties/text-properties.reel", 39 "prototype": "js/components/tools-properties/text-properties.reel",
41 "properties": { 40 "properties": {
42 "element": {"#": "textProperties"}, 41 "element": {"#": "textProperties"},
43 "className": {"@": "className"}, 42
44 "tagType": {"@": "tagType"}, 43 "fontName": {"@": "fontname"},
45 "fontSelection": {"@": "fontSelection"}, 44 "fontSize": {"@": "fontsize"},
46 "fontSettings": {"@": "fontSettings"},
47 "fontSize": {"@": "fontSize"},
48 "fontColor": {"#": "fontColorCtrl"}, 45 "fontColor": {"#": "fontColorCtrl"},
46
49 "btnBold": {"@": "btnBold"}, 47 "btnBold": {"@": "btnBold"},
50 "btnItalic": {"@": "btnItalic"}, 48 "btnItalic": {"@": "btnItalic"},
51 "btnUnderline": {"@": "btnUnderline"}, 49 "btnUnderline": {"@": "btnUnderline"},
52 "btnStrikethrough": {"@": "btnStrikethrough"}, 50 "btnStrikethrough": {"@": "btnStrikethrough"},
51
53 "alignLeft": {"@": "alignLeft"}, 52 "alignLeft": {"@": "alignLeft"},
54 "alignCenter": {"@": "alignCenter"}, 53 "alignCenter": {"@": "alignCenter"},
55 "alignRight": {"@": "alignRight"}, 54 "alignRight": {"@": "alignRight"},
56 "alignJustify": {"@": "alignJustify"}, 55 "alignJustify": {"@": "alignJustify"},
56
57 "indent": {"@": "indent"}, 57 "indent": {"@": "indent"},
58 "outdent": {"@": "outdent"}, 58 "outdent": {"@": "outdent"},
59
59 "numberedList": {"@": "numberedList"}, 60 "numberedList": {"@": "numberedList"},
60 "bulletedList": {"@": "bulletedList"} 61 "bulletedList": {"@": "bulletedList"}
61 } 62 }
62 }, 63 },
63 "className": { 64
64 "prototype": "js/components/textfield.reel[TextField]", 65 "fontname": {
66 "prototype": "montage/ui/native/select.reel",
65 "properties": { 67 "properties": {
66 "element": {"#": "className"} 68 "element": {"#": "fontname"},
69 "preventFocus": true,
70 "contentController": {"@": "fontnameController"}
67 } 71 }
68 }, 72 },
69 "tagType": { 73
70 "prototype": "js/components/combobox.reel", 74 "fontnameController": {
75 "prototype": "montage/ui/controller/array-controller",
71 "properties": { 76 "properties": {
72 "element": {"#": "tagType"} 77 "selectObjectsOnAddition": false,
78 "content": [
79 {"text" : "Arial", "value": "Arial"},
80 {"text" : "Arial Black", "value": "Arial Black"},
81 {"text" : "Courier New", "value": "Courier New"},
82 {"text" : "Garamond", "value": "Garamond"},
83 {"text" : "Georgia", "value": "Georgia"},
84 {"text" : "Open Sans", "value": "Open Sans"},
85 {"text" : "Tahoma", "value": "Tahoma"},
86 {"text" : "Times New Roman", "value": "Times New Roman"},
87 {"text" : "Times", "value": "Times"},
88 {"text" : "Trebuchet", "value": "Trebuchet MS"},
89 {"text" : "Verdana", "value": "Verdana"}
90 ]
73 } 91 }
74 }, 92 },
75 "fontSelection": {
76 "prototype": "js/components/combobox.reel",
77 "properties": {
78 "element": {"#": "fontSelection"},
79 "identifier": "fontSelection"
80 },
81 "listeners": [
82 {
83 "type": "change",
84 "listener": {"@": "owner"}
85 }
86 ]
87 93
88 }, 94 "fontsize": {
89 "fontSettings": { 95 "prototype": "montage/ui/native/select.reel",
90 "prototype": "montage/ui/button.reel",
91 "properties": { 96 "properties": {
92 "element": {"#": "fontSettings"} 97 "element": {"#": "fontSize"},
98 "preventFocus" : true,
99 "contentController" : {"@": "fontsizeController"}
93 } 100 }
94 }, 101 },
95 102
96 "fontSize": { 103 "fontsizeController": {
97 "prototype": "js/components/combobox.reel", 104 "prototype": "montage/ui/controller/array-controller",
98 "properties": { 105 "properties": {
99 "element": {"#": "fontSize"}, 106 "selectObjectsOnAddition": false,
100 "identifier": "fontSize" 107 "content": [
101 }, 108 {"text" : "8pt", "value": "1"},
102 "listeners": [ 109 {"text" : "10pt", "value": "2"},
103 { 110 {"text" : "12pt", "value": "3"},
104 "type": "change", 111 {"text" : "14pt", "value": "4"},
105 "listener": {"@": "owner"} 112 {"text" : "18pt", "value": "5"},
106 } 113 {"text" : "24pt", "value": "6"},
107 ] 114 {"text" : "36pt", "value": "7"}
108 115 ]
116 }
109 }, 117 },
110 118
111 "btnBold": { 119 "btnBold": {
112 "prototype": "montage/ui/toggle-button.reel", 120 "prototype": "montage/ui/toggle-button.reel",
113 "properties": { 121 "properties": {
@@ -127,13 +135,7 @@ POSSIBILITY OF SUCH DAMAGE.
127 "identifier": "btnItalic", 135 "identifier": "btnItalic",
128 "pressedLabel": "I", 136 "pressedLabel": "I",
129 "unpressedLabel": "I" 137 "unpressedLabel": "I"
130 }, 138 }
131 "listeners": [
132 {
133 "type": "action",
134 "listener": {"@": "owner"}
135 }
136 ]
137 }, 139 },
138 "btnUnderline": { 140 "btnUnderline": {
139 "prototype": "montage/ui/toggle-button.reel", 141 "prototype": "montage/ui/toggle-button.reel",
@@ -143,13 +145,7 @@ POSSIBILITY OF SUCH DAMAGE.
143 "identifier": "btnUnderline", 145 "identifier": "btnUnderline",
144 "pressedLabel": "U", 146 "pressedLabel": "U",
145 "unpressedLabel": "U" 147 "unpressedLabel": "U"
146 }, 148 }
147 "listeners": [
148 {
149 "type": "action",
150 "listener": {"@": "owner"}
151 }
152 ]
153 }, 149 },
154 "btnStrikethrough": { 150 "btnStrikethrough": {
155 "prototype": "montage/ui/toggle-button.reel", 151 "prototype": "montage/ui/toggle-button.reel",