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
=== modified file 'qml/KeyboardContainer.qml'
--- qml/KeyboardContainer.qml 2013-10-08 14:05:09 +0000
+++ qml/KeyboardContainer.qml 2013-10-10 09:57:10 +0000
@@ -45,6 +45,14 @@
45 characterKeypadSource = "languages/Keyboard_en_url_search.qml";45 characterKeypadSource = "languages/Keyboard_en_url_search.qml";
46 if (layoutId === "en_us")46 if (layoutId === "en_us")
47 characterKeypadSource = "languages/Keyboard_en_us.qml";47 characterKeypadSource = "languages/Keyboard_en_us.qml";
48 if (layoutId === "es")
49 characterKeypadSource = "languages/Keyboard_es.qml";
50 if (layoutId === "pt")
51 characterKeypadSource = "languages/Keyboard_pt.qml";
52 if (layoutId === "de")
53 characterKeypadSource = "languages/Keyboard_de.qml";
54 if (layoutId === "fr")
55 characterKeypadSource = "languages/Keyboard_fr.qml";
48 if (layoutId === "zh_cn_pinyin")56 if (layoutId === "zh_cn_pinyin")
49 characterKeypadSource = "languages/Keyboard_zh_cn_pinyin.qml";57 characterKeypadSource = "languages/Keyboard_zh_cn_pinyin.qml";
50 }58 }
5159
=== added file 'qml/languages/Keyboard_de.qml'
--- qml/languages/Keyboard_de.qml 1970-01-01 00:00:00 +0000
+++ qml/languages/Keyboard_de.qml 2013-10-10 09:57:10 +0000
@@ -0,0 +1,93 @@
1/*
2 * Copyright 2013 Canonical Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU Lesser General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU Lesser General Public License for more details.
12 *
13 * You should have received a copy of the GNU Lesser General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17import QtQuick 2.0
18import "../keys"
19
20KeyPad {
21 anchors.fill: parent
22
23 content: c1
24 symbols: "languages/Keyboard_symbols.qml"
25
26 Column {
27 id: c1
28 anchors.fill: parent
29 spacing: 0
30
31 Row {
32 anchors.horizontalCenter: parent.horizontalCenter;
33 spacing: 0
34
35 CharKey { label: "q"; shifted: "Q"; }
36 CharKey { label: "w"; shifted: "W"; }
37 CharKey { label: "e"; shifted: "E"; extended: ["è", "é", "ë", "ê", "€"]; extendedShifted: ["È","É", "Ë", "Ê", "€"] }
38 CharKey { label: "r"; shifted: "R"; }
39 CharKey { label: "t"; shifted: "T"; extended: ["þ"]; extendedShifted: ["Þ"] }
40 CharKey { label: "z"; shifted: "Z"; }
41 CharKey { label: "u"; shifted: "U"; extended: ["ü","ù","ú","û"]; extendedShifted: ["Ü","Ù","Ú","Û"] }
42 CharKey { label: "i"; shifted: "I"; extended: ["ì","í","î","ï","ı"]; extendedShifted: ["Ì","Í","Î","Ï","İ"] }
43 CharKey { label: "o"; shifted: "O"; extended: ["ö","ò","ó","ô","õ","ø"]; extendedShifted: ["Ö","Ò","Ó","Ô","Õ","Ø"] }
44 CharKey { label: "p"; shifted: "P"; }
45 }
46
47 Row {
48 anchors.horizontalCenter: parent.horizontalCenter;
49 spacing: 0
50
51 CharKey { label: "a"; shifted: "A"; extended: ["ä","à","á","ã","â","å","æ"]; extendedShifted: ["Ä","À","Â","Á","Ã","Å","Æ"] }
52 CharKey { label: "s"; shifted: "S"; extended: ["ß","$"]; extendedShifted: ["ş","$"] }
53 CharKey { label: "d"; shifted: "D"; }
54 CharKey { label: "f"; shifted: "F"; }
55 CharKey { label: "g"; shifted: "G"; extended: ["ğ"]; extendedShifted: ["Ğ"]; }
56 CharKey { label: "h"; shifted: "H"; }
57 CharKey { label: "j"; shifted: "J"; }
58 CharKey { label: "k"; shifted: "K"; }
59 CharKey { label: "l"; shifted: "L"; }
60 CharKey { label: "ü"; shifted: "Ü"; }
61 }
62
63 Row {
64 anchors.horizontalCenter: parent.horizontalCenter;
65 spacing: 0
66
67 ShiftKey { padding: 0 }
68 CharKey { label: "y"; shifted: "Y"; extended: ["¥"]; extendedShifted: ["¥"] }
69 CharKey { label: "x"; shifted: "X"; }
70 CharKey { label: "c"; shifted: "C"; extended: ["ç"]; extendedShifted: ["Ç"] }
71 CharKey { label: "v"; shifted: "V"; }
72 CharKey { label: "b"; shifted: "B"; }
73 CharKey { label: "n"; shifted: "N"; extended: ["ñ"]; extendedShifted: ["Ñ"] }
74 CharKey { label: "m"; shifted: "M"; }
75 CharKey { label: "ä"; shifted: "Ä"; }
76 BackspaceKey { padding: 0 }
77 }
78
79 Item {
80 anchors.left: parent.left
81 anchors.right: parent.right
82
83 height: panel.keyHeight;
84
85 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
86 CharKey { id: commaKey; label: ","; shifted: "/"; anchors.left: symShiftKey.right; }
87 SpaceKey { id: spaceKey; anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true }
88 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: umlaut.left; }
89 CharKey { id: umlaut; label: "ö"; shifted: "Ö"; anchors.right: enterKey.left; }
90 ReturnKey { id: enterKey; anchors.right: parent.right }
91 }
92 } // column
93}
094
=== modified file 'qml/languages/Keyboard_en_us.qml'
--- qml/languages/Keyboard_en_us.qml 2013-10-08 08:14:25 +0000
+++ qml/languages/Keyboard_en_us.qml 2013-10-10 09:57:10 +0000
@@ -48,7 +48,7 @@
48 anchors.horizontalCenter: parent.horizontalCenter;48 anchors.horizontalCenter: parent.horizontalCenter;
49 spacing: 049 spacing: 0
5050
51 CharKey { label: "a"; shifted: "A"; extended: ["ä","à","â","á","ã","å"]; extendedShifted: ["Ä","À","Â","Á","Ã","Å"] }51 CharKey { label: "a"; shifted: "A"; extended: ["ä","à","â","ª","á","å", "æ"]; extendedShifted: ["Ä","À","Â","ª","Á","Å","Æ"] }
52 CharKey { label: "s"; shifted: "S"; extended: ["ß","$"]; extendedShifted: ["$"] }52 CharKey { label: "s"; shifted: "S"; extended: ["ß","$"]; extendedShifted: ["$"] }
53 CharKey { label: "d"; shifted: "D"; extended: ["ð"]; extendedShifted: ["Ð"] }53 CharKey { label: "d"; shifted: "D"; extended: ["ð"]; extendedShifted: ["Ð"] }
54 CharKey { label: "f"; shifted: "F"; }54 CharKey { label: "f"; shifted: "F"; }
5555
=== added file 'qml/languages/Keyboard_es.qml'
--- qml/languages/Keyboard_es.qml 1970-01-01 00:00:00 +0000
+++ qml/languages/Keyboard_es.qml 2013-10-10 09:57:10 +0000
@@ -0,0 +1,91 @@
1/*
2 * Copyright 2013 Canonical Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU Lesser General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU Lesser General Public License for more details.
12 *
13 * You should have received a copy of the GNU Lesser General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17import QtQuick 2.0
18import "../keys"
19
20KeyPad {
21 anchors.fill: parent
22
23 content: c1
24 symbols: "languages/Keyboard_symbols.qml"
25
26 Column {
27 id: c1
28 anchors.fill: parent
29 spacing: 0
30
31 Row {
32 anchors.horizontalCenter: parent.horizontalCenter;
33 spacing: 0
34
35 CharKey { label: "q"; shifted: "Q"; }
36 CharKey { label: "w"; shifted: "W"; }
37 CharKey { label: "e"; shifted: "E"; extended: ["è", "é", "ê", "ë", "€"]; extendedShifted: ["È","É", "Ê", "Ë", "€"] }
38 CharKey { label: "r"; shifted: "R"; }
39 CharKey { label: "t"; shifted: "T"; extended: ["þ"]; extendedShifted: ["Þ"] }
40 CharKey { label: "y"; shifted: "Y"; extended: ["ý", "¥", "ÿ"]; extendedShifted: ["Ý", "¥", "Ÿ"] }
41 CharKey { label: "u"; shifted: "U"; extended: ["û","ù","ú","ü"]; extendedShifted: ["Û","Ù","Ú","Ü"] }
42 CharKey { label: "i"; shifted: "I"; extended: ["î","ï","ì","í"]; extendedShifted: ["Î","Ï","Ì","Í"] }
43 CharKey { label: "o"; shifted: "O"; extended: ["ö","ô","ò","ó", "º","õ"]; extendedShifted: ["Ö","Ô","Ò","Ó", "º","Õ"] }
44 CharKey { label: "p"; shifted: "P"; }
45 }
46
47 Row {
48 anchors.horizontalCenter: parent.horizontalCenter;
49 spacing: 0
50
51 CharKey { label: "a"; shifted: "A"; extended: ["ä","à","â","á","ã","å","ª","æ"]; extendedShifted: ["Ä","À","Â","Á","Ã","Å","ª","Æ"] }
52 CharKey { label: "s"; shifted: "S"; extended: ["ß","$"]; extendedShifted: ["$"] }
53 CharKey { label: "d"; shifted: "D"; extended: ["ð"]; extendedShifted: ["Ð"] }
54 CharKey { label: "f"; shifted: "F"; }
55 CharKey { label: "g"; shifted: "G"; }
56 CharKey { label: "h"; shifted: "H"; }
57 CharKey { label: "j"; shifted: "J"; }
58 CharKey { label: "k"; shifted: "K"; }
59 CharKey { label: "l"; shifted: "L"; }
60 CharKey { label: "ñ"; shifted: "Ñ"; }
61 }
62
63 Row {
64 anchors.horizontalCenter: parent.horizontalCenter;
65 spacing: 0
66
67 ShiftKey {}
68 CharKey { label: "z"; shifted: "Z"; }
69 CharKey { label: "x"; shifted: "X"; }
70 CharKey { label: "c"; shifted: "C"; extended: ["ç"]; extendedShifted: ["Ç"] }
71 CharKey { label: "v"; shifted: "V"; }
72 CharKey { label: "b"; shifted: "B"; }
73 CharKey { label: "n"; shifted: "N"; extended: ["ñ"]; extendedShifted: ["Ñ"] }
74 CharKey { label: "m"; shifted: "M"; }
75 BackspaceKey {}
76 }
77
78 Item {
79 anchors.left: parent.left
80 anchors.right: parent.right
81
82 height: panel.keyHeight;
83
84 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
85 CharKey { id: commaKey; label: ","; shifted: "/"; anchors.left: symShiftKey.right; }
86 SpaceKey { id: spaceKey; anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true }
87 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
88 ReturnKey { id: enterKey; anchors.right: parent.right }
89 }
90 } // column
91}
092
=== added file 'qml/languages/Keyboard_fr.qml'
--- qml/languages/Keyboard_fr.qml 1970-01-01 00:00:00 +0000
+++ qml/languages/Keyboard_fr.qml 2013-10-10 09:57:10 +0000
@@ -0,0 +1,91 @@
1/*
2 * Copyright 2013 Canonical Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU Lesser General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU Lesser General Public License for more details.
12 *
13 * You should have received a copy of the GNU Lesser General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17import QtQuick 2.0
18import "../keys"
19
20KeyPad {
21 anchors.fill: parent
22
23 content: c1
24 symbols: "languages/Keyboard_symbols.qml"
25
26 Column {
27 id: c1
28 anchors.fill: parent
29 spacing: 0
30
31 Row {
32 anchors.horizontalCenter: parent.horizontalCenter;
33 spacing: 0
34
35 CharKey { label: "a"; shifted: "A"; extended: ["à","â","æ","á","ã","ä"]; extendedShifted: ["À","Â","Æ","Á","Ã","Ä"] }
36 CharKey { label: "z"; shifted: "Z"; }
37 CharKey { label: "e"; shifted: "E"; extended: ["è","é","ë","ê","€"]; extendedShifted: ["È","É","Ë","Ê","€"] }
38 CharKey { label: "r"; shifted: "R"; }
39 CharKey { label: "t"; shifted: "T"; }
40 CharKey { label: "y"; shifted: "Y"; extended: ["ÿ","¥"]; extendedShifted: ["Ÿ","¥"] }
41 CharKey { label: "u"; shifted: "U"; extended: ["û","ù","ú","ü"]; extendedShifted: ["Û","Ù","Ú","Ü"] }
42 CharKey { label: "i"; shifted: "I"; extended: ["î","ï","ì","í"]; extendedShifted: ["Î","Ï","Ì","Í"] }
43 CharKey { label: "o"; shifted: "O"; extended: ["ô","œ","ò","ó","õ"]; extendedShifted: ["Ô","Œ","Ò","Ó","Õ"] }
44 CharKey { label: "p"; shifted: "P"; }
45 }
46
47 Row {
48 anchors.horizontalCenter: parent.horizontalCenter;
49 spacing: 0
50 CharKey { label: "q"; shifted: "Q"; }
51 CharKey { label: "s"; shifted: "S"; extended: ["ß","$"]; extendedShifted: ["$"] }
52 CharKey { label: "d"; shifted: "D"; extended: ["ð"]; extendedShifted: ["Ð"] }
53 CharKey { label: "f"; shifted: "F"; }
54 CharKey { label: "g"; shifted: "G"; }
55 CharKey { label: "h"; shifted: "H"; }
56 CharKey { label: "j"; shifted: "J"; }
57 CharKey { label: "k"; shifted: "K"; }
58 CharKey { label: "l"; shifted: "L"; }
59 CharKey { label: "m"; shifted: "M"; }
60 }
61
62 Row {
63 anchors.horizontalCenter: parent.horizontalCenter;
64 spacing: 0
65
66 ShiftKey {}
67
68 CharKey { label: "w"; shifted: "W"; }
69 CharKey { label: "x"; shifted: "X"; }
70 CharKey { label: "c"; shifted: "C"; extended: ["ç"]; extendedShifted: ["Ç"] }
71 CharKey { label: "v"; shifted: "V"; }
72 CharKey { label: "b"; shifted: "B"; }
73 CharKey { label: "n"; shifted: "N"; extended: ["ñ"]; extendedShifted: ["Ñ"] }
74 CharKey { label: "ç"; shifted: "Ç"; }
75 BackspaceKey {}
76 }
77
78 Item {
79 anchors.left: parent.left
80 anchors.right: parent.right
81
82 height: panel.keyHeight;
83
84 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
85 CharKey { id: commaKey; label: "'"; shifted: "/"; anchors.left: symShiftKey.right; }
86 SpaceKey { id: spaceKey; anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true }
87 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
88 ReturnKey { id: enterKey; anchors.right: parent.right }
89 }
90 } // column
91}
092
=== added file 'qml/languages/Keyboard_pt.qml'
--- qml/languages/Keyboard_pt.qml 1970-01-01 00:00:00 +0000
+++ qml/languages/Keyboard_pt.qml 2013-10-10 09:57:10 +0000
@@ -0,0 +1,91 @@
1/*
2 * Copyright 2013 Canonical Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU Lesser General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU Lesser General Public License for more details.
12 *
13 * You should have received a copy of the GNU Lesser General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17import QtQuick 2.0
18import "../keys"
19
20KeyPad {
21 anchors.fill: parent
22
23 content: c1
24 symbols: "languages/Keyboard_symbols.qml"
25
26 Column {
27 id: c1
28 anchors.fill: parent
29 spacing: 0
30
31 Row {
32 anchors.horizontalCenter: parent.horizontalCenter;
33 spacing: 0
34
35 CharKey { label: "q"; shifted: "Q"; }
36 CharKey { label: "w"; shifted: "W"; }
37 CharKey { label: "e"; shifted: "E"; extended: ["é","ê","è","ë","€"]; extendedShifted: ["É","Ê","È","Ë","€"] }
38 CharKey { label: "r"; shifted: "R"; }
39 CharKey { label: "t"; shifted: "T"; extended: ["þ"]; extendedShifted: ["Þ"] }
40 CharKey { label: "y"; shifted: "Y"; extended: ["ý", "¥", "ÿ"]; extendedShifted: ["Ý", "¥", "Ÿ"] }
41 CharKey { label: "u"; shifted: "U"; extended: ["ú","û","ù","ü"]; extendedShifted: ["Ú","Û","Ù","Ü"] }
42 CharKey { label: "i"; shifted: "I"; extended: ["í","î","ì","ï"]; extendedShifted: ["Í","Î","Ì","Ï"] }
43 CharKey { label: "o"; shifted: "O"; extended: ["ó","õ","ô","º","ò","ö"]; extendedShifted: ["Ó","Õ","Ô","º","Ò","Ö"] }
44 CharKey { label: "p"; shifted: "P"; }
45 }
46
47 Row {
48 anchors.horizontalCenter: parent.horizontalCenter;
49 spacing: 0
50
51 CharKey { label: "a"; shifted: "A"; extended: ["ã","á","à","â","ª","ä","å","æ"]; extendedShifted: ["Ã","Á","À","Â","ª","Ä","Å","Æ"] }
52 CharKey { label: "s"; shifted: "S"; extended: ["ß","$"]; extendedShifted: ["$"] }
53 CharKey { label: "d"; shifted: "D"; extended: ["ð"]; extendedShifted: ["Ð"] }
54 CharKey { label: "f"; shifted: "F"; }
55 CharKey { label: "g"; shifted: "G"; }
56 CharKey { label: "h"; shifted: "H"; }
57 CharKey { label: "j"; shifted: "J"; }
58 CharKey { label: "k"; shifted: "K"; }
59 CharKey { label: "l"; shifted: "L"; }
60 CharKey { label: "ç"; shifted: "Ç"; }
61 }
62
63 Row {
64 anchors.horizontalCenter: parent.horizontalCenter;
65 spacing: 0
66
67 ShiftKey {}
68 CharKey { label: "z"; shifted: "Z"; }
69 CharKey { label: "x"; shifted: "X"; }
70 CharKey { label: "c"; shifted: "C"; extended: ["ç"]; extendedShifted: ["Ç"] }
71 CharKey { label: "v"; shifted: "V"; }
72 CharKey { label: "b"; shifted: "B"; }
73 CharKey { label: "n"; shifted: "N"; extended: ["ñ"]; extendedShifted: ["Ñ"] }
74 CharKey { label: "m"; shifted: "M"; }
75 BackspaceKey {}
76 }
77
78 Item {
79 anchors.left: parent.left
80 anchors.right: parent.right
81
82 height: panel.keyHeight;
83
84 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
85 CharKey { id: commaKey; label: ","; shifted: "/"; anchors.left: symShiftKey.right; }
86 SpaceKey { id: spaceKey; anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true }
87 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
88 ReturnKey { id: enterKey; anchors.right: parent.right }
89 }
90 } // column
91}
092
=== modified file 'qml/qml.pro'
--- qml/qml.pro 2013-10-08 10:36:32 +0000
+++ qml/qml.pro 2013-10-10 09:57:10 +0000
@@ -51,3 +51,7 @@
51 languages/Keyboard_symbols.qml \51 languages/Keyboard_symbols.qml \
52 languages/Keyboard_telephone.qml \52 languages/Keyboard_telephone.qml \
53 languages/Keyboard_zh_cn_pinyin.qml \53 languages/Keyboard_zh_cn_pinyin.qml \
54 languages/Keyboard_es.qml \
55 languages/Keyboard_pt.qml \
56 languages/Keyboard_de.qml \
57 languages/Keyboard_fr.qml

Subscribers

People subscribed via source and target branches