Replace all old controls 1 comboboxes with UM.Combobox

2 files changed, 7 insertions, 14 deletions

diff --git a/plugins/SimulationView/SimulationViewMenuComponent.qml b/plugins/SimulationView/SimulationViewMenuComponent.qml
index 6dde44c8ae..2c62473764 100644
--- a/plugins/SimulationView/SimulationViewMenuComponent.qml
+++ b/plugins/SimulationView/SimulationViewMenuComponent.qml
@@ -7,7 +7,7 @@ import QtQuick.Layouts 1.1
 import QtQuick.Controls.Styles 1.1
 import QtGraphicalEffects 1.0
 
-import UM 1.0 as UM
+import UM 1.5 as UM
 import Cura 1.0 as Cura
 
 
@@ -187,7 +187,7 @@ Cura.ExpandableComponent
         {
             model: CuraApplication.getExtrudersModel()
 
-            CheckBox
+            UM.CheckBox
             {
                 id: extrudersModelCheckBox
                 checked: viewSettings.extruder_opacities[index] > 0.5 || viewSettings.extruder_opacities[index] == undefined || viewSettings.extruder_opacities[index] == ""
@@ -201,8 +201,6 @@ Cura.ExpandableComponent
                     UM.Preferences.setValue("layerview/extruder_opacities", viewSettings.extruder_opacities.join("|"));
                 }
 
-                style: UM.Theme.styles.checkbox
-
                 Rectangle
                 {
                     id: swatch
@@ -277,7 +275,7 @@ Cura.ExpandableComponent
                 }
             }
 
-            CheckBox
+            UM.CheckBox
             {
                 id: legendModelCheckBox
                 checked: model.initialValue
@@ -285,8 +283,6 @@ Cura.ExpandableComponent
                 height: UM.Theme.getSize("layerview_row").height + UM.Theme.getSize("default_lining").height
                 width: parent.width
 
-                style: UM.Theme.styles.checkbox
-
                 Rectangle
                 {
                     anchors.verticalCenter: parent.verticalCenter
@@ -315,24 +311,22 @@ Cura.ExpandableComponent
             }
         }
 
-        CheckBox
+        UM.CheckBox
         {
             checked: viewSettings.only_show_top_layers
             onClicked: UM.Preferences.setValue("view/only_show_top_layers", checked ? 1.0 : 0.0)
             text: catalog.i18nc("@label", "Only Show Top Layers")
             visible: UM.SimulationView.compatibilityMode
-            style: UM.Theme.styles.checkbox
             width: parent.width
         }
 
-        CheckBox
+        UM.CheckBox
         {
             checked: viewSettings.top_layer_count == 5
             onClicked: UM.Preferences.setValue("view/top_layer_count", checked ? 5 : 1)
             text: catalog.i18nc("@label", "Show 5 Detailed Layers On Top")
             width: parent.width
             visible: UM.SimulationView.compatibilityMode
-            style: UM.Theme.styles.checkbox
         }
 
         Repeater
diff --git a/plugins/Toolbox/resources/qml/components/ToolboxInstalledTile.qml b/plugins/Toolbox/resources/qml/components/ToolboxInstalledTile.qml
index e5c94fc996..fb59ff5d34 100644
--- a/plugins/Toolbox/resources/qml/components/ToolboxInstalledTile.qml
+++ b/plugins/Toolbox/resources/qml/components/ToolboxInstalledTile.qml
@@ -4,7 +4,7 @@
 import QtQuick 2.10
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
-import UM 1.1 as UM
+import UM 1.5 as UM
 
 Item
 {
@@ -28,7 +28,7 @@ Item
         spacing: UM.Theme.getSize("default_margin").width
         topPadding: UM.Theme.getSize("default_margin").height
 
-        CheckBox
+        UM.CheckBox
         {
             id: disableButton
             anchors.verticalCenter: pluginInfo.verticalCenter
@@ -36,7 +36,6 @@ Item
             visible: model.type == "plugin"
             width: visible ? UM.Theme.getSize("checkbox").width : 0
             enabled: !toolbox.isDownloading
-            style: UM.Theme.styles.checkbox
             onClicked: toolbox.isEnabled(model.id) ? toolbox.disable(model.id) : toolbox.enable(model.id)
         }
         Column