Merge branch 'master' into cura-2007

CMakeLists.txt

@@ -14,6 +14,7 @@ add_custom_command(TARGET tests POST_BUILD COMMAND "PYTHONPATH=${CMAKE_SOURCE_DI
 
 set(CURA_VERSION "master" CACHE STRING "Version name of Cura")
 set(CURA_BUILDTYPE "" CACHE STRING "Build type of Cura, eg. 'PPA'")
+configure_file(${CMAKE_SOURCE_DIR}/cura.desktop.in ${CMAKE_BINARY_DIR}/cura.desktop @ONLY)
 configure_file(cura/CuraVersion.py.in CuraVersion.py @ONLY)
 
 # Macro needed to list all sub-directory of a directory.
@@ -76,7 +77,7 @@ if(NOT APPLE AND NOT WIN32)
             FILES_MATCHING PATTERN *.py)
     install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py
             DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages/cura)
-    install(FILES cura.desktop
+    install(FILES ${CMAKE_BINARY_DIR}/cura.desktop
             DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
     install(FILES cura.sharedmimeinfo
             DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages/

cura.desktop.in

@@ -5,9 +5,9 @@ Name[de]=Cura
 GenericName=3D Printing Software
 GenericName[de]=3D-Druck-Software
 Comment=Cura converts 3D models into paths for a 3D printer. It prepares your print for maximum accuracy, minimum printing time and good reliability with many extra features that make your print come out great.
-Exec=/usr/bin/cura %F
+Exec=@CMAKE_INSTALL_FULL_BINDIR@/cura %F
-TryExec=/usr/bin/cura
+TryExec=@CMAKE_INSTALL_FULL_BINDIR@/cura
-Icon=/usr/share/cura/resources/images/cura-icon.png
+Icon=@CMAKE_INSTALL_FULL_DATADIR@/cura/resources/images/cura-icon.png
 Terminal=false
 Type=Application
 MimeType=application/sla;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;image/bmp;image/gif;image/jpeg;image/png

cura/CuraApplication.py

@@ -58,14 +58,6 @@ import copy
 import urllib
 numpy.seterr(all="ignore")
 
-#WORKAROUND: GITHUB-88 GITHUB-385 GITHUB-612
-if Platform.isLinux(): # Needed for platform.linux_distribution, which is not available on Windows and OSX
-    # For Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-qt4/+bug/941826
-    if platform.linux_distribution()[0] in ("Ubuntu", ): # TODO: Needs a "if X11_GFX == 'nvidia'" here. The workaround is only needed on Ubuntu+NVidia drivers. Other drivers are not affected, but fine with this fix.
-        import ctypes
-        from ctypes.util import find_library
-        ctypes.CDLL(find_library('GL'), ctypes.RTLD_GLOBAL)
-
 try:
     from cura.CuraVersion import CuraVersion, CuraBuildType
 except ImportError:

cura/PrinterOutputDevice.py

@@ -31,10 +31,13 @@ class PrinterOutputDevice(QObject, OutputDevice):
         self._head_y = 0
         self._head_z = 0
         self._connection_state = ConnectionState.closed
+        self._connection_text = ""
         self._time_elapsed = 0
         self._time_total = 0
         self._job_state = ""
         self._job_name = ""
+        self._error_text = ""
+        self._accepts_commands = True
 
     def requestWrite(self, node, file_name = None, filter_by_machine = False):
         raise NotImplementedError("requestWrite needs to be implemented")
@@ -69,6 +72,8 @@ class PrinterOutputDevice(QObject, OutputDevice):
     # it also sends it's own device_id (for convenience sake)
     connectionStateChanged = pyqtSignal(str)
 
+    connectionTextChanged = pyqtSignal()
+
     timeElapsedChanged = pyqtSignal()
 
     timeTotalChanged = pyqtSignal()
@@ -77,6 +82,10 @@ class PrinterOutputDevice(QObject, OutputDevice):
 
     jobNameChanged = pyqtSignal()
 
+    errorTextChanged = pyqtSignal()
+
+    acceptsCommandsChanged = pyqtSignal()
+
     @pyqtProperty(str, notify = jobStateChanged)
     def jobState(self):
         return self._job_state
@@ -102,6 +111,26 @@ class PrinterOutputDevice(QObject, OutputDevice):
             self._job_name = name
             self.jobNameChanged.emit()
 
+    @pyqtProperty(str, notify = errorTextChanged)
+    def errorText(self):
+        return self._error_text
+
+    ##  Set the error-text that is shown in the print monitor in case of an error
+    def setErrorText(self, error_text):
+        if self._error_text != error_text:
+            self._error_text = error_text
+            self.errorTextChanged.emit()
+
+    @pyqtProperty(bool, notify = acceptsCommandsChanged)
+    def acceptsCommands(self):
+        return self._accepts_commands
+
+    ##  Set a flag to signal the UI that the printer is not (yet) ready to receive commands
+    def setAcceptsCommands(self, accepts_commands):
+        if self._accepts_commands != accepts_commands:
+            self._accepts_commands = accepts_commands
+            self.acceptsCommandsChanged.emit()
+
     ##  Get the bed temperature of the bed (if any)
     #   This function is "final" (do not re-implement)
     #   /sa _getBedTemperature implementation function
@@ -266,6 +295,16 @@ class PrinterOutputDevice(QObject, OutputDevice):
         self._connection_state = connection_state
         self.connectionStateChanged.emit(self._id)
 
+    @pyqtProperty(str, notify = connectionTextChanged)
+    def connectionText(self):
+        return self._connection_text
+
+    ##  Set a text that is shown on top of the print monitor tab
+    def setConnectionText(self, connection_text):
+        if self._connection_text != connection_text:
+            self._connection_text = connection_text
+            self.connectionTextChanged.emit()
+
     ##  Ensure that close gets called when object is destroyed
     def __del__(self):
         self.close()

cura/Settings/ExtruderManager.py

@@ -301,7 +301,7 @@ class ExtruderManager(QObject):
 
         result = []
         for extruder in ExtruderManager.getInstance().getMachineExtruders(global_stack.getId()):
-            value = extruder.getRawProperty(key, "value", use_next = False)
+            value = extruder.getRawProperty(key, "value")
 
             if not value:
                 continue
@@ -334,16 +334,17 @@ class ExtruderManager(QObject):
     #   \param extruder_index The index of the extruder to get the value from.
     #   \param key The key of the setting to get the value of.
     #
-    #   \return The value of the setting for the specified extruder or None if not found.
+    #   \return The value of the setting for the specified extruder or for the
+    #   global stack if not found.
     @staticmethod
     def getExtruderValue(extruder_index, key):
         extruder = ExtruderManager.getInstance().getExtruderStack(extruder_index)
-        value = None
 
         if extruder:
-            value = extruder.getRawProperty(key, "value", use_next = False)
+            value = extruder.getRawProperty(key, "value")
-
             if isinstance(value, UM.Settings.SettingFunction):
                 value = value(extruder)
+        else: #Just a value from global.
+            value = UM.Application.getInstance().getGlobalContainerStack().getProperty(key, "value")
 
         return value

cura/Settings/ExtrudersModel.py

@@ -20,7 +20,7 @@ class ExtrudersModel(UM.Qt.ListModel.ListModel):
     NameRole = Qt.UserRole + 2
 
     ##  Colour of the material loaded in the extruder.
-    ColourRole = Qt.UserRole + 3
+    ColorRole = Qt.UserRole + 3
 
     ##  Index of the extruder, which is also the value of the setting itself.
     #
@@ -31,7 +31,7 @@ class ExtrudersModel(UM.Qt.ListModel.ListModel):
 
     ##  List of colours to display if there is no material or the material has no known
     #   colour.
-    defaultColours = ["#ffc924", "#86ec21", "#22eeee", "#245bff", "#9124ff", "#ff24c8"]
+    defaultColors = ["#ffc924", "#86ec21", "#22eeee", "#245bff", "#9124ff", "#ff24c8"]
 
     ##  Initialises the extruders model, defining the roles and listening for
     #   changes in the data.
@@ -42,7 +42,7 @@ class ExtrudersModel(UM.Qt.ListModel.ListModel):
 
         self.addRoleName(self.IdRole, "id")
         self.addRoleName(self.NameRole, "name")
-        self.addRoleName(self.ColourRole, "colour")
+        self.addRoleName(self.ColorRole, "color")
         self.addRoleName(self.IndexRole, "index")
 
         self._add_global = False
@@ -104,11 +104,11 @@ class ExtrudersModel(UM.Qt.ListModel.ListModel):
         if global_container_stack:
             if self._add_global:
                 material = global_container_stack.findContainer({ "type": "material" })
-                colour = material.getMetaDataEntry("color_code", default = self.defaultColours[0]) if material else self.defaultColours[0]
+                color = material.getMetaDataEntry("color_code", default = self.defaultColors[0]) if material else self.defaultColors[0]
                 item = {
                     "id": global_container_stack.getId(),
                     "name": "Global",
-                    "colour": colour,
+                    "color": color,
                     "index": -1
                 }
                 self.appendItem(item)
@@ -125,12 +125,12 @@ class ExtrudersModel(UM.Qt.ListModel.ListModel):
                     position = int(position)
                 except ValueError: #Not a proper int.
                     position = -1
-                default_colour = self.defaultColours[position] if position >= 0 and position < len(self.defaultColours) else self.defaultColours[0]
+                default_color = self.defaultColors[position] if position >= 0 and position < len(self.defaultColors) else self.defaultColors[0]
-                colour = material.getMetaDataEntry("color_code", default = default_colour) if material else default_colour
+                color = material.getMetaDataEntry("color_code", default = default_color) if material else default_color
                 item = { #Construct an item with only the relevant information.
                     "id": extruder.getId(),
                     "name": extruder_name,
-                    "colour": colour,
+                    "color": color,
                     "index": position
                 }
                 self.appendItem(item)

cura/Settings/MachineManager.py

@@ -168,7 +168,7 @@ class MachineManager(QObject):
                 # Save the material that needs to be changed. Multiple changes will be handled by the callback.
                 self._auto_materials_changed[str(index)] = containers[0].getId()
                 Application.getInstance().messageBox(catalog.i18nc("@window:title", "Changes on the Printer"), catalog.i18nc("@label", "Do you want to change the materials and hotends to match the material in your printer?"),
-                                                 catalog.i18nc("@label", "The materials and / or hotends on your printer were changed. For best results always slice for the materials . hotends that are inserted in your printer."),
+                                                 catalog.i18nc("@label", "The materials and / or hotends on your printer were changed. For best results always slice for the materials and hotends that are inserted in your printer."),
                                                  buttons = QMessageBox.Yes + QMessageBox.No, icon = QMessageBox.Question, callback = self._materialHotendChangedCallback)
 
         else:

cura_app.py

@@ -5,6 +5,18 @@
 
 import os
 import sys
+import platform
+
+from UM.Platform import Platform
+
+#WORKAROUND: GITHUB-88 GITHUB-385 GITHUB-612
+if Platform.isLinux(): # Needed for platform.linux_distribution, which is not available on Windows and OSX
+    # For Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-qt4/+bug/941826
+    if platform.linux_distribution()[0] in ("debian", "Ubuntu", "LinuxMint"): # TODO: Needs a "if X11_GFX == 'nvidia'" here. The workaround is only needed on Ubuntu+NVidia drivers. Other drivers are not affected, but fine with this fix.
+        import ctypes
+        from ctypes.util import find_library
+        libGL = find_library("GL")
+        ctypes.CDLL(libGL, ctypes.RTLD_GLOBAL)
 
 #WORKAROUND: GITHUB-704 GITHUB-708
 # It looks like setuptools creates a .pth file in

plugins/ChangeLogPlugin/ChangeLog.py

@@ -68,6 +68,7 @@ class ChangeLog(Extension, QObject,):
                     line = line.replace("[","")
                     line = line.replace("]","")
                     open_version = Version(line)
+                    open_header = ""
                     self._change_logs[open_version] = collections.OrderedDict()
                 elif line.startswith("*"):
                     open_header = line.replace("*","")

plugins/CuraEngineBackend/CuraEngineBackend.py

@@ -13,7 +13,6 @@ from UM.Resources import Resources
 from UM.Settings.Validator import ValidatorState #To find if a setting is in an error state. We can't slice then.
 from UM.Platform import Platform
 
-
 import cura.Settings
 
 from cura.OneAtATimeIterator import OneAtATimeIterator
@@ -33,7 +32,6 @@ import Arcus
 from UM.i18n import i18nCatalog
 catalog = i18nCatalog("cura")
 
-
 class CuraEngineBackend(Backend):
     ##  Starts the back-end plug-in.
     #
@@ -41,14 +39,30 @@ class CuraEngineBackend(Backend):
     #   with the back-end in general.
     def __init__(self):
         super().__init__()
-
         # Find out where the engine is located, and how it is called.
         # This depends on how Cura is packaged and which OS we are running on.
-        default_engine_location = os.path.join(Application.getInstallPrefix(), "bin", "CuraEngine")
+        executable_name = "CuraEngine"
-        if hasattr(sys, "frozen"):
-            default_engine_location = os.path.join(os.path.dirname(os.path.abspath(sys.executable)), "CuraEngine")
         if Platform.isWindows():
-            default_engine_location += ".exe"
+            executable_name += ".exe"
+        default_engine_location = executable_name
+        if os.path.exists(os.path.join(Application.getInstallPrefix(), "bin", executable_name)):
+            default_engine_location = os.path.join(Application.getInstallPrefix(), "bin", executable_name)
+        if hasattr(sys, "frozen"):
+            default_engine_location = os.path.join(os.path.dirname(os.path.abspath(sys.executable)), executable_name)
+        if Platform.isLinux() and not default_engine_location:
+            if not os.getenv("PATH"):
+                raise OSError("There is something wrong with your Linux installation.")
+            for pathdir in os.getenv("PATH").split(os.pathsep):
+                execpath = os.path.join(pathdir, executable_name)
+                if os.path.exists(execpath):
+                    default_engine_location = execpath
+                    break
+
+        if not default_engine_location:
+            raise EnvironmentError("Could not find CuraEngine")
+
+        Logger.log("i", "Found CuraEngine at: %s" %(default_engine_location))
+
         default_engine_location = os.path.abspath(default_engine_location)
         Preferences.getInstance().addPreference("backend/location", default_engine_location)
 

plugins/CuraEngineBackend/StartSliceJob.py

@@ -233,7 +233,7 @@ class StartSliceJob(Job):
     #   global_inherits_stack property.
     def _buildGlobalInheritsStackMessage(self, stack):
         for key in stack.getAllKeys():
-            extruder = int(stack.getProperty(key, "global_inherits_stack"))
+            extruder = int(round(float(stack.getProperty(key, "global_inherits_stack"))))
             if extruder >= 0: #Set to a specific extruder.
                 setting_extruder = self._slice_message.addRepeatedMessage("global_inherits_stack")
                 setting_extruder.name = key

plugins/PerObjectSettingsTool/PerObjectCategory.qml

@@ -13,7 +13,40 @@ import ".."
 Button {
     id: base;
 
-    style: UM.Theme.styles.sidebar_category;
+    style: ButtonStyle {
+        background: Item { }
+        label: Row
+        {
+            spacing: UM.Theme.getSize("default_lining").width
+
+            UM.RecolorImage
+            {
+                anchors.verticalCenter: parent.verticalCenter
+                height: label.height / 2
+                width: height
+                source: control.checked ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_right");
+                color: control.hovered ? palette.highlight : palette.buttonText
+            }
+            UM.RecolorImage
+            {
+                anchors.verticalCenter: parent.verticalCenter
+                height: label.height
+                width: height
+                source: control.iconSource
+                color: control.hovered ? palette.highlight : palette.buttonText
+            }
+            Label
+            {
+                id: label
+                anchors.verticalCenter: parent.verticalCenter
+                text: control.text
+                color: control.hovered ? palette.highlight : palette.buttonText
+                font.bold: true
+            }
+
+            SystemPalette { id: palette }
+        }
+    }
 
     signal showTooltip(string text);
     signal hideTooltip();

plugins/PerObjectSettingsTool/PerObjectItem.qml

@@ -16,17 +16,17 @@ UM.TooltipArea
     width: childrenRect.width;
     height: childrenRect.height;
 
-    Button
+    CheckBox
     {
         id: check
 
         text: definition.label
+        checked: addedSettingsModel.getVisible(model.key)
 
         onClicked:
         {
-            addedSettingsModel.setVisible(model.key, true);
+            addedSettingsModel.setVisible(model.key, checked);
-            settingPickDialog.visible = false
+            UM.ActiveTool.forceUpdate();
-            UM.ActiveTool.forceUpdate()
         }
     }
 }

plugins/PerObjectSettingsTool/PerObjectSettingVisibilityHandler.py

@@ -59,12 +59,18 @@ class PerObjectSettingVisibilityHandler(UM.Settings.Models.SettingVisibilityHand
                 definition = self._stack.getSettingDefinition(item)
                 if definition:
                     new_instance = SettingInstance(definition, settings)
-                    if definition.global_inherits_stack:
+                    stack_nr = -1
+                    if definition.global_inherits_stack and self._stack.getProperty("machine_extruder_count", "value") > 1:
                         #Obtain the value from the correct container stack. Only once, upon adding the setting.
-                        stack_nr = self._stack.getProperty(item, "global_inherits_stack") #Stack to get the setting from.
+                        stack_nr = str(int(round(float(self._stack.getProperty(item, "global_inherits_stack"))))) #Stack to get the setting from. Round it and remove the fractional part.
-                        if int(stack_nr) >= 0: #Only if it defines an extruder stack.
+                    if stack_nr not in ExtruderManager.getInstance().extruderIds and self._stack.getProperty("extruder_nr", "value"): #Property not defined, but we have an extruder number.
-                            extruder_stack = UM.Settings.ContainerRegistry.getInstance().findContainerStacks(id = ExtruderManager.getInstance().extruderIds[stack_nr])[0]
+                        stack_nr = str(int(round(float(self._stack.getProperty("extruder_nr", "value")))))
-                            new_instance.value = extruder_stack.getProperty(item, "value")
+                    if stack_nr in ExtruderManager.getInstance().extruderIds: #We have either a global_inherits_stack or an extruder_nr.
+                        stack = UM.Settings.ContainerRegistry.getInstance().findContainerStacks(id = ExtruderManager.getInstance().extruderIds[stack_nr])[0]
+                    else:
+                        stack = UM.Application.getInstance().getGlobalContainerStack()
+                    new_instance.setProperty("value", stack.getProperty(item, "value"))
+                    new_instance.resetState()  # Ensure that the state is not seen as a user state.
                     settings.addInstance(new_instance)
                     visibility_changed = True
                 else:

plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml

@@ -47,9 +47,9 @@ Item {
                     id: extruders_model
                     onRowsInserted: extruderSelector.visible = extruders_model.rowCount() > 1
                     onModelReset:   extruderSelector.visible = extruders_model.rowCount() > 1
-                    onModelChanged: extruderSelector.color = extruders_model.getItem(extruderSelector.currentIndex).colour
+                    onModelChanged: extruderSelector.color = extruders_model.getItem(extruderSelector.currentIndex).color
                 }
-                property string color: extruders_model.getItem(extruderSelector.currentIndex).colour
+                property string color: extruders_model.getItem(extruderSelector.currentIndex).color
                 visible: extruders_model.rowCount() > 1
                 textRole: "name"
                 width: UM.Theme.getSize("setting_control").width
@@ -128,7 +128,11 @@ Item {
                     }
                 }
 
-                onActivated: UM.ActiveTool.setProperty("SelectedActiveExtruder", extruders_model.getItem(index).id);
+                onActivated:
+                {
+                    UM.ActiveTool.setProperty("SelectedActiveExtruder", extruders_model.getItem(index).id);
+                    extruderSelector.color = extruders_model.getItem(index).color;
+                }
                 onModelChanged: updateCurrentIndex();
 
                 function updateCurrentIndex()
@@ -138,7 +142,7 @@ Item {
                         if(extruders_model.getItem(i).id == UM.ActiveTool.properties.getValue("SelectedActiveExtruder"))
                         {
                             extruderSelector.currentIndex = i;
-                            extruderSelector.color = extruders_model.getItem(i).colour;
+                            extruderSelector.color = extruders_model.getItem(i).color;
                             return;
                         }
                     }
@@ -147,6 +151,10 @@ Item {
             }
         }
 
+        Column
+        {
+            spacing: UM.Theme.getSize("default_lining").height
+
             Repeater
             {
                 id: contents
@@ -169,8 +177,8 @@ Item {
                     Loader
                     {
                         id: settingLoader
-                    width: UM.Theme.getSize("setting").width;
+                        width: UM.Theme.getSize("setting").width
-                    height: UM.Theme.getSize("section").height;
+                        height: UM.Theme.getSize("section").height
 
                         property var definition: model
                         property var settingDefinitionsModel: addedSettingsModel
@@ -215,7 +223,7 @@ Item {
 
                     Button
                     {
-                    width: UM.Theme.getSize("setting").height;
+                        width: UM.Theme.getSize("setting").height / 2;
                         height: UM.Theme.getSize("setting").height;
 
                         onClicked: addedSettingsModel.setVisible(model.key, false);
@@ -227,17 +235,17 @@ Item {
                                 UM.RecolorImage
                                 {
                                     anchors.verticalCenter: parent.verticalCenter
-                                anchors.horizontalCenter: parent.horizontalCenter
+                                    width: parent.width
-                                width: parent.width/2
                                     height: parent.height / 2
                                     sourceSize.width: width
                                     sourceSize.height: width
                                     color: control.hovered ? UM.Theme.getColor("setting_control_button_hover") : UM.Theme.getColor("setting_control_button")
-                                source: UM.Theme.getIcon("cross1")
+                                    source: UM.Theme.getIcon("minus")
                                 }
                             }
                         }
                     }
+
                     UM.SettingPropertyProvider
                     {
                         id: provider
@@ -250,6 +258,7 @@ Item {
                     }
                 }
             }
+        }
 
         Button
         {
@@ -257,7 +266,7 @@ Item {
             height: UM.Theme.getSize("setting").height;
             visible: parseInt(UM.Preferences.getValue("cura/active_mode")) == 1
 
-            text: catalog.i18nc("@action:button", "Add Setting");
+            text: catalog.i18nc("@action:button", "Select settings");
 
             style: ButtonStyle
             {
@@ -297,16 +306,28 @@ Item {
     UM.Dialog {
         id: settingPickDialog
 
-        title: catalog.i18nc("@title:window", "Pick a Setting to Customize")
+        title: catalog.i18nc("@title:window", "Select Settings to Customize for this object")
+        width: screenScaleFactor * 360;
+
         property string labelFilter: ""
 
+        onVisibilityChanged:
+        {
+            // force updating the model to sync it with addedSettingsModel
+            if(visible)
+            {
+                listview.model.forceUpdate()
+            }
+        }
+
         TextField {
-            id: filter;
+            id: filter
 
             anchors {
-                top: parent.top;
+                top: parent.top
-                left: parent.left;
+                left: parent.left
-                right: parent.right;
+                right: toggleShowAll.left
+                rightMargin: UM.Theme.getSize("default_margin").width
             }
 
             placeholderText: catalog.i18nc("@label:textbox", "Filter...");
@@ -324,6 +345,23 @@ Item {
             }
         }
 
+        CheckBox
+        {
+            id: toggleShowAll
+
+            anchors {
+                top: parent.top
+                right: parent.right
+            }
+
+            text: catalog.i18nc("@label:checkbox", "Show all")
+            checked: listview.model.showAll
+            onClicked:
+            {
+                listview.model.showAll = checked;
+            }
+        }
+
         ScrollView
         {
             id: scrollView
@@ -377,7 +415,7 @@ Item {
 
         rightButtons: [
             Button {
-                text: catalog.i18nc("@action:button", "Cancel");
+                text: catalog.i18nc("@action:button", "Close");
                 onClicked: {
                     settingPickDialog.visible = false;
                 }

plugins/SliceInfoPlugin/SliceInfo.py

@@ -11,11 +11,8 @@ from UM.i18n import i18nCatalog
 from UM.Logger import Logger
 from UM.Platform import Platform
 from UM.Qt.Duration import DurationFormat
+from UM.Job import Job
 
-import collections
-import json
-import os.path
-import copy
 import platform
 import math
 import urllib.request
@@ -24,6 +21,36 @@ import ssl
 
 catalog = i18nCatalog("cura")
 
+class SliceInfoJob(Job):
+    data = None
+    url = None
+
+    def __init__(self, url, data):
+        super().__init__()
+        self.url = url
+        self.data = data
+
+    def run(self):
+        if not self.url or not self.data:
+            Logger.log("e", "URL or DATA for sending slice info was not set!")
+            return
+
+        # Submit data
+        kwoptions = {"data" : self.data,
+                     "timeout" : 5
+                     }
+
+        if Platform.isOSX():
+            kwoptions["context"] = ssl._create_unverified_context()
+
+        try:
+            f = urllib.request.urlopen(self.url, **kwoptions)
+            Logger.log("i", "Sent anonymous slice info to %s", self.url)
+            f.close()
+        except urllib.error.HTTPError as http_exception:
+            Logger.log("e", "An HTTP error occurred while trying to send slice information: %s" % http_exception)
+        except Exception as e: # We don't want any exception to cause problems
+            Logger.log("e", "An exception occurred while trying to send slice information: %s" % e)
 
 ##      This Extension runs in the background and sends several bits of information to the Ultimaker servers.
 #       The data is only sent when the user in question gave permission to do so. All data is anonymous and
@@ -112,19 +139,10 @@ class SliceInfo(Extension):
             submitted_data = urllib.parse.urlencode(submitted_data)
             binary_data = submitted_data.encode("utf-8")
 
-            # Submit data
+            # Sending slice info non-blocking
-            kwoptions = {"data" : binary_data,
+            reportJob = SliceInfoJob(self.info_url, binary_data)
-                         "timeout" : 1
+            reportJob.start()
-                         }
-            if Platform.isOSX():
-                kwoptions["context"] = ssl._create_unverified_context()
-            try:
-                f = urllib.request.urlopen(self.info_url, **kwoptions)
-                Logger.log("i", "Sent anonymous slice info to %s", self.info_url)
-                f.close()
         except Exception as e:
-                Logger.logException("e", "An exception occurred while trying to send slice information")
-        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
+            Logger.log("e", "Exception raised while sending slice info: %s" %(repr(e))) # But we should be notified about these problems of course.

plugins/SolidView/SolidView.py

@@ -8,6 +8,7 @@ from UM.Resources import Resources
 from UM.Application import Application
 from UM.Preferences import Preferences
 from UM.View.Renderer import Renderer
+from UM.Settings.Validator import ValidatorState
 
 from UM.View.GL.OpenGL import OpenGL
 
@@ -40,27 +41,32 @@ class SolidView(View):
             self._disabled_shader.setUniformValue("u_diffuseColor2", [0.68, 0.68, 0.68, 1.0])
             self._disabled_shader.setUniformValue("u_width", 50.0)
 
-        if Application.getInstance().getGlobalContainerStack():
+        multi_extrusion = False
+
+        global_container_stack = Application.getInstance().getGlobalContainerStack()
+        if global_container_stack:
             if Preferences.getInstance().getValue("view/show_overhang"):
-                angle = Application.getInstance().getGlobalContainerStack().getProperty("support_angle", "value")
+                angle = global_container_stack.getProperty("support_angle", "value")
-                if angle is not None:
+                if angle is not None and global_container_stack.getProperty("support_angle", "validationState") == ValidatorState.Valid:
                     self._enabled_shader.setUniformValue("u_overhangAngle", math.cos(math.radians(90 - angle)))
                 else:
                     self._enabled_shader.setUniformValue("u_overhangAngle", math.cos(math.radians(0))) #Overhang angle of 0 causes no area at all to be marked as overhang.
             else:
                 self._enabled_shader.setUniformValue("u_overhangAngle", math.cos(math.radians(0)))
 
+            multi_extrusion = global_container_stack.getProperty("machine_extruder_count", "value") > 1
+
         for node in DepthFirstIterator(scene.getRoot()):
             if not node.render(renderer):
                 if node.getMeshData() and node.isVisible():
-                    # TODO: Find a better way to handle this
-                    #if node.getBoundingBoxMesh():
-                    #    renderer.queueNode(scene.getRoot(), mesh = node.getBoundingBoxMesh(),mode = Renderer.RenderLines)
 
                     uniforms = {}
-                    if self._extruders_model.rowCount() == 0:
+                    if not multi_extrusion:
-                        material = Application.getInstance().getGlobalContainerStack().findContainer({ "type": "material" })
+                        if global_container_stack:
-                        material_color = material.getMetaDataEntry("color_code", default = self._extruders_model.defaultColours[0]) if material else self._extruders_model.defaultColours[0]
+                            material = global_container_stack.findContainer({ "type": "material" })
+                            material_color = material.getMetaDataEntry("color_code", default = self._extruders_model.defaultColors[0]) if material else self._extruders_model.defaultColors[0]
+                        else:
+                            material_color = self._extruders_model.defaultColors[0]
                     else:
                         # Get color to render this mesh in from ExtrudersModel
                         extruder_index = 0
@@ -68,7 +74,7 @@ class SolidView(View):
                         if extruder_id:
                             extruder_index = max(0, self._extruders_model.find("id", extruder_id))
 
-                        material_color = self._extruders_model.getItem(extruder_index)["colour"]
+                        material_color = self._extruders_model.getItem(extruder_index)["color"]
                     try:
                         # Colors are passed as rgb hex strings (eg "#ffffff"), and the shader needs
                         # an rgba list of floats (eg [1.0, 1.0, 1.0, 1.0])

plugins/USBPrinting/FirmwareUpdateWindow.qml

@@ -32,16 +32,16 @@ UM.Dialog
             }
 
             text: {
-                if (manager.progress == 0)
+                if (manager.firmwareUpdateCompleteStatus)
-                {
-                    //: Firmware update status label
-                    return catalog.i18nc("@label","Starting firmware update, this may take a while.")
-                }
-                else if (manager.progress > 99)
                 {
                     //: Firmware update status label
                     return catalog.i18nc("@label","Firmware update completed.")
                 }
+                else if (manager.progress == 0)
+                {
+                    //: Firmware update status label
+                    return catalog.i18nc("@label","Starting firmware update, this may take a while.")
+                }
                 else
                 {
                     //: Firmware update status label
@@ -55,10 +55,10 @@ UM.Dialog
         ProgressBar
         {
             id: prog
-            value: manager.progress
+            value: manager.firmwareUpdateCompleteStatus ? 100 : manager.progress
             minimumValue: 0
             maximumValue: 100
-            indeterminate: manager.progress < 100
+            indeterminate: (manager.progress < 1) && (!manager.firmwareUpdateCompleteStatus)
             anchors
             {
                 left: parent.left;
@@ -79,7 +79,7 @@ UM.Dialog
         Button
         {
             text: catalog.i18nc("@action:button","Close");
-            enabled: manager.progress >= 100;
+            enabled: manager.firmwareUpdateCompleteStatus;
             onClicked: base.visible = false;
         }
     ]

plugins/USBPrinting/USBPrinterOutputDevice.py

@@ -21,12 +21,14 @@ catalog = i18nCatalog("cura")
 
 
 class USBPrinterOutputDevice(PrinterOutputDevice):
+
     def __init__(self, serial_port):
         super().__init__(serial_port)
         self.setName(catalog.i18nc("@item:inmenu", "USB printing"))
         self.setShortDescription(catalog.i18nc("@action:button", "Print via USB"))
         self.setDescription(catalog.i18nc("@info:tooltip", "Print via USB"))
         self.setIconName("print")
+        self.setConnectionText(catalog.i18nc("@info:status", "Connected via USB"))
 
         self._serial = None
         self._serial_port = serial_port
@@ -85,12 +87,14 @@ class USBPrinterOutputDevice(PrinterOutputDevice):
         self._updating_firmware = False
 
         self._firmware_file_name = None
+        self._firmware_update_finished = False
 
         self._error_message = None
 
     onError = pyqtSignal()
 
     firmwareUpdateComplete = pyqtSignal()
+    firmwareUpdateChange = pyqtSignal()
 
     endstopStateChanged = pyqtSignal(str ,bool, arguments = ["key","state"])
 
@@ -170,6 +174,7 @@ class USBPrinterOutputDevice(PrinterOutputDevice):
     ##  Private function (threaded) that actually uploads the firmware.
     def _updateFirmware(self):
         self.setProgress(0, 100)
+        self._firmware_update_finished = False
 
         if self._connection_state != ConnectionState.closed:
             self.close()
@@ -180,7 +185,7 @@ class USBPrinterOutputDevice(PrinterOutputDevice):
             return
 
         programmer = stk500v2.Stk500v2()
-        programmer.progressCallback = self.setProgress 
+        programmer.progress_callback = self.setProgress
 
         try:
             programmer.connect(self._serial_port)
@@ -206,8 +211,10 @@ class USBPrinterOutputDevice(PrinterOutputDevice):
         programmer.close()
 
         self.setProgress(100, 100)
+        self._firmware_update_finished = True
 
         self.firmwareUpdateComplete.emit()
+        self.firmwareUpdateChange.emit()
 
     ##  Upload new firmware to machine
     #   \param filename full path of firmware file to be uploaded
@@ -216,6 +223,14 @@ class USBPrinterOutputDevice(PrinterOutputDevice):
         self._firmware_file_name = file_name
         self._update_firmware_thread.start()
 
+    @property
+    def firmwareUpdateFinished(self):
+        return self._firmware_update_finished
+
+    def resetFirmwareUpdateFinished(self):
+        self._firmware_update_finished = False
+        self.firmwareUpdateChange.emit()
+
     @pyqtSlot()
     def startPollEndstop(self):
         if not self._poll_endstop:
@@ -270,11 +285,13 @@ class USBPrinterOutputDevice(PrinterOutputDevice):
             while timeout_time > time.time():
                 line = self._readline()
                 if line is None:
+                    Logger.log("d", "No response from serial connection received.")
                     # Something went wrong with reading, could be that close was called.
                     self.setConnectionState(ConnectionState.closed)
                     return
 
                 if b"T:" in line:
+                    Logger.log("d", "Correct response for auto-baudrate detection received.")
                     self._serial.timeout = 0.5
                     sucesfull_responses += 1
                     if sucesfull_responses >= self._required_responses_auto_baud:

plugins/USBPrinting/USBPrinterOutputDeviceManager.py

@@ -48,15 +48,24 @@ class USBPrinterOutputDeviceManager(QObject, OutputDevicePlugin, Extension):
     connectionStateChanged = pyqtSignal()
 
     progressChanged = pyqtSignal()
+    firmwareUpdateChange = pyqtSignal()
 
     @pyqtProperty(float, notify = progressChanged)
     def progress(self):
         progress = 0
         for printer_name, device in self._usb_output_devices.items(): # TODO: @UnusedVariable "printer_name"
             progress += device.progress
-
         return progress / len(self._usb_output_devices)
 
+    ##  Return True if all printers finished firmware update
+    @pyqtProperty(float, notify = firmwareUpdateChange)
+    def firmwareUpdateCompleteStatus(self):
+        complete = True
+        for printer_name, device in self._usb_output_devices.items(): # TODO: @UnusedVariable "printer_name"
+            if not device.firmwareUpdateFinished:
+                complete = False
+        return complete
+
     def start(self):
         self._check_updates = True
         self._update_thread.start()
@@ -93,13 +102,20 @@ class USBPrinterOutputDeviceManager(QObject, OutputDevicePlugin, Extension):
             Message(i18n_catalog.i18nc("@info","Cannot update firmware, there were no connected printers found.")).show()
             return
 
+        for printer_connection in self._usb_output_devices:
+            self._usb_output_devices[printer_connection].resetFirmwareUpdateFinished()
         self.spawnFirmwareInterface("")
         for printer_connection in self._usb_output_devices:
             try:
                 self._usb_output_devices[printer_connection].updateFirmware(Resources.getPath(CuraApplication.ResourceTypes.Firmware, self._getDefaultFirmwareName()))
             except FileNotFoundError:
+                # Should only happen in dev environments where the resources/firmware folder is absent.
                 self._usb_output_devices[printer_connection].setProgress(100, 100)
                 Logger.log("w", "No firmware found for printer %s", printer_connection)
+                Message(i18n_catalog.i18nc("@info",
+                    "Could not find firmware required for the printer at %s.") % printer_connection).show()
+                self._firmware_view.close()
+
                 continue
 
     @pyqtSlot(str, result = bool)
@@ -200,6 +216,7 @@ class USBPrinterOutputDeviceManager(QObject, OutputDevicePlugin, Extension):
         device.connectionStateChanged.connect(self._onConnectionStateChanged)
         device.connect()
         device.progressChanged.connect(self.progressChanged)
+        device.firmwareUpdateChange.connect(self.firmwareUpdateChange)
         self._usb_output_devices[serial_port] = device
 
     ##  If one of the states of the connected devices change, we might need to add / remove them from the global list.

plugins/VersionUpgrade/VersionUpgrade21to22/MachineInstance.py

@@ -73,13 +73,21 @@ class MachineInstance:
         config.set("general", "version", "2") # Hard-code version 2, since if this number changes the programmer MUST change this entire function.
 
         import VersionUpgrade21to22 # Import here to prevent circular dependencies.
+        has_machine_qualities = self._type_name in VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.machinesWithMachineQuality()
         type_name = VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.translatePrinter(self._type_name)
-        active_profile = VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.translateProfile(self._active_profile_name)
         active_material = VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.translateProfile(self._active_material_name)
         variant = VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.translateVariant(self._variant_name, type_name)
+        variant_materials = VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.translateVariantForMaterials(self._variant_name, type_name)
+        active_profile = VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.translateProfile(self._active_profile_name)
+        if has_machine_qualities: #This machine now has machine-quality profiles.
+            active_profile += "_" + active_material + "_" + variant
+            active_material += "_" + variant_materials #That means that the profile was split into multiple.
+            current_settings = "empty" #The profile didn't know the definition ID when it was upgraded, so it will have been invalid. Sorry, your current settings are lost now.
+        else:
+            current_settings = self._name + "_current_settings"
 
         containers = [
-            self._name + "_current_settings",
+            current_settings,
             active_profile,
             active_material,
             variant,
@@ -97,4 +105,4 @@ class MachineInstance:
 
         output = io.StringIO()
         config.write(output)
-        return self._filename, output.getvalue()
+        return [self._filename], [output.getvalue()]

plugins/VersionUpgrade/VersionUpgrade21to22/Preferences.py

@@ -77,4 +77,4 @@ class Preferences:
         #Output the result as a string.
         output = io.StringIO()
         self._config.write(output)
-        return self._filename, output.getvalue()
+        return [self._filename], [output.getvalue()]

plugins/VersionUpgrade/VersionUpgrade21to22/Profile.py

@@ -91,7 +91,7 @@ class Profile:
             translated_machine = VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.translatePrinter(self._machine_type_id)
             config.set("general", "definition", translated_machine)
         else:
-            config.set("general", "definition", "fdmprinter")
+            config.set("general", "definition", "fdmprinter") #In this case, the machine definition is unknown, and it might now have machine-specific profiles, in which case this will fail.
 
         config.add_section("metadata")
         if self._type:
@@ -105,8 +105,6 @@ class Profile:
                 config.set("metadata", "variant", VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.translateVariant(self._machine_variant_name, self._machine_type_id))
             else:
                 config.set("metadata", "variant", self._machine_variant_name)
-        if self._material_name and self._type != "material":
-            config.set("metadata", "material", self._material_name)
 
         if self._settings:
             VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.translateSettings(self._settings)
@@ -128,6 +126,34 @@ class Profile:
             for item in disabled_settings_defaults[1:]:
                 disabled_defaults_string += "," + str(item)
 
+        #Material metadata may cause the file to split, so do it last to minimise processing time (do more with the copy).
+        filenames = []
+        configs = []
+        if self._material_name and self._type != "material":
+            config.set("metadata", "material", self._material_name)
+            filenames.append(self._filename)
+            configs.append(config)
+        elif self._type != "material" and self._machine_type_id in VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.machinesWithMachineQuality():
+            #Split this profile into multiple profiles, one for each material.
+            _new_materials = VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.machinesWithMachineQuality()[self._machine_type_id]["materials"]
+            _new_variants = VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.machinesWithMachineQuality()[self._machine_type_id]["variants"]
+            translated_machine = VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.translatePrinter(self._machine_type_id)
+            for material_id in _new_materials:
+                for variant_id in _new_variants:
+                    variant_id_new = VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.translateVariant(variant_id, translated_machine)
+                    filenames.append("{profile}_{material}_{variant}".format(profile = self._filename, material = material_id, variant = variant_id_new))
+                    config_copy = configparser.ConfigParser(interpolation = None)
+                    config_copy.read_dict(config) #Copy the config to a new ConfigParser instance.
+                    variant_id_new_materials = VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.translateVariantForMaterials(variant_id, translated_machine)
+                    config_copy.set("metadata", "material", "{material}_{variant}".format(material = material_id, variant = variant_id_new_materials))
+                    configs.append(config_copy)
+        else:
+            configs.append(config)
+            filenames.append(self._filename)
+
+        outputs = []
+        for config in configs:
             output = io.StringIO()
             config.write(output)
-        return self._filename, output.getvalue()
+            outputs.append(output.getvalue())
+        return filenames, outputs

plugins/VersionUpgrade/VersionUpgrade21to22/VersionUpgrade21to22.py

@@ -9,6 +9,29 @@ from . import MachineInstance # To upgrade machine instances.
 from . import Preferences #To upgrade preferences.
 from . import Profile # To upgrade profiles.
 
+##  Which machines have material-specific profiles in the new version?
+#
+#   These are the 2.1 machine identities with "has_machine_materials": true in
+#   their definitions in Cura 2.2. So these are the machines for which profiles
+#   need to split into multiple profiles, one for each material and variant.
+#
+#   Each machine has the materials and variants listed in which it needs to
+#   split, since those might be different per machine.
+#
+#   This should contain the definition as they are stated in the profiles. The
+#   inheritance structure cannot be found at this stage, since the definitions
+#   may have changed in later versions than 2.2.
+_machines_with_machine_quality = {
+    "ultimaker2plus": {
+        "materials": { "generic_abs", "generic_cpe", "generic_pla", "generic_pva" },
+        "variants": { "0.25 mm", "0.4 mm", "0.6 mm", "0.8 mm" }
+    },
+    "ultimaker2_extended_plus": {
+        "materials": { "generic_abs", "generic_cpe", "generic_pla", "generic_pva" },
+        "variants": { "0.25 mm", "0.4 mm", "0.6 mm", "0.8 mm" }
+    }
+}
+
 ##  How to translate printer names from the old version to the new.
 _printer_translations = {
     "ultimaker2plus": "ultimaker2_plus"
@@ -61,6 +84,24 @@ _variant_translations = {
     }
 }
 
+##  Cura 2.2's material profiles use a different naming scheme for variants.
+#
+#   Getting pretty stressed out by this sort of thing...
+_variant_translations_materials = {
+    "ultimaker2_plus": {
+        "0.25 mm": "ultimaker2_plus_0.25_mm",
+        "0.4 mm": "ultimaker2_plus_0.4_mm",
+        "0.6 mm": "ultimaker2_plus_0.6_mm",
+        "0.8 mm": "ultimaker2_plus_0.8_mm"
+    },
+    "ultimaker2_extended_plus": {
+        "0.25 mm": "ultimaker2_plus_0.25_mm",
+        "0.4 mm": "ultimaker2_plus_0.4_mm",
+        "0.6 mm": "ultimaker2_plus_0.6_mm",
+        "0.8 mm": "ultimaker2_plus_0.8_mm"
+    }
+}
+
 ##  Converts configuration from Cura 2.1's file formats to Cura 2.2's.
 #
 #   It converts the machine instances and profiles.
@@ -77,6 +118,13 @@ class VersionUpgrade21to22(VersionUpgrade):
         parser.read_string(serialised)
         return int(parser.get("general", "version")) #Explicitly give an exception when this fails. That means that the file format is not recognised.
 
+    ##  Gets a set of the machines which now have per-material quality profiles.
+    #
+    #   \return A set of machine identifiers.
+    @staticmethod
+    def machinesWithMachineQuality():
+        return _machines_with_machine_quality
+
     ##  Converts machine instances from format version 1 to version 2.
     #
     #   \param serialised The serialised machine instance in version 1.
@@ -181,3 +229,17 @@ class VersionUpgrade21to22(VersionUpgrade):
         if machine in _variant_translations and variant in _variant_translations[machine]:
             return _variant_translations[machine][variant]
         return variant
+
+    ##  Translates a variant name for the change from Cura 2.1 to 2.2 in
+    #   material profiles.
+    #
+    #   \param variant The name of the variant in Cura 2.1.
+    #   \param machine The name of the machine this variant is part of in Cura
+    #   2.2's naming.
+    #   \return The name of the corresponding variant for in material profiles
+    #   in Cura 2.2.
+    @staticmethod
+    def translateVariantForMaterials(variant, machine):
+        if machine in _variant_translations_materials and variant in _variant_translations_materials[machine]:
+            return _variant_translations_materials[machine][variant]
+        return variant

resources/definitions/fdmprinter.def.json

@@ -644,7 +644,7 @@
                             "minimum_value": "0.0001",
                             "maximum_value_warning": "machine_nozzle_size * 2",
                             "type": "float",
-                            "enabled": "support_interface_enable",
+                            "enabled": "extruderValue(support_extruder_nr, 'support_interface_enable')",
                             "value": "line_width",
                             "settable_per_mesh": false,
                             "settable_per_extruder": true
@@ -1053,7 +1053,7 @@
                     "unit": "°C",
                     "type": "float",
                     "default_value": 210,
-                    "minimum_value": "0",
+                    "minimum_value": "-273.15",
                     "maximum_value_warning": "260",
                     "enabled": "not (material_flow_dependent_temperature)",
                     "settable_per_mesh": false,
@@ -1091,7 +1091,7 @@
                     "type": "float",
                     "resolve": "sum(extruderValues('material_bed_temperature')) / len(extruderValues('material_bed_temperature'))",
                     "default_value": 60,
-                    "minimum_value": "0",
+                    "minimum_value": "-273.15",
                     "maximum_value_warning": "260",
                     "enabled": "machine_heated_bed",
                     "settable_per_mesh": false,
@@ -1148,7 +1148,7 @@
                     "type": "float",
                     "default_value": 25,
                     "minimum_value": "0",
-                    "maximum_value": "299792458000",
+                    "maximum_value": "machine_max_feedrate_e",
                     "maximum_value_warning": "100",
                     "enabled": "retraction_enable",
                     "settable_per_mesh": false,
@@ -1161,7 +1161,7 @@
                             "type": "float",
                             "default_value": 25,
                             "minimum_value": "0",
-                            "maximum_value": "299792458000",
+                            "maximum_value": "machine_max_feedrate_e",
                             "maximum_value_warning": "100",
                             "enabled": "retraction_enable",
                             "value": "retraction_speed",
@@ -1175,7 +1175,7 @@
                             "type": "float",
                             "default_value": 25,
                             "minimum_value": "0",
-                            "maximum_value": "299792458000",
+                            "maximum_value": "machine_max_feedrate_e",
                             "maximum_value_warning": "100",
                             "enabled": "retraction_enable",
                             "value": "retraction_speed",
@@ -1270,7 +1270,7 @@
                     "type": "float",
                     "unit": "°C",
                     "default_value": 150,
-                    "minimum_value": "0",
+                    "minimum_value": "-273.15",
                     "maximum_value_warning": "260",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true
@@ -1360,7 +1360,7 @@
                     "type": "float",
                     "minimum_value": "0.1",
                     "maximum_value_warning": "150",
-                    "maximum_value": "299792458000",
+                    "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                     "default_value": 60,
                     "settable_per_mesh": true,
                     "children":
@@ -1372,7 +1372,7 @@
                             "unit": "mm/s",
                             "type": "float",
                             "minimum_value": "0.1",
-                            "maximum_value": "299792458000",
+                            "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                             "maximum_value_warning": "150",
                             "default_value": 60,
                             "value": "speed_print",
@@ -1385,7 +1385,7 @@
                             "unit": "mm/s",
                             "type": "float",
                             "minimum_value": "0.1",
-                            "maximum_value": "299792458000",
+                            "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                             "maximum_value_warning": "150",
                             "default_value": 30,
                             "value": "speed_print / 2",
@@ -1399,7 +1399,7 @@
                                     "unit": "mm/s",
                                     "type": "float",
                                     "minimum_value": "0.1",
-                                    "maximum_value": "299792458000",
+                                    "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                                     "maximum_value_warning": "150",
                                     "default_value": 30,
                                     "value": "speed_wall",
@@ -1412,7 +1412,7 @@
                                     "unit": "mm/s",
                                     "type": "float",
                                     "minimum_value": "0.1",
-                                    "maximum_value": "299792458000",
+                                    "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                                     "maximum_value_warning": "150",
                                     "default_value": 60,
                                     "value": "speed_wall * 2",
@@ -1427,7 +1427,7 @@
                             "unit": "mm/s",
                             "type": "float",
                             "minimum_value": "0.1",
-                            "maximum_value": "299792458000",
+                            "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                             "maximum_value_warning": "150",
                             "default_value": 30,
                             "value": "speed_print / 2",
@@ -1440,7 +1440,7 @@
                             "unit": "mm/s",
                             "type": "float",
                             "minimum_value": "0.1",
-                            "maximum_value": "299792458000",
+                            "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                             "maximum_value_warning": "150",
                             "default_value": 60,
                             "value": "speed_print",
@@ -1457,7 +1457,7 @@
                                     "type": "float",
                                     "default_value": 60,
                                     "minimum_value": "0.1",
-                                    "maximum_value": "299792458000",
+                                    "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                                     "maximum_value_warning": "150",
                                     "value": "speed_support",
                                     "enabled": "support_enable",
@@ -1472,9 +1472,9 @@
                                     "type": "float",
                                     "default_value": 40,
                                     "minimum_value": "0.1",
-                                    "maximum_value": "299792458000",
+                                    "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                                     "maximum_value_warning": "150",
-                                    "enabled": "support_interface_enable and support_enable",
+                                    "enabled": "extruderValue(support_extruder_nr, 'support_interface_enable') and support_enable",
                                     "value": "speed_support / 1.5",
                                     "settable_per_mesh": false,
                                     "settable_per_extruder": true
@@ -1491,6 +1491,7 @@
                             "default_value": 60,
                             "value": "speed_print",
                             "minimum_value": "0.1",
+                            "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                             "maximum_value_warning": "150",
                             "settable_per_mesh": false,
                             "settable_per_extruder": true
@@ -1505,7 +1506,7 @@
                     "type": "float",
                     "default_value": 120,
                     "minimum_value": "0.1",
-                    "maximum_value": "299792458000",
+                    "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                     "maximum_value_warning": "300",
                     "value": "speed_print if magic_spiralize else 120",
                     "settable_per_mesh": false,
@@ -1518,7 +1519,7 @@
                     "type": "float",
                     "default_value": 30,
                     "minimum_value": "0.1",
-                    "maximum_value": "299792458000",
+                    "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                     "maximum_value_warning": "300",
                     "settable_per_mesh": true,
                     "children":
@@ -1532,7 +1533,7 @@
                             "default_value": 30,
                             "value": "speed_layer_0",
                             "minimum_value": "0.1",
-                            "maximum_value": "299792458000",
+                            "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                             "maximum_value_warning": "300",
                             "settable_per_mesh": true
                         },
@@ -1545,7 +1546,7 @@
                             "default_value": 60,
                             "value": "speed_layer_0 * speed_travel / speed_print",
                             "minimum_value": "0.1",
-                            "maximum_value": "299792458000",
+                            "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                             "maximum_value_warning": "300",
                             "settable_per_extruder": true,
                             "settable_per_mesh": false
@@ -1559,13 +1560,26 @@
                     "type": "float",
                     "default_value": 30,
                     "minimum_value": "0.1",
-                    "maximum_value": "299792458000",
+                    "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                     "maximum_value_warning": "300",
                     "value": "speed_layer_0",
                     "enabled": "adhesion_type == \"skirt\" or adhesion_type == \"brim\"",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true
                 },
+                "max_feedrate_z_override":
+                {
+                    "label": "Maximum Z Speed",
+                    "description": "The maximum speed with which the bed is moved. Setting this to zero causes the print to use the firmware defaults for the maximum z speed.",
+                    "unit": "mm/s",
+                    "type": "float",
+                    "default_value": 0,
+                    "minimum_value": "0",
+                    "maximum_value": "299792458000",
+                    "maximum_value_warning": "machine_max_feedrate_z",
+                    "settable_per_mesh": false,
+                    "settable_per_extruder": true
+                },
                 "speed_slowdown_layers":
                 {
                     "label": "Number of Slower Layers",
@@ -1573,11 +1587,33 @@
                     "type": "int",
                     "default_value": 2,
                     "minimum_value": "0",
-                    "maximum_value": "299792458000",
+                    "maximum_value_warning": "1.0 / layer_height",
-                    "maximum_value_warning": "300",
                     "settable_per_mesh": false,
                     "settable_per_extruder": false
                 },
+                "speed_equalize_flow_enabled":
+                {
+                    "label": "Equalize Filament Flow",
+                    "description": "Print thinner than normal lines faster so that the amount of material extruded per second remains the same. Thin pieces in your model might require lines printed with smaller line width than provided in the settings. This setting controls the speed changes for such lines.",
+                    "type": "bool",
+                    "default_value": false,
+                    "settable_per_mesh": false,
+                    "settable_per_extruder": true
+                },
+                "speed_equalize_flow_max":
+                {
+                    "label": "Maximum Speed for Flow Equalization",
+                    "description": "Maximum print speed when adjusting the print speed in order to equalize flow.",
+                    "type": "float",
+                    "unit": "mm/s",
+                    "enabled": "speed_equalize_flow_enabled",
+                    "default_value": 150,
+                    "minimum_value": "0.1",
+                    "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
+                    "maximum_value_warning": "150",
+                    "settable_per_mesh": false,
+                    "settable_per_extruder": true
+                },
 
 
                 "acceleration_enabled": {
@@ -1705,7 +1741,7 @@
                                     "minimum_value": "0.1",
                                     "minimum_value_warning": "100",
                                     "maximum_value_warning": "10000",
-                                    "enabled": "acceleration_enabled and support_interface_enable and support_enable",
+                                    "enabled": "acceleration_enabled and extruderValue(support_extruder_nr, 'support_interface_enable') and support_enable",
                                     "settable_per_mesh": false,
                                     "settable_per_extruder": true
                                 }
@@ -1924,7 +1960,7 @@
                                     "minimum_value": "0.1",
                                     "minimum_value_warning": "5",
                                     "maximum_value_warning": "50",
-                                    "enabled": "jerk_enabled and support_interface_enable and support_enable",
+                                    "enabled": "jerk_enabled and extruderValue(support_extruder_nr, 'support_interface_enable') and support_enable",
                                     "settable_per_mesh": false,
                                     "settable_per_extruder": true
                                 }
@@ -2262,6 +2298,7 @@
                     },
                     "default_value": "zigzag",
                     "enabled": "support_enable",
+                    "global_inherits_stack": "support_extruder_nr",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true
                 },
@@ -2271,7 +2308,7 @@
                     "description": "Connect the ZigZags. This will increase the strength of the zig zag support structure.",
                     "type": "bool",
                     "default_value": true,
-                    "enabled": "support_enable and (support_pattern == \"zigzag\")",
+                    "enabled": "support_enable and (support_pattern == 'zigzag')",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true
                 },
@@ -2311,7 +2348,7 @@
                     "type": "float",
                     "minimum_value": "0",
                     "maximum_value_warning": "10",
-                    "default_value": 0.15,
+                    "default_value": 0.1,
                     "global_inherits_stack": "support_extruder_nr",
                     "enabled": "support_enable",
                     "settable_per_mesh": true,
@@ -2324,10 +2361,10 @@
                             "unit": "mm",
                             "minimum_value": "0",
                             "maximum_value_warning": "10",
-                            "default_value": 0.15,
+                            "default_value": 0.1,
                             "type": "float",
                             "enabled": "support_enable",
-                            "value": "support_z_distance",
+                            "value": "extruderValue(support_extruder_nr, 'support_z_distance')",
                             "global_inherits_stack": "support_extruder_nr",
                             "settable_per_mesh": true
                         },
@@ -2339,7 +2376,7 @@
                             "minimum_value": "0",
                             "maximum_value_warning": "10",
                             "default_value": 0.1,
-                            "value": "0.1 if support_type == 'everywhere' else 0",
+                            "value": "extruderValue(support_extruder_nr, 'support_z_distance') if support_type == 'everywhere' else 0",
                             "global_inherits_stack": "support_extruder_nr",
                             "type": "float",
                             "enabled": "support_enable and support_type == 'everywhere'",
@@ -2383,7 +2420,7 @@
                     "default_value": 0.2,
                     "value": "machine_nozzle_size / 2",
                     "global_inherits_stack": "support_extruder_nr",
-                    "enabled": "support_enable and support_xy_overrides_z=='z_overrides_xy'",
+                    "enabled": "support_enable and extruderValue(support_extruder_nr, 'support_xy_overrides_z') == 'z_overrides_xy'",
                     "settable_per_mesh": true
                 },
                 "support_bottom_stair_step_height":
@@ -2458,7 +2495,7 @@
                     "minimum_value": "0",
                     "global_inherits_stack": "support_extruder_nr",
                     "maximum_value_warning": "10",
-                    "enabled": "support_interface_enable and support_enable",
+                    "enabled": "extruderValue(support_extruder_nr, 'support_interface_enable') and support_enable",
                     "settable_per_mesh": true,
                     "children":
                     {
@@ -2469,11 +2506,11 @@
                             "unit": "mm",
                             "type": "float",
                             "default_value": 1,
-                            "value": "support_interface_height",
+                            "value": "extruderValue(support_extruder_nr, 'support_interface_height')",
                             "minimum_value": "0",
                             "global_inherits_stack": "support_extruder_nr",
                             "maximum_value_warning": "10",
-                            "enabled": "support_interface_enable and support_enable",
+                            "enabled": "extruderValue(support_extruder_nr, 'support_interface_enable') and support_enable",
                             "settable_per_mesh": true
                         },
                         "support_bottom_height":
@@ -2483,12 +2520,12 @@
                             "unit": "mm",
                             "type": "float",
                             "default_value": 1,
-                            "value": "support_interface_height",
+                            "value": "extruderValue(support_extruder_nr, 'support_interface_height')",
                             "minimum_value": "0",
-                            "minimum_value_warning": "support_bottom_stair_step_height",
+                            "minimum_value_warning": "extruderValue(support_extruder_nr, 'support_bottom_stair_step_height')",
                             "global_inherits_stack": "support_extruder_nr",
                             "maximum_value_warning": "10",
-                            "enabled": "support_interface_enable and support_enable",
+                            "enabled": "extruderValue(support_extruder_nr, 'support_interface_enable') and support_enable",
                             "settable_per_mesh": true
                         }
                     }
@@ -2502,7 +2539,8 @@
                     "default_value": 100,
                     "minimum_value": "0",
                     "maximum_value_warning": "100",
-                    "enabled":"support_interface_enable and support_enable",
+                    "global_inherits_stack": "support_extruder_nr",
+                    "enabled": "extruderValue(support_extruder_nr, 'support_interface_enable') and support_enable",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true,
                     "children":
@@ -2516,7 +2554,8 @@
                             "default_value": 0.4,
                             "minimum_value": "0",
                             "value": "0 if support_interface_density == 0 else (support_interface_line_width * 100) / support_interface_density * (2 if support_interface_pattern == \"grid\" else (3 if support_interface_pattern == \"triangles\" else 1))",
-                            "enabled": "support_interface_enable and support_enable",
+                            "global_inherits_stack": "support_extruder_nr",
+                            "enabled": "extruderValue(support_extruder_nr, 'support_interface_enable') and support_enable",
                             "settable_per_mesh": false,
                             "settable_per_extruder": true
                         }
@@ -2536,7 +2575,8 @@
                         "zigzag": "Zig Zag"
                     },
                     "default_value": "concentric",
-                    "enabled": "support_interface_enable and support_enable",
+                    "global_inherits_stack": "support_extruder_nr",
+                    "enabled": "extruderValue(support_extruder_nr, 'support_interface_enable') and support_enable",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true
                 },
@@ -2560,7 +2600,7 @@
                     "global_inherits_stack": "support_extruder_nr",
                     "minimum_value": "0",
                     "maximum_value_warning": "10",
-                    "enabled": "support_enable and support_use_towers",
+                    "enabled": "support_enable and extruderValue(support_extruder_nr, 'support_use_towers')",
                     "settable_per_mesh": true
                 },
                 "support_minimal_diameter":
@@ -2573,8 +2613,8 @@
                     "global_inherits_stack": "support_extruder_nr",
                     "minimum_value": "0",
                     "maximum_value_warning": "10",
-                    "maximum_value": "support_tower_diameter",
+                    "maximum_value": "extruderValue(support_extruder_nr, 'support_tower_diameter')",
-                    "enabled": "support_enable and support_use_towers",
+                    "enabled": "support_enable and extruderValue(support_extruder_nr, 'support_use_towers')",
                     "settable_per_mesh": true
                 },
                 "support_tower_roof_angle":
@@ -2587,7 +2627,7 @@
                     "maximum_value": "90",
                     "default_value": 65,
                     "global_inherits_stack": "support_extruder_nr",
-                    "enabled": "support_enable and support_use_towers",
+                    "enabled": "support_enable and extruderValue(support_extruder_nr, 'support_use_towers')",
                     "settable_per_mesh": true
                 }
             }
