Merge lp:~michael-sheldon/ubuntu-keyboard/fix-1421411-uncrisscross into lp:ubuntu-keyboard
- fix-1421411-uncrisscross
- Merge into trunk
| Status: | Merged |
|---|---|
| Approved by: | Bill Filler on 2015-03-16 |
| Approved revision: | 326 |
| Merged at revision: | 339 |
| Proposed branch: | lp:~michael-sheldon/ubuntu-keyboard/fix-1421411-uncrisscross |
| Merge into: | lp:ubuntu-keyboard |
| Prerequisite: | lp:~michael-sheldon/ubuntu-keyboard/fix-extended-key-ordering |
| Diff against target: |
1245 lines (+160/-106) 83 files modified
plugins/ar/qml/Keyboard_ar.qml (+1/-1) plugins/ar/qml/Keyboard_ar_email.qml (+1/-1) plugins/ar/qml/Keyboard_ar_url.qml (+1/-1) plugins/ar/qml/Keyboard_ar_url_search.qml (+1/-1) plugins/az/qml/Keyboard_az.qml (+2/-2) plugins/az/qml/Keyboard_az_email.qml (+1/-1) plugins/az/qml/Keyboard_az_url.qml (+1/-1) plugins/az/qml/Keyboard_az_url_search.qml (+1/-1) plugins/bs/qml/Keyboard_bs.qml (+2/-2) plugins/bs/qml/Keyboard_bs_email.qml (+1/-1) plugins/bs/qml/Keyboard_bs_url.qml (+1/-1) plugins/bs/qml/Keyboard_bs_url_search.qml (+1/-1) plugins/ca/qml/Keyboard_ca.qml (+2/-2) plugins/ca/qml/Keyboard_ca_email.qml (+1/-1) plugins/ca/qml/Keyboard_ca_url.qml (+1/-1) plugins/ca/qml/Keyboard_ca_url_search.qml (+1/-1) plugins/cs/qml/Keyboard_cs.qml (+2/-2) plugins/cs/qml/Keyboard_cs_email.qml (+1/-1) plugins/cs/qml/Keyboard_cs_url.qml (+1/-1) plugins/cs/qml/Keyboard_cs_url_search.qml (+1/-1) plugins/da/qml/Keyboard_da.qml (+2/-2) plugins/da/qml/Keyboard_da_email.qml (+1/-1) plugins/da/qml/Keyboard_da_url.qml (+1/-1) plugins/da/qml/Keyboard_da_url_search.qml (+1/-1) plugins/de/qml/Keyboard_de.qml (+2/-2) plugins/de/qml/Keyboard_de_email.qml (+1/-1) plugins/de/qml/Keyboard_de_url.qml (+1/-1) plugins/de/qml/Keyboard_de_url_search.qml (+1/-1) plugins/en/qml/Keyboard_en.qml (+2/-2) plugins/en/qml/Keyboard_en_email.qml (+1/-1) plugins/en/qml/Keyboard_en_url.qml (+1/-1) plugins/en/qml/Keyboard_en_url_search.qml (+1/-1) plugins/es/qml/Keyboard_es.qml (+2/-2) plugins/es/qml/Keyboard_es_email.qml (+1/-1) plugins/es/qml/Keyboard_es_url.qml (+1/-1) plugins/es/qml/Keyboard_es_url_search.qml (+1/-1) plugins/fi/qml/Keyboard_fi.qml (+2/-2) plugins/fr/qml/Keyboard_fr.qml (+2/-2) plugins/fr/qml/Keyboard_fr_email.qml (+1/-1) plugins/fr/qml/Keyboard_fr_url.qml (+1/-1) plugins/fr/qml/Keyboard_fr_url_search.qml (+1/-1) plugins/he/qml/Keyboard_he.qml (+2/-2) plugins/he/qml/Keyboard_he_email.qml (+1/-1) plugins/he/qml/Keyboard_he_url.qml (+1/-1) plugins/he/qml/Keyboard_he_url_search.qml (+1/-1) plugins/hr/qml/Keyboard_hr.qml (+2/-2) plugins/hr/qml/Keyboard_hr_email.qml (+1/-1) plugins/hr/qml/Keyboard_hr_url.qml (+1/-1) plugins/hr/qml/Keyboard_hr_url_search.qml (+1/-1) plugins/hu/qml/Keyboard_hu.qml (+2/-2) plugins/hu/qml/Keyboard_hu_email.qml (+1/-1) plugins/hu/qml/Keyboard_hu_url.qml (+1/-1) plugins/hu/qml/Keyboard_hu_url_search.qml (+1/-1) plugins/it/qml/Keyboard_it.qml (+2/-2) plugins/it/qml/Keyboard_it_email.qml (+1/-1) plugins/it/qml/Keyboard_it_url.qml (+1/-1) plugins/it/qml/Keyboard_it_url_search.qml (+1/-1) plugins/nl/qml/Keyboard_nl.qml (+2/-2) plugins/nl/qml/Keyboard_nl_email.qml (+1/-1) plugins/nl/qml/Keyboard_nl_url.qml (+1/-1) plugins/nl/qml/Keyboard_nl_url_search.qml (+1/-1) plugins/pl/qml/Keyboard_pl.qml (+2/-2) plugins/pl/qml/Keyboard_pl_email.qml (+1/-1) plugins/pl/qml/Keyboard_pl_url.qml (+1/-1) plugins/pl/qml/Keyboard_pl_url_search.qml (+1/-1) plugins/pt/qml/Keyboard_pt.qml (+2/-2) plugins/pt/qml/Keyboard_pt_email.qml (+1/-1) plugins/pt/qml/Keyboard_pt_url.qml (+1/-1) plugins/pt/qml/Keyboard_pt_url_search.qml (+1/-1) plugins/ru/qml/Keyboard_ru.qml (+2/-2) plugins/ru/qml/Keyboard_ru_email.qml (+1/-1) plugins/ru/qml/Keyboard_ru_url.qml (+1/-1) plugins/ru/qml/Keyboard_ru_url_search.qml (+1/-1) plugins/sr/qml/Keyboard_sr.qml (+2/-2) plugins/sr/qml/Keyboard_sr_email.qml (+1/-1) plugins/sr/qml/Keyboard_sr_url.qml (+1/-1) plugins/sr/qml/Keyboard_sr_url_search.qml (+1/-1) plugins/sv/qml/Keyboard_sv.qml (+2/-2) plugins/sv/qml/Keyboard_sv_email.qml (+1/-1) plugins/sv/qml/Keyboard_sv_url.qml (+1/-1) plugins/sv/qml/Keyboard_sv_url_search.qml (+1/-1) tests/autopilot/ubuntu_keyboard/emulators/keyboard.py (+15/-2) tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py (+44/-3) |
| To merge this branch: | bzr merge lp:~michael-sheldon/ubuntu-keyboard/fix-1421411-uncrisscross |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot | continuous-integration | Needs Fixing on 2015-03-13 | |
| Ubuntu Phablet Team | 2015-03-12 | Pending | |
|
Review via email:
|
|||
Commit Message
Add punctuation to extended keys and make comma key more consistent across shift states
Description of the Change
Add punctuation to extended keys and make comma key more consistent across shift states
- 323. By Michael Sheldon on 2015-03-13
-
Keep exclamation mark next to question mark in extended punctuation
- 324. By Michael Sheldon on 2015-03-13
-
Update test to reflect new punctuation character ordering
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:323
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 325. By Michael Sheldon on 2015-03-13
-
Update positioning of exclamation mark on Catalan layouts
| PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:324
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 326. By Michael Sheldon on 2015-03-13
-
Fix exclamation mark positioning in Hebrew layouts
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:325
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:326
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Preview Diff
| 1 | === modified file 'plugins/ar/qml/Keyboard_ar.qml' |
| 2 | --- plugins/ar/qml/Keyboard_ar.qml 2014-09-26 13:22:23 +0000 |
| 3 | +++ plugins/ar/qml/Keyboard_ar.qml 2015-03-13 15:59:15 +0000 |
| 4 | @@ -90,7 +90,7 @@ |
| 5 | LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; } |
| 6 | CharKey { id: commaKey; label: "ذ"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 7 | SpaceKey { id: spaceKey; anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; } |
| 8 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: specialChar.left; height: parent.height; } |
| 9 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: specialChar.left; height: parent.height; } |
| 10 | CharKey { id: specialChar; label: "ط"; anchors.right: enterKey.left; height: parent.height; } |
| 11 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 12 | } |
| 13 | |
| 14 | === modified file 'plugins/ar/qml/Keyboard_ar_email.qml' |
| 15 | --- plugins/ar/qml/Keyboard_ar_email.qml 2014-11-27 16:57:43 +0000 |
| 16 | +++ plugins/ar/qml/Keyboard_ar_email.qml 2015-03-13 15:59:15 +0000 |
| 17 | @@ -91,7 +91,7 @@ |
| 18 | CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 19 | SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; } |
| 20 | UrlKey { id: urlKey; label: ".eg"; extended: [".com", ".iq", ".lb", ".sa", ".sy", ".jo", ".ye"]; anchors.right: dotKey.left; height: parent.height; } |
| 21 | - CharKey { id: dotKey; label: "."; shifted: "ذ"; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: specialChar.left; height: parent.height; } |
| 22 | + CharKey { id: dotKey; label: "."; shifted: "ذ"; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: specialChar.left; height: parent.height; } |
| 23 | CharKey { id: specialChar; label: "ط"; anchors.right: enterKey.left; height: parent.height; } |
| 24 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 25 | } |
| 26 | |
| 27 | === modified file 'plugins/ar/qml/Keyboard_ar_url.qml' |
| 28 | --- plugins/ar/qml/Keyboard_ar_url.qml 2014-11-27 16:57:43 +0000 |
| 29 | +++ plugins/ar/qml/Keyboard_ar_url.qml 2015-03-13 15:59:15 +0000 |
| 30 | @@ -90,7 +90,7 @@ |
| 31 | LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; } |
| 32 | CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 33 | UrlKey { id: urlKey; label: ".eg"; extended: [".com", ".iq", ".lb", ".sa", ".sy", ".jo", ".ye"]; anchors.right: dotKey.left; height: parent.height; } |
| 34 | - CharKey { id: dotKey; label: "."; shifted: "ذ"; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: specialChar.left; height: parent.height; } |
| 35 | + CharKey { id: dotKey; label: "."; shifted: "ذ"; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: specialChar.left; height: parent.height; } |
| 36 | CharKey { id: specialChar; label: "ط"; anchors.right: enterKey.left; height: parent.height; } |
| 37 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 38 | } |
| 39 | |
| 40 | === modified file 'plugins/ar/qml/Keyboard_ar_url_search.qml' |
| 41 | --- plugins/ar/qml/Keyboard_ar_url_search.qml 2014-11-27 16:57:43 +0000 |
| 42 | +++ plugins/ar/qml/Keyboard_ar_url_search.qml 2015-03-13 15:59:15 +0000 |
| 43 | @@ -93,7 +93,7 @@ |
| 44 | CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 45 | SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; } |
| 46 | UrlKey { id: urlKey; label: ".eg"; extended: [".com", ".iq", ".lb", ".sa", ".sy", ".jo", ".ye"]; anchors.right: dotKey.left; height: parent.height; } |
| 47 | - CharKey { id: dotKey; label: "."; shifted: "ذ"; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: specialChar.left; height: parent.height; } |
| 48 | + CharKey { id: dotKey; label: "."; shifted: "ذ"; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: specialChar.left; height: parent.height; } |
| 49 | CharKey { id: specialChar; label: "ط"; anchors.right: enterKey.left; height: parent.height; } |
| 50 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 51 | } |
| 52 | |
| 53 | === modified file 'plugins/az/qml/Keyboard_az.qml' |
| 54 | --- plugins/az/qml/Keyboard_az.qml 2014-11-14 16:53:41 +0000 |
| 55 | +++ plugins/az/qml/Keyboard_az.qml 2015-03-13 15:59:15 +0000 |
| 56 | @@ -89,9 +89,9 @@ |
| 57 | |
| 58 | SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; height: parent.height; } |
| 59 | LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; } |
| 60 | - CharKey { id: commaKey; label: ","; shifted: "/"; extended: ["'", ";", ":"]; anchors.left: languageMenuButton.right; height: parent.height; } |
| 61 | + CharKey { id: commaKey; label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "(", ")"]; anchors.left: languageMenuButton.right; height: parent.height; } |
| 62 | SpaceKey { id: spaceKey; anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; } |
| 63 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 64 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 65 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 66 | } |
| 67 | } // column |
| 68 | |
| 69 | === modified file 'plugins/az/qml/Keyboard_az_email.qml' |
| 70 | --- plugins/az/qml/Keyboard_az_email.qml 2014-11-14 16:53:41 +0000 |
| 71 | +++ plugins/az/qml/Keyboard_az_email.qml 2015-03-13 15:59:15 +0000 |
| 72 | @@ -92,7 +92,7 @@ |
| 73 | CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 74 | SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; } |
| 75 | UrlKey { id: urlKey; label: ".com"; extended: [".az", ".co.uk", ".net", ".org", ".edu", ".gov", ".ac.uk"]; anchors.right: dotKey.left; height: parent.height; } |
| 76 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 77 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 78 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 79 | } |
| 80 | } // column |
| 81 | |
| 82 | === modified file 'plugins/az/qml/Keyboard_az_url.qml' |
| 83 | --- plugins/az/qml/Keyboard_az_url.qml 2014-11-14 16:53:41 +0000 |
| 84 | +++ plugins/az/qml/Keyboard_az_url.qml 2015-03-13 15:59:15 +0000 |
| 85 | @@ -91,7 +91,7 @@ |
| 86 | LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; } |
| 87 | CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 88 | UrlKey { id: urlKey; label: ".com"; extended: [".az", ".co.uk", ".net", ".org", ".edu", ".gov", ".ac.uk"]; anchors.right: dotKey.left; height: parent.height; } |
| 89 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 90 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 91 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 92 | } |
| 93 | } // column |
| 94 | |
| 95 | === modified file 'plugins/az/qml/Keyboard_az_url_search.qml' |
| 96 | --- plugins/az/qml/Keyboard_az_url_search.qml 2014-11-14 16:53:41 +0000 |
| 97 | +++ plugins/az/qml/Keyboard_az_url_search.qml 2015-03-13 15:59:15 +0000 |
| 98 | @@ -93,7 +93,7 @@ |
| 99 | CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 100 | SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; } |
| 101 | UrlKey { id: urlKey; label: ".com"; extended: [".az", ".co.uk", ".net", ".org", ".edu", ".gov", ".ac.uk"]; anchors.right: dotKey.left; height: parent.height; } |
| 102 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 103 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 104 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 105 | } |
| 106 | } // column |
| 107 | |
| 108 | === modified file 'plugins/bs/qml/Keyboard_bs.qml' |
| 109 | --- plugins/bs/qml/Keyboard_bs.qml 2014-10-24 14:42:34 +0000 |
| 110 | +++ plugins/bs/qml/Keyboard_bs.qml 2015-03-13 15:59:15 +0000 |
| 111 | @@ -83,9 +83,9 @@ |
| 112 | |
| 113 | SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; height: parent.height; } |
| 114 | LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; } |
| 115 | - CharKey { id: commaKey; label: ","; shifted: "/"; extended: ["'", ";", ":"]; anchors.left: languageMenuButton.right; height: parent.height; } |
| 116 | + CharKey { id: commaKey; label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "(", ")"]; anchors.left: languageMenuButton.right; height: parent.height; } |
| 117 | SpaceKey { id: spaceKey; anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; } |
| 118 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 119 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 120 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 121 | } |
| 122 | } // column |
| 123 | |
| 124 | === modified file 'plugins/bs/qml/Keyboard_bs_email.qml' |
| 125 | --- plugins/bs/qml/Keyboard_bs_email.qml 2014-10-24 21:49:09 +0000 |
| 126 | +++ plugins/bs/qml/Keyboard_bs_email.qml 2015-03-13 15:59:15 +0000 |
| 127 | @@ -86,7 +86,7 @@ |
| 128 | CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 129 | SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; } |
| 130 | UrlKey { id: urlKey; label: ".com"; extended: [".ba", "com.ba", ".net", ".org", ".edu.ba", ".gov.ba"]; anchors.right: dotKey.left; height: parent.height; } |
| 131 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 132 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 133 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 134 | } |
| 135 | } // column |
| 136 | |
| 137 | === modified file 'plugins/bs/qml/Keyboard_bs_url.qml' |
| 138 | --- plugins/bs/qml/Keyboard_bs_url.qml 2014-10-24 21:49:09 +0000 |
| 139 | +++ plugins/bs/qml/Keyboard_bs_url.qml 2015-03-13 15:59:15 +0000 |
| 140 | @@ -85,7 +85,7 @@ |
| 141 | LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; } |
| 142 | CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 143 | UrlKey { id: urlKey; label: ".com"; extended: [".ba", "com.ba", ".net", ".org", ".edu.ba", ".gov.ba"]; anchors.right: dotKey.left; height: parent.height; } |
| 144 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 145 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 146 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 147 | } |
| 148 | } // column |
| 149 | |
| 150 | === modified file 'plugins/bs/qml/Keyboard_bs_url_search.qml' |
| 151 | --- plugins/bs/qml/Keyboard_bs_url_search.qml 2014-11-14 16:50:54 +0000 |
| 152 | +++ plugins/bs/qml/Keyboard_bs_url_search.qml 2015-03-13 15:59:15 +0000 |
| 153 | @@ -87,7 +87,7 @@ |
| 154 | CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 155 | SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; } |
| 156 | UrlKey { id: urlKey; label: ".com"; extended: [".ba", "com.ba", ".net", ".org", ".edu.ba", ".gov.ba"]; anchors.right: dotKey.left; height: parent.height; } |
| 157 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 158 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 159 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 160 | } |
| 161 | } // column |
| 162 | |
| 163 | === modified file 'plugins/ca/qml/Keyboard_ca.qml' |
| 164 | --- plugins/ca/qml/Keyboard_ca.qml 2015-02-13 06:28:21 +0000 |
| 165 | +++ plugins/ca/qml/Keyboard_ca.qml 2015-03-13 15:59:15 +0000 |
| 166 | @@ -84,9 +84,9 @@ |
| 167 | |
| 168 | SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; height: parent.height; } |
| 169 | LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; } |
| 170 | - CharKey { id: commaKey; label: ","; shifted: "/"; extended: ["'","-",";",":"]; anchors.left: languageMenuButton.right; height: parent.height; } |
| 171 | + CharKey { id: commaKey; label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "«","»", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "«","»", "(", ")"]; anchors.left: languageMenuButton.right; height: parent.height; } |
| 172 | SpaceKey { id: spaceKey; anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; } |
| 173 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?","!",'"',"(",")","«","»", "·", "¿", "¡"]; extendedShifted: ["?","!",'"',"(",")","«","»", "·", "¿", "¡"]; anchors.right: enterKey.left; height: parent.height; } |
| 174 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "+", "%", "!", "#", "/", "·", "¿", "¡"]; extendedShifted: ["?",'"',"(","!",")", "·", "¿", "¡"]; anchors.right: enterKey.left; height: parent.height; } |
| 175 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 176 | } |
| 177 | } // column |
| 178 | |
| 179 | === modified file 'plugins/ca/qml/Keyboard_ca_email.qml' |
| 180 | --- plugins/ca/qml/Keyboard_ca_email.qml 2015-02-13 06:43:48 +0000 |
| 181 | +++ plugins/ca/qml/Keyboard_ca_email.qml 2015-03-13 15:59:15 +0000 |
| 182 | @@ -87,7 +87,7 @@ |
| 183 | CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 184 | SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; } |
| 185 | UrlKey { id: urlKey; label: ".com"; extended: [".cat", ".ad", ".es"]; anchors.right: dotKey.left; height: parent.height; } |
| 186 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?","!",'"',"(",")","«","»", "·", "¿", "¡"]; extendedShifted: ["?","!",'"',"(",")","«","»", "·", "¿", "¡"]; anchors.right: enterKey.left; height: parent.height; } |
| 187 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "+", "%", "!", "#", "/", "·", "¿", "¡"]; extendedShifted: ["?",'"',"(","!",")", "·", "¿", "¡"]; anchors.right: enterKey.left; height: parent.height; } |
| 188 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 189 | } |
| 190 | } // column |
| 191 | |
| 192 | === modified file 'plugins/ca/qml/Keyboard_ca_url.qml' |
| 193 | --- plugins/ca/qml/Keyboard_ca_url.qml 2015-02-13 06:43:48 +0000 |
| 194 | +++ plugins/ca/qml/Keyboard_ca_url.qml 2015-03-13 15:59:15 +0000 |
| 195 | @@ -86,7 +86,7 @@ |
| 196 | LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; } |
| 197 | CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 198 | UrlKey { id: urlKey; label: ".com"; extended: [".cat", ".ad", ".es"]; anchors.right: dotKey.left; height: parent.height; } |
| 199 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?","!",'"',"(",")","«","»", "·", "¿", "¡"]; extendedShifted: ["?","!",'"',"(",")","«","»", "·", "¿", "¡"]; anchors.right: enterKey.left; height: parent.height; } |
| 200 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "+", "%", "!", "#", "/", "·", "¿", "¡"]; extendedShifted: ["?",'"',"(","!",")", "·", "¿", "¡"]; anchors.right: enterKey.left; height: parent.height; } |
| 201 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 202 | } |
| 203 | } // column |
| 204 | |
| 205 | === modified file 'plugins/ca/qml/Keyboard_ca_url_search.qml' |
| 206 | --- plugins/ca/qml/Keyboard_ca_url_search.qml 2015-02-13 06:43:48 +0000 |
| 207 | +++ plugins/ca/qml/Keyboard_ca_url_search.qml 2015-03-13 15:59:15 +0000 |
| 208 | @@ -87,7 +87,7 @@ |
| 209 | CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 210 | SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; } |
| 211 | UrlKey { id: urlKey; label: ".com"; extended: [".cat", ".ad", ".es"]; anchors.right: dotKey.left; height: parent.height; } |
| 212 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?","!",'"',"(",")","«","»", "·", "¿", "¡"]; extendedShifted: ["?","!",'"',"(",")","«","»", "·", "¿", "¡"]; anchors.right: enterKey.left; height: parent.height; } |
| 213 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?",'"',"(",")","!","«","»", "·", "¿", "¡"]; extendedShifted: ["?",'"',"(",")","!","«","»", "·", "¿", "¡"]; anchors.right: enterKey.left; height: parent.height; } |
| 214 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 215 | } |
| 216 | } // column |
| 217 | |
| 218 | === modified file 'plugins/cs/qml/Keyboard_cs.qml' |
| 219 | --- plugins/cs/qml/Keyboard_cs.qml 2014-09-26 13:22:23 +0000 |
| 220 | +++ plugins/cs/qml/Keyboard_cs.qml 2015-03-13 15:59:15 +0000 |
| 221 | @@ -84,9 +84,9 @@ |
| 222 | |
| 223 | SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; height: parent.height; } |
| 224 | LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; } |
| 225 | - CharKey { id: commaKey; label: ","; shifted: "/"; extended: ["'", ";", ":"]; anchors.left: languageMenuButton.right; height: parent.height; } |
| 226 | + CharKey { id: commaKey; label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "(", ")"]; anchors.left: languageMenuButton.right; height: parent.height; } |
| 227 | SpaceKey { id: spaceKey; anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; } |
| 228 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 229 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 230 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 231 | } |
| 232 | } // column |
| 233 | |
| 234 | === modified file 'plugins/cs/qml/Keyboard_cs_email.qml' |
| 235 | --- plugins/cs/qml/Keyboard_cs_email.qml 2014-11-27 16:57:43 +0000 |
| 236 | +++ plugins/cs/qml/Keyboard_cs_email.qml 2015-03-13 15:59:15 +0000 |
| 237 | @@ -87,7 +87,7 @@ |
| 238 | CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 239 | SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; } |
| 240 | UrlKey { id: urlKey; label: ".cz"; extended: [".com", ".sk"];anchors.right: dotKey.left; height: parent.height; } |
| 241 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 242 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 243 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 244 | } |
| 245 | } // column |
| 246 | |
| 247 | === modified file 'plugins/cs/qml/Keyboard_cs_url.qml' |
| 248 | --- plugins/cs/qml/Keyboard_cs_url.qml 2014-11-27 16:57:43 +0000 |
| 249 | +++ plugins/cs/qml/Keyboard_cs_url.qml 2015-03-13 15:59:15 +0000 |
| 250 | @@ -86,7 +86,7 @@ |
| 251 | LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; } |
| 252 | CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 253 | UrlKey { id: urlKey; label: ".cz"; extended: [".com", ".sk"]; anchors.right: dotKey.left; height: parent.height; } |
| 254 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 255 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 256 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 257 | } |
| 258 | } // column |
| 259 | |
| 260 | === modified file 'plugins/cs/qml/Keyboard_cs_url_search.qml' |
| 261 | --- plugins/cs/qml/Keyboard_cs_url_search.qml 2014-11-27 16:57:43 +0000 |
| 262 | +++ plugins/cs/qml/Keyboard_cs_url_search.qml 2015-03-13 15:59:15 +0000 |
| 263 | @@ -87,7 +87,7 @@ |
| 264 | CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 265 | SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; } |
| 266 | UrlKey { id: urlKey; label: ".cz"; extended: [".com", ".sk"]; anchors.right: dotKey.left; height: parent.height; } |
| 267 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 268 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 269 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 270 | } |
| 271 | } // column |
| 272 | |
| 273 | === modified file 'plugins/da/qml/Keyboard_da.qml' |
| 274 | --- plugins/da/qml/Keyboard_da.qml 2014-09-26 13:22:23 +0000 |
| 275 | +++ plugins/da/qml/Keyboard_da.qml 2015-03-13 15:59:15 +0000 |
| 276 | @@ -85,9 +85,9 @@ |
| 277 | |
| 278 | SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; height: parent.height; } |
| 279 | LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; } |
| 280 | - CharKey { id: commaKey; label: ","; shifted: "/"; extended: ["'", ";", ":"]; anchors.left: languageMenuButton.right; height: parent.height; } |
| 281 | + CharKey { id: commaKey; label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "(", ")"]; anchors.left: languageMenuButton.right; height: parent.height; } |
| 282 | SpaceKey { id: spaceKey; anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; } |
| 283 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: umlaut.left; height: parent.height; } |
| 284 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: umlaut.left; height: parent.height; } |
| 285 | CharKey { id: umlaut; label: "ø"; shifted: "Ø"; anchors.right: enterKey.left; height: parent.height; } |
| 286 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 287 | } |
| 288 | |
| 289 | === modified file 'plugins/da/qml/Keyboard_da_email.qml' |
| 290 | --- plugins/da/qml/Keyboard_da_email.qml 2014-11-27 16:57:43 +0000 |
| 291 | +++ plugins/da/qml/Keyboard_da_email.qml 2015-03-13 15:59:15 +0000 |
| 292 | @@ -87,7 +87,7 @@ |
| 293 | CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 294 | SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; } |
| 295 | UrlKey { id: urlKey; label: ".dk"; extended: [".com", ".fo", ".gl"]; anchors.right: dotKey.left; height: parent.height; } |
| 296 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: umlaut.left; height: parent.height; } |
| 297 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: umlaut.left; height: parent.height; } |
| 298 | CharKey { id: umlaut; label: "ø"; shifted: "Ø"; anchors.right: enterKey.left; height: parent.height; } |
| 299 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 300 | } |
| 301 | |
| 302 | === modified file 'plugins/da/qml/Keyboard_da_url.qml' |
| 303 | --- plugins/da/qml/Keyboard_da_url.qml 2014-11-27 16:57:43 +0000 |
| 304 | +++ plugins/da/qml/Keyboard_da_url.qml 2015-03-13 15:59:15 +0000 |
| 305 | @@ -86,7 +86,7 @@ |
| 306 | LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; } |
| 307 | CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 308 | UrlKey { id: urlKey; label: ".dk"; extended: [".com", ".fo", ".gl"]; anchors.right: dotKey.left; height: parent.height; } |
| 309 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: umlaut.left; height: parent.height; } |
| 310 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: umlaut.left; height: parent.height; } |
| 311 | CharKey { id: umlaut; label: "ø"; shifted: "Ø"; anchors.right: enterKey.left; height: parent.height; } |
| 312 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 313 | } |
| 314 | |
| 315 | === modified file 'plugins/da/qml/Keyboard_da_url_search.qml' |
| 316 | --- plugins/da/qml/Keyboard_da_url_search.qml 2014-11-27 16:57:43 +0000 |
| 317 | +++ plugins/da/qml/Keyboard_da_url_search.qml 2015-03-13 15:59:15 +0000 |
| 318 | @@ -87,7 +87,7 @@ |
| 319 | CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 320 | SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; } |
| 321 | UrlKey { id: urlKey; label: ".dk"; extended: [".com", ".fo", ".gl"]; anchors.right: dotKey.left; height: parent.height; } |
| 322 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: umlaut.left; height: parent.height; } |
| 323 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: umlaut.left; height: parent.height; } |
| 324 | CharKey { id: umlaut; label: "ø"; shifted: "Ø"; anchors.right: enterKey.left; height: parent.height; } |
| 325 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 326 | } |
| 327 | |
| 328 | === modified file 'plugins/de/qml/Keyboard_de.qml' |
| 329 | --- plugins/de/qml/Keyboard_de.qml 2014-09-26 13:22:23 +0000 |
| 330 | +++ plugins/de/qml/Keyboard_de.qml 2015-03-13 15:59:15 +0000 |
| 331 | @@ -85,9 +85,9 @@ |
| 332 | |
| 333 | SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; height: parent.height; } |
| 334 | LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; } |
| 335 | - CharKey { id: commaKey; label: ","; shifted: "/"; extended: ["'", ";", ":"]; anchors.left: languageMenuButton.right; height: parent.height; } |
| 336 | + CharKey { id: commaKey; label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "(", ")"]; anchors.left: languageMenuButton.right; height: parent.height; } |
| 337 | SpaceKey { id: spaceKey; anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; } |
| 338 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: umlaut.left; height: parent.height; } |
| 339 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: umlaut.left; height: parent.height; } |
| 340 | CharKey { id: umlaut; label: "ö"; shifted: "Ö"; anchors.right: enterKey.left; height: parent.height; } |
| 341 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 342 | } |
| 343 | |
| 344 | === modified file 'plugins/de/qml/Keyboard_de_email.qml' |
| 345 | --- plugins/de/qml/Keyboard_de_email.qml 2014-11-27 16:57:43 +0000 |
| 346 | +++ plugins/de/qml/Keyboard_de_email.qml 2015-03-13 15:59:15 +0000 |
| 347 | @@ -88,7 +88,7 @@ |
| 348 | CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 349 | SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; } |
| 350 | UrlKey { id: urlKey; label: ".de"; extended: [".com", ".at", ".ch"]; anchors.right: dotKey.left; height: parent.height; } |
| 351 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: umlaut.left; height: parent.height; } |
| 352 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: umlaut.left; height: parent.height; } |
| 353 | CharKey { id: umlaut; label: "ö"; shifted: "Ö"; anchors.right: enterKey.left; height: parent.height; } |
| 354 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 355 | } |
| 356 | |
| 357 | === modified file 'plugins/de/qml/Keyboard_de_url.qml' |
| 358 | --- plugins/de/qml/Keyboard_de_url.qml 2014-11-27 16:57:43 +0000 |
| 359 | +++ plugins/de/qml/Keyboard_de_url.qml 2015-03-13 15:59:15 +0000 |
| 360 | @@ -87,7 +87,7 @@ |
| 361 | LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; } |
| 362 | CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 363 | UrlKey { id: urlKey; label: ".de"; extended: [".com", ".at", ".ch"]; anchors.right: dotKey.left; height: parent.height; } |
| 364 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: umlaut.left; height: parent.height; } |
| 365 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: umlaut.left; height: parent.height; } |
| 366 | CharKey { id: umlaut; label: "ö"; shifted: "Ö"; anchors.right: enterKey.left; height: parent.height; } |
| 367 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 368 | } |
| 369 | |
| 370 | === modified file 'plugins/de/qml/Keyboard_de_url_search.qml' |
| 371 | --- plugins/de/qml/Keyboard_de_url_search.qml 2014-11-27 16:57:43 +0000 |
| 372 | +++ plugins/de/qml/Keyboard_de_url_search.qml 2015-03-13 15:59:15 +0000 |
| 373 | @@ -88,7 +88,7 @@ |
| 374 | CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 375 | SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; } |
| 376 | UrlKey { id: urlKey; label: ".de"; extended: [".com", ".at", ".ch"]; anchors.right: dotKey.left; height: parent.height; } |
| 377 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: umlaut.left; height: parent.height; } |
| 378 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: umlaut.left; height: parent.height; } |
| 379 | CharKey { id: umlaut; label: "ö"; shifted: "Ö"; anchors.right: enterKey.left; height: parent.height; } |
| 380 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 381 | } |
| 382 | |
| 383 | === modified file 'plugins/en/qml/Keyboard_en.qml' |
| 384 | --- plugins/en/qml/Keyboard_en.qml 2014-09-26 13:22:23 +0000 |
| 385 | +++ plugins/en/qml/Keyboard_en.qml 2015-03-13 15:59:15 +0000 |
| 386 | @@ -83,9 +83,9 @@ |
| 387 | |
| 388 | SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; height: parent.height; } |
| 389 | LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; } |
| 390 | - CharKey { id: commaKey; label: ","; shifted: "/"; extended: ["'", ";", ":"]; anchors.left: languageMenuButton.right; height: parent.height; } |
| 391 | + CharKey { id: commaKey; label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "(", ")"]; anchors.left: languageMenuButton.right; height: parent.height; } |
| 392 | SpaceKey { id: spaceKey; anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; } |
| 393 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 394 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 395 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 396 | } |
| 397 | } // column |
| 398 | |
| 399 | === modified file 'plugins/en/qml/Keyboard_en_email.qml' |
| 400 | --- plugins/en/qml/Keyboard_en_email.qml 2014-09-26 15:49:22 +0000 |
| 401 | +++ plugins/en/qml/Keyboard_en_email.qml 2015-03-13 15:59:15 +0000 |
| 402 | @@ -86,7 +86,7 @@ |
| 403 | CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 404 | SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; } |
| 405 | UrlKey { id: urlKey; label: ".com"; extended: [".co.uk", ".net", ".org", ".edu", ".gov", ".ac.uk"]; anchors.right: dotKey.left; height: parent.height; } |
| 406 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 407 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 408 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 409 | } |
| 410 | } // column |
| 411 | |
| 412 | === modified file 'plugins/en/qml/Keyboard_en_url.qml' |
| 413 | --- plugins/en/qml/Keyboard_en_url.qml 2014-09-26 13:22:23 +0000 |
| 414 | +++ plugins/en/qml/Keyboard_en_url.qml 2015-03-13 15:59:15 +0000 |
| 415 | @@ -85,7 +85,7 @@ |
| 416 | LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; } |
| 417 | CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 418 | UrlKey { id: urlKey; label: ".com"; extended: [".co.uk", ".net", ".org", ".edu", ".gov", ".ac.uk"]; anchors.right: dotKey.left; height: parent.height; } |
| 419 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 420 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 421 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 422 | } |
| 423 | } // column |
| 424 | |
| 425 | === modified file 'plugins/en/qml/Keyboard_en_url_search.qml' |
| 426 | --- plugins/en/qml/Keyboard_en_url_search.qml 2014-09-26 13:22:23 +0000 |
| 427 | +++ plugins/en/qml/Keyboard_en_url_search.qml 2015-03-13 15:59:15 +0000 |
| 428 | @@ -87,7 +87,7 @@ |
| 429 | CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 430 | SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; } |
| 431 | UrlKey { id: urlKey; label: ".com"; extended: [".co.uk", ".net", ".org", ".edu", ".gov", ".ac.uk"]; anchors.right: dotKey.left; height: parent.height; } |
| 432 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 433 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 434 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 435 | } |
| 436 | } // column |
| 437 | |
| 438 | === modified file 'plugins/es/qml/Keyboard_es.qml' |
| 439 | --- plugins/es/qml/Keyboard_es.qml 2014-09-26 13:22:23 +0000 |
| 440 | +++ plugins/es/qml/Keyboard_es.qml 2015-03-13 15:59:15 +0000 |
| 441 | @@ -84,9 +84,9 @@ |
| 442 | |
| 443 | SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; height: parent.height; } |
| 444 | LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; } |
| 445 | - CharKey { id: commaKey; label: ","; shifted: "/"; extended: ["'", ";", ":"]; anchors.left: languageMenuButton.right; height: parent.height; } |
| 446 | + CharKey { id: commaKey; label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "(", ")"]; anchors.left: languageMenuButton.right; height: parent.height; } |
| 447 | SpaceKey { id: spaceKey; anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; } |
| 448 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 449 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 450 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 451 | } |
| 452 | } // column |
| 453 | |
| 454 | === modified file 'plugins/es/qml/Keyboard_es_email.qml' |
| 455 | --- plugins/es/qml/Keyboard_es_email.qml 2014-11-27 16:57:43 +0000 |
| 456 | +++ plugins/es/qml/Keyboard_es_email.qml 2015-03-13 15:59:15 +0000 |
| 457 | @@ -87,7 +87,7 @@ |
| 458 | CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 459 | SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; } |
| 460 | UrlKey { id: urlKey; label: ".es"; extended: [".com", ".mx", ".co", ".ar", ".pe", ".ve", ".cl"]; anchors.right: dotKey.left; height: parent.height; } |
| 461 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 462 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 463 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 464 | } |
| 465 | } // column |
| 466 | |
| 467 | === modified file 'plugins/es/qml/Keyboard_es_url.qml' |
| 468 | --- plugins/es/qml/Keyboard_es_url.qml 2014-11-27 16:57:43 +0000 |
| 469 | +++ plugins/es/qml/Keyboard_es_url.qml 2015-03-13 15:59:15 +0000 |
| 470 | @@ -86,7 +86,7 @@ |
| 471 | LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; } |
| 472 | CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 473 | UrlKey { id: urlKey; label: ".es"; extended: [".com", ".mx", ".co", ".ar", ".pe", ".ve", ".cl"]; anchors.right: dotKey.left; height: parent.height; } |
| 474 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 475 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 476 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 477 | } |
| 478 | } // column |
| 479 | |
| 480 | === modified file 'plugins/es/qml/Keyboard_es_url_search.qml' |
| 481 | --- plugins/es/qml/Keyboard_es_url_search.qml 2014-11-27 16:57:43 +0000 |
| 482 | +++ plugins/es/qml/Keyboard_es_url_search.qml 2015-03-13 15:59:15 +0000 |
| 483 | @@ -87,7 +87,7 @@ |
| 484 | CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 485 | SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; } |
| 486 | UrlKey { id: urlKey; label: ".es"; extended: [".com", ".mx", ".co", ".ar", ".pe", ".ve", ".cl"]; anchors.right: dotKey.left; height: parent.height; } |
| 487 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 488 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 489 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 490 | } |
| 491 | } // column |
| 492 | |
| 493 | === modified file 'plugins/fi/qml/Keyboard_fi.qml' |
| 494 | --- plugins/fi/qml/Keyboard_fi.qml 2014-09-26 13:22:23 +0000 |
| 495 | +++ plugins/fi/qml/Keyboard_fi.qml 2015-03-13 15:59:15 +0000 |
| 496 | @@ -84,9 +84,9 @@ |
| 497 | |
| 498 | SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; height: parent.height; } |
| 499 | LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; } |
| 500 | - CharKey { id: commaKey; label: ","; shifted: "/"; extended: ["'", ";", ":"]; anchors.left: languageMenuButton.right; height: parent.height; } |
| 501 | + CharKey { id: commaKey; label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "(", ")"]; anchors.left: languageMenuButton.right; height: parent.height; } |
| 502 | SpaceKey { id: spaceKey; anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; } |
| 503 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: umlaut.left; height: parent.height; } |
| 504 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: umlaut.left; height: parent.height; } |
| 505 | CharKey { id: umlaut; label: "ö"; shifted: "Ö"; anchors.right: enterKey.left; height: parent.height; } |
| 506 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 507 | } |
| 508 | |
| 509 | === modified file 'plugins/fr/qml/Keyboard_fr.qml' |
| 510 | --- plugins/fr/qml/Keyboard_fr.qml 2014-09-26 13:22:23 +0000 |
| 511 | +++ plugins/fr/qml/Keyboard_fr.qml 2015-03-13 15:59:15 +0000 |
| 512 | @@ -84,9 +84,9 @@ |
| 513 | |
| 514 | SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; height: parent.height; } |
| 515 | LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; } |
| 516 | - CharKey { id: commaKey; label: ","; shifted: "/"; extended: ["'", ";", ":"]; anchors.left: languageMenuButton.right; height: parent.height; } |
| 517 | + CharKey { id: commaKey; label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "(", ")"]; anchors.left: languageMenuButton.right; height: parent.height; } |
| 518 | SpaceKey { id: spaceKey; anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; } |
| 519 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 520 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 521 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 522 | } |
| 523 | } // column |
| 524 | |
| 525 | === modified file 'plugins/fr/qml/Keyboard_fr_email.qml' |
| 526 | --- plugins/fr/qml/Keyboard_fr_email.qml 2014-11-27 16:57:43 +0000 |
| 527 | +++ plugins/fr/qml/Keyboard_fr_email.qml 2015-03-13 15:59:15 +0000 |
| 528 | @@ -87,7 +87,7 @@ |
| 529 | CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 530 | SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; } |
| 531 | UrlKey { id: urlKey; label: ".fr"; extended: [".com", ".ca", ".cd", ".ci", ".ch", ".be", ".ht"]; anchors.right: dotKey.left; height: parent.height; } |
| 532 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 533 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 534 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 535 | } |
| 536 | } // column |
| 537 | |
| 538 | === modified file 'plugins/fr/qml/Keyboard_fr_url.qml' |
| 539 | --- plugins/fr/qml/Keyboard_fr_url.qml 2014-11-27 16:57:43 +0000 |
| 540 | +++ plugins/fr/qml/Keyboard_fr_url.qml 2015-03-13 15:59:15 +0000 |
| 541 | @@ -86,7 +86,7 @@ |
| 542 | LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; } |
| 543 | CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 544 | UrlKey { id: urlKey; label: ".fr"; extended: [".com", ".ca", ".cd", ".ci", ".ch", ".be", ".ht"]; anchors.right: dotKey.left; height: parent.height; } |
| 545 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 546 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 547 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 548 | } |
| 549 | } // column |
| 550 | |
| 551 | === modified file 'plugins/fr/qml/Keyboard_fr_url_search.qml' |
| 552 | --- plugins/fr/qml/Keyboard_fr_url_search.qml 2014-11-27 16:57:43 +0000 |
| 553 | +++ plugins/fr/qml/Keyboard_fr_url_search.qml 2015-03-13 15:59:15 +0000 |
| 554 | @@ -87,7 +87,7 @@ |
| 555 | CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 556 | SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; } |
| 557 | UrlKey { id: urlKey; label: ".fr"; extended: [".com", ".ca", ".cd", ".ci", ".ch", ".be", ".ht"]; anchors.right: dotKey.left; height: parent.height; } |
| 558 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 559 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 560 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 561 | } |
| 562 | } // column |
| 563 | |
| 564 | === modified file 'plugins/he/qml/Keyboard_he.qml' |
| 565 | --- plugins/he/qml/Keyboard_he.qml 2014-09-26 15:51:12 +0000 |
| 566 | +++ plugins/he/qml/Keyboard_he.qml 2015-03-13 15:59:15 +0000 |
| 567 | @@ -83,9 +83,9 @@ |
| 568 | |
| 569 | SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; height: parent.height; } |
| 570 | LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; } |
| 571 | - CharKey { id: commaKey; label: ","; shifted: ","; extended: ["'", ";", ":", "׳", "״"]; extendedShifted: ["'", ";", ":", "׳", "״"]; anchors.left: languageMenuButton.right; height: parent.height; } |
| 572 | + CharKey { id: commaKey; label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "(", ")", "׳", "״"]; extendedShifted: ["'", ";", ":", "׳", "״"]; anchors.left: languageMenuButton.right; height: parent.height; } |
| 573 | SpaceKey { id: spaceKey; anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; } |
| 574 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!", "־"]; extendedShifted: ["?", "!", "־"]; anchors.right: enterKey.left; height: parent.height; } |
| 575 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "+", "!", "%", "#", "/", "־"]; extendedShifted: ["?", "-", "_", "+", "!", "%", "#", "/", "־"]; anchors.right: enterKey.left; height: parent.height; } |
| 576 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 577 | } |
| 578 | } // column |
| 579 | |
| 580 | === modified file 'plugins/he/qml/Keyboard_he_email.qml' |
| 581 | --- plugins/he/qml/Keyboard_he_email.qml 2014-11-27 16:57:43 +0000 |
| 582 | +++ plugins/he/qml/Keyboard_he_email.qml 2015-03-13 15:59:15 +0000 |
| 583 | @@ -86,7 +86,7 @@ |
| 584 | CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 585 | SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; } |
| 586 | UrlKey { id: urlKey; label: ".il"; extended: [".com"]; anchors.right: dotKey.left; height: parent.height; } |
| 587 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!", "־"]; extendedShifted: ["?", "!", "־"]; anchors.right: enterKey.left; height: parent.height; } |
| 588 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "+", "!", "%", "#", "/", "־"]; extendedShifted: ["?", "-", "_", "+", "!", "%", "#", "/", "־"]; anchors.right: enterKey.left; height: parent.height; } |
| 589 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 590 | } |
| 591 | } // column |
| 592 | |
| 593 | === modified file 'plugins/he/qml/Keyboard_he_url.qml' |
| 594 | --- plugins/he/qml/Keyboard_he_url.qml 2014-11-27 16:57:43 +0000 |
| 595 | +++ plugins/he/qml/Keyboard_he_url.qml 2015-03-13 15:59:15 +0000 |
| 596 | @@ -85,7 +85,7 @@ |
| 597 | LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; } |
| 598 | CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 599 | UrlKey { id: urlKey; label: ".il"; extended: [".com"]; anchors.right: dotKey.left; height: parent.height; } |
| 600 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!", "־"]; extendedShifted: ["?", "!", "־"]; anchors.right: enterKey.left; height: parent.height; } |
| 601 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "+", "!", "%", "#", "/", "־"]; extendedShifted: ["?", "-", "_", "+", "!", "%", "#", "/", "־"]; anchors.right: enterKey.left; height: parent.height; } |
| 602 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 603 | } |
| 604 | } // column |
| 605 | |
| 606 | === modified file 'plugins/he/qml/Keyboard_he_url_search.qml' |
| 607 | --- plugins/he/qml/Keyboard_he_url_search.qml 2014-11-27 16:57:43 +0000 |
| 608 | +++ plugins/he/qml/Keyboard_he_url_search.qml 2015-03-13 15:59:15 +0000 |
| 609 | @@ -86,7 +86,7 @@ |
| 610 | CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 611 | SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; } |
| 612 | UrlKey { id: urlKey; label: ".il"; extended: [".com"]; anchors.right: dotKey.left; height: parent.height; } |
| 613 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!", "־"]; extendedShifted: ["?", "!", "־"]; anchors.right: enterKey.left; height: parent.height; } |
| 614 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "+", "!", "%", "#", "/", "־"]; extendedShifted: ["?", "-", "_", "+", "!", "%", "#", "/", "־"]; anchors.right: enterKey.left; height: parent.height; } |
| 615 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 616 | } |
| 617 | } // column |
| 618 | |
| 619 | === modified file 'plugins/hr/qml/Keyboard_hr.qml' |
| 620 | --- plugins/hr/qml/Keyboard_hr.qml 2014-10-29 11:17:42 +0000 |
| 621 | +++ plugins/hr/qml/Keyboard_hr.qml 2015-03-13 15:59:15 +0000 |
| 622 | @@ -83,9 +83,9 @@ |
| 623 | |
| 624 | SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; height: parent.height; } |
| 625 | LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; } |
| 626 | - CharKey { id: commaKey; label: ","; shifted: "/"; extended: ["'", ";", ":"]; anchors.left: languageMenuButton.right; height: parent.height; } |
| 627 | + CharKey { id: commaKey; label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "(", ")"]; anchors.left: languageMenuButton.right; height: parent.height; } |
| 628 | SpaceKey { id: spaceKey; anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; } |
| 629 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 630 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 631 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 632 | } |
| 633 | } // column |
| 634 | |
| 635 | === modified file 'plugins/hr/qml/Keyboard_hr_email.qml' |
| 636 | --- plugins/hr/qml/Keyboard_hr_email.qml 2014-10-29 11:17:42 +0000 |
| 637 | +++ plugins/hr/qml/Keyboard_hr_email.qml 2015-03-13 15:59:15 +0000 |
| 638 | @@ -86,7 +86,7 @@ |
| 639 | CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 640 | SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; } |
| 641 | UrlKey { id: urlKey; label: ".com"; extended: [".ba", "com.ba", ".net", ".org", ".edu.ba", ".gov.ba"]; anchors.right: dotKey.left; height: parent.height; } |
| 642 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 643 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 644 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 645 | } |
| 646 | } // column |
| 647 | |
| 648 | === modified file 'plugins/hr/qml/Keyboard_hr_url.qml' |
| 649 | --- plugins/hr/qml/Keyboard_hr_url.qml 2014-10-29 11:17:42 +0000 |
| 650 | +++ plugins/hr/qml/Keyboard_hr_url.qml 2015-03-13 15:59:15 +0000 |
| 651 | @@ -85,7 +85,7 @@ |
| 652 | LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; } |
| 653 | CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 654 | UrlKey { id: urlKey; label: ".com"; extended: [".ba", "com.ba", ".net", ".org", ".edu.ba", ".gov.ba"]; anchors.right: dotKey.left; height: parent.height; } |
| 655 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 656 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 657 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 658 | } |
| 659 | } // column |
| 660 | |
| 661 | === modified file 'plugins/hr/qml/Keyboard_hr_url_search.qml' |
| 662 | --- plugins/hr/qml/Keyboard_hr_url_search.qml 2014-11-14 16:50:54 +0000 |
| 663 | +++ plugins/hr/qml/Keyboard_hr_url_search.qml 2015-03-13 15:59:15 +0000 |
| 664 | @@ -87,7 +87,7 @@ |
| 665 | CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 666 | SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; } |
| 667 | UrlKey { id: urlKey; label: ".com"; extended: [".ba", "com.ba", ".net", ".org", ".edu.ba", ".gov.ba"]; anchors.right: dotKey.left; height: parent.height; } |
| 668 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 669 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 670 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 671 | } |
| 672 | } // column |
| 673 | |
| 674 | === modified file 'plugins/hu/qml/Keyboard_hu.qml' |
| 675 | --- plugins/hu/qml/Keyboard_hu.qml 2014-09-26 13:22:23 +0000 |
| 676 | +++ plugins/hu/qml/Keyboard_hu.qml 2015-03-13 15:59:15 +0000 |
| 677 | @@ -83,9 +83,9 @@ |
| 678 | |
| 679 | SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; height: parent.height; } |
| 680 | LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; } |
| 681 | - CharKey { id: commaKey; label: ","; shifted: "/"; extended: ["'", ";", ":"]; anchors.left: languageMenuButton.right; height: parent.height; } |
| 682 | + CharKey { id: commaKey; label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "(", ")"]; anchors.left: languageMenuButton.right; height: parent.height; } |
| 683 | SpaceKey { id: spaceKey; anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; } |
| 684 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 685 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 686 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 687 | } |
| 688 | } // column |
| 689 | |
| 690 | === modified file 'plugins/hu/qml/Keyboard_hu_email.qml' |
| 691 | --- plugins/hu/qml/Keyboard_hu_email.qml 2014-11-27 16:57:43 +0000 |
| 692 | +++ plugins/hu/qml/Keyboard_hu_email.qml 2015-03-13 15:59:15 +0000 |
| 693 | @@ -86,7 +86,7 @@ |
| 694 | CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 695 | SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; } |
| 696 | UrlKey { id: urlKey; label: ".hu"; extended: [".com"]; anchors.right: dotKey.left; height: parent.height; } |
| 697 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 698 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 699 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 700 | } |
| 701 | } // column |
| 702 | |
| 703 | === modified file 'plugins/hu/qml/Keyboard_hu_url.qml' |
| 704 | --- plugins/hu/qml/Keyboard_hu_url.qml 2014-11-27 16:57:43 +0000 |
| 705 | +++ plugins/hu/qml/Keyboard_hu_url.qml 2015-03-13 15:59:15 +0000 |
| 706 | @@ -85,7 +85,7 @@ |
| 707 | LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; } |
| 708 | CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 709 | UrlKey { id: urlKey; label: ".hu"; extended: [".com"]; anchors.right: dotKey.left; height: parent.height; } |
| 710 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 711 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 712 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 713 | } |
| 714 | } // column |
| 715 | |
| 716 | === modified file 'plugins/hu/qml/Keyboard_hu_url_search.qml' |
| 717 | --- plugins/hu/qml/Keyboard_hu_url_search.qml 2014-11-27 16:57:43 +0000 |
| 718 | +++ plugins/hu/qml/Keyboard_hu_url_search.qml 2015-03-13 15:59:15 +0000 |
| 719 | @@ -86,7 +86,7 @@ |
| 720 | CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 721 | SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; } |
| 722 | UrlKey { id: urlKey; label: ".hu"; extended: [".com"]; anchors.right: dotKey.left; height: parent.height; } |
| 723 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 724 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 725 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 726 | } |
| 727 | } // column |
| 728 | |
| 729 | === modified file 'plugins/it/qml/Keyboard_it.qml' |
| 730 | --- plugins/it/qml/Keyboard_it.qml 2014-09-26 13:22:23 +0000 |
| 731 | +++ plugins/it/qml/Keyboard_it.qml 2015-03-13 15:59:15 +0000 |
| 732 | @@ -83,9 +83,9 @@ |
| 733 | |
| 734 | SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; height: parent.height; } |
| 735 | LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; } |
| 736 | - CharKey { id: commaKey; label: ","; shifted: "/"; extended: ["'", ";", ":"]; anchors.left: languageMenuButton.right; height: parent.height; } |
| 737 | + CharKey { id: commaKey; label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "(", ")"]; anchors.left: languageMenuButton.right; height: parent.height; } |
| 738 | SpaceKey { id: spaceKey; anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; } |
| 739 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 740 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 741 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 742 | } |
| 743 | } // column |
| 744 | |
| 745 | === modified file 'plugins/it/qml/Keyboard_it_email.qml' |
| 746 | --- plugins/it/qml/Keyboard_it_email.qml 2014-11-27 16:57:43 +0000 |
| 747 | +++ plugins/it/qml/Keyboard_it_email.qml 2015-03-13 15:59:15 +0000 |
| 748 | @@ -86,7 +86,7 @@ |
| 749 | CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 750 | SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; } |
| 751 | UrlKey { id: urlKey; label: ".it"; extended: [".com", ".ch", ".va", ".sm"]; anchors.right: dotKey.left; height: parent.height; } |
| 752 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 753 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 754 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 755 | } |
| 756 | } // column |
| 757 | |
| 758 | === modified file 'plugins/it/qml/Keyboard_it_url.qml' |
| 759 | --- plugins/it/qml/Keyboard_it_url.qml 2014-11-27 16:57:43 +0000 |
| 760 | +++ plugins/it/qml/Keyboard_it_url.qml 2015-03-13 15:59:15 +0000 |
| 761 | @@ -85,7 +85,7 @@ |
| 762 | LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; } |
| 763 | CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 764 | UrlKey { id: urlKey; label: ".it"; extended: [".com", ".ch", ".va", ".sm"]; anchors.right: dotKey.left; height: parent.height; } |
| 765 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 766 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 767 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 768 | } |
| 769 | } // column |
| 770 | |
| 771 | === modified file 'plugins/it/qml/Keyboard_it_url_search.qml' |
| 772 | --- plugins/it/qml/Keyboard_it_url_search.qml 2014-11-27 16:57:43 +0000 |
| 773 | +++ plugins/it/qml/Keyboard_it_url_search.qml 2015-03-13 15:59:15 +0000 |
| 774 | @@ -86,7 +86,7 @@ |
| 775 | CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 776 | SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; } |
| 777 | UrlKey { id: urlKey; label: ".it"; extended: [".com", ".ch", ".va", ".sm"]; anchors.right: dotKey.left; height: parent.height; } |
| 778 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 779 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 780 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 781 | } |
| 782 | } // column |
| 783 | |
| 784 | === modified file 'plugins/nl/qml/Keyboard_nl.qml' |
| 785 | --- plugins/nl/qml/Keyboard_nl.qml 2014-09-26 13:22:23 +0000 |
| 786 | +++ plugins/nl/qml/Keyboard_nl.qml 2015-03-13 15:59:15 +0000 |
| 787 | @@ -83,9 +83,9 @@ |
| 788 | |
| 789 | SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; height: parent.height; } |
| 790 | LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; } |
| 791 | - CharKey { id: commaKey; label: ","; shifted: "/"; extended: ["'", ";", ":"]; anchors.left: languageMenuButton.right; height: parent.height; } |
| 792 | + CharKey { id: commaKey; label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "(", ")"]; anchors.left: languageMenuButton.right; height: parent.height; } |
| 793 | SpaceKey { id: spaceKey; anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; } |
| 794 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 795 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 796 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 797 | } |
| 798 | } // column |
| 799 | |
| 800 | === modified file 'plugins/nl/qml/Keyboard_nl_email.qml' |
| 801 | --- plugins/nl/qml/Keyboard_nl_email.qml 2014-11-27 16:57:43 +0000 |
| 802 | +++ plugins/nl/qml/Keyboard_nl_email.qml 2015-03-13 15:59:15 +0000 |
| 803 | @@ -86,7 +86,7 @@ |
| 804 | CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 805 | SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; } |
| 806 | UrlKey { id: urlKey; label: ".nl"; extended: [".com", ".be", ".an", ".sx", ".sr", ".aw", ".cw"]; anchors.right: dotKey.left; height: parent.height; } |
| 807 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 808 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 809 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 810 | } |
| 811 | } // column |
| 812 | |
| 813 | === modified file 'plugins/nl/qml/Keyboard_nl_url.qml' |
| 814 | --- plugins/nl/qml/Keyboard_nl_url.qml 2014-11-27 16:57:43 +0000 |
| 815 | +++ plugins/nl/qml/Keyboard_nl_url.qml 2015-03-13 15:59:15 +0000 |
| 816 | @@ -85,7 +85,7 @@ |
| 817 | LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; } |
| 818 | CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 819 | UrlKey { id: urlKey; label: ".nl"; extended: [".com", ".be", ".an", ".sx", ".sr", ".aw", ".cw"]; anchors.right: dotKey.left; height: parent.height; } |
| 820 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 821 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 822 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 823 | } |
| 824 | } // column |
| 825 | |
| 826 | === modified file 'plugins/nl/qml/Keyboard_nl_url_search.qml' |
| 827 | --- plugins/nl/qml/Keyboard_nl_url_search.qml 2014-11-27 16:57:43 +0000 |
| 828 | +++ plugins/nl/qml/Keyboard_nl_url_search.qml 2015-03-13 15:59:15 +0000 |
| 829 | @@ -86,7 +86,7 @@ |
| 830 | CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 831 | SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; } |
| 832 | UrlKey { id: urlKey; label: ".nl"; extended: [".com", ".be", ".an", ".sx", ".sr", ".aw", ".cw"]; anchors.right: dotKey.left; height: parent.height; } |
| 833 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 834 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 835 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 836 | } |
| 837 | } // column |
| 838 | |
| 839 | === modified file 'plugins/pl/qml/Keyboard_pl.qml' |
| 840 | --- plugins/pl/qml/Keyboard_pl.qml 2014-09-26 13:22:23 +0000 |
| 841 | +++ plugins/pl/qml/Keyboard_pl.qml 2015-03-13 15:59:15 +0000 |
| 842 | @@ -87,9 +87,9 @@ |
| 843 | |
| 844 | SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; height: parent.height; } |
| 845 | LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; } |
| 846 | - CharKey { id: commaKey; label: ","; shifted: "/"; extended: ["'", ";", ":"]; anchors.left: languageMenuButton.right; height: parent.height; } |
| 847 | + CharKey { id: commaKey; label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "(", ")"]; anchors.left: languageMenuButton.right; height: parent.height; } |
| 848 | SpaceKey { id: spaceKey; anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; } |
| 849 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 850 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 851 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 852 | } |
| 853 | } // column |
| 854 | |
| 855 | === modified file 'plugins/pl/qml/Keyboard_pl_email.qml' |
| 856 | --- plugins/pl/qml/Keyboard_pl_email.qml 2014-11-27 16:57:43 +0000 |
| 857 | +++ plugins/pl/qml/Keyboard_pl_email.qml 2015-03-13 15:59:15 +0000 |
| 858 | @@ -90,7 +90,7 @@ |
| 859 | CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 860 | SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; } |
| 861 | UrlKey { id: urlKey; label: ".pl"; extended: [".com"]; anchors.right: dotKey.left; height: parent.height; } |
| 862 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 863 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 864 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 865 | } |
| 866 | } // column |
| 867 | |
| 868 | === modified file 'plugins/pl/qml/Keyboard_pl_url.qml' |
| 869 | --- plugins/pl/qml/Keyboard_pl_url.qml 2014-11-27 16:57:43 +0000 |
| 870 | +++ plugins/pl/qml/Keyboard_pl_url.qml 2015-03-13 15:59:15 +0000 |
| 871 | @@ -89,7 +89,7 @@ |
| 872 | LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; } |
| 873 | CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 874 | UrlKey { id: urlKey; label: ".pl"; extended: [".com"]; anchors.right: dotKey.left; height: parent.height; } |
| 875 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 876 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 877 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 878 | } |
| 879 | } // column |
| 880 | |
| 881 | === modified file 'plugins/pl/qml/Keyboard_pl_url_search.qml' |
| 882 | --- plugins/pl/qml/Keyboard_pl_url_search.qml 2014-11-27 16:57:43 +0000 |
| 883 | +++ plugins/pl/qml/Keyboard_pl_url_search.qml 2015-03-13 15:59:15 +0000 |
| 884 | @@ -90,7 +90,7 @@ |
| 885 | CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 886 | SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; } |
| 887 | UrlKey { id: urlKey; label: ".pl"; extended: [".com"]; anchors.right: dotKey.left; height: parent.height; } |
| 888 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 889 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 890 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 891 | } |
| 892 | } // column |
| 893 | |
| 894 | === modified file 'plugins/pt/qml/Keyboard_pt.qml' |
| 895 | --- plugins/pt/qml/Keyboard_pt.qml 2014-09-26 13:22:23 +0000 |
| 896 | +++ plugins/pt/qml/Keyboard_pt.qml 2015-03-13 15:59:15 +0000 |
| 897 | @@ -84,9 +84,9 @@ |
| 898 | |
| 899 | SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; height: parent.height; } |
| 900 | LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; } |
| 901 | - CharKey { id: commaKey; label: ","; shifted: "/"; extended: ["'", ";", ":"]; anchors.left: languageMenuButton.right; height: parent.height; } |
| 902 | + CharKey { id: commaKey; label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "(", ")"]; anchors.left: languageMenuButton.right; height: parent.height; } |
| 903 | SpaceKey { id: spaceKey; anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; } |
| 904 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 905 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 906 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 907 | } |
| 908 | } // column |
| 909 | |
| 910 | === modified file 'plugins/pt/qml/Keyboard_pt_email.qml' |
| 911 | --- plugins/pt/qml/Keyboard_pt_email.qml 2014-11-27 16:57:43 +0000 |
| 912 | +++ plugins/pt/qml/Keyboard_pt_email.qml 2015-03-13 15:59:15 +0000 |
| 913 | @@ -87,7 +87,7 @@ |
| 914 | CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 915 | SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; } |
| 916 | UrlKey { id: urlKey; label: ".com.br"; extended: [".com", ".pt", ".mz", ".ao", ".gw", ".tl"]; anchors.right: dotKey.left; height: parent.height; width: panel.keyWidth + units.gu(UI.emailLayoutUrlKeyPadding + 0.5); } |
| 917 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 918 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 919 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 920 | } |
| 921 | } // column |
| 922 | |
| 923 | === modified file 'plugins/pt/qml/Keyboard_pt_url.qml' |
| 924 | --- plugins/pt/qml/Keyboard_pt_url.qml 2014-11-27 16:57:43 +0000 |
| 925 | +++ plugins/pt/qml/Keyboard_pt_url.qml 2015-03-13 15:59:15 +0000 |
| 926 | @@ -86,7 +86,7 @@ |
| 927 | LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; } |
| 928 | CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 929 | UrlKey { id: urlKey; label: ".com.br"; extended: [".com", ".pt", ".mz", ".ao", ".gw", ".tl"]; anchors.right: dotKey.left; height: parent.height; width: panel.keyWidth + units.gu(UI.emailLayoutUrlKeyPadding + 0.5); } |
| 930 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 931 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 932 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 933 | } |
| 934 | } // column |
| 935 | |
| 936 | === modified file 'plugins/pt/qml/Keyboard_pt_url_search.qml' |
| 937 | --- plugins/pt/qml/Keyboard_pt_url_search.qml 2014-11-27 16:57:43 +0000 |
| 938 | +++ plugins/pt/qml/Keyboard_pt_url_search.qml 2015-03-13 15:59:15 +0000 |
| 939 | @@ -87,7 +87,7 @@ |
| 940 | CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 941 | SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; } |
| 942 | UrlKey { id: urlKey; label: ".com.br"; extended: [".com", ".pt", ".mz", ".ao", ".gw", ".tl"]; anchors.right: dotKey.left; height: parent.height; width: panel.keyWidth + units.gu(UI.emailLayoutUrlKeyPadding + 0.5); } |
| 943 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 944 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 945 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 946 | } |
| 947 | } // column |
| 948 | |
| 949 | === modified file 'plugins/ru/qml/Keyboard_ru.qml' |
| 950 | --- plugins/ru/qml/Keyboard_ru.qml 2014-09-26 13:22:23 +0000 |
| 951 | +++ plugins/ru/qml/Keyboard_ru.qml 2015-03-13 15:59:15 +0000 |
| 952 | @@ -89,9 +89,9 @@ |
| 953 | |
| 954 | SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; height: parent.height; } |
| 955 | LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; } |
| 956 | - CharKey { id: commaKey; label: ","; shifted: "/"; extended: ["'", ";", ":"]; anchors.left: languageMenuButton.right; height: parent.height; } |
| 957 | + CharKey { id: commaKey; label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "(", ")"]; anchors.left: languageMenuButton.right; height: parent.height; } |
| 958 | SpaceKey { id: spaceKey; anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; } |
| 959 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 960 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 961 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 962 | } |
| 963 | } // column |
| 964 | |
| 965 | === modified file 'plugins/ru/qml/Keyboard_ru_email.qml' |
| 966 | --- plugins/ru/qml/Keyboard_ru_email.qml 2014-11-27 16:57:43 +0000 |
| 967 | +++ plugins/ru/qml/Keyboard_ru_email.qml 2015-03-13 15:59:15 +0000 |
| 968 | @@ -91,7 +91,7 @@ |
| 969 | CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 970 | SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; } |
| 971 | UrlKey { id: urlKey; label: ".ru"; extended: [".com", ".ua",".su",".kg",".рф",".укр",".by",".tj"]; anchors.right: dotKey.left; height: parent.height; } |
| 972 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 973 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 974 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 975 | } |
| 976 | } // column |
| 977 | |
| 978 | === modified file 'plugins/ru/qml/Keyboard_ru_url.qml' |
| 979 | --- plugins/ru/qml/Keyboard_ru_url.qml 2014-11-27 16:57:43 +0000 |
| 980 | +++ plugins/ru/qml/Keyboard_ru_url.qml 2015-03-13 15:59:15 +0000 |
| 981 | @@ -90,7 +90,7 @@ |
| 982 | LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; } |
| 983 | CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 984 | UrlKey { id: urlKey; label: ".ru"; extended: [".com", ".ua",".su",".kg",".рф","укр",".by",".tj"]; anchors.right: dotKey.left; height: parent.height; } |
| 985 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 986 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 987 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 988 | } |
| 989 | } // column |
| 990 | |
| 991 | === modified file 'plugins/ru/qml/Keyboard_ru_url_search.qml' |
| 992 | --- plugins/ru/qml/Keyboard_ru_url_search.qml 2014-11-27 16:57:43 +0000 |
| 993 | +++ plugins/ru/qml/Keyboard_ru_url_search.qml 2015-03-13 15:59:15 +0000 |
| 994 | @@ -91,7 +91,7 @@ |
| 995 | CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 996 | SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; } |
| 997 | UrlKey { id: urlKey; label: ".ru"; extended: [".com", ".ua",".su",".kg",".рф","укр",".by",".tj"]; anchors.right: dotKey.left; height: parent.height; } |
| 998 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 999 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 1000 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 1001 | } |
| 1002 | } // column |
| 1003 | |
| 1004 | === modified file 'plugins/sr/qml/Keyboard_sr.qml' |
| 1005 | --- plugins/sr/qml/Keyboard_sr.qml 2014-09-26 13:22:23 +0000 |
| 1006 | +++ plugins/sr/qml/Keyboard_sr.qml 2015-03-13 15:59:15 +0000 |
| 1007 | @@ -68,7 +68,7 @@ |
| 1008 | spacing: 0 |
| 1009 | |
| 1010 | ShiftKey { } |
| 1011 | - CharKey { label: ","; shifted: "/"; } |
| 1012 | + CharKey { label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "(", ")"]; } |
| 1013 | CharKey { label: "џ"; shifted: "Џ"; } |
| 1014 | CharKey { label: "ц"; shifted: "Ц"; } |
| 1015 | CharKey { label: "в"; shifted: "В"; } |
| 1016 | @@ -76,7 +76,7 @@ |
| 1017 | CharKey { label: "н"; shifted: "Н"; } |
| 1018 | CharKey { label: "м"; shifted: "М"; } |
| 1019 | CharKey { label: "ж"; shifted: "Ж"; } |
| 1020 | - CharKey { label: "."; shifted: "."; } |
| 1021 | + CharKey { label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; } |
| 1022 | BackspaceKey { } |
| 1023 | } |
| 1024 | |
| 1025 | |
| 1026 | === modified file 'plugins/sr/qml/Keyboard_sr_email.qml' |
| 1027 | --- plugins/sr/qml/Keyboard_sr_email.qml 2014-11-27 16:57:43 +0000 |
| 1028 | +++ plugins/sr/qml/Keyboard_sr_email.qml 2015-03-13 15:59:15 +0000 |
| 1029 | @@ -77,7 +77,7 @@ |
| 1030 | CharKey { label: "н"; shifted: "Н"; } |
| 1031 | CharKey { label: "м"; shifted: "М"; } |
| 1032 | CharKey { label: "ж"; shifted: "Ж"; } |
| 1033 | - CharKey { label: "."; shifted: "."; } |
| 1034 | + CharKey { label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; } |
| 1035 | BackspaceKey { } |
| 1036 | } |
| 1037 | |
| 1038 | |
| 1039 | === modified file 'plugins/sr/qml/Keyboard_sr_url.qml' |
| 1040 | --- plugins/sr/qml/Keyboard_sr_url.qml 2014-11-27 16:57:43 +0000 |
| 1041 | +++ plugins/sr/qml/Keyboard_sr_url.qml 2015-03-13 15:59:15 +0000 |
| 1042 | @@ -77,7 +77,7 @@ |
| 1043 | CharKey { label: "н"; shifted: "Н"; } |
| 1044 | CharKey { label: "м"; shifted: "М"; } |
| 1045 | CharKey { label: "ж"; shifted: "Ж"; } |
| 1046 | - CharKey { label: "."; shifted: "."; } |
| 1047 | + CharKey { label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; } |
| 1048 | BackspaceKey { } |
| 1049 | } |
| 1050 | |
| 1051 | |
| 1052 | === modified file 'plugins/sr/qml/Keyboard_sr_url_search.qml' |
| 1053 | --- plugins/sr/qml/Keyboard_sr_url_search.qml 2014-11-27 16:57:43 +0000 |
| 1054 | +++ plugins/sr/qml/Keyboard_sr_url_search.qml 2015-03-13 15:59:15 +0000 |
| 1055 | @@ -77,7 +77,7 @@ |
| 1056 | CharKey { label: "н"; shifted: "Н"; } |
| 1057 | CharKey { label: "м"; shifted: "М"; } |
| 1058 | CharKey { label: "ж"; shifted: "Ж"; } |
| 1059 | - CharKey { label: "."; shifted: "."; } |
| 1060 | + CharKey { label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; } |
| 1061 | BackspaceKey { } |
| 1062 | } |
| 1063 | |
| 1064 | |
| 1065 | === modified file 'plugins/sv/qml/Keyboard_sv.qml' |
| 1066 | --- plugins/sv/qml/Keyboard_sv.qml 2014-09-26 13:22:23 +0000 |
| 1067 | +++ plugins/sv/qml/Keyboard_sv.qml 2015-03-13 15:59:15 +0000 |
| 1068 | @@ -86,9 +86,9 @@ |
| 1069 | |
| 1070 | SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; height: parent.height; } |
| 1071 | LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; } |
| 1072 | - CharKey { id: commaKey; label: ","; shifted: "/"; extended: ["'", ";", ":"]; anchors.left: languageMenuButton.right; height: parent.height; } |
| 1073 | + CharKey { id: commaKey; label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "(", ")"]; anchors.left: languageMenuButton.right; height: parent.height; } |
| 1074 | SpaceKey { id: spaceKey; anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; } |
| 1075 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 1076 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 1077 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 1078 | } |
| 1079 | } // column |
| 1080 | |
| 1081 | === modified file 'plugins/sv/qml/Keyboard_sv_email.qml' |
| 1082 | --- plugins/sv/qml/Keyboard_sv_email.qml 2014-11-27 16:57:43 +0000 |
| 1083 | +++ plugins/sv/qml/Keyboard_sv_email.qml 2015-03-13 15:59:15 +0000 |
| 1084 | @@ -89,7 +89,7 @@ |
| 1085 | CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 1086 | SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; } |
| 1087 | UrlKey { id: urlKey; label: ".se"; extended: [".com", ".fi", ".ax"]; anchors.right: dotKey.left; height: parent.height; } |
| 1088 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 1089 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 1090 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 1091 | |
| 1092 | |
| 1093 | |
| 1094 | === modified file 'plugins/sv/qml/Keyboard_sv_url.qml' |
| 1095 | --- plugins/sv/qml/Keyboard_sv_url.qml 2014-11-27 16:57:43 +0000 |
| 1096 | +++ plugins/sv/qml/Keyboard_sv_url.qml 2015-03-13 15:59:15 +0000 |
| 1097 | @@ -88,7 +88,7 @@ |
| 1098 | LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; } |
| 1099 | CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 1100 | UrlKey { id: urlKey; label: ".se"; extended: [".com", ".fi", ".ax"]; anchors.right: dotKey.left; height: parent.height; } |
| 1101 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 1102 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 1103 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 1104 | } |
| 1105 | } // column |
| 1106 | |
| 1107 | === modified file 'plugins/sv/qml/Keyboard_sv_url_search.qml' |
| 1108 | --- plugins/sv/qml/Keyboard_sv_url_search.qml 2014-11-27 16:57:43 +0000 |
| 1109 | +++ plugins/sv/qml/Keyboard_sv_url_search.qml 2015-03-13 15:59:15 +0000 |
| 1110 | @@ -90,7 +90,7 @@ |
| 1111 | CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; } |
| 1112 | SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; } |
| 1113 | UrlKey { id: urlKey; label: ".se"; extended: [".com", ".fi", ".ax"]; anchors.right: dotKey.left; height: parent.height; } |
| 1114 | - CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; } |
| 1115 | + CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; } |
| 1116 | ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; } |
| 1117 | } |
| 1118 | } // column |
| 1119 | |
| 1120 | === modified file 'tests/autopilot/ubuntu_keyboard/emulators/keyboard.py' |
| 1121 | --- tests/autopilot/ubuntu_keyboard/emulators/keyboard.py 2015-02-13 16:12:59 +0000 |
| 1122 | +++ tests/autopilot/ubuntu_keyboard/emulators/keyboard.py 2015-03-13 15:59:15 +0000 |
| 1123 | @@ -24,6 +24,7 @@ |
| 1124 | |
| 1125 | from time import sleep |
| 1126 | import logging |
| 1127 | +import os |
| 1128 | |
| 1129 | from autopilot.input import Pointer, Touch |
| 1130 | from autopilot.introspection import ( |
| 1131 | @@ -160,7 +161,7 @@ |
| 1132 | except AssertionError: |
| 1133 | return False |
| 1134 | |
| 1135 | - def press_key(self, key, capslock_switch=False, long_press=False): |
| 1136 | + def press_key(self, key, capslock_switch=False, long_press=False, slide_offset=None): |
| 1137 | """Tap on the key with the internal pointer |
| 1138 | |
| 1139 | :params key: String containing the text of the key to tap. |
| 1140 | @@ -191,7 +192,9 @@ |
| 1141 | self._show_keypad(req_keypad) |
| 1142 | self._change_keypad_to_state(req_key_state) |
| 1143 | |
| 1144 | - if long_press: |
| 1145 | + if slide_offset != None: |
| 1146 | + self._select_extended_key(key_pos, slide_offset) |
| 1147 | + elif long_press: |
| 1148 | self._long_press_key(key_pos) |
| 1149 | else: |
| 1150 | self._tap_key(key_pos) |
| 1151 | @@ -322,6 +325,16 @@ |
| 1152 | sleep(0.5) |
| 1153 | pointer.release() |
| 1154 | |
| 1155 | + def _select_extended_key(self, key_rect, offset, pointer=None): |
| 1156 | + if pointer is None: |
| 1157 | + pointer = Pointer(Touch.create()) |
| 1158 | + |
| 1159 | + gu = float(os.environ.get('GRID_UNIT_PX', 8)) |
| 1160 | + |
| 1161 | + pointer.drag(key_rect.x + key_rect.w / 2.0, key_rect.y + key_rect.h / 2.0, |
| 1162 | + key_rect.x + key_rect.w / 2.0 + offset, key_rect.y + key_rect.h / 2.0, |
| 1163 | + rate=2.77 * gu, time_between_events=2) |
| 1164 | + |
| 1165 | def _keyboard_details_changed(self): |
| 1166 | return self._orientation_changed() |
| 1167 | |
| 1168 | |
| 1169 | === modified file 'tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py' |
| 1170 | --- tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py 2015-03-13 15:59:15 +0000 |
| 1171 | +++ tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py 2015-03-13 15:59:15 +0000 |
| 1172 | @@ -61,7 +61,7 @@ |
| 1173 | self.skipTest("Ubuntu Keyboard tests only run on device.") |
| 1174 | super(UbuntuKeyboardTests, self).setUp() |
| 1175 | self.set_test_settings() |
| 1176 | - sleep(1) # Have to give time for gsettings change to propogate |
| 1177 | + sleep(5) # Have to give time for gsettings change to propogate |
| 1178 | self.pointer = Pointer(Touch.create()) |
| 1179 | |
| 1180 | def set_test_settings(self): |
| 1181 | @@ -606,6 +606,47 @@ |
| 1182 | Eventually(Equals(expected)) |
| 1183 | ) |
| 1184 | |
| 1185 | + def test_extended_punctuation(self): |
| 1186 | + """The characters -_!?+%#/ and ";:'@&() should be available as |
| 1187 | + extended keys from the . and , keys. |
| 1188 | + |
| 1189 | + """ |
| 1190 | + |
| 1191 | + text_area = self.launch_test_input_area() |
| 1192 | + self.ensure_focus_on_input(text_area) |
| 1193 | + keyboard = Keyboard() |
| 1194 | + self.addCleanup(keyboard.dismiss) |
| 1195 | + |
| 1196 | + gu = float(os.environ.get('GRID_UNIT_PX', 8)) |
| 1197 | + |
| 1198 | + # The extended key positions aren't accessible until the |
| 1199 | + # drag has already started, so we need to provide their |
| 1200 | + # offsets manually based on the known extended key cell |
| 1201 | + # width |
| 1202 | + keyboard.press_key('.', slide_offset=-17.5 * gu) |
| 1203 | + keyboard.press_key('.', slide_offset=-14 * gu) |
| 1204 | + keyboard.press_key('.', slide_offset=-10.5 * gu) |
| 1205 | + keyboard.press_key('.', slide_offset=-7.5 * gu) |
| 1206 | + keyboard.press_key('.', slide_offset=-3.5 * gu) |
| 1207 | + keyboard.press_key('.', slide_offset=1) |
| 1208 | + keyboard.press_key('.', slide_offset=3.5 * gu) |
| 1209 | + keyboard.press_key('.', slide_offset=7 * gu) |
| 1210 | + |
| 1211 | + keyboard.press_key(',', slide_offset=-10.5 * gu) |
| 1212 | + keyboard.press_key(',', slide_offset=-7 * gu) |
| 1213 | + keyboard.press_key(',', slide_offset=-3.5 * gu) |
| 1214 | + keyboard.press_key(',', slide_offset=-1 * gu) |
| 1215 | + keyboard.press_key(',', slide_offset=3.5 * gu) |
| 1216 | + keyboard.press_key(',', slide_offset=7 * gu) |
| 1217 | + keyboard.press_key(',', slide_offset=10.5 * gu) |
| 1218 | + keyboard.press_key(',', slide_offset=14 * gu) |
| 1219 | + |
| 1220 | + expected = "-_!?+%#/\";:'@&()" |
| 1221 | + self.assertThat( |
| 1222 | + text_area.text, |
| 1223 | + Eventually(Equals(expected)) |
| 1224 | + ) |
| 1225 | + |
| 1226 | |
| 1227 | class UbuntuKeyboardPinyin(UbuntuKeyboardTests): |
| 1228 | |
| 1229 | @@ -781,7 +822,7 @@ |
| 1230 | |
| 1231 | keyboard.press_key("language") |
| 1232 | |
| 1233 | - sleep(1) |
| 1234 | + sleep(5) |
| 1235 | |
| 1236 | keyboard = Keyboard() |
| 1237 | |
| 1238 | @@ -805,7 +846,7 @@ |
| 1239 | |
| 1240 | keyboard.press_key("language") |
| 1241 | |
| 1242 | - sleep(1) |
| 1243 | + sleep(5) |
| 1244 | |
| 1245 | keyboard = Keyboard() |
| 1246 |

FAILED: Continuous integration, rev:322 jenkins. qa.ubuntu. com/job/ ubuntu- keyboard- ci/568/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- vivid-touch/ 1754 jenkins. qa.ubuntu. com/job/ ubuntu- keyboard- vivid-amd64- ci/69 jenkins. qa.ubuntu. com/job/ ubuntu- keyboard- vivid-armhf- ci/69 jenkins. qa.ubuntu. com/job/ ubuntu- keyboard- vivid-armhf- ci/69/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ ubuntu- keyboard- vivid-i386- ci/69 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- vivid-mako/ 1553 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 1752 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 1752/artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 18803
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/ubuntu- keyboard- ci/568/ rebuild
http://