Merge lp:~thomas-moenicke/ubuntu-keyboard/ubuntu-keyboard-language-layouts into lp:ubuntu-keyboard

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
Reviewer Review Type Date Requested Status
Günter Schwann (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+190325@code.launchpad.net

Commit message

more languages

Description of the change

more languages

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Günter Schwann (schwann) wrote :

looks good

review: Approve

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

Subscribers

People subscribed via source and target branches