@@ -2709,6 +2749,16 @@
                         }
                     }
                 },
+                "brim_outside_only":
+                {
+                    "label": "Brim Only on Outside",
+                    "description": "Only print the brim on the outside of the model. This reduces the amount of brim you need to remove afterwards, while it doesn't reduce the bed adhesion that much.",
+                    "type": "bool",
+                    "default_value": true,
+                    "enabled": "adhesion_type == \"brim\"",
+                    "settable_per_mesh": false,
+                    "settable_per_extruder": true
+                },
                 "raft_margin":
                 {
                     "label": "Raft Extra Margin",
@@ -2892,7 +2942,7 @@
                     "type": "float",
                     "default_value": 20,
                     "minimum_value": "0.1",
-                    "maximum_value": "299792458000",
+                    "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                     "maximum_value_warning": "200",
                     "enabled": "adhesion_type == \"raft\"",
                     "value": "speed_print / 60 * 30",
@@ -2908,7 +2958,7 @@
                             "type": "float",
                             "default_value": 20,
                             "minimum_value": "0.1",
-                            "maximum_value": "299792458000",
+                            "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                             "maximum_value_warning": "100",
                             "enabled": "adhesion_type == \"raft\"",
                             "value": "raft_speed",
@@ -2924,7 +2974,7 @@
                             "default_value": 15,
                             "value": "raft_speed * 0.75",
                             "minimum_value": "0.1",
-                            "maximum_value": "299792458000",
+                            "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                             "maximum_value_warning": "150",
                             "enabled": "adhesion_type == \"raft\"",
                             "settable_per_mesh": false,
@@ -2938,7 +2988,7 @@
                             "type": "float",
                             "default_value": 15,
                             "minimum_value": "0.1",
-                            "maximum_value": "299792458000",
+                            "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                             "maximum_value_warning": "200",
                             "enabled": "adhesion_type == \"raft\"",
                             "value": "0.75 * raft_speed",
@@ -3136,6 +3186,7 @@
                     "description": "The extruder train to use for printing the skirt/brim/raft. This is used in multi-extrusion.",
                     "type": "extruder",
                     "default_value": "0",
+                    "enabled": "machine_extruder_count > 1",
                     "settable_per_mesh": false,
                     "settable_per_extruder": false
                 },
