git.iko.soy/unity8
on xenial help sign in
add more debug
c32afb1Lukáš Tinkl
qml/Wizard/Pages/10-language.qml+17−4
compare with xenial
unifiedsplit
@@ -32,6 +32,7 @@ LocalComponents.Page {
32
32
33 Component.onCompleted: {
33 Component.onCompleted: {
34 if (!modemManager.available) { // don't wait for the modem if it's not there
34 if (!modemManager.available) { // don't wait for the modem if it's not there
35+ print("=== Modem manager not available, init manually")
35 init();
36 init();
36 }
37 }
37 }
38 }
@@ -39,7 +40,14 @@ LocalComponents.Page {
39 Connections {
40 Connections {
40 target: modemManager
41 target: modemManager
41 onModemsChanged: {
42 onModemsChanged: {
42− print("Modems changed");
43+ print("=== Modems changed, init");
44+ print("Modem manager available:", modemManager.available);
45+ print("SIM 1 present:", simManager0.present);
46+ print("SIM 1 ready:", simManager0.ready);
47+ print("SIM 1 languages:", simManager0.preferredLanguages);
48+ print("SIM 1 country:", LocalePlugin.mccToCountryCode(simManager0.mobileCountryCode));
49+ print("SIM 2 present:", simManager1.present);
50+ print("SIM 2 ready:", simManager1.ready);
43 init();
51 init();
44 }
52 }
45 }
53 }
@@ -47,7 +55,7 @@ LocalComponents.Page {
47 function init()
55 function init()
48 {
56 {
49 var detectedLang = "";
57 var detectedLang = "";
50− // try to detect the language from the SIM card
58+ // try to detect the language+country from the SIM card
51 if (simManager0.present && simManager0.preferredLanguages.length > 0) {
59 if (simManager0.present && simManager0.preferredLanguages.length > 0) {
52 detectedLang = simManager0.preferredLanguages[0] + "_" + LocalePlugin.mccToCountryCode(simManager0.mobileCountryCode);
60 detectedLang = simManager0.preferredLanguages[0] + "_" + LocalePlugin.mccToCountryCode(simManager0.mobileCountryCode);
53 print("SIM 0 detected lang:", detectedLang);
61 print("SIM 0 detected lang:", detectedLang);
@@ -56,21 +64,26 @@ LocalComponents.Page {
56 print("SIM 1 detected lang:", detectedLang);
64 print("SIM 1 detected lang:", detectedLang);
57 } else if (plugin.currentLanguage != -1) {
65 } else if (plugin.currentLanguage != -1) {
58 detectedLang = plugin.languageCodes[plugin.currentLanguage];
66 detectedLang = plugin.languageCodes[plugin.currentLanguage];
59− print("Using current language", detectedLang, "as default");
67+ print("Still using current language", detectedLang, "as default");
60 } else {
68 } else {
61 print("No lang detected, falling back to default (en_US)");
69 print("No lang detected, falling back to default (en_US)");
62 detectedLang = "en_US"; // fallback to default lang
70 detectedLang = "en_US"; // fallback to default lang
63 }
71 }
64
72
65 // preselect the detected language
73 // preselect the detected language
74+ var selectedIndex = -1;
66 for (var i = 0; i < plugin.languageCodes.length; i++) {
75 for (var i = 0; i < plugin.languageCodes.length; i++) {
67 var code = plugin.languageCodes[i].split(".")[0]; // remove the encoding part, after dot (en_US.utf8 -> en_US)
76 var code = plugin.languageCodes[i].split(".")[0]; // remove the encoding part, after dot (en_US.utf8 -> en_US)
68 if (detectedLang === code) {
77 if (detectedLang === code) {
69 languagesListView.currentIndex = i;
78 languagesListView.currentIndex = i;
70− languagesListView.positionViewAtIndex(i, ListView.Center);
79+ selectedIndex = i;
71 break;
80 break;
72 }
81 }
73 }
82 }
83+
84+ if (selectedIndex !== -1) {
85+ languagesListView.positionViewAtIndex(selectedIndex, ListView.Center);
86+ }
74 }
87 }
75
88
76 Column {
89 Column {
qml/Wizard/Pages/20-sim.qml+3−5
@@ -37,8 +37,8 @@ LocalComponents.Page {
37 property bool hadModem: false
37 property bool hadModem: false
38
38
39 Component.onCompleted: {
39 Component.onCompleted: {
40− hadModem = simManager0.present || simManager1.present
40+ hadModem = simManager0.present || simManager1.present;
41− print("Had modem: " + hadModem)
41+ print("Had modem: " + hadModem);
42 }
42 }
43
43
44 Dialog {
44 Dialog {
@@ -50,9 +50,7 @@ LocalComponents.Page {
50 id: restartButton
50 id: restartButton
51 text: i18n.tr("Restart")
51 text: i18n.tr("Restart")
52 onClicked: {
52 onClicked: {
53− PopupUtils.close(restartDialog)
54− quit()
55− DBusUnitySessionService.reboot()
53+ DBusUnitySessionService.reboot();
56 }
54 }
57 }
55 }
58 }
56 }