Merge lp://staging/~davidmhewitt/switchboard-plug-keyboard/fix-1650986-load-xml-config into lp://staging/~elementary-pantheon/switchboard-plug-keyboard/trunk
Proposed by
David Hewitt
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Danielle Foré | ||||
| Approved revision: | 519 | ||||
| Merged at revision: | 523 | ||||
| Proposed branch: | lp://staging/~davidmhewitt/switchboard-plug-keyboard/fix-1650986-load-xml-config | ||||
| Merge into: | lp://staging/~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://staging/~davidmhewitt/switchboard-plug-keyboard/fix-1650986-load-xml-config | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Santiago (community) | code | Approve | |
| elementary Pantheon team | Pending | ||
| Leonardo Lemos | 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.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
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.