@@ -3145,7 +3196,7 @@
                     "description": "The extruder train to use for printing the support. This is used in multi-extrusion.",
                     "type": "extruder",
                     "default_value": "0",
-                    "enabled": "support_enable",
+                    "enabled": "support_enable and machine_extruder_count > 1",
                     "settable_per_mesh": false,
                     "settable_per_extruder": false,
                     "children": {
@@ -3156,7 +3207,7 @@
                             "type": "extruder",
                             "default_value": "0",
                             "value": "support_extruder_nr",
-                            "enabled": "support_enable",
+                            "enabled": "support_enable and machine_extruder_count > 1",
                             "settable_per_mesh": false,
                             "settable_per_extruder": false
                         },
@@ -3167,7 +3218,7 @@
                             "type": "extruder",
                             "default_value": "0",
                             "value": "support_extruder_nr",
-                            "enabled": "support_enable",
+                            "enabled": "support_enable and machine_extruder_count > 1",
                             "settable_per_mesh": false,
                             "settable_per_extruder": false
                         },
@@ -3178,7 +3229,7 @@
                             "type": "extruder",
                             "default_value": "0",
                             "value": "support_extruder_nr",
-                            "enabled": "support_enable and support_interface_enable",
+                            "enabled": "support_enable and machine_extruder_count > 1 and extruderValue(support_extruder_nr, 'support_interface_enable')",
                             "settable_per_mesh": false,
                             "settable_per_extruder": false
                         }
