From b72b542d2170a5df0f416971f50a6c8770b5d573 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 26 Sep 2019 12:55:14 +0200 Subject: [PATCH] Add missing font & color CURA-6810 --- resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml | 2 ++ resources/qml/PrintSetupSelector/Custom/MenuButton.qml | 2 ++ .../PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml | 5 ++++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml index 682aefa821..c45a5fa8d7 100644 --- a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml @@ -67,6 +67,8 @@ Item { id: textLabel text: intentSelection.text + font: UM.Theme.getFont("default") + color: UM.Theme.getColor("text") anchors.left: parent.left anchors.leftMargin: UM.Theme.getSize("default_margin").width anchors.verticalCenter: intentSelection.verticalCenter diff --git a/resources/qml/PrintSetupSelector/Custom/MenuButton.qml b/resources/qml/PrintSetupSelector/Custom/MenuButton.qml index cebe130a20..acd8ed07bb 100644 --- a/resources/qml/PrintSetupSelector/Custom/MenuButton.qml +++ b/resources/qml/PrintSetupSelector/Custom/MenuButton.qml @@ -48,5 +48,7 @@ Button anchors.left: button.left anchors.leftMargin: UM.Theme.getSize("wide_margin").width renderType: Text.NativeRendering + font: UM.Theme.getFont("default") + color: UM.Theme.getColor("text") } } \ No newline at end of file diff --git a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml index 60fc8c55bf..332a56dd3b 100644 --- a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml +++ b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml @@ -111,7 +111,6 @@ Popup return Cura.MachineManager.activeQualityType == model.quality_type && Cura.MachineManager.activeIntentCategory == model.intent_category; } ButtonGroup.group: buttonGroup - } } } @@ -271,6 +270,8 @@ Popup anchors.leftMargin: UM.Theme.getSize("default_margin").width + UM.Theme.getSize("narrow_margin").width verticalAlignment: Text.AlignVCenter renderType: Text.NativeRendering + font: UM.Theme.getFont("default") + color: UM.Theme.getColor("text") } Label { @@ -281,6 +282,8 @@ Popup anchors.rightMargin: UM.Theme.getSize("default_margin").width verticalAlignment: Text.AlignVCenter renderType: Text.NativeRendering + font: UM.Theme.getFont("default") + color: UM.Theme.getColor("text") } } onClicked: