From 1f523053d9cd513f2b505a56a40b6afe07b54b92 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 11 Aug 2021 10:19:27 +0200 Subject: [PATCH 1/3] Add even more logging to authorization service --- cura/OAuth2/AuthorizationService.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cura/OAuth2/AuthorizationService.py b/cura/OAuth2/AuthorizationService.py index b2e790cbfc..46fe1be656 100644 --- a/cura/OAuth2/AuthorizationService.py +++ b/cura/OAuth2/AuthorizationService.py @@ -218,17 +218,18 @@ class AuthorizationService: def _onAuthStateChanged(self, auth_response: AuthenticationResponse) -> None: """Callback method for the authentication flow.""" - if auth_response.success: + Logger.log("d", "Got callback from Authorization state. The user should now be logged in!") self._storeAuthData(auth_response) self.onAuthStateChanged.emit(logged_in = True) else: + Logger.log("d", "Got callback from Authorization state. Something went wrong: [%s]", auth_response.err_message) self.onAuthenticationError.emit(logged_in = False, error_message = auth_response.err_message) self._server.stop() # Stop the web server at all times. def loadAuthDataFromPreferences(self) -> None: """Load authentication data from preferences.""" - + Logger.log("d", "Attempting to load the auth data from preferences.") if self._preferences is None: Logger.log("e", "Unable to load authentication data, since no preference has been set!") return @@ -240,6 +241,7 @@ class AuthorizationService: user_profile = self.getUserProfile() if user_profile is not None: self.onAuthStateChanged.emit(logged_in = True) + Logger.log("d", "Auth data was successfully loaded") else: if self._unable_to_get_data_message is not None: self._unable_to_get_data_message.hide() @@ -248,6 +250,7 @@ class AuthorizationService: "Unable to reach the Ultimaker account server."), title = i18n_catalog.i18nc("@info:title", "Warning"), message_type = Message.MessageType.ERROR) + Logger.log("w", "Unable to load auth data from preferences") self._unable_to_get_data_message.show() except (ValueError, TypeError): Logger.logException("w", "Could not load auth data from preferences") @@ -265,6 +268,7 @@ class AuthorizationService: self._user_profile = self.getUserProfile() self._preferences.setValue(self._settings.AUTH_DATA_PREFERENCE_KEY, json.dumps(auth_data.dump())) else: + Logger.log("d", "Clearing the user profile") self._user_profile = None self._preferences.resetPreference(self._settings.AUTH_DATA_PREFERENCE_KEY) From 4b324095ecdc79fb4d93cf9e6923e99d5371e232 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 12 Aug 2021 15:43:11 +0200 Subject: [PATCH 2/3] Remove incorrect log There is absolutely no reason that needed to be logged, since it happens on *every* boot. It was also not a place where an exception even happend. --- plugins/Toolbox/src/PackagesModel.py | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/Toolbox/src/PackagesModel.py b/plugins/Toolbox/src/PackagesModel.py index b11661c51e..97645ae466 100644 --- a/plugins/Toolbox/src/PackagesModel.py +++ b/plugins/Toolbox/src/PackagesModel.py @@ -58,7 +58,6 @@ class PackagesModel(ListModel): items = [] if self._metadata is None: - Logger.logException("w", "Failed to load packages for Marketplace") self.setItems(items) return From 3dec4e228b6c2f024beb44c2fb1661639b9d93cc Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 12 Aug 2021 15:48:58 +0200 Subject: [PATCH 3/3] Use leftpadding instead of binding anchors outside of siblings --- resources/qml/PrintSetupSelector/Custom/MenuButton.qml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Custom/MenuButton.qml b/resources/qml/PrintSetupSelector/Custom/MenuButton.qml index ffa6a68c9d..a012a56056 100644 --- a/resources/qml/PrintSetupSelector/Custom/MenuButton.qml +++ b/resources/qml/PrintSetupSelector/Custom/MenuButton.qml @@ -18,6 +18,7 @@ Button property string labelText: "" id: button hoverEnabled: true + leftPadding:UM.Theme.getSize("wide_margin").width background: Rectangle { @@ -45,8 +46,6 @@ Button text: button.text != "" ? replaceText(button.text) : replaceText(button.labelText) height: contentHeight verticalAlignment: Text.AlignVCenter - anchors.left: button.left - anchors.leftMargin: UM.Theme.getSize("wide_margin").width renderType: Text.NativeRendering font: UM.Theme.getFont("default") color: button.enabled ? UM.Theme.getColor("text") :UM.Theme.getColor("text_inactive")