@@ -3697,7 +3748,7 @@
                     "type": "float",
                     "default_value": 5,
                     "minimum_value": "0.1",
-                    "maximum_value": "299792458000",
+                    "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2 + max(max_feedrate_z_override, machine_max_feedrate_z) ** 2)",
                     "maximum_value_warning": "50",
                     "enabled": "wireframe_enabled",
                     "settable_per_mesh": false,
@@ -3713,7 +3764,7 @@
                             "type": "float",
                             "default_value": 5,
                             "minimum_value": "0.1",
-                            "maximum_value": "299792458000",
+                            "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                             "maximum_value_warning": "50",
                             "enabled": "wireframe_enabled",
                             "value": "wireframe_printspeed",
@@ -3729,7 +3780,7 @@
                             "type": "float",
                             "default_value": 5,
                             "minimum_value": "0.1",
-                            "maximum_value": "299792458000",
+                            "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2 + max(max_feedrate_z_override, machine_max_feedrate_z) ** 2)",
                             "maximum_value_warning": "50",
                             "enabled": "wireframe_enabled",
                             "value": "wireframe_printspeed",
@@ -3745,7 +3796,7 @@
                             "type": "float",
                             "default_value": 5,
                             "minimum_value": "0.1",
-                            "maximum_value": "299792458000",
+                            "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2 + max(max_feedrate_z_override, machine_max_feedrate_z) ** 2)",
                             "maximum_value_warning": "50",
                             "enabled": "wireframe_enabled",
                             "value": "wireframe_printspeed",
