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

[Michael Sheldon]

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

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.

[Michael Sheldon (michael-sheldon)]

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]

185. By Michael Sheldon on 2014-07-16

Merge from trunk

[PS Jenkins bot (ps-jenkins)]

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)

[PS Jenkins bot (ps-jenkins)]

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)

[Bill Filler (bfiller)]

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]

186. By Michael Sheldon on 2014-07-17

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

187. By Michael Sheldon on 2014-07-17

Scale down URL button

[PS Jenkins bot (ps-jenkins)]

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)

[Bill Filler (bfiller)]

tested, works

review: Approve

=== modified file 'plugins/ar/qml/Keyboard_ar_email.qml'
--- plugins/ar/qml/Keyboard_ar_email.qml	2013-12-12 10:12:23 +0000
+++ plugins/ar/qml/Keyboard_ar_email.qml	2014-07-17 10:53:15 +0000
@@ -86,7 +86,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: languageMenuButton.right; }
             SpaceKey       { id: spaceKey;                               anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true }
             UrlKey         { id: urlKey; label: ".eg"; extended: [".iq", ".lb", ".sa", ".sy", ".jo", ".ye"]; anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: "ذ";  anchors.right: specialChar.left; }
 
=== modified file 'plugins/ar/qml/Keyboard_ar_url.qml'
--- plugins/ar/qml/Keyboard_ar_url.qml	2013-12-12 10:12:23 +0000
+++ plugins/ar/qml/Keyboard_ar_url.qml	2014-07-17 10:53:15 +0000
@@ -86,7 +86,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; }
             UrlKey         { id: urlKey; label: ".eg"; extended: [".iq", ".lb", ".sa", ".sy", ".jo", ".ye"]; anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: "ذ";  anchors.right: specialChar.left; }
             CharKey        { id: specialChar; label: "ط";                anchors.right: enterKey.left }
 
=== modified file 'plugins/ar/qml/Keyboard_ar_url_search.qml'
--- plugins/ar/qml/Keyboard_ar_url_search.qml	2013-12-12 10:12:23 +0000
+++ plugins/ar/qml/Keyboard_ar_url_search.qml	2014-07-17 10:53:15 +0000
@@ -88,7 +88,8 @@
             // note FIXME: full list of tld:
             // [".ma", ".dz", ".ly", ".tn", ".iq", ".lb", ".ps", ".jo", ".ye", ".bh", ".dj", ".kw", ".km", ".mr‎", ".om", ".qa", ".sa", ".sy", ".so‎", ".sd", ".ae"]
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; }
             SpaceKey       { id: spaceKey;                               anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true }
             UrlKey         { id: urlKey; label: ".eg"; extended: [".iq", ".lb", ".sa", ".sy", ".jo", ".ye"]; anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: "ذ";  anchors.right: specialChar.left; }
 
=== modified file 'plugins/cs/qml/Keyboard_cs_email.qml'
--- plugins/cs/qml/Keyboard_cs_email.qml	2013-12-12 10:12:23 +0000
+++ plugins/cs/qml/Keyboard_cs_email.qml	2014-07-17 10:53:15 +0000
@@ -82,7 +82,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: languageMenuButton.right; }
             SpaceKey       { id: spaceKey;                               anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true }
             UrlKey         { id: urlKey; label: ".cz"; extended: [".sk"];anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: enterKey.left; }
 
=== modified file 'plugins/cs/qml/Keyboard_cs_url.qml'
--- plugins/cs/qml/Keyboard_cs_url.qml	2013-12-12 10:12:23 +0000
+++ plugins/cs/qml/Keyboard_cs_url.qml	2014-07-17 10:53:15 +0000
@@ -82,7 +82,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; }
             UrlKey         { id: urlKey; label: ".cz"; extended: [".sk"];anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: enterKey.left; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right }
 
