From 461165ea39a0b146243141228cb0905c29c0bbb7 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 11 Jul 2022 16:16:08 +0200 Subject: [PATCH 01/10] Set the correct color for inactive text It used to be all back, which is just unreadable... CURA-9465 --- resources/themes/cura-dark/theme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json index 34696fb35e..36b7ea831b 100644 --- a/resources/themes/cura-dark/theme.json +++ b/resources/themes/cura-dark/theme.json @@ -81,7 +81,7 @@ "text": "text_default", "text_detail": [255, 255, 255, 172], "text_link": "accent_1", - "text_inactive": [255, 255, 255, 88], + "text_inactive": [118, 118, 118, 255], "text_hover": [255, 255, 255, 204], "text_scene": [255, 255, 255, 162], "text_scene_hover": [255, 255, 255, 204], From 6536b375256b35ce770d1e93e82a9a52c1e03c69 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 11 Jul 2022 16:19:26 +0200 Subject: [PATCH 02/10] Set background color for machine actions Otherwise the background is always white, which makes it unusuable for darktheme CURA-9465 --- resources/qml/Preferences/MachinesPage.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/qml/Preferences/MachinesPage.qml b/resources/qml/Preferences/MachinesPage.qml index 9b6f5bf609..c77545bc03 100644 --- a/resources/qml/Preferences/MachinesPage.qml +++ b/resources/qml/Preferences/MachinesPage.qml @@ -92,6 +92,7 @@ UM.ManagementPage minimumHeight: UM.Theme.getSize("modal_window_minimum").height maximumWidth: minimumWidth * 3 maximumHeight: minimumHeight * 3 + backgroundColor: UM.Theme.getColor("main_background") } UM.ConfirmRemoveDialog From 32121c7adce3874767f5b520b9820f6e87046ce4 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 11 Jul 2022 16:21:10 +0200 Subject: [PATCH 03/10] Add background color for rename dialogs CURA-9465 --- resources/qml/Preferences/RenameDialog.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/Preferences/RenameDialog.qml b/resources/qml/Preferences/RenameDialog.qml index 6e4c628114..7bcd65ed5d 100644 --- a/resources/qml/Preferences/RenameDialog.qml +++ b/resources/qml/Preferences/RenameDialog.qml @@ -23,7 +23,7 @@ UM.Dialog property string explanation: catalog.i18nc("@info", "Please provide a new name.") title: dialogTitle - + backgroundColor: UM.Theme.getColor("main_background") minimumWidth: UM.Theme.getSize("small_popup_dialog").width minimumHeight: UM.Theme.getSize("small_popup_dialog").height width: minimumWidth From 796f80c9b9eeebc1e699eba2f0be89d316fdce94 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 11 Jul 2022 16:38:37 +0200 Subject: [PATCH 04/10] Remove fill from settings icon Otherwise we can't use it in UM.ColorImage CURA-9465 --- resources/themes/cura-light/icons/default/Settings.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/themes/cura-light/icons/default/Settings.svg b/resources/themes/cura-light/icons/default/Settings.svg index 204f2a5b6f..22000feb16 100644 --- a/resources/themes/cura-light/icons/default/Settings.svg +++ b/resources/themes/cura-light/icons/default/Settings.svg @@ -1,3 +1,3 @@ - + From fdd96b30a7c96e3786e95d3b055da4ac76fc638e Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 11 Jul 2022 17:18:01 +0200 Subject: [PATCH 05/10] Fix dark theme primary colour The dark theme was overriding the primary colour with the wrong Ultimaker Blue colour. There is a newer blue, and it was applied as 'accent_1'. The dark theme had its own version of that one too. But the old Primary colour was still the wrong one. Contributes to issue CURA-9465. --- resources/themes/cura-dark/theme.json | 1 - resources/themes/cura-light/theme.json | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json index 36b7ea831b..7fd5d797cd 100644 --- a/resources/themes/cura-dark/theme.json +++ b/resources/themes/cura-dark/theme.json @@ -48,7 +48,6 @@ "lining": "border_main", "viewport_overlay": "background_1", - "primary": [12, 169, 227, 255], "primary_text": "text_default", "secondary": [95, 95, 95, 255], diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 83eb13f0cb..e7622bc685 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -218,7 +218,7 @@ "lining": [192, 193, 194, 255], "viewport_overlay": [246, 246, 246, 255], - "primary": [25, 110, 240, 255], + "primary": "accent_1", "primary_hover": [48, 182, 231, 255], "primary_text": [255, 255, 255, 255], "text_selection": [156, 195, 255, 127], @@ -269,7 +269,7 @@ "text": [25, 25, 25, 255], "text_disabled": [180, 180, 180, 255], "text_detail": [174, 174, 174, 128], - "text_link": [25, 110, 240, 255], + "text_link": "accent_1", "text_inactive": [174, 174, 174, 255], "text_medium": [128, 128, 128, 255], "text_scene": [102, 102, 102, 255], From 00cfa5dc4cc6b7a5fdbfa5c0682c135b1a1ad6d6 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 11 Jul 2022 17:32:14 +0200 Subject: [PATCH 06/10] Remove fill colours from some icons The icons cannot be recoloured if they already have a colour. Contributes to issue CURA-9465. --- resources/themes/cura-light/icons/default/Download.svg | 4 ++-- resources/themes/cura-light/icons/default/People.svg | 4 ++-- resources/themes/cura-light/icons/high/Certificate.svg | 2 +- resources/themes/cura-light/icons/high/Settings.svg | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/themes/cura-light/icons/default/Download.svg b/resources/themes/cura-light/icons/default/Download.svg index cbe0da2a99..fb94cd78b4 100644 --- a/resources/themes/cura-light/icons/default/Download.svg +++ b/resources/themes/cura-light/icons/default/Download.svg @@ -1,3 +1,3 @@ - - + + diff --git a/resources/themes/cura-light/icons/default/People.svg b/resources/themes/cura-light/icons/default/People.svg index 8632b37f7c..6692cbb427 100644 --- a/resources/themes/cura-light/icons/default/People.svg +++ b/resources/themes/cura-light/icons/default/People.svg @@ -1,3 +1,3 @@ - - + + diff --git a/resources/themes/cura-light/icons/high/Certificate.svg b/resources/themes/cura-light/icons/high/Certificate.svg index b588bddd8b..4d2c5ba0cf 100644 --- a/resources/themes/cura-light/icons/high/Certificate.svg +++ b/resources/themes/cura-light/icons/high/Certificate.svg @@ -1,3 +1,3 @@ - + diff --git a/resources/themes/cura-light/icons/high/Settings.svg b/resources/themes/cura-light/icons/high/Settings.svg index 1cd2ff324e..23774a3beb 100644 --- a/resources/themes/cura-light/icons/high/Settings.svg +++ b/resources/themes/cura-light/icons/high/Settings.svg @@ -1,3 +1,3 @@ - - + + From 0fac778601ba94af96234e9441a78b3c219f7436 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 12 Jul 2022 10:06:39 +0200 Subject: [PATCH 07/10] Fix postprocessing settings being too dark In dark theme you couldn't really read them. CURA-9465 --- plugins/PostProcessingPlugin/PostProcessingPlugin.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/PostProcessingPlugin/PostProcessingPlugin.qml b/plugins/PostProcessingPlugin/PostProcessingPlugin.qml index 46d05511cf..a80f304aaa 100644 --- a/plugins/PostProcessingPlugin/PostProcessingPlugin.qml +++ b/plugins/PostProcessingPlugin/PostProcessingPlugin.qml @@ -286,6 +286,7 @@ UM.Dialog { id: definitionsModel containerId: manager.selectedScriptDefinitionId + onContainerIdChanged: definitionsModel.setAllVisible(true) showAll: true } From 7f1e17b8203f3084cd65180c7315ac8bfc3b2d8a Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Thu, 14 Jul 2022 09:24:32 +0200 Subject: [PATCH 08/10] Add option for additional conan install args Contributes to CURA-9365 (cherry picked from commit 0d4a8796328769a57746248cc8449eb56882d4c6) --- .github/workflows/cura-installer.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cura-installer.yml b/.github/workflows/cura-installer.yml index 8247fc2d47..a4adf07945 100644 --- a/.github/workflows/cura-installer.yml +++ b/.github/workflows/cura-installer.yml @@ -8,6 +8,10 @@ on: # Fixme: default to cura/latest@testing (which is main) default: 'cura/latest@ultimaker/stable' required: true + conan_args: + description: 'Conan args: eq.: --require-override=curaengine/5.1.0-beta+123@ultimaker/testing' + default: '' + required: false conan_config: description: 'Conan config branch to use' default: '' @@ -143,7 +147,7 @@ jobs: run: conan config install https://github.com/Ultimaker/conan-config.git - name: Create the Packages - run: conan install ${{ inputs.cura_conan_version }} --build=missing --update -if cura_inst -g VirtualPythonEnv -o cura:enterprise=${{ inputs.enterprise }} -o cura:staging=${{ inputs.staging }} --json "cura_inst/conan_install_info.json" + run: conan install ${{ inputs.cura_conan_version }} ${{ inputs.conan_args }} --build=missing --update -if cura_inst -g VirtualPythonEnv -o cura:enterprise=${{ inputs.enterprise }} -o cura:staging=${{ inputs.staging }} --json "cura_inst/conan_install_info.json" - name: Set Environment variables for Cura (bash) if: ${{ runner.os != 'Windows' }} From 77979c384de30680c0d0d6db7e6a4dbb4e10eaf2 Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Thu, 14 Jul 2022 14:55:54 +0200 Subject: [PATCH 09/10] Lowercase username Contributes to CURA-9365 (cherry picked from commit f5a559179bac2e638e62c6a41adf22dcb3ec3bdf) --- .github/workflows/conan-recipe-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index 70f28b0290..ea1915c5cb 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -68,7 +68,7 @@ jobs: from git import Repo repo = Repo('.') - user = "${{ github.repository_owner }}" + user = "${{ github.repository_owner }}".lower() project_name = "${{ inputs.project_name }}" event_name = "${{ github.event_name }}" issue_number = "${{ github.ref }}".split('/')[2] From e0c7259149fce773c85e0e8b5ef3f67c8f523c87 Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Thu, 14 Jul 2022 16:28:08 +0200 Subject: [PATCH 10/10] Notify on success Contributes to CURA-9365 --- .github/workflows/cura-installer.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/cura-installer.yml b/.github/workflows/cura-installer.yml index a4adf07945..11fe0ace35 100644 --- a/.github/workflows/cura-installer.yml +++ b/.github/workflows/cura-installer.yml @@ -210,3 +210,16 @@ jobs: dist/*.AppImage dist/*.asc retention-days: 2 + + notify-export: + if: ${{ always() }} + needs: [ cura-installer-create ] + + uses: ultimaker/cura/.github/workflows/notify.yml@main + with: + success: ${{ contains(join(needs.*.result, ','), 'success') }} + success_title: "Create the Cura distributions" + success_body: "Installers for ${{ inputs.cura_conan_version }}" + failure_title: "Failed to create the Cura distributions" + failure_body: "Failed to create at least 1 installer for ${{ inputs.cura_conan_version }}" + secrets: inherit