@@ -22,6 +22,8 @@ import Ubuntu.SystemSettings.LanguagePlugin 1.0
2222import Wizard 0.1
2323import AccountsService 0.1
2424import Unity.InputInfo 0.1
25+import Unity.Application 0.1
26+import WindowManager 0.1
2527import ".." as LocalComponents
2628
2729LocalComponents.Page {
@@ -58,6 +60,12 @@ LocalComponents.Page {
5860
5961 property string selectedKeymap: ""
6062
63+ TopLevelSurfaceList {
64+ id: topLevelSurfaceList
65+ objectName: "topLevelSurfaceList"
66+ applicationsModel: ApplicationManager
67+ }
68+
6169 ColumnLayout {
6270 id: column
6371 spacing: units.gu(2)
@@ -122,6 +130,11 @@ LocalComponents.Page {
122130 onClicked: {
123131 keyboardListView.currentIndex = index;
124132 selectedKeymap = layoutId;
133+ if (topLevelSurfaceList.count > 0) {
134+ print("Setting wizard keymap to:", selectedKeymap)
135+ var surface = topLevelSurfaceList.surfaceAt(0);
136+ surface.keymap = selectedKeymap;
137+ }
125138 }
126139 }
127140 }