git.iko.soy/unity8
on xenial help sign in
preselect the country based on SIM card and language preference
eb99c27Lukáš Tinkl
qml/Wizard/Pages/10-language.qml+26−13
compare with xenial
unifiedsplit
@@ -32,24 +32,35 @@ LocalComponents.Page {
32 id: plugin
32 id: plugin
33 }
33 }
34
34
35+ Component.onCompleted: {
36+ if (!modemManager.available) { // don't wait for the modem if it's not there
37+ init()
38+ }
39+ }
40+
35 Connections {
41 Connections {
36 target: modemManager
42 target: modemManager
37 onModemsChanged: {
43 onModemsChanged: {
38 print("Modems changed")
44 print("Modems changed")
39− var detectedLangs = []
45+ init()
40− if (simManager0.present && simManager0.preferredLanguages.length > 0) {
46+ }
41− print("SIM 0 detected langs:", detectedLangs)
42− detectedLangs = simManager0.preferredLanguages
43− } else if (simManager1.present && simManager1.preferredLanguages.length > 0) {
44− print("SIM 1 detected langs:", detectedLangs)
45− detectedLangs = simManager1.preferredLanguages
46− } else {
47− print("No lang detected, falling back to default:", defaultLanguage)
48− detectedLangs = [defaultLanguage] // fallback to default lang
49− }
47+ }
50
48
51− populateModel(false, detectedLangs)
49+ function init()
50+ {
51+ var detectedLangs = []
52+ if (simManager0.present && simManager0.preferredLanguages.length > 0) {
53+ detectedLangs = simManager0.preferredLanguages
54+ print("SIM 0 detected langs:", detectedLangs)
55+ } else if (simManager1.present && simManager1.preferredLanguages.length > 0) {
56+ detectedLangs = simManager1.preferredLanguages
57+ print("SIM 1 detected langs:", detectedLangs)
58+ } else {
59+ print("No lang detected, falling back to default:", defaultLanguage)
60+ detectedLangs = [defaultLanguage] // fallback to default lang
52 }
61 }
62+
63+ populateModel(false, detectedLangs)
53 }
64 }
54
65
55 function populateModel(onlyDetected, detectedLangs)
66 function populateModel(onlyDetected, detectedLangs)
@@ -85,7 +96,9 @@ LocalComponents.Page {
85 index++;
96 index++;
86 });
97 });
87
98
99+ if (selectedIndex !== -1) {
88− languagesListView.positionViewAtIndex(selectedIndex, ListView.Center)
100+ languagesListView.positionViewAtIndex(selectedIndex, ListView.Center)
101+ }
89 }
102 }
90
103
91 function selectLanguage(code, index)
104 function selectLanguage(code, index)
qml/Wizard/Pages/15-country.qml+54−13
@@ -26,28 +26,60 @@ LocalComponents.Page {
26 title: i18n.tr("Region")
26 title: i18n.tr("Region")
27 forwardButtonSourceComponent: forwardButton
27 forwardButtonSourceComponent: forwardButton
28
28
29− readonly property var preferedCountries: LocalePlugin.countriesForLanguage(root.language)
30−
31 Component.onCompleted: {
29 Component.onCompleted: {
30+ if (!modemManager.available) { // don't wait for the modem if it's not there
31+ init()
32+ }
33+ }
34+
35+ Connections {
36+ target: modemManager
37+ onModemsChanged: {
38+ print("Modems changed")
39+ init()
40+ }
41+ }
42+
43+ function init()
44+ {
45+ var detectedCountry
46+ if (simManager0.present && simManager0.mobileCountryCode) {
47+ detectedCountry = LocalePlugin.mccToCountryCode(simManager0.mobileCountryCode)
48+ print("SIM 0 detected country:", detectedCountry)
49+ } else if (simManager1.present && simManager1.mobileCountryCode) {
50+ detectedCountry = LocalePlugin.mccToCountryCode(simManager1.mobileCountryCode)
51+ print("SIM 1 detected country:", detectedCountry)
52+ } else if (!detectedCountry) {
53+ detectedCountry = preferedCountry() // fallback to prefered country
54+ print("No SIM country detected, falling back to prefered country:", detectedCountry)
55+ }
56+
32− populateModel(preferedCountries);
57+ populateModel(detectedCountry)
58+ }
59+
60+ // return a prefered country for a language, but only if there's exactly one
61+ function preferedCountry()
62+ {
63+ var countries = Object.keys(LocalePlugin.countriesForLanguage(root.language))
64+ if (countries.length === 1) {
65+ return countries[0]
66+ }
67+ // TODO should we ultimately fallback to "US" here?
33 }
68 }
34
69
35− function populateModel(preferedCountries)
70+ function populateModel(preferedCountry)
36 {
71 {
37 var countries = LocalePlugin.countries();
72 var countries = LocalePlugin.countries();
73+ var index = 0
74+ var selectedIndex = -1
38 //console.log("All countries:" + countries);
75 //console.log("All countries:" + countries);
76+ print("Prefered country", preferedCountry)
39 Object.keys(countries).map(function(code) { // prepare the object
77 Object.keys(countries).map(function(code) { // prepare the object
40 //console.log("Got country:" + code);
78 //console.log("Got country:" + code);
41− return { "code": code, "country": countries[code] || code,
79+ return { "code": code, "country": countries[code] || code };
42− "dept": Object.keys(preferedCountries).indexOf(code) !== -1 ? i18n.tr("Prefered") : i18n.tr("All") };
43 })
80 })
44− .sort(function(a, b) { // group by status, sort by country name
81+ .sort(function(a, b) { // sort by country name
45− if (a.dept === b.dept) {
46− return a.country.localeCompare(b.country);
82+ return a.country.localeCompare(b.country);
47− } else if (a.dept === i18n.tr("Prefered")) {
48− return -1
49− }
50− return 1
51 })
83 })
52 .forEach(function(country) { // build the model
84 .forEach(function(country) { // build the model
53 //console.debug("Adding country:" + country.code);
85 //console.debug("Adding country:" + country.code);
@@ -55,9 +87,18 @@ LocalComponents.Page {
55 return;
87 return;
56 }
88 }
57 model.append(country);
89 model.append(country);
90+ if (preferedCountry && country.code === preferedCountry) { // preselect the prefered country, if any
91+ selectedIndex = index;
92+ selectCountry(country.code, selectedIndex)
93+ }
94+ index++;
58 });
95 });
59 busyIndicator.running = false;
96 busyIndicator.running = false;
60 busyIndicator.visible = false;
97 busyIndicator.visible = false;
98+
99+ if (selectedIndex !== -1) {
100+ regionsListView.positionViewAtIndex(selectedIndex, ListView.Center)
101+ }
61 }
102 }
62
103
63 function selectCountry(code, index)
104 function selectCountry(code, index)