Merge lp:~michael-sheldon/ubuntu-keyboard/fix-croatian into lp:ubuntu-keyboard
- fix-croatian
- Merge into trunk
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | Bill Filler | ||||||||
Approved revision: | 459 | ||||||||
Merged at revision: | 460 | ||||||||
Proposed branch: | lp:~michael-sheldon/ubuntu-keyboard/fix-croatian | ||||||||
Merge into: | lp:ubuntu-keyboard | ||||||||
Diff against target: |
216 lines (+45/-45) 4 files modified
plugins/hr/qml/Keyboard_hr.qml (+11/-11) plugins/hr/qml/Keyboard_hr_email.qml (+12/-12) plugins/hr/qml/Keyboard_hr_url.qml (+11/-11) plugins/hr/qml/Keyboard_hr_url_search.qml (+11/-11) |
||||||||
To merge this branch: | bzr merge lp:~michael-sheldon/ubuntu-keyboard/fix-croatian | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Approve | |
Ubuntu Phablet Team | Pending | ||
Review via email: mp+292374@code.launchpad.net |
Commit message
Fix incorrect letters and URL key on Croatian layout
Description of the change
Fix incorrect letters and URL key on Croatian layout
PS Jenkins bot (ps-jenkins) wrote : | # |
Michael Sheldon (michael-sheldon) wrote : | # |
Are there any related MPs required for this MP to build/function as expected? Please list.
* No
Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
* Yes
Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
* Yes
Did you successfully run all tests found in your component's Test Plan (https:/
* Yes
If you changed the UI, was the change specified/approved by design?
* No change
If you changed UI labels, did you update the pot file?
* No change
If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
* No change
Preview Diff
1 | === modified file 'plugins/hr/qml/Keyboard_hr.qml' | |||
2 | --- plugins/hr/qml/Keyboard_hr.qml 2016-01-25 16:02:23 +0000 | |||
3 | +++ plugins/hr/qml/Keyboard_hr.qml 2016-04-20 12:40:44 +0000 | |||
4 | @@ -34,13 +34,13 @@ | |||
5 | 34 | 34 | ||
6 | 35 | CharKey { label: "q"; shifted: "Q"; extended: ["1"]; extendedShifted: ["1"]; leftSide: true; } | 35 | CharKey { label: "q"; shifted: "Q"; extended: ["1"]; extendedShifted: ["1"]; leftSide: true; } |
7 | 36 | CharKey { label: "w"; shifted: "W"; extended: ["2"]; extendedShifted: ["2"] } | 36 | CharKey { label: "w"; shifted: "W"; extended: ["2"]; extendedShifted: ["2"] } |
9 | 37 | CharKey { label: "e"; shifted: "E"; extended: ["3", "è", "é", "ê", "ë", "€"]; extendedShifted: ["3", "È","É", "Ê", "Ë", "€"] } | 37 | CharKey { label: "e"; shifted: "E"; extended: ["3", "€"]; extendedShifted: ["3", "€"] } |
10 | 38 | CharKey { label: "r"; shifted: "R"; extended: ["4"]; extendedShifted: ["4"] } | 38 | CharKey { label: "r"; shifted: "R"; extended: ["4"]; extendedShifted: ["4"] } |
12 | 39 | CharKey { label: "t"; shifted: "T"; extended: ["5", "þ"]; extendedShifted: ["5", "Þ"] } | 39 | CharKey { label: "t"; shifted: "T"; extended: ["5"]; extendedShifted: ["5"] } |
13 | 40 | CharKey { label: "z"; shifted: "Z"; extended: ["6", "ž"]; extendedShifted: ["6", "Ž"]} | 40 | CharKey { label: "z"; shifted: "Z"; extended: ["6", "ž"]; extendedShifted: ["6", "Ž"]} |
17 | 41 | CharKey { label: "u"; shifted: "U"; extended: ["7", "û","ù","ú","ü"]; extendedShifted: ["7", "Û","Ù","Ú","Ü"] } | 41 | CharKey { label: "u"; shifted: "U"; extended: ["7"]; extendedShifted: ["7"] } |
18 | 42 | CharKey { label: "i"; shifted: "I"; extended: ["8", "î","ï","ì","í"]; extendedShifted: ["8", "Î","Ï","Ì","Í"] } | 42 | CharKey { label: "i"; shifted: "I"; extended: ["8"]; extendedShifted: ["8"] } |
19 | 43 | CharKey { label: "o"; shifted: "O"; extended: ["9", "ö","ô","ò","ó"]; extendedShifted: ["9", "Ö","Ô","Ò","Ó"] } | 43 | CharKey { label: "o"; shifted: "O"; extended: ["9"]; extendedShifted: ["9"] } |
20 | 44 | CharKey { label: "p"; shifted: "P"; extended: ["0"]; extendedShifted: ["0"]; rightSide: true; } | 44 | CharKey { label: "p"; shifted: "P"; extended: ["0"]; extendedShifted: ["0"]; rightSide: true; } |
21 | 45 | } | 45 | } |
22 | 46 | 46 | ||
23 | @@ -48,9 +48,9 @@ | |||
24 | 48 | anchors.horizontalCenter: parent.horizontalCenter; | 48 | anchors.horizontalCenter: parent.horizontalCenter; |
25 | 49 | spacing: 0 | 49 | spacing: 0 |
26 | 50 | 50 | ||
30 | 51 | CharKey { label: "a"; shifted: "A"; extended: ["ä","à","â","ª","á","å", "æ"]; extendedShifted: ["Ä","À","Â","ª","Á","Å","Æ"]; leftSide: true; } | 51 | CharKey { label: "a"; shifted: "A"; leftSide: true; } |
31 | 52 | CharKey { label: "s"; shifted: "S"; extended: ["š","ß","$"]; extendedShifted: ["Š","$"] } | 52 | CharKey { label: "s"; shifted: "S"; extended: ["š","$"]; extendedShifted: ["Š","$"] } |
32 | 53 | CharKey { label: "d"; shifted: "D"; extended: ["ð"]; extendedShifted: ["Ð"] } | 53 | CharKey { label: "d"; shifted: "D"; extended: ["đ"]; extendedShifted: ["Ð"] } |
33 | 54 | CharKey { label: "f"; shifted: "F"; } | 54 | CharKey { label: "f"; shifted: "F"; } |
34 | 55 | CharKey { label: "g"; shifted: "G"; } | 55 | CharKey { label: "g"; shifted: "G"; } |
35 | 56 | CharKey { label: "h"; shifted: "H"; } | 56 | CharKey { label: "h"; shifted: "H"; } |
36 | @@ -64,12 +64,12 @@ | |||
37 | 64 | spacing: 0 | 64 | spacing: 0 |
38 | 65 | 65 | ||
39 | 66 | ShiftKey {} | 66 | ShiftKey {} |
41 | 67 | CharKey { label: "y"; shifted: "Y"; extended: ["ý", "¥"]; extendedShifted: ["Ý", "¥"] } | 67 | CharKey { label: "y"; shifted: "Y"; extended: ["¥"]; extendedShifted: ["¥"] } |
42 | 68 | CharKey { label: "x"; shifted: "X"; } | 68 | CharKey { label: "x"; shifted: "X"; } |
44 | 69 | CharKey { label: "c"; shifted: "C"; extended: ["č","ć","ç"]; extendedShifted: ["Č","Ć","Ç"] } | 69 | CharKey { label: "c"; shifted: "C"; extended: ["č","ć"]; extendedShifted: ["Č","Ć"] } |
45 | 70 | CharKey { label: "v"; shifted: "V"; } | 70 | CharKey { label: "v"; shifted: "V"; } |
46 | 71 | CharKey { label: "b"; shifted: "B"; } | 71 | CharKey { label: "b"; shifted: "B"; } |
48 | 72 | CharKey { label: "n"; shifted: "N"; extended: ["ñ"]; extendedShifted: ["Ñ"] } | 72 | CharKey { label: "n"; shifted: "N"; } |
49 | 73 | CharKey { label: "m"; shifted: "M"; } | 73 | CharKey { label: "m"; shifted: "M"; } |
50 | 74 | BackspaceKey {} | 74 | BackspaceKey {} |
51 | 75 | } | 75 | } |
52 | 76 | 76 | ||
53 | === modified file 'plugins/hr/qml/Keyboard_hr_email.qml' | |||
54 | --- plugins/hr/qml/Keyboard_hr_email.qml 2016-01-25 16:02:23 +0000 | |||
55 | +++ plugins/hr/qml/Keyboard_hr_email.qml 2016-04-20 12:40:44 +0000 | |||
56 | @@ -34,13 +34,13 @@ | |||
57 | 34 | 34 | ||
58 | 35 | CharKey { label: "q"; shifted: "Q"; extended: ["1"]; extendedShifted: ["1"]; leftSide: true; } | 35 | CharKey { label: "q"; shifted: "Q"; extended: ["1"]; extendedShifted: ["1"]; leftSide: true; } |
59 | 36 | CharKey { label: "w"; shifted: "W"; extended: ["2"]; extendedShifted: ["2"] } | 36 | CharKey { label: "w"; shifted: "W"; extended: ["2"]; extendedShifted: ["2"] } |
61 | 37 | CharKey { label: "e"; shifted: "E"; extended: ["3", "è", "é", "ê", "ë", "€"]; extendedShifted: ["3", "È","É", "Ê", "Ë", "€"] } | 37 | CharKey { label: "e"; shifted: "E"; extended: ["3", "€"]; extendedShifted: ["3", "€"] } |
62 | 38 | CharKey { label: "r"; shifted: "R"; extended: ["4"]; extendedShifted: ["4"] } | 38 | CharKey { label: "r"; shifted: "R"; extended: ["4"]; extendedShifted: ["4"] } |
64 | 39 | CharKey { label: "t"; shifted: "T"; extended: ["5", "þ"]; extendedShifted: ["5", "Þ"] } | 39 | CharKey { label: "t"; shifted: "T"; extended: ["5"]; extendedShifted: ["5"] } |
65 | 40 | CharKey { label: "z"; shifted: "Z"; extended: ["6", "ž"]; extendedShifted: ["6", "Ž"]} | 40 | CharKey { label: "z"; shifted: "Z"; extended: ["6", "ž"]; extendedShifted: ["6", "Ž"]} |
69 | 41 | CharKey { label: "u"; shifted: "U"; extended: ["7", "û","ù","ú","ü"]; extendedShifted: ["7", "Û","Ù","Ú","Ü"] } | 41 | CharKey { label: "u"; shifted: "U"; extended: ["7"]; extendedShifted: ["7"] } |
70 | 42 | CharKey { label: "i"; shifted: "I"; extended: ["8", "î","ï","ì","í"]; extendedShifted: ["8", "Î","Ï","Ì","Í"] } | 42 | CharKey { label: "i"; shifted: "I"; extended: ["8"]; extendedShifted: ["8"] } |
71 | 43 | CharKey { label: "o"; shifted: "O"; extended: ["9", "ö","ô","ò","ó"]; extendedShifted: ["9", "Ö","Ô","Ò","Ó"] } | 43 | CharKey { label: "o"; shifted: "O"; extended: ["9"]; extendedShifted: ["9"] } |
72 | 44 | CharKey { label: "p"; shifted: "P"; extended: ["0"]; extendedShifted: ["0"]; rightSide: true; } | 44 | CharKey { label: "p"; shifted: "P"; extended: ["0"]; extendedShifted: ["0"]; rightSide: true; } |
73 | 45 | } | 45 | } |
74 | 46 | 46 | ||
75 | @@ -48,9 +48,9 @@ | |||
76 | 48 | anchors.horizontalCenter: parent.horizontalCenter; | 48 | anchors.horizontalCenter: parent.horizontalCenter; |
77 | 49 | spacing: 0 | 49 | spacing: 0 |
78 | 50 | 50 | ||
82 | 51 | CharKey { label: "a"; shifted: "A"; extended: ["ä","à","â","ª","á","å", "æ"]; extendedShifted: ["Ä","À","Â","ª","Á","Å","Æ"]; leftSide: true; } | 51 | CharKey { label: "a"; shifted: "A"; leftSide: true; } |
83 | 52 | CharKey { label: "s"; shifted: "S"; extended: ["š","ß","$"]; extendedShifted: ["Š","$"] } | 52 | CharKey { label: "s"; shifted: "S"; extended: ["š","$"]; extendedShifted: ["Š","$"] } |
84 | 53 | CharKey { label: "d"; shifted: "D"; extended: ["ð"]; extendedShifted: ["Ð"] } | 53 | CharKey { label: "d"; shifted: "D"; extended: ["đ"]; extendedShifted: ["Ð"] } |
85 | 54 | CharKey { label: "f"; shifted: "F"; } | 54 | CharKey { label: "f"; shifted: "F"; } |
86 | 55 | CharKey { label: "g"; shifted: "G"; } | 55 | CharKey { label: "g"; shifted: "G"; } |
87 | 56 | CharKey { label: "h"; shifted: "H"; } | 56 | CharKey { label: "h"; shifted: "H"; } |
88 | @@ -64,12 +64,12 @@ | |||
89 | 64 | spacing: 0 | 64 | spacing: 0 |
90 | 65 | 65 | ||
91 | 66 | ShiftKey {} | 66 | ShiftKey {} |
93 | 67 | CharKey { label: "y"; shifted: "Y"; extended: ["ý", "¥"]; extendedShifted: ["Ý", "¥"] } | 67 | CharKey { label: "y"; shifted: "Y"; extended: ["¥"]; extendedShifted: ["¥"] } |
94 | 68 | CharKey { label: "x"; shifted: "X"; } | 68 | CharKey { label: "x"; shifted: "X"; } |
96 | 69 | CharKey { label: "c"; shifted: "C"; extended: ["č","ć","ç"]; extendedShifted: ["Č","Ć","Ç"] } | 69 | CharKey { label: "c"; shifted: "C"; extended: ["č","ć"]; extendedShifted: ["Č","Ć"] } |
97 | 70 | CharKey { label: "v"; shifted: "V"; } | 70 | CharKey { label: "v"; shifted: "V"; } |
98 | 71 | CharKey { label: "b"; shifted: "B"; } | 71 | CharKey { label: "b"; shifted: "B"; } |
100 | 72 | CharKey { label: "n"; shifted: "N"; extended: ["ñ"]; extendedShifted: ["Ñ"] } | 72 | CharKey { label: "n"; shifted: "N"; } |
101 | 73 | CharKey { label: "m"; shifted: "M"; } | 73 | CharKey { label: "m"; shifted: "M"; } |
102 | 74 | BackspaceKey {} | 74 | BackspaceKey {} |
103 | 75 | } | 75 | } |
104 | @@ -84,7 +84,7 @@ | |||
105 | 84 | LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; } | 84 | LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; } |
106 | 85 | CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; height: parent.height; } | 85 | CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; height: parent.height; } |
107 | 86 | SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; } | 86 | SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; } |
109 | 87 | UrlKey { id: urlKey; label: ".com"; extended: [".ba", "com.ba", ".net", ".org", ".edu.ba", ".gov.ba"]; anchors.right: dotKey.left; height: parent.height; } | 87 | UrlKey { id: urlKey; label: ".com"; extended: [".hr", "com.hr", ".net", ".org", ".edu.hr", ".gov.hr"]; anchors.right: dotKey.left; height: parent.height; } |
110 | 88 | CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } | 88 | CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
111 | 89 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } | 89 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
112 | 90 | } | 90 | } |
113 | 91 | 91 | ||
114 | === modified file 'plugins/hr/qml/Keyboard_hr_url.qml' | |||
115 | --- plugins/hr/qml/Keyboard_hr_url.qml 2016-01-25 16:02:23 +0000 | |||
116 | +++ plugins/hr/qml/Keyboard_hr_url.qml 2016-04-20 12:40:44 +0000 | |||
117 | @@ -34,13 +34,13 @@ | |||
118 | 34 | 34 | ||
119 | 35 | CharKey { label: "q"; shifted: "Q"; extended: ["1"]; extendedShifted: ["1"]; leftSide: true; } | 35 | CharKey { label: "q"; shifted: "Q"; extended: ["1"]; extendedShifted: ["1"]; leftSide: true; } |
120 | 36 | CharKey { label: "w"; shifted: "W"; extended: ["2"]; extendedShifted: ["2"] } | 36 | CharKey { label: "w"; shifted: "W"; extended: ["2"]; extendedShifted: ["2"] } |
122 | 37 | CharKey { label: "e"; shifted: "E"; extended: ["3", "è", "é", "ê", "ë", "€"]; extendedShifted: ["3", "È","É", "Ê", "Ë", "€"] } | 37 | CharKey { label: "e"; shifted: "E"; extended: ["3", "€"]; extendedShifted: ["3", "€"] } |
123 | 38 | CharKey { label: "r"; shifted: "R"; extended: ["4"]; extendedShifted: ["4"] } | 38 | CharKey { label: "r"; shifted: "R"; extended: ["4"]; extendedShifted: ["4"] } |
125 | 39 | CharKey { label: "t"; shifted: "T"; extended: ["5", "þ"]; extendedShifted: ["5", "Þ"] } | 39 | CharKey { label: "t"; shifted: "T"; extended: ["5"]; extendedShifted: ["5"] } |
126 | 40 | CharKey { label: "z"; shifted: "Z"; extended: ["6", "ž"]; extendedShifted: ["6", "Ž"]} | 40 | CharKey { label: "z"; shifted: "Z"; extended: ["6", "ž"]; extendedShifted: ["6", "Ž"]} |
130 | 41 | CharKey { label: "u"; shifted: "U"; extended: ["7", "û","ù","ú","ü"]; extendedShifted: ["7", "Û","Ù","Ú","Ü"] } | 41 | CharKey { label: "u"; shifted: "U"; extended: ["7"]; extendedShifted: ["7"] } |
131 | 42 | CharKey { label: "i"; shifted: "I"; extended: ["8", "î","ï","ì","í"]; extendedShifted: ["8", "Î","Ï","Ì","Í"] } | 42 | CharKey { label: "i"; shifted: "I"; extended: ["8"]; extendedShifted: ["8"] } |
132 | 43 | CharKey { label: "o"; shifted: "O"; extended: ["9", "ö","ô","ò","ó"]; extendedShifted: ["9", "Ö","Ô","Ò","Ó"] } | 43 | CharKey { label: "o"; shifted: "O"; extended: ["9"]; extendedShifted: ["9"] } |
133 | 44 | CharKey { label: "p"; shifted: "P"; extended: ["0"]; extendedShifted: ["0"]; rightSide: true; } | 44 | CharKey { label: "p"; shifted: "P"; extended: ["0"]; extendedShifted: ["0"]; rightSide: true; } |
134 | 45 | } | 45 | } |
135 | 46 | 46 | ||
136 | @@ -48,9 +48,9 @@ | |||
137 | 48 | anchors.horizontalCenter: parent.horizontalCenter; | 48 | anchors.horizontalCenter: parent.horizontalCenter; |
138 | 49 | spacing: 0 | 49 | spacing: 0 |
139 | 50 | 50 | ||
143 | 51 | CharKey { label: "a"; shifted: "A"; extended: ["ä","à","â","ª","á","å", "æ"]; extendedShifted: ["Ä","À","Â","ª","Á","Å","Æ"]; leftSide: true; } | 51 | CharKey { label: "a"; shifted: "A"; leftSide: true; } |
144 | 52 | CharKey { label: "s"; shifted: "S"; extended: ["š","ß","$"]; extendedShifted: ["Š","$"] } | 52 | CharKey { label: "s"; shifted: "S"; extended: ["š","$"]; extendedShifted: ["Š","$"] } |
145 | 53 | CharKey { label: "d"; shifted: "D"; extended: ["ð"]; extendedShifted: ["Ð"] } | 53 | CharKey { label: "d"; shifted: "D"; extended: ["đ"]; extendedShifted: ["Ð"] } |
146 | 54 | CharKey { label: "f"; shifted: "F"; } | 54 | CharKey { label: "f"; shifted: "F"; } |
147 | 55 | CharKey { label: "g"; shifted: "G"; } | 55 | CharKey { label: "g"; shifted: "G"; } |
148 | 56 | CharKey { label: "h"; shifted: "H"; } | 56 | CharKey { label: "h"; shifted: "H"; } |
149 | @@ -64,12 +64,12 @@ | |||
150 | 64 | spacing: 0 | 64 | spacing: 0 |
151 | 65 | 65 | ||
152 | 66 | ShiftKey {} | 66 | ShiftKey {} |
154 | 67 | CharKey { label: "y"; shifted: "Y"; extended: ["ý", "¥"]; extendedShifted: ["Ý", "¥"] } | 67 | CharKey { label: "y"; shifted: "Y"; extended: ["¥"]; extendedShifted: ["¥"] } |
155 | 68 | CharKey { label: "x"; shifted: "X"; } | 68 | CharKey { label: "x"; shifted: "X"; } |
157 | 69 | CharKey { label: "c"; shifted: "C"; extended: ["č","ć","ç"]; extendedShifted: ["Č","Ć","Ç"] } | 69 | CharKey { label: "c"; shifted: "C"; extended: ["č","ć"]; extendedShifted: ["Č","Ć"] } |
158 | 70 | CharKey { label: "v"; shifted: "V"; } | 70 | CharKey { label: "v"; shifted: "V"; } |
159 | 71 | CharKey { label: "b"; shifted: "B"; } | 71 | CharKey { label: "b"; shifted: "B"; } |
161 | 72 | CharKey { label: "n"; shifted: "N"; extended: ["ñ"]; extendedShifted: ["Ñ"] } | 72 | CharKey { label: "n"; shifted: "N"; } |
162 | 73 | CharKey { label: "m"; shifted: "M"; } | 73 | CharKey { label: "m"; shifted: "M"; } |
163 | 74 | BackspaceKey {} | 74 | BackspaceKey {} |
164 | 75 | } | 75 | } |
165 | 76 | 76 | ||
166 | === modified file 'plugins/hr/qml/Keyboard_hr_url_search.qml' | |||
167 | --- plugins/hr/qml/Keyboard_hr_url_search.qml 2016-01-25 16:02:23 +0000 | |||
168 | +++ plugins/hr/qml/Keyboard_hr_url_search.qml 2016-04-20 12:40:44 +0000 | |||
169 | @@ -35,13 +35,13 @@ | |||
170 | 35 | 35 | ||
171 | 36 | CharKey { label: "q"; shifted: "Q"; extended: ["1"]; extendedShifted: ["1"]; leftSide: true; } | 36 | CharKey { label: "q"; shifted: "Q"; extended: ["1"]; extendedShifted: ["1"]; leftSide: true; } |
172 | 37 | CharKey { label: "w"; shifted: "W"; extended: ["2"]; extendedShifted: ["2"] } | 37 | CharKey { label: "w"; shifted: "W"; extended: ["2"]; extendedShifted: ["2"] } |
174 | 38 | CharKey { label: "e"; shifted: "E"; extended: ["3", "è", "é", "ê", "ë", "€"]; extendedShifted: ["3", "È","É", "Ê", "Ë", "€"] } | 38 | CharKey { label: "e"; shifted: "E"; extended: ["3", "€"]; extendedShifted: ["3", "€"] } |
175 | 39 | CharKey { label: "r"; shifted: "R"; extended: ["4"]; extendedShifted: ["4"] } | 39 | CharKey { label: "r"; shifted: "R"; extended: ["4"]; extendedShifted: ["4"] } |
177 | 40 | CharKey { label: "t"; shifted: "T"; extended: ["5", "þ"]; extendedShifted: ["5", "Þ"] } | 40 | CharKey { label: "t"; shifted: "T"; extended: ["5"]; extendedShifted: ["5"] } |
178 | 41 | CharKey { label: "z"; shifted: "Z"; extended: ["6", "ž"]; extendedShifted: ["6", "Ž"]} | 41 | CharKey { label: "z"; shifted: "Z"; extended: ["6", "ž"]; extendedShifted: ["6", "Ž"]} |
182 | 42 | CharKey { label: "u"; shifted: "U"; extended: ["7", "û","ù","ú","ü"]; extendedShifted: ["7", "Û","Ù","Ú","Ü"] } | 42 | CharKey { label: "u"; shifted: "U"; extended: ["7"]; extendedShifted: ["7"] } |
183 | 43 | CharKey { label: "i"; shifted: "I"; extended: ["8", "î","ï","ì","í"]; extendedShifted: ["8", "Î","Ï","Ì","Í"] } | 43 | CharKey { label: "i"; shifted: "I"; extended: ["8"]; extendedShifted: ["8"] } |
184 | 44 | CharKey { label: "o"; shifted: "O"; extended: ["9", "ö","ô","ò","ó"]; extendedShifted: ["9", "Ö","Ô","Ò","Ó"] } | 44 | CharKey { label: "o"; shifted: "O"; extended: ["9"]; extendedShifted: ["9"] } |
185 | 45 | CharKey { label: "p"; shifted: "P"; extended: ["0"]; extendedShifted: ["0"]; rightSide: true; } | 45 | CharKey { label: "p"; shifted: "P"; extended: ["0"]; extendedShifted: ["0"]; rightSide: true; } |
186 | 46 | } | 46 | } |
187 | 47 | 47 | ||
188 | @@ -49,9 +49,9 @@ | |||
189 | 49 | anchors.horizontalCenter: parent.horizontalCenter; | 49 | anchors.horizontalCenter: parent.horizontalCenter; |
190 | 50 | spacing: 0 | 50 | spacing: 0 |
191 | 51 | 51 | ||
195 | 52 | CharKey { label: "a"; shifted: "A"; extended: ["ä","à","â","ª","á","å", "æ"]; extendedShifted: ["Ä","À","Â","ª","Á","Å","Æ"]; leftSide: true; } | 52 | CharKey { label: "a"; shifted: "A"; leftSide: true; } |
196 | 53 | CharKey { label: "s"; shifted: "S"; extended: ["š","ß","$"]; extendedShifted: ["Š","$"] } | 53 | CharKey { label: "s"; shifted: "S"; extended: ["š","$"]; extendedShifted: ["Š","$"] } |
197 | 54 | CharKey { label: "d"; shifted: "D"; extended: ["ð"]; extendedShifted: ["Ð"] } | 54 | CharKey { label: "d"; shifted: "D"; extended: ["đ"]; extendedShifted: ["Ð"] } |
198 | 55 | CharKey { label: "f"; shifted: "F"; } | 55 | CharKey { label: "f"; shifted: "F"; } |
199 | 56 | CharKey { label: "g"; shifted: "G"; } | 56 | CharKey { label: "g"; shifted: "G"; } |
200 | 57 | CharKey { label: "h"; shifted: "H"; } | 57 | CharKey { label: "h"; shifted: "H"; } |
201 | @@ -65,12 +65,12 @@ | |||
202 | 65 | spacing: 0 | 65 | spacing: 0 |
203 | 66 | 66 | ||
204 | 67 | ShiftKey {} | 67 | ShiftKey {} |
206 | 68 | CharKey { label: "y"; shifted: "Y"; extended: ["ý", "¥"]; extendedShifted: ["Ý", "¥"] } | 68 | CharKey { label: "y"; shifted: "Y"; extended: ["¥"]; extendedShifted: ["¥"] } |
207 | 69 | CharKey { label: "x"; shifted: "X"; } | 69 | CharKey { label: "x"; shifted: "X"; } |
209 | 70 | CharKey { label: "c"; shifted: "C"; extended: ["č","ć","ç"]; extendedShifted: ["Č","Ć","Ç"] } | 70 | CharKey { label: "c"; shifted: "C"; extended: ["č","ć"]; extendedShifted: ["Č","Ć"] } |
210 | 71 | CharKey { label: "v"; shifted: "V"; } | 71 | CharKey { label: "v"; shifted: "V"; } |
211 | 72 | CharKey { label: "b"; shifted: "B"; } | 72 | CharKey { label: "b"; shifted: "B"; } |
213 | 73 | CharKey { label: "n"; shifted: "N"; extended: ["ñ"]; extendedShifted: ["Ñ"] } | 73 | CharKey { label: "n"; shifted: "N"; } |
214 | 74 | CharKey { label: "m"; shifted: "M"; } | 74 | CharKey { label: "m"; shifted: "M"; } |
215 | 75 | BackspaceKey {} | 75 | BackspaceKey {} |
216 | 76 | } | 76 | } |
PASSED: Continuous integration, rev:459 jenkins. qa.ubuntu. com/job/ ubuntu- keyboard- ci/674/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- vivid-touch/ 6843 jenkins. qa.ubuntu. com/job/ ubuntu- keyboard- vivid-amd64- ci/173 jenkins. qa.ubuntu. com/job/ ubuntu- keyboard- vivid-armhf- ci/174 jenkins. qa.ubuntu. com/job/ ubuntu- keyboard- vivid-armhf- ci/174/ artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ ubuntu- keyboard- vivid-i386- ci/173 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- vivid-touch/ 5179 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 6854 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 6854/artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 28095
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/ubuntu- keyboard- ci/674/ rebuild
http://