=== modified file 'plugins/cs/qml/Keyboard_cs_url_search.qml'
--- plugins/cs/qml/Keyboard_cs_url_search.qml	2013-12-12 10:12:23 +0000
+++ plugins/cs/qml/Keyboard_cs_url_search.qml	2014-07-17 10:53:15 +0000
@@ -82,7 +82,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: slashKey;    label: "/"; shifted: "/";  anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; }
             SpaceKey       { id: spaceKey;                               anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true }
             UrlKey         { id: urlKey; label: ".cz"; extended: [".sk"];anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: enterKey.left; }
 
=== modified file 'plugins/da/qml/Keyboard_da_email.qml'
--- plugins/da/qml/Keyboard_da_email.qml	2013-12-11 12:56:26 +0000
+++ plugins/da/qml/Keyboard_da_email.qml	2014-07-17 10:53:15 +0000
@@ -82,7 +82,8 @@
 
             height: panel.keyHeight;
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: languageMenuButton.right; }
             SpaceKey       { id: spaceKey;                               anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true }
             UrlKey         { id: urlKey; label: ".dk"; extended: [".fo", ".gl"]; anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: umlaut.left; }
 
=== modified file 'plugins/da/qml/Keyboard_da_url.qml'
--- plugins/da/qml/Keyboard_da_url.qml	2013-12-11 12:56:26 +0000
+++ plugins/da/qml/Keyboard_da_url.qml	2014-07-17 10:53:15 +0000
@@ -82,7 +82,8 @@
 
             height: panel.keyHeight;
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; }
             UrlKey         { id: urlKey; label: ".dk"; extended: [".fo", ".gl"]; anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: umlaut.left; }
             CharKey        { id: umlaut;      label: "ø"; shifted: "Ø";  anchors.right: enterKey.left; }
 
=== modified file 'plugins/da/qml/Keyboard_da_url_search.qml'
--- plugins/da/qml/Keyboard_da_url_search.qml	2013-12-11 12:56:26 +0000
+++ plugins/da/qml/Keyboard_da_url_search.qml	2014-07-17 10:53:15 +0000
@@ -82,7 +82,8 @@
 
             height: panel.keyHeight;
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: slashKey;    label: "/"; shifted: "/";  anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; }
             SpaceKey       { id: spaceKey;                               anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true }
             UrlKey         { id: urlKey; label: ".dk"; extended: [".fo", ".gl"]; anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: umlaut.left; }
 
=== modified file 'plugins/de/qml/Keyboard_de_email.qml'
--- plugins/de/qml/Keyboard_de_email.qml	2013-11-28 14:40:54 +0000
+++ plugins/de/qml/Keyboard_de_email.qml	2014-07-17 10:53:15 +0000
@@ -83,7 +83,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: languageMenuButton.right; }
             SpaceKey       { id: spaceKey;                               anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true }
             UrlKey         { id: urlKey; label: ".de"; extended: [".at", ".ch", ".de"]; anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: umlaut.left; }
 
=== modified file 'plugins/de/qml/Keyboard_de_url.qml'
--- plugins/de/qml/Keyboard_de_url.qml	2013-11-28 14:40:54 +0000
+++ plugins/de/qml/Keyboard_de_url.qml	2014-07-17 10:53:15 +0000
@@ -83,7 +83,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; }
             UrlKey         { id: urlKey; label: ".de"; extended: [".at", ".ch", ".de"]; anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: umlaut.left; }
             CharKey        { id: umlaut;      label: "ö"; shifted: "Ö";  anchors.right: enterKey.left; }
 
=== modified file 'plugins/de/qml/Keyboard_de_url_search.qml'
--- plugins/de/qml/Keyboard_de_url_search.qml	2013-11-28 14:40:54 +0000
+++ plugins/de/qml/Keyboard_de_url_search.qml	2014-07-17 10:53:15 +0000
@@ -83,7 +83,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: slashKey;    label: "/"; shifted: "/";  anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; }
             SpaceKey       { id: spaceKey;                               anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true }
             UrlKey         { id: urlKey; label: ".de"; extended: [".at", ".ch", ".de"]; anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: umlaut.left; }
 
