Merge branch '4.0' of github.com:Ultimaker/Cura

resources/qml/ActionPanel/PrintJobInformation.qml

@@ -39,8 +39,8 @@ Column
             id: byLineType
 
             property var printDuration: PrintInformation.currentPrintTime
-            property var columnWidthMultipliers: [ 0.4, 0.3, 0.3 ]
+            property var columnWidthMultipliers: [ 0.45, 0.3, 0.25 ]
-            property var columnHorizontalAligns: [ TextInput.AlignLeft, TextInput.AlignHCenter, TextInput.AlignHCenter ]
+            property var columnHorizontalAligns: [ Text.AlignLeft, Text.AlignHCenter, Text.AlignRight ]
 
             function getMaterialTable()
             {
@@ -81,6 +81,7 @@ Column
                                 width: Math.round(byLineType.width * byLineType.columnWidthMultipliers[index])
                                 height: contentHeight
                                 horizontalAlignment: byLineType.columnHorizontalAligns[index]
+                                color: UM.Theme.getColor("text")
                                 font: UM.Theme.getFont("default")
                                 wrapMode: Text.WrapAnywhere
                                 text: modelData
@@ -124,8 +125,8 @@ Column
             property var printMaterialWeights: PrintInformation.materialWeights
             property var printMaterialCosts: PrintInformation.materialCosts
             property var printMaterialNames: PrintInformation.materialNames
-            property var columnWidthMultipliers: [ 0.4, 0.2, 0.2, 0.2 ]
+            property var columnWidthMultipliers: [ 0.46, 0.18, 0.18, 0.18 ]
-            property var columnHorizontalAligns: [ TextInput.AlignLeft, TextInput.AlignHCenter, TextInput.AlignHCenter, TextInput.AlignHCenter ]
+            property var columnHorizontalAligns: [ Text.AlignLeft, Text.AlignHCenter, Text.AlignHCenter, Text.AlignRight ]
 
             function getMaterialTable()
             {
@@ -183,7 +184,8 @@ Column
                             {
                                 width: Math.round(byMaterialType.width * byMaterialType.columnWidthMultipliers[index])
                                 height: contentHeight
-                                horizontalAlignment: byLineType.columnHorizontalAligns[index]
+                                horizontalAlignment: byMaterialType.columnHorizontalAligns[index]
+                                color: UM.Theme.getColor("text")
                                 font: UM.Theme.getFont("default")
                                 wrapMode: Text.WrapAnywhere
                                 text: modelData

resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml

@@ -52,7 +52,7 @@ Button
             anchors
             {
                 left: parent.left
-                leftMargin: UM.Theme.getSize("wide_margin").width
+                leftMargin: UM.Theme.getSize("default_margin").width
                 right: parent.right
                 rightMargin: UM.Theme.getSize("wide_margin").width
             }
@@ -63,10 +63,10 @@ Button
             {
                 id: repeater
                 model: configuration.extruderConfigurations
-
+                width: parent.width
                 delegate: PrintCoreConfiguration
                 {
-                    width: Math.round(parent.width / 2)
+                    width: Math.round(parent.width / configuration.extruderConfigurations.length)
                     printCoreConfiguration: modelData
                     visible: configurationItem.isValidMaterial
                 }

resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml

@@ -7,17 +7,17 @@ import QtQuick.Controls 2.0
 import UM 1.2 as UM
 import Cura 1.0 as Cura
 
-Row
+Item
 {
     id: extruderInfo
     property var printCoreConfiguration
 
     height: information.height
-    spacing: UM.Theme.getSize("default_margin").width
 
     //Extruder icon.
     Cura.ExtruderIcon
     {
+        id: icon
         materialColor: printCoreConfiguration.material.color
         anchors.verticalCenter: parent.verticalCenter
         extruderEnabled: printCoreConfiguration.material.brand !== "" && printCoreConfiguration.hotendID !== ""
@@ -26,6 +26,13 @@ Row
     Column
     {
         id: information
+        anchors
+        {
+            left: icon.right
+            right: parent.right
+            margins: UM.Theme.getSize("default_margin").width
+        }
+
         Label
         {
             text: printCoreConfiguration.material.brand ? printCoreConfiguration.material.brand : " " //Use space so that the height is still correct.
@@ -33,6 +40,7 @@ Row
             elide: Text.ElideRight
             font: UM.Theme.getFont("default")
             color: UM.Theme.getColor("text_inactive")
+            width: parent.width
         }
         Label
         {
@@ -41,6 +49,7 @@ Row
             elide: Text.ElideRight
             font: UM.Theme.getFont("medium")
             color: UM.Theme.getColor("text")
+            width: parent.width
         }
         Label
         {
@@ -49,6 +58,7 @@ Row
             elide: Text.ElideRight
             font: UM.Theme.getFont("default")
             color: UM.Theme.getColor("text_inactive")
+            width: parent.width
         }
     }
 }

resources/qml/Menus/SettingsMenu.qml

@@ -33,7 +33,7 @@ Menu
             MenuItem
             {
                 text: catalog.i18nc("@action:inmenu", "Set as Active Extruder")
-                onTriggered: Cura.MachineManager.setExtruderIndex(model.index)
+                onTriggered: Cura.ExtruderManager.setActiveExtruderIndex(model.index)
             }
 
             MenuItem

resources/themes/cura-light/theme.json

@@ -563,6 +563,7 @@
         "message_close": [1, 1],
         "message_radius": [0.25, 0.25],
         "message_action_button": [0, 2.0],
+        "message_image": [15.0, 5.0],
 
         "infill_button_margin": [0.5, 0.5],