@@ -3761,7 +3812,7 @@
                             "type": "float",
                             "default_value": 5,
                             "minimum_value": "0.1",
-                            "maximum_value": "299792458000",
+                            "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                             "maximum_value_warning": "100",
                             "value": "wireframe_printspeed",
                             "enabled": "wireframe_enabled",

resources/definitions/ultimaker.def.json

@@ -7,5 +7,16 @@
         "author": "Ultimaker",
         "manufacturer": "Ultimaker",
         "visible": false
+    },
+    "overrides": {
+        "material_print_temperature": {
+            "minimum_value": "0"
+        },
+        "material_bed_temperature": {
+            "minimum_value": "0"
+        },
+        "material_standby_temperature": {
+            "minimum_value": "0"
+        }
     }
 }

resources/definitions/ultimaker_original_dual.def.json

@@ -0,0 +1,76 @@
+{
+    "id": "ultimaker_original_dual",
+    "version": 2,
+    "name": "Ultimaker Original Dual Extrusion",
+    "inherits": "ultimaker",
+    "metadata": {
+        "visible": true,
+        "author": "Ultimaker",
+        "manufacturer": "Ultimaker",
+        "category": "Ultimaker",
+        "weight": 4,
+        "file_formats": "text/x-gcode",
+        "icon": "icon_ultimaker.png",
+        "platform": "ultimaker_platform.stl",
+        "has_materials": true,
+        "preferred_material": "*pla*",
+        "preferred_quality": "*normal*",
+        "machine_extruder_trains":
+        {
+            "0": "ultimaker_original_dual_left",
+            "1": "ultimaker_original_dual_right"
+        },
+        "first_start_actions": ["UMOUpgradeSelection", "UMOCheckup", "BedLevel"],
+        "supported_actions": ["UMOUpgradeSelection", "UMOCheckup", "BedLevel", "UpgradeFirmware"]
+    },
+
+    "overrides": {
+        "machine_width": {
+            "default_value": 205
+        },
+        "machine_height": {
+            "default_value": 200
+        },
+        "machine_depth": {
+            "default_value": 195
+        },
+        "machine_center_is_zero": {
+            "default_value": false
+        },
+        "machine_nozzle_size": {
+            "default_value": 0.4
+        },
+        "machine_nozzle_heat_up_speed": {
+            "default_value": 2
+        },
+        "machine_nozzle_cool_down_speed": {
+            "default_value": 2
+        },
+        "machine_head_with_fans_polygon":
+        {
+            "default_value": [
+                [ -75, 35 ],
+                [ -75, -18 ],
+                [ 18, 35 ],
+                [ 18, -18 ]
+            ]
+        },
+        "gantry_height": {
+            "default_value": 55
+        },
+        "machine_use_extruder_offset_to_offset_coords": {
+            "default_value": true
+        },
+        "machine_gcode_flavor": {
+            "default_value": "RepRap (Marlin/Sprinter)"
+        },
+        "machine_start_gcode": {
+            "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..."
+        },
+        "machine_end_gcode": {
+            "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning"
+        },
+        "machine_extruder_count": { "default_value": 2 },
+        "print_sequence": {"enabled": false}
+    }
+}