=== modified file 'plugins/en/qml/Keyboard_en_email.qml'
--- plugins/en/qml/Keyboard_en_email.qml	2013-11-28 14:40:54 +0000
+++ plugins/en/qml/Keyboard_en_email.qml	2014-07-17 10:53:15 +0000
@@ -81,7 +81,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: languageMenuButton.right; }
             SpaceKey       { id: spaceKey;                               anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true }
             UrlKey         { id: urlKey; label: ".com"; extended: [".co.uk", ".net", ".org", ".edu", ".gov", ".ac.uk"]; anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: enterKey.left; }
 
=== modified file 'plugins/en/qml/Keyboard_en_url.qml'
--- plugins/en/qml/Keyboard_en_url.qml	2013-11-28 14:40:54 +0000
+++ plugins/en/qml/Keyboard_en_url.qml	2014-07-17 10:53:15 +0000
@@ -81,7 +81,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; }
             UrlKey         { id: urlKey; label: ".com"; extended: [".co.uk", ".net", ".org", ".edu", ".gov", ".ac.uk"]; anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: enterKey.left; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right }
 
=== modified file 'plugins/en/qml/Keyboard_en_url_search.qml'
--- plugins/en/qml/Keyboard_en_url_search.qml	2013-11-28 14:40:54 +0000
+++ plugins/en/qml/Keyboard_en_url_search.qml	2014-07-17 10:53:15 +0000
@@ -82,7 +82,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: slashKey;    label: "/"; shifted: "/";  anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: slashKey;    label: "/"; shifted: "/";  anchors.left: languageMenuButton.right; }
             SpaceKey       { id: spaceKey;                               anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true }
             UrlKey         { id: urlKey; label: ".com"; extended: [".co.uk", ".net", ".org", ".edu", ".gov", ".ac.uk"]; anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: enterKey.left; }
 
=== modified file 'plugins/es/qml/Keyboard_es_email.qml'
--- plugins/es/qml/Keyboard_es_email.qml	2013-11-28 14:40:54 +0000
+++ plugins/es/qml/Keyboard_es_email.qml	2014-07-17 10:53:15 +0000
@@ -82,7 +82,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: languageMenuButton.right; }
             SpaceKey       { id: spaceKey;                               anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true }
             UrlKey         { id: urlKey; label: ".es"; extended: [".mx", ".co", ".ar", ".com", ".pe", ".ve", ".cl"]; anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: enterKey.left; }
 
=== modified file 'plugins/es/qml/Keyboard_es_url.qml'
--- plugins/es/qml/Keyboard_es_url.qml	2013-11-28 14:40:54 +0000
+++ plugins/es/qml/Keyboard_es_url.qml	2014-07-17 10:53:15 +0000
@@ -82,7 +82,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; }
             UrlKey         { id: urlKey; label: ".es"; extended: [".mx", ".co", ".ar", ".com", ".pe", ".ve", ".cl"]; anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: enterKey.left; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right }
 
=== modified file 'plugins/es/qml/Keyboard_es_url_search.qml'
--- plugins/es/qml/Keyboard_es_url_search.qml	2013-11-28 14:40:54 +0000
+++ plugins/es/qml/Keyboard_es_url_search.qml	2014-07-17 10:53:15 +0000
@@ -82,7 +82,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: slashKey;    label: "/"; shifted: "/";  anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; }
             SpaceKey       { id: spaceKey;                               anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true }
             UrlKey         { id: urlKey; label: ".es"; extended: [".mx", ".co", ".ar", ".com", ".pe", ".ve", ".cl"]; anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: enterKey.left; }
 
=== modified file 'plugins/fi/qml/Keyboard_fi_email.qml'
--- plugins/fi/qml/Keyboard_fi_email.qml	2013-12-11 12:56:26 +0000
+++ plugins/fi/qml/Keyboard_fi_email.qml	2014-07-17 10:53:15 +0000
@@ -82,7 +82,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: languageMenuButton.right; }
             SpaceKey       { id: spaceKey;                               anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true }
             UrlKey         { id: urlKey; label: ".fi"; extended: [".se", ".no"]; anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: umlaut.left; }
 
