From 64decc73453b9cb2b53355014b347287a9664c92 Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Mon, 9 Dec 2019 14:24:27 +0100 Subject: [PATCH 1/4] Change unselected intent to outline (dark theme) The unselected intent radio buttons in the default profiles are by default white-filled. This is fixed to have a white outline and be filled with the main background's color. CURA-6941 --- resources/qml/RadioCheckbar.qml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/qml/RadioCheckbar.qml b/resources/qml/RadioCheckbar.qml index dfd9ca8628..96afe5bb3c 100644 --- a/resources/qml/RadioCheckbar.qml +++ b/resources/qml/RadioCheckbar.qml @@ -14,6 +14,7 @@ Item property color activeColor: UM.Theme.getColor("primary") property color inactiveColor: UM.Theme.getColor("slider_groove") property color defaultItemColor: UM.Theme.getColor("small_button_active") + property color defaultItemFillColor: UM.Theme.getColor("main_background") property int checkboxSize: Math.round(UM.Theme.getSize("radio_button").height * 0.75) property int inactiveMarkerSize: 2 * barSize property int barSize: UM.Theme.getSize("slider_groove_radius").height @@ -135,6 +136,7 @@ Item radius: Math.round(width / 2) border.color: defaultItemColor + color: defaultItemFillColor Rectangle { From 5b9bd46ba3ea0c237b3f87d54823f5715a92ea9e Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Mon, 9 Dec 2019 14:31:43 +0100 Subject: [PATCH 2/4] Change active intent line to white The activated part of the intent lines will now be white instead of grey. CURA-6941 --- 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 282004c3a9..a724fcc117 100644 --- a/resources/themes/cura-dark/theme.json +++ b/resources/themes/cura-dark/theme.json @@ -60,7 +60,7 @@ "small_button": [39, 44, 48, 0], "small_button_hover": [39, 44, 48, 255], - "small_button_active": [67, 72, 75, 255], + "small_button_active": [255, 255, 255, 255], "small_button_active_hover": [67, 72, 75, 255], "small_button_text": [255, 255, 255, 197], "small_button_text_hover": [255, 255, 255, 255], From c0ac03f2ae9a95843d7f6b827e0bdf2d09b76711 Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Mon, 9 Dec 2019 14:35:19 +0100 Subject: [PATCH 3/4] Change Custom profiles title similar to Default CURA-6941 --- .../qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml index c5a725285c..ff235a8a67 100644 --- a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml +++ b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml @@ -164,6 +164,7 @@ Popup visible: profilesList.visibleChildren.length > 1 anchors.left: parent.left anchors.leftMargin: UM.Theme.getSize("default_margin").width + color: UM.Theme.getColor("text_inactive") } Column From 6ae0e08b7dfb8c956ff06ad5e5dc5adbcfd11913 Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Tue, 10 Dec 2019 13:19:10 +0100 Subject: [PATCH 4/4] Change RadioCheckbar active button color The RadioCheckbar active button is now using the slider_groove_fill value instead of the small_button_active value to avoid issues in case the small_button_active and small_button_text are used together. --- resources/qml/RadioCheckbar.qml | 2 +- resources/themes/cura-dark/theme.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/RadioCheckbar.qml b/resources/qml/RadioCheckbar.qml index 96afe5bb3c..0b8709fe7a 100644 --- a/resources/qml/RadioCheckbar.qml +++ b/resources/qml/RadioCheckbar.qml @@ -13,7 +13,7 @@ Item property color activeColor: UM.Theme.getColor("primary") property color inactiveColor: UM.Theme.getColor("slider_groove") - property color defaultItemColor: UM.Theme.getColor("small_button_active") + property color defaultItemColor: UM.Theme.getColor("slider_groove_fill") property color defaultItemFillColor: UM.Theme.getColor("main_background") property int checkboxSize: Math.round(UM.Theme.getSize("radio_button").height * 0.75) property int inactiveMarkerSize: 2 * barSize diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json index a724fcc117..282004c3a9 100644 --- a/resources/themes/cura-dark/theme.json +++ b/resources/themes/cura-dark/theme.json @@ -60,7 +60,7 @@ "small_button": [39, 44, 48, 0], "small_button_hover": [39, 44, 48, 255], - "small_button_active": [255, 255, 255, 255], + "small_button_active": [67, 72, 75, 255], "small_button_active_hover": [67, 72, 75, 255], "small_button_text": [255, 255, 255, 197], "small_button_text_hover": [255, 255, 255, 255],