resources/definitions/ultimaker_original_plus.def.json

@@ -12,7 +12,8 @@
         "icon": "icon_ultimaker.png",
         "platform": "ultimaker2_platform.obj",
         "platform_texture": "UltimakerPlusbackplate.png",
-        "supported_actions":["UMOCheckup", "UpgradeFirmware", "BedLevel"]
+        "first_start_actions": ["UMOCheckup", "BedLevel"],
+        "supported_actions": ["UMOCheckup", "BedLevel", "UpgradeFirmware"]
     },
 
     "overrides": {

resources/extruders/ultimaker_original_dual_left.def.json

@@ -0,0 +1,19 @@
+{
+    "id": "ultimaker_original_dual_left",
+    "version": 2, 
+    "name": "Left Extruder",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "ultimaker_original_dual",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 0,
+            "maximum_value": "1"
+        },
+        "machine_nozzle_offset_x": { "default_value": 0.0 },
+        "machine_nozzle_offset_y": { "default_value": 0.0 }
+    }
+}

resources/extruders/ultimaker_original_dual_right.def.json

@@ -0,0 +1,19 @@
+{
+    "id": "ultimaker_original_dual_right",
+    "version": 2, 
+    "name": "Right Extruder",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "ultimaker_original_dual",
+        "position": "1"
+    },
+
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 1,
+            "maximum_value": "1"
+        },
+        "machine_nozzle_offset_x": { "default_value": 0.0 },
+        "machine_nozzle_offset_y": { "default_value": 21.6 }
+    }
+}

resources/materials/generic_abs.xml.fdm_material

@@ -11,7 +11,7 @@ Generic PLA profile. Serves as an example file, data in this file is not correct
         </name>
         <GUID>60636bb4-518f-42e7-8237-fe77b194ebe0</GUID>
         <version>0</version>
-        <color_code>#FF0000</color_code>
+        <color_code>#8cb219</color_code>
     </metadata>
     <properties>
         <density>1.07</density>

resources/materials/generic_cpe.xml.fdm_material

@@ -11,7 +11,7 @@ Generic PLA profile. Serves as an example file, data in this file is not correct
         </name>
         <GUID>12f41353-1a33-415e-8b4f-a775a6c70cc6</GUID>
         <version>0</version>
-        <color_code>#0000FF</color_code>
+        <color_code>#159499</color_code>
     </metadata>
     <properties>
         <density>0.94</density>

resources/materials/generic_pla.xml.fdm_material

@@ -11,7 +11,7 @@ Generic PLA profile. Serves as an example file, data in this file is not correct
         </name>
         <GUID>506c9f0d-e3aa-4bd4-b2d2-23e2425b1aa9</GUID>
         <version>0</version>
-        <color_code>#00FF00</color_code>
+        <color_code>#ffc924</color_code>
     </metadata>
     <properties>
         <density>1.3</density>

resources/qml/AddMachineDialog.qml

@@ -183,14 +183,18 @@ UM.Dialog
         text: catalog.i18nc("@action:button", "Add Printer")
         anchors.bottom: parent.bottom
         anchors.right: parent.right
-        onClicked:
+        onClicked: addMachine()
+    }
+
+    onAccepted: addMachine()
+
+    function addMachine()
     {
         base.visible = false
         var item = machineList.model.getItem(machineList.currentIndex);
         Cura.MachineManager.addMachine(machineName.text, item.id)
         base.machineAdded(item.id) // Emit signal that the user added a machine.
     }
-    }
 
     Item
     {

resources/qml/JobSpecs.qml

@@ -209,7 +209,7 @@ Rectangle {
                         lengths = ["0.00"];
                         weights = ["0"];
                     }
-                    return catalog.i18nc("@label", "%1 m / %2 g").arg(lengths.join(" + ")).arg(weights.join(" + "));
+                    return catalog.i18nc("@label", "%1 m / ~ %2 g").arg(lengths.join(" + ")).arg(weights.join(" + "));
                 }
             }
         }

resources/qml/MonitorButton.qml

@@ -15,25 +15,57 @@ Rectangle
     UM.I18nCatalog { id: catalog; name:"cura"}
 
     property bool printerConnected: Cura.MachineManager.printerOutputDevices.length != 0
-    property real progress: printerConnected ? Cura.MachineManager.printerOutputDevices[0].progress : 0;
+    property bool printerAcceptsCommands: printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands
-    property int backendState: UM.Backend.state;
+    property real progress: printerConnected ? Cura.MachineManager.printerOutputDevices[0].progress : 0
+    property int backendState: UM.Backend.state
+
+
+    property bool showProgress: {
+        // determine if we need to show the progress bar + percentage
+        if(!printerConnected || !printerAcceptsCommands) {
+            return false;
+        }
+
+        switch(Cura.MachineManager.printerOutputDevices[0].jobState)
+        {
+            case "printing":
+            case "pre_print":  // heating, etc.
+            case "paused":
+                return true;
+            case "wait_cleanup":
+            case "ready":  // nut sure if this occurs, "" seems to be the ready state.
+            case "offline":
+            case "abort":  // note sure if this jobState actually occurs in the wild
+            case "error":  // after clicking abort you apparently get "error"
+            case "":  // ready to print or getting ready
+            default:
+                return false;
+        }
+    }
 
     property variant statusColor:
     {
-        if(!printerConnected)
+        if(!printerConnected || !printerAcceptsCommands)
-            return UM.Theme.getColor("status_offline")
+            return UM.Theme.getColor("text");
-        else if(Cura.MachineManager.printerOutputDevices[0].jobState == "printing" || Cura.MachineManager.printerOutputDevices[0].jobState == "pre_print" || Cura.MachineManager.printerOutputDevices[0].jobState == "wait_cleanup" )
+
-            return UM.Theme.getColor("status_busy")
+        switch(Cura.MachineManager.printerOutputDevices[0].jobState)
-        else if(Cura.MachineManager.printerOutputDevices[0].jobState == "ready" || Cura.MachineManager.printerOutputDevices[0].jobState == "")
+        {
-            return UM.Theme.getColor("status_ready")
+            case "printing":
-        else if(Cura.MachineManager.printerOutputDevices[0].jobState == "paused")
+            case "pre_print":
-            return UM.Theme.getColor("status_paused")
+            case "wait_cleanup":
-        else if (Cura.MachineManager.printerOutputDevices[0].jobState == "error")
+                return UM.Theme.getColor("status_busy");
-            return UM.Theme.getColor("status_stopped")
+            case "ready":
-        else if (Cura.MachineManager.printerOutputDevices[0].jobState == "offline")
+            case "":
-            return UM.Theme.getColor("status_offline")
+                return UM.Theme.getColor("status_ready");
-        else
+            case "paused":
-            return UM.Theme.getColor("text")
+                return UM.Theme.getColor("status_paused");
+            case "error":
+                return UM.Theme.getColor("status_stopped");
+            case "offline":
+                return UM.Theme.getColor("status_offline");
+            default:
+                return UM.Theme.getColor("text");
+        }
     }
 
     property bool activity: Printer.getPlatformActivity;