=== modified file 'plugins/fi/qml/Keyboard_fi_url.qml'
--- plugins/fi/qml/Keyboard_fi_url.qml	2013-12-11 12:56:26 +0000
+++ plugins/fi/qml/Keyboard_fi_url.qml	2014-07-17 10:53:15 +0000
@@ -82,7 +82,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; }
             UrlKey         { id: urlKey; label: ".fi"; extended: [".se", ".no"]; anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: umlaut.left; }
             CharKey        { id: umlaut;      label: "ö"; shifted: "Ö";  anchors.right: enterKey.left; }
 
=== modified file 'plugins/fi/qml/Keyboard_fi_url_search.qml'
--- plugins/fi/qml/Keyboard_fi_url_search.qml	2013-12-11 12:56:26 +0000
+++ plugins/fi/qml/Keyboard_fi_url_search.qml	2014-07-17 10:53:15 +0000
@@ -82,7 +82,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: slashKey;    label: "/"; shifted: "/";  anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; }
             SpaceKey       { id: spaceKey;                               anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true }
             UrlKey         { id: urlKey; label: ".fi"; extended: [".se", ".no"]; anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: umlaut.left; }
 
=== modified file 'plugins/fr/qml/Keyboard_fr_email.qml'
--- plugins/fr/qml/Keyboard_fr_email.qml	2013-11-28 14:40:54 +0000
+++ plugins/fr/qml/Keyboard_fr_email.qml	2014-07-17 10:53:15 +0000
@@ -82,7 +82,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: languageMenuButton.right; }
             SpaceKey       { id: spaceKey;                               anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true }
             UrlKey         { id: urlKey; label: ".fr"; extended: [".ca", ".cd", ".ci", ".ch", ".be", ".ht"]; anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: enterKey.left; }
 
=== modified file 'plugins/fr/qml/Keyboard_fr_url.qml'
--- plugins/fr/qml/Keyboard_fr_url.qml	2013-11-28 14:40:54 +0000
+++ plugins/fr/qml/Keyboard_fr_url.qml	2014-07-17 10:53:15 +0000
@@ -82,7 +82,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; }
             UrlKey         { id: urlKey; label: ".fr"; extended: [".ca", ".cd", ".ci", ".ch", ".be", ".ht"]; anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: enterKey.left; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right }
 
=== modified file 'plugins/fr/qml/Keyboard_fr_url_search.qml'
--- plugins/fr/qml/Keyboard_fr_url_search.qml	2013-11-28 14:40:54 +0000
+++ plugins/fr/qml/Keyboard_fr_url_search.qml	2014-07-17 10:53:15 +0000
@@ -82,7 +82,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: slashKey;    label: "/"; shifted: "/";  anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; }
             SpaceKey       { id: spaceKey;                               anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true }
             UrlKey         { id: urlKey; label: ".fr"; extended: [".ca", ".cd", ".ci", ".ch", ".be", ".ht"]; anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: enterKey.left; }
 
=== modified file 'plugins/he/qml/Keyboard_he_email.qml'
--- plugins/he/qml/Keyboard_he_email.qml	2013-12-11 14:38:18 +0000
+++ plugins/he/qml/Keyboard_he_email.qml	2014-07-17 10:53:15 +0000
@@ -81,7 +81,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: languageMenuButton.right; }
             SpaceKey       { id: spaceKey;                               anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true }
             UrlKey         { id: urlKey; label: ".il";                   anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: enterKey.left; }
 
=== modified file 'plugins/he/qml/Keyboard_he_url.qml'
--- plugins/he/qml/Keyboard_he_url.qml	2013-12-11 14:38:18 +0000
+++ plugins/he/qml/Keyboard_he_url.qml	2014-07-17 10:53:15 +0000
@@ -81,7 +81,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; }
             UrlKey         { id: urlKey; label: ".il";                   anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: enterKey.left; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right }
 
