b942489 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

remove some more debug

b942489Lukáš Tinkl11 years ago

qml/Wizard/Pages/10-language.qml−6

compare with xenial

unifiedsplit

@@ -37,15 +37,11 @@ LocalComponents.Page {

37 // try to detect the language+country from the SIM card

38 if (simManager0.present && simManager0.preferredLanguages.length > 0) {

39 detectedLang = simManager0.preferredLanguages[0] + "_" + LocalePlugin.mccToCountryCode(simManager0.mobileCountryCode);

40− print("SIM 0 detected lang:", detectedLang);

41 } else if (simManager1.present && simManager1.preferredLanguages.length > 0) {

40 } else if (simManager1.present && simManager1.preferredLanguages.length > 0) {

42 detectedLang = simManager1.preferredLanguages[0] + "_" + LocalePlugin.mccToCountryCode(simManager1.mobileCountryCode);

41 detectedLang = simManager1.preferredLanguages[0] + "_" + LocalePlugin.mccToCountryCode(simManager1.mobileCountryCode);

43− print("SIM 1 detected lang:", detectedLang);

44 } else if (plugin.currentLanguage != -1) {

42 } else if (plugin.currentLanguage != -1) {

45 detectedLang = plugin.languageCodes[plugin.currentLanguage].split(".")[0]; // remove the encoding part, after dot (en_US.utf8 -> en_US)

43 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");

47 } else {

44 } else {

48− print("No lang detected, falling back to default (en_US)");

49 detectedLang = "en_US"; // fallback to default lang

45 detectedLang = "en_US"; // fallback to default lang

50 }

46 }

@@ -53,7 +49,6 @@ LocalComponents.Page {

53 for (var i = 0; i < plugin.languageCodes.length; i++) {

49 for (var i = 0; i < plugin.languageCodes.length; i++) {

54 var code = plugin.languageCodes[i].split(".")[0]; // remove the encoding part, after dot (en_US.utf8 -> en_US)

50 var code = plugin.languageCodes[i].split(".")[0]; // remove the encoding part, after dot (en_US.utf8 -> en_US)

55 if (detectedLang === code) {

51 if (detectedLang === code) {

56− print("Found detected language", detectedLang, "at index", i);

57 languagesListView.currentIndex = i;

52 languagesListView.currentIndex = i;

58 languagesListView.positionViewAtIndex(i, ListView.Center);

53 languagesListView.positionViewAtIndex(i, ListView.Center);

59 break;

54 break;

@@ -160,7 +155,6 @@ LocalComponents.Page {

160 onClicked: {

155 onClicked: {

161 if (plugin.currentLanguage !== languagesListView.currentIndex) {

156 if (plugin.currentLanguage !== languagesListView.currentIndex) {

162 plugin.currentLanguage = languagesListView.currentIndex;

157 plugin.currentLanguage = languagesListView.currentIndex;

163− print("Updating session locale:", plugin.languageCodes[plugin.currentLanguage]);

164 System.updateSessionLocale(plugin.languageCodes[plugin.currentLanguage]);

158 System.updateSessionLocale(plugin.languageCodes[plugin.currentLanguage]);

165 }

159 }

166 i18n.language = plugin.languageCodes[plugin.currentLanguage]; // re-notify of change after above call (for qlocale change)

160 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 {

106 }

107

108 onClicked: {

109− print("Clicked index", index)

110 ListView.view.currentIndex = index

109 ListView.view.currentIndex = index

111 selectedTimeZone = timeZone

110 selectedTimeZone = timeZone

112− print("Clicked city", city)

113− print("Clicked country", country)

114 }

111 }

115 }

112 }

116 }

113 }

@@ -133,7 +130,6 @@ LocalComponents.Page {

133 inputMethodHints: Qt.ImhNoPredictiveText

130 inputMethodHints: Qt.ImhNoPredictiveText

134 onTextChanged: {

131 onTextChanged: {

135 // reset when switching between filter modes (text/country)

132 // reset when switching between filter modes (text/country)

136− print("Filter:", text)

137 selectedTimeZone = ""

133 selectedTimeZone = ""

138 tzList.currentIndex = -1

134 tzList.currentIndex = -1

139 }

135 }

qml/Wizard/Pages/60-account.qml−3

@@ -91,7 +91,6 @@ LocalComponents.Page {

91 anchors.topMargin: units.gu(1)

92 onActiveFocusChanged: {

93 if (activeFocus) {

94− print("Name got focused", focus);

95 column.contentY = nameLabel.y

94 column.contentY = nameLabel.y

96 }

95 }

97 }

96 }

@@ -122,7 +121,6 @@ LocalComponents.Page {

122 inputMethodHints: Qt.ImhNoPredictiveText

121 inputMethodHints: Qt.ImhNoPredictiveText

123 onActiveFocusChanged: {

122 onActiveFocusChanged: {

124 if (activeFocus) {

123 if (activeFocus) {

125− print("Password got focused", focus);

126 column.contentY = passLabel.y

124 column.contentY = passLabel.y

127 }

125 }

128 }

126 }

@@ -162,7 +160,6 @@ LocalComponents.Page {

162 inputMethodHints: Qt.ImhNoPredictiveText

160 inputMethodHints: Qt.ImhNoPredictiveText

163 onActiveFocusChanged: {

161 onActiveFocusChanged: {

164 if (activeFocus) {

162 if (activeFocus) {

165− print("Password 2 got focused", focus);

166 column.contentY = pass2Label.y

163 column.contentY = pass2Label.y

167 }

164 }

168 }

165 }

qml/Wizard/Pages/70-passwd-type.qml−2

@@ -116,7 +116,6 @@ LocalComponents.Page {

116

117 onClicked: {

118 selector.currentIndex = index;

119− print("Current method: " + indexToMethod(index));

120 }

119 }

121 }

120 }

122 }

121 }

@@ -138,7 +137,6 @@ LocalComponents.Page {

138 onClicked: {

137 onClicked: {

139 var method = indexToMethod(selector.currentIndex);

138 var method = indexToMethod(selector.currentIndex);

140 root.passwordMethod = method;

139 root.passwordMethod = method;

141− print("Current method: " + root.passwordMethod);

142

140

143 if (method === UbuntuSecurityPrivacyPanel.Passphrase) { // any password

141 if (method === UbuntuSecurityPrivacyPanel.Passphrase) { // any password

144 if (selector.currentIndex == 1)

142 if (selector.currentIndex == 1)