git.iko.soy/unity8
on xenial help sign in
remove some more debug
commitb942489b4131e287c41c80a0fc7313b12bfc30b9 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateThu 3 Dec 2015, 22:27 (11 years ago) parent61c07e9
4 files changed−15
compare with xenial
unifiedsplit
qml/Wizard/Pages/10-language.qml−6 qml/Wizard/Pages/50-timezone.qml−4 qml/Wizard/Pages/60-account.qml−3 qml/Wizard/Pages/70-passwd-type.qml−2
qml/Wizard/Pages/10-language.qml−6
@@ -37,15 +37,11 @@ LocalComponents.Page {
3737 // try to detect the language+country from the SIM card
3838 if (simManager0.present && simManager0.preferredLanguages.length > 0) {
3939 detectedLang = simManager0.preferredLanguages[0] + "_" + LocalePlugin.mccToCountryCode(simManager0.mobileCountryCode);
40− print("SIM 0 detected lang:", detectedLang);
4140 } else if (simManager1.present && simManager1.preferredLanguages.length > 0) {
4241 detectedLang = simManager1.preferredLanguages[0] + "_" + LocalePlugin.mccToCountryCode(simManager1.mobileCountryCode);
43− print("SIM 1 detected lang:", detectedLang);
4442 } else if (plugin.currentLanguage != -1) {
4543 detectedLang = plugin.languageCodes[plugin.currentLanguage].split(".")[0]; // remove the encoding part, after dot (en_US.utf8 -> en_US)
46− print("Using current language", detectedLang, "as default");
4744 } else {
48− print("No lang detected, falling back to default (en_US)");
4945 detectedLang = "en_US"; // fallback to default lang
5046 }
5147
@@ -53,7 +49,6 @@ LocalComponents.Page {
5349 for (var i = 0; i < plugin.languageCodes.length; i++) {
5450 var code = plugin.languageCodes[i].split(".")[0]; // remove the encoding part, after dot (en_US.utf8 -> en_US)
5551 if (detectedLang === code) {
56− print("Found detected language", detectedLang, "at index", i);
5752 languagesListView.currentIndex = i;
5853 languagesListView.positionViewAtIndex(i, ListView.Center);
5954 break;
@@ -160,7 +155,6 @@ LocalComponents.Page {
160155 onClicked: {
161156 if (plugin.currentLanguage !== languagesListView.currentIndex) {
162157 plugin.currentLanguage = languagesListView.currentIndex;
163− print("Updating session locale:", plugin.languageCodes[plugin.currentLanguage]);
164158 System.updateSessionLocale(plugin.languageCodes[plugin.currentLanguage]);
165159 }
166160 i18n.language = plugin.languageCodes[plugin.currentLanguage]; // re-notify of change after above call (for qlocale change)
qml/Wizard/Pages/50-timezone.qml−4
@@ -106,11 +106,8 @@ LocalComponents.Page {
106106 }
107107
108108 onClicked: {
109− print("Clicked index", index)
110109 ListView.view.currentIndex = index
111110 selectedTimeZone = timeZone
112− print("Clicked city", city)
113− print("Clicked country", country)
114111 }
115112 }
116113 }
@@ -133,7 +130,6 @@ LocalComponents.Page {
133130 inputMethodHints: Qt.ImhNoPredictiveText
134131 onTextChanged: {
135132 // reset when switching between filter modes (text/country)
136− print("Filter:", text)
137133 selectedTimeZone = ""
138134 tzList.currentIndex = -1
139135 }
qml/Wizard/Pages/60-account.qml−3
@@ -91,7 +91,6 @@ LocalComponents.Page {
9191 anchors.topMargin: units.gu(1)
9292 onActiveFocusChanged: {
9393 if (activeFocus) {
94− print("Name got focused", focus);
9594 column.contentY = nameLabel.y
9695 }
9796 }
@@ -122,7 +121,6 @@ LocalComponents.Page {
122121 inputMethodHints: Qt.ImhNoPredictiveText
123122 onActiveFocusChanged: {
124123 if (activeFocus) {
125− print("Password got focused", focus);
126124 column.contentY = passLabel.y
127125 }
128126 }
@@ -162,7 +160,6 @@ LocalComponents.Page {
162160 inputMethodHints: Qt.ImhNoPredictiveText
163161 onActiveFocusChanged: {
164162 if (activeFocus) {
165− print("Password 2 got focused", focus);
166163 column.contentY = pass2Label.y
167164 }
168165 }
qml/Wizard/Pages/70-passwd-type.qml−2
@@ -116,7 +116,6 @@ LocalComponents.Page {
116116
117117 onClicked: {
118118 selector.currentIndex = index;
119− print("Current method: " + indexToMethod(index));
120119 }
121120 }
122121 }
@@ -138,7 +137,6 @@ LocalComponents.Page {
138137 onClicked: {
139138 var method = indexToMethod(selector.currentIndex);
140139 root.passwordMethod = method;
141− print("Current method: " + root.passwordMethod);
142140
143141 if (method === UbuntuSecurityPrivacyPanel.Passphrase) { // any password
144142 if (selector.currentIndex == 1)