From 01b0d78f7b62098809d6dea962b28c0872a649c1 Mon Sep 17 00:00:00 2001 From: Konstantinos Karmas Date: Tue, 24 Aug 2021 13:31:39 +0200 Subject: [PATCH 1/4] Use custom style for the links in the what's new textArea A style had to be prepended in the text to make sure that it adheres to the style we want instead of using the OS-based link style. Note: For some reason QML ignores all other link-style tags (such as `a:hover`, `a:focus` etc) apart from `a:link`, so we can only change the style for the normal link and NOT for when it is clicked or hovered. CURA-8380 --- resources/qml/WelcomePages/WhatsNewContent.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/WelcomePages/WhatsNewContent.qml b/resources/qml/WelcomePages/WhatsNewContent.qml index f5ce72997f..179fc372c9 100644 --- a/resources/qml/WelcomePages/WhatsNewContent.qml +++ b/resources/qml/WelcomePages/WhatsNewContent.qml @@ -119,7 +119,7 @@ Item do_borders: false textArea.wrapMode: TextEdit.Wrap - textArea.text: manager.getSubpageText(index) + textArea.text: "" + manager.getSubpageText(index) textArea.textFormat: Text.RichText textArea.readOnly: true textArea.font: UM.Theme.getFont("default") From d24d520db02f6baf219e15be201b4a235d6aba89 Mon Sep 17 00:00:00 2001 From: Konstantinos Karmas Date: Tue, 24 Aug 2021 13:32:25 +0200 Subject: [PATCH 2/4] Change background of Premium plugins and materials Or else the link "Search materials" in the materials tab was very hard to see. CURA-8380 --- .../resources/qml/components/ToolboxDownloadsShowcase.qml | 2 +- resources/themes/cura-dark/theme.json | 1 + resources/themes/cura-light/theme.json | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcase.qml b/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcase.qml index 4732de8241..a42a10aa29 100644 --- a/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcase.qml +++ b/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcase.qml @@ -8,7 +8,7 @@ import UM 1.1 as UM Rectangle { - color: UM.Theme.getColor("secondary") + color: UM.Theme.getColor("toolbox_premium_packages_background") height: childrenRect.height width: parent.width Column diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json index 457d2092c1..520f863972 100644 --- a/resources/themes/cura-dark/theme.json +++ b/resources/themes/cura-dark/theme.json @@ -177,6 +177,7 @@ "toolbox_header_button_text_active": [255, 255, 255, 255], "toolbox_header_button_text_inactive": [128, 128, 128, 255], + "toolbox_premium_packages_background": [57, 57, 57, 255], "monitor_printer_family_tag": [86, 86, 106, 255], "monitor_text_disabled": [102, 102, 102, 255], diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 6d99b7ae03..d50a748493 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -428,6 +428,7 @@ "printer_config_mismatch": [127, 127, 127, 255], "toolbox_header_button_text_inactive": [0, 0, 0, 255], + "toolbox_premium_packages_background": [240, 240, 240, 255], "favorites_header_bar": [245, 245, 245, 255], "favorites_header_hover": [245, 245, 245, 255], From 99f8c850650a075d8715162b11aa21a71fcc44f0 Mon Sep 17 00:00:00 2001 From: Konstantinos Karmas Date: Tue, 24 Aug 2021 13:33:05 +0200 Subject: [PATCH 3/4] Style the "no plugin/material installed" texts in the installed tab The default black text color was invisible in the dark theme. --- plugins/Toolbox/resources/qml/pages/ToolboxInstalledPage.qml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/Toolbox/resources/qml/pages/ToolboxInstalledPage.qml b/plugins/Toolbox/resources/qml/pages/ToolboxInstalledPage.qml index 48620d5def..fa7bd24c9d 100644 --- a/plugins/Toolbox/resources/qml/pages/ToolboxInstalledPage.qml +++ b/plugins/Toolbox/resources/qml/pages/ToolboxInstalledPage.qml @@ -71,6 +71,7 @@ ScrollView padding: UM.Theme.getSize("default_margin").width text: catalog.i18nc("@info", "No plugin has been installed.") font: UM.Theme.getFont("medium") + color: UM.Theme.getColor("lining") renderType: Text.NativeRendering } } @@ -123,6 +124,7 @@ ScrollView visible: toolbox.materialsInstalledModel.count < 1 padding: UM.Theme.getSize("default_margin").width text: catalog.i18nc("@info", "No material has been installed.") + color: UM.Theme.getColor("lining") font: UM.Theme.getFont("medium") renderType: Text.NativeRendering } From bbada735505bda2536d76f95fbb11450914119f2 Mon Sep 17 00:00:00 2001 From: Konstantinos Karmas Date: Wed, 25 Aug 2021 15:32:42 +0200 Subject: [PATCH 4/4] Remove outdated image from "new printers added" message CURA-8497 --- .../resources/svg/cloud-flow-completed.svg | 27 ------------------- .../src/Cloud/CloudOutputDeviceManager.py | 6 ----- 2 files changed, 33 deletions(-) delete mode 100644 plugins/UM3NetworkPrinting/resources/svg/cloud-flow-completed.svg diff --git a/plugins/UM3NetworkPrinting/resources/svg/cloud-flow-completed.svg b/plugins/UM3NetworkPrinting/resources/svg/cloud-flow-completed.svg deleted file mode 100644 index 8eba62ecc8..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/cloud-flow-completed.svg +++ /dev/null @@ -1,27 +0,0 @@ - - - - Group 2 - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py index f50a2ec5d9..b35cd5b5f5 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py @@ -216,11 +216,6 @@ class CloudOutputDeviceManager: online_cluster_names = {c.friendly_name.lower() for c in clusters if c.is_online and not c.friendly_name is None} new_devices.sort(key = lambda x: ("a{}" if x.name.lower() in online_cluster_names else "b{}").format(x.name.lower())) - image_path = os.path.join( - CuraApplication.getInstance().getPluginRegistry().getPluginPath("UM3NetworkPrinting") or "", - "resources", "svg", "cloud-flow-completed.svg" - ) - message = Message( title = self.i18n_catalog.i18ncp( "info:status", @@ -230,7 +225,6 @@ class CloudOutputDeviceManager: ), progress = 0, lifetime = 0, - image_source = image_path, message_type = Message.MessageType.POSITIVE ) message.show()