=== modified file 'plugins/he/qml/Keyboard_he_url_search.qml'
--- plugins/he/qml/Keyboard_he_url_search.qml	2013-12-11 14:38:18 +0000
+++ plugins/he/qml/Keyboard_he_url_search.qml	2014-07-17 10:53:15 +0000
@@ -81,7 +81,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: slashKey;    label: "/"; shifted: "/";  anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; }
             SpaceKey       { id: spaceKey;                               anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true }
             UrlKey         { id: urlKey; label: ".il";                   anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: enterKey.left; }
 
=== modified file 'plugins/hu/qml/Keyboard_hu_email.qml'
--- plugins/hu/qml/Keyboard_hu_email.qml	2013-12-11 14:38:18 +0000
+++ plugins/hu/qml/Keyboard_hu_email.qml	2014-07-17 10:53:15 +0000
@@ -81,7 +81,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: languageMenuButton.right; }
             SpaceKey       { id: spaceKey;                               anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true }
             UrlKey         { id: urlKey; label: ".hu";                   anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: enterKey.left; }
 
=== modified file 'plugins/hu/qml/Keyboard_hu_url.qml'
--- plugins/hu/qml/Keyboard_hu_url.qml	2013-12-11 14:38:18 +0000
+++ plugins/hu/qml/Keyboard_hu_url.qml	2014-07-17 10:53:15 +0000
@@ -81,7 +81,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; }
             UrlKey         { id: urlKey; label: ".hu";                   anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: enterKey.left; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right }
 
=== modified file 'plugins/hu/qml/Keyboard_hu_url_search.qml'
--- plugins/hu/qml/Keyboard_hu_url_search.qml	2013-12-11 14:38:18 +0000
+++ plugins/hu/qml/Keyboard_hu_url_search.qml	2014-07-17 10:53:15 +0000
@@ -81,7 +81,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: slashKey;    label: "/"; shifted: "/";  anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; }
             SpaceKey       { id: spaceKey;                               anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true }
             UrlKey         { id: urlKey; label: ".hu";                   anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: enterKey.left; }
 
=== modified file 'plugins/it/qml/Keyboard_it_email.qml'
--- plugins/it/qml/Keyboard_it_email.qml	2013-11-28 14:40:54 +0000
+++ plugins/it/qml/Keyboard_it_email.qml	2014-07-17 10:53:15 +0000
@@ -81,7 +81,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: languageMenuButton.right; }
             SpaceKey       { id: spaceKey;                               anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true }
             UrlKey         { id: urlKey; label: ".it"; extended: [".ch", ".va", ".sm"]; anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: enterKey.left; }
 
=== modified file 'plugins/it/qml/Keyboard_it_url.qml'
--- plugins/it/qml/Keyboard_it_url.qml	2013-11-28 14:40:54 +0000
+++ plugins/it/qml/Keyboard_it_url.qml	2014-07-17 10:53:15 +0000
@@ -81,7 +81,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; }
             UrlKey         { id: urlKey; label: ".it"; extended: [".ch", ".va", ".sm"]; anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: enterKey.left; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right }
 
=== modified file 'plugins/it/qml/Keyboard_it_url_search.qml'
--- plugins/it/qml/Keyboard_it_url_search.qml	2013-11-28 14:40:54 +0000
+++ plugins/it/qml/Keyboard_it_url_search.qml	2014-07-17 10:53:15 +0000
@@ -81,7 +81,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: slashKey;    label: "/"; shifted: "/";  anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; }
             SpaceKey       { id: spaceKey;                               anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true }
             UrlKey         { id: urlKey; label: ".it"; extended: [".ch", ".va", ".sm"]; anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: enterKey.left; }
 
=== modified file 'plugins/nl/qml/Keyboard_nl_email.qml'
--- plugins/nl/qml/Keyboard_nl_email.qml	2013-12-12 10:12:23 +0000
+++ plugins/nl/qml/Keyboard_nl_email.qml	2014-07-17 10:53:15 +0000
@@ -81,7 +81,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: languageMenuButton.right; }
             SpaceKey       { id: spaceKey;                               anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true }
             UrlKey         { id: urlKey; label: ".nl"; extended: [".be", ".an", ".sx", ".sr", ".aw", ".cw"]; anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: enterKey.left; }
 
