Fix merge conflicts from master

CURA-4213

CMakeLists.txt

@@ -52,6 +52,8 @@ if(NOT APPLE AND NOT WIN32)
             DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages/cura)
     install(FILES ${CMAKE_BINARY_DIR}/cura.desktop
             DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
+    install(FILES ${CMAKE_SOURCE_DIR}/resources/images/cura-icon.png
+            DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/128x128/apps/)
     install(FILES cura.appdata.xml
             DESTINATION ${CMAKE_INSTALL_DATADIR}/appdata)
     install(FILES cura.sharedmimeinfo

cura/CuraApplication.py

@@ -205,6 +205,8 @@ class CuraApplication(QtApplication):
         super().__init__(name = "cura", version = CuraVersion, buildtype = CuraBuildType,
                          tray_icon_name = "cura-icon-32.png")
 
+        self.default_theme = "cura-light"
+
         self.setWindowIcon(QIcon(Resources.getPath(Resources.Images, "cura-icon.png")))
 
         self.setRequiredPlugins([
@@ -486,7 +488,7 @@ class CuraApplication(QtApplication):
             f.write(data)
 
 
-    @pyqtSlot(str, result = QUrl)
+    @pyqtSlot(str, result=QUrl)
     def getDefaultPath(self, key):
         default_path = Preferences.getInstance().getValue("local_file/%s" % key)
         return QUrl.fromLocalFile(default_path)
@@ -1126,7 +1128,7 @@ class CuraApplication(QtApplication):
 
     expandedCategoriesChanged = pyqtSignal()
 
-    @pyqtProperty("QStringList", notify = expandedCategoriesChanged)
+    @pyqtProperty("QStringList", notify=expandedCategoriesChanged)
     def expandedCategories(self):
         return Preferences.getInstance().getValue("cura/categories_expanded").split(";")
 

cura/PrinterOutputDevice.py

@@ -71,6 +71,9 @@ class PrinterOutputDevice(QObject, OutputDevice):
         self._control_item = None
 
         self._qml_context = None
+        self._can_pause = True
+        self._can_abort = True
+        self._can_pre_heat_bed = True
 
     def requestWrite(self, nodes, file_name = None, filter_by_machine = False, file_handler = None):
         raise NotImplementedError("requestWrite needs to be implemented")
@@ -126,6 +129,21 @@ class PrinterOutputDevice(QObject, OutputDevice):
     # Signal to be emitted when some drastic change occurs in the remaining time (not when the time just passes on normally).
     preheatBedRemainingTimeChanged = pyqtSignal()
 
+    # Does the printer support pre-heating the bed at all
+    @pyqtProperty(bool, constant=True)
+    def canPreHeatBed(self):
+        return self._can_pre_heat_bed
+
+    # Does the printer support pause at all
+    @pyqtProperty(bool,  constant=True)
+    def canPause(self):
+        return self._can_pause
+
+    # Does the printer support abort at all
+    @pyqtProperty(bool, constant=True)
+    def canAbort(self):
+        return self._can_abort
+
     @pyqtProperty(QObject, constant=True)
     def monitorItem(self):
         # Note that we specifically only check if the monitor component is created.

cura/Settings/MachineManager.py

@@ -649,6 +649,23 @@ class MachineManager(QObject):
                 return Util.parseBool(quality.getMetaDataEntry("supported", True))
         return False
 
+    ##  Returns whether there is anything unsupported in the current set-up.
+    #
+    #   The current set-up signifies the global stack and all extruder stacks,
+    #   so this indicates whether there is any container in any of the container
+    #   stacks that is not marked as supported.
+    @pyqtProperty(bool, notify = activeQualityChanged)
+    def isCurrentSetupSupported(self) -> bool:
+        if not self._global_container_stack:
+            return False
+        for stack in [self._global_container_stack] + list(self._global_container_stack.extruders.values()):
+            for container in stack.getContainers():
+                if not container:
+                    return False
+                if not Util.parseBool(container.getMetaDataEntry("supported", True)):
+                    return False
+        return True
+
     ##  Get the Quality ID associated with the currently active extruder
     #   Note that this only returns the "quality", not the "quality_changes"
     #   \returns QualityID (string) if found, empty string otherwise

cura_app.py

@@ -54,8 +54,17 @@ import Arcus #@UnusedImport
 import cura.CuraApplication
 import cura.Settings.CuraContainerRegistry
 
+def get_cura_dir_path():
+    if Platform.isWindows():
+        return os.path.expanduser("~/AppData/Local/cura/")
+    elif Platform.isLinux():
+        return os.path.expanduser("~/.local/share/cura")
+    elif Platform.isOSX():
+        return os.path.expanduser("~/Library/Logs/cura")
+
+
 if hasattr(sys, "frozen"):
-    dirpath = os.path.expanduser("~/AppData/Local/cura/")
+    dirpath = get_cura_dir_path()
     os.makedirs(dirpath, exist_ok = True)
     sys.stdout = open(os.path.join(dirpath, "stdout.log"), "w")
     sys.stderr = open(os.path.join(dirpath, "stderr.log"), "w")

plugins/CuraEngineBackend/StartSliceJob.py

@@ -224,7 +224,18 @@ class StartSliceJob(Job):
 
         material_instance_container = stack.findContainer({"type": "material"})
 
+        settings = {}
         for key in stack.getAllKeys():
+            settings[key] = stack.getProperty(key, "value")
+            Job.yieldThread()
+
+        settings["print_bed_temperature"] = settings["material_bed_temperature"] #Renamed settings.
+        settings["print_temperature"] = settings["material_print_temperature"]
+        settings["time"] = time.strftime("%H:%M:%S") #Some extra settings.
+        settings["date"] = time.strftime("%d-%m-%Y")
+        settings["day"] = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"][int(time.strftime("%w"))]
+
+        for key, value in settings.items():
             # Do not send settings that are not settable_per_extruder.
             if not stack.getProperty(key, "settable_per_extruder"):
                 continue
@@ -233,6 +244,8 @@ class StartSliceJob(Job):
             if key == "material_guid" and material_instance_container:
                 # Also send the material GUID. This is a setting in fdmprinter, but we have no interface for it.
                 setting.value = str(material_instance_container.getMetaDataEntry("GUID", "")).encode("utf-8")
+            elif key == "machine_extruder_start_code" or key == "machine_extruder_end_code":
+                setting.value = self._expandGcodeTokens(key, value, settings)
             else:
                 setting.value = str(stack.getProperty(key, "value")).encode("utf-8")
             Job.yieldThread()
@@ -278,7 +291,7 @@ class StartSliceJob(Job):
         for key, value in settings.items(): #Add all submessages for each individual setting.
             setting_message = self._slice_message.getMessage("global_settings").addRepeatedMessage("settings")
             setting_message.name = key
-            if key == "machine_start_gcode" or key == "machine_end_gcode" or key == "machine_extruder_start_code" or key == "machine_extruder_end_code": #If it's a g-code message, use special formatting.
+            if key == "machine_start_gcode" or key == "machine_end_gcode": #If it's a g-code message, use special formatting.
                 setting_message.value = self._expandGcodeTokens(key, value, settings)
             else:
                 setting_message.value = str(value).encode("utf-8")

plugins/LayerView/LayerView.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Ultimaker B.V.
+// Copyright (c) 2017 Ultimaker B.V.
 // Cura is released under the terms of the AGPLv3 or higher.
 
 import QtQuick 2.2
@@ -492,6 +492,8 @@ Item
                 anchors.horizontalCenter: parent.horizontalCenter
                 radius: parent.handleRadius
                 color: parent.upperHandleColor
+                border.width: UM.Theme.getSize("default_lining").width
+                border.color: UM.Theme.getColor("slider_handle_border")
 
                 visible: slider.layersVisible
 
@@ -531,6 +533,8 @@ Item
                 anchors.horizontalCenter: parent.horizontalCenter
                 radius: parent.handleRadius
                 color: parent.lowerHandleColor
+                border.width: UM.Theme.getSize("default_lining").width
+                border.color: UM.Theme.getColor("slider_handle_border")
 
                 visible: slider.layersVisible
 

plugins/MachineSettingsAction/MachineSettingsAction.qml

@@ -824,7 +824,7 @@ Cura.MachineAction
                             polygon.push([-printHeadPolygon["x"]["min"], printHeadPolygon["y"]["max"]]);
                             polygon.push([-printHeadPolygon["x"]["min"],-printHeadPolygon["y"]["min"]]);
                             polygon.push([ printHeadPolygon["x"]["max"], printHeadPolygon["y"]["max"]]);
-                            polygon.push([ printHeadPolygon["x"]["max"],-printHeadPolygon["y"]["mìn"]]);
+                            polygon.push([ printHeadPolygon["x"]["max"],-printHeadPolygon["y"]["min"]]);
                             var polygon_string = JSON.stringify(polygon);
                             if(polygon_string != machineHeadPolygonProvider.properties.value)
                             {

plugins/PluginBrowser/PluginBrowser.py

@@ -47,7 +47,7 @@ class PluginBrowser(QObject, Extension):
         self._is_downloading = False
 
         self._request_header = [b"User-Agent",
-                                str.encode("%s\%s (%s %s)" % (Application.getInstance().getApplicationName(),
+                                str.encode("%s/%s (%s %s)" % (Application.getInstance().getApplicationName(),
                                                               Application.getInstance().getVersion(),
                                                               platform.system(),
                                                               platform.machine(),

plugins/PluginBrowser/PluginBrowser.qml

@@ -9,10 +9,10 @@ UM.Dialog
     id: base
 
     title: catalog.i18nc("@title:window", "Find & Update plugins")
-    width: 600
+    width: 600 * Screen.devicePixelRatio
-    height: 450
+    height: 450 * Screen.devicePixelRatio
-    minimumWidth: 350
+    minimumWidth: 350 * Screen.devicePixelRatio
-    minimumHeight: 350
+    minimumHeight: 350 * Screen.devicePixelRatio
     Item
     {
         anchors.fill: parent
@@ -198,8 +198,8 @@ UM.Dialog
             id: licenseDialog
             title: catalog.i18nc("@title:window", "Plugin License Agreement")
 
-            minimumWidth: UM.Theme.getSize("modal_window_minimum").width
+            minimumWidth: UM.Theme.getSize("license_window_minimum").width
-            minimumHeight: UM.Theme.getSize("modal_window_minimum").height
+            minimumHeight: UM.Theme.getSize("license_window_minimum").height
             width: minimumWidth
             height: minimumHeight
 

plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py

@@ -123,8 +123,17 @@ class RemovableDriveOutputDevice(OutputDevice):
     def _onFinished(self, job):
         if self._stream:
             # Explicitly closing the stream flushes the write-buffer
-            self._stream.close()
+            try:
-            self._stream = None
+                self._stream.close()
+                self._stream = None
+            except:
+                Logger.logException("w", "An execption occured while trying to write to removable drive.")
+                message = Message(catalog.i18nc("@info:status", "Could not save to removable drive {0}: {1}").format(self.getName(),
+                                                                                                       str(
+                                                                                                           job.getError())))
+                message.show()
+                self.writeError.emit(self)
+                return
 
         self._writing = False
         self.writeFinished.emit(self)

plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py

@@ -328,14 +328,15 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
     def _stopCamera(self):
         if self._camera_timer.isActive():
             self._camera_timer.stop()
-            if self._image_reply:
+
-                try:
+        if self._image_reply:
-                    self._image_reply.abort()
+            try:
-                    self._image_reply.downloadProgress.disconnect(self._onStreamDownloadProgress)
+                self._image_reply.abort()
-                except RuntimeError:
+                self._image_reply.downloadProgress.disconnect(self._onStreamDownloadProgress)
-                    pass  # It can happen that the wrapped c++ object is already deleted.
+            except RuntimeError:
-                self._image_reply = None
+                pass  # It can happen that the wrapped c++ object is already deleted.
-                self._image_request = None
+            self._image_reply = None
+            self._image_request = None
 
     def _startCamera(self):
         if self._use_stream:
@@ -756,6 +757,8 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
 
         self._createNetworkManager()
 
+        self._last_response_time = time()  # Ensure we reset the time when trying to connect (again)
+
         self.setConnectionState(ConnectionState.connecting)
         self._update()  # Manually trigger the first update, as we don't want to wait a few secs before it starts.
         if not self._use_stream:

plugins/VersionUpgrade/VersionUpgrade27to30/VersionUpgrade27to30.py

@@ -0,0 +1,56 @@
+# Copyright (c) 2017 Ultimaker B.V.
+# Cura is released under the terms of the AGPLv3 or higher.
+
+import configparser #To parse preference files.
+import io #To serialise the preference files afterwards.
+
+from UM.VersionUpgrade import VersionUpgrade #We're inheriting from this.
+
+_renamed_themes = {
+    "cura": "cura-light"
+}
+
+class VersionUpgrade27to30(VersionUpgrade):
+    ##  Gets the version number from a CFG file in Uranium's 2.7 format.
+    #
+    #   Since the format may change, this is implemented for the 2.7 format only
+    #   and needs to be included in the version upgrade system rather than
+    #   globally in Uranium.
+    #
+    #   \param serialised The serialised form of a CFG file.
+    #   \return The version number stored in the CFG file.
+    #   \raises ValueError The format of the version number in the file is
+    #   incorrect.
+    #   \raises KeyError The format of the file is incorrect.
+    def getCfgVersion(self, serialised):
+        parser = configparser.ConfigParser(interpolation = None)
+        parser.read_string(serialised)
+        format_version = int(parser.get("general", "version")) #Explicitly give an exception when this fails. That means that the file format is not recognised.
+        setting_version = int(parser.get("metadata", "setting_version", fallback = 0))
+        return format_version * 1000000 + setting_version
+
+    ##  Upgrades a preferences file from version 2.7 to 3.0.
+    #
+    #   \param serialised The serialised form of a preferences file.
+    #   \param filename The name of the file to upgrade.
+    def upgradePreferences(self, serialised, filename):
+        parser = configparser.ConfigParser(interpolation=None)
+        parser.read_string(serialised)
+
+        # Update version numbers
+        if "general" not in parser:
+            parser["general"] = {}
+        parser["general"]["version"] = "5"
+        if "metadata" not in parser:
+            parser["metadata"] = {}
+        parser["metadata"]["setting_version"] = "2"
+
+        #Renamed themes.
+        if "theme" in parser["general"]:
+            if parser["general"]["theme"] in _renamed_themes:
+                parser["general"]["theme"] = _renamed_themes[parser["general"]["theme"]]
+
+        # Re-serialise the file.
+        output = io.StringIO()
+        parser.write(output)
+        return [filename], [output.getvalue()]

plugins/VersionUpgrade/VersionUpgrade27to30/__init__.py

@@ -0,0 +1,23 @@
+# Copyright (c) 2017 Ultimaker B.V.
+# Cura is released under the terms of the AGPLv3 or higher.
+
+from . import VersionUpgrade27to30
+
+upgrade = VersionUpgrade27to30.VersionUpgrade27to30()
+
+def getMetaData():
+    return {
+        "version_upgrade": {
+            # From                    To                       Upgrade function
+            ("preferences", 4000002): ("preferences", 5000002, upgrade.upgradePreferences),
+        },
+        "sources": {
+            "preferences": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"."}
+            },
+        }
+    }
+
+def register(app):
+    return { "version_upgrade": upgrade }

plugins/VersionUpgrade/VersionUpgrade27to30/plugin.json

@@ -0,0 +1,8 @@
+ {
+    "name": "Version Upgrade 2.7 to 3.0",
+    "author": "Ultimaker B.V.",
+    "version": "1.0.0",
+    "description": "Upgrades configurations from Cura 2.7 to Cura 3.0.",
+    "api": 4,
+    "i18n-catalog": "cura"
+}

plugins/VersionUpgrade/VersionUpgrade27to30/tests/TestVersionUpgrade27to30.py

@@ -0,0 +1,171 @@
+# Copyright (c) 2017 Ultimaker B.V.
+# Cura is released under the terms of the AGPLv3 or higher.
+
+import configparser #To parse the resulting config files.
+import pytest #To register tests with.
+
+import VersionUpgrade27to30 #The module we're testing.
+
+##  Creates an instance of the upgrader to test with.
+@pytest.fixture
+def upgrader():
+    return VersionUpgrade27to30.VersionUpgrade27to30()
+
+test_cfg_version_good_data = [
+    {
+        "test_name": "Simple",
+        "file_data": """[general]
+version = 1
+""",
+        "version": 1000000
+    },
+    {
+        "test_name": "Other Data Around",
+        "file_data": """[nonsense]
+life = good
+
+[general]
+version = 3
+
+[values]
+layer_height = 0.12
+infill_sparse_density = 42
+""",
+        "version": 3000000
+    },
+    {
+        "test_name": "Negative Version", #Why not?
+        "file_data": """[general]
+version = -20
+""",
+        "version": -20000000
+    },
+    {
+        "test_name": "Setting Version",
+        "file_data": """[general]
+version = 1
+[metadata]
+setting_version = 1
+""",
+        "version": 1000001
+    },
+    {
+        "test_name": "Negative Setting Version",
+        "file_data": """[general]
+version = 1
+[metadata]
+setting_version = -3
+""",
+        "version": 999997
+    }
+]
+
+##  Tests the technique that gets the version number from CFG files.
+#
+#   \param data The parametrised data to test with. It contains a test name
+#   to debug with, the serialised contents of a CFG file and the correct
+#   version number in that CFG file.
+#   \param upgrader The instance of the upgrade class to test.
+@pytest.mark.parametrize("data", test_cfg_version_good_data)
+def test_cfgVersionGood(data, upgrader):
+    version = upgrader.getCfgVersion(data["file_data"])
+    assert version == data["version"]
+
+test_cfg_version_bad_data = [
+    {
+        "test_name": "Empty",
+        "file_data": "",
+        "exception": configparser.Error #Explicitly not specified further which specific error we're getting, because that depends on the implementation of configparser.
+    },
+    {
+        "test_name": "No General",
+        "file_data": """[values]
+layer_height = 0.1337
+""",
+        "exception": configparser.Error
+    },
+    {
+        "test_name": "No Version",
+        "file_data": """[general]
+true = false
+""",
+        "exception": configparser.Error
+    },
+    {
+        "test_name": "Not a Number",
+        "file_data": """[general]
+version = not-a-text-version-number
+""",
+        "exception": ValueError
+    },
+    {
+        "test_name": "Setting Value NaN",
+        "file_data": """[general]
+version = 4
+[metadata]
+setting_version = latest_or_something
+""",
+        "exception": ValueError
+    },
+    {
+        "test_name": "Major-Minor",
+        "file_data": """[general]
+version = 1.2
+""",
+        "exception": ValueError
+    }
+]
+
+##  Tests whether getting a version number from bad CFG files gives an
+#   exception.
+#
+#   \param data The parametrised data to test with. It contains a test name
+#   to debug with, the serialised contents of a CFG file and the class of
+#   exception it needs to throw.
+#   \param upgrader The instance of the upgrader to test.
+@pytest.mark.parametrize("data", test_cfg_version_bad_data)
+def test_cfgVersionBad(data, upgrader):
+    with pytest.raises(data["exception"]):
+        upgrader.getCfgVersion(data["file_data"])
+
+test_translate_theme_data = [
+    (
+        "Original Cura theme",
+        """[general]
+version = 4
+theme = cura
+[metadata]
+setting_version = 2
+""",
+        "cura-light"
+    ),
+    (
+        "No theme",
+        """[general]
+version = 4
+[metadata]
+setting_version = 2
+""",
+        None #Indicates that the theme should be absent in the new file.
+    )
+]
+
+##  Tests whether the theme is properly translated.
+@pytest.mark.parametrize("test_name, file_data, new_theme", test_translate_theme_data)
+def test_translateTheme(test_name, file_data, new_theme, upgrader):
+    #Read old file.
+    original_parser = configparser.ConfigParser(interpolation = None)
+    original_parser.read_string(file_data)
+
+    #Perform the upgrade.
+    _, upgraded_stacks = upgrader.upgradePreferences(file_data, "<string>")
+    upgraded_stack = upgraded_stacks[0]
+    parser = configparser.ConfigParser(interpolation = None)
+    parser.read_string(upgraded_stack)
+
+    #Check whether the theme was properly translated.
+    if not new_theme:
+        assert "theme" not in parser["general"]
+    else:
+        assert "theme" in parser["general"]
+        assert parser["general"]["theme"] == new_theme

resources/definitions/fdmprinter.def.json

@@ -1228,7 +1228,8 @@
                     {
                         "back": "User Specified",
                         "shortest": "Shortest",
-                        "random": "Random"
+                        "random": "Random",
+                        "sharpest_corner": "Sharpest Corner"
                     },
                     "default_value": "shortest",
                     "limit_to_extruder": "wall_0_extruder_nr",
@@ -1258,6 +1259,23 @@
                     "limit_to_extruder": "wall_0_extruder_nr",
                     "settable_per_mesh": true
                 },
+                "z_seam_corner":
+                {
+                    "label": "Seam Corner Preference",
+                    "description": "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner.",
+                    "type": "enum",
+                    "options":
+                    {
+                        "z_seam_corner_none":  "None",
+                        "z_seam_corner_inner": "Hide Seam",
+                        "z_seam_corner_outer": "Expose Seam",
+                        "z_seam_corner_any":   "Hide or Expose Seam"
+                    },
+                    "default_value": "z_seam_corner_inner",
+                    "enabled": "z_seam_type != 'random'",
+                    "limit_to_extruder": "wall_0_extruder_nr",
+                    "settable_per_mesh": true
+                },
                 "z_seam_relative":
                 {
                     "label": "Z Seam Relative",
@@ -2997,7 +3015,7 @@
                     "unit": "mm",
                     "type": "float",
                     "default_value": 0.0,
-                    "minimum_value": "0",
+                    "minimum_value": "machine_width / -2 if machine_center_is_zero else 0",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true,
                     "settable_per_meshgroup": true
@@ -3009,7 +3027,7 @@
                     "unit": "mm",
                     "type": "float",
                     "default_value": 0.0,
-                    "minimum_value": "0",
+                    "minimum_value": "machine_depth / -2 if machine_center_is_zero else 0",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true,
                     "settable_per_meshgroup": true

resources/qml/Cura.qml

@@ -425,7 +425,7 @@ UM.MainWindow
                     right: sidebar.left
                 }
                 visible: opacity > 0
-                opacity: base.showPrintMonitor ? 0.75 : 0
+                opacity: base.showPrintMonitor ? 1 : 0
 
                 Behavior on opacity { NumberAnimation { duration: 100; } }
 

resources/qml/JobSpecs.qml

@@ -86,7 +86,7 @@ Item {
                             height: UM.Theme.getSize("save_button_specs_icons").height;
                             sourceSize.width: width;
                             sourceSize.height: width;
-                            color: control.hovered ? UM.Theme.getColor("setting_control_button_hover") : UM.Theme.getColor("text");
+                            color: control.hovered ? UM.Theme.getColor("text_scene_hover") : UM.Theme.getColor("text_scene");
                             source: UM.Theme.getIcon("pencil");
                         }
                     }
@@ -116,7 +116,7 @@ Item {
                     regExp: /^[^\\ \/ \*\?\|\[\]]*$/
                 }
                 style: TextFieldStyle{
-                    textColor: UM.Theme.getColor("setting_control_text");
+                    textColor: UM.Theme.getColor("text_scene");
                     font: UM.Theme.getFont("default_bold");
                     background: Rectangle {
                         opacity: 0
@@ -135,7 +135,7 @@ Item {
         height: UM.Theme.getSize("jobspecs_line").height
         verticalAlignment: Text.AlignVCenter
         font: UM.Theme.getFont("small")
-        color: UM.Theme.getColor("text_subtext")
+        color: UM.Theme.getColor("text_scene")
         text: CuraApplication.getSceneBoundingBoxString
     }
 }

resources/qml/MonitorButton.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2016 Ultimaker B.V.
+// Copyright (c) 2017 Ultimaker B.V.
 // Cura is released under the terms of the AGPLv3 or higher.
 
 import QtQuick 2.2
@@ -119,10 +119,10 @@ Item
     Label
     {
         id: statusLabel
-        width: parent.width - 2 * UM.Theme.getSize("default_margin").width
+        width: parent.width - 2 * UM.Theme.getSize("sidebar_margin").width
         anchors.top: parent.top
         anchors.left: parent.left
-        anchors.leftMargin: UM.Theme.getSize("default_margin").width
+        anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width
 
         color: base.statusColor
         font: UM.Theme.getFont("large")
@@ -177,21 +177,21 @@ Item
         property string backgroundColor: UM.Theme.getColor("progressbar_background");
         property string controlColor: base.statusColor;
 
-        width: parent.width - 2 * UM.Theme.getSize("default_margin").width;
+        width: parent.width - 2 * UM.Theme.getSize("sidebar_margin").width;
         height: UM.Theme.getSize("progressbar").height;
         anchors.top: statusLabel.bottom;
-        anchors.topMargin: UM.Theme.getSize("default_margin").height / 4;
+        anchors.topMargin: UM.Theme.getSize("sidebar_margin").height / 4;
         anchors.left: parent.left;
-        anchors.leftMargin: UM.Theme.getSize("default_margin").width;
+        anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width;
     }
 
     Row {
         id: buttonsRow
         height: abortButton.height
         anchors.top: progressBar.bottom
-        anchors.topMargin: UM.Theme.getSize("default_margin").height
+        anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
         anchors.right: parent.right
-        anchors.rightMargin: UM.Theme.getSize("default_margin").width
+        anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
         spacing: UM.Theme.getSize("default_margin").width
 
         Row {
@@ -220,7 +220,7 @@ Item
             property bool userClicked: false
             property string lastJobState: ""
 
-            visible: printerConnected
+            visible: printerConnected && Cura.MachineManager.printerOutputDevices[0].canPause
             enabled: (!userClicked) && printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands &&
                      (["paused", "printing"].indexOf(Cura.MachineManager.printerOutputDevices[0].jobState) >= 0)
 
@@ -261,7 +261,7 @@ Item
         {
             id: abortButton
 
-            visible: printerConnected
+            visible: printerConnected && Cura.MachineManager.printerOutputDevices[0].canAbort
             enabled: printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands &&
                      (["paused", "printing", "pre_print"].indexOf(Cura.MachineManager.printerOutputDevices[0].jobState) >= 0)
 

resources/qml/PrintMonitor.qml

@@ -353,7 +353,7 @@ Column
         Rectangle //Input field for pre-heat temperature.
         {
             id: preheatTemperatureControl
-            color: !enabled ? UM.Theme.getColor("setting_control_disabled") : showError ? UM.Theme.getColor("setting_validation_error") : UM.Theme.getColor("setting_validation_ok")
+            color: !enabled ? UM.Theme.getColor("setting_control_disabled") : showError ? UM.Theme.getColor("setting_validation_error_background") : UM.Theme.getColor("setting_validation_ok")
             property var showError:
             {
                 if(bedTemperature.properties.maximum_value != "None" && bedTemperature.properties.maximum_value <  parseInt(preheatTemperatureInput.text))
@@ -388,7 +388,7 @@ Column
             anchors.bottomMargin: UM.Theme.getSize("default_margin").height
             width: UM.Theme.getSize("setting_control").width
             height: UM.Theme.getSize("setting_control").height
-
+            visible: connectedPrinter != null ? connectedPrinter.canPreHeatBed: true
             Rectangle //Highlight of input field.
             {
                 anchors.fill: parent
@@ -511,6 +511,7 @@ Column
         {
             id: preheatButton
             height: UM.Theme.getSize("setting_control").height
+            visible: connectedPrinter != null ? connectedPrinter.canPreHeatBed: true
             enabled:
             {
                 if (!preheatTemperatureControl.enabled)

resources/qml/SaveButton.qml

@@ -45,10 +45,10 @@ Item {
 
     Text {
         id: statusLabel
-        width: parent.width - 2 * UM.Theme.getSize("default_margin").width
+        width: parent.width - 2 * UM.Theme.getSize("sidebar_margin").width
         anchors.top: parent.top
         anchors.left: parent.left
-        anchors.leftMargin: UM.Theme.getSize("default_margin").width
+        anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width
 
         color: UM.Theme.getColor("text")
         font: UM.Theme.getFont("default_bold")
@@ -57,12 +57,12 @@ Item {
 
     Rectangle {
         id: progressBar
-        width: parent.width - 2 * UM.Theme.getSize("default_margin").width
+        width: parent.width - 2 * UM.Theme.getSize("sidebar_margin").width
         height: UM.Theme.getSize("progressbar").height
         anchors.top: statusLabel.bottom
-        anchors.topMargin: UM.Theme.getSize("default_margin").height/4
+        anchors.topMargin: UM.Theme.getSize("sidebar_margin").height/4
         anchors.left: parent.left
-        anchors.leftMargin: UM.Theme.getSize("default_margin").width
+        anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width
         radius: UM.Theme.getSize("progressbar_radius").width
         color: UM.Theme.getColor("progressbar_background")
 
@@ -92,14 +92,14 @@ Item {
         width: base.width
         height: saveToButton.height
         anchors.top: progressBar.bottom
-        anchors.topMargin: UM.Theme.getSize("default_margin").height
+        anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
         anchors.left: parent.left
 
         Row {
             id: additionalComponentsRow
             anchors.top: parent.top
             anchors.right: saveToButton.visible ? saveToButton.left : parent.right
-            anchors.rightMargin: UM.Theme.getSize("default_margin").width
+            anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
 
             spacing: UM.Theme.getSize("default_margin").width
         }
@@ -141,7 +141,7 @@ Item {
 
             anchors.top: parent.top
             anchors.right: parent.right
-            anchors.rightMargin: UM.Theme.getSize("default_margin").width
+            anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
 
             // 1 = not started, 5 = disabled
             text: [1, 5].indexOf(UM.Backend.state) != -1 ? catalog.i18nc("@label:Printjob", "Prepare") : catalog.i18nc("@label:Printjob", "Cancel")
@@ -183,7 +183,7 @@ Item {
 
                     Behavior on color { ColorAnimation { duration: 50; } }
 
-                    implicitWidth: actualLabel.contentWidth + (UM.Theme.getSize("default_margin").width * 2)
+                    implicitWidth: actualLabel.contentWidth + (UM.Theme.getSize("sidebar_margin").width * 2)
 
                     Label {
                         id: actualLabel
@@ -221,7 +221,7 @@ Item {
 
             anchors.top: parent.top
             anchors.right: deviceSelectionMenu.visible ? deviceSelectionMenu.left : parent.right
-            anchors.rightMargin: deviceSelectionMenu.visible ? -3 * UM.Theme.getSize("default_lining").width : UM.Theme.getSize("default_margin").width
+            anchors.rightMargin: deviceSelectionMenu.visible ? -3 * UM.Theme.getSize("default_lining").width : UM.Theme.getSize("sidebar_margin").width
 
             text: UM.OutputDeviceManager.activeDeviceShortDescription
             onClicked:
@@ -258,7 +258,7 @@ Item {
 
                     Behavior on color { ColorAnimation { duration: 50; } }
 
-                    implicitWidth: actualLabel.contentWidth + (UM.Theme.getSize("default_margin").width * 2)
+                    implicitWidth: actualLabel.contentWidth + (UM.Theme.getSize("sidebar_margin").width * 2)
 
                     Label {
                         id: actualLabel
@@ -288,7 +288,7 @@ Item {
             anchors.top: parent.top
             anchors.right: parent.right
 
-            anchors.rightMargin: UM.Theme.getSize("default_margin").width
+            anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
             width: UM.Theme.getSize("save_button_save_to_button").height
             height: UM.Theme.getSize("save_button_save_to_button").height
             // 3 = Done, 5 = Disabled

resources/qml/Settings/SettingItem.qml

@@ -130,11 +130,11 @@ Item {
             id: settingControls
 
             height: parent.height / 2
-            spacing: UM.Theme.getSize("default_margin").width / 2
+            spacing: UM.Theme.getSize("sidebar_margin").height / 2
 
             anchors {
                 right: controlContainer.left
-                rightMargin: UM.Theme.getSize("default_margin").width / 2
+                rightMargin: UM.Theme.getSize("sidebar_margin").width / 2
                 verticalCenter: parent.verticalCenter
             }
 
@@ -293,7 +293,7 @@ Item {
             enabled: propertyProvider.isValueUsed
 
             anchors.right: parent.right;
-            anchors.rightMargin: UM.Theme.getSize("default_margin").width
+            anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
             anchors.verticalCenter: parent.verticalCenter;
             width: UM.Theme.getSize("setting_control").width;
             height: UM.Theme.getSize("setting_control").height

resources/qml/Settings/SettingTextField.qml

@@ -24,6 +24,17 @@ SettingItem
             {
                 return UM.Theme.getColor("setting_control_disabled_border")
             }
+            switch(propertyProvider.properties.validationState)
+            {
+                case "ValidatorState.Exception":
+                case "ValidatorState.MinimumError":
+                case "ValidatorState.MaximumError":
+                    return UM.Theme.getColor("setting_validation_error");
+                case "ValidatorState.MinimumWarning":
+                case "ValidatorState.MaximumWarning":
+                    return UM.Theme.getColor("setting_validation_warning");
+            }
+            //Validation is OK.
             if(hovered || input.activeFocus)
             {
                 return UM.Theme.getColor("setting_control_border_highlight")
@@ -39,15 +50,12 @@ SettingItem
             switch(propertyProvider.properties.validationState)
             {
                 case "ValidatorState.Exception":
-                    return UM.Theme.getColor("setting_validation_error")
                 case "ValidatorState.MinimumError":
-                    return UM.Theme.getColor("setting_validation_error")
                 case "ValidatorState.MaximumError":
-                    return UM.Theme.getColor("setting_validation_error")
+                    return UM.Theme.getColor("setting_validation_error_background")
                 case "ValidatorState.MinimumWarning":
-                    return UM.Theme.getColor("setting_validation_warning")
                 case "ValidatorState.MaximumWarning":
-                    return UM.Theme.getColor("setting_validation_warning")
+                    return UM.Theme.getColor("setting_validation_warning_background")
                 case "ValidatorState.Valid":
                     return UM.Theme.getColor("setting_validation_ok")
 

resources/qml/Settings/SettingView.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Ultimaker B.V.
+// Copyright (c) 2017 Ultimaker B.V.
 // Uranium is released under the terms of the AGPLv3 or higher.
 
 import QtQuick 2.2
@@ -42,9 +42,9 @@ Item
         {
             top: parent.top
             left: parent.left
-            leftMargin: UM.Theme.getSize("default_margin").width
+            leftMargin: UM.Theme.getSize("sidebar_margin").width
             right: parent.right
-            rightMargin: UM.Theme.getSize("default_margin").width
+            rightMargin: UM.Theme.getSize("sidebar_margin").width
         }
         height: visible ? UM.Theme.getSize("setting_control").height : 0
         Behavior on height { NumberAnimation { duration: 100 } }
@@ -55,13 +55,14 @@ Item
 
             anchors.left: parent.left
             anchors.right: clearFilterButton.left
-            anchors.rightMargin: UM.Theme.getSize("default_margin").width
+            anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
 
             placeholderText: catalog.i18nc("@label:textbox", "Search...")
 
             style: TextFieldStyle
             {
                 textColor: UM.Theme.getColor("setting_control_text");
+                placeholderTextColor: UM.Theme.getColor("setting_control_text")
                 font: UM.Theme.getFont("default");
                 background: Item {}
             }
@@ -118,7 +119,7 @@ Item
 
             anchors.verticalCenter: parent.verticalCenter
             anchors.right: parent.right
-            anchors.rightMargin: UM.Theme.getSize("default_margin").width
+            anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
 
             color: UM.Theme.getColor("setting_control_button")
             hoverColor: UM.Theme.getColor("setting_control_button_hover")
@@ -137,7 +138,7 @@ Item
         anchors.bottom: parent.bottom;
         anchors.right: parent.right;
         anchors.left: parent.left;
-        anchors.topMargin: filterContainer.visible ? UM.Theme.getSize("default_margin").width : 0
+        anchors.topMargin: filterContainer.visible ? UM.Theme.getSize("sidebar_margin").height : 0
         Behavior on anchors.topMargin { NumberAnimation { duration: 100 } }
 
         style: UM.Theme.styles.scrollview;
@@ -296,7 +297,7 @@ Item
                         contextMenu.provider = provider
                         contextMenu.popup();
                     }
-                    onShowTooltip: base.showTooltip(delegate, { x: 0, y: delegate.height / 2 }, text)
+                    onShowTooltip: base.showTooltip(delegate, { x: -UM.Theme.getSize("default_arrow").width, y: delegate.height / 2 }, text)
                     onHideTooltip: base.hideTooltip()
                     onShowAllHiddenInheritedSettings:
                     {

resources/qml/Sidebar.qml

@@ -43,14 +43,14 @@ Rectangle
 
         onTriggered:
         {
-            base.showTooltip(base, {x:1, y:item.y}, text);
+            base.showTooltip(base, {x: 0, y: item.y}, text);
         }
     }
 
     function showTooltip(item, position, text)
     {
         tooltip.text = text;
-        position = item.mapToItem(base, position.x, position.y);
+        position = item.mapToItem(base, position.x - UM.Theme.getSize("default_arrow").width, position.y);
         tooltip.show(position);
     }
 
@@ -102,7 +102,7 @@ Rectangle
         height: visible ? UM.Theme.getSize("sidebar_lining").height : 0
         color: UM.Theme.getColor("sidebar_lining")
         anchors.top: header.bottom
-        anchors.topMargin: visible ? UM.Theme.getSize("default_margin").height : 0
+        anchors.topMargin: visible ? UM.Theme.getSize("sidebar_margin").height : 0
     }
 
     onCurrentModeIndexChanged:
@@ -118,10 +118,10 @@ Rectangle
         id: settingsModeLabel
         text: !hideSettings ? catalog.i18nc("@label:listbox", "Print Setup") : catalog.i18nc("@label:listbox","Print Setup disabled\nG-code files cannot be modified");
         anchors.left: parent.left
-        anchors.leftMargin: UM.Theme.getSize("default_margin").width;
+        anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width
         anchors.top: headerSeparator.bottom
-        anchors.topMargin: UM.Theme.getSize("default_margin").height
+        anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
-        width: parent.width * 0.45 - 2 * UM.Theme.getSize("default_margin").width
+        width: parent.width * 0.45 - 2 * UM.Theme.getSize("sidebar_margin").width
         font: UM.Theme.getFont("large")
         color: UM.Theme.getColor("text")
         visible: !monitoringPrint
@@ -134,9 +134,9 @@ Rectangle
         width: parent.width * 0.55
         height: UM.Theme.getSize("sidebar_header_mode_toggle").height
         anchors.right: parent.right
-        anchors.rightMargin: UM.Theme.getSize("default_margin").width
+        anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
         anchors.top: headerSeparator.bottom
-        anchors.topMargin: UM.Theme.getSize("default_margin").height
+        anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
         visible: !monitoringPrint && !hideSettings
         Component{
             id: wizardDelegate
@@ -169,18 +169,18 @@ Rectangle
                 style: ButtonStyle {
                     background: Rectangle {
                         border.width: UM.Theme.getSize("default_lining").width
-                        border.color: control.checked ? UM.Theme.getColor("toggle_checked_border") :
+                        border.color: (control.checked || control.pressed) ? UM.Theme.getColor("action_button_active_border") :
-                                          control.pressed ? UM.Theme.getColor("toggle_active_border") :
+                                          control.hovered ? UM.Theme.getColor("action_button_hovered_border") :
-                                          control.hovered ? UM.Theme.getColor("toggle_hovered_border") : UM.Theme.getColor("toggle_unchecked_border")
+                                          UM.Theme.getColor("action_button_border")
-                        color: control.checked ? UM.Theme.getColor("toggle_checked") :
+                        color: (control.checked || control.pressed) ? UM.Theme.getColor("action_button_active") :
-                                   control.pressed ? UM.Theme.getColor("toggle_active") :
+                                   control.hovered ? UM.Theme.getColor("action_button_hovered") :
-                                   control.hovered ? UM.Theme.getColor("toggle_hovered") : UM.Theme.getColor("toggle_unchecked")
+                                   UM.Theme.getColor("action_button")
                         Behavior on color { ColorAnimation { duration: 50; } }
                         Label {
                             anchors.centerIn: parent
-                            color: control.checked ? UM.Theme.getColor("toggle_checked_text") :
+                            color: (control.checked || control.pressed) ? UM.Theme.getColor("action_button_active_text") :
-                                       control.pressed ? UM.Theme.getColor("toggle_active_text") :
+                                       control.hovered ? UM.Theme.getColor("action_button_hovered_text") :
-                                       control.hovered ? UM.Theme.getColor("toggle_hovered_text") : UM.Theme.getColor("toggle_unchecked_text")
+                                       UM.Theme.getColor("action_button_text")
                             font: UM.Theme.getFont("default")
                             text: control.text;
                         }
@@ -212,18 +212,18 @@ Rectangle
         anchors
         {
             top: settingsModeSelection.bottom
-            topMargin: UM.Theme.getSize("default_margin").width
+            topMargin: UM.Theme.getSize("sidebar_margin").height
             left: parent.left
-            leftMargin: UM.Theme.getSize("default_margin").width
+            leftMargin: UM.Theme.getSize("sidebar_margin").width
             right: parent.right
-            rightMargin: UM.Theme.getSize("default_margin").width
+            rightMargin: UM.Theme.getSize("sidebar_margin").width
         }
 
         Text
         {
             id: globalProfileLabel
             text: catalog.i18nc("@label","Profile:");
-            width: parent.width * 0.45 - UM.Theme.getSize("default_margin").width
+            width: parent.width * 0.45 - UM.Theme.getSize("sidebar_margin").width
             font: UM.Theme.getFont("default");
             color: UM.Theme.getColor("text");
             verticalAlignment: Text.AlignVCenter
@@ -247,14 +247,13 @@ Rectangle
             }
             enabled: !header.currentExtruderVisible || header.currentExtruderIndex > -1
 
-            width: parent.width * 0.7 + UM.Theme.getSize("default_margin").width
+            width: parent.width * 0.7 + UM.Theme.getSize("sidebar_margin").width
             height: UM.Theme.getSize("setting_control").height
             anchors.left: globalProfileLabel.right
             anchors.right: parent.right
             tooltip: Cura.MachineManager.activeQualityName
             style: UM.Theme.styles.sidebar_header_button
             activeFocusOnPress: true;
-            property var valueWarning: !Cura.MachineManager.isActiveQualitySupported
             menu: ProfileMenu { }
 
             UM.SimpleButton
@@ -267,7 +266,7 @@ Rectangle
 
                 anchors.verticalCenter: parent.verticalCenter
                 anchors.right: parent.right
-                anchors.rightMargin: UM.Theme.getSize("setting_preferences_button_margin").width - UM.Theme.getSize("default_margin").width
+                anchors.rightMargin: UM.Theme.getSize("setting_preferences_button_margin").width - UM.Theme.getSize("sidebar_margin").width
 
                 color: hovered ? UM.Theme.getColor("setting_control_button_hover") : UM.Theme.getColor("setting_control_button");
                 iconSource: UM.Theme.getIcon("star");
@@ -280,7 +279,7 @@ Rectangle
                 onEntered:
                 {
                     var content = catalog.i18nc("@tooltip","Some setting/override values are different from the values stored in the profile.\n\nClick to open the profile manager.")
-                    base.showTooltip(globalProfileRow, Qt.point(-UM.Theme.getSize("default_margin").width, 0),  content)
+                    base.showTooltip(globalProfileRow, Qt.point(-UM.Theme.getSize("sidebar_margin").width, 0),  content)
                 }
                 onExited: base.hideTooltip()
             }
@@ -293,7 +292,7 @@ Rectangle
 
         anchors.bottom: footerSeparator.top
         anchors.top: globalProfileRow.bottom
-        anchors.topMargin: UM.Theme.getSize("default_margin").height
+        anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
         anchors.left: base.left
         anchors.right: base.right
         visible: !monitoringPrint && !hideSettings
@@ -379,7 +378,7 @@ Rectangle
         height: UM.Theme.getSize("sidebar_lining").height
         color: UM.Theme.getColor("sidebar_lining")
         anchors.bottom: printSpecs.top
-        anchors.bottomMargin: UM.Theme.getSize("default_margin").height * 2 + UM.Theme.getSize("progressbar").height + UM.Theme.getFont("default_bold").pixelSize
+        anchors.bottomMargin: UM.Theme.getSize("sidebar_margin").height * 2 + UM.Theme.getSize("progressbar").height + UM.Theme.getFont("default_bold").pixelSize
     }
 
     Rectangle
@@ -387,9 +386,10 @@ Rectangle
         id: printSpecs
         anchors.left: parent.left
         anchors.bottom: parent.bottom
-        anchors.leftMargin: UM.Theme.getSize("default_margin").width
+        anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width
-        anchors.bottomMargin: UM.Theme.getSize("default_margin").height
+        anchors.bottomMargin: UM.Theme.getSize("sidebar_margin").height
         height: childrenRect.height
+        visible: !monitoringPrint
 
         UM.TooltipArea
         {
@@ -500,7 +500,7 @@ Rectangle
         id: saveButton
         implicitWidth: base.width
         anchors.top: footerSeparator.bottom
-        anchors.topMargin: UM.Theme.getSize("default_margin").height
+        anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
         anchors.bottom: parent.bottom
         visible: !monitoringPrint
     }
@@ -510,7 +510,7 @@ Rectangle
         id: monitorButton
         implicitWidth: base.width
         anchors.top: footerSeparator.bottom
-        anchors.topMargin: UM.Theme.getSize("default_margin").height
+        anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
         anchors.bottom: parent.bottom
         visible: monitoringPrint
     }

resources/qml/SidebarHeader.qml

@@ -17,7 +17,7 @@ Column
     property int currentExtruderIndex: ExtruderManager.activeExtruderIndex;
     property bool currentExtruderVisible: extrudersList.visible;
 
-    spacing: UM.Theme.getSize("default_margin").height
+    spacing: UM.Theme.getSize("sidebar_margin").height
 
     signal showTooltip(Item item, point location, string text)
     signal hideTooltip()
@@ -133,9 +133,9 @@ Column
                         {
                             anchors.verticalCenter: parent.verticalCenter
                             anchors.left: swatch.visible ? swatch.right : parent.left
-                            anchors.leftMargin: swatch.visible ? UM.Theme.getSize("default_margin").width / 2 : UM.Theme.getSize("default_margin").width
+                            anchors.leftMargin: swatch.visible ? UM.Theme.getSize("sidebar_margin").width / 2 : UM.Theme.getSize("sidebar_margin").width
                             anchors.right: parent.right
-                            anchors.rightMargin: UM.Theme.getSize("default_margin").width / 2
+                            anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width / 2
 
                             color: control.checked ? UM.Theme.getColor("tab_checked_text") :
                                    control.pressed ? UM.Theme.getColor("tab_active_text") :
@@ -155,7 +155,7 @@ Column
     Item
     {
         id: variantRowSpacer
-        height: UM.Theme.getSize("default_margin").height / 4
+        height: UM.Theme.getSize("sidebar_margin").height / 4
         width: height
         visible: !extruderSelectionRow.visible
     }
@@ -170,9 +170,9 @@ Column
         anchors
         {
             left: parent.left
-            leftMargin: UM.Theme.getSize("default_margin").width
+            leftMargin: UM.Theme.getSize("sidebar_margin").width
             right: parent.right
-            rightMargin: UM.Theme.getSize("default_margin").width
+            rightMargin: UM.Theme.getSize("sidebar_margin").width
         }
 
         Text
@@ -207,7 +207,7 @@ Column
             enabled: !extrudersList.visible || base.currentExtruderIndex  > -1
 
             height: UM.Theme.getSize("setting_control").height
-            width: parent.width * 0.7 + UM.Theme.getSize("default_margin").width
+            width: parent.width * 0.7 + UM.Theme.getSize("sidebar_margin").width
             anchors.right: parent.right
             style: UM.Theme.styles.sidebar_header_button
             activeFocusOnPress: true;
@@ -226,9 +226,9 @@ Column
         anchors
         {
             left: parent.left
-            leftMargin: UM.Theme.getSize("default_margin").width
+            leftMargin: UM.Theme.getSize("sidebar_margin").width
             right: parent.right
-            rightMargin: UM.Theme.getSize("default_margin").width
+            rightMargin: UM.Theme.getSize("sidebar_margin").width
         }
 
         Text
@@ -247,7 +247,7 @@ Column
             visible: Cura.MachineManager.hasVariants
 
             height: UM.Theme.getSize("setting_control").height
-            width: parent.width * 0.7 + UM.Theme.getSize("default_margin").width
+            width: parent.width * 0.7 + UM.Theme.getSize("sidebar_margin").width
             anchors.right: parent.right
             style: UM.Theme.styles.sidebar_header_button
             activeFocusOnPress: true;
@@ -266,37 +266,27 @@ Column
         anchors
         {
             left: parent.left
-            leftMargin: UM.Theme.getSize("default_margin").width
+            leftMargin: UM.Theme.getSize("sidebar_margin").width
             right: parent.right
-            rightMargin: UM.Theme.getSize("default_margin").width
+            rightMargin: UM.Theme.getSize("sidebar_margin").width
         }
 
         Item
         {
             height: UM.Theme.getSize("sidebar_setup").height
             anchors.right: parent.right
-            width: parent.width * 0.7 + UM.Theme.getSize("default_margin").width
+            width: parent.width * 0.7 + UM.Theme.getSize("sidebar_margin").width
 
             Text
             {
                 id: materialInfoLabel
                 wrapMode: Text.WordWrap
-                text: catalog.i18nc("@label","Check material compability");
+                text: catalog.i18nc("@label", "Check material compability");
                 font: UM.Theme.getFont("default");
                 verticalAlignment: Text.AlignVCenter
                 anchors.top: parent.top
                 anchors.bottom: parent.bottom
-                color:
+                color: UM.Theme.getColor("text")
-                {
-                    if (!Cura.MachineManager.isActiveQualitySupported)
-                    {
-                        UM.Theme.getColor("setting_validation_error");
-                    }
-                    else
-                    {
-                        UM.Theme.getColor("text");
-                    }
-                }
 
                 MouseArea
                 {
@@ -317,7 +307,7 @@ Column
                         var content = catalog.i18nc("@tooltip", "Click to check the material compatibility on Ultimaker.com.");
                         base.showTooltip(
                             materialInfoRow,
-                            Qt.point(-UM.Theme.getSize("default_margin").width, 0),
+                            Qt.point(-UM.Theme.getSize("sidebar_margin").width, 0),
                             catalog.i18nc("@tooltip", content)
                         );
                     }
@@ -336,8 +326,8 @@ Column
                 //sourceSize.width: width + 5
                 //sourceSize.height: width + 5
 
-                color: UM.Theme.getColor("setting_control_text")
+                color: UM.Theme.getColor("setting_validation_warning")
-                visible: !Cura.MachineManager.isActiveQualitySupported
+                visible: !Cura.MachineManager.isCurrentSetupSupported
             }
         }
     }

resources/qml/Topbar.qml

@@ -59,7 +59,7 @@ Rectangle
             onClicked: base.stopMonitoringPrint()
             property color overlayColor: "transparent"
             property string overlayIconSource: ""
-            text: catalog.i18nc("@title:tab","Prepare")
+            text: catalog.i18nc("@title:tab", "Prepare")
             checkable: true
             checked: !base.monitoringPrint
             exclusiveGroup: sidebarHeaderBarGroup
@@ -227,13 +227,13 @@ Rectangle
                     height: UM.Theme.getSize("standard_arrow").height
                     sourceSize.width: width
                     sourceSize.height: width
-                    color: UM.Theme.getColor("text_reversed")
+                    color: UM.Theme.getColor("text_emphasis")
                     source: UM.Theme.getIcon("arrow_bottom")
                 }
                 Label
                 {
                     id: sidebarComboBoxLabel
-                    color: UM.Theme.getColor("text_reversed")
+                    color: UM.Theme.getColor("sidebar_header_text_active")
                     text: control.text;
                     elide: Text.ElideRight;
                     anchors.left: parent.left;

resources/quality/ultimaker3/um3_bb0.4_PP_Fast_Print.inst.cfg

@@ -0,0 +1,14 @@
+[general]
+version = 2
+name = Not Supported
+definition = ultimaker3
+
+[metadata]
+type = quality
+quality_type = normal
+material = generic_pp_ultimaker3_BB_0.4
+weight = 0
+supported = False
+setting_version = 2
+
+[values]

resources/quality/ultimaker3/um3_bb0.4_PP_Superdraft_Print.inst.cfg

@@ -0,0 +1,14 @@
+[general]
+version = 2
+name = Not Supported
+definition = ultimaker3
+
+[metadata]
+type = quality
+quality_type = superdraft
+material = generic_pp_ultimaker3_BB_0.4
+weight = 0
+supported = False
+setting_version = 2
+
+[values]

resources/quality/ultimaker3/um3_bb0.8_PP_Fast_Print.inst.cfg

@@ -0,0 +1,14 @@
+[general]
+version = 2
+name = Not Supported
+definition = ultimaker3
+
+[metadata]
+type = quality
+quality_type = normal
+material = generic_pp_ultimaker3_BB_0.8
+weight = 0
+supported = False
+setting_version = 2
+
+[values]

resources/quality/ultimaker3/um3_bb0.8_PP_Superdraft_Print.inst.cfg

@@ -0,0 +1,14 @@
+[general]
+version = 2
+name = Not Supported
+definition = ultimaker3
+
+[metadata]
+type = quality
+quality_type = superdraft
+material = generic_pp_ultimaker3_BB_0.8
+weight = 0
+supported = False
+setting_version = 2
+
+[values]

resources/themes/cura-dark/theme.json

@@ -4,183 +4,8 @@
         "inherits": "cura"
     },
     "colors": {
-        "sidebar": [83, 83, 83, 255],
+        "viewport_background": [31, 36, 39, 255],
-        "lining": [127, 127, 127, 255],
+        "text_scene": [255, 255, 255, 162],
-        "viewport_overlay": [66, 66, 66, 255],
+        "text_scene_hover": [255, 255, 255, 204]
-
-        "primary": [12, 169, 227, 255],
-        "primary_hover": [48, 182, 231, 255],
-        "primary_text": [83, 83, 83, 255],
-        "border": [127, 127, 127, 255],
-        "secondary": [66, 66, 66, 255],
-
-        "text": [255, 255, 255, 255],
-        "text_detail": [174, 174, 174, 128],
-        "text_link": [12, 169, 227, 255],
-        "text_inactive": [174, 174, 174, 255],
-        "text_hover": [70, 84, 113, 255],
-        "text_pressed": [12, 169, 227, 255],
-        "text_reversed": [255, 255, 255, 255],
-        "text_subtext": [255, 255, 255, 255],
-
-        "error": [255, 140, 0, 255],
-
-        "sidebar_header_bar": [66, 66, 66, 255],
-        "sidebar_header_active": [83, 83, 83, 255],
-        "sidebar_header_hover": [83, 83, 83, 255],
-        "sidebar_header_highlight": [83, 83, 83, 255],
-        "sidebar_header_highlight_hover": [66, 66, 66, 255],
-        "sidebar_lining": [66, 66, 66, 255],
-
-        "button": [83, 83, 83, 255],
-        "button_hover": [83, 83, 83, 255],
-        "button_active": [32, 166, 219, 255],
-        "button_active_hover": [12, 169, 227, 255],
-        "button_text": [255, 255, 255, 255],
-        "button_disabled": [255, 255, 255, 255],
-        "button_disabled_text": [70, 84, 113, 255],
-
-        "button_tooltip": [83, 83, 83, 255],
-        "button_tooltip_border": [255, 255, 255, 255],
-        "button_tooltip_text": [255, 255, 255, 255],
-
-        "toggle_checked": [255, 255, 255, 255],
-        "toggle_checked_border": [255, 255, 255, 255],
-        "toggle_checked_text": [83, 83, 83, 255],
-        "toggle_unchecked": [83, 83, 83, 255],
-        "toggle_unchecked_border": [127, 127, 127, 255],
-        "toggle_unchecked_text": [255, 255, 255, 255],
-        "toggle_hovered": [83, 83, 83, 255],
-        "toggle_hovered_border": [32, 166, 219, 255],
-        "toggle_hovered_text": [255, 255, 255, 255],
-        "toggle_active": [32, 166, 219, 255],
-        "toggle_active_border": [32, 166, 219, 255],
-        "toggle_active_text": [255, 255, 255, 255],
-
-        "tab_checked": [83, 83, 83, 255],
-        "tab_checked_border": [83, 83, 83, 255],
-        "tab_checked_text": [255, 255, 255, 255],
-        "tab_unchecked": [66, 66, 66, 255],
-        "tab_unchecked_border": [66, 66, 66, 255],
-        "tab_unchecked_text": [127, 127, 127, 255],
-        "tab_hovered": [66, 66, 66, 255],
-        "tab_hovered_border": [66, 66, 66, 255],
-        "tab_hovered_text": [32, 166, 219, 255],
-        "tab_active": [83, 83, 83, 255],
-        "tab_active_border": [83, 83, 83, 255],
-        "tab_active_text": [255, 255, 255, 255],
-        "tab_background": [66, 66, 66, 255],
-
-        "action_button": [83, 83, 83, 255],
-        "action_button_text": [255, 255, 255, 255],
-        "action_button_border": [127, 127, 127, 255],
-        "action_button_hovered": [83, 83, 83, 255],
-        "action_button_hovered_text": [255, 255, 255, 255],
-        "action_button_hovered_border": [12, 169, 227, 255],
-        "action_button_active": [12, 169, 227, 255],
-        "action_button_active_text": [83, 83, 83, 255],
-        "action_button_active_border": [12, 169, 227, 255],
-        "action_button_disabled": [66, 66, 66, 255],
-        "action_button_disabled_text": [127, 127, 127, 255],
-        "action_button_disabled_border": [66, 66, 66, 255],
-
-        "scrollbar_background": [83, 83, 83, 255],
-        "scrollbar_handle": [255, 255, 255, 255],
-        "scrollbar_handle_hover": [12, 159, 227, 255],
-        "scrollbar_handle_down": [12, 159, 227, 255],
-
-        "setting_category": [66, 66, 66, 255],
-        "setting_category_disabled": [83, 83, 83, 255],
-        "setting_category_hover": [66, 66, 66, 255],
-        "setting_category_active": [66, 66, 66, 255],
-        "setting_category_active_hover": [66, 66, 66, 255],
-        "setting_category_text": [255, 255, 255, 255],
-        "setting_category_border": [66, 66, 66, 255],
-        "setting_category_disabled_border": [66, 66, 66, 255],
-        "setting_category_hover_border": [12, 159, 227, 255],
-        "setting_category_active_border": [66, 66, 66, 255],
-        "setting_category_active_hover_border": [12, 159, 227, 255],
-
-        "setting_control": [83, 83, 83, 255],
-        "setting_control_selected": [12, 159, 227, 255],
-        "setting_control_highlight": [83, 83, 83, 0],
-        "setting_control_border": [127, 127, 127, 255],
-        "setting_control_border_highlight": [12, 169, 227, 255],
-        "setting_control_text": [255, 255, 255, 255],
-        "setting_control_depth_line": [127, 127, 127, 255],
-        "setting_control_button": [127, 127, 127, 255],
-        "setting_control_button_hover": [70, 84, 113, 255],
-        "setting_control_disabled": [66, 66, 66, 255],
-        "setting_control_disabled_text": [127, 127, 127, 255],
-        "setting_control_disabled_border": [127, 127, 127, 255],
-        "setting_unit": [127, 127, 127, 255],
-        "setting_validation_error": [204, 37, 0, 255],
-        "setting_validation_warning": [204, 146, 0, 255],
-        "setting_validation_ok": [83, 83, 83, 255],
-
-        "progressbar_background": [66, 66, 66, 255],
-        "progressbar_control": [255, 255, 255, 255],
-
-        "slider_groove": [66, 66, 66, 255],
-        "slider_groove_border": [127, 127, 127, 255],
-        "slider_groove_fill": [127, 127, 127, 255],
-        "slider_handle": [32, 166, 219, 255],
-        "slider_handle_hover": [77, 182, 226, 255],
-        "slider_text_background": [83, 83, 83, 255],
-
-        "checkbox": [83, 83, 83, 255],
-        "checkbox_hover": [83, 83, 83, 255],
-        "checkbox_border": [127, 127, 127, 255],
-        "checkbox_border_hover": [12, 169, 227, 255],
-        "checkbox_mark": [255, 255, 255, 255],
-        "checkbox_text": [255, 255, 255, 255],
-
-        "mode_switch": [83, 83, 83, 255],
-        "mode_switch_hover": [83, 83, 83, 255],
-        "mode_switch_border": [127, 127, 127, 255],
-        "mode_switch_border_hover": [12, 169, 227, 255],
-        "mode_switch_handle": [255, 255, 255, 255],
-        "mode_switch_text": [255, 255, 255, 255],
-        "mode_switch_text_hover": [255, 255, 255, 255],
-        "mode_switch_text_checked": [12, 169, 227, 255],
-
-        "tooltip": [40, 40, 40, 255],
-        "tooltip_text": [255, 255, 255, 255],
-
-        "message_background": [255, 255, 255, 255],
-        "message_text": [83, 83, 83, 255],
-        "message_border": [255, 255, 255, 255],
-        "message_button": [83, 83, 83, 255],
-        "message_button_hover": [12, 169, 227, 255],
-        "message_button_active": [32, 166, 219, 255],
-        "message_button_text": [255, 255, 255, 255],
-        "message_button_text_hover": [83, 83, 83, 255],
-        "message_button_text_active": [83, 83, 83, 255],
-        "message_progressbar_background": [83, 83, 83, 255],
-        "message_progressbar_control": [12, 169, 227, 255],
-
-        "tool_panel_background": [83, 83, 83, 255],
-
-        "status_offline": [0, 0, 0, 255],
-        "status_ready": [0, 205, 0, 255],
-        "status_busy": [12, 169, 227, 255],
-        "status_paused": [255, 140, 0, 255],
-        "status_stopped": [236, 82, 80, 255],
-        "status_unknown": [127, 127, 127, 255],
-
-        "disabled_axis": [127, 127, 127, 255],
-        "x_axis": [255, 0, 0, 255],
-        "y_axis": [0, 0, 255, 255],
-        "z_axis": [0, 255, 0, 255],
-        "all_axis": [83, 83, 83, 255],
-
-        "viewport_background": [66, 66, 66, 255],
-        "volume_outline": [12, 169, 227, 255],
-        "buildplate": [169, 169, 169, 255],
-        "buildplate_alt": [204, 204, 204, 255],
-
-        "convex_hull": [35, 35, 35, 127],
-        "disallowed_area": [0, 0, 0, 40],
-        "error_area": [255, 0, 0, 127]
     }
 }

resources/themes/cura-light/icons/drop_down_button.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<svg width="7px" height="5px" viewBox="0 0 7 5" version="1.1" xmlns="http://www.w3.org/2000/svg">
+    <polygon points="3.5 5 7 0 0 0" />
+</svg>

resources/themes/cura-light/icons/notice.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg">
+    <path d="M7.5 15C11.641 15 15 11.643 15 7.5 15 3.358 11.641 0 7.5 0 3.358 0 0 3.358 0 7.5 0 11.643 3.358 15 7.5 15ZM8.6 12.369L6.472 12.369 6.472 4.57 8.6 4.57 8.6 12.369ZM7.541 1.514C8.313 1.514 8.697 1.861 8.697 2.553 8.697 2.885 8.6 3.141 8.409 3.325 8.216 3.509 7.926 3.601 7.541 3.601 6.767 3.601 6.382 3.252 6.382 2.553 6.382 1.861 6.767 1.514 7.541 1.514Z"/>
+</svg>

resources/themes/cura-light/icons/play.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<svg width="5px" height="20px" viewBox="0 0 5 20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+    <polygon fill="#FFFFFF" opacity="0.8" points="5 10 0 13.5 0 6.5" />
+</svg>