From 713a5cb4e5500e7f96ca7139eb122ce068f0c456 Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Tue, 15 Feb 2022 15:38:08 +0100
Subject: [PATCH] Ensure that settingPickDialog uses the themed controls

CURA-8685
---
 plugins/PerObjectSettingsTool/PerObjectCategory.qml | 6 +++---
 plugins/PerObjectSettingsTool/PerObjectItem.qml     | 3 ++-
 plugins/PerObjectSettingsTool/SettingPickDialog.qml | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/plugins/PerObjectSettingsTool/PerObjectCategory.qml b/plugins/PerObjectSettingsTool/PerObjectCategory.qml
index d23b0b9458..3f95d4e021 100644
--- a/plugins/PerObjectSettingsTool/PerObjectCategory.qml
+++ b/plugins/PerObjectSettingsTool/PerObjectCategory.qml
@@ -4,8 +4,8 @@
 import QtQuick 2.2
 import QtQuick.Controls 2.1
 
-import UM 1.1 as UM
-
+import UM 1.5 as UM
+import Cura 1.0 as Cura
 import ".."
 
 Button {
@@ -33,7 +33,7 @@ Button {
             source: UM.Theme.getIcon(definition.icon)
             color: base.hovered ? palette.highlight : palette.buttonText
         }
-        Label
+        UM.Label
         {
             id: label
             anchors.verticalCenter: parent.verticalCenter
diff --git a/plugins/PerObjectSettingsTool/PerObjectItem.qml b/plugins/PerObjectSettingsTool/PerObjectItem.qml
index dd74721464..5c67a42d01 100644
--- a/plugins/PerObjectSettingsTool/PerObjectItem.qml
+++ b/plugins/PerObjectSettingsTool/PerObjectItem.qml
@@ -6,6 +6,7 @@ import QtQuick.Layouts 1.1
 import QtQuick.Controls 2.1
 
 import UM 1.2 as UM
+import Cura 1.0 as Cura
 
 UM.TooltipArea
 {
@@ -15,7 +16,7 @@ UM.TooltipArea
     width: childrenRect.width;
     height: childrenRect.height;
 
-    CheckBox
+    Cura.CheckBox
     {
         id: check
 
diff --git a/plugins/PerObjectSettingsTool/SettingPickDialog.qml b/plugins/PerObjectSettingsTool/SettingPickDialog.qml
index 1c79a02c97..46c9825334 100644
--- a/plugins/PerObjectSettingsTool/SettingPickDialog.qml
+++ b/plugins/PerObjectSettingsTool/SettingPickDialog.qml
@@ -42,7 +42,7 @@ UM.Dialog
         listview.model.filter = new_filter
     }
 
-    TextField
+    Cura.TextField
     {
         id: filterInput
         selectByMouse: true
@@ -60,7 +60,7 @@ UM.Dialog
         onTextChanged: settingPickDialog.updateFilter()
     }
 
-    CheckBox
+    Cura.CheckBox
     {
         id: toggleShowAll
         anchors