Merge lp:~michael-sheldon/ubuntu-keyboard/visual-refresh into lp:ubuntu-keyboard
- visual-refresh
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Bill Filler |
Approved revision: | no longer in the source branch. |
Merged at revision: | 442 |
Proposed branch: | lp:~michael-sheldon/ubuntu-keyboard/visual-refresh |
Merge into: | lp:ubuntu-keyboard |
Diff against target: |
3229 lines (+1006/-358) 150 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 (+1/-1) 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 (+1/-1) 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 (+1/-1) 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 (+1/-1) 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 (+1/-1) 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 (+1/-1) 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/el/qml/Keyboard_el.qml (+1/-1) plugins/el/qml/Keyboard_el_email.qml (+1/-1) plugins/el/qml/Keyboard_el_url.qml (+1/-1) plugins/el/qml/Keyboard_el_url_search.qml (+1/-1) plugins/emoji/qml/Keyboard_emoji.qml (+1/-1) plugins/en/qml/Keyboard_en.qml (+1/-1) 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 (+1/-1) 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 (+1/-1) plugins/fi/qml/Keyboard_fi_email.qml (+1/-1) plugins/fi/qml/Keyboard_fi_url.qml (+1/-1) plugins/fi/qml/Keyboard_fi_url_search.qml (+1/-1) plugins/fr/qml/Keyboard_fr.qml (+1/-1) 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/gd/qml/Keyboard_gd.qml (+1/-1) plugins/gd/qml/Keyboard_gd_email.qml (+1/-1) plugins/gd/qml/Keyboard_gd_url.qml (+1/-1) plugins/gd/qml/Keyboard_gd_url_search.qml (+1/-1) plugins/he/qml/Keyboard_he.qml (+1/-1) 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 (+1/-1) 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 (+1/-1) 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/is/qml/Keyboard_is.qml (+1/-1) plugins/is/qml/Keyboard_is_email.qml (+1/-1) plugins/is/qml/Keyboard_is_url.qml (+1/-1) plugins/is/qml/Keyboard_is_url_search.qml (+1/-1) plugins/it/qml/Keyboard_it.qml (+1/-1) 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/nb/qml/Keyboard_nb.qml (+1/-1) plugins/nb/qml/Keyboard_nb_email.qml (+1/-1) plugins/nb/qml/Keyboard_nb_url.qml (+1/-1) plugins/nb/qml/Keyboard_nb_url_search.qml (+1/-1) plugins/nl/qml/Keyboard_nl.qml (+1/-1) 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/pinyin/qml/Keyboard_zh.qml (+1/-1) plugins/pinyin/qml/Keyboard_zh_email.qml (+1/-1) plugins/pinyin/qml/Keyboard_zh_url.qml (+1/-1) plugins/pinyin/qml/Keyboard_zh_url_search.qml (+1/-1) plugins/pl/qml/Keyboard_pl.qml (+1/-1) 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 (+1/-1) 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/ro/qml/Keyboard_ro.qml (+1/-1) plugins/ro/qml/Keyboard_ro_email.qml (+1/-1) plugins/ro/qml/Keyboard_ro_url.qml (+1/-1) plugins/ro/qml/Keyboard_ro_url_search.qml (+1/-1) plugins/ru/qml/Keyboard_ru.qml (+1/-1) 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/sl/qml/Keyboard_sl.qml (+1/-1) plugins/sl/qml/Keyboard_sl_email.qml (+1/-1) plugins/sl/qml/Keyboard_sl_url.qml (+1/-1) plugins/sl/qml/Keyboard_sl_url_search.qml (+1/-1) plugins/sr/qml/Keyboard_sr.qml (+1/-1) 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 (+1/-1) 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) plugins/uk/qml/Keyboard_uk.qml (+1/-1) plugins/uk/qml/Keyboard_uk_email.qml (+1/-1) plugins/uk/qml/Keyboard_uk_url.qml (+1/-1) plugins/uk/qml/Keyboard_uk_url_search.qml (+1/-1) qml/Keyboard.qml (+23/-10) qml/KeyboardContainer.qml (+1/-1) qml/WordRibbon.qml (+9/-9) qml/images/keyboard-caps-disabled.svg (+180/-0) qml/images/keyboard-caps-enabled.svg (+181/-0) qml/images/keyboard-caps-locked.svg (+186/-0) qml/keys/ActionKey.qml (+20/-11) qml/keys/BackspaceKey.qml (+1/-1) qml/keys/CharKey.qml (+26/-23) qml/keys/DropShadow.qml (+1/-1) qml/keys/ExtendedKeysSelector.qml (+2/-4) qml/keys/KeyPad.qml (+1/-1) qml/keys/LanguageKey.qml (+1/-1) qml/keys/LanguageMenu.qml (+3/-39) qml/keys/Magnifier.qml (+2/-2) qml/keys/OneTwoKey.qml (+1/-4) qml/keys/PressArea.qml (+1/-1) qml/keys/ReturnKey.qml (+2/-4) qml/keys/ShiftKey.qml (+5/-6) qml/keys/SmallSpaceKey.qml (+34/-0) qml/keys/SpaceKey.qml (+15/-3) qml/keys/Spacer.qml (+1/-1) qml/keys/SymbolShiftKey.qml (+1/-3) qml/keys/UrlKey.qml (+1/-2) qml/keys/key_constants.js (+38/-23) qml/keys/languages.js (+52/-0) qml/languages/Keyboard_numbers.qml (+48/-43) qml/languages/Keyboard_symbols.qml (+1/-1) qml/languages/Keyboard_telephone.qml (+48/-43) qml/qml.pro (+1/-1) tests/autopilot/ubuntu_keyboard/emulators/keyboard.py (+1/-1) tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py (+1/-1) tests/testlayout/qml/Keyboard_testlayout.qml (+1/-1) |
To merge this branch: | bzr merge lp:~michael-sheldon/ubuntu-keyboard/visual-refresh |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Needs Fixing | |
Ubuntu Phablet Team | Pending | ||
Review via email: mp+283480@code.launchpad.net |
Commit message
Update keyboard visuals to match new design spec
Description of the change
Update keyboard visuals to match new design spec
- 438. By Michael Sheldon
-
Switch suru keyboard enter icon
PS Jenkins bot (ps-jenkins) wrote : | # |
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:438
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:439
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://
- 439. By Michael Sheldon
-
Update number and telephone layout to new style
- 440. By Michael Sheldon
-
Merge changes
- 441. By Michael Sheldon
-
Add missing small space key
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:440
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://
- 442. By Michael Sheldon
-
Fix tablet detection in portrait orientation and switch to sizing based on proportion of screen
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:441
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://
- 443. By Michael Sheldon
-
Fix sizing on URL key
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:442
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:443
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://
- 444. By Michael Sheldon
-
Tweak word ribbon sizing and boldness
- 445. By Michael Sheldon
-
Fix alignment of bottom row
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:444
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://
- 446. By Michael Sheldon
-
Update phone sizing
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:445
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://
- 447. By Michael Sheldon
-
Fix key font sizing in landscape
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:446
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:447
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://
- 448. By Michael Sheldon
-
Fix word ribbon sizing
- 449. By Michael Sheldon
-
Fix annotation sizing
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:448
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://
- 450. By Michael Sheldon
-
Tweak annotation size and selection colours
- 451. By Michael Sheldon
-
Update imports
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:449
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://
- 452. By Michael Sheldon
-
Add new keyboard shift key icons
- 453. By Michael Sheldon
-
Fix installation of new keyboard assets
- 454. By Michael Sheldon
-
Tweak annotation font size
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:451
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:454
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://
- 455. By Michael Sheldon
-
Fix dismiss positioning for new layouts
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:455
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 456. By Michael Sheldon
-
Remove unused icon references
- 457. By Michael Sheldon
-
Fix light font
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:457
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://
- 458. By Michael Sheldon
-
Update telephone layout visuals to remove keys that can't be handled by libphonenumber
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:458
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:459
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://
- 459. By Michael Sheldon
-
Fix dragging keyboard from top with no word ribbon
- 460. By Michael Sheldon
-
Merge changes
- 461. By Michael Sheldon
-
Reduce word ribbon size on phones slightly
Preview Diff
1 | === modified file 'plugins/ar/qml/Keyboard_ar.qml' | |||
2 | --- plugins/ar/qml/Keyboard_ar.qml 2015-04-13 10:54:12 +0000 | |||
3 | +++ plugins/ar/qml/Keyboard_ar.qml 2016-01-28 19:06:48 +0000 | |||
4 | @@ -14,7 +14,7 @@ | |||
5 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
6 | 15 | */ | 15 | */ |
7 | 16 | 16 | ||
9 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
10 | 18 | import keys 1.0 | 18 | import keys 1.0 |
11 | 19 | 19 | ||
12 | 20 | KeyPad { | 20 | KeyPad { |
13 | 21 | 21 | ||
14 | === modified file 'plugins/ar/qml/Keyboard_ar_email.qml' | |||
15 | --- plugins/ar/qml/Keyboard_ar_email.qml 2015-04-13 10:54:12 +0000 | |||
16 | +++ plugins/ar/qml/Keyboard_ar_email.qml 2016-01-28 19:06:48 +0000 | |||
17 | @@ -14,7 +14,7 @@ | |||
18 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
19 | 15 | */ | 15 | */ |
20 | 16 | 16 | ||
22 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
23 | 18 | import keys 1.0 | 18 | import keys 1.0 |
24 | 19 | 19 | ||
25 | 20 | KeyPad { | 20 | KeyPad { |
26 | 21 | 21 | ||
27 | === modified file 'plugins/ar/qml/Keyboard_ar_url.qml' | |||
28 | --- plugins/ar/qml/Keyboard_ar_url.qml 2015-04-13 10:54:12 +0000 | |||
29 | +++ plugins/ar/qml/Keyboard_ar_url.qml 2016-01-28 19:06:48 +0000 | |||
30 | @@ -14,7 +14,7 @@ | |||
31 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
32 | 15 | */ | 15 | */ |
33 | 16 | 16 | ||
35 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
36 | 18 | import keys 1.0 | 18 | import keys 1.0 |
37 | 19 | 19 | ||
38 | 20 | KeyPad { | 20 | KeyPad { |
39 | 21 | 21 | ||
40 | === modified file 'plugins/ar/qml/Keyboard_ar_url_search.qml' | |||
41 | --- plugins/ar/qml/Keyboard_ar_url_search.qml 2015-04-13 10:54:12 +0000 | |||
42 | +++ plugins/ar/qml/Keyboard_ar_url_search.qml 2016-01-28 19:06:48 +0000 | |||
43 | @@ -14,7 +14,7 @@ | |||
44 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
45 | 15 | */ | 15 | */ |
46 | 16 | 16 | ||
48 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
49 | 18 | import keys 1.0 | 18 | import keys 1.0 |
50 | 19 | 19 | ||
51 | 20 | KeyPad { | 20 | KeyPad { |
52 | 21 | 21 | ||
53 | === modified file 'plugins/az/qml/Keyboard_az.qml' | |||
54 | --- plugins/az/qml/Keyboard_az.qml 2015-04-13 10:54:12 +0000 | |||
55 | +++ plugins/az/qml/Keyboard_az.qml 2016-01-28 19:06:48 +0000 | |||
56 | @@ -14,7 +14,7 @@ | |||
57 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
58 | 15 | */ | 15 | */ |
59 | 16 | 16 | ||
61 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
62 | 18 | import keys 1.0 | 18 | import keys 1.0 |
63 | 19 | 19 | ||
64 | 20 | KeyPad { | 20 | KeyPad { |
65 | 21 | 21 | ||
66 | === modified file 'plugins/az/qml/Keyboard_az_email.qml' | |||
67 | --- plugins/az/qml/Keyboard_az_email.qml 2015-04-13 10:54:12 +0000 | |||
68 | +++ plugins/az/qml/Keyboard_az_email.qml 2016-01-28 19:06:48 +0000 | |||
69 | @@ -14,7 +14,7 @@ | |||
70 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
71 | 15 | */ | 15 | */ |
72 | 16 | 16 | ||
74 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
75 | 18 | import keys 1.0 | 18 | import keys 1.0 |
76 | 19 | 19 | ||
77 | 20 | KeyPad { | 20 | KeyPad { |
78 | 21 | 21 | ||
79 | === modified file 'plugins/az/qml/Keyboard_az_url.qml' | |||
80 | --- plugins/az/qml/Keyboard_az_url.qml 2015-04-13 10:54:12 +0000 | |||
81 | +++ plugins/az/qml/Keyboard_az_url.qml 2016-01-28 19:06:48 +0000 | |||
82 | @@ -14,7 +14,7 @@ | |||
83 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
84 | 15 | */ | 15 | */ |
85 | 16 | 16 | ||
87 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
88 | 18 | import keys 1.0 | 18 | import keys 1.0 |
89 | 19 | 19 | ||
90 | 20 | KeyPad { | 20 | KeyPad { |
91 | 21 | 21 | ||
92 | === modified file 'plugins/az/qml/Keyboard_az_url_search.qml' | |||
93 | --- plugins/az/qml/Keyboard_az_url_search.qml 2015-04-13 10:54:12 +0000 | |||
94 | +++ plugins/az/qml/Keyboard_az_url_search.qml 2016-01-28 19:06:48 +0000 | |||
95 | @@ -14,7 +14,7 @@ | |||
96 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
97 | 15 | */ | 15 | */ |
98 | 16 | 16 | ||
100 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
101 | 18 | import keys 1.0 | 18 | import keys 1.0 |
102 | 19 | 19 | ||
103 | 20 | KeyPad { | 20 | KeyPad { |
104 | 21 | 21 | ||
105 | === modified file 'plugins/bs/qml/Keyboard_bs.qml' | |||
106 | --- plugins/bs/qml/Keyboard_bs.qml 2015-04-13 10:54:12 +0000 | |||
107 | +++ plugins/bs/qml/Keyboard_bs.qml 2016-01-28 19:06:48 +0000 | |||
108 | @@ -14,7 +14,7 @@ | |||
109 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
110 | 15 | */ | 15 | */ |
111 | 16 | 16 | ||
113 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
114 | 18 | import keys 1.0 | 18 | import keys 1.0 |
115 | 19 | 19 | ||
116 | 20 | KeyPad { | 20 | KeyPad { |
117 | 21 | 21 | ||
118 | === modified file 'plugins/bs/qml/Keyboard_bs_email.qml' | |||
119 | --- plugins/bs/qml/Keyboard_bs_email.qml 2015-04-13 10:54:12 +0000 | |||
120 | +++ plugins/bs/qml/Keyboard_bs_email.qml 2016-01-28 19:06:48 +0000 | |||
121 | @@ -14,7 +14,7 @@ | |||
122 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
123 | 15 | */ | 15 | */ |
124 | 16 | 16 | ||
126 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
127 | 18 | import keys 1.0 | 18 | import keys 1.0 |
128 | 19 | 19 | ||
129 | 20 | KeyPad { | 20 | KeyPad { |
130 | 21 | 21 | ||
131 | === modified file 'plugins/bs/qml/Keyboard_bs_url.qml' | |||
132 | --- plugins/bs/qml/Keyboard_bs_url.qml 2015-04-13 10:54:12 +0000 | |||
133 | +++ plugins/bs/qml/Keyboard_bs_url.qml 2016-01-28 19:06:48 +0000 | |||
134 | @@ -14,7 +14,7 @@ | |||
135 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
136 | 15 | */ | 15 | */ |
137 | 16 | 16 | ||
139 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
140 | 18 | import keys 1.0 | 18 | import keys 1.0 |
141 | 19 | 19 | ||
142 | 20 | KeyPad { | 20 | KeyPad { |
143 | 21 | 21 | ||
144 | === modified file 'plugins/bs/qml/Keyboard_bs_url_search.qml' | |||
145 | --- plugins/bs/qml/Keyboard_bs_url_search.qml 2015-04-13 10:54:12 +0000 | |||
146 | +++ plugins/bs/qml/Keyboard_bs_url_search.qml 2016-01-28 19:06:48 +0000 | |||
147 | @@ -14,7 +14,7 @@ | |||
148 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
149 | 15 | */ | 15 | */ |
150 | 16 | 16 | ||
152 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
153 | 18 | import keys 1.0 | 18 | import keys 1.0 |
154 | 19 | 19 | ||
155 | 20 | KeyPad { | 20 | KeyPad { |
156 | 21 | 21 | ||
157 | === modified file 'plugins/ca/qml/Keyboard_ca.qml' | |||
158 | --- plugins/ca/qml/Keyboard_ca.qml 2015-04-13 10:54:12 +0000 | |||
159 | +++ plugins/ca/qml/Keyboard_ca.qml 2016-01-28 19:06:48 +0000 | |||
160 | @@ -14,7 +14,7 @@ | |||
161 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
162 | 15 | */ | 15 | */ |
163 | 16 | 16 | ||
165 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
166 | 18 | import keys 1.0 | 18 | import keys 1.0 |
167 | 19 | 19 | ||
168 | 20 | KeyPad { | 20 | KeyPad { |
169 | 21 | 21 | ||
170 | === modified file 'plugins/ca/qml/Keyboard_ca_email.qml' | |||
171 | --- plugins/ca/qml/Keyboard_ca_email.qml 2015-04-13 10:54:12 +0000 | |||
172 | +++ plugins/ca/qml/Keyboard_ca_email.qml 2016-01-28 19:06:48 +0000 | |||
173 | @@ -14,7 +14,7 @@ | |||
174 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
175 | 15 | */ | 15 | */ |
176 | 16 | 16 | ||
178 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
179 | 18 | import keys 1.0 | 18 | import keys 1.0 |
180 | 19 | 19 | ||
181 | 20 | KeyPad { | 20 | KeyPad { |
182 | 21 | 21 | ||
183 | === modified file 'plugins/ca/qml/Keyboard_ca_url.qml' | |||
184 | --- plugins/ca/qml/Keyboard_ca_url.qml 2015-04-13 10:54:12 +0000 | |||
185 | +++ plugins/ca/qml/Keyboard_ca_url.qml 2016-01-28 19:06:48 +0000 | |||
186 | @@ -14,7 +14,7 @@ | |||
187 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
188 | 15 | */ | 15 | */ |
189 | 16 | 16 | ||
191 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
192 | 18 | import keys 1.0 | 18 | import keys 1.0 |
193 | 19 | 19 | ||
194 | 20 | KeyPad { | 20 | KeyPad { |
195 | 21 | 21 | ||
196 | === modified file 'plugins/ca/qml/Keyboard_ca_url_search.qml' | |||
197 | --- plugins/ca/qml/Keyboard_ca_url_search.qml 2015-04-13 10:54:12 +0000 | |||
198 | +++ plugins/ca/qml/Keyboard_ca_url_search.qml 2016-01-28 19:06:48 +0000 | |||
199 | @@ -14,7 +14,7 @@ | |||
200 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
201 | 15 | */ | 15 | */ |
202 | 16 | 16 | ||
204 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
205 | 18 | import keys 1.0 | 18 | import keys 1.0 |
206 | 19 | 19 | ||
207 | 20 | KeyPad { | 20 | KeyPad { |
208 | 21 | 21 | ||
209 | === modified file 'plugins/cs/qml/Keyboard_cs.qml' | |||
210 | --- plugins/cs/qml/Keyboard_cs.qml 2015-04-13 10:54:12 +0000 | |||
211 | +++ plugins/cs/qml/Keyboard_cs.qml 2016-01-28 19:06:48 +0000 | |||
212 | @@ -14,7 +14,7 @@ | |||
213 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
214 | 15 | */ | 15 | */ |
215 | 16 | 16 | ||
217 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
218 | 18 | import keys 1.0 | 18 | import keys 1.0 |
219 | 19 | 19 | ||
220 | 20 | KeyPad { | 20 | KeyPad { |
221 | 21 | 21 | ||
222 | === modified file 'plugins/cs/qml/Keyboard_cs_email.qml' | |||
223 | --- plugins/cs/qml/Keyboard_cs_email.qml 2015-04-13 10:54:12 +0000 | |||
224 | +++ plugins/cs/qml/Keyboard_cs_email.qml 2016-01-28 19:06:48 +0000 | |||
225 | @@ -14,7 +14,7 @@ | |||
226 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
227 | 15 | */ | 15 | */ |
228 | 16 | 16 | ||
230 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
231 | 18 | import keys 1.0 | 18 | import keys 1.0 |
232 | 19 | 19 | ||
233 | 20 | KeyPad { | 20 | KeyPad { |
234 | 21 | 21 | ||
235 | === modified file 'plugins/cs/qml/Keyboard_cs_url.qml' | |||
236 | --- plugins/cs/qml/Keyboard_cs_url.qml 2015-04-13 10:54:12 +0000 | |||
237 | +++ plugins/cs/qml/Keyboard_cs_url.qml 2016-01-28 19:06:48 +0000 | |||
238 | @@ -14,7 +14,7 @@ | |||
239 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
240 | 15 | */ | 15 | */ |
241 | 16 | 16 | ||
243 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
244 | 18 | import keys 1.0 | 18 | import keys 1.0 |
245 | 19 | 19 | ||
246 | 20 | KeyPad { | 20 | KeyPad { |
247 | 21 | 21 | ||
248 | === modified file 'plugins/cs/qml/Keyboard_cs_url_search.qml' | |||
249 | --- plugins/cs/qml/Keyboard_cs_url_search.qml 2015-04-13 10:54:12 +0000 | |||
250 | +++ plugins/cs/qml/Keyboard_cs_url_search.qml 2016-01-28 19:06:48 +0000 | |||
251 | @@ -14,7 +14,7 @@ | |||
252 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
253 | 15 | */ | 15 | */ |
254 | 16 | 16 | ||
256 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
257 | 18 | import keys 1.0 | 18 | import keys 1.0 |
258 | 19 | 19 | ||
259 | 20 | KeyPad { | 20 | KeyPad { |
260 | 21 | 21 | ||
261 | === modified file 'plugins/da/qml/Keyboard_da.qml' | |||
262 | --- plugins/da/qml/Keyboard_da.qml 2015-04-13 10:54:12 +0000 | |||
263 | +++ plugins/da/qml/Keyboard_da.qml 2016-01-28 19:06:48 +0000 | |||
264 | @@ -14,7 +14,7 @@ | |||
265 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
266 | 15 | */ | 15 | */ |
267 | 16 | 16 | ||
269 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
270 | 18 | import keys 1.0 | 18 | import keys 1.0 |
271 | 19 | 19 | ||
272 | 20 | KeyPad { | 20 | KeyPad { |
273 | 21 | 21 | ||
274 | === modified file 'plugins/da/qml/Keyboard_da_email.qml' | |||
275 | --- plugins/da/qml/Keyboard_da_email.qml 2015-04-13 10:54:12 +0000 | |||
276 | +++ plugins/da/qml/Keyboard_da_email.qml 2016-01-28 19:06:48 +0000 | |||
277 | @@ -14,7 +14,7 @@ | |||
278 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
279 | 15 | */ | 15 | */ |
280 | 16 | 16 | ||
282 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
283 | 18 | import keys 1.0 | 18 | import keys 1.0 |
284 | 19 | 19 | ||
285 | 20 | KeyPad { | 20 | KeyPad { |
286 | 21 | 21 | ||
287 | === modified file 'plugins/da/qml/Keyboard_da_url.qml' | |||
288 | --- plugins/da/qml/Keyboard_da_url.qml 2015-04-13 10:54:12 +0000 | |||
289 | +++ plugins/da/qml/Keyboard_da_url.qml 2016-01-28 19:06:48 +0000 | |||
290 | @@ -14,7 +14,7 @@ | |||
291 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
292 | 15 | */ | 15 | */ |
293 | 16 | 16 | ||
295 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
296 | 18 | import keys 1.0 | 18 | import keys 1.0 |
297 | 19 | 19 | ||
298 | 20 | KeyPad { | 20 | KeyPad { |
299 | 21 | 21 | ||
300 | === modified file 'plugins/da/qml/Keyboard_da_url_search.qml' | |||
301 | --- plugins/da/qml/Keyboard_da_url_search.qml 2015-04-13 10:54:12 +0000 | |||
302 | +++ plugins/da/qml/Keyboard_da_url_search.qml 2016-01-28 19:06:48 +0000 | |||
303 | @@ -14,7 +14,7 @@ | |||
304 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
305 | 15 | */ | 15 | */ |
306 | 16 | 16 | ||
308 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
309 | 18 | import keys 1.0 | 18 | import keys 1.0 |
310 | 19 | 19 | ||
311 | 20 | KeyPad { | 20 | KeyPad { |
312 | 21 | 21 | ||
313 | === modified file 'plugins/de/qml/Keyboard_de.qml' | |||
314 | --- plugins/de/qml/Keyboard_de.qml 2015-04-13 10:54:12 +0000 | |||
315 | +++ plugins/de/qml/Keyboard_de.qml 2016-01-28 19:06:48 +0000 | |||
316 | @@ -14,7 +14,7 @@ | |||
317 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
318 | 15 | */ | 15 | */ |
319 | 16 | 16 | ||
321 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
322 | 18 | import keys 1.0 | 18 | import keys 1.0 |
323 | 19 | 19 | ||
324 | 20 | KeyPad { | 20 | KeyPad { |
325 | 21 | 21 | ||
326 | === modified file 'plugins/de/qml/Keyboard_de_email.qml' | |||
327 | --- plugins/de/qml/Keyboard_de_email.qml 2015-04-13 10:54:12 +0000 | |||
328 | +++ plugins/de/qml/Keyboard_de_email.qml 2016-01-28 19:06:48 +0000 | |||
329 | @@ -14,7 +14,7 @@ | |||
330 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
331 | 15 | */ | 15 | */ |
332 | 16 | 16 | ||
334 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
335 | 18 | import keys 1.0 | 18 | import keys 1.0 |
336 | 19 | 19 | ||
337 | 20 | KeyPad { | 20 | KeyPad { |
338 | 21 | 21 | ||
339 | === modified file 'plugins/de/qml/Keyboard_de_url.qml' | |||
340 | --- plugins/de/qml/Keyboard_de_url.qml 2015-04-13 10:54:12 +0000 | |||
341 | +++ plugins/de/qml/Keyboard_de_url.qml 2016-01-28 19:06:48 +0000 | |||
342 | @@ -14,7 +14,7 @@ | |||
343 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
344 | 15 | */ | 15 | */ |
345 | 16 | 16 | ||
347 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
348 | 18 | import keys 1.0 | 18 | import keys 1.0 |
349 | 19 | 19 | ||
350 | 20 | KeyPad { | 20 | KeyPad { |
351 | 21 | 21 | ||
352 | === modified file 'plugins/de/qml/Keyboard_de_url_search.qml' | |||
353 | --- plugins/de/qml/Keyboard_de_url_search.qml 2015-04-13 10:54:12 +0000 | |||
354 | +++ plugins/de/qml/Keyboard_de_url_search.qml 2016-01-28 19:06:48 +0000 | |||
355 | @@ -14,7 +14,7 @@ | |||
356 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
357 | 15 | */ | 15 | */ |
358 | 16 | 16 | ||
360 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
361 | 18 | import keys 1.0 | 18 | import keys 1.0 |
362 | 19 | 19 | ||
363 | 20 | KeyPad { | 20 | KeyPad { |
364 | 21 | 21 | ||
365 | === modified file 'plugins/el/qml/Keyboard_el.qml' | |||
366 | --- plugins/el/qml/Keyboard_el.qml 2015-05-07 13:16:07 +0000 | |||
367 | +++ plugins/el/qml/Keyboard_el.qml 2016-01-28 19:06:48 +0000 | |||
368 | @@ -14,7 +14,7 @@ | |||
369 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
370 | 15 | */ | 15 | */ |
371 | 16 | 16 | ||
373 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
374 | 18 | import keys 1.0 | 18 | import keys 1.0 |
375 | 19 | 19 | ||
376 | 20 | KeyPad { | 20 | KeyPad { |
377 | 21 | 21 | ||
378 | === modified file 'plugins/el/qml/Keyboard_el_email.qml' | |||
379 | --- plugins/el/qml/Keyboard_el_email.qml 2015-05-07 13:16:07 +0000 | |||
380 | +++ plugins/el/qml/Keyboard_el_email.qml 2016-01-28 19:06:48 +0000 | |||
381 | @@ -14,7 +14,7 @@ | |||
382 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
383 | 15 | */ | 15 | */ |
384 | 16 | 16 | ||
386 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
387 | 18 | import keys 1.0 | 18 | import keys 1.0 |
388 | 19 | 19 | ||
389 | 20 | KeyPad { | 20 | KeyPad { |
390 | 21 | 21 | ||
391 | === modified file 'plugins/el/qml/Keyboard_el_url.qml' | |||
392 | --- plugins/el/qml/Keyboard_el_url.qml 2015-05-07 13:16:07 +0000 | |||
393 | +++ plugins/el/qml/Keyboard_el_url.qml 2016-01-28 19:06:48 +0000 | |||
394 | @@ -14,7 +14,7 @@ | |||
395 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
396 | 15 | */ | 15 | */ |
397 | 16 | 16 | ||
399 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
400 | 18 | import keys 1.0 | 18 | import keys 1.0 |
401 | 19 | 19 | ||
402 | 20 | KeyPad { | 20 | KeyPad { |
403 | 21 | 21 | ||
404 | === modified file 'plugins/el/qml/Keyboard_el_url_search.qml' | |||
405 | --- plugins/el/qml/Keyboard_el_url_search.qml 2015-05-07 13:16:07 +0000 | |||
406 | +++ plugins/el/qml/Keyboard_el_url_search.qml 2016-01-28 19:06:48 +0000 | |||
407 | @@ -14,7 +14,7 @@ | |||
408 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
409 | 15 | */ | 15 | */ |
410 | 16 | 16 | ||
412 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
413 | 18 | import keys 1.0 | 18 | import keys 1.0 |
414 | 19 | 19 | ||
415 | 20 | KeyPad { | 20 | KeyPad { |
416 | 21 | 21 | ||
417 | === modified file 'plugins/emoji/qml/Keyboard_emoji.qml' | |||
418 | --- plugins/emoji/qml/Keyboard_emoji.qml 2015-04-13 10:54:12 +0000 | |||
419 | +++ plugins/emoji/qml/Keyboard_emoji.qml 2016-01-28 19:06:48 +0000 | |||
420 | @@ -14,7 +14,7 @@ | |||
421 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
422 | 15 | */ | 15 | */ |
423 | 16 | 16 | ||
425 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
426 | 18 | import keys 1.0 | 18 | import keys 1.0 |
427 | 19 | import "emoji.js" as Emoji | 19 | import "emoji.js" as Emoji |
428 | 20 | 20 | ||
429 | 21 | 21 | ||
430 | === modified file 'plugins/en/qml/Keyboard_en.qml' | |||
431 | --- plugins/en/qml/Keyboard_en.qml 2015-04-13 10:54:12 +0000 | |||
432 | +++ plugins/en/qml/Keyboard_en.qml 2016-01-28 19:06:48 +0000 | |||
433 | @@ -14,7 +14,7 @@ | |||
434 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
435 | 15 | */ | 15 | */ |
436 | 16 | 16 | ||
438 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
439 | 18 | import keys 1.0 | 18 | import keys 1.0 |
440 | 19 | 19 | ||
441 | 20 | KeyPad { | 20 | KeyPad { |
442 | 21 | 21 | ||
443 | === modified file 'plugins/en/qml/Keyboard_en_email.qml' | |||
444 | --- plugins/en/qml/Keyboard_en_email.qml 2015-04-13 10:54:12 +0000 | |||
445 | +++ plugins/en/qml/Keyboard_en_email.qml 2016-01-28 19:06:48 +0000 | |||
446 | @@ -14,7 +14,7 @@ | |||
447 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
448 | 15 | */ | 15 | */ |
449 | 16 | 16 | ||
451 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
452 | 18 | import keys 1.0 | 18 | import keys 1.0 |
453 | 19 | 19 | ||
454 | 20 | KeyPad { | 20 | KeyPad { |
455 | 21 | 21 | ||
456 | === modified file 'plugins/en/qml/Keyboard_en_url.qml' | |||
457 | --- plugins/en/qml/Keyboard_en_url.qml 2015-04-13 10:54:12 +0000 | |||
458 | +++ plugins/en/qml/Keyboard_en_url.qml 2016-01-28 19:06:48 +0000 | |||
459 | @@ -14,7 +14,7 @@ | |||
460 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
461 | 15 | */ | 15 | */ |
462 | 16 | 16 | ||
464 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
465 | 18 | import keys 1.0 | 18 | import keys 1.0 |
466 | 19 | 19 | ||
467 | 20 | KeyPad { | 20 | KeyPad { |
468 | 21 | 21 | ||
469 | === modified file 'plugins/en/qml/Keyboard_en_url_search.qml' | |||
470 | --- plugins/en/qml/Keyboard_en_url_search.qml 2015-04-13 10:54:12 +0000 | |||
471 | +++ plugins/en/qml/Keyboard_en_url_search.qml 2016-01-28 19:06:48 +0000 | |||
472 | @@ -14,7 +14,7 @@ | |||
473 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
474 | 15 | */ | 15 | */ |
475 | 16 | 16 | ||
477 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
478 | 18 | import keys 1.0 | 18 | import keys 1.0 |
479 | 19 | 19 | ||
480 | 20 | KeyPad { | 20 | KeyPad { |
481 | 21 | 21 | ||
482 | === modified file 'plugins/es/qml/Keyboard_es.qml' | |||
483 | --- plugins/es/qml/Keyboard_es.qml 2015-04-13 10:54:12 +0000 | |||
484 | +++ plugins/es/qml/Keyboard_es.qml 2016-01-28 19:06:48 +0000 | |||
485 | @@ -14,7 +14,7 @@ | |||
486 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
487 | 15 | */ | 15 | */ |
488 | 16 | 16 | ||
490 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
491 | 18 | import keys 1.0 | 18 | import keys 1.0 |
492 | 19 | 19 | ||
493 | 20 | KeyPad { | 20 | KeyPad { |
494 | 21 | 21 | ||
495 | === modified file 'plugins/es/qml/Keyboard_es_email.qml' | |||
496 | --- plugins/es/qml/Keyboard_es_email.qml 2015-04-13 10:54:12 +0000 | |||
497 | +++ plugins/es/qml/Keyboard_es_email.qml 2016-01-28 19:06:48 +0000 | |||
498 | @@ -14,7 +14,7 @@ | |||
499 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
500 | 15 | */ | 15 | */ |
501 | 16 | 16 | ||
503 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
504 | 18 | import keys 1.0 | 18 | import keys 1.0 |
505 | 19 | 19 | ||
506 | 20 | KeyPad { | 20 | KeyPad { |
507 | 21 | 21 | ||
508 | === modified file 'plugins/es/qml/Keyboard_es_url.qml' | |||
509 | --- plugins/es/qml/Keyboard_es_url.qml 2015-04-13 10:54:12 +0000 | |||
510 | +++ plugins/es/qml/Keyboard_es_url.qml 2016-01-28 19:06:48 +0000 | |||
511 | @@ -14,7 +14,7 @@ | |||
512 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
513 | 15 | */ | 15 | */ |
514 | 16 | 16 | ||
516 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
517 | 18 | import keys 1.0 | 18 | import keys 1.0 |
518 | 19 | 19 | ||
519 | 20 | KeyPad { | 20 | KeyPad { |
520 | 21 | 21 | ||
521 | === modified file 'plugins/es/qml/Keyboard_es_url_search.qml' | |||
522 | --- plugins/es/qml/Keyboard_es_url_search.qml 2015-04-13 10:54:12 +0000 | |||
523 | +++ plugins/es/qml/Keyboard_es_url_search.qml 2016-01-28 19:06:48 +0000 | |||
524 | @@ -14,7 +14,7 @@ | |||
525 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
526 | 15 | */ | 15 | */ |
527 | 16 | 16 | ||
529 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
530 | 18 | import keys 1.0 | 18 | import keys 1.0 |
531 | 19 | 19 | ||
532 | 20 | KeyPad { | 20 | KeyPad { |
533 | 21 | 21 | ||
534 | === modified file 'plugins/fi/qml/Keyboard_fi.qml' | |||
535 | --- plugins/fi/qml/Keyboard_fi.qml 2015-04-13 10:54:12 +0000 | |||
536 | +++ plugins/fi/qml/Keyboard_fi.qml 2016-01-28 19:06:48 +0000 | |||
537 | @@ -14,7 +14,7 @@ | |||
538 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
539 | 15 | */ | 15 | */ |
540 | 16 | 16 | ||
542 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
543 | 18 | import keys 1.0 | 18 | import keys 1.0 |
544 | 19 | 19 | ||
545 | 20 | KeyPad { | 20 | KeyPad { |
546 | 21 | 21 | ||
547 | === modified file 'plugins/fi/qml/Keyboard_fi_email.qml' | |||
548 | --- plugins/fi/qml/Keyboard_fi_email.qml 2015-04-13 10:54:12 +0000 | |||
549 | +++ plugins/fi/qml/Keyboard_fi_email.qml 2016-01-28 19:06:48 +0000 | |||
550 | @@ -14,7 +14,7 @@ | |||
551 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
552 | 15 | */ | 15 | */ |
553 | 16 | 16 | ||
555 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
556 | 18 | import keys 1.0 | 18 | import keys 1.0 |
557 | 19 | 19 | ||
558 | 20 | KeyPad { | 20 | KeyPad { |
559 | 21 | 21 | ||
560 | === modified file 'plugins/fi/qml/Keyboard_fi_url.qml' | |||
561 | --- plugins/fi/qml/Keyboard_fi_url.qml 2015-04-13 10:54:12 +0000 | |||
562 | +++ plugins/fi/qml/Keyboard_fi_url.qml 2016-01-28 19:06:48 +0000 | |||
563 | @@ -14,7 +14,7 @@ | |||
564 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
565 | 15 | */ | 15 | */ |
566 | 16 | 16 | ||
568 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
569 | 18 | import keys 1.0 | 18 | import keys 1.0 |
570 | 19 | 19 | ||
571 | 20 | KeyPad { | 20 | KeyPad { |
572 | 21 | 21 | ||
573 | === modified file 'plugins/fi/qml/Keyboard_fi_url_search.qml' | |||
574 | --- plugins/fi/qml/Keyboard_fi_url_search.qml 2015-04-13 10:54:12 +0000 | |||
575 | +++ plugins/fi/qml/Keyboard_fi_url_search.qml 2016-01-28 19:06:48 +0000 | |||
576 | @@ -14,7 +14,7 @@ | |||
577 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
578 | 15 | */ | 15 | */ |
579 | 16 | 16 | ||
581 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
582 | 18 | import keys 1.0 | 18 | import keys 1.0 |
583 | 19 | 19 | ||
584 | 20 | KeyPad { | 20 | KeyPad { |
585 | 21 | 21 | ||
586 | === modified file 'plugins/fr/qml/Keyboard_fr.qml' | |||
587 | --- plugins/fr/qml/Keyboard_fr.qml 2015-04-13 10:54:12 +0000 | |||
588 | +++ plugins/fr/qml/Keyboard_fr.qml 2016-01-28 19:06:48 +0000 | |||
589 | @@ -14,7 +14,7 @@ | |||
590 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
591 | 15 | */ | 15 | */ |
592 | 16 | 16 | ||
594 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
595 | 18 | import keys 1.0 | 18 | import keys 1.0 |
596 | 19 | 19 | ||
597 | 20 | KeyPad { | 20 | KeyPad { |
598 | 21 | 21 | ||
599 | === modified file 'plugins/fr/qml/Keyboard_fr_email.qml' | |||
600 | --- plugins/fr/qml/Keyboard_fr_email.qml 2015-04-13 10:54:12 +0000 | |||
601 | +++ plugins/fr/qml/Keyboard_fr_email.qml 2016-01-28 19:06:48 +0000 | |||
602 | @@ -14,7 +14,7 @@ | |||
603 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
604 | 15 | */ | 15 | */ |
605 | 16 | 16 | ||
607 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
608 | 18 | import keys 1.0 | 18 | import keys 1.0 |
609 | 19 | 19 | ||
610 | 20 | KeyPad { | 20 | KeyPad { |
611 | 21 | 21 | ||
612 | === modified file 'plugins/fr/qml/Keyboard_fr_url.qml' | |||
613 | --- plugins/fr/qml/Keyboard_fr_url.qml 2015-04-13 10:54:12 +0000 | |||
614 | +++ plugins/fr/qml/Keyboard_fr_url.qml 2016-01-28 19:06:48 +0000 | |||
615 | @@ -14,7 +14,7 @@ | |||
616 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
617 | 15 | */ | 15 | */ |
618 | 16 | 16 | ||
620 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
621 | 18 | import keys 1.0 | 18 | import keys 1.0 |
622 | 19 | 19 | ||
623 | 20 | KeyPad { | 20 | KeyPad { |
624 | 21 | 21 | ||
625 | === modified file 'plugins/fr/qml/Keyboard_fr_url_search.qml' | |||
626 | --- plugins/fr/qml/Keyboard_fr_url_search.qml 2015-04-13 10:54:12 +0000 | |||
627 | +++ plugins/fr/qml/Keyboard_fr_url_search.qml 2016-01-28 19:06:48 +0000 | |||
628 | @@ -14,7 +14,7 @@ | |||
629 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
630 | 15 | */ | 15 | */ |
631 | 16 | 16 | ||
633 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
634 | 18 | import keys 1.0 | 18 | import keys 1.0 |
635 | 19 | 19 | ||
636 | 20 | KeyPad { | 20 | KeyPad { |
637 | 21 | 21 | ||
638 | === modified file 'plugins/gd/qml/Keyboard_gd.qml' | |||
639 | --- plugins/gd/qml/Keyboard_gd.qml 2015-05-07 13:16:07 +0000 | |||
640 | +++ plugins/gd/qml/Keyboard_gd.qml 2016-01-28 19:06:48 +0000 | |||
641 | @@ -14,7 +14,7 @@ | |||
642 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
643 | 15 | */ | 15 | */ |
644 | 16 | 16 | ||
646 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
647 | 18 | import keys 1.0 | 18 | import keys 1.0 |
648 | 19 | 19 | ||
649 | 20 | KeyPad { | 20 | KeyPad { |
650 | 21 | 21 | ||
651 | === modified file 'plugins/gd/qml/Keyboard_gd_email.qml' | |||
652 | --- plugins/gd/qml/Keyboard_gd_email.qml 2015-05-07 13:16:07 +0000 | |||
653 | +++ plugins/gd/qml/Keyboard_gd_email.qml 2016-01-28 19:06:48 +0000 | |||
654 | @@ -14,7 +14,7 @@ | |||
655 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
656 | 15 | */ | 15 | */ |
657 | 16 | 16 | ||
659 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
660 | 18 | import keys 1.0 | 18 | import keys 1.0 |
661 | 19 | 19 | ||
662 | 20 | KeyPad { | 20 | KeyPad { |
663 | 21 | 21 | ||
664 | === modified file 'plugins/gd/qml/Keyboard_gd_url.qml' | |||
665 | --- plugins/gd/qml/Keyboard_gd_url.qml 2015-05-07 13:16:07 +0000 | |||
666 | +++ plugins/gd/qml/Keyboard_gd_url.qml 2016-01-28 19:06:48 +0000 | |||
667 | @@ -14,7 +14,7 @@ | |||
668 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
669 | 15 | */ | 15 | */ |
670 | 16 | 16 | ||
672 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
673 | 18 | import keys 1.0 | 18 | import keys 1.0 |
674 | 19 | 19 | ||
675 | 20 | KeyPad { | 20 | KeyPad { |
676 | 21 | 21 | ||
677 | === modified file 'plugins/gd/qml/Keyboard_gd_url_search.qml' | |||
678 | --- plugins/gd/qml/Keyboard_gd_url_search.qml 2015-05-07 13:16:07 +0000 | |||
679 | +++ plugins/gd/qml/Keyboard_gd_url_search.qml 2016-01-28 19:06:48 +0000 | |||
680 | @@ -14,7 +14,7 @@ | |||
681 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
682 | 15 | */ | 15 | */ |
683 | 16 | 16 | ||
685 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
686 | 18 | import keys 1.0 | 18 | import keys 1.0 |
687 | 19 | 19 | ||
688 | 20 | KeyPad { | 20 | KeyPad { |
689 | 21 | 21 | ||
690 | === modified file 'plugins/he/qml/Keyboard_he.qml' | |||
691 | --- plugins/he/qml/Keyboard_he.qml 2015-04-13 10:54:12 +0000 | |||
692 | +++ plugins/he/qml/Keyboard_he.qml 2016-01-28 19:06:48 +0000 | |||
693 | @@ -14,7 +14,7 @@ | |||
694 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
695 | 15 | */ | 15 | */ |
696 | 16 | 16 | ||
698 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
699 | 18 | import keys 1.0 | 18 | import keys 1.0 |
700 | 19 | 19 | ||
701 | 20 | KeyPad { | 20 | KeyPad { |
702 | 21 | 21 | ||
703 | === modified file 'plugins/he/qml/Keyboard_he_email.qml' | |||
704 | --- plugins/he/qml/Keyboard_he_email.qml 2015-04-13 10:54:12 +0000 | |||
705 | +++ plugins/he/qml/Keyboard_he_email.qml 2016-01-28 19:06:48 +0000 | |||
706 | @@ -14,7 +14,7 @@ | |||
707 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
708 | 15 | */ | 15 | */ |
709 | 16 | 16 | ||
711 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
712 | 18 | import keys 1.0 | 18 | import keys 1.0 |
713 | 19 | 19 | ||
714 | 20 | KeyPad { | 20 | KeyPad { |
715 | 21 | 21 | ||
716 | === modified file 'plugins/he/qml/Keyboard_he_url.qml' | |||
717 | --- plugins/he/qml/Keyboard_he_url.qml 2015-04-13 10:54:12 +0000 | |||
718 | +++ plugins/he/qml/Keyboard_he_url.qml 2016-01-28 19:06:48 +0000 | |||
719 | @@ -14,7 +14,7 @@ | |||
720 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
721 | 15 | */ | 15 | */ |
722 | 16 | 16 | ||
724 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
725 | 18 | import keys 1.0 | 18 | import keys 1.0 |
726 | 19 | 19 | ||
727 | 20 | KeyPad { | 20 | KeyPad { |
728 | 21 | 21 | ||
729 | === modified file 'plugins/he/qml/Keyboard_he_url_search.qml' | |||
730 | --- plugins/he/qml/Keyboard_he_url_search.qml 2015-04-13 10:54:12 +0000 | |||
731 | +++ plugins/he/qml/Keyboard_he_url_search.qml 2016-01-28 19:06:48 +0000 | |||
732 | @@ -14,7 +14,7 @@ | |||
733 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
734 | 15 | */ | 15 | */ |
735 | 16 | 16 | ||
737 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
738 | 18 | import keys 1.0 | 18 | import keys 1.0 |
739 | 19 | 19 | ||
740 | 20 | KeyPad { | 20 | KeyPad { |
741 | 21 | 21 | ||
742 | === modified file 'plugins/hr/qml/Keyboard_hr.qml' | |||
743 | --- plugins/hr/qml/Keyboard_hr.qml 2015-04-13 10:54:12 +0000 | |||
744 | +++ plugins/hr/qml/Keyboard_hr.qml 2016-01-28 19:06:48 +0000 | |||
745 | @@ -14,7 +14,7 @@ | |||
746 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
747 | 15 | */ | 15 | */ |
748 | 16 | 16 | ||
750 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
751 | 18 | import keys 1.0 | 18 | import keys 1.0 |
752 | 19 | 19 | ||
753 | 20 | KeyPad { | 20 | KeyPad { |
754 | 21 | 21 | ||
755 | === modified file 'plugins/hr/qml/Keyboard_hr_email.qml' | |||
756 | --- plugins/hr/qml/Keyboard_hr_email.qml 2015-04-13 10:54:12 +0000 | |||
757 | +++ plugins/hr/qml/Keyboard_hr_email.qml 2016-01-28 19:06:48 +0000 | |||
758 | @@ -14,7 +14,7 @@ | |||
759 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
760 | 15 | */ | 15 | */ |
761 | 16 | 16 | ||
763 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
764 | 18 | import keys 1.0 | 18 | import keys 1.0 |
765 | 19 | 19 | ||
766 | 20 | KeyPad { | 20 | KeyPad { |
767 | 21 | 21 | ||
768 | === modified file 'plugins/hr/qml/Keyboard_hr_url.qml' | |||
769 | --- plugins/hr/qml/Keyboard_hr_url.qml 2015-05-07 13:04:09 +0000 | |||
770 | +++ plugins/hr/qml/Keyboard_hr_url.qml 2016-01-28 19:06:48 +0000 | |||
771 | @@ -14,7 +14,7 @@ | |||
772 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
773 | 15 | */ | 15 | */ |
774 | 16 | 16 | ||
776 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
777 | 18 | import keys 1.0 | 18 | import keys 1.0 |
778 | 19 | 19 | ||
779 | 20 | KeyPad { | 20 | KeyPad { |
780 | 21 | 21 | ||
781 | === modified file 'plugins/hr/qml/Keyboard_hr_url_search.qml' | |||
782 | --- plugins/hr/qml/Keyboard_hr_url_search.qml 2015-05-07 13:04:09 +0000 | |||
783 | +++ plugins/hr/qml/Keyboard_hr_url_search.qml 2016-01-28 19:06:48 +0000 | |||
784 | @@ -14,7 +14,7 @@ | |||
785 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
786 | 15 | */ | 15 | */ |
787 | 16 | 16 | ||
789 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
790 | 18 | import keys 1.0 | 18 | import keys 1.0 |
791 | 19 | 19 | ||
792 | 20 | KeyPad { | 20 | KeyPad { |
793 | 21 | 21 | ||
794 | === modified file 'plugins/hu/qml/Keyboard_hu.qml' | |||
795 | --- plugins/hu/qml/Keyboard_hu.qml 2015-04-13 10:54:12 +0000 | |||
796 | +++ plugins/hu/qml/Keyboard_hu.qml 2016-01-28 19:06:48 +0000 | |||
797 | @@ -14,7 +14,7 @@ | |||
798 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
799 | 15 | */ | 15 | */ |
800 | 16 | 16 | ||
802 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
803 | 18 | import keys 1.0 | 18 | import keys 1.0 |
804 | 19 | 19 | ||
805 | 20 | KeyPad { | 20 | KeyPad { |
806 | 21 | 21 | ||
807 | === modified file 'plugins/hu/qml/Keyboard_hu_email.qml' | |||
808 | --- plugins/hu/qml/Keyboard_hu_email.qml 2015-04-13 10:54:12 +0000 | |||
809 | +++ plugins/hu/qml/Keyboard_hu_email.qml 2016-01-28 19:06:48 +0000 | |||
810 | @@ -14,7 +14,7 @@ | |||
811 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
812 | 15 | */ | 15 | */ |
813 | 16 | 16 | ||
815 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
816 | 18 | import keys 1.0 | 18 | import keys 1.0 |
817 | 19 | 19 | ||
818 | 20 | KeyPad { | 20 | KeyPad { |
819 | 21 | 21 | ||
820 | === modified file 'plugins/hu/qml/Keyboard_hu_url.qml' | |||
821 | --- plugins/hu/qml/Keyboard_hu_url.qml 2015-04-13 10:54:12 +0000 | |||
822 | +++ plugins/hu/qml/Keyboard_hu_url.qml 2016-01-28 19:06:48 +0000 | |||
823 | @@ -14,7 +14,7 @@ | |||
824 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
825 | 15 | */ | 15 | */ |
826 | 16 | 16 | ||
828 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
829 | 18 | import keys 1.0 | 18 | import keys 1.0 |
830 | 19 | 19 | ||
831 | 20 | KeyPad { | 20 | KeyPad { |
832 | 21 | 21 | ||
833 | === modified file 'plugins/hu/qml/Keyboard_hu_url_search.qml' | |||
834 | --- plugins/hu/qml/Keyboard_hu_url_search.qml 2015-04-13 10:54:12 +0000 | |||
835 | +++ plugins/hu/qml/Keyboard_hu_url_search.qml 2016-01-28 19:06:48 +0000 | |||
836 | @@ -14,7 +14,7 @@ | |||
837 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
838 | 15 | */ | 15 | */ |
839 | 16 | 16 | ||
841 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
842 | 18 | import keys 1.0 | 18 | import keys 1.0 |
843 | 19 | 19 | ||
844 | 20 | KeyPad { | 20 | KeyPad { |
845 | 21 | 21 | ||
846 | === modified file 'plugins/is/qml/Keyboard_is.qml' | |||
847 | --- plugins/is/qml/Keyboard_is.qml 2016-01-05 16:45:41 +0000 | |||
848 | +++ plugins/is/qml/Keyboard_is.qml 2016-01-28 19:06:48 +0000 | |||
849 | @@ -14,7 +14,7 @@ | |||
850 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
851 | 15 | */ | 15 | */ |
852 | 16 | 16 | ||
854 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
855 | 18 | import keys 1.0 | 18 | import keys 1.0 |
856 | 19 | 19 | ||
857 | 20 | KeyPad { | 20 | KeyPad { |
858 | 21 | 21 | ||
859 | === modified file 'plugins/is/qml/Keyboard_is_email.qml' | |||
860 | --- plugins/is/qml/Keyboard_is_email.qml 2016-01-05 16:45:41 +0000 | |||
861 | +++ plugins/is/qml/Keyboard_is_email.qml 2016-01-28 19:06:48 +0000 | |||
862 | @@ -14,7 +14,7 @@ | |||
863 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
864 | 15 | */ | 15 | */ |
865 | 16 | 16 | ||
867 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
868 | 18 | import keys 1.0 | 18 | import keys 1.0 |
869 | 19 | 19 | ||
870 | 20 | KeyPad { | 20 | KeyPad { |
871 | 21 | 21 | ||
872 | === modified file 'plugins/is/qml/Keyboard_is_url.qml' | |||
873 | --- plugins/is/qml/Keyboard_is_url.qml 2016-01-05 16:45:41 +0000 | |||
874 | +++ plugins/is/qml/Keyboard_is_url.qml 2016-01-28 19:06:48 +0000 | |||
875 | @@ -14,7 +14,7 @@ | |||
876 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
877 | 15 | */ | 15 | */ |
878 | 16 | 16 | ||
880 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
881 | 18 | import keys 1.0 | 18 | import keys 1.0 |
882 | 19 | 19 | ||
883 | 20 | KeyPad { | 20 | KeyPad { |
884 | 21 | 21 | ||
885 | === modified file 'plugins/is/qml/Keyboard_is_url_search.qml' | |||
886 | --- plugins/is/qml/Keyboard_is_url_search.qml 2016-01-05 16:45:41 +0000 | |||
887 | +++ plugins/is/qml/Keyboard_is_url_search.qml 2016-01-28 19:06:48 +0000 | |||
888 | @@ -14,7 +14,7 @@ | |||
889 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
890 | 15 | */ | 15 | */ |
891 | 16 | 16 | ||
893 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
894 | 18 | import keys 1.0 | 18 | import keys 1.0 |
895 | 19 | 19 | ||
896 | 20 | KeyPad { | 20 | KeyPad { |
897 | 21 | 21 | ||
898 | === modified file 'plugins/it/qml/Keyboard_it.qml' | |||
899 | --- plugins/it/qml/Keyboard_it.qml 2015-04-13 10:54:12 +0000 | |||
900 | +++ plugins/it/qml/Keyboard_it.qml 2016-01-28 19:06:48 +0000 | |||
901 | @@ -14,7 +14,7 @@ | |||
902 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
903 | 15 | */ | 15 | */ |
904 | 16 | 16 | ||
906 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
907 | 18 | import keys 1.0 | 18 | import keys 1.0 |
908 | 19 | 19 | ||
909 | 20 | KeyPad { | 20 | KeyPad { |
910 | 21 | 21 | ||
911 | === modified file 'plugins/it/qml/Keyboard_it_email.qml' | |||
912 | --- plugins/it/qml/Keyboard_it_email.qml 2015-04-13 10:54:12 +0000 | |||
913 | +++ plugins/it/qml/Keyboard_it_email.qml 2016-01-28 19:06:48 +0000 | |||
914 | @@ -14,7 +14,7 @@ | |||
915 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
916 | 15 | */ | 15 | */ |
917 | 16 | 16 | ||
919 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
920 | 18 | import keys 1.0 | 18 | import keys 1.0 |
921 | 19 | 19 | ||
922 | 20 | KeyPad { | 20 | KeyPad { |
923 | 21 | 21 | ||
924 | === modified file 'plugins/it/qml/Keyboard_it_url.qml' | |||
925 | --- plugins/it/qml/Keyboard_it_url.qml 2015-04-13 10:54:12 +0000 | |||
926 | +++ plugins/it/qml/Keyboard_it_url.qml 2016-01-28 19:06:48 +0000 | |||
927 | @@ -14,7 +14,7 @@ | |||
928 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
929 | 15 | */ | 15 | */ |
930 | 16 | 16 | ||
932 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
933 | 18 | import keys 1.0 | 18 | import keys 1.0 |
934 | 19 | 19 | ||
935 | 20 | KeyPad { | 20 | KeyPad { |
936 | 21 | 21 | ||
937 | === modified file 'plugins/it/qml/Keyboard_it_url_search.qml' | |||
938 | --- plugins/it/qml/Keyboard_it_url_search.qml 2015-04-13 10:54:12 +0000 | |||
939 | +++ plugins/it/qml/Keyboard_it_url_search.qml 2016-01-28 19:06:48 +0000 | |||
940 | @@ -14,7 +14,7 @@ | |||
941 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
942 | 15 | */ | 15 | */ |
943 | 16 | 16 | ||
945 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
946 | 18 | import keys 1.0 | 18 | import keys 1.0 |
947 | 19 | 19 | ||
948 | 20 | KeyPad { | 20 | KeyPad { |
949 | 21 | 21 | ||
950 | === modified file 'plugins/nb/qml/Keyboard_nb.qml' | |||
951 | --- plugins/nb/qml/Keyboard_nb.qml 2015-05-07 13:16:07 +0000 | |||
952 | +++ plugins/nb/qml/Keyboard_nb.qml 2016-01-28 19:06:48 +0000 | |||
953 | @@ -14,7 +14,7 @@ | |||
954 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
955 | 15 | */ | 15 | */ |
956 | 16 | 16 | ||
958 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
959 | 18 | import keys 1.0 | 18 | import keys 1.0 |
960 | 19 | 19 | ||
961 | 20 | KeyPad { | 20 | KeyPad { |
962 | 21 | 21 | ||
963 | === modified file 'plugins/nb/qml/Keyboard_nb_email.qml' | |||
964 | --- plugins/nb/qml/Keyboard_nb_email.qml 2015-05-07 13:16:07 +0000 | |||
965 | +++ plugins/nb/qml/Keyboard_nb_email.qml 2016-01-28 19:06:48 +0000 | |||
966 | @@ -14,7 +14,7 @@ | |||
967 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
968 | 15 | */ | 15 | */ |
969 | 16 | 16 | ||
971 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
972 | 18 | import keys 1.0 | 18 | import keys 1.0 |
973 | 19 | 19 | ||
974 | 20 | KeyPad { | 20 | KeyPad { |
975 | 21 | 21 | ||
976 | === modified file 'plugins/nb/qml/Keyboard_nb_url.qml' | |||
977 | --- plugins/nb/qml/Keyboard_nb_url.qml 2015-05-07 13:16:07 +0000 | |||
978 | +++ plugins/nb/qml/Keyboard_nb_url.qml 2016-01-28 19:06:48 +0000 | |||
979 | @@ -14,7 +14,7 @@ | |||
980 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
981 | 15 | */ | 15 | */ |
982 | 16 | 16 | ||
984 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
985 | 18 | import keys 1.0 | 18 | import keys 1.0 |
986 | 19 | 19 | ||
987 | 20 | KeyPad { | 20 | KeyPad { |
988 | 21 | 21 | ||
989 | === modified file 'plugins/nb/qml/Keyboard_nb_url_search.qml' | |||
990 | --- plugins/nb/qml/Keyboard_nb_url_search.qml 2015-05-07 13:16:07 +0000 | |||
991 | +++ plugins/nb/qml/Keyboard_nb_url_search.qml 2016-01-28 19:06:48 +0000 | |||
992 | @@ -14,7 +14,7 @@ | |||
993 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
994 | 15 | */ | 15 | */ |
995 | 16 | 16 | ||
997 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
998 | 18 | import keys 1.0 | 18 | import keys 1.0 |
999 | 19 | 19 | ||
1000 | 20 | KeyPad { | 20 | KeyPad { |
1001 | 21 | 21 | ||
1002 | === modified file 'plugins/nl/qml/Keyboard_nl.qml' | |||
1003 | --- plugins/nl/qml/Keyboard_nl.qml 2015-04-13 10:54:12 +0000 | |||
1004 | +++ plugins/nl/qml/Keyboard_nl.qml 2016-01-28 19:06:48 +0000 | |||
1005 | @@ -14,7 +14,7 @@ | |||
1006 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1007 | 15 | */ | 15 | */ |
1008 | 16 | 16 | ||
1010 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
1011 | 18 | import keys 1.0 | 18 | import keys 1.0 |
1012 | 19 | 19 | ||
1013 | 20 | KeyPad { | 20 | KeyPad { |
1014 | 21 | 21 | ||
1015 | === modified file 'plugins/nl/qml/Keyboard_nl_email.qml' | |||
1016 | --- plugins/nl/qml/Keyboard_nl_email.qml 2015-04-13 10:54:12 +0000 | |||
1017 | +++ plugins/nl/qml/Keyboard_nl_email.qml 2016-01-28 19:06:48 +0000 | |||
1018 | @@ -14,7 +14,7 @@ | |||
1019 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1020 | 15 | */ | 15 | */ |
1021 | 16 | 16 | ||
1023 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
1024 | 18 | import keys 1.0 | 18 | import keys 1.0 |
1025 | 19 | 19 | ||
1026 | 20 | KeyPad { | 20 | KeyPad { |
1027 | 21 | 21 | ||
1028 | === modified file 'plugins/nl/qml/Keyboard_nl_url.qml' | |||
1029 | --- plugins/nl/qml/Keyboard_nl_url.qml 2015-04-13 10:54:12 +0000 | |||
1030 | +++ plugins/nl/qml/Keyboard_nl_url.qml 2016-01-28 19:06:48 +0000 | |||
1031 | @@ -14,7 +14,7 @@ | |||
1032 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1033 | 15 | */ | 15 | */ |
1034 | 16 | 16 | ||
1036 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
1037 | 18 | import keys 1.0 | 18 | import keys 1.0 |
1038 | 19 | 19 | ||
1039 | 20 | KeyPad { | 20 | KeyPad { |
1040 | 21 | 21 | ||
1041 | === modified file 'plugins/nl/qml/Keyboard_nl_url_search.qml' | |||
1042 | --- plugins/nl/qml/Keyboard_nl_url_search.qml 2015-04-13 10:54:12 +0000 | |||
1043 | +++ plugins/nl/qml/Keyboard_nl_url_search.qml 2016-01-28 19:06:48 +0000 | |||
1044 | @@ -14,7 +14,7 @@ | |||
1045 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1046 | 15 | */ | 15 | */ |
1047 | 16 | 16 | ||
1049 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
1050 | 18 | import keys 1.0 | 18 | import keys 1.0 |
1051 | 19 | 19 | ||
1052 | 20 | KeyPad { | 20 | KeyPad { |
1053 | 21 | 21 | ||
1054 | === modified file 'plugins/pinyin/qml/Keyboard_zh.qml' | |||
1055 | --- plugins/pinyin/qml/Keyboard_zh.qml 2015-04-13 10:54:12 +0000 | |||
1056 | +++ plugins/pinyin/qml/Keyboard_zh.qml 2016-01-28 19:06:48 +0000 | |||
1057 | @@ -14,7 +14,7 @@ | |||
1058 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1059 | 15 | */ | 15 | */ |
1060 | 16 | 16 | ||
1062 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
1063 | 18 | import keys 1.0 | 18 | import keys 1.0 |
1064 | 19 | 19 | ||
1065 | 20 | KeyPad { | 20 | KeyPad { |
1066 | 21 | 21 | ||
1067 | === modified file 'plugins/pinyin/qml/Keyboard_zh_email.qml' | |||
1068 | --- plugins/pinyin/qml/Keyboard_zh_email.qml 2015-04-13 10:54:12 +0000 | |||
1069 | +++ plugins/pinyin/qml/Keyboard_zh_email.qml 2016-01-28 19:06:48 +0000 | |||
1070 | @@ -14,7 +14,7 @@ | |||
1071 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1072 | 15 | */ | 15 | */ |
1073 | 16 | 16 | ||
1075 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
1076 | 18 | import keys 1.0 | 18 | import keys 1.0 |
1077 | 19 | 19 | ||
1078 | 20 | KeyPad { | 20 | KeyPad { |
1079 | 21 | 21 | ||
1080 | === modified file 'plugins/pinyin/qml/Keyboard_zh_url.qml' | |||
1081 | --- plugins/pinyin/qml/Keyboard_zh_url.qml 2015-04-13 10:54:12 +0000 | |||
1082 | +++ plugins/pinyin/qml/Keyboard_zh_url.qml 2016-01-28 19:06:48 +0000 | |||
1083 | @@ -14,7 +14,7 @@ | |||
1084 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1085 | 15 | */ | 15 | */ |
1086 | 16 | 16 | ||
1088 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
1089 | 18 | import keys 1.0 | 18 | import keys 1.0 |
1090 | 19 | 19 | ||
1091 | 20 | KeyPad { | 20 | KeyPad { |
1092 | 21 | 21 | ||
1093 | === modified file 'plugins/pinyin/qml/Keyboard_zh_url_search.qml' | |||
1094 | --- plugins/pinyin/qml/Keyboard_zh_url_search.qml 2015-04-13 10:54:12 +0000 | |||
1095 | +++ plugins/pinyin/qml/Keyboard_zh_url_search.qml 2016-01-28 19:06:48 +0000 | |||
1096 | @@ -14,7 +14,7 @@ | |||
1097 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1098 | 15 | */ | 15 | */ |
1099 | 16 | 16 | ||
1101 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
1102 | 18 | import keys 1.0 | 18 | import keys 1.0 |
1103 | 19 | 19 | ||
1104 | 20 | KeyPad { | 20 | KeyPad { |
1105 | 21 | 21 | ||
1106 | === modified file 'plugins/pl/qml/Keyboard_pl.qml' | |||
1107 | --- plugins/pl/qml/Keyboard_pl.qml 2015-04-13 10:54:12 +0000 | |||
1108 | +++ plugins/pl/qml/Keyboard_pl.qml 2016-01-28 19:06:48 +0000 | |||
1109 | @@ -14,7 +14,7 @@ | |||
1110 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1111 | 15 | */ | 15 | */ |
1112 | 16 | 16 | ||
1114 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
1115 | 18 | import keys 1.0 | 18 | import keys 1.0 |
1116 | 19 | 19 | ||
1117 | 20 | KeyPad { | 20 | KeyPad { |
1118 | 21 | 21 | ||
1119 | === modified file 'plugins/pl/qml/Keyboard_pl_email.qml' | |||
1120 | --- plugins/pl/qml/Keyboard_pl_email.qml 2015-04-13 10:54:12 +0000 | |||
1121 | +++ plugins/pl/qml/Keyboard_pl_email.qml 2016-01-28 19:06:48 +0000 | |||
1122 | @@ -14,7 +14,7 @@ | |||
1123 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1124 | 15 | */ | 15 | */ |
1125 | 16 | 16 | ||
1127 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
1128 | 18 | import keys 1.0 | 18 | import keys 1.0 |
1129 | 19 | 19 | ||
1130 | 20 | KeyPad { | 20 | KeyPad { |
1131 | 21 | 21 | ||
1132 | === modified file 'plugins/pl/qml/Keyboard_pl_url.qml' | |||
1133 | --- plugins/pl/qml/Keyboard_pl_url.qml 2015-04-13 10:54:12 +0000 | |||
1134 | +++ plugins/pl/qml/Keyboard_pl_url.qml 2016-01-28 19:06:48 +0000 | |||
1135 | @@ -14,7 +14,7 @@ | |||
1136 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1137 | 15 | */ | 15 | */ |
1138 | 16 | 16 | ||
1140 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
1141 | 18 | import keys 1.0 | 18 | import keys 1.0 |
1142 | 19 | 19 | ||
1143 | 20 | KeyPad { | 20 | KeyPad { |
1144 | 21 | 21 | ||
1145 | === modified file 'plugins/pl/qml/Keyboard_pl_url_search.qml' | |||
1146 | --- plugins/pl/qml/Keyboard_pl_url_search.qml 2015-04-13 10:54:12 +0000 | |||
1147 | +++ plugins/pl/qml/Keyboard_pl_url_search.qml 2016-01-28 19:06:48 +0000 | |||
1148 | @@ -14,7 +14,7 @@ | |||
1149 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1150 | 15 | */ | 15 | */ |
1151 | 16 | 16 | ||
1153 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
1154 | 18 | import keys 1.0 | 18 | import keys 1.0 |
1155 | 19 | 19 | ||
1156 | 20 | KeyPad { | 20 | KeyPad { |
1157 | 21 | 21 | ||
1158 | === modified file 'plugins/pt/qml/Keyboard_pt.qml' | |||
1159 | --- plugins/pt/qml/Keyboard_pt.qml 2015-04-13 10:54:12 +0000 | |||
1160 | +++ plugins/pt/qml/Keyboard_pt.qml 2016-01-28 19:06:48 +0000 | |||
1161 | @@ -14,7 +14,7 @@ | |||
1162 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1163 | 15 | */ | 15 | */ |
1164 | 16 | 16 | ||
1166 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
1167 | 18 | import keys 1.0 | 18 | import keys 1.0 |
1168 | 19 | 19 | ||
1169 | 20 | KeyPad { | 20 | KeyPad { |
1170 | 21 | 21 | ||
1171 | === modified file 'plugins/pt/qml/Keyboard_pt_email.qml' | |||
1172 | --- plugins/pt/qml/Keyboard_pt_email.qml 2015-04-13 10:54:12 +0000 | |||
1173 | +++ plugins/pt/qml/Keyboard_pt_email.qml 2016-01-28 19:06:48 +0000 | |||
1174 | @@ -14,7 +14,7 @@ | |||
1175 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1176 | 15 | */ | 15 | */ |
1177 | 16 | 16 | ||
1179 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
1180 | 18 | import keys 1.0 | 18 | import keys 1.0 |
1181 | 19 | 19 | ||
1182 | 20 | KeyPad { | 20 | KeyPad { |
1183 | 21 | 21 | ||
1184 | === modified file 'plugins/pt/qml/Keyboard_pt_url.qml' | |||
1185 | --- plugins/pt/qml/Keyboard_pt_url.qml 2015-04-13 10:54:12 +0000 | |||
1186 | +++ plugins/pt/qml/Keyboard_pt_url.qml 2016-01-28 19:06:48 +0000 | |||
1187 | @@ -14,7 +14,7 @@ | |||
1188 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1189 | 15 | */ | 15 | */ |
1190 | 16 | 16 | ||
1192 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
1193 | 18 | import keys 1.0 | 18 | import keys 1.0 |
1194 | 19 | 19 | ||
1195 | 20 | KeyPad { | 20 | KeyPad { |
1196 | 21 | 21 | ||
1197 | === modified file 'plugins/pt/qml/Keyboard_pt_url_search.qml' | |||
1198 | --- plugins/pt/qml/Keyboard_pt_url_search.qml 2015-04-13 10:54:12 +0000 | |||
1199 | +++ plugins/pt/qml/Keyboard_pt_url_search.qml 2016-01-28 19:06:48 +0000 | |||
1200 | @@ -14,7 +14,7 @@ | |||
1201 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1202 | 15 | */ | 15 | */ |
1203 | 16 | 16 | ||
1205 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
1206 | 18 | import keys 1.0 | 18 | import keys 1.0 |
1207 | 19 | 19 | ||
1208 | 20 | KeyPad { | 20 | KeyPad { |
1209 | 21 | 21 | ||
1210 | === modified file 'plugins/ro/qml/Keyboard_ro.qml' | |||
1211 | --- plugins/ro/qml/Keyboard_ro.qml 2015-05-06 10:40:33 +0000 | |||
1212 | +++ plugins/ro/qml/Keyboard_ro.qml 2016-01-28 19:06:48 +0000 | |||
1213 | @@ -14,7 +14,7 @@ | |||
1214 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1215 | 15 | */ | 15 | */ |
1216 | 16 | 16 | ||
1218 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
1219 | 18 | import keys 1.0 | 18 | import keys 1.0 |
1220 | 19 | 19 | ||
1221 | 20 | KeyPad { | 20 | KeyPad { |
1222 | 21 | 21 | ||
1223 | === modified file 'plugins/ro/qml/Keyboard_ro_email.qml' | |||
1224 | --- plugins/ro/qml/Keyboard_ro_email.qml 2015-05-06 10:40:33 +0000 | |||
1225 | +++ plugins/ro/qml/Keyboard_ro_email.qml 2016-01-28 19:06:48 +0000 | |||
1226 | @@ -14,7 +14,7 @@ | |||
1227 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1228 | 15 | */ | 15 | */ |
1229 | 16 | 16 | ||
1231 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
1232 | 18 | import keys 1.0 | 18 | import keys 1.0 |
1233 | 19 | 19 | ||
1234 | 20 | KeyPad { | 20 | KeyPad { |
1235 | 21 | 21 | ||
1236 | === modified file 'plugins/ro/qml/Keyboard_ro_url.qml' | |||
1237 | --- plugins/ro/qml/Keyboard_ro_url.qml 2015-05-06 10:40:33 +0000 | |||
1238 | +++ plugins/ro/qml/Keyboard_ro_url.qml 2016-01-28 19:06:48 +0000 | |||
1239 | @@ -14,7 +14,7 @@ | |||
1240 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1241 | 15 | */ | 15 | */ |
1242 | 16 | 16 | ||
1244 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
1245 | 18 | import keys 1.0 | 18 | import keys 1.0 |
1246 | 19 | 19 | ||
1247 | 20 | KeyPad { | 20 | KeyPad { |
1248 | 21 | 21 | ||
1249 | === modified file 'plugins/ro/qml/Keyboard_ro_url_search.qml' | |||
1250 | --- plugins/ro/qml/Keyboard_ro_url_search.qml 2015-05-06 10:40:33 +0000 | |||
1251 | +++ plugins/ro/qml/Keyboard_ro_url_search.qml 2016-01-28 19:06:48 +0000 | |||
1252 | @@ -14,7 +14,7 @@ | |||
1253 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1254 | 15 | */ | 15 | */ |
1255 | 16 | 16 | ||
1257 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
1258 | 18 | import keys 1.0 | 18 | import keys 1.0 |
1259 | 19 | 19 | ||
1260 | 20 | KeyPad { | 20 | KeyPad { |
1261 | 21 | 21 | ||
1262 | === modified file 'plugins/ru/qml/Keyboard_ru.qml' | |||
1263 | --- plugins/ru/qml/Keyboard_ru.qml 2015-04-13 10:54:12 +0000 | |||
1264 | +++ plugins/ru/qml/Keyboard_ru.qml 2016-01-28 19:06:48 +0000 | |||
1265 | @@ -14,7 +14,7 @@ | |||
1266 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1267 | 15 | */ | 15 | */ |
1268 | 16 | 16 | ||
1270 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
1271 | 18 | import keys 1.0 | 18 | import keys 1.0 |
1272 | 19 | 19 | ||
1273 | 20 | KeyPad { | 20 | KeyPad { |
1274 | 21 | 21 | ||
1275 | === modified file 'plugins/ru/qml/Keyboard_ru_email.qml' | |||
1276 | --- plugins/ru/qml/Keyboard_ru_email.qml 2015-04-13 10:54:12 +0000 | |||
1277 | +++ plugins/ru/qml/Keyboard_ru_email.qml 2016-01-28 19:06:48 +0000 | |||
1278 | @@ -14,7 +14,7 @@ | |||
1279 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1280 | 15 | */ | 15 | */ |
1281 | 16 | 16 | ||
1283 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
1284 | 18 | import keys 1.0 | 18 | import keys 1.0 |
1285 | 19 | 19 | ||
1286 | 20 | KeyPad { | 20 | KeyPad { |
1287 | 21 | 21 | ||
1288 | === modified file 'plugins/ru/qml/Keyboard_ru_url.qml' | |||
1289 | --- plugins/ru/qml/Keyboard_ru_url.qml 2015-04-13 10:54:12 +0000 | |||
1290 | +++ plugins/ru/qml/Keyboard_ru_url.qml 2016-01-28 19:06:48 +0000 | |||
1291 | @@ -14,7 +14,7 @@ | |||
1292 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1293 | 15 | */ | 15 | */ |
1294 | 16 | 16 | ||
1296 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
1297 | 18 | import keys 1.0 | 18 | import keys 1.0 |
1298 | 19 | 19 | ||
1299 | 20 | KeyPad { | 20 | KeyPad { |
1300 | 21 | 21 | ||
1301 | === modified file 'plugins/ru/qml/Keyboard_ru_url_search.qml' | |||
1302 | --- plugins/ru/qml/Keyboard_ru_url_search.qml 2015-04-13 10:54:12 +0000 | |||
1303 | +++ plugins/ru/qml/Keyboard_ru_url_search.qml 2016-01-28 19:06:48 +0000 | |||
1304 | @@ -14,7 +14,7 @@ | |||
1305 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1306 | 15 | */ | 15 | */ |
1307 | 16 | 16 | ||
1309 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
1310 | 18 | import keys 1.0 | 18 | import keys 1.0 |
1311 | 19 | 19 | ||
1312 | 20 | KeyPad { | 20 | KeyPad { |
1313 | 21 | 21 | ||
1314 | === modified file 'plugins/sl/qml/Keyboard_sl.qml' | |||
1315 | --- plugins/sl/qml/Keyboard_sl.qml 2015-05-07 13:16:07 +0000 | |||
1316 | +++ plugins/sl/qml/Keyboard_sl.qml 2016-01-28 19:06:48 +0000 | |||
1317 | @@ -14,7 +14,7 @@ | |||
1318 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1319 | 15 | */ | 15 | */ |
1320 | 16 | 16 | ||
1322 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
1323 | 18 | import keys 1.0 | 18 | import keys 1.0 |
1324 | 19 | 19 | ||
1325 | 20 | KeyPad { | 20 | KeyPad { |
1326 | 21 | 21 | ||
1327 | === modified file 'plugins/sl/qml/Keyboard_sl_email.qml' | |||
1328 | --- plugins/sl/qml/Keyboard_sl_email.qml 2015-05-15 12:21:01 +0000 | |||
1329 | +++ plugins/sl/qml/Keyboard_sl_email.qml 2016-01-28 19:06:48 +0000 | |||
1330 | @@ -14,7 +14,7 @@ | |||
1331 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1332 | 15 | */ | 15 | */ |
1333 | 16 | 16 | ||
1335 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
1336 | 18 | import keys 1.0 | 18 | import keys 1.0 |
1337 | 19 | 19 | ||
1338 | 20 | KeyPad { | 20 | KeyPad { |
1339 | 21 | 21 | ||
1340 | === modified file 'plugins/sl/qml/Keyboard_sl_url.qml' | |||
1341 | --- plugins/sl/qml/Keyboard_sl_url.qml 2015-05-15 12:21:01 +0000 | |||
1342 | +++ plugins/sl/qml/Keyboard_sl_url.qml 2016-01-28 19:06:48 +0000 | |||
1343 | @@ -14,7 +14,7 @@ | |||
1344 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1345 | 15 | */ | 15 | */ |
1346 | 16 | 16 | ||
1348 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
1349 | 18 | import keys 1.0 | 18 | import keys 1.0 |
1350 | 19 | 19 | ||
1351 | 20 | KeyPad { | 20 | KeyPad { |
1352 | 21 | 21 | ||
1353 | === modified file 'plugins/sl/qml/Keyboard_sl_url_search.qml' | |||
1354 | --- plugins/sl/qml/Keyboard_sl_url_search.qml 2015-05-15 12:21:01 +0000 | |||
1355 | +++ plugins/sl/qml/Keyboard_sl_url_search.qml 2016-01-28 19:06:48 +0000 | |||
1356 | @@ -14,7 +14,7 @@ | |||
1357 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1358 | 15 | */ | 15 | */ |
1359 | 16 | 16 | ||
1361 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
1362 | 18 | import keys 1.0 | 18 | import keys 1.0 |
1363 | 19 | 19 | ||
1364 | 20 | KeyPad { | 20 | KeyPad { |
1365 | 21 | 21 | ||
1366 | === modified file 'plugins/sr/qml/Keyboard_sr.qml' | |||
1367 | --- plugins/sr/qml/Keyboard_sr.qml 2015-04-13 10:54:12 +0000 | |||
1368 | +++ plugins/sr/qml/Keyboard_sr.qml 2016-01-28 19:06:48 +0000 | |||
1369 | @@ -14,7 +14,7 @@ | |||
1370 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1371 | 15 | */ | 15 | */ |
1372 | 16 | 16 | ||
1374 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
1375 | 18 | import keys 1.0 | 18 | import keys 1.0 |
1376 | 19 | 19 | ||
1377 | 20 | KeyPad { | 20 | KeyPad { |
1378 | 21 | 21 | ||
1379 | === modified file 'plugins/sr/qml/Keyboard_sr_email.qml' | |||
1380 | --- plugins/sr/qml/Keyboard_sr_email.qml 2015-04-13 10:54:12 +0000 | |||
1381 | +++ plugins/sr/qml/Keyboard_sr_email.qml 2016-01-28 19:06:48 +0000 | |||
1382 | @@ -14,7 +14,7 @@ | |||
1383 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1384 | 15 | */ | 15 | */ |
1385 | 16 | 16 | ||
1387 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
1388 | 18 | import keys 1.0 | 18 | import keys 1.0 |
1389 | 19 | 19 | ||
1390 | 20 | KeyPad { | 20 | KeyPad { |
1391 | 21 | 21 | ||
1392 | === modified file 'plugins/sr/qml/Keyboard_sr_url.qml' | |||
1393 | --- plugins/sr/qml/Keyboard_sr_url.qml 2015-04-13 10:54:12 +0000 | |||
1394 | +++ plugins/sr/qml/Keyboard_sr_url.qml 2016-01-28 19:06:48 +0000 | |||
1395 | @@ -14,7 +14,7 @@ | |||
1396 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1397 | 15 | */ | 15 | */ |
1398 | 16 | 16 | ||
1400 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
1401 | 18 | import keys 1.0 | 18 | import keys 1.0 |
1402 | 19 | 19 | ||
1403 | 20 | KeyPad { | 20 | KeyPad { |
1404 | 21 | 21 | ||
1405 | === modified file 'plugins/sr/qml/Keyboard_sr_url_search.qml' | |||
1406 | --- plugins/sr/qml/Keyboard_sr_url_search.qml 2015-04-13 10:54:12 +0000 | |||
1407 | +++ plugins/sr/qml/Keyboard_sr_url_search.qml 2016-01-28 19:06:48 +0000 | |||
1408 | @@ -14,7 +14,7 @@ | |||
1409 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1410 | 15 | */ | 15 | */ |
1411 | 16 | 16 | ||
1413 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
1414 | 18 | import keys 1.0 | 18 | import keys 1.0 |
1415 | 19 | 19 | ||
1416 | 20 | KeyPad { | 20 | KeyPad { |
1417 | 21 | 21 | ||
1418 | === modified file 'plugins/sv/qml/Keyboard_sv.qml' | |||
1419 | --- plugins/sv/qml/Keyboard_sv.qml 2015-04-20 14:03:56 +0000 | |||
1420 | +++ plugins/sv/qml/Keyboard_sv.qml 2016-01-28 19:06:48 +0000 | |||
1421 | @@ -14,7 +14,7 @@ | |||
1422 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1423 | 15 | */ | 15 | */ |
1424 | 16 | 16 | ||
1426 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
1427 | 18 | import keys 1.0 | 18 | import keys 1.0 |
1428 | 19 | 19 | ||
1429 | 20 | KeyPad { | 20 | KeyPad { |
1430 | 21 | 21 | ||
1431 | === modified file 'plugins/sv/qml/Keyboard_sv_email.qml' | |||
1432 | --- plugins/sv/qml/Keyboard_sv_email.qml 2015-04-20 14:03:56 +0000 | |||
1433 | +++ plugins/sv/qml/Keyboard_sv_email.qml 2016-01-28 19:06:48 +0000 | |||
1434 | @@ -14,7 +14,7 @@ | |||
1435 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1436 | 15 | */ | 15 | */ |
1437 | 16 | 16 | ||
1439 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
1440 | 18 | import keys 1.0 | 18 | import keys 1.0 |
1441 | 19 | 19 | ||
1442 | 20 | KeyPad { | 20 | KeyPad { |
1443 | 21 | 21 | ||
1444 | === modified file 'plugins/sv/qml/Keyboard_sv_url.qml' | |||
1445 | --- plugins/sv/qml/Keyboard_sv_url.qml 2015-04-20 14:03:56 +0000 | |||
1446 | +++ plugins/sv/qml/Keyboard_sv_url.qml 2016-01-28 19:06:48 +0000 | |||
1447 | @@ -14,7 +14,7 @@ | |||
1448 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1449 | 15 | */ | 15 | */ |
1450 | 16 | 16 | ||
1452 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
1453 | 18 | import keys 1.0 | 18 | import keys 1.0 |
1454 | 19 | 19 | ||
1455 | 20 | KeyPad { | 20 | KeyPad { |
1456 | 21 | 21 | ||
1457 | === modified file 'plugins/sv/qml/Keyboard_sv_url_search.qml' | |||
1458 | --- plugins/sv/qml/Keyboard_sv_url_search.qml 2015-05-08 14:44:20 +0000 | |||
1459 | +++ plugins/sv/qml/Keyboard_sv_url_search.qml 2016-01-28 19:06:48 +0000 | |||
1460 | @@ -14,7 +14,7 @@ | |||
1461 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1462 | 15 | */ | 15 | */ |
1463 | 16 | 16 | ||
1465 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
1466 | 18 | import keys 1.0 | 18 | import keys 1.0 |
1467 | 19 | 19 | ||
1468 | 20 | KeyPad { | 20 | KeyPad { |
1469 | 21 | 21 | ||
1470 | === modified file 'plugins/uk/qml/Keyboard_uk.qml' | |||
1471 | --- plugins/uk/qml/Keyboard_uk.qml 2015-05-07 13:16:07 +0000 | |||
1472 | +++ plugins/uk/qml/Keyboard_uk.qml 2016-01-28 19:06:48 +0000 | |||
1473 | @@ -14,7 +14,7 @@ | |||
1474 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1475 | 15 | */ | 15 | */ |
1476 | 16 | 16 | ||
1478 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
1479 | 18 | import keys 1.0 | 18 | import keys 1.0 |
1480 | 19 | 19 | ||
1481 | 20 | KeyPad { | 20 | KeyPad { |
1482 | 21 | 21 | ||
1483 | === modified file 'plugins/uk/qml/Keyboard_uk_email.qml' | |||
1484 | --- plugins/uk/qml/Keyboard_uk_email.qml 2015-05-07 13:16:07 +0000 | |||
1485 | +++ plugins/uk/qml/Keyboard_uk_email.qml 2016-01-28 19:06:48 +0000 | |||
1486 | @@ -14,7 +14,7 @@ | |||
1487 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1488 | 15 | */ | 15 | */ |
1489 | 16 | 16 | ||
1491 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
1492 | 18 | import keys 1.0 | 18 | import keys 1.0 |
1493 | 19 | 19 | ||
1494 | 20 | KeyPad { | 20 | KeyPad { |
1495 | 21 | 21 | ||
1496 | === modified file 'plugins/uk/qml/Keyboard_uk_url.qml' | |||
1497 | --- plugins/uk/qml/Keyboard_uk_url.qml 2015-05-07 13:16:07 +0000 | |||
1498 | +++ plugins/uk/qml/Keyboard_uk_url.qml 2016-01-28 19:06:48 +0000 | |||
1499 | @@ -14,7 +14,7 @@ | |||
1500 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1501 | 15 | */ | 15 | */ |
1502 | 16 | 16 | ||
1504 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
1505 | 18 | import keys 1.0 | 18 | import keys 1.0 |
1506 | 19 | 19 | ||
1507 | 20 | KeyPad { | 20 | KeyPad { |
1508 | 21 | 21 | ||
1509 | === modified file 'plugins/uk/qml/Keyboard_uk_url_search.qml' | |||
1510 | --- plugins/uk/qml/Keyboard_uk_url_search.qml 2015-05-07 13:16:07 +0000 | |||
1511 | +++ plugins/uk/qml/Keyboard_uk_url_search.qml 2016-01-28 19:06:48 +0000 | |||
1512 | @@ -14,7 +14,7 @@ | |||
1513 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1514 | 15 | */ | 15 | */ |
1515 | 16 | 16 | ||
1517 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
1518 | 18 | import keys 1.0 | 18 | import keys 1.0 |
1519 | 19 | 19 | ||
1520 | 20 | KeyPad { | 20 | KeyPad { |
1521 | 21 | 21 | ||
1522 | === modified file 'qml/Keyboard.qml' | |||
1523 | --- qml/Keyboard.qml 2016-01-04 14:13:58 +0000 | |||
1524 | +++ qml/Keyboard.qml 2016-01-28 19:06:48 +0000 | |||
1525 | @@ -40,6 +40,7 @@ | |||
1526 | 40 | objectName: "fullScreenItem" | 40 | objectName: "fullScreenItem" |
1527 | 41 | 41 | ||
1528 | 42 | property bool landscape: width > height | 42 | property bool landscape: width > height |
1529 | 43 | readonly property bool tablet: landscape ? width >= units.gu(90) : height >= units.gu(90) | ||
1530 | 43 | 44 | ||
1531 | 44 | property variant input_method: maliit_input_method | 45 | property variant input_method: maliit_input_method |
1532 | 45 | property variant event_handler: maliit_event_handler | 46 | property variant event_handler: maliit_event_handler |
1533 | @@ -57,8 +58,11 @@ | |||
1534 | 57 | anchors.left: parent.left | 58 | anchors.left: parent.left |
1535 | 58 | 59 | ||
1536 | 59 | width: parent.width | 60 | width: parent.width |
1539 | 60 | height: fullScreenItem.landscape ? (fullScreenItem.height * UI.phoneKeyboardHeightLandscape) + wordRibbon.height | 61 | height: fullScreenItem.height * (fullScreenItem.landscape ? fullScreenItem.tablet ? UI.tabletKeyboardHeightLandscape |
1540 | 61 | : (fullScreenItem.height * UI.phoneKeyboardHeightPortrait) + wordRibbon.height | 62 | : UI.phoneKeyboardHeightLandscape |
1541 | 63 | : fullScreenItem.tablet ? UI.tabletKeyboardHeightPortrait | ||
1542 | 64 | : UI.phoneKeyboardHeightPortrait) | ||
1543 | 65 | + wordRibbon.height + borderTop.height | ||
1544 | 62 | 66 | ||
1545 | 63 | property int keypadHeight: height; | 67 | property int keypadHeight: height; |
1546 | 64 | 68 | ||
1547 | @@ -89,7 +93,7 @@ | |||
1548 | 89 | anchors.right: parent.right | 93 | anchors.right: parent.right |
1549 | 90 | anchors.top: parent.top | 94 | anchors.top: parent.top |
1550 | 91 | height: (parent.height - canvas.keypadHeight) + wordRibbon.height + | 95 | height: (parent.height - canvas.keypadHeight) + wordRibbon.height + |
1552 | 92 | borderTop.height + units.gu(UI.top_margin) | 96 | borderTop.height |
1553 | 93 | 97 | ||
1554 | 94 | drag.target: keyboardSurface | 98 | drag.target: keyboardSurface |
1555 | 95 | drag.axis: Drag.YAxis; | 99 | drag.axis: Drag.YAxis; |
1556 | @@ -124,6 +128,13 @@ | |||
1557 | 124 | onWidthChanged: fullScreenItem.reportKeyboardVisibleRect(); | 128 | onWidthChanged: fullScreenItem.reportKeyboardVisibleRect(); |
1558 | 125 | onHeightChanged: fullScreenItem.reportKeyboardVisibleRect(); | 129 | onHeightChanged: fullScreenItem.reportKeyboardVisibleRect(); |
1559 | 126 | 130 | ||
1560 | 131 | Rectangle { | ||
1561 | 132 | width: parent.width | ||
1562 | 133 | height: units.dp(1) | ||
1563 | 134 | color: UI.dividerColor | ||
1564 | 135 | anchors.bottom: wordRibbon.visible ? wordRibbon.top : keyboardComp.top | ||
1565 | 136 | } | ||
1566 | 137 | |||
1567 | 127 | WordRibbon { | 138 | WordRibbon { |
1568 | 128 | id: wordRibbon | 139 | id: wordRibbon |
1569 | 129 | objectName: "wordRibbon" | 140 | objectName: "wordRibbon" |
1570 | @@ -133,7 +144,9 @@ | |||
1571 | 133 | anchors.bottom: keyboardComp.top | 144 | anchors.bottom: keyboardComp.top |
1572 | 134 | width: parent.width; | 145 | width: parent.width; |
1573 | 135 | 146 | ||
1575 | 136 | height: canvas.wordribbon_visible ? units.gu(UI.wordribbonHeight) : 0 | 147 | height: canvas.wordribbon_visible ? (fullScreenItem.tablet ? units.gu(UI.tabletWordribbonHeight) |
1576 | 148 | : units.gu(UI.phoneWordribbonHeight)) | ||
1577 | 149 | : 0 | ||
1578 | 137 | onHeightChanged: fullScreenItem.reportKeyboardVisibleRect(); | 150 | onHeightChanged: fullScreenItem.reportKeyboardVisibleRect(); |
1579 | 138 | } | 151 | } |
1580 | 139 | 152 | ||
1581 | @@ -141,7 +154,7 @@ | |||
1582 | 141 | id: keyboardComp | 154 | id: keyboardComp |
1583 | 142 | objectName: "keyboardComp" | 155 | objectName: "keyboardComp" |
1584 | 143 | 156 | ||
1586 | 144 | height: canvas.keypadHeight - wordRibbon.height | 157 | height: canvas.keypadHeight - wordRibbon.height + keypad.anchors.topMargin |
1587 | 145 | width: parent.width | 158 | width: parent.width |
1588 | 146 | anchors.bottom: parent.bottom | 159 | anchors.bottom: parent.bottom |
1589 | 147 | 160 | ||
1590 | @@ -154,12 +167,13 @@ | |||
1591 | 154 | 167 | ||
1592 | 155 | color: UI.backgroundColor | 168 | color: UI.backgroundColor |
1593 | 156 | } | 169 | } |
1596 | 157 | 170 | ||
1597 | 158 | Image { | 171 | Rectangle { |
1598 | 159 | id: borderTop | 172 | id: borderTop |
1600 | 160 | source: "styles/ubuntu/images/border_top.png" | 173 | color: UI.backgroundColor |
1601 | 161 | width: parent.width | 174 | width: parent.width |
1602 | 162 | anchors.top: parent.top.bottom | 175 | anchors.top: parent.top.bottom |
1603 | 176 | height: wordRibbon.visible ? 0 : units.gu(UI.top_margin) | ||
1604 | 163 | } | 177 | } |
1605 | 164 | 178 | ||
1606 | 165 | KeyboardContainer { | 179 | KeyboardContainer { |
1607 | @@ -167,8 +181,7 @@ | |||
1608 | 167 | 181 | ||
1609 | 168 | anchors.top: borderTop.bottom | 182 | anchors.top: borderTop.bottom |
1610 | 169 | anchors.bottom: background.bottom | 183 | anchors.bottom: background.bottom |
1613 | 170 | anchors.topMargin: units.gu( UI.top_margin ) | 184 | anchors.bottomMargin: units.gu(UI.bottom_margin) |
1612 | 171 | anchors.bottomMargin: units.gu( UI.bottom_margin ) | ||
1614 | 172 | width: parent.width | 185 | width: parent.width |
1615 | 173 | 186 | ||
1616 | 174 | onPopoverEnabledChanged: fullScreenItem.reportKeyboardVisibleRect(); | 187 | onPopoverEnabledChanged: fullScreenItem.reportKeyboardVisibleRect(); |
1617 | 175 | 188 | ||
1618 | === modified file 'qml/KeyboardContainer.qml' | |||
1619 | --- qml/KeyboardContainer.qml 2015-07-24 14:42:03 +0000 | |||
1620 | +++ qml/KeyboardContainer.qml 2016-01-28 19:06:48 +0000 | |||
1621 | @@ -14,7 +14,7 @@ | |||
1622 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1623 | 15 | */ | 15 | */ |
1624 | 16 | 16 | ||
1626 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
1627 | 18 | import QtMultimedia 5.0 | 18 | import QtMultimedia 5.0 |
1628 | 19 | import QtQuick.Window 2.0 | 19 | import QtQuick.Window 2.0 |
1629 | 20 | import "languages/" | 20 | import "languages/" |
1630 | 21 | 21 | ||
1631 | === modified file 'qml/WordRibbon.qml' | |||
1632 | --- qml/WordRibbon.qml 2016-01-04 14:13:58 +0000 | |||
1633 | +++ qml/WordRibbon.qml 2016-01-28 19:06:48 +0000 | |||
1634 | @@ -16,6 +16,7 @@ | |||
1635 | 16 | 16 | ||
1636 | 17 | import QtQuick 2.4 | 17 | import QtQuick 2.4 |
1637 | 18 | import Ubuntu.Components 1.3 | 18 | import Ubuntu.Components 1.3 |
1638 | 19 | import "keys/key_constants.js" as UI | ||
1639 | 19 | 20 | ||
1640 | 20 | Rectangle { | 21 | Rectangle { |
1641 | 21 | 22 | ||
1642 | @@ -25,7 +26,7 @@ | |||
1643 | 25 | 26 | ||
1644 | 26 | Rectangle { | 27 | Rectangle { |
1645 | 27 | anchors.fill: parent | 28 | anchors.fill: parent |
1647 | 28 | color: "#f1f1f1" | 29 | color: UI.backgroundColor |
1648 | 29 | } | 30 | } |
1649 | 30 | 31 | ||
1650 | 31 | ListView { | 32 | ListView { |
1651 | @@ -48,23 +49,22 @@ | |||
1652 | 48 | height: wordRibbonCanvas.height | 49 | height: wordRibbonCanvas.height |
1653 | 49 | anchors.margins: 0 | 50 | anchors.margins: 0 |
1654 | 50 | property alias word_text: wordItem // For testing in Autopilot | 51 | property alias word_text: wordItem // For testing in Autopilot |
1656 | 51 | property alias textBold: wordItem.font.bold // Exposed for autopilot | 52 | property bool textBold: isPrimaryCandidate || listView.count == 1 // Exposed for autopilot |
1657 | 52 | 53 | ||
1658 | 53 | Item { | 54 | Item { |
1659 | 54 | anchors.fill: parent | 55 | anchors.fill: parent |
1660 | 55 | anchors.margins: { | 56 | anchors.margins: { |
1661 | 56 | top: units.gu(0) | 57 | top: units.gu(0) |
1662 | 57 | bottom: units.gu(0) | 58 | bottom: units.gu(0) |
1665 | 58 | left: units.gu(1) | 59 | left: units.gu(2) |
1666 | 59 | right: units.gu(1) | 60 | right: units.gu(2) |
1667 | 60 | } | 61 | } |
1668 | 61 | 62 | ||
1670 | 62 | Text { | 63 | Label { |
1671 | 63 | id: wordItem | 64 | id: wordItem |
1676 | 64 | font.pixelSize: units.gu(1.9) | 65 | font.pixelSize: units.dp(fullScreenItem.tablet ? UI.tabletWordRibbonFontSize : UI.phoneWordRibbonFontSize) |
1677 | 65 | font.family: "Ubuntu Medium" | 66 | font.family: UI.fontFamily |
1678 | 66 | color: "#999999" | 67 | font.weight: textBold ? Font.Bold : Font.Light |
1675 | 67 | font.bold: isPrimaryCandidate || listView.count == 1 | ||
1679 | 68 | text: word; | 68 | text: word; |
1680 | 69 | anchors.centerIn: parent | 69 | anchors.centerIn: parent |
1681 | 70 | } | 70 | } |
1682 | 71 | 71 | ||
1683 | === added file 'qml/images/keyboard-caps-disabled.svg' | |||
1684 | --- qml/images/keyboard-caps-disabled.svg 1970-01-01 00:00:00 +0000 | |||
1685 | +++ qml/images/keyboard-caps-disabled.svg 2016-01-28 19:06:48 +0000 | |||
1686 | @@ -0,0 +1,180 @@ | |||
1687 | 1 | <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
1688 | 2 | <!-- Created with Inkscape (http://www.inkscape.org/) --> | ||
1689 | 3 | |||
1690 | 4 | <svg | ||
1691 | 5 | xmlns:dc="http://purl.org/dc/elements/1.1/" | ||
1692 | 6 | xmlns:cc="http://creativecommons.org/ns#" | ||
1693 | 7 | xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" | ||
1694 | 8 | xmlns:svg="http://www.w3.org/2000/svg" | ||
1695 | 9 | xmlns="http://www.w3.org/2000/svg" | ||
1696 | 10 | xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" | ||
1697 | 11 | xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" | ||
1698 | 12 | width="96" | ||
1699 | 13 | height="96" | ||
1700 | 14 | id="svg4874" | ||
1701 | 15 | version="1.1" | ||
1702 | 16 | inkscape:version="0.91+devel r" | ||
1703 | 17 | viewBox="0 0 96 96.000001" | ||
1704 | 18 | sodipodi:docname="keyboard-caps-disabled.svg"> | ||
1705 | 19 | <defs | ||
1706 | 20 | id="defs4876" /> | ||
1707 | 21 | <sodipodi:namedview | ||
1708 | 22 | id="base" | ||
1709 | 23 | pagecolor="#ffffff" | ||
1710 | 24 | bordercolor="#666666" | ||
1711 | 25 | borderopacity="1.0" | ||
1712 | 26 | inkscape:pageopacity="0.0" | ||
1713 | 27 | inkscape:pageshadow="2" | ||
1714 | 28 | inkscape:zoom="5.6199992" | ||
1715 | 29 | inkscape:cx="36.912809" | ||
1716 | 30 | inkscape:cy="16.645887" | ||
1717 | 31 | inkscape:document-units="px" | ||
1718 | 32 | inkscape:current-layer="g4780" | ||
1719 | 33 | showgrid="true" | ||
1720 | 34 | showborder="true" | ||
1721 | 35 | fit-margin-top="0" | ||
1722 | 36 | fit-margin-left="0" | ||
1723 | 37 | fit-margin-right="0" | ||
1724 | 38 | fit-margin-bottom="0" | ||
1725 | 39 | inkscape:snap-bbox="true" | ||
1726 | 40 | inkscape:bbox-paths="true" | ||
1727 | 41 | inkscape:bbox-nodes="true" | ||
1728 | 42 | inkscape:snap-bbox-edge-midpoints="true" | ||
1729 | 43 | inkscape:snap-bbox-midpoints="true" | ||
1730 | 44 | inkscape:object-paths="true" | ||
1731 | 45 | inkscape:snap-intersection-paths="true" | ||
1732 | 46 | inkscape:object-nodes="true" | ||
1733 | 47 | inkscape:snap-smooth-nodes="false" | ||
1734 | 48 | inkscape:snap-midpoints="true" | ||
1735 | 49 | inkscape:snap-object-midpoints="true" | ||
1736 | 50 | inkscape:snap-center="true" | ||
1737 | 51 | showguides="true" | ||
1738 | 52 | inkscape:guide-bbox="true" | ||
1739 | 53 | inkscape:snap-others="false"> | ||
1740 | 54 | <inkscape:grid | ||
1741 | 55 | type="xygrid" | ||
1742 | 56 | id="grid5451" | ||
1743 | 57 | empspacing="8" /> | ||
1744 | 58 | <sodipodi:guide | ||
1745 | 59 | orientation="1,0" | ||
1746 | 60 | position="8,-8.0000001" | ||
1747 | 61 | id="guide4063" | ||
1748 | 62 | inkscape:locked="false" /> | ||
1749 | 63 | <sodipodi:guide | ||
1750 | 64 | orientation="1,0" | ||
1751 | 65 | position="4,-8.0000001" | ||
1752 | 66 | id="guide4065" | ||
1753 | 67 | inkscape:locked="false" /> | ||
1754 | 68 | <sodipodi:guide | ||
1755 | 69 | orientation="0,1" | ||
1756 | 70 | position="-8,88.000001" | ||
1757 | 71 | id="guide4067" | ||
1758 | 72 | inkscape:locked="false" /> | ||
1759 | 73 | <sodipodi:guide | ||
1760 | 74 | orientation="0,1" | ||
1761 | 75 | position="-8,92.000001" | ||
1762 | 76 | id="guide4069" | ||
1763 | 77 | inkscape:locked="false" /> | ||
1764 | 78 | <sodipodi:guide | ||
1765 | 79 | orientation="0,1" | ||
1766 | 80 | position="104,4" | ||
1767 | 81 | id="guide4071" | ||
1768 | 82 | inkscape:locked="false" /> | ||
1769 | 83 | <sodipodi:guide | ||
1770 | 84 | orientation="0,1" | ||
1771 | 85 | position="-5,8.0000001" | ||
1772 | 86 | id="guide4073" | ||
1773 | 87 | inkscape:locked="false" /> | ||
1774 | 88 | <sodipodi:guide | ||
1775 | 89 | orientation="1,0" | ||
1776 | 90 | position="92,-8.0000001" | ||
1777 | 91 | id="guide4075" | ||
1778 | 92 | inkscape:locked="false" /> | ||
1779 | 93 | <sodipodi:guide | ||
1780 | 94 | orientation="1,0" | ||
1781 | 95 | position="88,-8.0000001" | ||
1782 | 96 | id="guide4077" | ||
1783 | 97 | inkscape:locked="false" /> | ||
1784 | 98 | <sodipodi:guide | ||
1785 | 99 | orientation="0,1" | ||
1786 | 100 | position="-8,84.000001" | ||
1787 | 101 | id="guide4074" | ||
1788 | 102 | inkscape:locked="false" /> | ||
1789 | 103 | <sodipodi:guide | ||
1790 | 104 | orientation="1,0" | ||
1791 | 105 | position="12,-8.0000001" | ||
1792 | 106 | id="guide4076" | ||
1793 | 107 | inkscape:locked="false" /> | ||
1794 | 108 | <sodipodi:guide | ||
1795 | 109 | orientation="0,1" | ||
1796 | 110 | position="-5,12" | ||
1797 | 111 | id="guide4078" | ||
1798 | 112 | inkscape:locked="false" /> | ||
1799 | 113 | <sodipodi:guide | ||
1800 | 114 | orientation="1,0" | ||
1801 | 115 | position="84,-9.0000001" | ||
1802 | 116 | id="guide4080" | ||
1803 | 117 | inkscape:locked="false" /> | ||
1804 | 118 | <sodipodi:guide | ||
1805 | 119 | position="48,-8.0000001" | ||
1806 | 120 | orientation="1,0" | ||
1807 | 121 | id="guide4170" | ||
1808 | 122 | inkscape:locked="false" /> | ||
1809 | 123 | <sodipodi:guide | ||
1810 | 124 | position="-8,48" | ||
1811 | 125 | orientation="0,1" | ||
1812 | 126 | id="guide4172" | ||
1813 | 127 | inkscape:locked="false" /> | ||
1814 | 128 | </sodipodi:namedview> | ||
1815 | 129 | <metadata | ||
1816 | 130 | id="metadata4879"> | ||
1817 | 131 | <rdf:RDF> | ||
1818 | 132 | <cc:Work | ||
1819 | 133 | rdf:about=""> | ||
1820 | 134 | <dc:format>image/svg+xml</dc:format> | ||
1821 | 135 | <dc:type | ||
1822 | 136 | rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> | ||
1823 | 137 | <dc:title /> | ||
1824 | 138 | </cc:Work> | ||
1825 | 139 | </rdf:RDF> | ||
1826 | 140 | </metadata> | ||
1827 | 141 | <g | ||
1828 | 142 | inkscape:label="Layer 1" | ||
1829 | 143 | inkscape:groupmode="layer" | ||
1830 | 144 | id="layer1" | ||
1831 | 145 | transform="translate(67.857146,-78.50504)"> | ||
1832 | 146 | <g | ||
1833 | 147 | transform="matrix(0,-1,-1,0,373.50506,516.50504)" | ||
1834 | 148 | id="g4845" | ||
1835 | 149 | style="display:inline"> | ||
1836 | 150 | <g | ||
1837 | 151 | inkscape:export-ydpi="90" | ||
1838 | 152 | inkscape:export-xdpi="90" | ||
1839 | 153 | inkscape:export-filename="next01.png" | ||
1840 | 154 | transform="matrix(-0.9996045,0,0,1,575.94296,-611.00001)" | ||
1841 | 155 | id="g4778" | ||
1842 | 156 | inkscape:label="Layer 1"> | ||
1843 | 157 | <g | ||
1844 | 158 | transform="matrix(-1,0,0,1,575.99999,611)" | ||
1845 | 159 | id="g4780" | ||
1846 | 160 | style="display:inline"> | ||
1847 | 161 | <rect | ||
1848 | 162 | style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:4;marker:none;enable-background:accumulate" | ||
1849 | 163 | id="rect4782" | ||
1850 | 164 | width="96.037987" | ||
1851 | 165 | height="96" | ||
1852 | 166 | x="-438.00244" | ||
1853 | 167 | y="345.36221" | ||
1854 | 168 | transform="scale(-1,1)" /> | ||
1855 | 169 | <path | ||
1856 | 170 | style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99980235;marker:none;enable-background:accumulate" | ||
1857 | 171 | d="M 48,4.0078127 C 29.14382,30.199769 15.144531,59.992188 15.144531,59.992188 H 32 V 82 H 64 V 60 H 80.855469 C 80.855469,60.00002 66.8562,30.205639 48,4.0136721 Z m -0.002,7.2128903 C 61.890077,31.358675 70.875351,49.40304 74.212891,56 H 59.998047 V 78 H 36 V 55.992188 H 21.785156 c 3.33727,-6.596421 12.322541,-24.635102 26.212891,-44.771485 z" | ||
1858 | 172 | transform="matrix(0,-1,-1.0003957,0,438.00245,441.36222)" | ||
1859 | 173 | id="path4218" | ||
1860 | 174 | inkscape:connector-curvature="0" | ||
1861 | 175 | sodipodi:nodetypes="ccccccccccccccccc" /> | ||
1862 | 176 | </g> | ||
1863 | 177 | </g> | ||
1864 | 178 | </g> | ||
1865 | 179 | </g> | ||
1866 | 180 | </svg> | ||
1867 | 0 | 181 | ||
1868 | === added file 'qml/images/keyboard-caps-enabled.svg' | |||
1869 | --- qml/images/keyboard-caps-enabled.svg 1970-01-01 00:00:00 +0000 | |||
1870 | +++ qml/images/keyboard-caps-enabled.svg 2016-01-28 19:06:48 +0000 | |||
1871 | @@ -0,0 +1,181 @@ | |||
1872 | 1 | <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
1873 | 2 | <!-- Created with Inkscape (http://www.inkscape.org/) --> | ||
1874 | 3 | |||
1875 | 4 | <svg | ||
1876 | 5 | xmlns:dc="http://purl.org/dc/elements/1.1/" | ||
1877 | 6 | xmlns:cc="http://creativecommons.org/ns#" | ||
1878 | 7 | xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" | ||
1879 | 8 | xmlns:svg="http://www.w3.org/2000/svg" | ||
1880 | 9 | xmlns="http://www.w3.org/2000/svg" | ||
1881 | 10 | xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" | ||
1882 | 11 | xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" | ||
1883 | 12 | width="96" | ||
1884 | 13 | height="96" | ||
1885 | 14 | id="svg4874" | ||
1886 | 15 | version="1.1" | ||
1887 | 16 | inkscape:version="0.91+devel r" | ||
1888 | 17 | viewBox="0 0 96 96.000001" | ||
1889 | 18 | sodipodi:docname="keyboard-caps-enabled.svg"> | ||
1890 | 19 | <defs | ||
1891 | 20 | id="defs4876" /> | ||
1892 | 21 | <sodipodi:namedview | ||
1893 | 22 | id="base" | ||
1894 | 23 | pagecolor="#ffffff" | ||
1895 | 24 | bordercolor="#666666" | ||
1896 | 25 | borderopacity="1.0" | ||
1897 | 26 | inkscape:pageopacity="0.0" | ||
1898 | 27 | inkscape:pageshadow="2" | ||
1899 | 28 | inkscape:zoom="5.6199992" | ||
1900 | 29 | inkscape:cx="36.912809" | ||
1901 | 30 | inkscape:cy="16.645887" | ||
1902 | 31 | inkscape:document-units="px" | ||
1903 | 32 | inkscape:current-layer="g4780" | ||
1904 | 33 | showgrid="true" | ||
1905 | 34 | showborder="true" | ||
1906 | 35 | fit-margin-top="0" | ||
1907 | 36 | fit-margin-left="0" | ||
1908 | 37 | fit-margin-right="0" | ||
1909 | 38 | fit-margin-bottom="0" | ||
1910 | 39 | inkscape:snap-bbox="true" | ||
1911 | 40 | inkscape:bbox-paths="true" | ||
1912 | 41 | inkscape:bbox-nodes="true" | ||
1913 | 42 | inkscape:snap-bbox-edge-midpoints="true" | ||
1914 | 43 | inkscape:snap-bbox-midpoints="true" | ||
1915 | 44 | inkscape:object-paths="true" | ||
1916 | 45 | inkscape:snap-intersection-paths="true" | ||
1917 | 46 | inkscape:object-nodes="true" | ||
1918 | 47 | inkscape:snap-smooth-nodes="false" | ||
1919 | 48 | inkscape:snap-midpoints="true" | ||
1920 | 49 | inkscape:snap-object-midpoints="true" | ||
1921 | 50 | inkscape:snap-center="true" | ||
1922 | 51 | showguides="true" | ||
1923 | 52 | inkscape:guide-bbox="true" | ||
1924 | 53 | inkscape:snap-others="false"> | ||
1925 | 54 | <inkscape:grid | ||
1926 | 55 | type="xygrid" | ||
1927 | 56 | id="grid5451" | ||
1928 | 57 | empspacing="8" /> | ||
1929 | 58 | <sodipodi:guide | ||
1930 | 59 | orientation="1,0" | ||
1931 | 60 | position="8,-8.0000001" | ||
1932 | 61 | id="guide4063" | ||
1933 | 62 | inkscape:locked="false" /> | ||
1934 | 63 | <sodipodi:guide | ||
1935 | 64 | orientation="1,0" | ||
1936 | 65 | position="4,-8.0000001" | ||
1937 | 66 | id="guide4065" | ||
1938 | 67 | inkscape:locked="false" /> | ||
1939 | 68 | <sodipodi:guide | ||
1940 | 69 | orientation="0,1" | ||
1941 | 70 | position="-8,88.000001" | ||
1942 | 71 | id="guide4067" | ||
1943 | 72 | inkscape:locked="false" /> | ||
1944 | 73 | <sodipodi:guide | ||
1945 | 74 | orientation="0,1" | ||
1946 | 75 | position="-8,92.000001" | ||
1947 | 76 | id="guide4069" | ||
1948 | 77 | inkscape:locked="false" /> | ||
1949 | 78 | <sodipodi:guide | ||
1950 | 79 | orientation="0,1" | ||
1951 | 80 | position="104,4" | ||
1952 | 81 | id="guide4071" | ||
1953 | 82 | inkscape:locked="false" /> | ||
1954 | 83 | <sodipodi:guide | ||
1955 | 84 | orientation="0,1" | ||
1956 | 85 | position="-5,8.0000001" | ||
1957 | 86 | id="guide4073" | ||
1958 | 87 | inkscape:locked="false" /> | ||
1959 | 88 | <sodipodi:guide | ||
1960 | 89 | orientation="1,0" | ||
1961 | 90 | position="92,-8.0000001" | ||
1962 | 91 | id="guide4075" | ||
1963 | 92 | inkscape:locked="false" /> | ||
1964 | 93 | <sodipodi:guide | ||
1965 | 94 | orientation="1,0" | ||
1966 | 95 | position="88,-8.0000001" | ||
1967 | 96 | id="guide4077" | ||
1968 | 97 | inkscape:locked="false" /> | ||
1969 | 98 | <sodipodi:guide | ||
1970 | 99 | orientation="0,1" | ||
1971 | 100 | position="-8,84.000001" | ||
1972 | 101 | id="guide4074" | ||
1973 | 102 | inkscape:locked="false" /> | ||
1974 | 103 | <sodipodi:guide | ||
1975 | 104 | orientation="1,0" | ||
1976 | 105 | position="12,-8.0000001" | ||
1977 | 106 | id="guide4076" | ||
1978 | 107 | inkscape:locked="false" /> | ||
1979 | 108 | <sodipodi:guide | ||
1980 | 109 | orientation="0,1" | ||
1981 | 110 | position="-5,12" | ||
1982 | 111 | id="guide4078" | ||
1983 | 112 | inkscape:locked="false" /> | ||
1984 | 113 | <sodipodi:guide | ||
1985 | 114 | orientation="1,0" | ||
1986 | 115 | position="84,-9.0000001" | ||
1987 | 116 | id="guide4080" | ||
1988 | 117 | inkscape:locked="false" /> | ||
1989 | 118 | <sodipodi:guide | ||
1990 | 119 | position="48,-8.0000001" | ||
1991 | 120 | orientation="1,0" | ||
1992 | 121 | id="guide4170" | ||
1993 | 122 | inkscape:locked="false" /> | ||
1994 | 123 | <sodipodi:guide | ||
1995 | 124 | position="-8,48" | ||
1996 | 125 | orientation="0,1" | ||
1997 | 126 | id="guide4172" | ||
1998 | 127 | inkscape:locked="false" /> | ||
1999 | 128 | </sodipodi:namedview> | ||
2000 | 129 | <metadata | ||
2001 | 130 | id="metadata4879"> | ||
2002 | 131 | <rdf:RDF> | ||
2003 | 132 | <cc:Work | ||
2004 | 133 | rdf:about=""> | ||
2005 | 134 | <dc:format>image/svg+xml</dc:format> | ||
2006 | 135 | <dc:type | ||
2007 | 136 | rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> | ||
2008 | 137 | <dc:title /> | ||
2009 | 138 | </cc:Work> | ||
2010 | 139 | </rdf:RDF> | ||
2011 | 140 | </metadata> | ||
2012 | 141 | <g | ||
2013 | 142 | inkscape:label="Layer 1" | ||
2014 | 143 | inkscape:groupmode="layer" | ||
2015 | 144 | id="layer1" | ||
2016 | 145 | transform="translate(67.857146,-78.50504)"> | ||
2017 | 146 | <g | ||
2018 | 147 | transform="matrix(0,-1,-1,0,373.50506,516.50504)" | ||
2019 | 148 | id="g4845" | ||
2020 | 149 | style="display:inline"> | ||
2021 | 150 | <g | ||
2022 | 151 | inkscape:export-ydpi="90" | ||
2023 | 152 | inkscape:export-xdpi="90" | ||
2024 | 153 | inkscape:export-filename="next01.png" | ||
2025 | 154 | transform="matrix(-0.9996045,0,0,1,575.94296,-611.00001)" | ||
2026 | 155 | id="g4778" | ||
2027 | 156 | inkscape:label="Layer 1"> | ||
2028 | 157 | <g | ||
2029 | 158 | transform="matrix(-1,0,0,1,575.99999,611)" | ||
2030 | 159 | id="g4780" | ||
2031 | 160 | style="display:inline"> | ||
2032 | 161 | <rect | ||
2033 | 162 | style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:4;marker:none;enable-background:accumulate" | ||
2034 | 163 | id="rect4782" | ||
2035 | 164 | width="96.037987" | ||
2036 | 165 | height="96" | ||
2037 | 166 | x="-438.00244" | ||
2038 | 167 | y="345.36221" | ||
2039 | 168 | transform="scale(-1,1)" /> | ||
2040 | 169 | <path | ||
2041 | 170 | style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;enable-background:accumulate" | ||
2042 | 171 | d="m 433.99374,393.36223 c -26.20232,18.85618 -56.0079,32.85641 -56.0079,32.85641 v -16.85642 h -22.01583 v -32 h 22.00871 v -16.85641 c -2e-5,0 29.80555,14.00022 56.00788,32.85642 h 0.008 z" | ||
2043 | 172 | id="path4218" | ||
2044 | 173 | inkscape:connector-curvature="0" | ||
2045 | 174 | inkscape:transform-center-x="8.7500002e-06" | ||
2046 | 175 | inkscape:transform-center-y="36.503129" | ||
2047 | 176 | sodipodi:nodetypes="cccccccccc" /> | ||
2048 | 177 | </g> | ||
2049 | 178 | </g> | ||
2050 | 179 | </g> | ||
2051 | 180 | </g> | ||
2052 | 181 | </svg> | ||
2053 | 0 | 182 | ||
2054 | === added file 'qml/images/keyboard-caps-locked.svg' | |||
2055 | --- qml/images/keyboard-caps-locked.svg 1970-01-01 00:00:00 +0000 | |||
2056 | +++ qml/images/keyboard-caps-locked.svg 2016-01-28 19:06:48 +0000 | |||
2057 | @@ -0,0 +1,186 @@ | |||
2058 | 1 | <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
2059 | 2 | <!-- Created with Inkscape (http://www.inkscape.org/) --> | ||
2060 | 3 | |||
2061 | 4 | <svg | ||
2062 | 5 | xmlns:dc="http://purl.org/dc/elements/1.1/" | ||
2063 | 6 | xmlns:cc="http://creativecommons.org/ns#" | ||
2064 | 7 | xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" | ||
2065 | 8 | xmlns:svg="http://www.w3.org/2000/svg" | ||
2066 | 9 | xmlns="http://www.w3.org/2000/svg" | ||
2067 | 10 | xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" | ||
2068 | 11 | xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" | ||
2069 | 12 | width="96" | ||
2070 | 13 | height="96" | ||
2071 | 14 | id="svg4874" | ||
2072 | 15 | version="1.1" | ||
2073 | 16 | inkscape:version="0.91+devel r" | ||
2074 | 17 | viewBox="0 0 96 96.000001" | ||
2075 | 18 | sodipodi:docname="keyboard-caps-locked.svg"> | ||
2076 | 19 | <defs | ||
2077 | 20 | id="defs4876" /> | ||
2078 | 21 | <sodipodi:namedview | ||
2079 | 22 | id="base" | ||
2080 | 23 | pagecolor="#ffffff" | ||
2081 | 24 | bordercolor="#666666" | ||
2082 | 25 | borderopacity="1.0" | ||
2083 | 26 | inkscape:pageopacity="0.0" | ||
2084 | 27 | inkscape:pageshadow="2" | ||
2085 | 28 | inkscape:zoom="10.976561" | ||
2086 | 29 | inkscape:cx="18.398291" | ||
2087 | 30 | inkscape:cy="25.558996" | ||
2088 | 31 | inkscape:document-units="px" | ||
2089 | 32 | inkscape:current-layer="g4780" | ||
2090 | 33 | showgrid="true" | ||
2091 | 34 | showborder="true" | ||
2092 | 35 | fit-margin-top="0" | ||
2093 | 36 | fit-margin-left="0" | ||
2094 | 37 | fit-margin-right="0" | ||
2095 | 38 | fit-margin-bottom="0" | ||
2096 | 39 | inkscape:snap-bbox="true" | ||
2097 | 40 | inkscape:bbox-paths="true" | ||
2098 | 41 | inkscape:bbox-nodes="true" | ||
2099 | 42 | inkscape:snap-bbox-edge-midpoints="true" | ||
2100 | 43 | inkscape:snap-bbox-midpoints="true" | ||
2101 | 44 | inkscape:object-paths="true" | ||
2102 | 45 | inkscape:snap-intersection-paths="true" | ||
2103 | 46 | inkscape:object-nodes="true" | ||
2104 | 47 | inkscape:snap-smooth-nodes="false" | ||
2105 | 48 | inkscape:snap-midpoints="true" | ||
2106 | 49 | inkscape:snap-object-midpoints="true" | ||
2107 | 50 | inkscape:snap-center="true" | ||
2108 | 51 | showguides="true" | ||
2109 | 52 | inkscape:guide-bbox="true" | ||
2110 | 53 | inkscape:snap-others="false"> | ||
2111 | 54 | <inkscape:grid | ||
2112 | 55 | type="xygrid" | ||
2113 | 56 | id="grid5451" | ||
2114 | 57 | empspacing="8" /> | ||
2115 | 58 | <sodipodi:guide | ||
2116 | 59 | orientation="1,0" | ||
2117 | 60 | position="8,-8.0000001" | ||
2118 | 61 | id="guide4063" | ||
2119 | 62 | inkscape:locked="false" /> | ||
2120 | 63 | <sodipodi:guide | ||
2121 | 64 | orientation="1,0" | ||
2122 | 65 | position="4,-8.0000001" | ||
2123 | 66 | id="guide4065" | ||
2124 | 67 | inkscape:locked="false" /> | ||
2125 | 68 | <sodipodi:guide | ||
2126 | 69 | orientation="0,1" | ||
2127 | 70 | position="-8,88.000001" | ||
2128 | 71 | id="guide4067" | ||
2129 | 72 | inkscape:locked="false" /> | ||
2130 | 73 | <sodipodi:guide | ||
2131 | 74 | orientation="0,1" | ||
2132 | 75 | position="-8,92.000001" | ||
2133 | 76 | id="guide4069" | ||
2134 | 77 | inkscape:locked="false" /> | ||
2135 | 78 | <sodipodi:guide | ||
2136 | 79 | orientation="0,1" | ||
2137 | 80 | position="104,4" | ||
2138 | 81 | id="guide4071" | ||
2139 | 82 | inkscape:locked="false" /> | ||
2140 | 83 | <sodipodi:guide | ||
2141 | 84 | orientation="0,1" | ||
2142 | 85 | position="-5,8.0000001" | ||
2143 | 86 | id="guide4073" | ||
2144 | 87 | inkscape:locked="false" /> | ||
2145 | 88 | <sodipodi:guide | ||
2146 | 89 | orientation="1,0" | ||
2147 | 90 | position="92,-8.0000001" | ||
2148 | 91 | id="guide4075" | ||
2149 | 92 | inkscape:locked="false" /> | ||
2150 | 93 | <sodipodi:guide | ||
2151 | 94 | orientation="1,0" | ||
2152 | 95 | position="88,-8.0000001" | ||
2153 | 96 | id="guide4077" | ||
2154 | 97 | inkscape:locked="false" /> | ||
2155 | 98 | <sodipodi:guide | ||
2156 | 99 | orientation="0,1" | ||
2157 | 100 | position="-8,84.000001" | ||
2158 | 101 | id="guide4074" | ||
2159 | 102 | inkscape:locked="false" /> | ||
2160 | 103 | <sodipodi:guide | ||
2161 | 104 | orientation="1,0" | ||
2162 | 105 | position="12,-8.0000001" | ||
2163 | 106 | id="guide4076" | ||
2164 | 107 | inkscape:locked="false" /> | ||
2165 | 108 | <sodipodi:guide | ||
2166 | 109 | orientation="0,1" | ||
2167 | 110 | position="-5,12" | ||
2168 | 111 | id="guide4078" | ||
2169 | 112 | inkscape:locked="false" /> | ||
2170 | 113 | <sodipodi:guide | ||
2171 | 114 | orientation="1,0" | ||
2172 | 115 | position="84,-9.0000001" | ||
2173 | 116 | id="guide4080" | ||
2174 | 117 | inkscape:locked="false" /> | ||
2175 | 118 | <sodipodi:guide | ||
2176 | 119 | position="48,-8.0000001" | ||
2177 | 120 | orientation="1,0" | ||
2178 | 121 | id="guide4170" | ||
2179 | 122 | inkscape:locked="false" /> | ||
2180 | 123 | <sodipodi:guide | ||
2181 | 124 | position="-8,48" | ||
2182 | 125 | orientation="0,1" | ||
2183 | 126 | id="guide4172" | ||
2184 | 127 | inkscape:locked="false" /> | ||
2185 | 128 | </sodipodi:namedview> | ||
2186 | 129 | <metadata | ||
2187 | 130 | id="metadata4879"> | ||
2188 | 131 | <rdf:RDF> | ||
2189 | 132 | <cc:Work | ||
2190 | 133 | rdf:about=""> | ||
2191 | 134 | <dc:format>image/svg+xml</dc:format> | ||
2192 | 135 | <dc:type | ||
2193 | 136 | rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> | ||
2194 | 137 | <dc:title /> | ||
2195 | 138 | </cc:Work> | ||
2196 | 139 | </rdf:RDF> | ||
2197 | 140 | </metadata> | ||
2198 | 141 | <g | ||
2199 | 142 | inkscape:label="Layer 1" | ||
2200 | 143 | inkscape:groupmode="layer" | ||
2201 | 144 | id="layer1" | ||
2202 | 145 | transform="translate(67.857146,-78.50504)"> | ||
2203 | 146 | <g | ||
2204 | 147 | transform="matrix(0,-1,-1,0,373.50506,516.50504)" | ||
2205 | 148 | id="g4845" | ||
2206 | 149 | style="display:inline"> | ||
2207 | 150 | <g | ||
2208 | 151 | inkscape:export-ydpi="90" | ||
2209 | 152 | inkscape:export-xdpi="90" | ||
2210 | 153 | inkscape:export-filename="next01.png" | ||
2211 | 154 | transform="matrix(-0.9996045,0,0,1,575.94296,-611.00001)" | ||
2212 | 155 | id="g4778" | ||
2213 | 156 | inkscape:label="Layer 1"> | ||
2214 | 157 | <g | ||
2215 | 158 | transform="matrix(-1,0,0,1,575.99999,611)" | ||
2216 | 159 | id="g4780" | ||
2217 | 160 | style="display:inline"> | ||
2218 | 161 | <rect | ||
2219 | 162 | style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:4;marker:none;enable-background:accumulate" | ||
2220 | 163 | id="rect4782" | ||
2221 | 164 | width="96.037987" | ||
2222 | 165 | height="96" | ||
2223 | 166 | x="-438.00244" | ||
2224 | 167 | y="345.36221" | ||
2225 | 168 | transform="scale(-1,1)" /> | ||
2226 | 169 | <path | ||
2227 | 170 | style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;enable-background:accumulate" | ||
2228 | 171 | d="m 433.99374,393.36223 c -26.20232,18.85618 -56.0079,32.85641 -56.0079,32.85641 v -16.85642 h -22.01583 v -32 h 22.00871 v -16.85641 c -2e-5,0 29.80555,14.00022 56.00788,32.85642 h 0.008 z" | ||
2229 | 172 | id="path4218" | ||
2230 | 173 | inkscape:connector-curvature="0" | ||
2231 | 174 | inkscape:transform-center-x="8.7500002e-06" | ||
2232 | 175 | inkscape:transform-center-y="36.503129" | ||
2233 | 176 | sodipodi:nodetypes="cccccccccc" /> | ||
2234 | 177 | <path | ||
2235 | 178 | style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.00079107;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" | ||
2236 | 179 | d="m 345.9668,377.36133 v 32 h 4 v -32 z" | ||
2237 | 180 | id="path4250" | ||
2238 | 181 | inkscape:connector-curvature="0" /> | ||
2239 | 182 | </g> | ||
2240 | 183 | </g> | ||
2241 | 184 | </g> | ||
2242 | 185 | </g> | ||
2243 | 186 | </svg> | ||
2244 | 0 | 187 | ||
2245 | === added file 'qml/images/keyboard_spacebar@27.png' | |||
2246 | 1 | Binary files qml/images/keyboard_spacebar@27.png 1970-01-01 00:00:00 +0000 and qml/images/keyboard_spacebar@27.png 2016-01-28 19:06:48 +0000 differ | 188 | Binary files qml/images/keyboard_spacebar@27.png 1970-01-01 00:00:00 +0000 and qml/images/keyboard_spacebar@27.png 2016-01-28 19:06:48 +0000 differ |
2247 | === modified file 'qml/keys/ActionKey.qml' | |||
2248 | --- qml/keys/ActionKey.qml 2014-11-05 14:44:19 +0000 | |||
2249 | +++ qml/keys/ActionKey.qml 2016-01-28 19:06:48 +0000 | |||
2250 | @@ -14,9 +14,9 @@ | |||
2251 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2252 | 15 | */ | 15 | */ |
2253 | 16 | 16 | ||
2255 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
2256 | 18 | 18 | ||
2258 | 19 | import Ubuntu.Components 0.1 | 19 | import Ubuntu.Components 1.3 |
2259 | 20 | 20 | ||
2260 | 21 | import "key_constants.js" as UI | 21 | import "key_constants.js" as UI |
2261 | 22 | 22 | ||
2262 | @@ -26,6 +26,10 @@ | |||
2263 | 26 | property string iconShifted: "" | 26 | property string iconShifted: "" |
2264 | 27 | property string iconCapsLock: "" | 27 | property string iconCapsLock: "" |
2265 | 28 | 28 | ||
2266 | 29 | property string iconSourceNormal: "" | ||
2267 | 30 | property string iconSourceShifted: "" | ||
2268 | 31 | property string iconSourceCapsLock: "" | ||
2269 | 32 | |||
2270 | 29 | noMagnifier: true | 33 | noMagnifier: true |
2271 | 30 | skipAutoCaps: true | 34 | skipAutoCaps: true |
2272 | 31 | property int padding: UI.actionKeyPadding | 35 | property int padding: UI.actionKeyPadding |
2273 | @@ -33,8 +37,8 @@ | |||
2274 | 33 | // action keys are a bit wider | 37 | // action keys are a bit wider |
2275 | 34 | width: panel.keyWidth + units.gu( padding ) | 38 | width: panel.keyWidth + units.gu( padding ) |
2276 | 35 | 39 | ||
2279 | 36 | imgNormal: UI.imageActionKey | 40 | normalColor: UI.actionKeyColor |
2280 | 37 | imgPressed: UI.imageActionKeyPressed | 41 | pressedColor: UI.actionKeyPressedColor |
2281 | 38 | 42 | ||
2282 | 39 | // can be overwritten by keys | 43 | // can be overwritten by keys |
2283 | 40 | property color colorNormal: UI.fontColor | 44 | property color colorNormal: UI.fontColor |
2284 | @@ -52,14 +56,15 @@ | |||
2285 | 52 | 56 | ||
2286 | 53 | Icon { | 57 | Icon { |
2287 | 54 | id: iconImage | 58 | id: iconImage |
2289 | 55 | name: actionKeyRoot.iconNormal | 59 | source: iconSourceNormal !== "" ? iconSourceNormal |
2290 | 60 | : iconNormal ? "image://theme/%1".arg(iconNormal) | ||
2291 | 61 | : "" | ||
2292 | 56 | color: actionKeyRoot.colorNormal | 62 | color: actionKeyRoot.colorNormal |
2293 | 57 | anchors.centerIn: parent | 63 | anchors.centerIn: parent |
2296 | 58 | anchors.verticalCenterOffset: fullScreenItem.landscape ? -units.dp( UI.keyMargins ) : -units.gu(UI.row_margin/2) - units.gu(0.15) | 64 | anchors.verticalCenterOffset: -actionKeyRoot.rowMargin / 2 - units.gu(0.15) |
2295 | 59 | |||
2297 | 60 | visible: (label == "") | 65 | visible: (label == "") |
2300 | 61 | width: units.gu(2.5) | 66 | height: actionKeyRoot.fontSize |
2301 | 62 | height: units.gu(2.5) | 67 | width: height |
2302 | 63 | } | 68 | } |
2303 | 64 | } | 69 | } |
2304 | 65 | 70 | ||
2305 | @@ -70,7 +75,9 @@ | |||
2306 | 70 | name: "SHIFTED" | 75 | name: "SHIFTED" |
2307 | 71 | PropertyChanges { | 76 | PropertyChanges { |
2308 | 72 | target: iconImage | 77 | target: iconImage |
2310 | 73 | name: actionKeyRoot.iconShifted | 78 | source: iconSourceShifted !== "" ? iconSourceShifted |
2311 | 79 | : iconShifted ? "image://theme/%1".arg(iconShifted) | ||
2312 | 80 | : "" | ||
2313 | 74 | color: actionKeyRoot.colorShifted | 81 | color: actionKeyRoot.colorShifted |
2314 | 75 | } | 82 | } |
2315 | 76 | }, | 83 | }, |
2316 | @@ -78,7 +85,9 @@ | |||
2317 | 78 | name: "CAPSLOCK" | 85 | name: "CAPSLOCK" |
2318 | 79 | PropertyChanges { | 86 | PropertyChanges { |
2319 | 80 | target: iconImage | 87 | target: iconImage |
2321 | 81 | name: actionKeyRoot.iconCapsLock | 88 | source: iconSourceCapsLock !== "" ? iconSourceCapsLock |
2322 | 89 | : iconCapsLock ? "image://theme/%1".arg(iconCapsLock) | ||
2323 | 90 | : "" | ||
2324 | 82 | color: actionKeyRoot.colorCapsLock | 91 | color: actionKeyRoot.colorCapsLock |
2325 | 83 | } | 92 | } |
2326 | 84 | } | 93 | } |
2327 | 85 | 94 | ||
2328 | === modified file 'qml/keys/BackspaceKey.qml' | |||
2329 | --- qml/keys/BackspaceKey.qml 2013-10-09 13:51:12 +0000 | |||
2330 | +++ qml/keys/BackspaceKey.qml 2016-01-28 19:06:48 +0000 | |||
2331 | @@ -14,7 +14,7 @@ | |||
2332 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2333 | 15 | */ | 15 | */ |
2334 | 16 | 16 | ||
2336 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
2337 | 18 | 18 | ||
2338 | 19 | ActionKey { | 19 | ActionKey { |
2339 | 20 | iconNormal: "erase"; | 20 | iconNormal: "erase"; |
2340 | 21 | 21 | ||
2341 | === modified file 'qml/keys/CharKey.qml' | |||
2342 | --- qml/keys/CharKey.qml 2016-01-04 14:13:58 +0000 | |||
2343 | +++ qml/keys/CharKey.qml 2016-01-28 19:06:48 +0000 | |||
2344 | @@ -49,16 +49,23 @@ | |||
2345 | 49 | property bool leftSide: false | 49 | property bool leftSide: false |
2346 | 50 | property bool rightSide: false | 50 | property bool rightSide: false |
2347 | 51 | 51 | ||
2348 | 52 | property double rowMargin: fullScreenItem.tablet ? units.gu(UI.tabletRowMargin) | ||
2349 | 53 | : (fullScreenItem.landscape ? units.dp(UI.phoneRowMarginLandscape) | ||
2350 | 54 | : units.dp(UI.phoneRowMarginPortrait)) | ||
2351 | 55 | property double keyMargin: fullScreenItem.tablet ? units.gu(UI.tabletKeyMargins) | ||
2352 | 56 | : units.gu(UI.phoneKeyMargins) | ||
2353 | 57 | |||
2354 | 52 | // These properties are used by autopilot to determine the visible | 58 | // These properties are used by autopilot to determine the visible |
2355 | 53 | // portion of the key to press | 59 | // portion of the key to press |
2358 | 54 | readonly property double leftOffset: buttonImage.anchors.leftMargin | 60 | readonly property double leftOffset: buttonRect.anchors.leftMargin |
2359 | 55 | readonly property double rightOffset: buttonImage.anchors.rightMargin | 61 | readonly property double rightOffset: buttonRect.anchors.rightMargin |
2360 | 56 | 62 | ||
2361 | 57 | /* design */ | 63 | /* design */ |
2366 | 58 | property string imgNormal: UI.imageCharKey | 64 | property string normalColor: UI.charKeyColor |
2367 | 59 | property string imgPressed: UI.imageCharKeyPressed | 65 | property string pressedColor: UI.charKeyPressedColor |
2368 | 60 | // fontSize can be overwritten when using the component, e.g. SymbolShiftKey uses smaller fontSize | 66 | // Scale the font so the label fits if a long word is set |
2369 | 61 | property int fontSize: units.gu( UI.fontSize ); | 67 | property int fontSize: (fullScreenItem.landscape ? (height / 2) : (height / 2.8)) |
2370 | 68 | * (4 / (label.length >= 2 ? (label.length <= 6 ? label.length + 2 : 8) : 4)); | ||
2371 | 62 | 69 | ||
2372 | 63 | /// annotation shows a small label in the upper right corner | 70 | /// annotation shows a small label in the upper right corner |
2373 | 64 | // if the annotiation property is set, it will be used. If not, the first position in extended[] list or extendedShifted[] list will | 71 | // if the annotiation property is set, it will be used. If not, the first position in extended[] list or extendedShifted[] list will |
2374 | @@ -119,19 +126,14 @@ | |||
2375 | 119 | height: panel.keyHeight | 126 | height: panel.keyHeight |
2376 | 120 | width: parent.width | 127 | width: parent.width |
2377 | 121 | 128 | ||
2380 | 122 | BorderImage { | 129 | Rectangle { |
2381 | 123 | id: buttonImage | 130 | id: buttonRect |
2382 | 131 | color: key.currentlyPressed || key.highlight ? pressedColor : normalColor | ||
2383 | 124 | anchors.fill: parent | 132 | anchors.fill: parent |
2394 | 125 | anchors.leftMargin: key.leftSide ? (parent.width - panel.keyWidth) + units.dp(UI.keyMargins) : units.dp(UI.keyMargins) | 133 | anchors.leftMargin: key.leftSide ? (parent.width - panel.keyWidth) + key.keyMargin : key.keyMargin |
2395 | 126 | anchors.rightMargin: key.rightSide ? (parent.width - panel.keyWidth) + units.dp(UI.keyMargins) : units.dp(UI.keyMargins) | 134 | anchors.rightMargin: key.rightSide ? (parent.width - panel.keyWidth) + key.keyMargin : key.keyMargin |
2396 | 127 | anchors.bottomMargin: fullScreenItem.landscape ? units.dp( UI.keyMargins ) * 2 : units.gu(UI.row_margin); | 135 | anchors.bottomMargin: key.rowMargin |
2397 | 128 | source: key.imgNormal | 136 | radius: units.dp(4) |
2388 | 129 | |||
2389 | 130 | BorderImage { | ||
2390 | 131 | anchors.fill: parent | ||
2391 | 132 | visible: key.currentlyPressed || key.highlight | ||
2392 | 133 | source: key.imgPressed | ||
2393 | 134 | } | ||
2398 | 135 | 137 | ||
2399 | 136 | /// label of the key | 138 | /// label of the key |
2400 | 137 | // the label is also the value subitted to the app | 139 | // the label is also the value subitted to the app |
2401 | @@ -141,7 +143,7 @@ | |||
2402 | 141 | text: (panel.activeKeypadState === "NORMAL") ? label : shifted; | 143 | text: (panel.activeKeypadState === "NORMAL") ? label : shifted; |
2403 | 142 | font.family: UI.fontFamily | 144 | font.family: UI.fontFamily |
2404 | 143 | font.pixelSize: fontSize | 145 | font.pixelSize: fontSize |
2406 | 144 | font.bold: UI.fontBold | 146 | font.weight: Font.Light |
2407 | 145 | color: UI.fontColor | 147 | color: UI.fontColor |
2408 | 146 | anchors.right: parent.right | 148 | anchors.right: parent.right |
2409 | 147 | anchors.left: parent.left | 149 | anchors.left: parent.left |
2410 | @@ -150,7 +152,8 @@ | |||
2411 | 150 | anchors.verticalCenter: parent.verticalCenter | 152 | anchors.verticalCenter: parent.verticalCenter |
2412 | 151 | anchors.verticalCenterOffset: -units.gu(0.15) | 153 | anchors.verticalCenterOffset: -units.gu(0.15) |
2413 | 152 | horizontalAlignment: Text.AlignHCenter | 154 | horizontalAlignment: Text.AlignHCenter |
2415 | 153 | elide: Text.ElideRight | 155 | // Avoid eliding characters that are slightly too wide (e.g. some emoji) |
2416 | 156 | elide: text.length <= 2 ? Text.ElideNone : Text.ElideRight | ||
2417 | 154 | } | 157 | } |
2418 | 155 | 158 | ||
2419 | 156 | /// shows an annotation | 159 | /// shows an annotation |
2420 | @@ -164,9 +167,9 @@ | |||
2421 | 164 | anchors.top: parent.top | 167 | anchors.top: parent.top |
2422 | 165 | anchors.topMargin: units.gu(UI.annotationTopMargin) | 168 | anchors.topMargin: units.gu(UI.annotationTopMargin) |
2423 | 166 | anchors.rightMargin: units.gu(UI.annotationRightMargin) | 169 | anchors.rightMargin: units.gu(UI.annotationRightMargin) |
2427 | 167 | 170 | font.family: UI.annotationFont | |
2428 | 168 | font.pixelSize: units.gu( UI.annotationFontSize ) | 171 | font.pixelSize: fullScreenItem.tablet ? units.dp(UI.tabletAnnotationFontSize) : units.dp(UI.phoneAnnotationFontSize) |
2429 | 169 | font.bold: false | 172 | font.weight: Font.Light |
2430 | 170 | color: UI.annotationFontColor | 173 | color: UI.annotationFontColor |
2431 | 171 | } | 174 | } |
2432 | 172 | 175 | ||
2433 | 173 | 176 | ||
2434 | === modified file 'qml/keys/DropShadow.qml' | |||
2435 | --- qml/keys/DropShadow.qml 2013-09-25 12:09:46 +0000 | |||
2436 | +++ qml/keys/DropShadow.qml 2016-01-28 19:06:48 +0000 | |||
2437 | @@ -1,7 +1,7 @@ | |||
2438 | 1 | 1 | ||
2439 | 2 | // from qt-components/desktop | 2 | // from qt-components/desktop |
2440 | 3 | 3 | ||
2442 | 4 | import QtQuick 2.0 | 4 | import QtQuick 2.4 |
2443 | 5 | 5 | ||
2444 | 6 | ShaderEffect { | 6 | ShaderEffect { |
2445 | 7 | id: effect | 7 | id: effect |
2446 | 8 | 8 | ||
2447 | === modified file 'qml/keys/ExtendedKeysSelector.qml' | |||
2448 | --- qml/keys/ExtendedKeysSelector.qml 2015-12-09 14:19:04 +0000 | |||
2449 | +++ qml/keys/ExtendedKeysSelector.qml 2016-01-28 19:06:48 +0000 | |||
2450 | @@ -20,8 +20,6 @@ | |||
2451 | 20 | import Ubuntu.Components.ListItems 1.3 as ListItem | 20 | import Ubuntu.Components.ListItems 1.3 as ListItem |
2452 | 21 | import Ubuntu.Components.Popups 1.3 | 21 | import Ubuntu.Components.Popups 1.3 |
2453 | 22 | 22 | ||
2454 | 23 | import QtQuick.Window 2.0 | ||
2455 | 24 | |||
2456 | 25 | import "key_constants.js" as UI | 23 | import "key_constants.js" as UI |
2457 | 26 | 24 | ||
2458 | 27 | KeyPopover { | 25 | KeyPopover { |
2459 | @@ -118,8 +116,8 @@ | |||
2460 | 118 | text: modelData | 116 | text: modelData |
2461 | 119 | font.family: UI.fontFamily | 117 | font.family: UI.fontFamily |
2462 | 120 | font.pixelSize: text.length > 2 ? units.gu( UI.smallFontSize ) : units.gu( UI.fontSize ) | 118 | font.pixelSize: text.length > 2 ? units.gu( UI.smallFontSize ) : units.gu( UI.fontSize ) |
2465 | 121 | font.bold: UI.fontBold | 119 | font.weight: Font.Light |
2466 | 122 | color: key.highlight ? UbuntuColors.orange : UI.fontColor | 120 | color: key.highlight ? UI.selectionColor : UI.fontColor |
2467 | 123 | Component.onCompleted: __width += (textCell.width + units.gu( UI.popoverCellPadding)); | 121 | Component.onCompleted: __width += (textCell.width + units.gu( UI.popoverCellPadding)); |
2468 | 124 | } | 122 | } |
2469 | 125 | 123 | ||
2470 | 126 | 124 | ||
2471 | === modified file 'qml/keys/KeyPad.qml' | |||
2472 | --- qml/keys/KeyPad.qml 2013-10-15 12:24:32 +0000 | |||
2473 | +++ qml/keys/KeyPad.qml 2016-01-28 19:06:48 +0000 | |||
2474 | @@ -14,7 +14,7 @@ | |||
2475 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2476 | 15 | */ | 15 | */ |
2477 | 16 | 16 | ||
2479 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
2480 | 18 | 18 | ||
2481 | 19 | Item { | 19 | Item { |
2482 | 20 | id: keyPadRoot | 20 | id: keyPadRoot |
2483 | 21 | 21 | ||
2484 | === modified file 'qml/keys/LanguageKey.qml' | |||
2485 | --- qml/keys/LanguageKey.qml 2015-02-09 14:46:50 +0000 | |||
2486 | +++ qml/keys/LanguageKey.qml 2016-01-28 19:06:48 +0000 | |||
2487 | @@ -14,7 +14,7 @@ | |||
2488 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2489 | 15 | */ | 15 | */ |
2490 | 16 | 16 | ||
2492 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
2493 | 18 | 18 | ||
2494 | 19 | ActionKey { | 19 | ActionKey { |
2495 | 20 | iconNormal: "language-chooser"; | 20 | iconNormal: "language-chooser"; |
2496 | 21 | 21 | ||
2497 | === modified file 'qml/keys/LanguageMenu.qml' | |||
2498 | --- qml/keys/LanguageMenu.qml 2015-12-09 14:19:04 +0000 | |||
2499 | +++ qml/keys/LanguageMenu.qml 2016-01-28 19:06:48 +0000 | |||
2500 | @@ -19,6 +19,7 @@ | |||
2501 | 19 | import Ubuntu.Components.ListItems 1.3 as ListItem | 19 | import Ubuntu.Components.ListItems 1.3 as ListItem |
2502 | 20 | 20 | ||
2503 | 21 | import "key_constants.js" as UI | 21 | import "key_constants.js" as UI |
2504 | 22 | import "languages.js" as Languages | ||
2505 | 22 | 23 | ||
2506 | 23 | Item { | 24 | Item { |
2507 | 24 | 25 | ||
2508 | @@ -50,7 +51,7 @@ | |||
2509 | 50 | model: maliit_input_method.enabledLanguages | 51 | model: maliit_input_method.enabledLanguages |
2510 | 51 | 52 | ||
2511 | 52 | delegate: ListItem.Standard { | 53 | delegate: ListItem.Standard { |
2513 | 53 | text: languageIdToName(modelData) | 54 | text: Languages.languageIdToName(modelData) |
2514 | 54 | showDivider: modelData != maliit_input_method.enabledLanguages[maliit_input_method.enabledLanguages.length - 1] | 55 | showDivider: modelData != maliit_input_method.enabledLanguages[maliit_input_method.enabledLanguages.length - 1] |
2515 | 55 | control: CheckBox { | 56 | control: CheckBox { |
2516 | 56 | checked: maliit_input_method.activeLanguage == modelData | 57 | checked: maliit_input_method.activeLanguage == modelData |
2517 | @@ -71,7 +72,7 @@ | |||
2518 | 71 | Component { | 72 | Component { |
2519 | 72 | id: settingsComp | 73 | id: settingsComp |
2520 | 73 | Column { | 74 | Column { |
2522 | 74 | width: parent.width | 75 | width: menuList.width |
2523 | 75 | height: settingsItem.height + settingsDiv.height * 2 | 76 | height: settingsItem.height + settingsDiv.height * 2 |
2524 | 76 | ListItem.ThinDivider { id: settingsDiv } | 77 | ListItem.ThinDivider { id: settingsDiv } |
2525 | 77 | ListItem.ThinDivider { } | 78 | ListItem.ThinDivider { } |
2526 | @@ -90,41 +91,4 @@ | |||
2527 | 90 | footer: greeter_status.greeterActive ? null : settingsComp | 91 | footer: greeter_status.greeterActive ? null : settingsComp |
2528 | 91 | } | 92 | } |
2529 | 92 | 93 | ||
2530 | 93 | function languageIdToName(languageId) | ||
2531 | 94 | { | ||
2532 | 95 | if (languageId == "ar") return i18n.tr("Arabic"); | ||
2533 | 96 | if (languageId == "az") return i18n.tr("Azerbaijani"); | ||
2534 | 97 | if (languageId == "bs") return i18n.tr("Bosnian"); | ||
2535 | 98 | if (languageId == "ca") return i18n.tr("Catalan"); | ||
2536 | 99 | if (languageId == "cs") return i18n.tr("Czech"); | ||
2537 | 100 | if (languageId == "da") return i18n.tr("Danish"); | ||
2538 | 101 | if (languageId == "de") return i18n.tr("German"); | ||
2539 | 102 | if (languageId == "emoji") return i18n.tr("Emoji"); | ||
2540 | 103 | if (languageId == "el") return i18n.tr("Greek"); | ||
2541 | 104 | if (languageId == "en") return i18n.tr("English"); | ||
2542 | 105 | if (languageId == "es") return i18n.tr("Spanish"); | ||
2543 | 106 | if (languageId == "fi") return i18n.tr("Finnish"); | ||
2544 | 107 | if (languageId == "fr") return i18n.tr("French"); | ||
2545 | 108 | if (languageId == "gd") return i18n.tr("Scottish Gaelic"); | ||
2546 | 109 | if (languageId == "he") return i18n.tr("Hebrew"); | ||
2547 | 110 | if (languageId == "hr") return i18n.tr("Croatian"); | ||
2548 | 111 | if (languageId == "hu") return i18n.tr("Hungarian"); | ||
2549 | 112 | if (languageId == "is") return i18n.tr("Icelandic"); | ||
2550 | 113 | if (languageId == "it") return i18n.tr("Italian"); | ||
2551 | 114 | if (languageId == "nl") return i18n.tr("Dutch"); | ||
2552 | 115 | if (languageId == "nb") return i18n.tr("Norwegian"); | ||
2553 | 116 | if (languageId == "pl") return i18n.tr("Polish"); | ||
2554 | 117 | if (languageId == "pt") return i18n.tr("Portuguese"); | ||
2555 | 118 | if (languageId == "ro") return i18n.tr("Romanian"); | ||
2556 | 119 | if (languageId == "ru") return i18n.tr("Russian"); | ||
2557 | 120 | if (languageId == "sl") return i18n.tr("Slovenian"); | ||
2558 | 121 | if (languageId == "sr") return i18n.tr("Serbian"); | ||
2559 | 122 | if (languageId == "sv") return i18n.tr("Swedish"); | ||
2560 | 123 | if (languageId == "uk") return i18n.tr("Ukrainian"); | ||
2561 | 124 | if (languageId == "zh") return i18n.tr("Chinese - Pinyin"); | ||
2562 | 125 | |||
2563 | 126 | // fallback | ||
2564 | 127 | return languageId.charAt(0).toUpperCase() + languageId.slice(1); | ||
2565 | 128 | } | ||
2566 | 129 | |||
2567 | 130 | } | 94 | } |
2568 | 131 | 95 | ||
2569 | === modified file 'qml/keys/Magnifier.qml' | |||
2570 | --- qml/keys/Magnifier.qml 2014-09-26 13:22:23 +0000 | |||
2571 | +++ qml/keys/Magnifier.qml 2016-01-28 19:06:48 +0000 | |||
2572 | @@ -14,7 +14,7 @@ | |||
2573 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2574 | 15 | */ | 15 | */ |
2575 | 16 | 16 | ||
2577 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
2578 | 18 | import "key_constants.js" as UI | 18 | import "key_constants.js" as UI |
2579 | 19 | 19 | ||
2580 | 20 | /*! | 20 | /*! |
2581 | @@ -83,8 +83,8 @@ | |||
2582 | 83 | anchors.centerIn: parent | 83 | anchors.centerIn: parent |
2583 | 84 | text: currentlyAssignedKey ? currentlyAssignedKey.valueToSubmit : "" | 84 | text: currentlyAssignedKey ? currentlyAssignedKey.valueToSubmit : "" |
2584 | 85 | font.family: UI.fontFamily | 85 | font.family: UI.fontFamily |
2585 | 86 | font.weight: Font.Light | ||
2586 | 86 | font.pixelSize: units.gu( UI.fontSizeMagnified ) | 87 | font.pixelSize: units.gu( UI.fontSizeMagnified ) |
2587 | 87 | font.bold: UI.fontBold | ||
2588 | 88 | color: UI.fontColor | 88 | color: UI.fontColor |
2589 | 89 | } | 89 | } |
2590 | 90 | 90 | ||
2591 | 91 | 91 | ||
2592 | === modified file 'qml/keys/OneTwoKey.qml' | |||
2593 | --- qml/keys/OneTwoKey.qml 2014-08-20 12:45:36 +0000 | |||
2594 | +++ qml/keys/OneTwoKey.qml 2016-01-28 19:06:48 +0000 | |||
2595 | @@ -14,12 +14,9 @@ | |||
2596 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2597 | 15 | */ | 15 | */ |
2598 | 16 | 16 | ||
2600 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
2601 | 18 | 18 | ||
2602 | 19 | ActionKey { | 19 | ActionKey { |
2603 | 20 | iconNormal: "../images/icon_shift@18.png"; | ||
2604 | 21 | iconShifted: "../images/icon_shift_upsidedown@18.png"; | ||
2605 | 22 | iconCapsLock: "../images/icon_shift_white@18.png"; | ||
2606 | 23 | action: "shift" | 20 | action: "shift" |
2607 | 24 | overridePressArea: true | 21 | overridePressArea: true |
2608 | 25 | 22 | ||
2609 | 26 | 23 | ||
2610 | === modified file 'qml/keys/PressArea.qml' | |||
2611 | --- qml/keys/PressArea.qml 2015-12-10 17:50:51 +0000 | |||
2612 | +++ qml/keys/PressArea.qml 2016-01-28 19:06:48 +0000 | |||
2613 | @@ -14,7 +14,7 @@ | |||
2614 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2615 | 15 | */ | 15 | */ |
2616 | 16 | 16 | ||
2618 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
2619 | 18 | 18 | ||
2620 | 19 | /*! | 19 | /*! |
2621 | 20 | MultiPointTouchArea is similar to the MouseArea | 20 | MultiPointTouchArea is similar to the MouseArea |
2622 | 21 | 21 | ||
2623 | === modified file 'qml/keys/ReturnKey.qml' | |||
2624 | --- qml/keys/ReturnKey.qml 2014-11-19 13:57:09 +0000 | |||
2625 | +++ qml/keys/ReturnKey.qml 2016-01-28 19:06:48 +0000 | |||
2626 | @@ -14,7 +14,7 @@ | |||
2627 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2628 | 15 | */ | 15 | */ |
2629 | 16 | 16 | ||
2631 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
2632 | 18 | import "key_constants.js" as UI | 18 | import "key_constants.js" as UI |
2633 | 19 | 19 | ||
2634 | 20 | ActionKey { | 20 | ActionKey { |
2635 | @@ -25,11 +25,9 @@ | |||
2636 | 25 | enabled: actionKeyOverride ? actionKeyOverride.enabled : true | 25 | enabled: actionKeyOverride ? actionKeyOverride.enabled : true |
2637 | 26 | // overrideIcon has high priority over label | 26 | // overrideIcon has high priority over label |
2638 | 27 | label: overrideIconName == "" ? overrideLabel : "" | 27 | label: overrideIconName == "" ? overrideLabel : "" |
2639 | 28 | // Scale the font so the label fits if a long word is set | ||
2640 | 29 | fontSize: units.gu(UI.symbolShiftKeyFontSize) * (4 / (label.length >= 4 ? (label.length <= 6 ? label.length : 6) : 4)); | ||
2641 | 30 | shifted: label | 28 | shifted: label |
2642 | 31 | 29 | ||
2644 | 32 | iconNormal: (overrideIconName == "") && (overrideLabel == "") ? "keyboard-return" : overrideIconName | 30 | iconNormal: (overrideIconName == "") && (overrideLabel == "") ? "keyboard-enter" : overrideIconName |
2645 | 33 | iconShifted: iconNormal | 31 | iconShifted: iconNormal |
2646 | 34 | iconCapsLock: iconNormal | 32 | iconCapsLock: iconNormal |
2647 | 35 | 33 | ||
2648 | 36 | 34 | ||
2649 | === modified file 'qml/keys/ShiftKey.qml' | |||
2650 | --- qml/keys/ShiftKey.qml 2015-12-09 14:19:04 +0000 | |||
2651 | +++ qml/keys/ShiftKey.qml 2016-01-28 19:06:48 +0000 | |||
2652 | @@ -17,13 +17,12 @@ | |||
2653 | 17 | import QtQuick 2.4 | 17 | import QtQuick 2.4 |
2654 | 18 | import Ubuntu.Components 1.3 | 18 | import Ubuntu.Components 1.3 |
2655 | 19 | 19 | ||
2656 | 20 | import "key_constants.js" as UI | ||
2657 | 21 | |||
2658 | 20 | ActionKey { | 22 | ActionKey { |
2665 | 21 | iconNormal: "keyboard-caps" | 23 | iconSourceNormal: "../images/keyboard-caps-disabled.svg" |
2666 | 22 | iconShifted: "keyboard-caps-active" | 24 | iconSourceShifted: "../images/keyboard-caps-enabled.svg" |
2667 | 23 | iconCapsLock: "keyboard-caps-lock" | 25 | iconSourceCapsLock: "../images/keyboard-caps-locked.svg" |
2662 | 24 | |||
2663 | 25 | // XXX: Disabled due to problems with coloring - see LP: #1251285 for details | ||
2664 | 26 | // colorShifted: UbuntuColors.orange | ||
2668 | 27 | 26 | ||
2669 | 28 | action: "shift" | 27 | action: "shift" |
2670 | 29 | 28 | ||
2671 | 30 | 29 | ||
2672 | === added file 'qml/keys/SmallSpaceKey.qml' | |||
2673 | --- qml/keys/SmallSpaceKey.qml 1970-01-01 00:00:00 +0000 | |||
2674 | +++ qml/keys/SmallSpaceKey.qml 2016-01-28 19:06:48 +0000 | |||
2675 | @@ -0,0 +1,34 @@ | |||
2676 | 1 | /* | ||
2677 | 2 | * Copyright 2013 Canonical Ltd. | ||
2678 | 3 | * | ||
2679 | 4 | * This program is free software; you can redistribute it and/or modify | ||
2680 | 5 | * it under the terms of the GNU Lesser General Public License as published by | ||
2681 | 6 | * the Free Software Foundation; version 3. | ||
2682 | 7 | * | ||
2683 | 8 | * This program is distributed in the hope that it will be useful, | ||
2684 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
2685 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
2686 | 11 | * GNU Lesser General Public License for more details. | ||
2687 | 12 | * | ||
2688 | 13 | * You should have received a copy of the GNU Lesser General Public License | ||
2689 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
2690 | 15 | */ | ||
2691 | 16 | |||
2692 | 17 | import QtQuick 2.4 | ||
2693 | 18 | import Ubuntu.Components 1.3 | ||
2694 | 19 | |||
2695 | 20 | import "key_constants.js" as UI | ||
2696 | 21 | import "languages.js" as Languages | ||
2697 | 22 | |||
2698 | 23 | ActionKey { | ||
2699 | 24 | normalColor: UI.charKeyColor | ||
2700 | 25 | pressedColor: UI.charKeyPressedColor | ||
2701 | 26 | |||
2702 | 27 | Image { | ||
2703 | 28 | anchors.centerIn: parent | ||
2704 | 29 | source: "../images/keyboard_spacebar.png" | ||
2705 | 30 | } | ||
2706 | 31 | |||
2707 | 32 | action: "space" | ||
2708 | 33 | switchBackFromSymbols: true | ||
2709 | 34 | } | ||
2710 | 0 | 35 | ||
2711 | === modified file 'qml/keys/SpaceKey.qml' | |||
2712 | --- qml/keys/SpaceKey.qml 2014-08-29 15:11:05 +0000 | |||
2713 | +++ qml/keys/SpaceKey.qml 2016-01-28 19:06:48 +0000 | |||
2714 | @@ -14,17 +14,29 @@ | |||
2715 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2716 | 15 | */ | 15 | */ |
2717 | 16 | 16 | ||
2719 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
2720 | 18 | import Ubuntu.Components 1.3 | ||
2721 | 18 | 19 | ||
2722 | 19 | import "key_constants.js" as UI | 20 | import "key_constants.js" as UI |
2723 | 21 | import "languages.js" as Languages | ||
2724 | 20 | 22 | ||
2725 | 21 | ActionKey { | 23 | ActionKey { |
2726 | 22 | label: " "; | 24 | label: " "; |
2727 | 23 | shifted: " "; | 25 | shifted: " "; |
2728 | 24 | 26 | ||
2731 | 25 | imgNormal: UI.imageCharKey | 27 | normalColor: UI.charKeyColor |
2732 | 26 | imgPressed: UI.imageCharKeyPressed | 28 | pressedColor: UI.charKeyPressedColor |
2733 | 27 | 29 | ||
2734 | 28 | action: "space" | 30 | action: "space" |
2735 | 29 | switchBackFromSymbols: true | 31 | switchBackFromSymbols: true |
2736 | 32 | |||
2737 | 33 | Label { | ||
2738 | 34 | anchors.centerIn: parent | ||
2739 | 35 | anchors.verticalCenterOffset: -parent.rowMargin / 2 - units.gu(0.15) | ||
2740 | 36 | font.family: UI.spaceFontFamily | ||
2741 | 37 | font.weight: Font.Light | ||
2742 | 38 | fontSize: fullScreenItem.tablet ? UI.tabletSpaceFontSize : UI.phoneSpaceFontSize | ||
2743 | 39 | opacity: UI.spaceOpacity | ||
2744 | 40 | text: Languages.languageIdToName(maliit_input_method.activeLanguage) | ||
2745 | 41 | } | ||
2746 | 30 | } | 42 | } |
2747 | 31 | 43 | ||
2748 | === modified file 'qml/keys/Spacer.qml' | |||
2749 | --- qml/keys/Spacer.qml 2013-09-07 07:55:28 +0000 | |||
2750 | +++ qml/keys/Spacer.qml 2016-01-28 19:06:48 +0000 | |||
2751 | @@ -14,7 +14,7 @@ | |||
2752 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2753 | 15 | */ | 15 | */ |
2754 | 16 | 16 | ||
2756 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
2757 | 18 | 18 | ||
2758 | 19 | /** | 19 | /** |
2759 | 20 | * an invisible spacer the size of a regular key. | 20 | * an invisible spacer the size of a regular key. |
2760 | 21 | 21 | ||
2761 | === modified file 'qml/keys/SymbolShiftKey.qml' | |||
2762 | --- qml/keys/SymbolShiftKey.qml 2014-08-20 12:45:36 +0000 | |||
2763 | +++ qml/keys/SymbolShiftKey.qml 2016-01-28 19:06:48 +0000 | |||
2764 | @@ -14,7 +14,7 @@ | |||
2765 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2766 | 15 | */ | 15 | */ |
2767 | 16 | 16 | ||
2769 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
2770 | 18 | 18 | ||
2771 | 19 | import "key_constants.js" as UI | 19 | import "key_constants.js" as UI |
2772 | 20 | 20 | ||
2773 | @@ -23,8 +23,6 @@ | |||
2774 | 23 | shifted: "?123"; | 23 | shifted: "?123"; |
2775 | 24 | action: "symbols"; | 24 | action: "symbols"; |
2776 | 25 | 25 | ||
2777 | 26 | fontSize: units.gu(UI.symbolShiftKeyFontSize); | ||
2778 | 27 | |||
2779 | 28 | overridePressArea: true; | 26 | overridePressArea: true; |
2780 | 29 | 27 | ||
2781 | 30 | onPressed: { | 28 | onPressed: { |
2782 | 31 | 29 | ||
2783 | === modified file 'qml/keys/UrlKey.qml' | |||
2784 | --- qml/keys/UrlKey.qml 2013-10-25 13:16:15 +0000 | |||
2785 | +++ qml/keys/UrlKey.qml 2016-01-28 19:06:48 +0000 | |||
2786 | @@ -14,7 +14,7 @@ | |||
2787 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2788 | 15 | */ | 15 | */ |
2789 | 16 | 16 | ||
2791 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
2792 | 18 | import "../keys/key_constants.js" as UI | 18 | import "../keys/key_constants.js" as UI |
2793 | 19 | 19 | ||
2794 | 20 | CharKey { | 20 | CharKey { |
2795 | @@ -23,5 +23,4 @@ | |||
2796 | 23 | label: ".com"; | 23 | label: ".com"; |
2797 | 24 | shifted: label | 24 | shifted: label |
2798 | 25 | extendedShifted: extended | 25 | extendedShifted: extended |
2799 | 26 | fontSize: units.gu(UI.smallFontSize); | ||
2800 | 27 | } | 26 | } |
2801 | 28 | 27 | ||
2802 | === modified file 'qml/keys/key_constants.js' | |||
2803 | --- qml/keys/key_constants.js 2015-03-26 02:53:03 +0000 | |||
2804 | +++ qml/keys/key_constants.js 2016-01-28 19:06:48 +0000 | |||
2805 | @@ -16,19 +16,29 @@ | |||
2806 | 16 | 16 | ||
2807 | 17 | .pragma library | 17 | .pragma library |
2808 | 18 | 18 | ||
2810 | 19 | var keyMargins = 1.8; // dp | 19 | var tabletKeyMargins = 0.5; // gu |
2811 | 20 | var phoneKeyMargins = 0.25 // gu | ||
2812 | 20 | var fontSize = 2.5; // gu | 21 | var fontSize = 2.5; // gu |
2813 | 21 | var fontSizeMagnified = 4; // gu | 22 | var fontSizeMagnified = 4; // gu |
2814 | 22 | var fontFamily = "Ubuntu"; | 23 | var fontFamily = "Ubuntu"; |
2821 | 23 | var fontColor = "#5d5d5d" | 24 | var fontColor = "#333333"; |
2822 | 24 | var fontBold = false | 25 | var fontBold = false; |
2823 | 25 | 26 | var selectionColor = "#19B6EE"; | |
2824 | 26 | var backgroundColor = "#f1f1f1" | 27 | |
2825 | 27 | 28 | var backgroundColor = "#f7f7f7"; | |
2826 | 28 | var annotationFontSize = 0.85; // gu | 29 | var dividerColor = "#cdcdcd"; |
2827 | 30 | |||
2828 | 31 | var tabletAnnotationFontSize = 10; // dp | ||
2829 | 32 | var phoneAnnotationFontSize = 10; // dp | ||
2830 | 29 | var annotationTopMargin = 0.35; // gu | 33 | var annotationTopMargin = 0.35; // gu |
2831 | 30 | var annotationRightMargin = 0.65; // gu | 34 | var annotationRightMargin = 0.65; // gu |
2833 | 31 | var annotationFontColor = "#5d5d5d" | 35 | var annotationFontColor = "#333333"; |
2834 | 36 | var annotationFont = "Ubuntu"; | ||
2835 | 37 | |||
2836 | 38 | var spaceFontFamily = "Ubuntu"; | ||
2837 | 39 | var tabletSpaceFontSize = "large"; | ||
2838 | 40 | var phoneSpaceFontSize = "small"; | ||
2839 | 41 | var spaceOpacity = 0.33; | ||
2840 | 32 | 42 | ||
2841 | 33 | /* magnifier */ | 43 | /* magnifier */ |
2842 | 34 | var magnifierHorizontalPadding = 1.8; // gu, stretch the magnifier a little bit in x-axis | 44 | var magnifierHorizontalPadding = 1.8; // gu, stretch the magnifier a little bit in x-axis |
2843 | @@ -45,15 +55,17 @@ | |||
2844 | 45 | var popoverEdgeMargin = 2.2; // gu | 55 | var popoverEdgeMargin = 2.2; // gu |
2845 | 46 | var popoverSquat = 3; // gu, when no wordribbon, avoid click-through above input trap | 56 | var popoverSquat = 3; // gu, when no wordribbon, avoid click-through above input trap |
2846 | 47 | 57 | ||
2854 | 48 | var imageCharKey = "../images/white_key.sci" | 58 | var charKeyColor = "white" |
2855 | 49 | var imageCharKeyPressed = "../images/grey_key.sci" | 59 | var charKeyPressedColor = "#d9d9d9" |
2856 | 50 | 60 | ||
2857 | 51 | var imageActionKey = "../images/action_key.sci" | 61 | var actionKeyColor = "#cdcdcd" |
2858 | 52 | var imageActionKeyPressed = "../images/grey_key.sci" | 62 | var actionKeyPressedColor = "#aeaeae" |
2859 | 53 | 63 | ||
2860 | 54 | var top_margin = 1.35; // gu | 64 | var top_margin = 1; // gu |
2861 | 55 | var bottom_margin = 0; // gu | 65 | var bottom_margin = 0; // gu |
2863 | 56 | var row_margin = 1.5; // gu | 66 | var tabletRowMargin = 1; // gu |
2864 | 67 | var phoneRowMarginLandscape = 4; // dp | ||
2865 | 68 | var phoneRowMarginPortrait = 7; // dp | ||
2866 | 57 | 69 | ||
2867 | 58 | var urlLayoutLeftSpacerSize = 5; // gu | 70 | var urlLayoutLeftSpacerSize = 5; // gu |
2868 | 59 | var emailLayoutUrlKeyPadding = 1.5; // gu | 71 | var emailLayoutUrlKeyPadding = 1.5; // gu |
2869 | @@ -61,10 +73,13 @@ | |||
2870 | 61 | /* language menu */ | 73 | /* language menu */ |
2871 | 62 | var languageMenuListViewPadding = 2.22; // gu | 74 | var languageMenuListViewPadding = 2.22; // gu |
2872 | 63 | 75 | ||
2880 | 64 | var wordribbonHeight = 3; // gu | 76 | var tabletWordribbonHeight = 6; // gu |
2881 | 65 | 77 | var phoneWordribbonHeight = 4; // gu | |
2882 | 66 | var phoneKeyboardHeightPortrait = 0.41; | 78 | var tabletWordRibbonFontSize = 17 // dp |
2883 | 67 | var phoneKeyboardHeightLandscape = 0.50; | 79 | var phoneWordRibbonFontSize = 14 // dp |
2884 | 68 | 80 | ||
2885 | 69 | var tabletKeyboardHeightPortrait = 0.28; | 81 | var phoneKeyboardHeightPortrait = 0.40; // percent of screen |
2886 | 70 | var tabletKeyboardHeightLandscape = 0.38; | 82 | var phoneKeyboardHeightLandscape = 0.49; // percent of screen |
2887 | 83 | |||
2888 | 84 | var tabletKeyboardHeightPortrait = 0.39; // percent of screen | ||
2889 | 85 | var tabletKeyboardHeightLandscape = 0.42; // percent of screen | ||
2890 | 71 | 86 | ||
2891 | === added file 'qml/keys/languages.js' | |||
2892 | --- qml/keys/languages.js 1970-01-01 00:00:00 +0000 | |||
2893 | +++ qml/keys/languages.js 2016-01-28 19:06:48 +0000 | |||
2894 | @@ -0,0 +1,52 @@ | |||
2895 | 1 | /* | ||
2896 | 2 | * Copyright 2016 Canonical Ltd. | ||
2897 | 3 | * | ||
2898 | 4 | * This program is free software; you can redistribute it and/or modify | ||
2899 | 5 | * it under the terms of the GNU General Public License as published by | ||
2900 | 6 | * the Free Software Foundation; version 3. | ||
2901 | 7 | * | ||
2902 | 8 | * This program is distributed in the hope that it will be useful, | ||
2903 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
2904 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
2905 | 11 | * GNU General Public License for more details. | ||
2906 | 12 | * | ||
2907 | 13 | * You should have received a copy of the GNU General Public License | ||
2908 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
2909 | 15 | */ | ||
2910 | 16 | |||
2911 | 17 | function languageIdToName(languageId) | ||
2912 | 18 | { | ||
2913 | 19 | if (languageId == "ar") return i18n.tr("Arabic"); | ||
2914 | 20 | if (languageId == "az") return i18n.tr("Azerbaijani"); | ||
2915 | 21 | if (languageId == "bs") return i18n.tr("Bosnian"); | ||
2916 | 22 | if (languageId == "ca") return i18n.tr("Catalan"); | ||
2917 | 23 | if (languageId == "cs") return i18n.tr("Czech"); | ||
2918 | 24 | if (languageId == "da") return i18n.tr("Danish"); | ||
2919 | 25 | if (languageId == "de") return i18n.tr("German"); | ||
2920 | 26 | if (languageId == "emoji") return i18n.tr("Emoji"); | ||
2921 | 27 | if (languageId == "el") return i18n.tr("Greek"); | ||
2922 | 28 | if (languageId == "en") return i18n.tr("English"); | ||
2923 | 29 | if (languageId == "es") return i18n.tr("Spanish"); | ||
2924 | 30 | if (languageId == "fi") return i18n.tr("Finnish"); | ||
2925 | 31 | if (languageId == "fr") return i18n.tr("French"); | ||
2926 | 32 | if (languageId == "gd") return i18n.tr("Scottish Gaelic"); | ||
2927 | 33 | if (languageId == "he") return i18n.tr("Hebrew"); | ||
2928 | 34 | if (languageId == "hr") return i18n.tr("Croatian"); | ||
2929 | 35 | if (languageId == "hu") return i18n.tr("Hungarian"); | ||
2930 | 36 | if (languageId == "is") return i18n.tr("Icelandic"); | ||
2931 | 37 | if (languageId == "it") return i18n.tr("Italian"); | ||
2932 | 38 | if (languageId == "nl") return i18n.tr("Dutch"); | ||
2933 | 39 | if (languageId == "nb") return i18n.tr("Norwegian"); | ||
2934 | 40 | if (languageId == "pl") return i18n.tr("Polish"); | ||
2935 | 41 | if (languageId == "pt") return i18n.tr("Portuguese"); | ||
2936 | 42 | if (languageId == "ro") return i18n.tr("Romanian"); | ||
2937 | 43 | if (languageId == "ru") return i18n.tr("Russian"); | ||
2938 | 44 | if (languageId == "sl") return i18n.tr("Slovenian"); | ||
2939 | 45 | if (languageId == "sr") return i18n.tr("Serbian"); | ||
2940 | 46 | if (languageId == "sv") return i18n.tr("Swedish"); | ||
2941 | 47 | if (languageId == "uk") return i18n.tr("Ukrainian"); | ||
2942 | 48 | if (languageId == "zh") return i18n.tr("Chinese - Pinyin"); | ||
2943 | 49 | |||
2944 | 50 | // fallback | ||
2945 | 51 | return languageId.charAt(0).toUpperCase() + languageId.slice(1); | ||
2946 | 52 | } | ||
2947 | 0 | 53 | ||
2948 | === modified file 'qml/languages/Keyboard_numbers.qml' | |||
2949 | --- qml/languages/Keyboard_numbers.qml 2014-05-28 11:14:15 +0000 | |||
2950 | +++ qml/languages/Keyboard_numbers.qml 2016-01-28 19:06:48 +0000 | |||
2951 | @@ -14,7 +14,7 @@ | |||
2952 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2953 | 15 | */ | 15 | */ |
2954 | 16 | 16 | ||
2956 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
2957 | 18 | import "../keys" | 18 | import "../keys" |
2958 | 19 | 19 | ||
2959 | 20 | KeyPad { | 20 | KeyPad { |
2960 | @@ -26,48 +26,53 @@ | |||
2961 | 26 | Column { | 26 | Column { |
2962 | 27 | id: c1 | 27 | id: c1 |
2963 | 28 | anchors.fill: parent | 28 | anchors.fill: parent |
3006 | 29 | anchors.margins: 0; | 29 | anchors.leftMargin: units.gu(1); |
3007 | 30 | 30 | anchors.rightMargin: units.gu(1); | |
3008 | 31 | spacing: 0 | 31 | anchors.bottomMargin: units.gu(1); |
3009 | 32 | 32 | ||
3010 | 33 | Row { | 33 | property double numKeyWidth: panel.keyWidth - units.gu(0.75); |
3011 | 34 | anchors.horizontalCenter: parent.horizontalCenter; | 34 | property double numKeyHeight: panel.keyHeight - units.gu(1); |
3012 | 35 | anchors.margins: 50; | 35 | |
3013 | 36 | spacing: 0 | 36 | spacing: units.gu(1); |
3014 | 37 | 37 | ||
3015 | 38 | CharKey { label: "1"; noMagnifier: true; } | 38 | Row { |
3016 | 39 | CharKey { label: "2"; noMagnifier: true; } | 39 | anchors.horizontalCenter: parent.horizontalCenter; |
3017 | 40 | CharKey { label: "3"; noMagnifier: true; } | 40 | spacing: units.gu(0.5); |
3018 | 41 | } | 41 | |
3019 | 42 | 42 | CharKey { label: "1"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; } | |
3020 | 43 | Row { | 43 | CharKey { label: "2"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; } |
3021 | 44 | anchors.horizontalCenter: parent.horizontalCenter; | 44 | CharKey { label: "3"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; } |
3022 | 45 | anchors.margins: 50; | 45 | CharKey { label: "-"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; } |
3023 | 46 | spacing: 0 | 46 | } |
3024 | 47 | 47 | ||
3025 | 48 | CharKey { label: "4"; noMagnifier: true; } | 48 | Row { |
3026 | 49 | CharKey { label: "5"; noMagnifier: true; } | 49 | anchors.horizontalCenter: parent.horizontalCenter; |
3027 | 50 | CharKey { label: "6"; noMagnifier: true; } | 50 | spacing: units.gu(0.5); |
3028 | 51 | } | 51 | |
3029 | 52 | 52 | CharKey { label: "4"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; } | |
3030 | 53 | Row { | 53 | CharKey { label: "5"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; } |
3031 | 54 | anchors.horizontalCenter: parent.horizontalCenter; | 54 | CharKey { label: "6"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; } |
3032 | 55 | anchors.margins: 50; | 55 | SmallSpaceKey { padding: 0; width: c1.numKeyWidth; height: c1.numKeyHeight; } |
3033 | 56 | spacing: 0 | 56 | } |
3034 | 57 | 57 | ||
3035 | 58 | CharKey { label: "7"; noMagnifier: true; } | 58 | Row { |
3036 | 59 | CharKey { label: "8"; noMagnifier: true; } | 59 | anchors.horizontalCenter: parent.horizontalCenter; |
3037 | 60 | CharKey { label: "9"; noMagnifier: true; } | 60 | spacing: units.gu(0.5); |
3038 | 61 | } | 61 | |
3039 | 62 | 62 | CharKey { label: "7"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; } | |
3040 | 63 | Row { | 63 | CharKey { label: "8"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; } |
3041 | 64 | anchors.horizontalCenter: parent.horizontalCenter; | 64 | CharKey { label: "9"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; } |
3042 | 65 | anchors.margins: 50; | 65 | BackspaceKey { padding: 0; width: c1.numKeyWidth; height: c1.numKeyHeight; } |
3043 | 66 | spacing: 0 | 66 | } |
3044 | 67 | 67 | ||
3045 | 68 | CharKey { label: "."; extended: ["-", "."]; noMagnifier: true; } | 68 | Row { |
3046 | 69 | CharKey { label: "0"; noMagnifier: true; } | 69 | anchors.horizontalCenter: parent.horizontalCenter; |
3047 | 70 | BackspaceKey { padding: 0; } | 70 | spacing: units.gu(0.5); |
3048 | 71 | |||
3049 | 72 | CharKey { label: "+"; annotation: "#*"; extended: ["#", "*"]; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; } | ||
3050 | 73 | CharKey { label: "0"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; } | ||
3051 | 74 | CharKey { label: "."; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; } | ||
3052 | 75 | ReturnKey { padding: 0; width: c1.numKeyWidth; height: c1.numKeyHeight; } | ||
3053 | 71 | } | 76 | } |
3054 | 72 | } // column | 77 | } // column |
3055 | 73 | } | 78 | } |
3056 | 74 | 79 | ||
3057 | === modified file 'qml/languages/Keyboard_symbols.qml' | |||
3058 | --- qml/languages/Keyboard_symbols.qml 2015-01-26 19:50:40 +0000 | |||
3059 | +++ qml/languages/Keyboard_symbols.qml 2016-01-28 19:06:48 +0000 | |||
3060 | @@ -14,7 +14,7 @@ | |||
3061 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3062 | 15 | */ | 15 | */ |
3063 | 16 | 16 | ||
3065 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
3066 | 18 | import "../keys" | 18 | import "../keys" |
3067 | 19 | import "../keys/key_constants.js" as UI | 19 | import "../keys/key_constants.js" as UI |
3068 | 20 | 20 | ||
3069 | 21 | 21 | ||
3070 | === modified file 'qml/languages/Keyboard_telephone.qml' | |||
3071 | --- qml/languages/Keyboard_telephone.qml 2014-12-12 17:28:08 +0000 | |||
3072 | +++ qml/languages/Keyboard_telephone.qml 2016-01-28 19:06:48 +0000 | |||
3073 | @@ -14,7 +14,7 @@ | |||
3074 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3075 | 15 | */ | 15 | */ |
3076 | 16 | 16 | ||
3078 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
3079 | 18 | import "../keys" | 18 | import "../keys" |
3080 | 19 | 19 | ||
3081 | 20 | KeyPad { | 20 | KeyPad { |
3082 | @@ -26,48 +26,53 @@ | |||
3083 | 26 | Column { | 26 | Column { |
3084 | 27 | id: c1 | 27 | id: c1 |
3085 | 28 | anchors.fill: parent | 28 | anchors.fill: parent |
3128 | 29 | anchors.margins: 0; | 29 | anchors.leftMargin: units.gu(1); |
3129 | 30 | 30 | anchors.rightMargin: units.gu(1); | |
3130 | 31 | spacing: 0 | 31 | anchors.bottomMargin: units.gu(1); |
3131 | 32 | 32 | ||
3132 | 33 | Row { | 33 | property double numKeyWidth: panel.keyWidth - units.gu(0.75); |
3133 | 34 | anchors.horizontalCenter: parent.horizontalCenter; | 34 | property double numKeyHeight: panel.keyHeight - units.gu(1); |
3134 | 35 | anchors.margins: 50; | 35 | |
3135 | 36 | spacing: 0 | 36 | spacing: units.gu(1); |
3136 | 37 | 37 | ||
3137 | 38 | CharKey { label: "1"; noMagnifier: true; } | 38 | Row { |
3138 | 39 | CharKey { label: "2"; noMagnifier: true; } | 39 | anchors.horizontalCenter: parent.horizontalCenter; |
3139 | 40 | CharKey { label: "3"; noMagnifier: true; } | 40 | spacing: units.gu(0.5); |
3140 | 41 | } | 41 | |
3141 | 42 | 42 | CharKey { label: "1"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; } | |
3142 | 43 | Row { | 43 | CharKey { label: "2"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; } |
3143 | 44 | anchors.horizontalCenter: parent.horizontalCenter; | 44 | CharKey { label: "3"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; } |
3144 | 45 | anchors.margins: 50; | 45 | CharKey { label: "#"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; } |
3145 | 46 | spacing: 0 | 46 | } |
3146 | 47 | 47 | ||
3147 | 48 | CharKey { label: "4"; noMagnifier: true; } | 48 | Row { |
3148 | 49 | CharKey { label: "5"; noMagnifier: true; } | 49 | anchors.horizontalCenter: parent.horizontalCenter; |
3149 | 50 | CharKey { label: "6"; noMagnifier: true; } | 50 | spacing: units.gu(0.5); |
3150 | 51 | } | 51 | |
3151 | 52 | 52 | CharKey { label: "4"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; } | |
3152 | 53 | Row { | 53 | CharKey { label: "5"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; } |
3153 | 54 | anchors.horizontalCenter: parent.horizontalCenter; | 54 | CharKey { label: "6"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; } |
3154 | 55 | anchors.margins: 50; | 55 | CharKey { label: "*"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; } |
3155 | 56 | spacing: 0 | 56 | } |
3156 | 57 | 57 | ||
3157 | 58 | CharKey { label: "7"; noMagnifier: true; } | 58 | Row { |
3158 | 59 | CharKey { label: "8"; noMagnifier: true; } | 59 | anchors.horizontalCenter: parent.horizontalCenter; |
3159 | 60 | CharKey { label: "9"; noMagnifier: true; } | 60 | spacing: units.gu(0.5); |
3160 | 61 | } | 61 | |
3161 | 62 | 62 | CharKey { label: "7"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; } | |
3162 | 63 | Row { | 63 | CharKey { label: "8"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; } |
3163 | 64 | anchors.horizontalCenter: parent.horizontalCenter; | 64 | CharKey { label: "9"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; } |
3164 | 65 | anchors.margins: 50; | 65 | BackspaceKey { padding: 0; width: c1.numKeyWidth; height: c1.numKeyHeight; } |
3165 | 66 | spacing: 0 | 66 | } |
3166 | 67 | 67 | ||
3167 | 68 | CharKey { label: "+"; annotation: "*#"; extended: ["*", "#"]; noMagnifier: true; } | 68 | Row { |
3168 | 69 | CharKey { label: "0"; noMagnifier: true; } | 69 | anchors.horizontalCenter: parent.horizontalCenter; |
3169 | 70 | BackspaceKey { padding: 0; } | 70 | spacing: units.gu(0.5); |
3170 | 71 | |||
3171 | 72 | CharKey { label: "+"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; } | ||
3172 | 73 | CharKey { label: "0"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; } | ||
3173 | 74 | CharKey { label: ""; enabled: false; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; } | ||
3174 | 75 | ReturnKey { padding: 0; width: c1.numKeyWidth; height: c1.numKeyHeight; } | ||
3175 | 71 | } | 76 | } |
3176 | 72 | } // column | 77 | } // column |
3177 | 73 | } | 78 | } |
3178 | 74 | 79 | ||
3179 | === modified file 'qml/qml.pro' | |||
3180 | --- qml/qml.pro 2015-04-15 12:56:56 +0000 | |||
3181 | +++ qml/qml.pro 2016-01-28 19:06:48 +0000 | |||
3182 | @@ -14,7 +14,7 @@ | |||
3183 | 14 | 14 | ||
3184 | 15 | 15 | ||
3185 | 16 | images.path = "$$UBUNTU_KEYBOARD_DATA_DIR/images" | 16 | images.path = "$$UBUNTU_KEYBOARD_DATA_DIR/images" |
3187 | 17 | images.files = images/*.png images/*.sci | 17 | images.files = images/*.png images/*.sci images/*.svg |
3188 | 18 | 18 | ||
3189 | 19 | INSTALLS += qml qml_keys qml_languages images | 19 | INSTALLS += qml qml_keys qml_languages images |
3190 | 20 | 20 | ||
3191 | 21 | 21 | ||
3192 | === modified file 'tests/autopilot/ubuntu_keyboard/emulators/keyboard.py' | |||
3193 | --- tests/autopilot/ubuntu_keyboard/emulators/keyboard.py 2015-08-18 11:37:58 +0000 | |||
3194 | +++ tests/autopilot/ubuntu_keyboard/emulators/keyboard.py 2016-01-28 19:06:48 +0000 | |||
3195 | @@ -126,7 +126,7 @@ | |||
3196 | 126 | if self.is_available(): | 126 | if self.is_available(): |
3197 | 127 | x, y, h, w = self._keyboard_container.globalRect | 127 | x, y, h, w = self._keyboard_container.globalRect |
3198 | 128 | x_pos = int(w / 2) | 128 | x_pos = int(w / 2) |
3200 | 129 | start_y = y + int(h / 2) | 129 | start_y = y + int(h / 2.5) |
3201 | 130 | end_y = y + h | 130 | end_y = y + h |
3202 | 131 | self.pointer.drag(x_pos, start_y, x_pos, end_y) | 131 | self.pointer.drag(x_pos, start_y, x_pos, end_y) |
3203 | 132 | 132 | ||
3204 | 133 | 133 | ||
3205 | === modified file 'tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py' | |||
3206 | --- tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py 2016-01-04 14:13:58 +0000 | |||
3207 | +++ tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py 2016-01-28 19:06:48 +0000 | |||
3208 | @@ -1185,7 +1185,7 @@ | |||
3209 | 1185 | 1185 | ||
3210 | 1186 | """ | 1186 | """ |
3211 | 1187 | qml = dedent(""" | 1187 | qml = dedent(""" |
3213 | 1188 | import QtQuick 2.0 | 1188 | import QtQuick 2.4 |
3214 | 1189 | import Ubuntu.Components 1.1 | 1189 | import Ubuntu.Components 1.1 |
3215 | 1190 | import Ubuntu.Web 0.2 | 1190 | import Ubuntu.Web 0.2 |
3216 | 1191 | 1191 | ||
3217 | 1192 | 1192 | ||
3218 | === modified file 'tests/testlayout/qml/Keyboard_testlayout.qml' | |||
3219 | --- tests/testlayout/qml/Keyboard_testlayout.qml 2015-04-17 13:15:54 +0000 | |||
3220 | +++ tests/testlayout/qml/Keyboard_testlayout.qml 2016-01-28 19:06:48 +0000 | |||
3221 | @@ -14,7 +14,7 @@ | |||
3222 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3223 | 15 | */ | 15 | */ |
3224 | 16 | 16 | ||
3226 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
3227 | 18 | import keys 1.0 | 18 | import keys 1.0 |
3228 | 19 | 19 | ||
3229 | 20 | KeyPad { | 20 | KeyPad { |
FAILED: Continuous integration, rev:437 jenkins. qa.ubuntu. com/job/ ubuntu- keyboard- ci/648/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- vivid-touch/ 6117/console jenkins. qa.ubuntu. com/job/ ubuntu- keyboard- vivid-amd64- ci/147/ console jenkins. qa.ubuntu. com/job/ ubuntu- keyboard- vivid-armhf- ci/148/ console jenkins. qa.ubuntu. com/job/ ubuntu- keyboard- vivid-i386- ci/147/ console jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 6128/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/ubuntu- keyboard- ci/648/ rebuild
http://