@@ -42,31 +74,28 @@ Rectangle
     property string statusText:
     {
         if(!printerConnected)
-        {
+            return catalog.i18nc("@label:MonitorStatus", "Not connected to a printer");
-            return catalog.i18nc("@label:", "Not connected to a printer")
+        if(!printerAcceptsCommands)
-        } else if(Cura.MachineManager.printerOutputDevices[0].jobState == "offline")
+            return catalog.i18nc("@label:MonitorStatus", "Printer does not accept commands");
-        {
-            return catalog.i18nc("@label:", "Lost connection with the printer")
-        } else if(Cura.MachineManager.printerOutputDevices[0].jobState == "printing")
-        {
-            return catalog.i18nc("@label:", "Printing...")
-        } else if(Cura.MachineManager.printerOutputDevices[0].jobState == "paused")
-        {
-            return catalog.i18nc("@label:", "Paused")
-        }
-        else if(Cura.MachineManager.printerOutputDevices[0].jobState == "pre_print")
-        {
-            return catalog.i18nc("@label:", "Preparing...")
-        }
-        else if(Cura.MachineManager.printerOutputDevices[0].jobState == "wait_cleanup")
-        {
-            return catalog.i18nc("@label:", "Waiting for cleanup...")
-        }
-        else
-        {
-            return " "
-        }
 
+        var printerOutputDevice = Cura.MachineManager.printerOutputDevices[0]
+        switch(printerOutputDevice.jobState)
+        {
+            case "offline":
+                return catalog.i18nc("@label:MonitorStatus", "Lost connection with the printer");
+            case "printing":
+                return catalog.i18nc("@label:MonitorStatus", "Printing...");
+            case "paused":
+                return catalog.i18nc("@label:MonitorStatus", "Paused");
+            case "pre_print":
+                return catalog.i18nc("@label:MonitorStatus", "Preparing...");
+            case "wait_cleanup":
+                return catalog.i18nc("@label:MonitorStatus", "Please remove the print");
+            case "error":
+                return printerOutputDevice.errorText;
+            default:
+                return " ";
+        }
     }
 
     Label
@@ -79,7 +108,7 @@ Rectangle
 
         color: base.statusColor
         font: UM.Theme.getFont("large")
-        text: statusText;
+        text: statusText
     }
 
     Label
@@ -90,8 +119,8 @@ Rectangle
 
         color: base.statusColor
         font: UM.Theme.getFont("large")
-        text: Math.round(progress) + "%";
+        text: Math.round(progress) + "%"
-        visible: printerConnected
+        visible: showProgress
     }
 
     Rectangle
@@ -105,6 +134,7 @@ Rectangle
         anchors.leftMargin: UM.Theme.getSize("default_margin").width
         radius: UM.Theme.getSize("progressbar_radius").width
         color: UM.Theme.getColor("progressbar_background")