=== modified file 'plugins/nl/qml/Keyboard_nl_url.qml'
--- plugins/nl/qml/Keyboard_nl_url.qml	2013-12-12 10:12:23 +0000
+++ plugins/nl/qml/Keyboard_nl_url.qml	2014-07-17 10:53:15 +0000
@@ -81,7 +81,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; }
             UrlKey         { id: urlKey; label: ".nl"; extended: [".be", ".an", ".sx", ".sr", ".aw", ".cw"]; anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: enterKey.left; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right }
 
=== modified file 'plugins/nl/qml/Keyboard_nl_url_search.qml'
--- plugins/nl/qml/Keyboard_nl_url_search.qml	2013-12-12 10:12:23 +0000
+++ plugins/nl/qml/Keyboard_nl_url_search.qml	2014-07-17 10:53:15 +0000
@@ -81,7 +81,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: slashKey;    label: "/"; shifted: "/";  anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; }
             SpaceKey       { id: spaceKey;                               anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true }
             UrlKey         { id: urlKey; label: ".nl"; extended: [".be", ".an", ".sx", ".sr", ".aw", ".cw"]; anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: enterKey.left; }
 
=== modified file 'plugins/pinyin/qml/Keyboard_zh_email.qml'
--- plugins/pinyin/qml/Keyboard_zh_email.qml	2013-12-12 16:26:16 +0000
+++ plugins/pinyin/qml/Keyboard_zh_email.qml	2014-07-17 10:53:15 +0000
@@ -82,7 +82,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: languageMenuButton.right; }
             SpaceKey       { id: spaceKey;                               anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true }
             UrlKey         { id: urlKey; label: ".cn"; extended: [".中國", ".中国", ".hk", ".香港", ".mo", ".tw", ".台灣", ".台湾"]; anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: enterKey.left; }
 
=== modified file 'plugins/pinyin/qml/Keyboard_zh_url.qml'
--- plugins/pinyin/qml/Keyboard_zh_url.qml	2013-12-12 16:26:16 +0000
+++ plugins/pinyin/qml/Keyboard_zh_url.qml	2014-07-17 10:53:15 +0000
@@ -82,7 +82,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: slashKey;    label: "/"; shifted: "/";  anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; }
             UrlKey         { id: urlKey; label: ".cn"; extended: [".中國", ".中国", ".hk", ".香港", ".mo", ".tw", ".台灣", ".台湾"]; anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: enterKey.left; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right }
 
=== modified file 'plugins/pinyin/qml/Keyboard_zh_url_search.qml'
--- plugins/pinyin/qml/Keyboard_zh_url_search.qml	2013-12-12 16:26:16 +0000
+++ plugins/pinyin/qml/Keyboard_zh_url_search.qml	2014-07-17 10:53:15 +0000
@@ -82,7 +82,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: slashKey;    label: "/"; shifted: "/";  anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; }
             SpaceKey       { id: spaceKey;                               anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true }
             UrlKey         { id: urlKey; label: ".cn"; extended: [".中國", ".中国", ".hk", ".香港", ".mo", ".tw", ".台灣", ".台湾"]; anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: enterKey.left; }
 
=== modified file 'plugins/pl/qml/Keyboard_pl_email.qml'
--- plugins/pl/qml/Keyboard_pl_email.qml	2013-12-12 10:12:23 +0000
+++ plugins/pl/qml/Keyboard_pl_email.qml	2014-07-17 10:53:15 +0000
@@ -85,7 +85,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: languageMenuButton.right; }
             SpaceKey       { id: spaceKey;                               anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true }
             UrlKey         { id: urlKey; label: ".pl";                   anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: enterKey.left; }
 
=== modified file 'plugins/pl/qml/Keyboard_pl_url.qml'
--- plugins/pl/qml/Keyboard_pl_url.qml	2013-12-12 10:12:23 +0000
+++ plugins/pl/qml/Keyboard_pl_url.qml	2014-07-17 10:53:15 +0000
@@ -85,7 +85,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; }
             UrlKey         { id: urlKey; label: ".pl";                   anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: enterKey.left; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right }
 
