ubuntu-keyboard

Merge lp:~michael-sheldon/ubuntu-keyboard/language-button-cleanup into lp:ubuntu-keyboard

  1. language-button-cleanup
  2. Merge into trunk
Proposed by Michael Sheldon
Status: Merged
Approved by: Bill Filler
Approved revision: 187
Merged at revision: 185
Proposed branch: lp:~michael-sheldon/ubuntu-keyboard/language-button-cleanup
Merge into: lp:ubuntu-keyboard
Diff against target: 766 lines (+121/-52)
54 files modified
plugins/ar/qml/Keyboard_ar_email.qml (+2/-1)
plugins/ar/qml/Keyboard_ar_url.qml (+2/-1)
plugins/ar/qml/Keyboard_ar_url_search.qml (+2/-1)
plugins/cs/qml/Keyboard_cs_email.qml (+2/-1)
plugins/cs/qml/Keyboard_cs_url.qml (+2/-1)
plugins/cs/qml/Keyboard_cs_url_search.qml (+2/-1)
plugins/da/qml/Keyboard_da_email.qml (+2/-1)
plugins/da/qml/Keyboard_da_url.qml (+2/-1)
plugins/da/qml/Keyboard_da_url_search.qml (+2/-1)
plugins/de/qml/Keyboard_de_email.qml (+2/-1)
plugins/de/qml/Keyboard_de_url.qml (+2/-1)
plugins/de/qml/Keyboard_de_url_search.qml (+2/-1)
plugins/en/qml/Keyboard_en_email.qml (+2/-1)
plugins/en/qml/Keyboard_en_url.qml (+2/-1)
plugins/en/qml/Keyboard_en_url_search.qml (+2/-1)
plugins/es/qml/Keyboard_es_email.qml (+2/-1)
plugins/es/qml/Keyboard_es_url.qml (+2/-1)
plugins/es/qml/Keyboard_es_url_search.qml (+2/-1)
plugins/fi/qml/Keyboard_fi_email.qml (+2/-1)
plugins/fi/qml/Keyboard_fi_url.qml (+2/-1)
plugins/fi/qml/Keyboard_fi_url_search.qml (+2/-1)
plugins/fr/qml/Keyboard_fr_email.qml (+2/-1)
plugins/fr/qml/Keyboard_fr_url.qml (+2/-1)
plugins/fr/qml/Keyboard_fr_url_search.qml (+2/-1)
plugins/he/qml/Keyboard_he_email.qml (+2/-1)
plugins/he/qml/Keyboard_he_url.qml (+2/-1)
plugins/he/qml/Keyboard_he_url_search.qml (+2/-1)
plugins/hu/qml/Keyboard_hu_email.qml (+2/-1)
plugins/hu/qml/Keyboard_hu_url.qml (+2/-1)
plugins/hu/qml/Keyboard_hu_url_search.qml (+2/-1)
plugins/it/qml/Keyboard_it_email.qml (+2/-1)
plugins/it/qml/Keyboard_it_url.qml (+2/-1)
plugins/it/qml/Keyboard_it_url_search.qml (+2/-1)
plugins/nl/qml/Keyboard_nl_email.qml (+2/-1)
plugins/nl/qml/Keyboard_nl_url.qml (+2/-1)
plugins/nl/qml/Keyboard_nl_url_search.qml (+2/-1)
plugins/pinyin/qml/Keyboard_zh_email.qml (+2/-1)
plugins/pinyin/qml/Keyboard_zh_url.qml (+2/-1)
plugins/pinyin/qml/Keyboard_zh_url_search.qml (+2/-1)
plugins/pl/qml/Keyboard_pl_email.qml (+2/-1)
plugins/pl/qml/Keyboard_pl_url.qml (+2/-1)
plugins/pl/qml/Keyboard_pl_url_search.qml (+2/-1)
plugins/pt/qml/Keyboard_pt_email.qml (+2/-1)
plugins/pt/qml/Keyboard_pt_url.qml (+2/-1)
plugins/pt/qml/Keyboard_pt_url_search.qml (+2/-1)
plugins/ru/qml/Keyboard_ru_email.qml (+2/-1)
plugins/ru/qml/Keyboard_ru_url.qml (+2/-1)
plugins/ru/qml/Keyboard_ru_url_search.qml (+2/-1)
plugins/sv/qml/Keyboard_sv_email.qml (+2/-1)
plugins/sv/qml/Keyboard_sv_url.qml (+2/-1)
plugins/sv/qml/Keyboard_sv_url_search.qml (+2/-1)
qml/keys/LanguageKey.qml (+9/-0)
qml/keys/LanguageMenu.qml (+9/-0)
qml/keys/key_constants.js (+1/-1)
To merge this branch: bzr merge lp:~michael-sheldon/ubuntu-keyboard/language-button-cleanup
Reviewer Review Type Date Requested Status
Bill Filler (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+226994@code.launchpad.net

Commit message

Enable the language menu when single pressing the language switcher button and add a settings item to the bottom of the language switcher.

Description of the change

Enables the language menu when single pressing the language switcher button in addition to long pressing and adds a settings item to the bottom of the language switcher which takes the user to the system settings language & text page.

To post a comment you must log in.
Revision history for this message
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://wiki.ubuntu.com/Process/Merges/TestPlan/ubuntu-keyboard) on device or emulator?

 * Yes

If you changed the UI, was the change specified/approved by design?

 * Yes, added settings link to language menu based on spec: https://docs.google.com/a/canonical.com/document/d/1UunhUqLkUiAhsy9iu_Pu3Sn6jUTCn3d7E8WxkfT6ZVQ/edit#heading=h.ioz6enifxu2a

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?

 * No change

lp:~michael-sheldon/ubuntu-keyboard/language-button-cleanup updated
185. By Michael Sheldon

Merge from trunk

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:184
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/409/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-amd64-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/34
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/34/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-i386-ci/34

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/409/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:185
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/410/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-amd64-ci/35
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/35
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/35/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-i386-ci/35

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/410/rebuild

review: Approve (continuous-integration)
Revision history for this message
Bill Filler (bfiller) wrote :

Works fine. But we need to add the globe menu to all of the non-numeric layouts. Currently it's only shown on the standard layout

review: Needs Fixing
lp:~michael-sheldon/ubuntu-keyboard/language-button-cleanup updated
186. By Michael Sheldon

Add language button to all non-numeric layouts and reduce URL button width

187. By Michael Sheldon

Scale down URL button

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:187
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/413/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-amd64-ci/38
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/38
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/38/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-i386-ci/38

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/413/rebuild

review: Approve (continuous-integration)
Revision history for this message
Bill Filler (bfiller) wrote :

tested, works

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/ar/qml/Keyboard_ar_email.qml'
2--- plugins/ar/qml/Keyboard_ar_email.qml 2013-12-12 10:12:23 +0000
3+++ plugins/ar/qml/Keyboard_ar_email.qml 2014-07-17 10:53:15 +0000
4@@ -86,7 +86,8 @@
5 height: panel.keyHeight;
6
7 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
8- CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: symShiftKey.right; }
9+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
10+ CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; }
11 SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true }
12 UrlKey { id: urlKey; label: ".eg"; extended: [".iq", ".lb", ".sa", ".sy", ".jo", ".ye"]; anchors.right: dotKey.left; }
13 CharKey { id: dotKey; label: "."; shifted: "ذ"; anchors.right: specialChar.left; }
14
15=== modified file 'plugins/ar/qml/Keyboard_ar_url.qml'
16--- plugins/ar/qml/Keyboard_ar_url.qml 2013-12-12 10:12:23 +0000
17+++ plugins/ar/qml/Keyboard_ar_url.qml 2014-07-17 10:53:15 +0000
18@@ -86,7 +86,8 @@
19 height: panel.keyHeight;
20
21 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
22- CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: symShiftKey.right; }
23+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
24+ CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; }
25 UrlKey { id: urlKey; label: ".eg"; extended: [".iq", ".lb", ".sa", ".sy", ".jo", ".ye"]; anchors.right: dotKey.left; }
26 CharKey { id: dotKey; label: "."; shifted: "ذ"; anchors.right: specialChar.left; }
27 CharKey { id: specialChar; label: "ط"; anchors.right: enterKey.left }
28
29=== modified file 'plugins/ar/qml/Keyboard_ar_url_search.qml'
30--- plugins/ar/qml/Keyboard_ar_url_search.qml 2013-12-12 10:12:23 +0000
31+++ plugins/ar/qml/Keyboard_ar_url_search.qml 2014-07-17 10:53:15 +0000
32@@ -88,7 +88,8 @@
33 // note FIXME: full list of tld:
34 // [".ma", ".dz", ".ly", ".tn", ".iq", ".lb", ".ps", ".jo", ".ye", ".bh", ".dj", ".kw", ".km", ".mr‎", ".om", ".qa", ".sa", ".sy", ".so‎", ".sd", ".ae"]
35 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
36- CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: symShiftKey.right; }
37+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
38+ CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; }
39 SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true }
40 UrlKey { id: urlKey; label: ".eg"; extended: [".iq", ".lb", ".sa", ".sy", ".jo", ".ye"]; anchors.right: dotKey.left; }
41 CharKey { id: dotKey; label: "."; shifted: "ذ"; anchors.right: specialChar.left; }
42
43=== modified file 'plugins/cs/qml/Keyboard_cs_email.qml'
44--- plugins/cs/qml/Keyboard_cs_email.qml 2013-12-12 10:12:23 +0000
45+++ plugins/cs/qml/Keyboard_cs_email.qml 2014-07-17 10:53:15 +0000
46@@ -82,7 +82,8 @@
47 height: panel.keyHeight;
48
49 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
50- CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: symShiftKey.right; }
51+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
52+ CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; }
53 SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true }
54 UrlKey { id: urlKey; label: ".cz"; extended: [".sk"];anchors.right: dotKey.left; }
55 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
56
57=== modified file 'plugins/cs/qml/Keyboard_cs_url.qml'
58--- plugins/cs/qml/Keyboard_cs_url.qml 2013-12-12 10:12:23 +0000
59+++ plugins/cs/qml/Keyboard_cs_url.qml 2014-07-17 10:53:15 +0000
60@@ -82,7 +82,8 @@
61 height: panel.keyHeight;
62
63 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
64- CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: symShiftKey.right; }
65+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
66+ CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; }
67 UrlKey { id: urlKey; label: ".cz"; extended: [".sk"];anchors.right: dotKey.left; }
68 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
69 ReturnKey { id: enterKey; anchors.right: parent.right }
70
71=== modified file 'plugins/cs/qml/Keyboard_cs_url_search.qml'
72--- plugins/cs/qml/Keyboard_cs_url_search.qml 2013-12-12 10:12:23 +0000
73+++ plugins/cs/qml/Keyboard_cs_url_search.qml 2014-07-17 10:53:15 +0000
74@@ -82,7 +82,8 @@
75 height: panel.keyHeight;
76
77 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
78- CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: symShiftKey.right; }
79+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
80+ CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; }
81 SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true }
82 UrlKey { id: urlKey; label: ".cz"; extended: [".sk"];anchors.right: dotKey.left; }
83 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
84
85=== modified file 'plugins/da/qml/Keyboard_da_email.qml'
86--- plugins/da/qml/Keyboard_da_email.qml 2013-12-11 12:56:26 +0000
87+++ plugins/da/qml/Keyboard_da_email.qml 2014-07-17 10:53:15 +0000
88@@ -82,7 +82,8 @@
89
90 height: panel.keyHeight;
91 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
92- CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: symShiftKey.right; }
93+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
94+ CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; }
95 SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true }
96 UrlKey { id: urlKey; label: ".dk"; extended: [".fo", ".gl"]; anchors.right: dotKey.left; }
97 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: umlaut.left; }
98
99=== modified file 'plugins/da/qml/Keyboard_da_url.qml'
100--- plugins/da/qml/Keyboard_da_url.qml 2013-12-11 12:56:26 +0000
101+++ plugins/da/qml/Keyboard_da_url.qml 2014-07-17 10:53:15 +0000
102@@ -82,7 +82,8 @@
103
104 height: panel.keyHeight;
105 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
106- CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: symShiftKey.right; }
107+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
108+ CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; }
109 UrlKey { id: urlKey; label: ".dk"; extended: [".fo", ".gl"]; anchors.right: dotKey.left; }
110 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: umlaut.left; }
111 CharKey { id: umlaut; label: "ø"; shifted: "Ø"; anchors.right: enterKey.left; }
112
113=== modified file 'plugins/da/qml/Keyboard_da_url_search.qml'
114--- plugins/da/qml/Keyboard_da_url_search.qml 2013-12-11 12:56:26 +0000
115+++ plugins/da/qml/Keyboard_da_url_search.qml 2014-07-17 10:53:15 +0000
116@@ -82,7 +82,8 @@
117
118 height: panel.keyHeight;
119 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
120- CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: symShiftKey.right; }
121+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
122+ CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; }
123 SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true }
124 UrlKey { id: urlKey; label: ".dk"; extended: [".fo", ".gl"]; anchors.right: dotKey.left; }
125 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: umlaut.left; }
126
127=== modified file 'plugins/de/qml/Keyboard_de_email.qml'
128--- plugins/de/qml/Keyboard_de_email.qml 2013-11-28 14:40:54 +0000
129+++ plugins/de/qml/Keyboard_de_email.qml 2014-07-17 10:53:15 +0000
130@@ -83,7 +83,8 @@
131 height: panel.keyHeight;
132
133 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
134- CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: symShiftKey.right; }
135+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
136+ CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; }
137 SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true }
138 UrlKey { id: urlKey; label: ".de"; extended: [".at", ".ch", ".de"]; anchors.right: dotKey.left; }
139 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: umlaut.left; }
140
141=== modified file 'plugins/de/qml/Keyboard_de_url.qml'
142--- plugins/de/qml/Keyboard_de_url.qml 2013-11-28 14:40:54 +0000
143+++ plugins/de/qml/Keyboard_de_url.qml 2014-07-17 10:53:15 +0000
144@@ -83,7 +83,8 @@
145 height: panel.keyHeight;
146
147 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
148- CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: symShiftKey.right; }
149+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
150+ CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; }
151 UrlKey { id: urlKey; label: ".de"; extended: [".at", ".ch", ".de"]; anchors.right: dotKey.left; }
152 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: umlaut.left; }
153 CharKey { id: umlaut; label: "ö"; shifted: "Ö"; anchors.right: enterKey.left; }
154
155=== modified file 'plugins/de/qml/Keyboard_de_url_search.qml'
156--- plugins/de/qml/Keyboard_de_url_search.qml 2013-11-28 14:40:54 +0000
157+++ plugins/de/qml/Keyboard_de_url_search.qml 2014-07-17 10:53:15 +0000
158@@ -83,7 +83,8 @@
159 height: panel.keyHeight;
160
161 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
162- CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: symShiftKey.right; }
163+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
164+ CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; }
165 SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true }
166 UrlKey { id: urlKey; label: ".de"; extended: [".at", ".ch", ".de"]; anchors.right: dotKey.left; }
167 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: umlaut.left; }
168
169=== modified file 'plugins/en/qml/Keyboard_en_email.qml'
170--- plugins/en/qml/Keyboard_en_email.qml 2013-11-28 14:40:54 +0000
171+++ plugins/en/qml/Keyboard_en_email.qml 2014-07-17 10:53:15 +0000
172@@ -81,7 +81,8 @@
173 height: panel.keyHeight;
174
175 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
176- CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: symShiftKey.right; }
177+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
178+ CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; }
179 SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true }
180 UrlKey { id: urlKey; label: ".com"; extended: [".co.uk", ".net", ".org", ".edu", ".gov", ".ac.uk"]; anchors.right: dotKey.left; }
181 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
182
183=== modified file 'plugins/en/qml/Keyboard_en_url.qml'
184--- plugins/en/qml/Keyboard_en_url.qml 2013-11-28 14:40:54 +0000
185+++ plugins/en/qml/Keyboard_en_url.qml 2014-07-17 10:53:15 +0000
186@@ -81,7 +81,8 @@
187 height: panel.keyHeight;
188
189 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
190- CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: symShiftKey.right; }
191+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
192+ CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; }
193 UrlKey { id: urlKey; label: ".com"; extended: [".co.uk", ".net", ".org", ".edu", ".gov", ".ac.uk"]; anchors.right: dotKey.left; }
194 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
195 ReturnKey { id: enterKey; anchors.right: parent.right }
196
197=== modified file 'plugins/en/qml/Keyboard_en_url_search.qml'
198--- plugins/en/qml/Keyboard_en_url_search.qml 2013-11-28 14:40:54 +0000
199+++ plugins/en/qml/Keyboard_en_url_search.qml 2014-07-17 10:53:15 +0000
200@@ -82,7 +82,8 @@
201 height: panel.keyHeight;
202
203 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
204- CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: symShiftKey.right; }
205+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
206+ CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; }
207 SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true }
208 UrlKey { id: urlKey; label: ".com"; extended: [".co.uk", ".net", ".org", ".edu", ".gov", ".ac.uk"]; anchors.right: dotKey.left; }
209 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
210
211=== modified file 'plugins/es/qml/Keyboard_es_email.qml'
212--- plugins/es/qml/Keyboard_es_email.qml 2013-11-28 14:40:54 +0000
213+++ plugins/es/qml/Keyboard_es_email.qml 2014-07-17 10:53:15 +0000
214@@ -82,7 +82,8 @@
215 height: panel.keyHeight;
216
217 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
218- CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: symShiftKey.right; }
219+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
220+ CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; }
221 SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true }
222 UrlKey { id: urlKey; label: ".es"; extended: [".mx", ".co", ".ar", ".com", ".pe", ".ve", ".cl"]; anchors.right: dotKey.left; }
223 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
224
225=== modified file 'plugins/es/qml/Keyboard_es_url.qml'
226--- plugins/es/qml/Keyboard_es_url.qml 2013-11-28 14:40:54 +0000
227+++ plugins/es/qml/Keyboard_es_url.qml 2014-07-17 10:53:15 +0000
228@@ -82,7 +82,8 @@
229 height: panel.keyHeight;
230
231 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
232- CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: symShiftKey.right; }
233+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
234+ CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; }
235 UrlKey { id: urlKey; label: ".es"; extended: [".mx", ".co", ".ar", ".com", ".pe", ".ve", ".cl"]; anchors.right: dotKey.left; }
236 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
237 ReturnKey { id: enterKey; anchors.right: parent.right }
238
239=== modified file 'plugins/es/qml/Keyboard_es_url_search.qml'
240--- plugins/es/qml/Keyboard_es_url_search.qml 2013-11-28 14:40:54 +0000
241+++ plugins/es/qml/Keyboard_es_url_search.qml 2014-07-17 10:53:15 +0000
242@@ -82,7 +82,8 @@
243 height: panel.keyHeight;
244
245 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
246- CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: symShiftKey.right; }
247+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
248+ CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; }
249 SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true }
250 UrlKey { id: urlKey; label: ".es"; extended: [".mx", ".co", ".ar", ".com", ".pe", ".ve", ".cl"]; anchors.right: dotKey.left; }
251 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
252
253=== modified file 'plugins/fi/qml/Keyboard_fi_email.qml'
254--- plugins/fi/qml/Keyboard_fi_email.qml 2013-12-11 12:56:26 +0000
255+++ plugins/fi/qml/Keyboard_fi_email.qml 2014-07-17 10:53:15 +0000
256@@ -82,7 +82,8 @@
257 height: panel.keyHeight;
258
259 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
260- CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: symShiftKey.right; }
261+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
262+ CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; }
263 SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true }
264 UrlKey { id: urlKey; label: ".fi"; extended: [".se", ".no"]; anchors.right: dotKey.left; }
265 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: umlaut.left; }
266
267=== modified file 'plugins/fi/qml/Keyboard_fi_url.qml'
268--- plugins/fi/qml/Keyboard_fi_url.qml 2013-12-11 12:56:26 +0000
269+++ plugins/fi/qml/Keyboard_fi_url.qml 2014-07-17 10:53:15 +0000
270@@ -82,7 +82,8 @@
271 height: panel.keyHeight;
272
273 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
274- CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: symShiftKey.right; }
275+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
276+ CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; }
277 UrlKey { id: urlKey; label: ".fi"; extended: [".se", ".no"]; anchors.right: dotKey.left; }
278 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: umlaut.left; }
279 CharKey { id: umlaut; label: "ö"; shifted: "Ö"; anchors.right: enterKey.left; }
280
281=== modified file 'plugins/fi/qml/Keyboard_fi_url_search.qml'
282--- plugins/fi/qml/Keyboard_fi_url_search.qml 2013-12-11 12:56:26 +0000
283+++ plugins/fi/qml/Keyboard_fi_url_search.qml 2014-07-17 10:53:15 +0000
284@@ -82,7 +82,8 @@
285 height: panel.keyHeight;
286
287 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
288- CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: symShiftKey.right; }
289+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
290+ CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; }
291 SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true }
292 UrlKey { id: urlKey; label: ".fi"; extended: [".se", ".no"]; anchors.right: dotKey.left; }
293 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: umlaut.left; }
294
295=== modified file 'plugins/fr/qml/Keyboard_fr_email.qml'
296--- plugins/fr/qml/Keyboard_fr_email.qml 2013-11-28 14:40:54 +0000
297+++ plugins/fr/qml/Keyboard_fr_email.qml 2014-07-17 10:53:15 +0000
298@@ -82,7 +82,8 @@
299 height: panel.keyHeight;
300
301 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
302- CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: symShiftKey.right; }
303+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
304+ CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; }
305 SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true }
306 UrlKey { id: urlKey; label: ".fr"; extended: [".ca", ".cd", ".ci", ".ch", ".be", ".ht"]; anchors.right: dotKey.left; }
307 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
308
309=== modified file 'plugins/fr/qml/Keyboard_fr_url.qml'
310--- plugins/fr/qml/Keyboard_fr_url.qml 2013-11-28 14:40:54 +0000
311+++ plugins/fr/qml/Keyboard_fr_url.qml 2014-07-17 10:53:15 +0000
312@@ -82,7 +82,8 @@
313 height: panel.keyHeight;
314
315 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
316- CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: symShiftKey.right; }
317+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
318+ CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; }
319 UrlKey { id: urlKey; label: ".fr"; extended: [".ca", ".cd", ".ci", ".ch", ".be", ".ht"]; anchors.right: dotKey.left; }
320 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
321 ReturnKey { id: enterKey; anchors.right: parent.right }
322
323=== modified file 'plugins/fr/qml/Keyboard_fr_url_search.qml'
324--- plugins/fr/qml/Keyboard_fr_url_search.qml 2013-11-28 14:40:54 +0000
325+++ plugins/fr/qml/Keyboard_fr_url_search.qml 2014-07-17 10:53:15 +0000
326@@ -82,7 +82,8 @@
327 height: panel.keyHeight;
328
329 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
330- CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: symShiftKey.right; }
331+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
332+ CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; }
333 SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true }
334 UrlKey { id: urlKey; label: ".fr"; extended: [".ca", ".cd", ".ci", ".ch", ".be", ".ht"]; anchors.right: dotKey.left; }
335 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
336
337=== modified file 'plugins/he/qml/Keyboard_he_email.qml'
338--- plugins/he/qml/Keyboard_he_email.qml 2013-12-11 14:38:18 +0000
339+++ plugins/he/qml/Keyboard_he_email.qml 2014-07-17 10:53:15 +0000
340@@ -81,7 +81,8 @@
341 height: panel.keyHeight;
342
343 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
344- CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: symShiftKey.right; }
345+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
346+ CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; }
347 SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true }
348 UrlKey { id: urlKey; label: ".il"; anchors.right: dotKey.left; }
349 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
350
351=== modified file 'plugins/he/qml/Keyboard_he_url.qml'
352--- plugins/he/qml/Keyboard_he_url.qml 2013-12-11 14:38:18 +0000
353+++ plugins/he/qml/Keyboard_he_url.qml 2014-07-17 10:53:15 +0000
354@@ -81,7 +81,8 @@
355 height: panel.keyHeight;
356
357 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
358- CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: symShiftKey.right; }
359+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
360+ CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; }
361 UrlKey { id: urlKey; label: ".il"; anchors.right: dotKey.left; }
362 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
363 ReturnKey { id: enterKey; anchors.right: parent.right }
364
365=== modified file 'plugins/he/qml/Keyboard_he_url_search.qml'
366--- plugins/he/qml/Keyboard_he_url_search.qml 2013-12-11 14:38:18 +0000
367+++ plugins/he/qml/Keyboard_he_url_search.qml 2014-07-17 10:53:15 +0000
368@@ -81,7 +81,8 @@
369 height: panel.keyHeight;
370
371 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
372- CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: symShiftKey.right; }
373+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
374+ CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; }
375 SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true }
376 UrlKey { id: urlKey; label: ".il"; anchors.right: dotKey.left; }
377 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
378
379=== modified file 'plugins/hu/qml/Keyboard_hu_email.qml'
380--- plugins/hu/qml/Keyboard_hu_email.qml 2013-12-11 14:38:18 +0000
381+++ plugins/hu/qml/Keyboard_hu_email.qml 2014-07-17 10:53:15 +0000
382@@ -81,7 +81,8 @@
383 height: panel.keyHeight;
384
385 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
386- CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: symShiftKey.right; }
387+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
388+ CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; }
389 SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true }
390 UrlKey { id: urlKey; label: ".hu"; anchors.right: dotKey.left; }
391 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
392
393=== modified file 'plugins/hu/qml/Keyboard_hu_url.qml'
394--- plugins/hu/qml/Keyboard_hu_url.qml 2013-12-11 14:38:18 +0000
395+++ plugins/hu/qml/Keyboard_hu_url.qml 2014-07-17 10:53:15 +0000
396@@ -81,7 +81,8 @@
397 height: panel.keyHeight;
398
399 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
400- CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: symShiftKey.right; }
401+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
402+ CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; }
403 UrlKey { id: urlKey; label: ".hu"; anchors.right: dotKey.left; }
404 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
405 ReturnKey { id: enterKey; anchors.right: parent.right }
406
407=== modified file 'plugins/hu/qml/Keyboard_hu_url_search.qml'
408--- plugins/hu/qml/Keyboard_hu_url_search.qml 2013-12-11 14:38:18 +0000
409+++ plugins/hu/qml/Keyboard_hu_url_search.qml 2014-07-17 10:53:15 +0000
410@@ -81,7 +81,8 @@
411 height: panel.keyHeight;
412
413 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
414- CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: symShiftKey.right; }
415+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
416+ CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; }
417 SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true }
418 UrlKey { id: urlKey; label: ".hu"; anchors.right: dotKey.left; }
419 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
420
421=== modified file 'plugins/it/qml/Keyboard_it_email.qml'
422--- plugins/it/qml/Keyboard_it_email.qml 2013-11-28 14:40:54 +0000
423+++ plugins/it/qml/Keyboard_it_email.qml 2014-07-17 10:53:15 +0000
424@@ -81,7 +81,8 @@
425 height: panel.keyHeight;
426
427 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
428- CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: symShiftKey.right; }
429+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
430+ CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; }
431 SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true }
432 UrlKey { id: urlKey; label: ".it"; extended: [".ch", ".va", ".sm"]; anchors.right: dotKey.left; }
433 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
434
435=== modified file 'plugins/it/qml/Keyboard_it_url.qml'
436--- plugins/it/qml/Keyboard_it_url.qml 2013-11-28 14:40:54 +0000
437+++ plugins/it/qml/Keyboard_it_url.qml 2014-07-17 10:53:15 +0000
438@@ -81,7 +81,8 @@
439 height: panel.keyHeight;
440
441 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
442- CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: symShiftKey.right; }
443+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
444+ CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; }
445 UrlKey { id: urlKey; label: ".it"; extended: [".ch", ".va", ".sm"]; anchors.right: dotKey.left; }
446 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
447 ReturnKey { id: enterKey; anchors.right: parent.right }
448
449=== modified file 'plugins/it/qml/Keyboard_it_url_search.qml'
450--- plugins/it/qml/Keyboard_it_url_search.qml 2013-11-28 14:40:54 +0000
451+++ plugins/it/qml/Keyboard_it_url_search.qml 2014-07-17 10:53:15 +0000
452@@ -81,7 +81,8 @@
453 height: panel.keyHeight;
454
455 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
456- CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: symShiftKey.right; }
457+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
458+ CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; }
459 SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true }
460 UrlKey { id: urlKey; label: ".it"; extended: [".ch", ".va", ".sm"]; anchors.right: dotKey.left; }
461 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
462
463=== modified file 'plugins/nl/qml/Keyboard_nl_email.qml'
464--- plugins/nl/qml/Keyboard_nl_email.qml 2013-12-12 10:12:23 +0000
465+++ plugins/nl/qml/Keyboard_nl_email.qml 2014-07-17 10:53:15 +0000
466@@ -81,7 +81,8 @@
467 height: panel.keyHeight;
468
469 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
470- CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: symShiftKey.right; }
471+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
472+ CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; }
473 SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true }
474 UrlKey { id: urlKey; label: ".nl"; extended: [".be", ".an", ".sx", ".sr", ".aw", ".cw"]; anchors.right: dotKey.left; }
475 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
476
477=== modified file 'plugins/nl/qml/Keyboard_nl_url.qml'
478--- plugins/nl/qml/Keyboard_nl_url.qml 2013-12-12 10:12:23 +0000
479+++ plugins/nl/qml/Keyboard_nl_url.qml 2014-07-17 10:53:15 +0000
480@@ -81,7 +81,8 @@
481 height: panel.keyHeight;
482
483 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
484- CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: symShiftKey.right; }
485+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
486+ CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; }
487 UrlKey { id: urlKey; label: ".nl"; extended: [".be", ".an", ".sx", ".sr", ".aw", ".cw"]; anchors.right: dotKey.left; }
488 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
489 ReturnKey { id: enterKey; anchors.right: parent.right }
490
491=== modified file 'plugins/nl/qml/Keyboard_nl_url_search.qml'
492--- plugins/nl/qml/Keyboard_nl_url_search.qml 2013-12-12 10:12:23 +0000
493+++ plugins/nl/qml/Keyboard_nl_url_search.qml 2014-07-17 10:53:15 +0000
494@@ -81,7 +81,8 @@
495 height: panel.keyHeight;
496
497 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
498- CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: symShiftKey.right; }
499+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
500+ CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; }
501 SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true }
502 UrlKey { id: urlKey; label: ".nl"; extended: [".be", ".an", ".sx", ".sr", ".aw", ".cw"]; anchors.right: dotKey.left; }
503 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
504
505=== modified file 'plugins/pinyin/qml/Keyboard_zh_email.qml'
506--- plugins/pinyin/qml/Keyboard_zh_email.qml 2013-12-12 16:26:16 +0000
507+++ plugins/pinyin/qml/Keyboard_zh_email.qml 2014-07-17 10:53:15 +0000
508@@ -82,7 +82,8 @@
509 height: panel.keyHeight;
510
511 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
512- CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: symShiftKey.right; }
513+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
514+ CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; }
515 SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true }
516 UrlKey { id: urlKey; label: ".cn"; extended: [".中國", ".中国", ".hk", ".香港", ".mo", ".tw", ".台灣", ".台湾"]; anchors.right: dotKey.left; }
517 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
518
519=== modified file 'plugins/pinyin/qml/Keyboard_zh_url.qml'
520--- plugins/pinyin/qml/Keyboard_zh_url.qml 2013-12-12 16:26:16 +0000
521+++ plugins/pinyin/qml/Keyboard_zh_url.qml 2014-07-17 10:53:15 +0000
522@@ -82,7 +82,8 @@
523 height: panel.keyHeight;
524
525 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
526- CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: symShiftKey.right; }
527+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
528+ CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; }
529 UrlKey { id: urlKey; label: ".cn"; extended: [".中國", ".中国", ".hk", ".香港", ".mo", ".tw", ".台灣", ".台湾"]; anchors.right: dotKey.left; }
530 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
531 ReturnKey { id: enterKey; anchors.right: parent.right }
532
533=== modified file 'plugins/pinyin/qml/Keyboard_zh_url_search.qml'
534--- plugins/pinyin/qml/Keyboard_zh_url_search.qml 2013-12-12 16:26:16 +0000
535+++ plugins/pinyin/qml/Keyboard_zh_url_search.qml 2014-07-17 10:53:15 +0000
536@@ -82,7 +82,8 @@
537 height: panel.keyHeight;
538
539 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
540- CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: symShiftKey.right; }
541+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
542+ CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; }
543 SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true }
544 UrlKey { id: urlKey; label: ".cn"; extended: [".中國", ".中国", ".hk", ".香港", ".mo", ".tw", ".台灣", ".台湾"]; anchors.right: dotKey.left; }
545 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
546
547=== modified file 'plugins/pl/qml/Keyboard_pl_email.qml'
548--- plugins/pl/qml/Keyboard_pl_email.qml 2013-12-12 10:12:23 +0000
549+++ plugins/pl/qml/Keyboard_pl_email.qml 2014-07-17 10:53:15 +0000
550@@ -85,7 +85,8 @@
551 height: panel.keyHeight;
552
553 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
554- CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: symShiftKey.right; }
555+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
556+ CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; }
557 SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true }
558 UrlKey { id: urlKey; label: ".pl"; anchors.right: dotKey.left; }
559 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
560
561=== modified file 'plugins/pl/qml/Keyboard_pl_url.qml'
562--- plugins/pl/qml/Keyboard_pl_url.qml 2013-12-12 10:12:23 +0000
563+++ plugins/pl/qml/Keyboard_pl_url.qml 2014-07-17 10:53:15 +0000
564@@ -85,7 +85,8 @@
565 height: panel.keyHeight;
566
567 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
568- CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: symShiftKey.right; }
569+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
570+ CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; }
571 UrlKey { id: urlKey; label: ".pl"; anchors.right: dotKey.left; }
572 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
573 ReturnKey { id: enterKey; anchors.right: parent.right }
574
575=== modified file 'plugins/pl/qml/Keyboard_pl_url_search.qml'
576--- plugins/pl/qml/Keyboard_pl_url_search.qml 2013-12-12 10:12:23 +0000
577+++ plugins/pl/qml/Keyboard_pl_url_search.qml 2014-07-17 10:53:15 +0000
578@@ -85,7 +85,8 @@
579 height: panel.keyHeight;
580
581 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
582- CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: symShiftKey.right; }
583+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
584+ CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; }
585 SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true }
586 UrlKey { id: urlKey; label: ".pl"; anchors.right: dotKey.left; }
587 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
588
589=== modified file 'plugins/pt/qml/Keyboard_pt_email.qml'
590--- plugins/pt/qml/Keyboard_pt_email.qml 2013-11-29 14:51:51 +0000
591+++ plugins/pt/qml/Keyboard_pt_email.qml 2014-07-17 10:53:15 +0000
592@@ -82,7 +82,8 @@
593 height: panel.keyHeight;
594
595 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
596- CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: symShiftKey.right; }
597+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
598+ CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; }
599 SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true }
600 UrlKey { id: urlKey; label: ".br"; extended: [".pt", ".mz", ".ao", ".gw", ".tl"]; anchors.right: dotKey.left; }
601 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
602
603=== modified file 'plugins/pt/qml/Keyboard_pt_url.qml'
604--- plugins/pt/qml/Keyboard_pt_url.qml 2013-11-29 14:51:51 +0000
605+++ plugins/pt/qml/Keyboard_pt_url.qml 2014-07-17 10:53:15 +0000
606@@ -82,7 +82,8 @@
607 height: panel.keyHeight;
608
609 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
610- CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: symShiftKey.right; }
611+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
612+ CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; }
613 UrlKey { id: urlKey; label: ".br"; extended: [".pt", ".mz", ".ao", ".gw", ".tl"]; anchors.right: dotKey.left; }
614 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
615 ReturnKey { id: enterKey; anchors.right: parent.right }
616
617=== modified file 'plugins/pt/qml/Keyboard_pt_url_search.qml'
618--- plugins/pt/qml/Keyboard_pt_url_search.qml 2013-11-29 14:51:51 +0000
619+++ plugins/pt/qml/Keyboard_pt_url_search.qml 2014-07-17 10:53:15 +0000
620@@ -82,7 +82,8 @@
621 height: panel.keyHeight;
622
623 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
624- CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: symShiftKey.right; }
625+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
626+ CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; }
627 SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true }
628 UrlKey { id: urlKey; label: ".br"; extended: [".pt", ".mz", ".ao", ".gw", ".tl"]; anchors.right: dotKey.left; }
629 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }
630
631=== modified file 'plugins/ru/qml/Keyboard_ru_email.qml'
632--- plugins/ru/qml/Keyboard_ru_email.qml 2013-12-12 10:12:23 +0000
633+++ plugins/ru/qml/Keyboard_ru_email.qml 2014-07-17 10:53:15 +0000
634@@ -86,7 +86,8 @@
635
636 height: panel.keyHeight;
637 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
638- CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: symShiftKey.right; }
639+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
640+ CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; }
641 SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true }
642 UrlKey { id: urlKey; label: ".ru"; extended: [".ua",".su",".kg",".рф","укр",".by",".tj"]; anchors.right: dotKey.left; }
643 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: extraCharKey.left; }
644
645=== modified file 'plugins/ru/qml/Keyboard_ru_url.qml'
646--- plugins/ru/qml/Keyboard_ru_url.qml 2013-12-12 10:12:23 +0000
647+++ plugins/ru/qml/Keyboard_ru_url.qml 2014-07-17 10:53:15 +0000
648@@ -86,7 +86,8 @@
649
650 height: panel.keyHeight;
651 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
652- CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: symShiftKey.right; }
653+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
654+ CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; }
655 UrlKey { id: urlKey; label: ".ru"; extended: [".ua",".su",".kg",".рф","укр",".by",".tj"]; anchors.right: dotKey.left; }
656 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: extraCharKey.left; }
657 CharKey { id: extraCharKey; label: "ъ"; shifted: "Ъ"; anchors.right: enterKey.left; }
658
659=== modified file 'plugins/ru/qml/Keyboard_ru_url_search.qml'
660--- plugins/ru/qml/Keyboard_ru_url_search.qml 2013-12-12 10:12:23 +0000
661+++ plugins/ru/qml/Keyboard_ru_url_search.qml 2014-07-17 10:53:15 +0000
662@@ -86,7 +86,8 @@
663
664 height: panel.keyHeight;
665 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
666- CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: symShiftKey.right; }
667+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
668+ CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; }
669 SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true }
670 UrlKey { id: urlKey; label: ".ru"; extended: [".ua",".su",".kg",".рф","укр",".by",".tj"]; anchors.right: dotKey.left; }
671 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: extraCharKey.left; }
672
673=== modified file 'plugins/sv/qml/Keyboard_sv_email.qml'
674--- plugins/sv/qml/Keyboard_sv_email.qml 2013-12-12 10:12:23 +0000
675+++ plugins/sv/qml/Keyboard_sv_email.qml 2014-07-17 10:53:15 +0000
676@@ -83,7 +83,8 @@
677 height: panel.keyHeight;
678
679 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
680- CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: symShiftKey.right; }
681+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
682+ CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; }
683 SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true }
684 UrlKey { id: urlKey; label: ".se"; extended: [".fi", ".ax"]; anchors.right: dotKey.left; }
685 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: umlaut.left; }
686
687=== modified file 'plugins/sv/qml/Keyboard_sv_url.qml'
688--- plugins/sv/qml/Keyboard_sv_url.qml 2013-12-12 10:12:23 +0000
689+++ plugins/sv/qml/Keyboard_sv_url.qml 2014-07-17 10:53:15 +0000
690@@ -83,7 +83,8 @@
691 height: panel.keyHeight;
692
693 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
694- CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: symShiftKey.right; }
695+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
696+ CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; }
697 UrlKey { id: urlKey; label: ".se"; extended: [".fi", ".ax"]; anchors.right: dotKey.left; }
698 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: umlaut.left; }
699 CharKey { id: umlaut; label: "ö"; shifted: "Ö"; extended: ["ø"]; extendedShifted: ["Ø"]; anchors.right: enterKey.left; }
700
701=== modified file 'plugins/sv/qml/Keyboard_sv_url_search.qml'
702--- plugins/sv/qml/Keyboard_sv_url_search.qml 2013-12-12 10:12:23 +0000
703+++ plugins/sv/qml/Keyboard_sv_url_search.qml 2014-07-17 10:53:15 +0000
704@@ -83,7 +83,8 @@
705 height: panel.keyHeight;
706
707 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
708- CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: symShiftKey.right; }
709+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
710+ CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; }
711 SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true }
712 UrlKey { id: urlKey; label: ".se"; extended: [".fi", ".ax"]; anchors.right: dotKey.left; }
713 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: umlaut.left; }
714
715=== modified file 'qml/keys/LanguageKey.qml'
716--- qml/keys/LanguageKey.qml 2013-10-31 14:24:31 +0000
717+++ qml/keys/LanguageKey.qml 2014-07-17 10:53:15 +0000
718@@ -29,6 +29,15 @@
719 MouseArea {
720 anchors.fill: parent
721 preventStealing: true
722+ onReleased: {
723+ if (maliit_input_method.useAudioFeedback)
724+ audioFeedback.play();
725+
726+ if (maliit_input_method.useHapticFeedback)
727+ pressEffect.start();
728+
729+ canvas.languageMenuShown = true
730+ }
731 onPressAndHold: canvas.languageMenuShown = true
732 }
733 }
734
735=== modified file 'qml/keys/LanguageMenu.qml'
736--- qml/keys/LanguageMenu.qml 2014-03-03 16:21:35 +0000
737+++ qml/keys/LanguageMenu.qml 2014-07-17 10:53:15 +0000
738@@ -54,6 +54,15 @@
739 canvas.languageMenuShown = false;
740 }
741 }
742+
743+ footer: ListItem.Standard {
744+ text: i18n.tr("Settings")
745+ onClicked: {
746+ Qt.openUrlExternally("settings:///system/language")
747+ canvas.languageMenuShown = false;
748+ maliit_input_method.hide();
749+ }
750+ }
751 }
752
753 function languageIdToName(languageId)
754
755=== modified file 'qml/keys/key_constants.js'
756--- qml/keys/key_constants.js 2014-06-06 13:30:59 +0000
757+++ qml/keys/key_constants.js 2014-07-17 10:53:15 +0000
758@@ -53,7 +53,7 @@
759
760
761 var urlLayoutLeftSpacerSize = 5; // gu
762-var emailLayoutUrlKeyPadding = 4; // gu
763+var emailLayoutUrlKeyPadding = 1.5; // gu
764
765 /* language menu */
766 var languageMenuListViewPadding = 2.22; // gu

Subscribers

People subscribed via source and target branches