WIP: Cleanup and unify MachineAction styles

resources/qml/ActionPanel/SliceProcessWidget.qml

@@ -9,8 +9,6 @@ import QtQuick.Controls 1.4 as Controls1
 import UM 1.1 as UM
 import Cura 1.0 as Cura
 
-import "../Widgets"
-
 
 // This element contains all the elements the user needs to create a printjob from the
 // model(s) that is(are) on the buildplate. Mainly the button to start/stop the slicing
@@ -66,7 +64,7 @@ Column
     }
 
     // Progress bar, only visible when the backend is in the process of slice the printjob
-    CuraProgressBar
+    Cura.ProgressBar
     {
         id: progressBar
         width: parent.width

resources/qml/MachineSettings/ComboBoxWithOptions.qml

@@ -92,7 +92,7 @@ UM.TooltipArea
         onContainerStackChanged: defaultOptionsModel.updateModel()
     }
 
-    CuraComboBox
+    Cura.ComboBox
     {
         id: comboBox
         anchors.left: fieldLabel.right

resources/qml/MachineSettings/SimpleCheckBox.qml

@@ -8,8 +8,6 @@ import QtQuick.Layouts 1.3
 import UM 1.3 as UM
 import Cura 1.1 as Cura
 
-import "../Widgets"
-
 
 //
 // CheckBox widget for the on/off or true/false settings in the Machine Settings Dialog.
@@ -58,7 +56,7 @@ UM.TooltipArea
         renderType: Text.NativeRendering
     }
 
-    CuraCheckBox
+    Cura.CheckBox
     {
         id: checkBox
         anchors.left: fieldLabel.right

resources/qml/Settings/SettingComboBox.qml

@@ -5,8 +5,7 @@ import QtQuick 2.10
 import QtQuick.Controls 2.3
 
 import UM 1.3 as UM
-
-import "../Widgets" as Widgets
+import Cura 1.1 as Cura
 
 
 SettingItem
@@ -14,7 +13,7 @@ SettingItem
     id: base
     property var focusItem: control
 
-    contents: Widgets.CuraComboBox
+    contents: Cura.ComboBox
     {
         id: control
 

resources/qml/WelcomePages/FirstStartMachineActionsContent.qml

@@ -58,8 +58,7 @@ Item
     {
         anchors.top: titleLabel.bottom
         anchors.bottom: nextButton.top
-        anchors.topMargin: UM.Theme.getSize("default_margin").height
-        anchors.bottomMargin: UM.Theme.getSize("default_margin").height
+        anchors.margins: UM.Theme.getSize("default_margin").width
         anchors.left: parent.left
         anchors.right: parent.right
 

resources/qml/WelcomePages/StepPanel.qml

@@ -8,8 +8,6 @@ import QtGraphicalEffects 1.0 // For the dropshadow
 import UM 1.3 as UM
 import Cura 1.1 as Cura
 
-import "../Widgets"
-
 
 Item
 {
@@ -117,7 +115,7 @@ Item
         z: panelBackground.z - 1
     }
 
-    CuraProgressBar
+    Cura.ProgressBar
     {
         id: progressBar
 

resources/qml/Widgets/CheckBox.qml

@@ -57,7 +57,7 @@ CheckBox
             width: Math.round(parent.width / 2.5)
             height: Math.round(parent.height / 2.5)
             sourceSize.height: width
-            color: !enabled ? UM.Theme.getColor("setting_control_disabled_text") : UM.Theme.getColor("setting_control_text");
+            color: !enabled ? UM.Theme.getColor("setting_control_disabled_text") : UM.Theme.getColor("setting_control_text")
             source: UM.Theme.getIcon("check")
             opacity: control.checked ? 1 : 0
             Behavior on opacity { NumberAnimation { duration: 100; } }

resources/qml/qmldir

@@ -21,10 +21,10 @@ ToolTip 1.0 ToolTip.qml
 
 # Cura/Widgets
 
-CuraCheckBox    1.0 CuraCheckBox.qml
-CuraComboBox    1.0 CuraComboBox.qml
-CuraProgressBar 1.0 CuraProgressBar.qml
-CuraTabButton   1.0 CuraTabButton.qml
+CheckBox    1.0 CheckBox.qml
+ComboBox    1.0 ComboBox.qml
+ProgressBar 1.0 ProgressBar.qml
+TabButton   1.0 TabButton.qml
 
 
 # Cura/MachineSettings