git.iko.soy/unity8
on xenial help sign in
skip the page when there's no HW keyboard attached
9e02484Lukáš Tinkl
qml/Wizard/Pages/20-keyboard.qml+10
compare with xenial
unifiedsplit
@@ -20,6 +20,7 @@ import Ubuntu.Components 1.3
20import Ubuntu.Components.ListItems 1.3
20import Ubuntu.Components.ListItems 1.3
21import Ubuntu.SystemSettings.LanguagePlugin 1.0
21import Ubuntu.SystemSettings.LanguagePlugin 1.0
22import Wizard 0.1
22import Wizard 0.1
23+import Unity.InputInfo 0.1
23import ".." as LocalComponents
24import ".." as LocalComponents
24
25
25LocalComponents.Page {
26LocalComponents.Page {
@@ -28,6 +29,9 @@ LocalComponents.Page {
28 title: i18n.tr("Hardware Keyboard")
29 title: i18n.tr("Hardware Keyboard")
29 forwardButtonSourceComponent: forwardButton
30 forwardButtonSourceComponent: forwardButton
30
31
32+ skip: keyboardsModel.count == 0
33+ skipValid: false
34+
31 UbuntuLanguagePlugin {
35 UbuntuLanguagePlugin {
32 id: langPlugin
36 id: langPlugin
33 }
37 }
@@ -37,6 +41,12 @@ LocalComponents.Page {
37 language: selectedLanguage
41 language: selectedLanguage
38 }
42 }
39
43
44+ InputDeviceModel {
45+ id: keyboardsModel
46+ deviceFilter: InputInfo.Keyboard
47+ Component.onCompleted: skipValid = true;
48+ }
49+
40 Component.onCompleted: print("Initial language:", i18n.language)
50 Component.onCompleted: print("Initial language:", i18n.language)
41
51
42 readonly property string selectedLanguage: langPlugin.languageCodes[langSelector.selectedIndex].split(".")[0] // chop off the codeset (.UTF-8)
52 readonly property string selectedLanguage: langPlugin.languageCodes[langSelector.selectedIndex].split(".")[0] // chop off the codeset (.UTF-8)
tests/qmltests/Wizard/tst_Wizard.qml+6
@@ -24,6 +24,7 @@ import Ubuntu.SystemSettings.SecurityPrivacy 1.0
24import Ubuntu.SystemSettings.TimeDate 1.0
24import Ubuntu.SystemSettings.TimeDate 1.0
25import Unity.Test 0.1 as UT
25import Unity.Test 0.1 as UT
26import Wizard 0.1
26import Wizard 0.1
27+import Unity.InputInfo 0.1
27import "../../../qml/Wizard"
28import "../../../qml/Wizard"
28
29
29Item {
30Item {
@@ -41,7 +42,12 @@ Item {
41 id: wizard
42 id: wizard
42 anchors.fill: parent
43 anchors.fill: parent
43
44
45+ Component.onCompleted: {
46+ MockInputDeviceBackend.addMockDevice("/test", InputInfo.Keyboard);
47+ }
48+
44 Component.onDestruction: {
49 Component.onDestruction: {
50+ MockInputDeviceBackend.removeDevice("/test");
45 wizardLoader.itemDestroyed = true;
51 wizardLoader.itemDestroyed = true;
46 }
52 }
47 }
53 }