@@ -22,6 +22,8 @@ import Ubuntu.SystemSettings.LanguagePlugin 1.0
22import Wizard 0.1
22import Wizard 0.1
23import AccountsService 0.1
23import AccountsService 0.1
24import Unity.InputInfo 0.1
24import Unity.InputInfo 0.1
25+import Unity.Application 0.1
26+import WindowManager 0.1
25import ".." as LocalComponents
27import ".." as LocalComponents
27LocalComponents.Page {
29LocalComponents.Page {
@@ -58,6 +60,12 @@ LocalComponents.Page {
59 property string selectedKeymap: ""
61 property string selectedKeymap: ""
63+ TopLevelSurfaceList {
64+ id: topLevelSurfaceList
65+ objectName: "topLevelSurfaceList"
66+ applicationsModel: ApplicationManager
61 ColumnLayout {
69 ColumnLayout {
62 id: column
70 id: column
63 spacing: units.gu(2)
71 spacing: units.gu(2)
@@ -122,6 +130,11 @@ LocalComponents.Page {
122 onClicked: {
130 onClicked: {
123 keyboardListView.currentIndex = index;
131 keyboardListView.currentIndex = index;
124 selectedKeymap = layoutId;
132 selectedKeymap = layoutId;
133+ if (topLevelSurfaceList.count > 0) {
134+ print("Setting wizard keymap to:", selectedKeymap)
135+ var surface = topLevelSurfaceList.surfaceAt(0);
136+ surface.keymap = selectedKeymap;