=== modified file 'plugins/pl/qml/Keyboard_pl_url_search.qml'
--- plugins/pl/qml/Keyboard_pl_url_search.qml	2013-12-12 10:12:23 +0000
+++ plugins/pl/qml/Keyboard_pl_url_search.qml	2014-07-17 10:53:15 +0000
@@ -85,7 +85,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: slashKey;    label: "/"; shifted: "/";  anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; }
             SpaceKey       { id: spaceKey;                               anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true }
             UrlKey         { id: urlKey; label: ".pl";                   anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: enterKey.left; }
 
=== modified file 'plugins/pt/qml/Keyboard_pt_email.qml'
--- plugins/pt/qml/Keyboard_pt_email.qml	2013-11-29 14:51:51 +0000
+++ plugins/pt/qml/Keyboard_pt_email.qml	2014-07-17 10:53:15 +0000
@@ -82,7 +82,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: languageMenuButton.right; }
             SpaceKey       { id: spaceKey;                               anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true }
             UrlKey         { id: urlKey; label: ".br"; extended: [".pt", ".mz", ".ao", ".gw", ".tl"]; anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: enterKey.left; }
 
=== modified file 'plugins/pt/qml/Keyboard_pt_url.qml'
--- plugins/pt/qml/Keyboard_pt_url.qml	2013-11-29 14:51:51 +0000
+++ plugins/pt/qml/Keyboard_pt_url.qml	2014-07-17 10:53:15 +0000
@@ -82,7 +82,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; }
             UrlKey         { id: urlKey; label: ".br"; extended: [".pt", ".mz", ".ao", ".gw", ".tl"]; anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: enterKey.left; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right }
 
=== modified file 'plugins/pt/qml/Keyboard_pt_url_search.qml'
--- plugins/pt/qml/Keyboard_pt_url_search.qml	2013-11-29 14:51:51 +0000
+++ plugins/pt/qml/Keyboard_pt_url_search.qml	2014-07-17 10:53:15 +0000
@@ -82,7 +82,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: slashKey;    label: "/"; shifted: "/";  anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; }
             SpaceKey       { id: spaceKey;                               anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true }
             UrlKey         { id: urlKey; label: ".br"; extended: [".pt", ".mz", ".ao", ".gw", ".tl"]; anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: enterKey.left; }
 
=== modified file 'plugins/ru/qml/Keyboard_ru_email.qml'
--- plugins/ru/qml/Keyboard_ru_email.qml	2013-12-12 10:12:23 +0000
+++ plugins/ru/qml/Keyboard_ru_email.qml	2014-07-17 10:53:15 +0000
@@ -86,7 +86,8 @@
 
             height: panel.keyHeight;
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: languageMenuButton.right; }
             SpaceKey       { id: spaceKey;                               anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true }
             UrlKey         { id: urlKey; label: ".ru"; extended: [".ua",".su",".kg",".рф","укр",".by",".tj"]; anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: extraCharKey.left; }
 
=== modified file 'plugins/ru/qml/Keyboard_ru_url.qml'
--- plugins/ru/qml/Keyboard_ru_url.qml	2013-12-12 10:12:23 +0000
+++ plugins/ru/qml/Keyboard_ru_url.qml	2014-07-17 10:53:15 +0000
@@ -86,7 +86,8 @@
 
             height: panel.keyHeight;
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; }
             UrlKey         { id: urlKey; label: ".ru"; extended: [".ua",".su",".kg",".рф","укр",".by",".tj"]; anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: extraCharKey.left; }
             CharKey        { id: extraCharKey; label: "ъ"; shifted: "Ъ"; anchors.right: enterKey.left; }
 
