Merge lp:~thomas-moenicke/ubuntu-keyboard/ubuntu-keyboard-language-layouts into lp:ubuntu-keyboard
- ubuntu-keyboard-language-layouts
- Merge into trunk
Proposed by
Thomas Moenicke
Status: | Merged |
---|---|
Approved by: | Günter Schwann |
Approved revision: | 71 |
Merged at revision: | 72 |
Proposed branch: | lp:~thomas-moenicke/ubuntu-keyboard/ubuntu-keyboard-language-layouts |
Merge into: | lp:ubuntu-keyboard |
Diff against target: |
429 lines (+379/-1) 7 files modified
qml/KeyboardContainer.qml (+8/-0) qml/languages/Keyboard_de.qml (+93/-0) qml/languages/Keyboard_en_us.qml (+1/-1) qml/languages/Keyboard_es.qml (+91/-0) qml/languages/Keyboard_fr.qml (+91/-0) qml/languages/Keyboard_pt.qml (+91/-0) qml/qml.pro (+4/-0) |
To merge this branch: | bzr merge lp:~thomas-moenicke/ubuntu-keyboard/ubuntu-keyboard-language-layouts |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Günter Schwann (community) | Approve | ||
PS Jenkins bot | continuous-integration | Approve | |
Review via email:
|
Commit message
more languages
Description of the change
more languages
To post a comment you must log in.
Revision history for this message
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
PS Jenkins bot (ps-jenkins) wrote : | # |
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'qml/KeyboardContainer.qml' | |||
2 | --- qml/KeyboardContainer.qml 2013-10-08 14:05:09 +0000 | |||
3 | +++ qml/KeyboardContainer.qml 2013-10-10 09:57:10 +0000 | |||
4 | @@ -45,6 +45,14 @@ | |||
5 | 45 | characterKeypadSource = "languages/Keyboard_en_url_search.qml"; | 45 | characterKeypadSource = "languages/Keyboard_en_url_search.qml"; |
6 | 46 | if (layoutId === "en_us") | 46 | if (layoutId === "en_us") |
7 | 47 | characterKeypadSource = "languages/Keyboard_en_us.qml"; | 47 | characterKeypadSource = "languages/Keyboard_en_us.qml"; |
8 | 48 | if (layoutId === "es") | ||
9 | 49 | characterKeypadSource = "languages/Keyboard_es.qml"; | ||
10 | 50 | if (layoutId === "pt") | ||
11 | 51 | characterKeypadSource = "languages/Keyboard_pt.qml"; | ||
12 | 52 | if (layoutId === "de") | ||
13 | 53 | characterKeypadSource = "languages/Keyboard_de.qml"; | ||
14 | 54 | if (layoutId === "fr") | ||
15 | 55 | characterKeypadSource = "languages/Keyboard_fr.qml"; | ||
16 | 48 | if (layoutId === "zh_cn_pinyin") | 56 | if (layoutId === "zh_cn_pinyin") |
17 | 49 | characterKeypadSource = "languages/Keyboard_zh_cn_pinyin.qml"; | 57 | characterKeypadSource = "languages/Keyboard_zh_cn_pinyin.qml"; |
18 | 50 | } | 58 | } |
19 | 51 | 59 | ||
20 | === added file 'qml/languages/Keyboard_de.qml' | |||
21 | --- qml/languages/Keyboard_de.qml 1970-01-01 00:00:00 +0000 | |||
22 | +++ qml/languages/Keyboard_de.qml 2013-10-10 09:57:10 +0000 | |||
23 | @@ -0,0 +1,93 @@ | |||
24 | 1 | /* | ||
25 | 2 | * Copyright 2013 Canonical Ltd. | ||
26 | 3 | * | ||
27 | 4 | * This program is free software; you can redistribute it and/or modify | ||
28 | 5 | * it under the terms of the GNU Lesser General Public License as published by | ||
29 | 6 | * the Free Software Foundation; version 3. | ||
30 | 7 | * | ||
31 | 8 | * This program is distributed in the hope that it will be useful, | ||
32 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
33 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
34 | 11 | * GNU Lesser General Public License for more details. | ||
35 | 12 | * | ||
36 | 13 | * You should have received a copy of the GNU Lesser General Public License | ||
37 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
38 | 15 | */ | ||
39 | 16 | |||
40 | 17 | import QtQuick 2.0 | ||
41 | 18 | import "../keys" | ||
42 | 19 | |||
43 | 20 | KeyPad { | ||
44 | 21 | anchors.fill: parent | ||
45 | 22 | |||
46 | 23 | content: c1 | ||
47 | 24 | symbols: "languages/Keyboard_symbols.qml" | ||
48 | 25 | |||
49 | 26 | Column { | ||
50 | 27 | id: c1 | ||
51 | 28 | anchors.fill: parent | ||
52 | 29 | spacing: 0 | ||
53 | 30 | |||
54 | 31 | Row { | ||
55 | 32 | anchors.horizontalCenter: parent.horizontalCenter; | ||
56 | 33 | spacing: 0 | ||
57 | 34 | |||
58 | 35 | CharKey { label: "q"; shifted: "Q"; } | ||
59 | 36 | CharKey { label: "w"; shifted: "W"; } | ||
60 | 37 | CharKey { label: "e"; shifted: "E"; extended: ["è", "é", "ë", "ê", "€"]; extendedShifted: ["È","É", "Ë", "Ê", "€"] } | ||
61 | 38 | CharKey { label: "r"; shifted: "R"; } | ||
62 | 39 | CharKey { label: "t"; shifted: "T"; extended: ["þ"]; extendedShifted: ["Þ"] } | ||
63 | 40 | CharKey { label: "z"; shifted: "Z"; } | ||
64 | 41 | CharKey { label: "u"; shifted: "U"; extended: ["ü","ù","ú","û"]; extendedShifted: ["Ü","Ù","Ú","Û"] } | ||
65 | 42 | CharKey { label: "i"; shifted: "I"; extended: ["ì","í","î","ï","ı"]; extendedShifted: ["Ì","Í","Î","Ï","İ"] } | ||
66 | 43 | CharKey { label: "o"; shifted: "O"; extended: ["ö","ò","ó","ô","õ","ø"]; extendedShifted: ["Ö","Ò","Ó","Ô","Õ","Ø"] } | ||
67 | 44 | CharKey { label: "p"; shifted: "P"; } | ||
68 | 45 | } | ||
69 | 46 | |||
70 | 47 | Row { | ||
71 | 48 | anchors.horizontalCenter: parent.horizontalCenter; | ||
72 | 49 | spacing: 0 | ||
73 | 50 | |||
74 | 51 | CharKey { label: "a"; shifted: "A"; extended: ["ä","à","á","ã","â","å","æ"]; extendedShifted: ["Ä","À","Â","Á","Ã","Å","Æ"] } | ||
75 | 52 | CharKey { label: "s"; shifted: "S"; extended: ["ß","$"]; extendedShifted: ["ş","$"] } | ||
76 | 53 | CharKey { label: "d"; shifted: "D"; } | ||
77 | 54 | CharKey { label: "f"; shifted: "F"; } | ||
78 | 55 | CharKey { label: "g"; shifted: "G"; extended: ["ğ"]; extendedShifted: ["Ğ"]; } | ||
79 | 56 | CharKey { label: "h"; shifted: "H"; } | ||
80 | 57 | CharKey { label: "j"; shifted: "J"; } | ||
81 | 58 | CharKey { label: "k"; shifted: "K"; } | ||
82 | 59 | CharKey { label: "l"; shifted: "L"; } | ||
83 | 60 | CharKey { label: "ü"; shifted: "Ü"; } | ||
84 | 61 | } | ||
85 | 62 | |||
86 | 63 | Row { | ||
87 | 64 | anchors.horizontalCenter: parent.horizontalCenter; | ||
88 | 65 | spacing: 0 | ||
89 | 66 | |||
90 | 67 | ShiftKey { padding: 0 } | ||
91 | 68 | CharKey { label: "y"; shifted: "Y"; extended: ["¥"]; extendedShifted: ["¥"] } | ||
92 | 69 | CharKey { label: "x"; shifted: "X"; } | ||
93 | 70 | CharKey { label: "c"; shifted: "C"; extended: ["ç"]; extendedShifted: ["Ç"] } | ||
94 | 71 | CharKey { label: "v"; shifted: "V"; } | ||
95 | 72 | CharKey { label: "b"; shifted: "B"; } | ||
96 | 73 | CharKey { label: "n"; shifted: "N"; extended: ["ñ"]; extendedShifted: ["Ñ"] } | ||
97 | 74 | CharKey { label: "m"; shifted: "M"; } | ||
98 | 75 | CharKey { label: "ä"; shifted: "Ä"; } | ||
99 | 76 | BackspaceKey { padding: 0 } | ||
100 | 77 | } | ||
101 | 78 | |||
102 | 79 | Item { | ||
103 | 80 | anchors.left: parent.left | ||
104 | 81 | anchors.right: parent.right | ||
105 | 82 | |||
106 | 83 | height: panel.keyHeight; | ||
107 | 84 | |||
108 | 85 | SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; } | ||
109 | 86 | CharKey { id: commaKey; label: ","; shifted: "/"; anchors.left: symShiftKey.right; } | ||
110 | 87 | SpaceKey { id: spaceKey; anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true } | ||
111 | 88 | CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: umlaut.left; } | ||
112 | 89 | CharKey { id: umlaut; label: "ö"; shifted: "Ö"; anchors.right: enterKey.left; } | ||
113 | 90 | ReturnKey { id: enterKey; anchors.right: parent.right } | ||
114 | 91 | } | ||
115 | 92 | } // column | ||
116 | 93 | } | ||
117 | 0 | 94 | ||
118 | === modified file 'qml/languages/Keyboard_en_us.qml' | |||
119 | --- qml/languages/Keyboard_en_us.qml 2013-10-08 08:14:25 +0000 | |||
120 | +++ qml/languages/Keyboard_en_us.qml 2013-10-10 09:57:10 +0000 | |||
121 | @@ -48,7 +48,7 @@ | |||
122 | 48 | anchors.horizontalCenter: parent.horizontalCenter; | 48 | anchors.horizontalCenter: parent.horizontalCenter; |
123 | 49 | spacing: 0 | 49 | spacing: 0 |
124 | 50 | 50 | ||
126 | 51 | CharKey { label: "a"; shifted: "A"; extended: ["ä","à","â","á","ã","å"]; extendedShifted: ["Ä","À","Â","Á","Ã","Å"] } | 51 | CharKey { label: "a"; shifted: "A"; extended: ["ä","à","â","ª","á","å", "æ"]; extendedShifted: ["Ä","À","Â","ª","Á","Å","Æ"] } |
127 | 52 | CharKey { label: "s"; shifted: "S"; extended: ["ß","$"]; extendedShifted: ["$"] } | 52 | CharKey { label: "s"; shifted: "S"; extended: ["ß","$"]; extendedShifted: ["$"] } |
128 | 53 | CharKey { label: "d"; shifted: "D"; extended: ["ð"]; extendedShifted: ["Ð"] } | 53 | CharKey { label: "d"; shifted: "D"; extended: ["ð"]; extendedShifted: ["Ð"] } |
129 | 54 | CharKey { label: "f"; shifted: "F"; } | 54 | CharKey { label: "f"; shifted: "F"; } |
130 | 55 | 55 | ||
131 | === added file 'qml/languages/Keyboard_es.qml' | |||
132 | --- qml/languages/Keyboard_es.qml 1970-01-01 00:00:00 +0000 | |||
133 | +++ qml/languages/Keyboard_es.qml 2013-10-10 09:57:10 +0000 | |||
134 | @@ -0,0 +1,91 @@ | |||
135 | 1 | /* | ||
136 | 2 | * Copyright 2013 Canonical Ltd. | ||
137 | 3 | * | ||
138 | 4 | * This program is free software; you can redistribute it and/or modify | ||
139 | 5 | * it under the terms of the GNU Lesser General Public License as published by | ||
140 | 6 | * the Free Software Foundation; version 3. | ||
141 | 7 | * | ||
142 | 8 | * This program is distributed in the hope that it will be useful, | ||
143 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
144 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
145 | 11 | * GNU Lesser General Public License for more details. | ||
146 | 12 | * | ||
147 | 13 | * You should have received a copy of the GNU Lesser General Public License | ||
148 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
149 | 15 | */ | ||
150 | 16 | |||
151 | 17 | import QtQuick 2.0 | ||
152 | 18 | import "../keys" | ||
153 | 19 | |||
154 | 20 | KeyPad { | ||
155 | 21 | anchors.fill: parent | ||
156 | 22 | |||
157 | 23 | content: c1 | ||
158 | 24 | symbols: "languages/Keyboard_symbols.qml" | ||
159 | 25 | |||
160 | 26 | Column { | ||
161 | 27 | id: c1 | ||
162 | 28 | anchors.fill: parent | ||
163 | 29 | spacing: 0 | ||
164 | 30 | |||
165 | 31 | Row { | ||
166 | 32 | anchors.horizontalCenter: parent.horizontalCenter; | ||
167 | 33 | spacing: 0 | ||
168 | 34 | |||
169 | 35 | CharKey { label: "q"; shifted: "Q"; } | ||
170 | 36 | CharKey { label: "w"; shifted: "W"; } | ||
171 | 37 | CharKey { label: "e"; shifted: "E"; extended: ["è", "é", "ê", "ë", "€"]; extendedShifted: ["È","É", "Ê", "Ë", "€"] } | ||
172 | 38 | CharKey { label: "r"; shifted: "R"; } | ||
173 | 39 | CharKey { label: "t"; shifted: "T"; extended: ["þ"]; extendedShifted: ["Þ"] } | ||
174 | 40 | CharKey { label: "y"; shifted: "Y"; extended: ["ý", "¥", "ÿ"]; extendedShifted: ["Ý", "¥", "Ÿ"] } | ||
175 | 41 | CharKey { label: "u"; shifted: "U"; extended: ["û","ù","ú","ü"]; extendedShifted: ["Û","Ù","Ú","Ü"] } | ||
176 | 42 | CharKey { label: "i"; shifted: "I"; extended: ["î","ï","ì","í"]; extendedShifted: ["Î","Ï","Ì","Í"] } | ||
177 | 43 | CharKey { label: "o"; shifted: "O"; extended: ["ö","ô","ò","ó", "º","õ"]; extendedShifted: ["Ö","Ô","Ò","Ó", "º","Õ"] } | ||
178 | 44 | CharKey { label: "p"; shifted: "P"; } | ||
179 | 45 | } | ||
180 | 46 | |||
181 | 47 | Row { | ||
182 | 48 | anchors.horizontalCenter: parent.horizontalCenter; | ||
183 | 49 | spacing: 0 | ||
184 | 50 | |||
185 | 51 | CharKey { label: "a"; shifted: "A"; extended: ["ä","à","â","á","ã","å","ª","æ"]; extendedShifted: ["Ä","À","Â","Á","Ã","Å","ª","Æ"] } | ||
186 | 52 | CharKey { label: "s"; shifted: "S"; extended: ["ß","$"]; extendedShifted: ["$"] } | ||
187 | 53 | CharKey { label: "d"; shifted: "D"; extended: ["ð"]; extendedShifted: ["Ð"] } | ||
188 | 54 | CharKey { label: "f"; shifted: "F"; } | ||
189 | 55 | CharKey { label: "g"; shifted: "G"; } | ||
190 | 56 | CharKey { label: "h"; shifted: "H"; } | ||
191 | 57 | CharKey { label: "j"; shifted: "J"; } | ||
192 | 58 | CharKey { label: "k"; shifted: "K"; } | ||
193 | 59 | CharKey { label: "l"; shifted: "L"; } | ||
194 | 60 | CharKey { label: "ñ"; shifted: "Ñ"; } | ||
195 | 61 | } | ||
196 | 62 | |||
197 | 63 | Row { | ||
198 | 64 | anchors.horizontalCenter: parent.horizontalCenter; | ||
199 | 65 | spacing: 0 | ||
200 | 66 | |||
201 | 67 | ShiftKey {} | ||
202 | 68 | CharKey { label: "z"; shifted: "Z"; } | ||
203 | 69 | CharKey { label: "x"; shifted: "X"; } | ||
204 | 70 | CharKey { label: "c"; shifted: "C"; extended: ["ç"]; extendedShifted: ["Ç"] } | ||
205 | 71 | CharKey { label: "v"; shifted: "V"; } | ||
206 | 72 | CharKey { label: "b"; shifted: "B"; } | ||
207 | 73 | CharKey { label: "n"; shifted: "N"; extended: ["ñ"]; extendedShifted: ["Ñ"] } | ||
208 | 74 | CharKey { label: "m"; shifted: "M"; } | ||
209 | 75 | BackspaceKey {} | ||
210 | 76 | } | ||
211 | 77 | |||
212 | 78 | Item { | ||
213 | 79 | anchors.left: parent.left | ||
214 | 80 | anchors.right: parent.right | ||
215 | 81 | |||
216 | 82 | height: panel.keyHeight; | ||
217 | 83 | |||
218 | 84 | SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; } | ||
219 | 85 | CharKey { id: commaKey; label: ","; shifted: "/"; anchors.left: symShiftKey.right; } | ||
220 | 86 | SpaceKey { id: spaceKey; anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true } | ||
221 | 87 | CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; } | ||
222 | 88 | ReturnKey { id: enterKey; anchors.right: parent.right } | ||
223 | 89 | } | ||
224 | 90 | } // column | ||
225 | 91 | } | ||
226 | 0 | 92 | ||
227 | === added file 'qml/languages/Keyboard_fr.qml' | |||
228 | --- qml/languages/Keyboard_fr.qml 1970-01-01 00:00:00 +0000 | |||
229 | +++ qml/languages/Keyboard_fr.qml 2013-10-10 09:57:10 +0000 | |||
230 | @@ -0,0 +1,91 @@ | |||
231 | 1 | /* | ||
232 | 2 | * Copyright 2013 Canonical Ltd. | ||
233 | 3 | * | ||
234 | 4 | * This program is free software; you can redistribute it and/or modify | ||
235 | 5 | * it under the terms of the GNU Lesser General Public License as published by | ||
236 | 6 | * the Free Software Foundation; version 3. | ||
237 | 7 | * | ||
238 | 8 | * This program is distributed in the hope that it will be useful, | ||
239 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
240 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
241 | 11 | * GNU Lesser General Public License for more details. | ||
242 | 12 | * | ||
243 | 13 | * You should have received a copy of the GNU Lesser General Public License | ||
244 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
245 | 15 | */ | ||
246 | 16 | |||
247 | 17 | import QtQuick 2.0 | ||
248 | 18 | import "../keys" | ||
249 | 19 | |||
250 | 20 | KeyPad { | ||
251 | 21 | anchors.fill: parent | ||
252 | 22 | |||
253 | 23 | content: c1 | ||
254 | 24 | symbols: "languages/Keyboard_symbols.qml" | ||
255 | 25 | |||
256 | 26 | Column { | ||
257 | 27 | id: c1 | ||
258 | 28 | anchors.fill: parent | ||
259 | 29 | spacing: 0 | ||
260 | 30 | |||
261 | 31 | Row { | ||
262 | 32 | anchors.horizontalCenter: parent.horizontalCenter; | ||
263 | 33 | spacing: 0 | ||
264 | 34 | |||
265 | 35 | CharKey { label: "a"; shifted: "A"; extended: ["à","â","æ","á","ã","ä"]; extendedShifted: ["À","Â","Æ","Á","Ã","Ä"] } | ||
266 | 36 | CharKey { label: "z"; shifted: "Z"; } | ||
267 | 37 | CharKey { label: "e"; shifted: "E"; extended: ["è","é","ë","ê","€"]; extendedShifted: ["È","É","Ë","Ê","€"] } | ||
268 | 38 | CharKey { label: "r"; shifted: "R"; } | ||
269 | 39 | CharKey { label: "t"; shifted: "T"; } | ||
270 | 40 | CharKey { label: "y"; shifted: "Y"; extended: ["ÿ","¥"]; extendedShifted: ["Ÿ","¥"] } | ||
271 | 41 | CharKey { label: "u"; shifted: "U"; extended: ["û","ù","ú","ü"]; extendedShifted: ["Û","Ù","Ú","Ü"] } | ||
272 | 42 | CharKey { label: "i"; shifted: "I"; extended: ["î","ï","ì","í"]; extendedShifted: ["Î","Ï","Ì","Í"] } | ||
273 | 43 | CharKey { label: "o"; shifted: "O"; extended: ["ô","œ","ò","ó","õ"]; extendedShifted: ["Ô","Œ","Ò","Ó","Õ"] } | ||
274 | 44 | CharKey { label: "p"; shifted: "P"; } | ||
275 | 45 | } | ||
276 | 46 | |||
277 | 47 | Row { | ||
278 | 48 | anchors.horizontalCenter: parent.horizontalCenter; | ||
279 | 49 | spacing: 0 | ||
280 | 50 | CharKey { label: "q"; shifted: "Q"; } | ||
281 | 51 | CharKey { label: "s"; shifted: "S"; extended: ["ß","$"]; extendedShifted: ["$"] } | ||
282 | 52 | CharKey { label: "d"; shifted: "D"; extended: ["ð"]; extendedShifted: ["Ð"] } | ||
283 | 53 | CharKey { label: "f"; shifted: "F"; } | ||
284 | 54 | CharKey { label: "g"; shifted: "G"; } | ||
285 | 55 | CharKey { label: "h"; shifted: "H"; } | ||
286 | 56 | CharKey { label: "j"; shifted: "J"; } | ||
287 | 57 | CharKey { label: "k"; shifted: "K"; } | ||
288 | 58 | CharKey { label: "l"; shifted: "L"; } | ||
289 | 59 | CharKey { label: "m"; shifted: "M"; } | ||
290 | 60 | } | ||
291 | 61 | |||
292 | 62 | Row { | ||
293 | 63 | anchors.horizontalCenter: parent.horizontalCenter; | ||
294 | 64 | spacing: 0 | ||
295 | 65 | |||
296 | 66 | ShiftKey {} | ||
297 | 67 | |||
298 | 68 | CharKey { label: "w"; shifted: "W"; } | ||
299 | 69 | CharKey { label: "x"; shifted: "X"; } | ||
300 | 70 | CharKey { label: "c"; shifted: "C"; extended: ["ç"]; extendedShifted: ["Ç"] } | ||
301 | 71 | CharKey { label: "v"; shifted: "V"; } | ||
302 | 72 | CharKey { label: "b"; shifted: "B"; } | ||
303 | 73 | CharKey { label: "n"; shifted: "N"; extended: ["ñ"]; extendedShifted: ["Ñ"] } | ||
304 | 74 | CharKey { label: "ç"; shifted: "Ç"; } | ||
305 | 75 | BackspaceKey {} | ||
306 | 76 | } | ||
307 | 77 | |||
308 | 78 | Item { | ||
309 | 79 | anchors.left: parent.left | ||
310 | 80 | anchors.right: parent.right | ||
311 | 81 | |||
312 | 82 | height: panel.keyHeight; | ||
313 | 83 | |||
314 | 84 | SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; } | ||
315 | 85 | CharKey { id: commaKey; label: "'"; shifted: "/"; anchors.left: symShiftKey.right; } | ||
316 | 86 | SpaceKey { id: spaceKey; anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true } | ||
317 | 87 | CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; } | ||
318 | 88 | ReturnKey { id: enterKey; anchors.right: parent.right } | ||
319 | 89 | } | ||
320 | 90 | } // column | ||
321 | 91 | } | ||
322 | 0 | 92 | ||
323 | === added file 'qml/languages/Keyboard_pt.qml' | |||
324 | --- qml/languages/Keyboard_pt.qml 1970-01-01 00:00:00 +0000 | |||
325 | +++ qml/languages/Keyboard_pt.qml 2013-10-10 09:57:10 +0000 | |||
326 | @@ -0,0 +1,91 @@ | |||
327 | 1 | /* | ||
328 | 2 | * Copyright 2013 Canonical Ltd. | ||
329 | 3 | * | ||
330 | 4 | * This program is free software; you can redistribute it and/or modify | ||
331 | 5 | * it under the terms of the GNU Lesser General Public License as published by | ||
332 | 6 | * the Free Software Foundation; version 3. | ||
333 | 7 | * | ||
334 | 8 | * This program is distributed in the hope that it will be useful, | ||
335 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
336 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
337 | 11 | * GNU Lesser General Public License for more details. | ||
338 | 12 | * | ||
339 | 13 | * You should have received a copy of the GNU Lesser General Public License | ||
340 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
341 | 15 | */ | ||
342 | 16 | |||
343 | 17 | import QtQuick 2.0 | ||
344 | 18 | import "../keys" | ||
345 | 19 | |||
346 | 20 | KeyPad { | ||
347 | 21 | anchors.fill: parent | ||
348 | 22 | |||
349 | 23 | content: c1 | ||
350 | 24 | symbols: "languages/Keyboard_symbols.qml" | ||
351 | 25 | |||
352 | 26 | Column { | ||
353 | 27 | id: c1 | ||
354 | 28 | anchors.fill: parent | ||
355 | 29 | spacing: 0 | ||
356 | 30 | |||
357 | 31 | Row { | ||
358 | 32 | anchors.horizontalCenter: parent.horizontalCenter; | ||
359 | 33 | spacing: 0 | ||
360 | 34 | |||
361 | 35 | CharKey { label: "q"; shifted: "Q"; } | ||
362 | 36 | CharKey { label: "w"; shifted: "W"; } | ||
363 | 37 | CharKey { label: "e"; shifted: "E"; extended: ["é","ê","è","ë","€"]; extendedShifted: ["É","Ê","È","Ë","€"] } | ||
364 | 38 | CharKey { label: "r"; shifted: "R"; } | ||
365 | 39 | CharKey { label: "t"; shifted: "T"; extended: ["þ"]; extendedShifted: ["Þ"] } | ||
366 | 40 | CharKey { label: "y"; shifted: "Y"; extended: ["ý", "¥", "ÿ"]; extendedShifted: ["Ý", "¥", "Ÿ"] } | ||
367 | 41 | CharKey { label: "u"; shifted: "U"; extended: ["ú","û","ù","ü"]; extendedShifted: ["Ú","Û","Ù","Ü"] } | ||
368 | 42 | CharKey { label: "i"; shifted: "I"; extended: ["í","î","ì","ï"]; extendedShifted: ["Í","Î","Ì","Ï"] } | ||
369 | 43 | CharKey { label: "o"; shifted: "O"; extended: ["ó","õ","ô","º","ò","ö"]; extendedShifted: ["Ó","Õ","Ô","º","Ò","Ö"] } | ||
370 | 44 | CharKey { label: "p"; shifted: "P"; } | ||
371 | 45 | } | ||
372 | 46 | |||
373 | 47 | Row { | ||
374 | 48 | anchors.horizontalCenter: parent.horizontalCenter; | ||
375 | 49 | spacing: 0 | ||
376 | 50 | |||
377 | 51 | CharKey { label: "a"; shifted: "A"; extended: ["ã","á","à","â","ª","ä","å","æ"]; extendedShifted: ["Ã","Á","À","Â","ª","Ä","Å","Æ"] } | ||
378 | 52 | CharKey { label: "s"; shifted: "S"; extended: ["ß","$"]; extendedShifted: ["$"] } | ||
379 | 53 | CharKey { label: "d"; shifted: "D"; extended: ["ð"]; extendedShifted: ["Ð"] } | ||
380 | 54 | CharKey { label: "f"; shifted: "F"; } | ||
381 | 55 | CharKey { label: "g"; shifted: "G"; } | ||
382 | 56 | CharKey { label: "h"; shifted: "H"; } | ||
383 | 57 | CharKey { label: "j"; shifted: "J"; } | ||
384 | 58 | CharKey { label: "k"; shifted: "K"; } | ||
385 | 59 | CharKey { label: "l"; shifted: "L"; } | ||
386 | 60 | CharKey { label: "ç"; shifted: "Ç"; } | ||
387 | 61 | } | ||
388 | 62 | |||
389 | 63 | Row { | ||
390 | 64 | anchors.horizontalCenter: parent.horizontalCenter; | ||
391 | 65 | spacing: 0 | ||
392 | 66 | |||
393 | 67 | ShiftKey {} | ||
394 | 68 | CharKey { label: "z"; shifted: "Z"; } | ||
395 | 69 | CharKey { label: "x"; shifted: "X"; } | ||
396 | 70 | CharKey { label: "c"; shifted: "C"; extended: ["ç"]; extendedShifted: ["Ç"] } | ||
397 | 71 | CharKey { label: "v"; shifted: "V"; } | ||
398 | 72 | CharKey { label: "b"; shifted: "B"; } | ||
399 | 73 | CharKey { label: "n"; shifted: "N"; extended: ["ñ"]; extendedShifted: ["Ñ"] } | ||
400 | 74 | CharKey { label: "m"; shifted: "M"; } | ||
401 | 75 | BackspaceKey {} | ||
402 | 76 | } | ||
403 | 77 | |||
404 | 78 | Item { | ||
405 | 79 | anchors.left: parent.left | ||
406 | 80 | anchors.right: parent.right | ||
407 | 81 | |||
408 | 82 | height: panel.keyHeight; | ||
409 | 83 | |||
410 | 84 | SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; } | ||
411 | 85 | CharKey { id: commaKey; label: ","; shifted: "/"; anchors.left: symShiftKey.right; } | ||
412 | 86 | SpaceKey { id: spaceKey; anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true } | ||
413 | 87 | CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; } | ||
414 | 88 | ReturnKey { id: enterKey; anchors.right: parent.right } | ||
415 | 89 | } | ||
416 | 90 | } // column | ||
417 | 91 | } | ||
418 | 0 | 92 | ||
419 | === modified file 'qml/qml.pro' | |||
420 | --- qml/qml.pro 2013-10-08 10:36:32 +0000 | |||
421 | +++ qml/qml.pro 2013-10-10 09:57:10 +0000 | |||
422 | @@ -51,3 +51,7 @@ | |||
423 | 51 | languages/Keyboard_symbols.qml \ | 51 | languages/Keyboard_symbols.qml \ |
424 | 52 | languages/Keyboard_telephone.qml \ | 52 | languages/Keyboard_telephone.qml \ |
425 | 53 | languages/Keyboard_zh_cn_pinyin.qml \ | 53 | languages/Keyboard_zh_cn_pinyin.qml \ |
426 | 54 | languages/Keyboard_es.qml \ | ||
427 | 55 | languages/Keyboard_pt.qml \ | ||
428 | 56 | languages/Keyboard_de.qml \ | ||
429 | 57 | languages/Keyboard_fr.qml |
PASSED: Continuous integration, rev:71 jenkins. qa.ubuntu. com/job/ ubuntu- keyboard- ci/146/ jenkins. qa.ubuntu. com/job/ ubuntu- keyboard- saucy-amd64- ci/147 jenkins. qa.ubuntu. com/job/ ubuntu- keyboard- saucy-armhf- ci/146 jenkins. qa.ubuntu. com/job/ ubuntu- keyboard- saucy-armhf- ci/146/ artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ ubuntu- keyboard- saucy-i386- ci/146
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: 10.97.0. 26:8080/ job/ubuntu- keyboard- ci/146/ rebuild
http://