+        visible: showProgress
 
         Rectangle
         {
@@ -120,7 +150,8 @@ Rectangle
         id: abortButton
 
         visible: printerConnected
-        enabled: printerConnected && (Cura.MachineManager.printerOutputDevices[0].jobState == "paused" || Cura.MachineManager.printerOutputDevices[0].jobState == "printing")
+        enabled: printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands &&
+                 (["paused", "printing", "pre_print"].indexOf(Cura.MachineManager.printerOutputDevices[0].jobState) >= 0)
 
         height: UM.Theme.getSize("save_button_save_to_button").height
         anchors.top: progressBar.bottom
@@ -129,20 +160,35 @@ Rectangle
         anchors.rightMargin: UM.Theme.getSize("default_margin").width
 
         text: catalog.i18nc("@label:", "Abort Print")
-        onClicked: { Cura.MachineManager.printerOutputDevices[0].setJobState("abort") }
+        onClicked: Cura.MachineManager.printerOutputDevices[0].setJobState("abort")
-
 
         style: ButtonStyle
         {
             background: Rectangle
             {
                 border.width: UM.Theme.getSize("default_lining").width
-                border.color: !control.enabled ? UM.Theme.getColor("action_button_disabled_border") :
+                border.color:
-                                  control.pressed ? UM.Theme.getColor("action_button_active_border") :
+                {
-                                  control.hovered ? UM.Theme.getColor("action_button_hovered_border") : UM.Theme.getColor("action_button_border")
+                    if(!control.enabled)
-                color: !control.enabled ? UM.Theme.getColor("action_button_disabled") :
+                        return UM.Theme.getColor("action_button_disabled_border");
-                           control.pressed ? UM.Theme.getColor("action_button_active") :
+                    else if(control.pressed)
-                           control.hovered ? UM.Theme.getColor("action_button_hovered") : UM.Theme.getColor("action_button")
+                        return UM.Theme.getColor("action_button_active_border");
+                    else if(control.hovered)
+                        return UM.Theme.getColor("action_button_hovered_border");
+                    else
+                        return UM.Theme.getColor("action_button_border");
+                }
+                color:
+                {
+                    if(!control.enabled)
+                        return UM.Theme.getColor("action_button_disabled");
+                    else if(control.pressed)
+                        return UM.Theme.getColor("action_button_active");
+                    else if(control.hovered)
+                        return UM.Theme.getColor("action_button_hovered");
+                    else
+                        return UM.Theme.getColor("action_button");
+                }
                 Behavior on color { ColorAnimation { duration: 50; } }
 
                 implicitWidth: actualLabel.contentWidth + (UM.Theme.getSize("default_margin").width * 2)
@@ -151,9 +197,17 @@ Rectangle
                 {
                     id: actualLabel
                     anchors.centerIn: parent
-                    color: !control.enabled ? UM.Theme.getColor("action_button_disabled_text") :
+                    color:
-                               control.pressed ? UM.Theme.getColor("action_button_active_text") :
+                    {
-                               control.hovered ? UM.Theme.getColor("action_button_hovered_text") : UM.Theme.getColor("action_button_text")
+                        if(!control.enabled)
+                            return UM.Theme.getColor("action_button_disabled_text");
+                        else if(control.pressed)
+                            return UM.Theme.getColor("action_button_active_text");
+                        else if(control.hovered)
+                            return UM.Theme.getColor("action_button_hovered_text");
+                        else
+                            return UM.Theme.getColor("action_button_text");
+                    }
                     font: UM.Theme.getFont("action_button")
                     text: control.text;
                 }
@@ -164,10 +218,7 @@ Rectangle
 
     Button
     {
-        id: pauseButton
+        id: pauseResumeButton
-
-        visible: printerConnected
-        enabled: printerConnected && (Cura.MachineManager.printerOutputDevices[0].jobState == "paused" || Cura.MachineManager.printerOutputDevices[0].jobState == "printing")
 
         height: UM.Theme.getSize("save_button_save_to_button").height
         anchors.top: progressBar.bottom
@@ -175,20 +226,77 @@ Rectangle
         anchors.right: abortButton.left
         anchors.rightMargin: UM.Theme.getSize("default_margin").width
 
-        text: printerConnected ? Cura.MachineManager.printerOutputDevices[0].jobState == "paused" ? catalog.i18nc("@label:", "Resume") : catalog.i18nc("@label:", "Pause") : ""
+        property bool userClicked: false
-        onClicked: { Cura.MachineManager.printerOutputDevices[0].jobState == "paused" ? Cura.MachineManager.printerOutputDevices[0].setJobState("print") : Cura.MachineManager.printerOutputDevices[0].setJobState("pause") }
+        property string lastJobState: ""
+
+        visible: printerConnected
+        enabled: (!userClicked) && printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands &&
+                 (["paused", "printing"].indexOf(Cura.MachineManager.printerOutputDevices[0].jobState) >= 0)
+
+        text: {
+            var result = "";
+            var jobState = Cura.MachineManager.printerOutputDevices[0].jobState;
+            if (!printerConnected) {
+              return "";
+            }
+
+            if (lastJobState !== jobState) {
+                // the userClicked message must disappear when an "automated" jobState comes by
+                userClicked = false;
+                lastJobState = jobState;
+            }
+
+            if (jobState == "paused")
+            {
+              if (userClicked) {
+                // User feedback for pretending we're already in "printing" mode.
+                result = catalog.i18nc("@label:", "Pause");
+              } else {
+                result = catalog.i18nc("@label:", "Resume");
+              }
+            } else {
+              if (userClicked) {
+                // User feedback for pretending we're already in "pause" mode.
+                result = catalog.i18nc("@label:", "Resume");
+              } else {
+                result = catalog.i18nc("@label:", "Pause");
+              }
+            }
+            return result;
+        }
+        onClicked: {
+          var newJobState = Cura.MachineManager.printerOutputDevices[0].jobState == "paused" ? "print" : "pause";
+          Cura.MachineManager.printerOutputDevices[0].setJobState(newJobState);
+          userClicked = true;
+        }
 
         style: ButtonStyle
         {
             background: Rectangle
             {
                 border.width: UM.Theme.getSize("default_lining").width
-                border.color: !control.enabled ? UM.Theme.getColor("action_button_disabled_border") :
+                border.color:
-                                  control.pressed ? UM.Theme.getColor("action_button_active_border") :
+                {
-                                  control.hovered ? UM.Theme.getColor("action_button_hovered_border") : UM.Theme.getColor("action_button_border")
+                    if(!control.enabled)
-                color: !control.enabled ? UM.Theme.getColor("action_button_disabled") :
+                        return UM.Theme.getColor("action_button_disabled_border");
-                           control.pressed ? UM.Theme.getColor("action_button_active") :
+                    else if(control.pressed)
-                           control.hovered ? UM.Theme.getColor("action_button_hovered") : UM.Theme.getColor("action_button")
+                        return UM.Theme.getColor("action_button_active_border");
+                    else if(control.hovered)
+                        return UM.Theme.getColor("action_button_hovered_border");
+                    else
+                        return UM.Theme.getColor("action_button_border");
+                }
+                color:
+                {
+                    if(!control.enabled)
+                        return UM.Theme.getColor("action_button_disabled");
+                    else if(control.pressed)
+                        return UM.Theme.getColor("action_button_active");
+                    else if(control.hovered)
+                        return UM.Theme.getColor("action_button_hovered");
+                    else
+                        return UM.Theme.getColor("action_button");
+                }
                 Behavior on color { ColorAnimation { duration: 50; } }
 
                 implicitWidth: actualLabel.contentWidth + (UM.Theme.getSize("default_margin").width * 2)
@@ -197,11 +305,19 @@ Rectangle
                 {
                     id: actualLabel
                     anchors.centerIn: parent
-                    color: !control.enabled ? UM.Theme.getColor("action_button_disabled_text") :
+                    color:
-                               control.pressed ? UM.Theme.getColor("action_button_active_text") :
+                    {
-                               control.hovered ? UM.Theme.getColor("action_button_hovered_text") : UM.Theme.getColor("action_button_text")
+                        if(!control.enabled)
+                            return UM.Theme.getColor("action_button_disabled_text");
+                        else if(control.pressed)
+                            return UM.Theme.getColor("action_button_active_text");
+                        else if(control.hovered)
+                            return UM.Theme.getColor("action_button_hovered_text");
+                        else
+                            return UM.Theme.getColor("action_button_text");
+                    }
                     font: UM.Theme.getFont("action_button")
-                    text: control.text;
+                    text: control.text
                 }
             }
         label: Item { }

resources/qml/PrintMonitor.qml

@@ -12,6 +12,16 @@ import Cura 1.0 as Cura
 Column
 {
     id: printMonitor
+    property var connectedPrinter: printerConnected ? Cura.MachineManager.printerOutputDevices[0] : null
+
+    Label
+    {
+        text: printerConnected ? connectedPrinter.connectionText : catalog.i18nc("@label", "The printer is not connected.")
+        color: printerConnected && printerAcceptsCommands ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text")
+        font: UM.Theme.getFont("default")
+        wrapMode: Text.WordWrap
+        width: base.width
+    }
 
     Loader
     {
@@ -25,7 +35,7 @@ Column
         {
             sourceComponent: monitorItem
             property string label: machineExtruderCount.properties.value > 1 ? catalog.i18nc("@label", "Hotend Temperature %1").arg(index + 1) : catalog.i18nc("@label", "Hotend Temperature")
-            property string value: printerConnected ? Math.round(Cura.MachineManager.printerOutputDevices[0].hotendTemperatures[index]) + "°C" : ""
+            property string value: printerConnected ? Math.round(connectedPrinter.hotendTemperatures[index]) + "°C" : ""
         }
     }
     Repeater
@@ -35,7 +45,7 @@ Column
         {
             sourceComponent: monitorItem
             property string label: catalog.i18nc("@label", "Bed Temperature")
-            property string value: printerConnected ? Math.round(Cura.MachineManager.printerOutputDevices[0].bedTemperature) + "°C" : ""
+            property string value: printerConnected ? Math.round(connectedPrinter.bedTemperature) + "°C" : ""
         }
     }
 
@@ -48,19 +58,19 @@ Column
     {
         sourceComponent: monitorItem
         property string label: catalog.i18nc("@label", "Job Name")
-        property string value: printerConnected ? Cura.MachineManager.printerOutputDevices[0].jobName : ""
+        property string value: printerConnected ? connectedPrinter.jobName : ""
     }
     Loader
     {
         sourceComponent: monitorItem
         property string label: catalog.i18nc("@label", "Printing Time")
-        property string value: printerConnected ? getPrettyTime(Cura.MachineManager.printerOutputDevices[0].timeTotal) : ""
+        property string value: printerConnected ? getPrettyTime(connectedPrinter.timeTotal) : ""
     }
     Loader
     {
         sourceComponent: monitorItem
         property string label: catalog.i18nc("@label", "Estimated time left")
-        property string value: printerConnected ? getPrettyTime(Cura.MachineManager.printerOutputDevices[0].timeTotal - Cura.MachineManager.printerOutputDevices[0].timeElapsed) : ""
+        property string value: printerConnected ? getPrettyTime(connectedPrinter.timeTotal - connectedPrinter.timeElapsed) : ""
     }
 
     Component
@@ -73,7 +83,7 @@ Column
             Label
             {
                 text: label
-                color: printerConnected ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text")
+                color: printerConnected && printerAcceptsCommands ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text")
                 font: UM.Theme.getFont("default")
                 width: base.width * 0.4
                 elide: Text.ElideRight
@@ -82,7 +92,7 @@ Column
             Label
             {
                 text: value
-                color: printerConnected ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text")
+                color: printerConnected && printerAcceptsCommands ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text")
                 font: UM.Theme.getFont("default")
                 anchors.verticalCenter: parent.verticalCenter
             }

resources/qml/Settings/SettingExtruder.qml

@@ -19,7 +19,10 @@ SettingItem
         model: Cura.ExtrudersModel
         {
             id: extruders_model
+            onModelChanged: control.color = extruders_model.getItem(control.currentIndex).color
         }
+        property string color: extruders_model.getItem(control.currentIndex).color
+
         textRole: "name"
 
         anchors.fill: parent
@@ -64,7 +67,7 @@ SettingItem
                     anchors.leftMargin: UM.Theme.getSize("default_lining").width
                     anchors.verticalCenter: parent.verticalCenter
 
-                    color: extruders_model.getItem(control.currentIndex).colour
+                    color: control.color
                     border.width: UM.Theme.getSize("default_lining").width
                     border.color: !enabled ? UM.Theme.getColor("setting_control_disabled_border") : UM.Theme.getColor("setting_control_border")
                 }
@@ -105,7 +108,8 @@ SettingItem
         onActivated:
         {
             forceActiveFocus();
-            propertyProvider.setPropertyValue("value", extruders_model.getItem(index).index)
+            propertyProvider.setPropertyValue("value", extruders_model.getItem(index).index);
+            control.color = extruders_model.getItem(index).color;
         }
         onModelChanged: updateCurrentIndex();
 
@@ -121,7 +125,8 @@ SettingItem
             {
                 if(extruders_model.getItem(i).index == propertyProvider.properties.value)
                 {
-                    currentIndex = i;
+                    control.currentIndex = i;
+                    control.color = extruders_model.getItem(i).color;
                     return;
                 }
             }

resources/qml/Settings/SettingTextField.qml

@@ -100,7 +100,7 @@ SettingItem
 
             maximumLength: 10;
 
-            validator: RegExpValidator { regExp: /[0-9.,-]{0,10}/ }
+            validator: RegExpValidator { regExp: (definition.type == "int") ? /^-?[0-9]{0,10}/ : /^-?[0-9.,]{0,10}/ } // definition.type property from parent loader used to disallow fractional number entry
 
             Binding
             {

resources/qml/Sidebar.qml

@@ -28,6 +28,7 @@ Rectangle
 
     // Is there an output device for this printer?
     property bool printerConnected: Cura.MachineManager.printerOutputDevices.length != 0
+    property bool printerAcceptsCommands: printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands
 
     color: UM.Theme.getColor("sidebar");
     UM.I18nCatalog { id: catalog; name:"cura"}
@@ -107,20 +108,29 @@ Rectangle
                 onClicked: monitoringPrint = true
                 iconSource: {
                     if(!printerConnected)
-                        return UM.Theme.getIcon("tab_monitor")
+                        return UM.Theme.getIcon("tab_monitor");
-                    else if(Cura.MachineManager.printerOutputDevices[0].jobState == "printing" || Cura.MachineManager.printerOutputDevices[0].jobState == "pre_print" || Cura.MachineManager.printerOutputDevices[0].jobState == "wait_cleanup" )
+                    else if(!printerAcceptsCommands)
-                        return UM.Theme.getIcon("tab_monitor_busy")
+                        return UM.Theme.getIcon("tab_monitor_unknown");
-                    else if(Cura.MachineManager.printerOutputDevices[0].jobState == "ready" || Cura.MachineManager.printerOutputDevices[0].jobState == "")
+
+                    switch(Cura.MachineManager.printerOutputDevices[0].jobState)
+                    {
+                        case "printing":
+                        case "pre_print":
+                        case "wait_cleanup":
+                            return UM.Theme.getIcon("tab_monitor_busy");
+                        case "ready":
+                        case "":
                             return UM.Theme.getIcon("tab_monitor_connected")
-                    else if(Cura.MachineManager.printerOutputDevices[0].jobState == "paused")
+                        case "paused":
                             return UM.Theme.getIcon("tab_monitor_paused")
-                    else if (Cura.MachineManager.printerOutputDevices[0].jobState == "error")
+                        case "error":
                             return UM.Theme.getIcon("tab_monitor_stopped")
-                    else if (Cura.MachineManager.printerOutputDevices[0].jobState == "offline")
+                        case "offline":
                             return UM.Theme.getIcon("tab_monitor_offline")
-                    else
+                        default:
                             return UM.Theme.getIcon("tab_monitor")
                     }
+                }
                 checkable: true
                 checked: monitoringPrint
                 exclusiveGroup: sidebarHeaderBarGroup

resources/qml/SidebarHeader.qml

@@ -138,7 +138,7 @@ Column
                         anchors.leftMargin: (parent.height - height) / 2
                         anchors.verticalCenter: parent.verticalCenter
 
-                        color: model.colour
+                        color: model.color
                         border.width: UM.Theme.getSize("default_lining").width
                         border.color: UM.Theme.getColor("toggle_checked")
                     }

resources/qml/SidebarSimple.qml

@@ -327,7 +327,8 @@ Item
                     supportEnabled.setPropertyValue("value", false);
                 } else {
                     supportEnabled.setPropertyValue("value", true);
-                    supportExtruderNr.setPropertyValue("value", index - 1);
+                    // Send the extruder nr as a string.
+                    supportExtruderNr.setPropertyValue("value", String(index - 1));
                 }
             }
             MouseArea {
@@ -372,7 +373,7 @@ Item
         for(var extruderNumber = 0; extruderNumber < extruders.model.rowCount() ; extruderNumber++) {
             extruderModel.append({
                 text: catalog.i18nc("@label", "Print using %1").arg(extruders.model.getItem(extruderNumber).name),
-                color: extruders.model.getItem(extruderNumber).colour
+                color: extruders.model.getItem(extruderNumber).color
             })
         }
     }

resources/themes/cura/icons/notice.svg

@@ -1,13 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 16.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
+	 viewBox="0 0 30 30" xml:space="preserve">
-<path d="M240.168,503.311c-60.098,21.117-109.643-3.1-99.704-60.816c9.942-57.73,66.971-181.316,75.107-204.688
+<path d="M13.628 29.557c-3.53 1.24-6.44-.182-5.857-3.572.584-3.39 3.934-10.65 4.412-12.023.477-1.373-.438-1.75-1.42-1.19-.566.326-1.408.98-2.13 1.617-.2-.404-.482-.865-.694-1.306 1.18-1.181 3.15-2.765 5.482-3.339 2.787-.688 7.446.413 5.444 5.739-1.43 3.797-2.441 6.417-3.078 8.372-.637 1.952.125 2.365 1.239 1.6.87-.594 1.798-1.403 2.478-2.03.315.513.413.676.726 1.264-1.185 1.2-4.27 4.042-6.598 4.868h-.004zM20.942 6.071c-1.601 1.363-3.974 1.333-5.302-.067-1.328-1.399-1.106-3.638.495-5.001 1.6-1.363 3.974-1.333 5.306.062 1.323 1.399 1.1 3.639-.501 5.006h.002z"/>
-	c8.129-23.371-7.46-29.777-24.172-20.267c-9.638,5.56-23.963,16.704-36.26,27.535c-3.41-6.866-8.206-14.712-11.807-22.226
-	c20.067-20.109,53.61-47.07,93.318-56.841c47.445-11.711,126.759,7.031,92.673,97.695c-24.338,64.636-41.549,109.239-52.396,142.524
-	c-10.84,33.233,2.13,40.266,21.092,27.25c14.825-10.123,30.618-23.892,42.195-34.568c5.357,8.733,7.03,11.505,12.356,21.516
-	c-20.175,20.447-72.704,68.808-112.33,82.886H240.168z"/>
-<path d="M364.689,103.474c-27.258,23.203-67.66,22.7-90.263-1.134c-22.598-23.819-18.828-61.943,8.426-85.149
-	c27.254-23.2,67.665-22.697,90.328,1.065c22.531,23.805,18.745,61.939-8.524,85.218H364.689z"/>
 </svg>

resources/themes/cura/icons/tab_monitor_unknown.svg

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="30"
+   height="30"
+   viewBox="0 0 30 30"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="tab_monitor_unavailable.svg">
+  <metadata
+     id="metadata15">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Fill 1 Copy 3</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#000000"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1148"
+     id="namedview13"
+     showgrid="false"
+     showborder="true"
+     inkscape:zoom="12.987195"
+     inkscape:cx="14.346643"
+     inkscape:cy="15.151358"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2"
+     inkscape:snap-global="true"
+     inkscape:object-nodes="false"
+     inkscape:snap-smooth-nodes="false"
+     inkscape:snap-midpoints="false"
+     inkscape:snap-intersection-paths="false"
+     inkscape:snap-bbox="true"
+     inkscape:snap-others="false"
+     inkscape:snap-nodes="false" />
+  <!-- Generator: Sketch 3.4.4 (17249) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title4">Fill 1 Copy 3</title>
+  <desc
+     id="desc6">Created with Sketch.</desc>
+  <defs
+     id="defs8" />
+  <g
+     id="Page-1"
+     sketch:type="MSPage"
+     style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1"
+     transform="matrix(1.3157895,0,0,1.3157895,2.5,2.4999995)">
+    <g
+       id="HIG"
+       sketch:type="MSArtboardGroup"
+       transform="translate(-718,-2432)"
+       style="fill:#ffffff">
+      <path
+         d="m 718,2432 19,0 0,0.9048 -19,0 0,-0.9048 0,0 z m 0,18.0952 1.73776,0 1.7267,-0.9047 12.13477,0 1.69775,0.9047 1.70302,0 0,0.9048 -1.70166,0 -1.69911,-0.9048 -12.13593,0 -1.72554,0.8949 L 718,2451 l 0,-0.9048 0,0 z m 18.13636,-17.1904 0.86364,0 0,17.1904 -0.86364,0 0,-17.1904 0,0 z m -18.13636,0 0.86364,0 0,17.1904 -0.86364,0 0,-17.1904 0,0 z m 2.59091,1.8095 13.81818,0 0,12.6667 -13.81818,0 0,-12.6667 0,0 z m 0.86364,0.9047 12.0909,0 0,10.8572 -12.0909,0 0,-10.8572 0,0 z m 4.31818,0 3.45454,0 0,2.7143 -3.45454,0 0,-2.7143 0,0 z m -2.59091,9.9524 8.63636,0 0,0.9048 -8.63636,0 0,-0.9048 0,0 z m 3.45454,-7.2381 1.72728,0 0,0.9048 -1.72728,0 0,-0.9048 0,0 z"
+         id="Fill-1-Copy-3"
+         sketch:type="MSShapeGroup"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+  <circle
+     style="fill:#7f7f7f;fill-opacity:1"
+     id="path3337"
+     cx="22.5"
+     cy="7.5"
+     r="7.5" />
+  <g
+     style="font-style:normal;font-weight:normal;font-size:10.78604317px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     id="text3339">
+    <path
+       d="m 25.53769,5.6750499 q 0,0.5319289 -0.157999,0.9427255 -0.152732,0.4055299 -0.43713,0.7057274 -0.284397,0.3001975 -0.68466,0.5371955 -0.394997,0.236998 -0.895326,0.4318631 l 0,1.2007899 -1.853851,0 0,-1.7748518 q 0.37393,-0.1000658 0.674127,-0.2053983 0.305464,-0.1053324 0.637262,-0.3423305 0.31073,-0.2106649 0.484529,-0.4897959 0.179065,-0.279131 0.179065,-0.6319947 0,-0.5266622 -0.34233,-0.7478604 -0.337064,-0.2264648 -0.953259,-0.2264648 -0.379197,0 -0.85846,0.1632653 -0.473996,0.1632653 -0.868992,0.4213298 l -0.210665,0 0,-1.6063199 q 0.337064,-0.1421988 1.037524,-0.2949308 0.700461,-0.1579987 1.421988,-0.1579987 1.300856,0 2.064517,0.5740619 0.76366,0.5740618 0.76366,1.5009874 z M 23.51004,11.6 l -2.127715,0 0,-1.390388 2.127715,0 0,1.390388 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Verdana;-inkscape-font-specification:'Verdana Bold';fill:#ffffff"
+       id="path4144" />
+  </g>
+</svg>