ubuntu-system-settings

Merge lp://qastaging/~jonas-drange/ubuntu-system-settings/hwKeyboardMinimal into lp://qastaging/ubuntu-system-settings

hwKeyboardMinimal
Merge into trunk

Proposed by Jonas G. Drange on 2015-12-22

Status:

Merged

Approved by:

Jonas G. Drange on 2016-03-14

Approved revision:

1589

Merged at revision:

1623

Proposed branch:

lp://qastaging/~jonas-drange/ubuntu-system-settings/hwKeyboardMinimal

Merge into:

lp://qastaging/ubuntu-system-settings

Diff against target:

1707 lines (+1014/-345)

17 files modified

debian/control (+1/-0)
plugins/language/CMakeLists.txt (+7/-4)
plugins/language/KeyboardLayoutItem.qml (+65/-34)
plugins/language/KeyboardLayouts.qml (+114/-5)
plugins/language/PageComponent.qml (+34/-19)
plugins/language/PageHardwareKeyboard.qml (+75/-0)
plugins/language/hardwarekeyboard-plugin.cpp (+224/-0)
plugins/language/hardwarekeyboard-plugin.h (+75/-0)
plugins/language/keyboard-layout.cpp (+3/-1)
plugins/language/language-plugin.cpp (+13/-261)
plugins/language/language-plugin.h (+2/-20)
plugins/language/onscreenkeyboard-plugin.cpp (+294/-0)
plugins/language/onscreenkeyboard-plugin.h (+75/-0)
plugins/language/plugin.cpp (+4/-0)
plugins/language/subset-model.cpp (+24/-0)
plugins/language/subset-model.h (+3/-0)
tests/autopilot/ubuntu_system_settings/__init__.py (+1/-1)

To merge this branch:

bzr merge lp://qastaging/~jonas-drange/ubuntu-system-settings/hwKeyboardMinimal

Related bugs:

Bug #1491340: Bluetooth keyboard is configured with wrong keyboard layout	Undecided	Invalid
Bug #1524400: Use default keymap on creation of surface	High	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2016-03-07
Ken VanDine		2015-12-22	Approve on 2016-02-09
Review via email: mp+281213@code.qastaging.launchpad.net

Commit message

Add External Keyboard panel which allows for configuration of the default keymap.

Description of the change

* Refactors some bits in the language plugin and keyboard layouts to make them work well with both OSK and external keyboards.
* Add a External Keyboard panel that allows for manipulation of input sources.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-12-22:

#

FAILED: Continuous integration, rev:1577
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2559/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5888/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/334/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/743/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5899/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2559/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-12-22:

#

FAILED: Continuous integration, rev:1578
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2560/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5890
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/335
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/744
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4545
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5901
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5901/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26324

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2560/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-01-22:

#

FAILED: Continuous integration, rev:1579
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2580/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6147/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/354/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/763/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6158/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2580/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-01-25:

#

FAILED: Continuous integration, rev:1580
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2584/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6184/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/358/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/767/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6195/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2584/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-01-25:

#

FAILED: Continuous integration, rev:1582
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2585/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6187/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/359
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/768
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4774/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6198
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6198/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27022

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2585/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-01-27:

#

FAILED: Continuous integration, rev:1583
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2590/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6221
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/364
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/773
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4794
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6232
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6232/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27076

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2590/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2016-01-27:

#

See inline comments

review: Needs Information

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-01-27:

#

FAILED: Continuous integration, rev:1584
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2592/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6226
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/366
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/775
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4798
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6237
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6237/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27084

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2592/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2016-01-28:

#

Some inline comments

Revision history for this message

Jonas G. Drange (jonas-drange) wrote on 2016-01-28:

#

Addressing comments from Lukáš and Ken. Thanks guys!

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2016-01-28:

#

See inline comments

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-01-28:

#

FAILED: Continuous integration, rev:1585
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2595/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6238
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/369
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/778
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4807
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6249
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6249/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27122

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2595/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2016-02-08:

#

I'm happy with the code, during testing it didn't appear to show the hardware keyboard stuff. I'm guessing UnityInputInfo.keyboards is not > 0 even with the bt keyboard connected, is that expected?

review: Needs Information

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2016-02-08:

#

I got it working (I had install problems before) however I noticed the first time I open the lang panel it shows 0 layouts for the hardware keyboards. Shouldn't there be some default set?

review: Needs Information

Revision history for this message

Jonas G. Drange (jonas-drange) wrote on 2016-02-09:

#

> I got it working (I had install problems before) however I noticed the first
> time I open the lang panel it shows 0 layouts for the hardware keyboards.
> Shouldn't there be some default set?

InputSources could be empty. If we want a default, then it needs to be set in the AccountsService schema.

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2016-02-09:

#

OK, I think there should be a default, but that has to be set elsewhere.

review: Approve

Revision history for this message

Jonas G. Drange (jonas-drange) wrote on 2016-02-09:

#

On 9 February 2016 at 15:26, Ken VanDine <email address hidden> wrote:

> Review: Approve
>
> OK, I think there should be a default, but that has to be set elsewhere.
>

I agree and filed bug 1543617. Thanks!

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2016-02-11:

#

I'm still not getting the panel on my laptop, only on the phone

Revision history for this message

Jonas G. Drange (jonas-drange) wrote on 2016-02-11:

#

On 11 February 2016 at 22:01, Lukáš Tinkl <email address hidden> wrote:

> I'm still not getting the panel on my laptop, only on the phone
>

It could be that the input detector is lacking. We'll then have to wait
for [1] to land. We can do that.

[1] https://requests.ci-train.ubuntu.com/#/ticket/763

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-03-07:

#

FAILED: Continuous integration, rev:1588
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2641/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6717
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/415
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/824
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/5094
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6728
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6728/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27982

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2641/rebuild

review: Needs Fixing (continuous-integration)

lp://qastaging/~jonas-drange/ubuntu-system-settings/hwKeyboardMinimal updated on 2016-03-14

1589. By Jonas G. Drange on 2016-03-14: sync with trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes:

Jonas G. Drange

Ubuntu Touch System Settings