Merge branch 'master' of github.com:Ultimaker/Cura into CURA-8979_Materials_Preference_Page

6 files changed, 7 insertions, 8 deletions

diff --git a/plugins/PerObjectSettingsTool/PerObjectCategory.qml b/plugins/PerObjectSettingsTool/PerObjectCategory.qml
index 99f0000393..555c661517 100644
--- a/plugins/PerObjectSettingsTool/PerObjectCategory.qml
+++ b/plugins/PerObjectSettingsTool/PerObjectCategory.qml
@@ -5,6 +5,7 @@ import QtQuick 2.2
 import QtQuick.Controls 2.1
 
 import Cura 1.5 as Cura
+import UM 1.5 as UM
 import ".."
 
 Cura.CategoryButton
diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml
index 8fbaadc5c3..9bb99f23cf 100644
--- a/resources/qml/Preferences/GeneralPage.qml
+++ b/resources/qml/Preferences/GeneralPage.qml
@@ -215,7 +215,7 @@ UM.PreferencesPage
 
                     textRole: "text"
                     model: languageList
-                    implicitWidth: UM.Theme.getSize("setting_control").width
+                    implicitWidth: UM.Theme.getSize("combobox_wide").width
                     implicitHeight: currencyField.height
 
                     function setCurrentIndex() {
@@ -255,7 +255,7 @@ UM.PreferencesPage
                     id: currencyField
                     selectByMouse: true
                     text: UM.Preferences.getValue("cura/currency")
-                    implicitWidth: UM.Theme.getSize("setting_control").width
+                    implicitWidth: UM.Theme.getSize("combobox_wide").width
                     onTextChanged: UM.Preferences.setValue("cura/currency", text)
                 }
 
@@ -284,7 +284,7 @@ UM.PreferencesPage
 
                     model: themeList
                     textRole: "text"
-                    implicitWidth: UM.Theme.getSize("setting_control").width
+                    implicitWidth: UM.Theme.getSize("combobox_wide").width
                     implicitHeight: currencyField.height
 
                     currentIndex:
diff --git a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml
index 6d3682d9ff..2ca4a9f9bf 100644
--- a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml
+++ b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml
@@ -84,19 +84,19 @@ Item
                     Layout.maximumWidth: Math.floor(parent.width * 0.7)  // Always leave >= 30% for the rest of the row.
                     height: contentHeight
                     elide: Text.ElideRight
+                    wrapMode: Text.NoWrap
                 }
 
                 UM.Label
                 {
                     text: activeQualityDetailText()
-                    font: UM.Theme.getFont("default")
                     color: UM.Theme.getColor("text_detail")
                     Layout.margins: 0
                     Layout.fillWidth: true
 
                     height: contentHeight
                     elide: Text.ElideRight
-
+                    wrapMode: Text.NoWrap
                     function activeQualityDetailText()
                     {
                         var resultMap = Cura.MachineManager.activeQualityDisplayNameMap
diff --git a/resources/qml/Settings/SettingItem.qml b/resources/qml/Settings/SettingItem.qml
index fa1976757b..6787855775 100644
--- a/resources/qml/Settings/SettingItem.qml
+++ b/resources/qml/Settings/SettingItem.qml
@@ -134,7 +134,7 @@ Item
             id: label
 
             anchors.left: parent.left
-            anchors.leftMargin: doDepthIndentation ? Math.round(UM.Theme.getSize("thin_margin").width + ((definition.depth - 1) * UM.Theme.getSize("narrow_margin").width)) : 0
+            anchors.leftMargin: doDepthIndentation ? Math.round(UM.Theme.getSize("thin_margin").width + ((definition.depth - 1) * UM.Theme.getSize("default_margin").width)) : 0
             anchors.right: settingControls.left
             anchors.verticalCenter: parent.verticalCenter
 
diff --git a/resources/quality/flsun_sr/flsun_sr_fine.inst.cfg b/resources/quality/flsun_sr/flsun_sr_fine.inst.cfg
index 1e460ba4ae..c6943185b8 100644
--- a/resources/quality/flsun_sr/flsun_sr_fine.inst.cfg
+++ b/resources/quality/flsun_sr/flsun_sr_fine.inst.cfg
@@ -27,7 +27,6 @@ infill_before_walls = False
 infill_enable_travel_optimization = False
 infill_support_angle = 50
 ironing_enabled = False
-max_skin_angle_for_expansion = 20
 retract_at_layer_change = False
 retraction_amount = 6.5
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/flsun_sr/flsun_sr_normal.inst.cfg b/resources/quality/flsun_sr/flsun_sr_normal.inst.cfg
index 826a2524bb..a5c43dc3d3 100644
--- a/resources/quality/flsun_sr/flsun_sr_normal.inst.cfg
+++ b/resources/quality/flsun_sr/flsun_sr_normal.inst.cfg
@@ -27,7 +27,6 @@ infill_before_walls = False
 infill_enable_travel_optimization = False
 infill_support_angle = 50
 ironing_enabled = False
-max_skin_angle_for_expansion = 20
 retract_at_layer_change = False
 retraction_amount = 6.5
 retraction_hop_only_when_collides = True