Browse Source

Ensure that settingPickDialog uses the themed controls

CURA-8685
Jaime van Kessel 3 years ago
parent
commit
713a5cb4e5

+ 3 - 3
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

+ 2 - 1
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
 

+ 2 - 2
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