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

plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml

@@ -183,6 +183,7 @@ Item {
                         settingLoader.item.showInheritButton = false
                         settingLoader.item.showLinkedSettingIcon = false
                         settingLoader.item.doDepthIndentation = false
+                        settingLoader.item.doQualityUserSettingEmphasis = false
                     }
 
                     sourceComponent:

plugins/SliceInfoPlugin/SliceInfo.py

@@ -10,6 +10,7 @@ from UM.Message import Message
 from UM.i18n import i18nCatalog
 from UM.Logger import Logger
 from UM.Platform import Platform
+from UM.Qt.Duration import DurationFormat
 
 import collections
 import json
@@ -90,7 +91,7 @@ class SliceInfo(Extension):
                 "settings": global_container_stack.serialize(), # global_container with references on used containers
                 "version": Application.getInstance().getVersion(),
                 "modelhash": "None",
-                "printtime": print_information.currentPrintTime.getDisplayString(),
+                "printtime": print_information.currentPrintTime.getDisplayString(DurationFormat.Format.ISO8601),
                 "filament": material_used,
                 "language": Preferences.getInstance().getValue("general/language"),
             }
@@ -126,4 +127,4 @@ class SliceInfo(Extension):
         except:
             # We really can't afford to have a mistake here, as this would break the sending of g-code to a device
             # (Either saving or directly to a printer). The functionality of the slice data is not *that* important.
-            pass
+            pass

resources/qml/Settings/SettingItem.qml

@@ -23,6 +23,7 @@ Item {
     property var showInheritButton: true
     property var showLinkedSettingIcon: true
     property var doDepthIndentation: true
+    property var doQualityUserSettingEmphasis: true
 
     // Create properties to put property provider stuff in (bindings break in qt 5.5.1 otherwise)
     property var state: propertyProvider.properties.state
@@ -117,7 +118,7 @@ Item {
 
             color: UM.Theme.getColor("setting_control_text");
             // emphasize the setting if it has a value in the user or quality profile
-            font: base.stackLevel != undefined && base.stackLevel <= 1 ? UM.Theme.getFont("default_italic") : UM.Theme.getFont("default")
+            font: base.doQualityUserSettingEmphasis && base.stackLevel != undefined && base.stackLevel <= 1 ? UM.Theme.getFont("default_italic") : UM.Theme.getFont("default")
         }
 
         Row

resources/qml/Settings/SettingView.qml

@@ -33,8 +33,6 @@ ScrollView
             exclude: ["machine_settings"]
             expanded: Printer.expandedCategories
             onExpandedChanged: Printer.setExpandedCategories(expanded)
-
-            filter: {}
         }
 
         delegate: Loader
@@ -183,7 +181,7 @@ ScrollView
                 //: Settings context menu action
                 text: catalog.i18nc("@action:menu", "Copy value to all extruders")
                 visible: machineExtruderCount.properties.value > 1
-                enabled: contextMenu.provider.properties.settable_per_extruder != "False"
+                enabled: contextMenu.provider != undefined && contextMenu.provider.properties.settable_per_extruder != "False"
                 onTriggered: Cura.MachineManager.copyValueToExtruders(contextMenu.key)
             }