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 } 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 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 diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json index 34696fb35e..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], @@ -81,7 +80,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], 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/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 @@ - + 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 @@ - - + + 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],