=== modified file 'plugins/ru/qml/Keyboard_ru_url_search.qml'
--- plugins/ru/qml/Keyboard_ru_url_search.qml	2013-12-12 10:12:23 +0000
+++ plugins/ru/qml/Keyboard_ru_url_search.qml	2014-07-17 10:53:15 +0000
@@ -86,7 +86,8 @@
 
             height: panel.keyHeight;
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; }
             SpaceKey       { id: spaceKey;                               anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true }
             UrlKey         { id: urlKey; label: ".ru"; extended: [".ua",".su",".kg",".рф","укр",".by",".tj"]; anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: extraCharKey.left; }
 
=== modified file 'plugins/sv/qml/Keyboard_sv_email.qml'
--- plugins/sv/qml/Keyboard_sv_email.qml	2013-12-12 10:12:23 +0000
+++ plugins/sv/qml/Keyboard_sv_email.qml	2014-07-17 10:53:15 +0000
@@ -83,7 +83,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: languageMenuButton.right; }
             SpaceKey       { id: spaceKey;                               anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true }
             UrlKey         { id: urlKey; label: ".se"; extended: [".fi", ".ax"]; anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: umlaut.left; }
 
=== modified file 'plugins/sv/qml/Keyboard_sv_url.qml'
--- plugins/sv/qml/Keyboard_sv_url.qml	2013-12-12 10:12:23 +0000
+++ plugins/sv/qml/Keyboard_sv_url.qml	2014-07-17 10:53:15 +0000
@@ -83,7 +83,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; }
             UrlKey         { id: urlKey; label: ".se"; extended: [".fi", ".ax"]; anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: umlaut.left; }
             CharKey        { id: umlaut;      label: "ö"; shifted: "Ö";  extended: ["ø"]; extendedShifted: ["Ø"]; anchors.right: enterKey.left; }
 
=== modified file 'plugins/sv/qml/Keyboard_sv_url_search.qml'
--- plugins/sv/qml/Keyboard_sv_url_search.qml	2013-12-12 10:12:23 +0000
+++ plugins/sv/qml/Keyboard_sv_url_search.qml	2014-07-17 10:53:15 +0000
@@ -83,7 +83,8 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: symShiftKey.right; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
+            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; }
             SpaceKey       { id: spaceKey;                               anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true }
             UrlKey         { id: urlKey; label: ".se"; extended: [".fi", ".ax"]; anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: umlaut.left; }
 
=== modified file 'qml/keys/LanguageKey.qml'
--- qml/keys/LanguageKey.qml	2013-10-31 14:24:31 +0000
+++ qml/keys/LanguageKey.qml	2014-07-17 10:53:15 +0000
@@ -29,6 +29,15 @@
     MouseArea {
         anchors.fill: parent
         preventStealing: true
+        onReleased: {
+            if (maliit_input_method.useAudioFeedback)
+                audioFeedback.play();
+
+            if (maliit_input_method.useHapticFeedback)
+                 pressEffect.start();
+
+            canvas.languageMenuShown = true
+        }
         onPressAndHold: canvas.languageMenuShown = true
     }
 }
 
=== modified file 'qml/keys/LanguageMenu.qml'
--- qml/keys/LanguageMenu.qml	2014-03-03 16:21:35 +0000
+++ qml/keys/LanguageMenu.qml	2014-07-17 10:53:15 +0000
@@ -54,6 +54,15 @@
                 canvas.languageMenuShown = false;
             }
          }
+
+        footer: ListItem.Standard {
+            text: i18n.tr("Settings")
+            onClicked: {
+                Qt.openUrlExternally("settings:///system/language")
+                canvas.languageMenuShown = false;
+                maliit_input_method.hide();
+            }
+         }
     }
 
     function languageIdToName(languageId)
 
=== modified file 'qml/keys/key_constants.js'
--- qml/keys/key_constants.js	2014-06-06 13:30:59 +0000
+++ qml/keys/key_constants.js	2014-07-17 10:53:15 +0000
@@ -53,7 +53,7 @@
 
 
 var urlLayoutLeftSpacerSize = 5; // gu
-var emailLayoutUrlKeyPadding = 4; // gu
+var emailLayoutUrlKeyPadding = 1.5; // gu
 
 /* language menu */
 var languageMenuListViewPadding = 2.22; // gu