ubuntu-keyboard

Merge lp:~michael-sheldon/ubuntu-keyboard/visual-refresh into lp:ubuntu-keyboard

  1. visual-refresh
  2. Merge into trunk
Proposed by Michael Sheldon
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
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

To post a comment you must log in.
lp:~michael-sheldon/ubuntu-keyboard/visual-refresh updated
438. By Michael Sheldon

Switch suru keyboard enter icon

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

FAILED: Continuous integration, rev:437
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/648/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6117/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/147/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/148/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/147/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6128/console

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

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

FAILED: Continuous integration, rev:438
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/649/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6121/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/148/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/149/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/148/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6132/console

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

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

FAILED: Continuous integration, rev:439
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/650/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6123
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/149
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/150
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/150/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/149
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4725
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6134
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6134/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26894

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

review: Needs Fixing (continuous-integration)
lp:~michael-sheldon/ubuntu-keyboard/visual-refresh updated
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

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

FAILED: Continuous integration, rev:440
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/651/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6131
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/150
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/151
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/151/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/150
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4730
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6142
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6142/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26917

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

review: Needs Fixing (continuous-integration)
lp:~michael-sheldon/ubuntu-keyboard/visual-refresh updated
442. By Michael Sheldon

Fix tablet detection in portrait orientation and switch to sizing based on proportion of screen

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

FAILED: Continuous integration, rev:441
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/652/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6134
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/151
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/152
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/152/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/151
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4733
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6145
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6145/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26926

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

review: Needs Fixing (continuous-integration)
lp:~michael-sheldon/ubuntu-keyboard/visual-refresh updated
443. By Michael Sheldon

Fix sizing on URL key

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

FAILED: Continuous integration, rev:442
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/653/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6135
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/152
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/153
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/153/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/152
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4734
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6146
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6146/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26931

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

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

FAILED: Continuous integration, rev:443
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/654/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6136
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/153
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/154
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/154/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/153
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4735
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6147
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6147/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26935

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

review: Needs Fixing (continuous-integration)
lp:~michael-sheldon/ubuntu-keyboard/visual-refresh updated
444. By Michael Sheldon

Tweak word ribbon sizing and boldness

445. By Michael Sheldon

Fix alignment of bottom row

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

FAILED: Continuous integration, rev:444
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/655/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6137
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/154
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/155
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/155/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/154
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4736
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6148
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6148/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26938

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

review: Needs Fixing (continuous-integration)
lp:~michael-sheldon/ubuntu-keyboard/visual-refresh updated
446. By Michael Sheldon

Update phone sizing

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

FAILED: Continuous integration, rev:445
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/656/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6141
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/155
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/156
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/156/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/155
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4738
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6152
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6152/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26940

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

review: Needs Fixing (continuous-integration)
lp:~michael-sheldon/ubuntu-keyboard/visual-refresh updated
447. By Michael Sheldon

Fix key font sizing in landscape

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

FAILED: Continuous integration, rev:446
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/657/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6148
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/156
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/157
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/157/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/156
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4743
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6159
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6159/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26950

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

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

FAILED: Continuous integration, rev:447
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/659/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6158
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/158
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/159
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/159/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/158
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4753
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6169
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6169/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26967

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

review: Needs Fixing (continuous-integration)
lp:~michael-sheldon/ubuntu-keyboard/visual-refresh updated
448. By Michael Sheldon

Fix word ribbon sizing

449. By Michael Sheldon

Fix annotation sizing

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

FAILED: Continuous integration, rev:448
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/660/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6178
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/159
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/160
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/160/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/159
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4767
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6189
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6189/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27007

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

review: Needs Fixing (continuous-integration)
lp:~michael-sheldon/ubuntu-keyboard/visual-refresh updated
450. By Michael Sheldon

Tweak annotation size and selection colours

451. By Michael Sheldon

Update imports

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

FAILED: Continuous integration, rev:449
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/661/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6181
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/160
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/161
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/161/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/160
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4769
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6192
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6192/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27012

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

review: Needs Fixing (continuous-integration)
lp:~michael-sheldon/ubuntu-keyboard/visual-refresh updated
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

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

FAILED: Continuous integration, rev:451
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/662/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6185
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/161
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/162
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/162/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/161
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4771
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6196
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6196/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27018

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

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

FAILED: Continuous integration, rev:454
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/663/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6191
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/162
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/163
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/163/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/162
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4775
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6202
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6202/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27025

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

review: Needs Fixing (continuous-integration)
lp:~michael-sheldon/ubuntu-keyboard/visual-refresh updated
455. By Michael Sheldon

Fix dismiss positioning for new layouts

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

FAILED: Continuous integration, rev:455
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/664/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6197/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/163
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/164
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/164/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/163
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4780/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6208
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6208/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27036

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

review: Needs Fixing (continuous-integration)
lp:~michael-sheldon/ubuntu-keyboard/visual-refresh updated
456. By Michael Sheldon

Remove unused icon references

457. By Michael Sheldon

Fix light font

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

FAILED: Continuous integration, rev:457
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/665/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6201
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/164
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/165
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/165/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/164
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4782
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6212
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6212/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27047

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

review: Needs Fixing (continuous-integration)
lp:~michael-sheldon/ubuntu-keyboard/visual-refresh updated
458. By Michael Sheldon

Update telephone layout visuals to remove keys that can't be handled by libphonenumber

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

FAILED: Continuous integration, rev:458
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/666/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6225
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/165
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/166
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/166/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/165
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4797
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6236
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6236/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27082

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

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

FAILED: Continuous integration, rev:459
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/667/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6229
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/166
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/167
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/167/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/166
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4801
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6240
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6240/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27093

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

