From 4f074d0609715a63dfa617d2ffa5e0fc498d0466 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Tue, 19 May 2020 11:53:11 +0200 Subject: [PATCH 1/5] Add 4.6.2 changelog stub --- resources/texts/change_log.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index 4eef21b742..8ce125d932 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -1,3 +1,7 @@ +[4.6.2] + +TODO + [4.6.1] Patch release to fix some bugs that emerged with 4.6.0. From fa34c625ae31b02a07bf31199c62ce7439b28581 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 18 May 2020 11:42:39 +0200 Subject: [PATCH 2/5] Prevent crash when sentry could not be initialized --- cura_app.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/cura_app.py b/cura_app.py index 6c9839e79c..a78e7cabd1 100755 --- a/cura_app.py +++ b/cura_app.py @@ -63,14 +63,17 @@ if with_sentry_sdk: # Errors to be ignored by Sentry ignore_errors = [KeyboardInterrupt, MemoryError] - sentry_sdk.init("https://5034bf0054fb4b889f82896326e79b13@sentry.io/1821564", - before_send = CrashHandler.sentryBeforeSend, - environment = sentry_env, - release = "cura%s" % ApplicationMetadata.CuraVersion, - default_integrations = False, - max_breadcrumbs = 300, - server_name = "cura", - ignore_errors = ignore_errors) + try: + sentry_sdk.init("https://5034bf0054fb4b889f82896326e79b13@sentry.io/1821564", + before_send = CrashHandler.sentryBeforeSend, + environment = sentry_env, + release = "cura%s" % ApplicationMetadata.CuraVersion, + default_integrations = False, + max_breadcrumbs = 300, + server_name = "cura", + ignore_errors = ignore_errors) + except Exception: + with_sentry_sdk = False if not known_args["debug"]: def get_cura_dir_path(): From fed5598eb702fae5a2cf8f8f412eafd4510f9292 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Wed, 22 Apr 2020 15:18:48 +0200 Subject: [PATCH 3/5] Removed logobot image from Enterprise marketplace pop-up screen Updated the qml WelcomPage to no longer show the logobot and removed the logobot.svg from the resources since it is no longer used. --- plugins/Toolbox/resources/images/logobot.svg | 161 ------------------ .../resources/qml/pages/WelcomePage.qml | 9 - 2 files changed, 170 deletions(-) delete mode 100644 plugins/Toolbox/resources/images/logobot.svg diff --git a/plugins/Toolbox/resources/images/logobot.svg b/plugins/Toolbox/resources/images/logobot.svg deleted file mode 100644 index 8234f66887..0000000000 --- a/plugins/Toolbox/resources/images/logobot.svg +++ /dev/null @@ -1,161 +0,0 @@ - - - - -logo -Created with Sketch. - - - - - - - - - - - - diff --git a/plugins/Toolbox/resources/qml/pages/WelcomePage.qml b/plugins/Toolbox/resources/qml/pages/WelcomePage.qml index cbfdf8f402..d8adda0846 100644 --- a/plugins/Toolbox/resources/qml/pages/WelcomePage.qml +++ b/plugins/Toolbox/resources/qml/pages/WelcomePage.qml @@ -16,15 +16,6 @@ Column height: childrenRect.height anchors.centerIn: parent - Image - { - id: profileImage - fillMode: Image.PreserveAspectFit - source: "../../images/logobot.svg" - anchors.horizontalCenter: parent.horizontalCenter - width: Math.round(parent.width / 4) - } - Label { id: welcomeTextLabel From 6a334dd907eeeaf657db006a07d71618d800987f Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Wed, 22 Apr 2020 15:20:39 +0200 Subject: [PATCH 4/5] Revised text from Enterprise marketplace pop-up screen Updated the qml WelcomPage with the revised text: "Please sign in to get verified plugins and materials for Ultimaker Cura Enterprise" --- plugins/Toolbox/resources/qml/pages/WelcomePage.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Toolbox/resources/qml/pages/WelcomePage.qml b/plugins/Toolbox/resources/qml/pages/WelcomePage.qml index d8adda0846..04110cbc0f 100644 --- a/plugins/Toolbox/resources/qml/pages/WelcomePage.qml +++ b/plugins/Toolbox/resources/qml/pages/WelcomePage.qml @@ -19,7 +19,7 @@ Column Label { id: welcomeTextLabel - text: catalog.i18nc("@description", "Get plugins and materials verified by Ultimaker") + text: catalog.i18nc("@description", "Please sign in to get verified plugins and materials for Ultimaker Cura Enterprise") width: Math.round(parent.width / 2) font: UM.Theme.getFont("default") color: UM.Theme.getColor("text") From ed74198e206f2c95ddf698aa4ac240f4953f9b5c Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 26 May 2020 11:19:54 +0200 Subject: [PATCH 5/5] Revert "Revised text from Enterprise marketplace pop-up screen" This reverts commit 6a334dd907eeeaf657db006a07d71618d800987f. The commit broke the string freeze. It also hardcodes the enterprise text for all versions of Cura (which should not be the case!) --- plugins/Toolbox/resources/qml/pages/WelcomePage.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Toolbox/resources/qml/pages/WelcomePage.qml b/plugins/Toolbox/resources/qml/pages/WelcomePage.qml index 04110cbc0f..d8adda0846 100644 --- a/plugins/Toolbox/resources/qml/pages/WelcomePage.qml +++ b/plugins/Toolbox/resources/qml/pages/WelcomePage.qml @@ -19,7 +19,7 @@ Column Label { id: welcomeTextLabel - text: catalog.i18nc("@description", "Please sign in to get verified plugins and materials for Ultimaker Cura Enterprise") + text: catalog.i18nc("@description", "Get plugins and materials verified by Ultimaker") width: Math.round(parent.width / 2) font: UM.Theme.getFont("default") color: UM.Theme.getColor("text")