Merge lp:~davidmhewitt/switchboard-plug-keyboard/fix-1650986-load-xml-config into lp:~elementary-pantheon/switchboard-plug-keyboard/trunk
Proposed by
David Hewitt
on 2017-02-16
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Daniel Fore on 2017-02-26 | ||||
Approved revision: | 519 | ||||
Merged at revision: | 523 | ||||
Proposed branch: | lp:~davidmhewitt/switchboard-plug-keyboard/fix-1650986-load-xml-config | ||||
Merge into: | lp:~elementary-pantheon/switchboard-plug-keyboard/trunk | ||||
Diff against target: |
176 lines (+81/-53) 2 files modified
src/CMakeLists.txt (+2/-1) src/Layout/Handler.vala (+79/-52) |
||||
To merge this branch: | bzr merge lp:~davidmhewitt/switchboard-plug-keyboard/fix-1650986-load-xml-config | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Santiago | code | 2017-02-18 | Approve on 2017-02-25 |
elementary Pantheon team | 2017-02-16 | Pending | |
Leonardo Lemos | 2017-02-16 | Pending | |
Review via email:
|
Commit message
Load XKB keymaps from evdev.xml instead of evdev.lst
Description of the change
The list of keyboard configurations was being read from evdev.lst. All documentation online about how to create keyboard maps refers to creating them in the XML files.
I checked and both files contain the exact same base configurations for every language and keymap. But, it's likely that any custom or new keyboard maps will be added to the XML files.
To post a comment you must log in.
lp:~davidmhewitt/switchboard-plug-keyboard/fix-1650986-load-xml-config
updated
on 2017-02-25
- 517. By David Hewitt on 2017-02-23
-
Fixed double-free crash?
- 518. By David Hewitt on 2017-02-25
-
Improved code based on Santiago's suggestions
- 519. By David Hewitt on 2017-02-25
-
Ooops, missed some improvements from last commit
This and the branch on the keyboard indicator should allow users to more easily use custom keyboard layouts, I've been running them both for several days and they seem fine. Code looks good to me too.