review: Needs Fixing (continuous-integration)
lp:~michael-sheldon/ubuntu-keyboard/visual-refresh updated
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

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
6 */
7
8-import QtQuick 2.0
9+import QtQuick 2.4
10 import keys 1.0
11
12 KeyPad {
13
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 */
20
21-import QtQuick 2.0
22+import QtQuick 2.4
23 import keys 1.0
24
25 KeyPad {
26
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
32 */
33
34-import QtQuick 2.0
35+import QtQuick 2.4
36 import keys 1.0
37
38 KeyPad {
39
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
45 */
46
47-import QtQuick 2.0
48+import QtQuick 2.4
49 import keys 1.0
50
51 KeyPad {
52
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
58 */
59
60-import QtQuick 2.0
61+import QtQuick 2.4
62 import keys 1.0
63
64 KeyPad {
65
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
71 */
72
73-import QtQuick 2.0
74+import QtQuick 2.4
75 import keys 1.0
76
77 KeyPad {
78
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
84 */
85
86-import QtQuick 2.0
87+import QtQuick 2.4
88 import keys 1.0
89
90 KeyPad {
91
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
97 */
98
99-import QtQuick 2.0
100+import QtQuick 2.4
101 import keys 1.0
102
103 KeyPad {
104
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
110 */
111
112-import QtQuick 2.0
113+import QtQuick 2.4
114 import keys 1.0
115
116 KeyPad {
117
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
123 */
124
125-import QtQuick 2.0
126+import QtQuick 2.4
127 import keys 1.0
128
129 KeyPad {
130
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
136 */
137
138-import QtQuick 2.0
139+import QtQuick 2.4
140 import keys 1.0
141
142 KeyPad {
143
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
149 */
150
151-import QtQuick 2.0
152+import QtQuick 2.4
153 import keys 1.0
154
155 KeyPad {
156
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
162 */
163
164-import QtQuick 2.0
165+import QtQuick 2.4
166 import keys 1.0
167
168 KeyPad {
169
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
175 */
176
177-import QtQuick 2.0
178+import QtQuick 2.4
179 import keys 1.0
180
181 KeyPad {
182
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
188 */
189
190-import QtQuick 2.0
191+import QtQuick 2.4
192 import keys 1.0
193
194 KeyPad {
195
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
201 */
202
203-import QtQuick 2.0
204+import QtQuick 2.4
205 import keys 1.0
206
207 KeyPad {
208
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
214 */
215
216-import QtQuick 2.0
217+import QtQuick 2.4
218 import keys 1.0
219
220 KeyPad {
221
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
227 */
228
229-import QtQuick 2.0
230+import QtQuick 2.4
231 import keys 1.0
232
233 KeyPad {
234
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
240 */
241
242-import QtQuick 2.0
243+import QtQuick 2.4
244 import keys 1.0
245
246 KeyPad {
247
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
253 */
254
255-import QtQuick 2.0
256+import QtQuick 2.4
257 import keys 1.0
258
259 KeyPad {
260
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
266 */
267
268-import QtQuick 2.0
269+import QtQuick 2.4
270 import keys 1.0
271
272 KeyPad {
273
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
279 */
280
281-import QtQuick 2.0
282+import QtQuick 2.4
283 import keys 1.0
284
285 KeyPad {
286
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
292 */
293
294-import QtQuick 2.0
295+import QtQuick 2.4
296 import keys 1.0
297
298 KeyPad {
299
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
305 */
306
307-import QtQuick 2.0
308+import QtQuick 2.4
309 import keys 1.0
310
311 KeyPad {
312
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
318 */
319
320-import QtQuick 2.0
321+import QtQuick 2.4
322 import keys 1.0
323
324 KeyPad {
325
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
331 */
332
333-import QtQuick 2.0
334+import QtQuick 2.4
335 import keys 1.0
336
337 KeyPad {
338
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
344 */
345
346-import QtQuick 2.0
347+import QtQuick 2.4
348 import keys 1.0
349
350 KeyPad {
351
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
357 */
358
359-import QtQuick 2.0
360+import QtQuick 2.4
361 import keys 1.0
362
363 KeyPad {
364
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
370 */
371
372-import QtQuick 2.0
373+import QtQuick 2.4
374 import keys 1.0
375
376 KeyPad {
377
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
383 */
384
385-import QtQuick 2.0
386+import QtQuick 2.4
387 import keys 1.0
388
389 KeyPad {
390
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
396 */
397
398-import QtQuick 2.0
399+import QtQuick 2.4
400 import keys 1.0
401
402 KeyPad {
403
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
409 */
410
411-import QtQuick 2.0
412+import QtQuick 2.4
413 import keys 1.0
414
415 KeyPad {
416
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
422 */
423
424-import QtQuick 2.0
425+import QtQuick 2.4
426 import keys 1.0
427 import "emoji.js" as Emoji
428
429
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
435 */
436
437-import QtQuick 2.0
438+import QtQuick 2.4
439 import keys 1.0
440
441 KeyPad {
442
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
448 */
449
450-import QtQuick 2.0
451+import QtQuick 2.4
452 import keys 1.0
453
454 KeyPad {
455
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
461 */
462
463-import QtQuick 2.0
464+import QtQuick 2.4
465 import keys 1.0
466
467 KeyPad {
468
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
474 */
475
476-import QtQuick 2.0
477+import QtQuick 2.4
478 import keys 1.0
479
480 KeyPad {
481
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
487 */
488
489-import QtQuick 2.0
490+import QtQuick 2.4
491 import keys 1.0
492
493 KeyPad {
494
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
500 */
501
502-import QtQuick 2.0
503+import QtQuick 2.4
504 import keys 1.0
505
506 KeyPad {
507
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
513 */
514
515-import QtQuick 2.0
516+import QtQuick 2.4
517 import keys 1.0
518
519 KeyPad {
520
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
526 */
527
528-import QtQuick 2.0
529+import QtQuick 2.4
530 import keys 1.0
531
532 KeyPad {
533
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
539 */
540
541-import QtQuick 2.0
542+import QtQuick 2.4
543 import keys 1.0
544
545 KeyPad {
546
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
552 */
553
554-import QtQuick 2.0
555+import QtQuick 2.4
556 import keys 1.0
557
558 KeyPad {
559
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
565 */
566
567-import QtQuick 2.0
568+import QtQuick 2.4
569 import keys 1.0
570
571 KeyPad {
572
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
578 */
579
580-import QtQuick 2.0
581+import QtQuick 2.4
582 import keys 1.0
583
584 KeyPad {
585
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
591 */
592
593-import QtQuick 2.0
594+import QtQuick 2.4
595 import keys 1.0
596
597 KeyPad {
598
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
604 */
605
606-import QtQuick 2.0
607+import QtQuick 2.4
608 import keys 1.0
609
610 KeyPad {
611
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
617 */
618
619-import QtQuick 2.0
620+import QtQuick 2.4
621 import keys 1.0
622
623 KeyPad {
624
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
630 */
631
632-import QtQuick 2.0
633+import QtQuick 2.4
634 import keys 1.0
635
636 KeyPad {
637
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
643 */
644
645-import QtQuick 2.0
646+import QtQuick 2.4
647 import keys 1.0
648
649 KeyPad {
650
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
656 */
657
658-import QtQuick 2.0
659+import QtQuick 2.4
660 import keys 1.0
661
662 KeyPad {
663
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
669 */
670
671-import QtQuick 2.0
672+import QtQuick 2.4
673 import keys 1.0
674
675 KeyPad {
676
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
682 */
683
684-import QtQuick 2.0
685+import QtQuick 2.4
686 import keys 1.0
687
688 KeyPad {
689
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
695 */
696
697-import QtQuick 2.0
698+import QtQuick 2.4
699 import keys 1.0
700
701 KeyPad {
702
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
708 */
709
710-import QtQuick 2.0
711+import QtQuick 2.4
712 import keys 1.0
713
714 KeyPad {
715
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
721 */
722
723-import QtQuick 2.0
724+import QtQuick 2.4
725 import keys 1.0
726
727 KeyPad {
728
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
734 */
735
736-import QtQuick 2.0
737+import QtQuick 2.4
738 import keys 1.0
739
740 KeyPad {
741
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
747 */
748
749-import QtQuick 2.0
750+import QtQuick 2.4
751 import keys 1.0
752
753 KeyPad {
754
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
760 */
761
762-import QtQuick 2.0
763+import QtQuick 2.4
764 import keys 1.0
765
766 KeyPad {
767
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
773 */
774
775-import QtQuick 2.0
776+import QtQuick 2.4
777 import keys 1.0
778
779 KeyPad {
780
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
786 */
787
788-import QtQuick 2.0
789+import QtQuick 2.4
790 import keys 1.0
791
792 KeyPad {
793
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
799 */
800
801-import QtQuick 2.0
802+import QtQuick 2.4
803 import keys 1.0
804
805 KeyPad {
806
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
812 */
813
814-import QtQuick 2.0
815+import QtQuick 2.4
816 import keys 1.0
817
818 KeyPad {
819
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
825 */
826
827-import QtQuick 2.0
828+import QtQuick 2.4
829 import keys 1.0
830
831 KeyPad {
832
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
838 */
839
840-import QtQuick 2.0
841+import QtQuick 2.4
842 import keys 1.0
843
844 KeyPad {
845
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
851 */
852
853-import QtQuick 2.0
854+import QtQuick 2.4
855 import keys 1.0
856
857 KeyPad {
858
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
864 */
865
866-import QtQuick 2.0
867+import QtQuick 2.4
868 import keys 1.0
869
870 KeyPad {
871
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
877 */
878
879-import QtQuick 2.0
880+import QtQuick 2.4
881 import keys 1.0
882
883 KeyPad {
884
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
890 */
891
892-import QtQuick 2.0
893+import QtQuick 2.4
894 import keys 1.0
895
896 KeyPad {
897
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
903 */
904
905-import QtQuick 2.0
906+import QtQuick 2.4
907 import keys 1.0
908
909 KeyPad {
910
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
916 */
917
918-import QtQuick 2.0
919+import QtQuick 2.4
920 import keys 1.0
921
922 KeyPad {
923
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
929 */
930
931-import QtQuick 2.0
932+import QtQuick 2.4
933 import keys 1.0
934
935 KeyPad {
936
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
942 */
943
944-import QtQuick 2.0
945+import QtQuick 2.4
946 import keys 1.0
947
948 KeyPad {
949
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
955 */
956
957-import QtQuick 2.0
958+import QtQuick 2.4
959 import keys 1.0
960
961 KeyPad {
962
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
968 */
969
970-import QtQuick 2.0
971+import QtQuick 2.4
972 import keys 1.0
973
974 KeyPad {
975
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
981 */
982
983-import QtQuick 2.0
984+import QtQuick 2.4
985 import keys 1.0
986
987 KeyPad {
988
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
994 */
995
996-import QtQuick 2.0
997+import QtQuick 2.4
998 import keys 1.0
999
1000 KeyPad {
1001
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1007 */
1008
1009-import QtQuick 2.0
1010+import QtQuick 2.4
1011 import keys 1.0
1012
1013 KeyPad {
1014
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1020 */
1021
1022-import QtQuick 2.0
1023+import QtQuick 2.4
1024 import keys 1.0
1025
1026 KeyPad {
1027
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1033 */
1034
1035-import QtQuick 2.0
1036+import QtQuick 2.4
1037 import keys 1.0
1038
1039 KeyPad {
1040
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1046 */
1047
1048-import QtQuick 2.0
1049+import QtQuick 2.4
1050 import keys 1.0
1051
1052 KeyPad {
1053
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1059 */
1060
1061-import QtQuick 2.0
1062+import QtQuick 2.4
1063 import keys 1.0
1064
1065 KeyPad {
1066
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1072 */
1073
1074-import QtQuick 2.0
1075+import QtQuick 2.4
1076 import keys 1.0
1077
1078 KeyPad {
1079
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1085 */
1086
1087-import QtQuick 2.0
1088+import QtQuick 2.4
1089 import keys 1.0
1090
1091 KeyPad {
1092
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1098 */
1099
1100-import QtQuick 2.0
1101+import QtQuick 2.4
1102 import keys 1.0
1103
1104 KeyPad {
1105
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1111 */
1112
1113-import QtQuick 2.0
1114+import QtQuick 2.4
1115 import keys 1.0
1116
1117 KeyPad {
1118
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1124 */
1125
1126-import QtQuick 2.0
1127+import QtQuick 2.4
1128 import keys 1.0
1129
1130 KeyPad {
1131
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1137 */
1138
1139-import QtQuick 2.0
1140+import QtQuick 2.4
1141 import keys 1.0
1142
1143 KeyPad {
1144
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1150 */
1151
1152-import QtQuick 2.0
1153+import QtQuick 2.4
1154 import keys 1.0
1155
1156 KeyPad {
1157
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1163 */
1164
1165-import QtQuick 2.0
1166+import QtQuick 2.4
1167 import keys 1.0
1168
1169 KeyPad {
1170
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1176 */
1177
1178-import QtQuick 2.0
1179+import QtQuick 2.4
1180 import keys 1.0
1181
1182 KeyPad {
1183
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1189 */
1190
1191-import QtQuick 2.0
1192+import QtQuick 2.4
1193 import keys 1.0
1194
1195 KeyPad {
1196
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1202 */
1203
1204-import QtQuick 2.0
1205+import QtQuick 2.4
1206 import keys 1.0
1207
1208 KeyPad {
1209
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1215 */
1216
1217-import QtQuick 2.0
1218+import QtQuick 2.4
1219 import keys 1.0
1220
1221 KeyPad {
1222
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1228 */
1229
1230-import QtQuick 2.0
1231+import QtQuick 2.4
1232 import keys 1.0
1233
1234 KeyPad {
1235
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1241 */
1242
1243-import QtQuick 2.0
1244+import QtQuick 2.4
1245 import keys 1.0
1246
1247 KeyPad {
1248
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1254 */
1255
1256-import QtQuick 2.0
1257+import QtQuick 2.4
1258 import keys 1.0
1259
1260 KeyPad {
1261
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1267 */
1268
1269-import QtQuick 2.0
1270+import QtQuick 2.4
1271 import keys 1.0
1272
1273 KeyPad {
1274
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1280 */
1281
1282-import QtQuick 2.0
1283+import QtQuick 2.4
1284 import keys 1.0
1285
1286 KeyPad {
1287
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1293 */
1294
1295-import QtQuick 2.0
1296+import QtQuick 2.4
1297 import keys 1.0
1298
1299 KeyPad {
1300
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1306 */
1307
1308-import QtQuick 2.0
1309+import QtQuick 2.4
1310 import keys 1.0
1311
1312 KeyPad {
1313
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1319 */
1320
1321-import QtQuick 2.0
1322+import QtQuick 2.4
1323 import keys 1.0
1324
1325 KeyPad {
1326
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1332 */
1333
1334-import QtQuick 2.0
1335+import QtQuick 2.4
1336 import keys 1.0
1337
1338 KeyPad {
1339
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1345 */
1346
1347-import QtQuick 2.0
1348+import QtQuick 2.4
1349 import keys 1.0
1350
1351 KeyPad {
1352
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1358 */
1359
1360-import QtQuick 2.0
1361+import QtQuick 2.4
1362 import keys 1.0
1363
1364 KeyPad {
1365
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1371 */
1372
1373-import QtQuick 2.0
1374+import QtQuick 2.4
1375 import keys 1.0
1376
1377 KeyPad {
1378
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1384 */
1385
1386-import QtQuick 2.0
1387+import QtQuick 2.4
1388 import keys 1.0
1389
1390 KeyPad {
1391
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1397 */
1398
1399-import QtQuick 2.0
1400+import QtQuick 2.4
1401 import keys 1.0
1402
1403 KeyPad {
1404
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1410 */
1411
1412-import QtQuick 2.0
1413+import QtQuick 2.4
1414 import keys 1.0
1415
1416 KeyPad {
1417
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1423 */
1424
1425-import QtQuick 2.0
1426+import QtQuick 2.4
1427 import keys 1.0
1428
1429 KeyPad {
1430
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1436 */
1437
1438-import QtQuick 2.0
1439+import QtQuick 2.4
1440 import keys 1.0
1441
1442 KeyPad {
1443
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1449 */
1450
1451-import QtQuick 2.0
1452+import QtQuick 2.4
1453 import keys 1.0
1454
1455 KeyPad {
1456
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1462 */
1463
1464-import QtQuick 2.0
1465+import QtQuick 2.4
1466 import keys 1.0
1467
1468 KeyPad {
1469
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1475 */
1476
1477-import QtQuick 2.0
1478+import QtQuick 2.4
1479 import keys 1.0
1480
1481 KeyPad {
1482
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1488 */
1489
1490-import QtQuick 2.0
1491+import QtQuick 2.4
1492 import keys 1.0
1493
1494 KeyPad {
1495
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1501 */
1502
1503-import QtQuick 2.0
1504+import QtQuick 2.4
1505 import keys 1.0
1506
1507 KeyPad {
1508
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1514 */
1515
1516-import QtQuick 2.0
1517+import QtQuick 2.4
1518 import keys 1.0
1519
1520 KeyPad {
1521
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 objectName: "fullScreenItem"
1527
1528 property bool landscape: width > height
1529+ readonly property bool tablet: landscape ? width >= units.gu(90) : height >= units.gu(90)
1530
1531 property variant input_method: maliit_input_method
1532 property variant event_handler: maliit_event_handler
1533@@ -57,8 +58,11 @@
1534 anchors.left: parent.left
1535
1536 width: parent.width
1537- height: fullScreenItem.landscape ? (fullScreenItem.height * UI.phoneKeyboardHeightLandscape) + wordRibbon.height
1538- : (fullScreenItem.height * UI.phoneKeyboardHeightPortrait) + wordRibbon.height
1539+ height: fullScreenItem.height * (fullScreenItem.landscape ? fullScreenItem.tablet ? UI.tabletKeyboardHeightLandscape
1540+ : UI.phoneKeyboardHeightLandscape
1541+ : fullScreenItem.tablet ? UI.tabletKeyboardHeightPortrait
1542+ : UI.phoneKeyboardHeightPortrait)
1543+ + wordRibbon.height + borderTop.height
1544
1545 property int keypadHeight: height;
1546
1547@@ -89,7 +93,7 @@
1548 anchors.right: parent.right
1549 anchors.top: parent.top
1550 height: (parent.height - canvas.keypadHeight) + wordRibbon.height +
1551- borderTop.height + units.gu(UI.top_margin)
1552+ borderTop.height
1553
1554 drag.target: keyboardSurface
1555 drag.axis: Drag.YAxis;
1556@@ -124,6 +128,13 @@
1557 onWidthChanged: fullScreenItem.reportKeyboardVisibleRect();
1558 onHeightChanged: fullScreenItem.reportKeyboardVisibleRect();
1559
1560+ Rectangle {
1561+ width: parent.width
1562+ height: units.dp(1)
1563+ color: UI.dividerColor
1564+ anchors.bottom: wordRibbon.visible ? wordRibbon.top : keyboardComp.top
1565+ }
1566+
1567 WordRibbon {
1568 id: wordRibbon
1569 objectName: "wordRibbon"
1570@@ -133,7 +144,9 @@
1571 anchors.bottom: keyboardComp.top
1572 width: parent.width;
1573
1574- height: canvas.wordribbon_visible ? units.gu(UI.wordribbonHeight) : 0
1575+ height: canvas.wordribbon_visible ? (fullScreenItem.tablet ? units.gu(UI.tabletWordribbonHeight)
1576+ : units.gu(UI.phoneWordribbonHeight))
1577+ : 0
1578 onHeightChanged: fullScreenItem.reportKeyboardVisibleRect();
1579 }
1580
1581@@ -141,7 +154,7 @@
1582 id: keyboardComp
1583 objectName: "keyboardComp"
1584
1585- height: canvas.keypadHeight - wordRibbon.height
1586+ height: canvas.keypadHeight - wordRibbon.height + keypad.anchors.topMargin
1587 width: parent.width
1588 anchors.bottom: parent.bottom
1589
1590@@ -154,12 +167,13 @@
1591
1592 color: UI.backgroundColor
1593 }
1594-
1595- Image {
1596+
1597+ Rectangle {
1598 id: borderTop
1599- source: "styles/ubuntu/images/border_top.png"
1600+ color: UI.backgroundColor
1601 width: parent.width
1602 anchors.top: parent.top.bottom
1603+ height: wordRibbon.visible ? 0 : units.gu(UI.top_margin)
1604 }
1605
1606 KeyboardContainer {
1607@@ -167,8 +181,7 @@
1608
1609 anchors.top: borderTop.bottom
1610 anchors.bottom: background.bottom
1611- anchors.topMargin: units.gu( UI.top_margin )
1612- anchors.bottomMargin: units.gu( UI.bottom_margin )
1613+ anchors.bottomMargin: units.gu(UI.bottom_margin)
1614 width: parent.width
1615
1616 onPopoverEnabledChanged: fullScreenItem.reportKeyboardVisibleRect();
1617
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1623 */
1624
1625-import QtQuick 2.0
1626+import QtQuick 2.4
1627 import QtMultimedia 5.0
1628 import QtQuick.Window 2.0
1629 import "languages/"
1630
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
1636 import QtQuick 2.4
1637 import Ubuntu.Components 1.3
1638+import "keys/key_constants.js" as UI
1639
1640 Rectangle {
1641
1642@@ -25,7 +26,7 @@
1643
1644 Rectangle {
1645 anchors.fill: parent
1646- color: "#f1f1f1"
1647+ color: UI.backgroundColor
1648 }
1649
1650 ListView {
1651@@ -48,23 +49,22 @@
1652 height: wordRibbonCanvas.height
1653 anchors.margins: 0
1654 property alias word_text: wordItem // For testing in Autopilot
1655- property alias textBold: wordItem.font.bold // Exposed for autopilot
1656+ property bool textBold: isPrimaryCandidate || listView.count == 1 // Exposed for autopilot
1657
1658 Item {
1659 anchors.fill: parent
1660 anchors.margins: {
1661 top: units.gu(0)
1662 bottom: units.gu(0)
1663- left: units.gu(1)
1664- right: units.gu(1)
1665+ left: units.gu(2)
1666+ right: units.gu(2)
1667 }
1668
1669- Text {
1670+ Label {
1671 id: wordItem
1672- font.pixelSize: units.gu(1.9)
1673- font.family: "Ubuntu Medium"
1674- color: "#999999"
1675- font.bold: isPrimaryCandidate || listView.count == 1
1676+ font.pixelSize: units.dp(fullScreenItem.tablet ? UI.tabletWordRibbonFontSize : UI.phoneWordRibbonFontSize)
1677+ font.family: UI.fontFamily
1678+ font.weight: textBold ? Font.Bold : Font.Light
1679 text: word;
1680 anchors.centerIn: parent
1681 }
1682
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+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
1688+<!-- Created with Inkscape (http://www.inkscape.org/) -->
1689+
1690+<svg
1691+ xmlns:dc="http://purl.org/dc/elements/1.1/"
1692+ xmlns:cc="http://creativecommons.org/ns#"
1693+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
1694+ xmlns:svg="http://www.w3.org/2000/svg"
1695+ xmlns="http://www.w3.org/2000/svg"
1696+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
1697+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
1698+ width="96"
1699+ height="96"
1700+ id="svg4874"
1701+ version="1.1"
1702+ inkscape:version="0.91+devel r"
1703+ viewBox="0 0 96 96.000001"
1704+ sodipodi:docname="keyboard-caps-disabled.svg">
1705+ <defs
1706+ id="defs4876" />
1707+ <sodipodi:namedview
1708+ id="base"
1709+ pagecolor="#ffffff"
1710+ bordercolor="#666666"
1711+ borderopacity="1.0"
1712+ inkscape:pageopacity="0.0"
1713+ inkscape:pageshadow="2"
1714+ inkscape:zoom="5.6199992"
1715+ inkscape:cx="36.912809"
1716+ inkscape:cy="16.645887"
1717+ inkscape:document-units="px"
1718+ inkscape:current-layer="g4780"
1719+ showgrid="true"
1720+ showborder="true"
1721+ fit-margin-top="0"
1722+ fit-margin-left="0"
1723+ fit-margin-right="0"
1724+ fit-margin-bottom="0"
1725+ inkscape:snap-bbox="true"
1726+ inkscape:bbox-paths="true"
1727+ inkscape:bbox-nodes="true"
1728+ inkscape:snap-bbox-edge-midpoints="true"
1729+ inkscape:snap-bbox-midpoints="true"
1730+ inkscape:object-paths="true"
1731+ inkscape:snap-intersection-paths="true"
1732+ inkscape:object-nodes="true"
1733+ inkscape:snap-smooth-nodes="false"
1734+ inkscape:snap-midpoints="true"
1735+ inkscape:snap-object-midpoints="true"
1736+ inkscape:snap-center="true"
1737+ showguides="true"
1738+ inkscape:guide-bbox="true"
1739+ inkscape:snap-others="false">
1740+ <inkscape:grid
1741+ type="xygrid"
1742+ id="grid5451"
1743+ empspacing="8" />
1744+ <sodipodi:guide
1745+ orientation="1,0"
1746+ position="8,-8.0000001"
1747+ id="guide4063"
1748+ inkscape:locked="false" />
1749+ <sodipodi:guide
1750+ orientation="1,0"
1751+ position="4,-8.0000001"
1752+ id="guide4065"
1753+ inkscape:locked="false" />
1754+ <sodipodi:guide
1755+ orientation="0,1"
1756+ position="-8,88.000001"
1757+ id="guide4067"
1758+ inkscape:locked="false" />
1759+ <sodipodi:guide
1760+ orientation="0,1"
1761+ position="-8,92.000001"
1762+ id="guide4069"
1763+ inkscape:locked="false" />
1764+ <sodipodi:guide
1765+ orientation="0,1"
1766+ position="104,4"
1767+ id="guide4071"
1768+ inkscape:locked="false" />
1769+ <sodipodi:guide
1770+ orientation="0,1"
1771+ position="-5,8.0000001"
1772+ id="guide4073"
1773+ inkscape:locked="false" />
1774+ <sodipodi:guide
1775+ orientation="1,0"
1776+ position="92,-8.0000001"
1777+ id="guide4075"
1778+ inkscape:locked="false" />
1779+ <sodipodi:guide
1780+ orientation="1,0"
1781+ position="88,-8.0000001"
1782+ id="guide4077"
1783+ inkscape:locked="false" />
1784+ <sodipodi:guide
1785+ orientation="0,1"
1786+ position="-8,84.000001"
1787+ id="guide4074"
1788+ inkscape:locked="false" />
1789+ <sodipodi:guide
1790+ orientation="1,0"
1791+ position="12,-8.0000001"
1792+ id="guide4076"
1793+ inkscape:locked="false" />
1794+ <sodipodi:guide
1795+ orientation="0,1"
1796+ position="-5,12"
1797+ id="guide4078"
1798+ inkscape:locked="false" />
1799+ <sodipodi:guide
1800+ orientation="1,0"
1801+ position="84,-9.0000001"
1802+ id="guide4080"
1803+ inkscape:locked="false" />
1804+ <sodipodi:guide
1805+ position="48,-8.0000001"
1806+ orientation="1,0"
1807+ id="guide4170"
1808+ inkscape:locked="false" />
1809+ <sodipodi:guide
1810+ position="-8,48"
1811+ orientation="0,1"
1812+ id="guide4172"
1813+ inkscape:locked="false" />
1814+ </sodipodi:namedview>
1815+ <metadata
1816+ id="metadata4879">
1817+ <rdf:RDF>
1818+ <cc:Work
1819+ rdf:about="">
1820+ <dc:format>image/svg+xml</dc:format>
1821+ <dc:type
1822+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
1823+ <dc:title />
1824+ </cc:Work>
1825+ </rdf:RDF>
1826+ </metadata>
1827+ <g
1828+ inkscape:label="Layer 1"
1829+ inkscape:groupmode="layer"
1830+ id="layer1"
1831+ transform="translate(67.857146,-78.50504)">
1832+ <g
1833+ transform="matrix(0,-1,-1,0,373.50506,516.50504)"
1834+ id="g4845"
1835+ style="display:inline">
1836+ <g
1837+ inkscape:export-ydpi="90"
1838+ inkscape:export-xdpi="90"
1839+ inkscape:export-filename="next01.png"
1840+ transform="matrix(-0.9996045,0,0,1,575.94296,-611.00001)"
1841+ id="g4778"
1842+ inkscape:label="Layer 1">
1843+ <g
1844+ transform="matrix(-1,0,0,1,575.99999,611)"
1845+ id="g4780"
1846+ style="display:inline">
1847+ <rect
1848+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:4;marker:none;enable-background:accumulate"
1849+ id="rect4782"
1850+ width="96.037987"
1851+ height="96"
1852+ x="-438.00244"
1853+ y="345.36221"
1854+ transform="scale(-1,1)" />
1855+ <path
1856+ 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+ 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+ transform="matrix(0,-1,-1.0003957,0,438.00245,441.36222)"
1859+ id="path4218"
1860+ inkscape:connector-curvature="0"
1861+ sodipodi:nodetypes="ccccccccccccccccc" />
1862+ </g>
1863+ </g>
1864+ </g>
1865+ </g>
1866+</svg>
1867
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+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
1873+<!-- Created with Inkscape (http://www.inkscape.org/) -->
1874+
1875+<svg
1876+ xmlns:dc="http://purl.org/dc/elements/1.1/"
1877+ xmlns:cc="http://creativecommons.org/ns#"
1878+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
1879+ xmlns:svg="http://www.w3.org/2000/svg"
1880+ xmlns="http://www.w3.org/2000/svg"
1881+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
1882+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
1883+ width="96"
1884+ height="96"
1885+ id="svg4874"
1886+ version="1.1"
1887+ inkscape:version="0.91+devel r"
1888+ viewBox="0 0 96 96.000001"
1889+ sodipodi:docname="keyboard-caps-enabled.svg">
1890+ <defs
1891+ id="defs4876" />
1892+ <sodipodi:namedview
1893+ id="base"
1894+ pagecolor="#ffffff"
1895+ bordercolor="#666666"
1896+ borderopacity="1.0"
1897+ inkscape:pageopacity="0.0"
1898+ inkscape:pageshadow="2"
1899+ inkscape:zoom="5.6199992"
1900+ inkscape:cx="36.912809"
1901+ inkscape:cy="16.645887"
1902+ inkscape:document-units="px"
1903+ inkscape:current-layer="g4780"
1904+ showgrid="true"
1905+ showborder="true"
1906+ fit-margin-top="0"
1907+ fit-margin-left="0"
1908+ fit-margin-right="0"
1909+ fit-margin-bottom="0"
1910+ inkscape:snap-bbox="true"
1911+ inkscape:bbox-paths="true"
1912+ inkscape:bbox-nodes="true"
1913+ inkscape:snap-bbox-edge-midpoints="true"
1914+ inkscape:snap-bbox-midpoints="true"
1915+ inkscape:object-paths="true"
1916+ inkscape:snap-intersection-paths="true"
1917+ inkscape:object-nodes="true"
1918+ inkscape:snap-smooth-nodes="false"
1919+ inkscape:snap-midpoints="true"
1920+ inkscape:snap-object-midpoints="true"
1921+ inkscape:snap-center="true"
1922+ showguides="true"
1923+ inkscape:guide-bbox="true"
1924+ inkscape:snap-others="false">
1925+ <inkscape:grid
1926+ type="xygrid"
1927+ id="grid5451"
1928+ empspacing="8" />
1929+ <sodipodi:guide
1930+ orientation="1,0"
1931+ position="8,-8.0000001"
1932+ id="guide4063"
1933+ inkscape:locked="false" />
1934+ <sodipodi:guide
1935+ orientation="1,0"
1936+ position="4,-8.0000001"
1937+ id="guide4065"
1938+ inkscape:locked="false" />
1939+ <sodipodi:guide
1940+ orientation="0,1"
1941+ position="-8,88.000001"
1942+ id="guide4067"
1943+ inkscape:locked="false" />
1944+ <sodipodi:guide
1945+ orientation="0,1"
1946+ position="-8,92.000001"
1947+ id="guide4069"
1948+ inkscape:locked="false" />
1949+ <sodipodi:guide
1950+ orientation="0,1"
1951+ position="104,4"
1952+ id="guide4071"
1953+ inkscape:locked="false" />
1954+ <sodipodi:guide
1955+ orientation="0,1"
1956+ position="-5,8.0000001"
1957+ id="guide4073"
1958+ inkscape:locked="false" />
1959+ <sodipodi:guide
1960+ orientation="1,0"
1961+ position="92,-8.0000001"
1962+ id="guide4075"
1963+ inkscape:locked="false" />
1964+ <sodipodi:guide
1965+ orientation="1,0"
1966+ position="88,-8.0000001"
1967+ id="guide4077"
1968+ inkscape:locked="false" />
1969+ <sodipodi:guide
1970+ orientation="0,1"
1971+ position="-8,84.000001"
1972+ id="guide4074"
1973+ inkscape:locked="false" />
1974+ <sodipodi:guide
1975+ orientation="1,0"
1976+ position="12,-8.0000001"
1977+ id="guide4076"
1978+ inkscape:locked="false" />
1979+ <sodipodi:guide
1980+ orientation="0,1"
1981+ position="-5,12"
1982+ id="guide4078"
1983+ inkscape:locked="false" />
1984+ <sodipodi:guide
1985+ orientation="1,0"
1986+ position="84,-9.0000001"
1987+ id="guide4080"
1988+ inkscape:locked="false" />
1989+ <sodipodi:guide
1990+ position="48,-8.0000001"
1991+ orientation="1,0"
1992+ id="guide4170"
1993+ inkscape:locked="false" />
1994+ <sodipodi:guide
1995+ position="-8,48"
1996+ orientation="0,1"
1997+ id="guide4172"
1998+ inkscape:locked="false" />
1999+ </sodipodi:namedview>
2000+ <metadata
2001+ id="metadata4879">
2002+ <rdf:RDF>
2003+ <cc:Work
2004+ rdf:about="">
2005+ <dc:format>image/svg+xml</dc:format>
2006+ <dc:type
2007+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
2008+ <dc:title />
2009+ </cc:Work>
2010+ </rdf:RDF>
2011+ </metadata>
2012+ <g
2013+ inkscape:label="Layer 1"
2014+ inkscape:groupmode="layer"
2015+ id="layer1"
2016+ transform="translate(67.857146,-78.50504)">
2017+ <g
2018+ transform="matrix(0,-1,-1,0,373.50506,516.50504)"
2019+ id="g4845"
2020+ style="display:inline">
2021+ <g
2022+ inkscape:export-ydpi="90"
2023+ inkscape:export-xdpi="90"
2024+ inkscape:export-filename="next01.png"
2025+ transform="matrix(-0.9996045,0,0,1,575.94296,-611.00001)"
2026+ id="g4778"
2027+ inkscape:label="Layer 1">
2028+ <g
2029+ transform="matrix(-1,0,0,1,575.99999,611)"
2030+ id="g4780"
2031+ style="display:inline">
2032+ <rect
2033+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:4;marker:none;enable-background:accumulate"
2034+ id="rect4782"
2035+ width="96.037987"
2036+ height="96"
2037+ x="-438.00244"
2038+ y="345.36221"
2039+ transform="scale(-1,1)" />
2040+ <path
2041+ 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+ 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+ id="path4218"
2044+ inkscape:connector-curvature="0"
2045+ inkscape:transform-center-x="8.7500002e-06"
2046+ inkscape:transform-center-y="36.503129"
2047+ sodipodi:nodetypes="cccccccccc" />
2048+ </g>
2049+ </g>
2050+ </g>
2051+ </g>
2052+</svg>
2053
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+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2059+<!-- Created with Inkscape (http://www.inkscape.org/) -->
2060+
2061+<svg
2062+ xmlns:dc="http://purl.org/dc/elements/1.1/"
2063+ xmlns:cc="http://creativecommons.org/ns#"
2064+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
2065+ xmlns:svg="http://www.w3.org/2000/svg"
2066+ xmlns="http://www.w3.org/2000/svg"
2067+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
2068+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
2069+ width="96"
2070+ height="96"
2071+ id="svg4874"
2072+ version="1.1"
2073+ inkscape:version="0.91+devel r"
2074+ viewBox="0 0 96 96.000001"
2075+ sodipodi:docname="keyboard-caps-locked.svg">
2076+ <defs
2077+ id="defs4876" />
2078+ <sodipodi:namedview
2079+ id="base"
2080+ pagecolor="#ffffff"
2081+ bordercolor="#666666"
2082+ borderopacity="1.0"
2083+ inkscape:pageopacity="0.0"
2084+ inkscape:pageshadow="2"
2085+ inkscape:zoom="10.976561"
2086+ inkscape:cx="18.398291"
2087+ inkscape:cy="25.558996"
2088+ inkscape:document-units="px"
2089+ inkscape:current-layer="g4780"
2090+ showgrid="true"
2091+ showborder="true"
2092+ fit-margin-top="0"
2093+ fit-margin-left="0"
2094+ fit-margin-right="0"
2095+ fit-margin-bottom="0"
2096+ inkscape:snap-bbox="true"
2097+ inkscape:bbox-paths="true"
2098+ inkscape:bbox-nodes="true"
2099+ inkscape:snap-bbox-edge-midpoints="true"
2100+ inkscape:snap-bbox-midpoints="true"
2101+ inkscape:object-paths="true"
2102+ inkscape:snap-intersection-paths="true"
2103+ inkscape:object-nodes="true"
2104+ inkscape:snap-smooth-nodes="false"
2105+ inkscape:snap-midpoints="true"
2106+ inkscape:snap-object-midpoints="true"
2107+ inkscape:snap-center="true"
2108+ showguides="true"
2109+ inkscape:guide-bbox="true"
2110+ inkscape:snap-others="false">
2111+ <inkscape:grid
2112+ type="xygrid"
2113+ id="grid5451"
2114+ empspacing="8" />
2115+ <sodipodi:guide
2116+ orientation="1,0"
2117+ position="8,-8.0000001"
2118+ id="guide4063"
2119+ inkscape:locked="false" />
2120+ <sodipodi:guide
2121+ orientation="1,0"
2122+ position="4,-8.0000001"
2123+ id="guide4065"
2124+ inkscape:locked="false" />
2125+ <sodipodi:guide
2126+ orientation="0,1"
2127+ position="-8,88.000001"
2128+ id="guide4067"
2129+ inkscape:locked="false" />
2130+ <sodipodi:guide
2131+ orientation="0,1"
2132+ position="-8,92.000001"
2133+ id="guide4069"
2134+ inkscape:locked="false" />
2135+ <sodipodi:guide
2136+ orientation="0,1"
2137+ position="104,4"
2138+ id="guide4071"
2139+ inkscape:locked="false" />
2140+ <sodipodi:guide
2141+ orientation="0,1"
2142+ position="-5,8.0000001"
2143+ id="guide4073"
2144+ inkscape:locked="false" />
2145+ <sodipodi:guide
2146+ orientation="1,0"
2147+ position="92,-8.0000001"
2148+ id="guide4075"
2149+ inkscape:locked="false" />
2150+ <sodipodi:guide
2151+ orientation="1,0"
2152+ position="88,-8.0000001"
2153+ id="guide4077"
2154+ inkscape:locked="false" />
2155+ <sodipodi:guide
2156+ orientation="0,1"
2157+ position="-8,84.000001"
2158+ id="guide4074"
2159+ inkscape:locked="false" />
2160+ <sodipodi:guide
2161+ orientation="1,0"
2162+ position="12,-8.0000001"
2163+ id="guide4076"
2164+ inkscape:locked="false" />
2165+ <sodipodi:guide
2166+ orientation="0,1"
2167+ position="-5,12"
2168+ id="guide4078"
2169+ inkscape:locked="false" />
2170+ <sodipodi:guide
2171+ orientation="1,0"
2172+ position="84,-9.0000001"
2173+ id="guide4080"
2174+ inkscape:locked="false" />
2175+ <sodipodi:guide
2176+ position="48,-8.0000001"
2177+ orientation="1,0"
2178+ id="guide4170"
2179+ inkscape:locked="false" />
2180+ <sodipodi:guide
2181+ position="-8,48"
2182+ orientation="0,1"
2183+ id="guide4172"
2184+ inkscape:locked="false" />
2185+ </sodipodi:namedview>
2186+ <metadata
2187+ id="metadata4879">
2188+ <rdf:RDF>
2189+ <cc:Work
2190+ rdf:about="">
2191+ <dc:format>image/svg+xml</dc:format>
2192+ <dc:type
2193+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
2194+ <dc:title />
2195+ </cc:Work>
2196+ </rdf:RDF>
2197+ </metadata>
2198+ <g
2199+ inkscape:label="Layer 1"
2200+ inkscape:groupmode="layer"
2201+ id="layer1"
2202+ transform="translate(67.857146,-78.50504)">
2203+ <g
2204+ transform="matrix(0,-1,-1,0,373.50506,516.50504)"
2205+ id="g4845"
2206+ style="display:inline">
2207+ <g
2208+ inkscape:export-ydpi="90"
2209+ inkscape:export-xdpi="90"
2210+ inkscape:export-filename="next01.png"
2211+ transform="matrix(-0.9996045,0,0,1,575.94296,-611.00001)"
2212+ id="g4778"
2213+ inkscape:label="Layer 1">
2214+ <g
2215+ transform="matrix(-1,0,0,1,575.99999,611)"
2216+ id="g4780"
2217+ style="display:inline">
2218+ <rect
2219+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:4;marker:none;enable-background:accumulate"
2220+ id="rect4782"
2221+ width="96.037987"
2222+ height="96"
2223+ x="-438.00244"
2224+ y="345.36221"
2225+ transform="scale(-1,1)" />
2226+ <path
2227+ 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+ 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+ id="path4218"
2230+ inkscape:connector-curvature="0"
2231+ inkscape:transform-center-x="8.7500002e-06"
2232+ inkscape:transform-center-y="36.503129"
2233+ sodipodi:nodetypes="cccccccccc" />
2234+ <path
2235+ 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+ d="m 345.9668,377.36133 v 32 h 4 v -32 z"
2237+ id="path4250"
2238+ inkscape:connector-curvature="0" />
2239+ </g>
2240+ </g>
2241+ </g>
2242+ </g>
2243+</svg>
2244
2245=== added file 'qml/images/keyboard_spacebar@27.png'
2246Binary 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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2252 */
2253
2254-import QtQuick 2.0
2255+import QtQuick 2.4
2256
2257-import Ubuntu.Components 0.1
2258+import Ubuntu.Components 1.3
2259
2260 import "key_constants.js" as UI
2261
2262@@ -26,6 +26,10 @@
2263 property string iconShifted: ""
2264 property string iconCapsLock: ""
2265
2266+ property string iconSourceNormal: ""
2267+ property string iconSourceShifted: ""
2268+ property string iconSourceCapsLock: ""
2269+
2270 noMagnifier: true
2271 skipAutoCaps: true
2272 property int padding: UI.actionKeyPadding
2273@@ -33,8 +37,8 @@
2274 // action keys are a bit wider
2275 width: panel.keyWidth + units.gu( padding )
2276
2277- imgNormal: UI.imageActionKey
2278- imgPressed: UI.imageActionKeyPressed
2279+ normalColor: UI.actionKeyColor
2280+ pressedColor: UI.actionKeyPressedColor
2281
2282 // can be overwritten by keys
2283 property color colorNormal: UI.fontColor
2284@@ -52,14 +56,15 @@
2285
2286 Icon {
2287 id: iconImage
2288- name: actionKeyRoot.iconNormal
2289+ source: iconSourceNormal !== "" ? iconSourceNormal
2290+ : iconNormal ? "image://theme/%1".arg(iconNormal)
2291+ : ""
2292 color: actionKeyRoot.colorNormal
2293 anchors.centerIn: parent
2294- anchors.verticalCenterOffset: fullScreenItem.landscape ? -units.dp( UI.keyMargins ) : -units.gu(UI.row_margin/2) - units.gu(0.15)
2295-
2296+ anchors.verticalCenterOffset: -actionKeyRoot.rowMargin / 2 - units.gu(0.15)
2297 visible: (label == "")
2298- width: units.gu(2.5)
2299- height: units.gu(2.5)
2300+ height: actionKeyRoot.fontSize
2301+ width: height
2302 }
2303 }
2304
2305@@ -70,7 +75,9 @@
2306 name: "SHIFTED"
2307 PropertyChanges {
2308 target: iconImage
2309- name: actionKeyRoot.iconShifted
2310+ source: iconSourceShifted !== "" ? iconSourceShifted
2311+ : iconShifted ? "image://theme/%1".arg(iconShifted)
2312+ : ""
2313 color: actionKeyRoot.colorShifted
2314 }
2315 },
2316@@ -78,7 +85,9 @@
2317 name: "CAPSLOCK"
2318 PropertyChanges {
2319 target: iconImage
2320- name: actionKeyRoot.iconCapsLock
2321+ source: iconSourceCapsLock !== "" ? iconSourceCapsLock
2322+ : iconCapsLock ? "image://theme/%1".arg(iconCapsLock)
2323+ : ""
2324 color: actionKeyRoot.colorCapsLock
2325 }
2326 }
2327
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2333 */
2334
2335-import QtQuick 2.0
2336+import QtQuick 2.4
2337
2338 ActionKey {
2339 iconNormal: "erase";
2340
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 property bool leftSide: false
2346 property bool rightSide: false
2347
2348+ property double rowMargin: fullScreenItem.tablet ? units.gu(UI.tabletRowMargin)
2349+ : (fullScreenItem.landscape ? units.dp(UI.phoneRowMarginLandscape)
2350+ : units.dp(UI.phoneRowMarginPortrait))
2351+ property double keyMargin: fullScreenItem.tablet ? units.gu(UI.tabletKeyMargins)
2352+ : units.gu(UI.phoneKeyMargins)
2353+
2354 // These properties are used by autopilot to determine the visible
2355 // portion of the key to press
2356- readonly property double leftOffset: buttonImage.anchors.leftMargin
2357- readonly property double rightOffset: buttonImage.anchors.rightMargin
2358+ readonly property double leftOffset: buttonRect.anchors.leftMargin
2359+ readonly property double rightOffset: buttonRect.anchors.rightMargin
2360
2361 /* design */
2362- property string imgNormal: UI.imageCharKey
2363- property string imgPressed: UI.imageCharKeyPressed
2364- // fontSize can be overwritten when using the component, e.g. SymbolShiftKey uses smaller fontSize
2365- property int fontSize: units.gu( UI.fontSize );
2366+ property string normalColor: UI.charKeyColor
2367+ property string pressedColor: UI.charKeyPressedColor
2368+ // Scale the font so the label fits if a long word is set
2369+ property int fontSize: (fullScreenItem.landscape ? (height / 2) : (height / 2.8))
2370+ * (4 / (label.length >= 2 ? (label.length <= 6 ? label.length + 2 : 8) : 4));
2371
2372 /// annotation shows a small label in the upper right corner
2373 // 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 height: panel.keyHeight
2376 width: parent.width
2377
2378- BorderImage {
2379- id: buttonImage
2380+ Rectangle {
2381+ id: buttonRect
2382+ color: key.currentlyPressed || key.highlight ? pressedColor : normalColor
2383 anchors.fill: parent
2384- anchors.leftMargin: key.leftSide ? (parent.width - panel.keyWidth) + units.dp(UI.keyMargins) : units.dp(UI.keyMargins)
2385- anchors.rightMargin: key.rightSide ? (parent.width - panel.keyWidth) + units.dp(UI.keyMargins) : units.dp(UI.keyMargins)
2386- anchors.bottomMargin: fullScreenItem.landscape ? units.dp( UI.keyMargins ) * 2 : units.gu(UI.row_margin);
2387- source: key.imgNormal
2388-
2389- BorderImage {
2390- anchors.fill: parent
2391- visible: key.currentlyPressed || key.highlight
2392- source: key.imgPressed
2393- }
2394+ anchors.leftMargin: key.leftSide ? (parent.width - panel.keyWidth) + key.keyMargin : key.keyMargin
2395+ anchors.rightMargin: key.rightSide ? (parent.width - panel.keyWidth) + key.keyMargin : key.keyMargin
2396+ anchors.bottomMargin: key.rowMargin
2397+ radius: units.dp(4)
2398
2399 /// label of the key
2400 // the label is also the value subitted to the app
2401@@ -141,7 +143,7 @@
2402 text: (panel.activeKeypadState === "NORMAL") ? label : shifted;
2403 font.family: UI.fontFamily
2404 font.pixelSize: fontSize
2405- font.bold: UI.fontBold
2406+ font.weight: Font.Light
2407 color: UI.fontColor
2408 anchors.right: parent.right
2409 anchors.left: parent.left
2410@@ -150,7 +152,8 @@
2411 anchors.verticalCenter: parent.verticalCenter
2412 anchors.verticalCenterOffset: -units.gu(0.15)
2413 horizontalAlignment: Text.AlignHCenter
2414- elide: Text.ElideRight
2415+ // Avoid eliding characters that are slightly too wide (e.g. some emoji)
2416+ elide: text.length <= 2 ? Text.ElideNone : Text.ElideRight
2417 }
2418
2419 /// shows an annotation
2420@@ -164,9 +167,9 @@
2421 anchors.top: parent.top
2422 anchors.topMargin: units.gu(UI.annotationTopMargin)
2423 anchors.rightMargin: units.gu(UI.annotationRightMargin)
2424-
2425- font.pixelSize: units.gu( UI.annotationFontSize )
2426- font.bold: false
2427+ font.family: UI.annotationFont
2428+ font.pixelSize: fullScreenItem.tablet ? units.dp(UI.tabletAnnotationFontSize) : units.dp(UI.phoneAnnotationFontSize)
2429+ font.weight: Font.Light
2430 color: UI.annotationFontColor
2431 }
2432
2433
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
2439 // from qt-components/desktop
2440
2441-import QtQuick 2.0
2442+import QtQuick 2.4
2443
2444 ShaderEffect {
2445 id: effect
2446
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 import Ubuntu.Components.ListItems 1.3 as ListItem
2452 import Ubuntu.Components.Popups 1.3
2453
2454-import QtQuick.Window 2.0
2455-
2456 import "key_constants.js" as UI
2457
2458 KeyPopover {
2459@@ -118,8 +116,8 @@
2460 text: modelData
2461 font.family: UI.fontFamily
2462 font.pixelSize: text.length > 2 ? units.gu( UI.smallFontSize ) : units.gu( UI.fontSize )
2463- font.bold: UI.fontBold
2464- color: key.highlight ? UbuntuColors.orange : UI.fontColor
2465+ font.weight: Font.Light
2466+ color: key.highlight ? UI.selectionColor : UI.fontColor
2467 Component.onCompleted: __width += (textCell.width + units.gu( UI.popoverCellPadding));
2468 }
2469
2470
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2476 */
2477
2478-import QtQuick 2.0
2479+import QtQuick 2.4
2480
2481 Item {
2482 id: keyPadRoot
2483
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2489 */
2490
2491-import QtQuick 2.0
2492+import QtQuick 2.4
2493
2494 ActionKey {
2495 iconNormal: "language-chooser";
2496
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 import Ubuntu.Components.ListItems 1.3 as ListItem
2502
2503 import "key_constants.js" as UI
2504+import "languages.js" as Languages
2505
2506 Item {
2507
2508@@ -50,7 +51,7 @@
2509 model: maliit_input_method.enabledLanguages
2510
2511 delegate: ListItem.Standard {
2512- text: languageIdToName(modelData)
2513+ text: Languages.languageIdToName(modelData)
2514 showDivider: modelData != maliit_input_method.enabledLanguages[maliit_input_method.enabledLanguages.length - 1]
2515 control: CheckBox {
2516 checked: maliit_input_method.activeLanguage == modelData
2517@@ -71,7 +72,7 @@
2518 Component {
2519 id: settingsComp
2520 Column {
2521- width: parent.width
2522+ width: menuList.width
2523 height: settingsItem.height + settingsDiv.height * 2
2524 ListItem.ThinDivider { id: settingsDiv }
2525 ListItem.ThinDivider { }
2526@@ -90,41 +91,4 @@
2527 footer: greeter_status.greeterActive ? null : settingsComp
2528 }
2529
2530- function languageIdToName(languageId)
2531- {
2532- if (languageId == "ar") return i18n.tr("Arabic");
2533- if (languageId == "az") return i18n.tr("Azerbaijani");
2534- if (languageId == "bs") return i18n.tr("Bosnian");
2535- if (languageId == "ca") return i18n.tr("Catalan");
2536- if (languageId == "cs") return i18n.tr("Czech");
2537- if (languageId == "da") return i18n.tr("Danish");
2538- if (languageId == "de") return i18n.tr("German");
2539- if (languageId == "emoji") return i18n.tr("Emoji");
2540- if (languageId == "el") return i18n.tr("Greek");
2541- if (languageId == "en") return i18n.tr("English");
2542- if (languageId == "es") return i18n.tr("Spanish");
2543- if (languageId == "fi") return i18n.tr("Finnish");
2544- if (languageId == "fr") return i18n.tr("French");
2545- if (languageId == "gd") return i18n.tr("Scottish Gaelic");
2546- if (languageId == "he") return i18n.tr("Hebrew");
2547- if (languageId == "hr") return i18n.tr("Croatian");
2548- if (languageId == "hu") return i18n.tr("Hungarian");
2549- if (languageId == "is") return i18n.tr("Icelandic");
2550- if (languageId == "it") return i18n.tr("Italian");
2551- if (languageId == "nl") return i18n.tr("Dutch");
2552- if (languageId == "nb") return i18n.tr("Norwegian");
2553- if (languageId == "pl") return i18n.tr("Polish");
2554- if (languageId == "pt") return i18n.tr("Portuguese");
2555- if (languageId == "ro") return i18n.tr("Romanian");
2556- if (languageId == "ru") return i18n.tr("Russian");
2557- if (languageId == "sl") return i18n.tr("Slovenian");
2558- if (languageId == "sr") return i18n.tr("Serbian");
2559- if (languageId == "sv") return i18n.tr("Swedish");
2560- if (languageId == "uk") return i18n.tr("Ukrainian");
2561- if (languageId == "zh") return i18n.tr("Chinese - Pinyin");
2562-
2563- // fallback
2564- return languageId.charAt(0).toUpperCase() + languageId.slice(1);
2565- }
2566-
2567 }
2568
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2574 */
2575
2576-import QtQuick 2.0
2577+import QtQuick 2.4
2578 import "key_constants.js" as UI
2579
2580 /*!
2581@@ -83,8 +83,8 @@
2582 anchors.centerIn: parent
2583 text: currentlyAssignedKey ? currentlyAssignedKey.valueToSubmit : ""
2584 font.family: UI.fontFamily
2585+ font.weight: Font.Light
2586 font.pixelSize: units.gu( UI.fontSizeMagnified )
2587- font.bold: UI.fontBold
2588 color: UI.fontColor
2589 }
2590
2591
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2597 */
2598
2599-import QtQuick 2.0
2600+import QtQuick 2.4
2601
2602 ActionKey {
2603- iconNormal: "../images/icon_shift@18.png";
2604- iconShifted: "../images/icon_shift_upsidedown@18.png";
2605- iconCapsLock: "../images/icon_shift_white@18.png";
2606 action: "shift"
2607 overridePressArea: true
2608
2609
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2615 */
2616
2617-import QtQuick 2.0
2618+import QtQuick 2.4
2619
2620 /*!
2621 MultiPointTouchArea is similar to the MouseArea
2622
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2628 */
2629
2630-import QtQuick 2.0
2631+import QtQuick 2.4
2632 import "key_constants.js" as UI
2633
2634 ActionKey {
2635@@ -25,11 +25,9 @@
2636 enabled: actionKeyOverride ? actionKeyOverride.enabled : true
2637 // overrideIcon has high priority over label
2638 label: overrideIconName == "" ? overrideLabel : ""
2639- // Scale the font so the label fits if a long word is set
2640- fontSize: units.gu(UI.symbolShiftKeyFontSize) * (4 / (label.length >= 4 ? (label.length <= 6 ? label.length : 6) : 4));
2641 shifted: label
2642
2643- iconNormal: (overrideIconName == "") && (overrideLabel == "") ? "keyboard-return" : overrideIconName
2644+ iconNormal: (overrideIconName == "") && (overrideLabel == "") ? "keyboard-enter" : overrideIconName
2645 iconShifted: iconNormal
2646 iconCapsLock: iconNormal
2647
2648
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 import QtQuick 2.4
2654 import Ubuntu.Components 1.3
2655
2656+import "key_constants.js" as UI
2657+
2658 ActionKey {
2659- iconNormal: "keyboard-caps"
2660- iconShifted: "keyboard-caps-active"
2661- iconCapsLock: "keyboard-caps-lock"
2662-
2663- // XXX: Disabled due to problems with coloring - see LP: #1251285 for details
2664- // colorShifted: UbuntuColors.orange
2665+ iconSourceNormal: "../images/keyboard-caps-disabled.svg"
2666+ iconSourceShifted: "../images/keyboard-caps-enabled.svg"
2667+ iconSourceCapsLock: "../images/keyboard-caps-locked.svg"
2668
2669 action: "shift"
2670
2671
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+/*
2677+ * Copyright 2013 Canonical Ltd.
2678+ *
2679+ * This program is free software; you can redistribute it and/or modify
2680+ * it under the terms of the GNU Lesser General Public License as published by
2681+ * the Free Software Foundation; version 3.
2682+ *
2683+ * This program is distributed in the hope that it will be useful,
2684+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
2685+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2686+ * GNU Lesser General Public License for more details.
2687+ *
2688+ * You should have received a copy of the GNU Lesser General Public License
2689+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
2690+ */
2691+
2692+import QtQuick 2.4
2693+import Ubuntu.Components 1.3
2694+
2695+import "key_constants.js" as UI
2696+import "languages.js" as Languages
2697+
2698+ActionKey {
2699+ normalColor: UI.charKeyColor
2700+ pressedColor: UI.charKeyPressedColor
2701+
2702+ Image {
2703+ anchors.centerIn: parent
2704+ source: "../images/keyboard_spacebar.png"
2705+ }
2706+
2707+ action: "space"
2708+ switchBackFromSymbols: true
2709+}
2710
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2716 */
2717
2718-import QtQuick 2.0
2719+import QtQuick 2.4
2720+import Ubuntu.Components 1.3
2721
2722 import "key_constants.js" as UI
2723+import "languages.js" as Languages
2724
2725 ActionKey {
2726 label: " ";
2727 shifted: " ";
2728
2729- imgNormal: UI.imageCharKey
2730- imgPressed: UI.imageCharKeyPressed
2731+ normalColor: UI.charKeyColor
2732+ pressedColor: UI.charKeyPressedColor
2733
2734 action: "space"
2735 switchBackFromSymbols: true
2736+
2737+ Label {
2738+ anchors.centerIn: parent
2739+ anchors.verticalCenterOffset: -parent.rowMargin / 2 - units.gu(0.15)
2740+ font.family: UI.spaceFontFamily
2741+ font.weight: Font.Light
2742+ fontSize: fullScreenItem.tablet ? UI.tabletSpaceFontSize : UI.phoneSpaceFontSize
2743+ opacity: UI.spaceOpacity
2744+ text: Languages.languageIdToName(maliit_input_method.activeLanguage)
2745+ }
2746 }
2747
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2753 */
2754
2755-import QtQuick 2.0
2756+import QtQuick 2.4
2757
2758 /**
2759 * an invisible spacer the size of a regular key.
2760
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2766 */
2767
2768-import QtQuick 2.0
2769+import QtQuick 2.4
2770
2771 import "key_constants.js" as UI
2772
2773@@ -23,8 +23,6 @@
2774 shifted: "?123";
2775 action: "symbols";
2776
2777- fontSize: units.gu(UI.symbolShiftKeyFontSize);
2778-
2779 overridePressArea: true;
2780
2781 onPressed: {
2782
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2788 */
2789
2790-import QtQuick 2.0
2791+import QtQuick 2.4
2792 import "../keys/key_constants.js" as UI
2793
2794 CharKey {
2795@@ -23,5 +23,4 @@
2796 label: ".com";
2797 shifted: label
2798 extendedShifted: extended
2799- fontSize: units.gu(UI.smallFontSize);
2800 }
2801
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
2807 .pragma library
2808
2809-var keyMargins = 1.8; // dp
2810+var tabletKeyMargins = 0.5; // gu
2811+var phoneKeyMargins = 0.25 // gu
2812 var fontSize = 2.5; // gu
2813 var fontSizeMagnified = 4; // gu
2814 var fontFamily = "Ubuntu";
2815-var fontColor = "#5d5d5d"
2816-var fontBold = false
2817-
2818-var backgroundColor = "#f1f1f1"
2819-
2820-var annotationFontSize = 0.85; // gu
2821+var fontColor = "#333333";
2822+var fontBold = false;
2823+var selectionColor = "#19B6EE";
2824+
2825+var backgroundColor = "#f7f7f7";
2826+var dividerColor = "#cdcdcd";
2827+
2828+var tabletAnnotationFontSize = 10; // dp
2829+var phoneAnnotationFontSize = 10; // dp
2830 var annotationTopMargin = 0.35; // gu
2831 var annotationRightMargin = 0.65; // gu
2832-var annotationFontColor = "#5d5d5d"
2833+var annotationFontColor = "#333333";
2834+var annotationFont = "Ubuntu";
2835+
2836+var spaceFontFamily = "Ubuntu";
2837+var tabletSpaceFontSize = "large";
2838+var phoneSpaceFontSize = "small";
2839+var spaceOpacity = 0.33;
2840
2841 /* magnifier */
2842 var magnifierHorizontalPadding = 1.8; // gu, stretch the magnifier a little bit in x-axis
2843@@ -45,15 +55,17 @@
2844 var popoverEdgeMargin = 2.2; // gu
2845 var popoverSquat = 3; // gu, when no wordribbon, avoid click-through above input trap
2846
2847-var imageCharKey = "../images/white_key.sci"
2848-var imageCharKeyPressed = "../images/grey_key.sci"
2849-
2850-var imageActionKey = "../images/action_key.sci"
2851-var imageActionKeyPressed = "../images/grey_key.sci"
2852-
2853-var top_margin = 1.35; // gu
2854+var charKeyColor = "white"
2855+var charKeyPressedColor = "#d9d9d9"
2856+
2857+var actionKeyColor = "#cdcdcd"
2858+var actionKeyPressedColor = "#aeaeae"
2859+
2860+var top_margin = 1; // gu
2861 var bottom_margin = 0; // gu
2862-var row_margin = 1.5; // gu
2863+var tabletRowMargin = 1; // gu
2864+var phoneRowMarginLandscape = 4; // dp
2865+var phoneRowMarginPortrait = 7; // dp
2866
2867 var urlLayoutLeftSpacerSize = 5; // gu
2868 var emailLayoutUrlKeyPadding = 1.5; // gu
2869@@ -61,10 +73,13 @@
2870 /* language menu */
2871 var languageMenuListViewPadding = 2.22; // gu
2872
2873-var wordribbonHeight = 3; // gu
2874-
2875-var phoneKeyboardHeightPortrait = 0.41;
2876-var phoneKeyboardHeightLandscape = 0.50;
2877-
2878-var tabletKeyboardHeightPortrait = 0.28;
2879-var tabletKeyboardHeightLandscape = 0.38;
2880+var tabletWordribbonHeight = 6; // gu
2881+var phoneWordribbonHeight = 4; // gu
2882+var tabletWordRibbonFontSize = 17 // dp
2883+var phoneWordRibbonFontSize = 14 // dp
2884+
2885+var phoneKeyboardHeightPortrait = 0.40; // percent of screen
2886+var phoneKeyboardHeightLandscape = 0.49; // percent of screen
2887+
2888+var tabletKeyboardHeightPortrait = 0.39; // percent of screen
2889+var tabletKeyboardHeightLandscape = 0.42; // percent of screen
2890
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+/*
2896+ * Copyright 2016 Canonical Ltd.
2897+ *
2898+ * This program is free software; you can redistribute it and/or modify
2899+ * it under the terms of the GNU General Public License as published by
2900+ * the Free Software Foundation; version 3.
2901+ *
2902+ * This program is distributed in the hope that it will be useful,
2903+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
2904+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2905+ * GNU General Public License for more details.
2906+ *
2907+ * You should have received a copy of the GNU General Public License
2908+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
2909+ */
2910+
2911+function languageIdToName(languageId)
2912+{
2913+ if (languageId == "ar") return i18n.tr("Arabic");
2914+ if (languageId == "az") return i18n.tr("Azerbaijani");
2915+ if (languageId == "bs") return i18n.tr("Bosnian");
2916+ if (languageId == "ca") return i18n.tr("Catalan");
2917+ if (languageId == "cs") return i18n.tr("Czech");
2918+ if (languageId == "da") return i18n.tr("Danish");
2919+ if (languageId == "de") return i18n.tr("German");
2920+ if (languageId == "emoji") return i18n.tr("Emoji");
2921+ if (languageId == "el") return i18n.tr("Greek");
2922+ if (languageId == "en") return i18n.tr("English");
2923+ if (languageId == "es") return i18n.tr("Spanish");
2924+ if (languageId == "fi") return i18n.tr("Finnish");
2925+ if (languageId == "fr") return i18n.tr("French");
2926+ if (languageId == "gd") return i18n.tr("Scottish Gaelic");
2927+ if (languageId == "he") return i18n.tr("Hebrew");
2928+ if (languageId == "hr") return i18n.tr("Croatian");
2929+ if (languageId == "hu") return i18n.tr("Hungarian");
2930+ if (languageId == "is") return i18n.tr("Icelandic");
2931+ if (languageId == "it") return i18n.tr("Italian");
2932+ if (languageId == "nl") return i18n.tr("Dutch");
2933+ if (languageId == "nb") return i18n.tr("Norwegian");
2934+ if (languageId == "pl") return i18n.tr("Polish");
2935+ if (languageId == "pt") return i18n.tr("Portuguese");
2936+ if (languageId == "ro") return i18n.tr("Romanian");
2937+ if (languageId == "ru") return i18n.tr("Russian");
2938+ if (languageId == "sl") return i18n.tr("Slovenian");
2939+ if (languageId == "sr") return i18n.tr("Serbian");
2940+ if (languageId == "sv") return i18n.tr("Swedish");
2941+ if (languageId == "uk") return i18n.tr("Ukrainian");
2942+ if (languageId == "zh") return i18n.tr("Chinese - Pinyin");
2943+
2944+ // fallback
2945+ return languageId.charAt(0).toUpperCase() + languageId.slice(1);
2946+}
2947
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2953 */
2954
2955-import QtQuick 2.0
2956+import QtQuick 2.4
2957 import "../keys"
2958
2959 KeyPad {
2960@@ -26,48 +26,53 @@
2961 Column {
2962 id: c1
2963 anchors.fill: parent
2964- anchors.margins: 0;
2965-
2966- spacing: 0
2967-
2968- Row {
2969- anchors.horizontalCenter: parent.horizontalCenter;
2970- anchors.margins: 50;
2971- spacing: 0
2972-
2973- CharKey { label: "1"; noMagnifier: true; }
2974- CharKey { label: "2"; noMagnifier: true; }
2975- CharKey { label: "3"; noMagnifier: true; }
2976- }
2977-
2978- Row {
2979- anchors.horizontalCenter: parent.horizontalCenter;
2980- anchors.margins: 50;
2981- spacing: 0
2982-
2983- CharKey { label: "4"; noMagnifier: true; }
2984- CharKey { label: "5"; noMagnifier: true; }
2985- CharKey { label: "6"; noMagnifier: true; }
2986- }
2987-
2988- Row {
2989- anchors.horizontalCenter: parent.horizontalCenter;
2990- anchors.margins: 50;
2991- spacing: 0
2992-
2993- CharKey { label: "7"; noMagnifier: true; }
2994- CharKey { label: "8"; noMagnifier: true; }
2995- CharKey { label: "9"; noMagnifier: true; }
2996- }
2997-
2998- Row {
2999- anchors.horizontalCenter: parent.horizontalCenter;
3000- anchors.margins: 50;
3001- spacing: 0
3002-
3003- CharKey { label: "."; extended: ["-", "."]; noMagnifier: true; }
3004- CharKey { label: "0"; noMagnifier: true; }
3005- BackspaceKey { padding: 0; }
3006+ anchors.leftMargin: units.gu(1);
3007+ anchors.rightMargin: units.gu(1);
3008+ anchors.bottomMargin: units.gu(1);
3009+
3010+ property double numKeyWidth: panel.keyWidth - units.gu(0.75);
3011+ property double numKeyHeight: panel.keyHeight - units.gu(1);
3012+
3013+ spacing: units.gu(1);
3014+
3015+ Row {
3016+ anchors.horizontalCenter: parent.horizontalCenter;
3017+ spacing: units.gu(0.5);
3018+
3019+ CharKey { label: "1"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
3020+ CharKey { label: "2"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
3021+ CharKey { label: "3"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
3022+ CharKey { label: "-"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
3023+ }
3024+
3025+ Row {
3026+ anchors.horizontalCenter: parent.horizontalCenter;
3027+ spacing: units.gu(0.5);
3028+
3029+ CharKey { label: "4"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
3030+ CharKey { label: "5"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
3031+ CharKey { label: "6"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
3032+ SmallSpaceKey { padding: 0; width: c1.numKeyWidth; height: c1.numKeyHeight; }
3033+ }
3034+
3035+ Row {
3036+ anchors.horizontalCenter: parent.horizontalCenter;
3037+ spacing: units.gu(0.5);
3038+
3039+ CharKey { label: "7"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
3040+ CharKey { label: "8"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
3041+ CharKey { label: "9"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
3042+ BackspaceKey { padding: 0; width: c1.numKeyWidth; height: c1.numKeyHeight; }
3043+ }
3044+
3045+ Row {
3046+ anchors.horizontalCenter: parent.horizontalCenter;
3047+ spacing: units.gu(0.5);
3048+
3049+ CharKey { label: "+"; annotation: "#*"; extended: ["#", "*"]; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
3050+ CharKey { label: "0"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
3051+ CharKey { label: "."; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
3052+ ReturnKey { padding: 0; width: c1.numKeyWidth; height: c1.numKeyHeight; }
3053 }
3054 } // column
3055 }
3056
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3062 */
3063
3064-import QtQuick 2.0
3065+import QtQuick 2.4
3066 import "../keys"
3067 import "../keys/key_constants.js" as UI
3068
3069
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3075 */
3076
3077-import QtQuick 2.0
3078+import QtQuick 2.4
3079 import "../keys"
3080
3081 KeyPad {
3082@@ -26,48 +26,53 @@
3083 Column {
3084 id: c1
3085 anchors.fill: parent
3086- anchors.margins: 0;
3087-
3088- spacing: 0
3089-
3090- Row {
3091- anchors.horizontalCenter: parent.horizontalCenter;
3092- anchors.margins: 50;
3093- spacing: 0
3094-
3095- CharKey { label: "1"; noMagnifier: true; }
3096- CharKey { label: "2"; noMagnifier: true; }
3097- CharKey { label: "3"; noMagnifier: true; }
3098- }
3099-
3100- Row {
3101- anchors.horizontalCenter: parent.horizontalCenter;
3102- anchors.margins: 50;
3103- spacing: 0
3104-
3105- CharKey { label: "4"; noMagnifier: true; }
3106- CharKey { label: "5"; noMagnifier: true; }
3107- CharKey { label: "6"; noMagnifier: true; }
3108- }
3109-
3110- Row {
3111- anchors.horizontalCenter: parent.horizontalCenter;
3112- anchors.margins: 50;
3113- spacing: 0
3114-
3115- CharKey { label: "7"; noMagnifier: true; }
3116- CharKey { label: "8"; noMagnifier: true; }
3117- CharKey { label: "9"; noMagnifier: true; }
3118- }
3119-
3120- Row {
3121- anchors.horizontalCenter: parent.horizontalCenter;
3122- anchors.margins: 50;
3123- spacing: 0
3124-
3125- CharKey { label: "+"; annotation: "*#"; extended: ["*", "#"]; noMagnifier: true; }
3126- CharKey { label: "0"; noMagnifier: true; }
3127- BackspaceKey { padding: 0; }
3128+ anchors.leftMargin: units.gu(1);
3129+ anchors.rightMargin: units.gu(1);
3130+ anchors.bottomMargin: units.gu(1);
3131+
3132+ property double numKeyWidth: panel.keyWidth - units.gu(0.75);
3133+ property double numKeyHeight: panel.keyHeight - units.gu(1);
3134+
3135+ spacing: units.gu(1);
3136+
3137+ Row {
3138+ anchors.horizontalCenter: parent.horizontalCenter;
3139+ spacing: units.gu(0.5);
3140+
3141+ CharKey { label: "1"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
3142+ CharKey { label: "2"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
3143+ CharKey { label: "3"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
3144+ CharKey { label: "#"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
3145+ }
3146+
3147+ Row {
3148+ anchors.horizontalCenter: parent.horizontalCenter;
3149+ spacing: units.gu(0.5);
3150+
3151+ CharKey { label: "4"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
3152+ CharKey { label: "5"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
3153+ CharKey { label: "6"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
3154+ CharKey { label: "*"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
3155+ }
3156+
3157+ Row {
3158+ anchors.horizontalCenter: parent.horizontalCenter;
3159+ spacing: units.gu(0.5);
3160+
3161+ CharKey { label: "7"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
3162+ CharKey { label: "8"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
3163+ CharKey { label: "9"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
3164+ BackspaceKey { padding: 0; width: c1.numKeyWidth; height: c1.numKeyHeight; }
3165+ }
3166+
3167+ Row {
3168+ anchors.horizontalCenter: parent.horizontalCenter;
3169+ spacing: units.gu(0.5);
3170+
3171+ CharKey { label: "+"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
3172+ CharKey { label: "0"; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
3173+ CharKey { label: ""; enabled: false; noMagnifier: true; width: c1.numKeyWidth; height: c1.numKeyHeight; }
3174+ ReturnKey { padding: 0; width: c1.numKeyWidth; height: c1.numKeyHeight; }
3175 }
3176 } // column
3177 }
3178
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
3184
3185 images.path = "$$UBUNTU_KEYBOARD_DATA_DIR/images"
3186-images.files = images/*.png images/*.sci
3187+images.files = images/*.png images/*.sci images/*.svg
3188
3189 INSTALLS += qml qml_keys qml_languages images
3190
3191
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 if self.is_available():
3197 x, y, h, w = self._keyboard_container.globalRect
3198 x_pos = int(w / 2)
3199- start_y = y + int(h / 2)
3200+ start_y = y + int(h / 2.5)
3201 end_y = y + h
3202 self.pointer.drag(x_pos, start_y, x_pos, end_y)
3203
3204
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
3210 """
3211 qml = dedent("""
3212- import QtQuick 2.0
3213+ import QtQuick 2.4
3214 import Ubuntu.Components 1.1
3215 import Ubuntu.Web 0.2
3216
3217
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3223 */
3224
3225-import QtQuick 2.0
3226+import QtQuick 2.4
3227 import keys 1.0
3228
3229 KeyPad {

Subscribers

People subscribed via source and target branches