Merge branch 'feature_intent_interface' of github.com:Ultimaker/Cura into feature_intent_interface

resources/qml/LabelBar.qml

@@ -1,7 +1,12 @@
-import QtQuick 2.0
-import QtQuick.Controls 2.1
+// Copyright (c) 2019 Ultimaker B.V.
+// Cura is released under the terms of the LGPLv3 or higher.
+
+import QtQuick 2.10
+import QtQuick.Controls 2.3
 import QtQuick.Layouts 1.3
+
 import UM 1.2 as UM
+
 // The labelBar shows a set of labels that are evenly spaced from oneother.
 // The first item is aligned to the left, the last is aligned to the right.
 // It's intended to be used together with RadioCheckBar. As such, it needs
@@ -27,8 +32,9 @@ Item
             Item
             {
                 Layout.fillWidth: true
-                Layout.maximumWidth: index + 1 === repeater.count || repeater.count <= 1 ? itemSize : base.width / (repeater.count - 1)
+                Layout.maximumWidth: Math.round(index + 1 === repeater.count || repeater.count <= 1 ? itemSize : base.width / (repeater.count - 1))
                 height: label.height
+
                 Label
                 {
                     id: label
@@ -47,7 +53,7 @@ Item
                         // We want the center of the label to align with the center of the item, so we negatively offset by half the contentWidth
                         right: index + 1 === repeater.count ? parent.right: undefined
                         left: index + 1 === repeater.count || index === 0 ? undefined: parent.left
-                        leftMargin: (0.5 * itemSize) - 0.5 * contentWidth
+                        leftMargin: Math.round((itemSize - contentWidth) * 0.5)
                     }
                 }
             }

resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml

@@ -1,8 +1,8 @@
 // Copyright (c) 2018 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
-import QtQuick 2.7
-import QtQuick.Controls 2.0
+import QtQuick 2.10
+import QtQuick.Controls 2.3
 import QtQuick.Controls.Styles 1.4
 
 import UM 1.2 as UM

resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml

@@ -1,9 +1,9 @@
 // Copyright (c) 2018 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
-import QtQuick 2.7
-import QtQuick.Controls 2.0
-import QtQuick.Controls 1.1 as OldControls
+import QtQuick 2.10
+import QtQuick.Controls 2.3
+import QtQuick.Controls 1.4 as OldControls
 
 import UM 1.3 as UM
 import Cura 1.6 as Cura

resources/qml/PrintSetupSelector/Custom/MenuButton.qml

@@ -1,8 +1,11 @@
-import QtQuick 2.0
+// Copyright (c) 2019 Ultimaker B.V.
+// Cura is released under the terms of the LGPLv3 or higher.
+
+import QtQuick 2.10
 import QtQuick.Controls 2.3
-import Cura 1.6 as Cura
 
 import UM 1.2 as UM
+import Cura 1.6 as Cura
 
 Button
 {

resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml

@@ -1,8 +1,12 @@
-import QtQuick 2.0
+// Copyright (c) 2019 Ultimaker B.V.
+// Cura is released under the terms of the LGPLv3 or higher.
+
+import QtQuick 2.10
 import QtQuick.Controls 2.3
-import Cura 1.6 as Cura
 
 import UM 1.2 as UM
+import Cura 1.6 as Cura
+
 Popup
 {
     id: popup

resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml

@@ -1,7 +1,7 @@
 // Copyright (c) 2018 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
-import QtQuick 2.7
+import QtQuick 2.10
 import QtQuick.Controls 2.3
 import QtQuick.Layouts 1.3
 

resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml

@@ -1,7 +1,7 @@
 // Copyright (c) 2018 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
-import QtQuick 2.7
+import QtQuick 2.10
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 

resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml

@@ -1,7 +1,7 @@
 // Copyright (c) 2018 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
-import QtQuick 2.7
+import QtQuick 2.10
 import QtQuick.Controls 1.4
 import QtQuick.Controls 2.3 as Controls2
 import QtQuick.Controls.Styles 1.4

resources/qml/RadioCheckbar.qml

@@ -1,4 +1,7 @@
-import QtQuick 2.0
+// Copyright (c) 2019 Ultimaker B.V.
+// Cura is released under the terms of the LGPLv3 or higher.
+
+import QtQuick 2.10
 import QtQuick.Controls 2.3
 import QtQuick.Layouts 1.3
 import UM 1.1 as UM