Merge branch 'master' into libArachne_rebased

Conflicts:
	resources/texts/change_log.txt -> Adding 4.10 release notes in between 4.9 and Arachne.

cura/Backups/Backup.py

@@ -7,7 +7,7 @@ import re
 import shutil
 from copy import deepcopy
 from zipfile import ZipFile, ZIP_DEFLATED, BadZipfile
-from typing import Dict, Optional, TYPE_CHECKING
+from typing import Dict, Optional, TYPE_CHECKING, List
 
 from UM import i18nCatalog
 from UM.Logger import Logger
@@ -29,7 +29,7 @@ class Backup:
     IGNORED_FILES = [r"cura\.log", r"plugins\.json", r"cache", r"__pycache__", r"\.qmlc", r"\.pyc"]
     """These files should be ignored when making a backup."""
 
-    IGNORED_FOLDERS = [r"plugins"]
+    IGNORED_FOLDERS = []  # type: List[str]
 
     SECRETS_SETTINGS = ["general/ultimaker_auth_data"]
     """Secret preferences that need to obfuscated when making a backup of Cura"""
@@ -166,6 +166,9 @@ class Backup:
             Logger.log("d", "Moving preferences file from %s to %s", backup_preferences_file, preferences_file)
             shutil.move(backup_preferences_file, preferences_file)
 
+        # Read the preferences from the newly restored configuration (or else the cached Preferences will override the restored ones)
+        self._application.readPreferencesFromConfiguration()
+
         # Restore the obfuscated settings
         self._illuminate(**secrets)
 
@@ -190,11 +193,13 @@ class Backup:
         Logger.log("d", "Removing current data in location: %s", target_path)
         Resources.factoryReset()
         Logger.log("d", "Extracting backup to location: %s", target_path)
-        try:
+        name_list = archive.namelist()
-            archive.extractall(target_path)
+        for archive_filename in name_list:
-        except (PermissionError, EnvironmentError):
+            try:
-            Logger.logException("e", "Unable to extract the backup due to permission or file system errors.")
+                archive.extract(archive_filename, target_path)
-            return False
+            except (PermissionError, EnvironmentError):
+                Logger.logException("e", f"Unable to extract the file {archive_filename} from the backup due to permission or file system errors.")
+            CuraApplication.getInstance().processEvents()
         return True
 
     def _obfuscate(self) -> Dict[str, str]:

cura/Backups/BackupsManager.py

@@ -54,17 +54,6 @@ class BackupsManager:
         backup = Backup(self._application, zip_file = zip_file, meta_data = meta_data)
         restored = backup.restore()
 
-        package_manager = self._application.getPackageManager()
-
-        # If the backup was made with Cura 4.10 (or higher), we no longer store plugins.
-        # Since the restored backup doesn't have those plugins anymore, we should remove it from the list
-        # of installed plugins.
-        if Version(meta_data.get("cura_release")) >= Version("4.10.0"):
-            for package_id in package_manager.getAllInstalledPackageIDs():
-                package_data = package_manager.getInstalledPackageInfo(package_id)
-                if package_data.get("package_type") == "plugin" and not package_data.get("is_bundled"):
-                    package_manager.removePackage(package_id)
-
         if restored:
             # At this point, Cura will need to restart for the changes to take effect.
             # We don't want to store the data at this point as that would override the just-restored backup.

cura/BuildVolume.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Ultimaker B.V.
+# Copyright (c) 2021 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
 import numpy
@@ -916,6 +916,8 @@ class BuildVolume(SceneNode):
             return {}
 
         for area in self._global_container_stack.getProperty("machine_disallowed_areas", "value"):
+            if len(area) == 0:
+                continue  # Numpy doesn't deal well with 0-length arrays, since it can't determine the dimensionality of them.
             polygon = Polygon(numpy.array(area, numpy.float32))
             polygon = polygon.getMinkowskiHull(Polygon.approximatedCircle(border_size))
             machine_disallowed_polygons.append(polygon)

cura/CuraApplication.py

@@ -708,6 +708,8 @@ class CuraApplication(QtApplication):
     @pyqtSlot(str)
     def discardOrKeepProfileChangesClosed(self, option: str) -> None:
         global_stack = self.getGlobalContainerStack()
+        if global_stack is None:
+            return
         if option == "discard":
             for extruder in global_stack.extruderList:
                 extruder.userChanges.clear()

cura/Machines/Models/ExtrudersModel.py

@@ -53,6 +53,9 @@ class ExtrudersModel(ListModel):
     EnabledRole = Qt.UserRole + 11
     """Is the extruder enabled?"""
 
+    MaterialTypeRole = Qt.UserRole + 12
+    """The type of the material (e.g. PLA, ABS, PETG, etc.)."""
+
     defaultColors = ["#ffc924", "#86ec21", "#22eeee", "#245bff", "#9124ff", "#ff24c8"]
     """List of colours to display if there is no material or the material has no known colour. """
 
@@ -75,6 +78,7 @@ class ExtrudersModel(ListModel):
         self.addRoleName(self.StackRole, "stack")
         self.addRoleName(self.MaterialBrandRole, "material_brand")
         self.addRoleName(self.ColorNameRole, "color_name")
+        self.addRoleName(self.MaterialTypeRole, "material_type")
         self._update_extruder_timer = QTimer()
         self._update_extruder_timer.setInterval(100)
         self._update_extruder_timer.setSingleShot(True)
@@ -193,7 +197,8 @@ class ExtrudersModel(ListModel):
                     "variant": extruder.variant.getName() if extruder.variant else "",  # e.g. print core
                     "stack": extruder,
                     "material_brand": material_brand,
-                    "color_name": color_name
+                    "color_name": color_name,
+                    "material_type": extruder.material.getMetaDataEntry("material") if extruder.material else "",
                 }
 
                 items.append(item)
@@ -218,6 +223,7 @@ class ExtrudersModel(ListModel):
                     "stack": None,
                     "material_brand": "",
                     "color_name": "",
+                    "material_type": "",
                 }
                 items.append(item)
             if self._items != items:

cura/Machines/Models/MaterialManagementModel.py

@@ -2,10 +2,9 @@
 # Cura is released under the terms of the LGPLv3 or higher.
 
 import copy  # To duplicate materials.
-from PyQt5.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, QObject, QUrl
+from PyQt5.QtCore import QObject, pyqtSignal, pyqtSlot  # To allow the preference page proxy to be used from the actual preferences page.
 from typing import Any, Dict, Optional, TYPE_CHECKING
 import uuid  # To generate new GUIDs for new materials.
-import zipfile  # To export all materials in a .zip archive.
 
 from UM.i18n import i18nCatalog
 from UM.Logger import Logger
@@ -25,11 +24,6 @@ class MaterialManagementModel(QObject):
 
     This class handles the actions in that page, such as creating new materials, renaming them, etc.
     """
-    def __init__(self, parent: QObject) -> None:
-        super().__init__(parent)
-        cura_application = cura.CuraApplication.CuraApplication.getInstance()
-        self._preferred_export_all_path = None  # type: Optional[QUrl]  # Path to export all materials to. None if not yet initialised.
-        cura_application.getOutputDeviceManager().outputDevicesChanged.connect(self._onOutputDevicesChanged)
 
     favoritesChanged = pyqtSignal(str)
     """Triggered when a favorite is added or removed.
@@ -270,52 +264,3 @@ class MaterialManagementModel(QObject):
             self.favoritesChanged.emit(material_base_file)
         except ValueError:  # Material was not in the favorites list.
             Logger.log("w", "Material {material_base_file} was already not a favorite material.".format(material_base_file = material_base_file))
-
-    def _onOutputDevicesChanged(self) -> None:
-        """
-        When the list of output devices changes, we may want to update the
-        preferred export path.
-        """
-        cura_application = cura.CuraApplication.CuraApplication.getInstance()
-        device_manager = cura_application.getOutputDeviceManager()
-        devices = device_manager.getOutputDevices()
-        for device in devices:
-            if device.__class__.__name__ == "RemovableDriveOutputDevice":
-                self._preferred_export_all_path = QUrl.fromLocalFile(device.getId())
-                break
-        else:  # No removable drives? Use local path.
-            self._preferred_export_all_path = cura_application.getDefaultPath("dialog_material_path")
-        self.outputDevicesChanged.emit()
-
-    outputDevicesChanged = pyqtSignal()  # Triggered when adding or removing removable drives.
-    @pyqtProperty(QUrl, notify = outputDevicesChanged)
-    def preferredExportAllPath(self) -> QUrl:
-        """
-        Get the preferred path to export materials to.
-
-        If there is a removable drive, that should be the preferred path. Otherwise it should be the most recent local
-        file path.
-        :return: The preferred path to export all materials to.
-        """
-        if self._preferred_export_all_path is None:  # Not initialised yet. Can happen when output devices changed before class got created.
-            self._onOutputDevicesChanged()
-        return self._preferred_export_all_path
-
-    @pyqtSlot(QUrl)
-    def exportAll(self, file_path: QUrl) -> None:
-        """
-        Export all materials to a certain file path.
-        :param file_path: The path to export the materials to.
-        """
-        registry = CuraContainerRegistry.getInstance()
-
-        archive = zipfile.ZipFile(file_path.toLocalFile(), "w", compression = zipfile.ZIP_DEFLATED)
-        for metadata in registry.findInstanceContainersMetadata(type = "material"):
-            if metadata["base_file"] != metadata["id"]:  # Only process base files.
-                continue
-            if metadata["id"] == "empty_material":  # Don't export the empty material.
-                continue
-            material = registry.findContainers(id = metadata["id"])[0]
-            suffix = registry.getMimeTypeForContainer(type(material)).preferredSuffix
-            filename = metadata["id"] + "." + suffix
-            archive.writestr(filename, material.serialize())

cura/Machines/Models/QualitySettingsModel.py

@@ -114,6 +114,7 @@ class QualitySettingsModel(ListModel):
             global_container = None if len(global_containers) == 0 else global_containers[0]
             extruders_containers = {pos: container_registry.findContainers(id = quality_changes_group.metadata_per_extruder[pos]["id"]) for pos in quality_changes_group.metadata_per_extruder}
             extruders_container = {pos: None if not containers else containers[0] for pos, containers in extruders_containers.items()}
+            quality_changes_metadata = None
             if self._selected_position == self.GLOBAL_STACK_POSITION and global_container:
                 quality_changes_metadata = global_container.getMetaData()
             else:

cura/OAuth2/KeyringAttribute.py

@@ -4,7 +4,7 @@ from typing import Type, TYPE_CHECKING, Optional, List
 
 import keyring
 from keyring.backend import KeyringBackend
-from keyring.errors import NoKeyringError, PasswordSetError
+from keyring.errors import NoKeyringError, PasswordSetError, KeyringLocked
 
 from UM.Logger import Logger
 
@@ -39,6 +39,10 @@ class KeyringAttribute:
                 self._store_secure = False
                 Logger.logException("w", "No keyring backend present")
                 return getattr(instance, self._name)
+            except KeyringLocked:
+                self._store_secure = False
+                Logger.log("i", "Access to the keyring was denied.")
+                return getattr(instance, self._name)
         else:
             return getattr(instance, self._name)
 
@@ -48,7 +52,7 @@ class KeyringAttribute:
             if value is not None:
                 try:
                     keyring.set_password("cura", self._keyring_name, value)
-                except PasswordSetError:
+                except (PasswordSetError, KeyringLocked):
                     self._store_secure = False
                     if self._name not in DONT_EVER_STORE_LOCALLY:
                         setattr(instance, self._name, value)

cura/Settings/GlobalStack.py

@@ -86,14 +86,6 @@ class GlobalStack(CuraContainerStack):
     def supportsNetworkConnection(self):
         return self.getMetaDataEntry("supports_network_connection", False)
 
-    @pyqtProperty(bool, constant = True)
-    def supportsMaterialExport(self):
-        """
-        Whether the printer supports Cura's export format of material profiles.
-        :return: ``True`` if it supports it, or ``False`` if not.
-        """
-        return self.getMetaDataEntry("supports_material_export", False)
-
     @classmethod
     def getLoadingPriority(cls) -> int:
         return 2

cura/UI/WhatsNewPagesModel.py

@@ -29,7 +29,7 @@ class WhatsNewPagesModel(WelcomePagesModel):
                 for filename in files:
                     basename = os.path.basename(filename)
                     base, ext = os.path.splitext(basename)
-                    if ext not in include or not base.isdigit():
+                    if ext.lower() not in include or not base.isdigit():
                         continue
                     page_no = int(base)
                     highest = max(highest, page_no)

plugins/3MFReader/WorkspaceDialog.qml

@@ -419,7 +419,7 @@ UM.Dialog
                     width: warningLabel.height
                     height: width
 
-                    source: UM.Theme.getIcon("notice")
+                    source: UM.Theme.getIcon("Information")
                     color: palette.text
 
                 }

plugins/3MFReader/plugin.json

@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.1",
     "description": "Provides support for reading 3MF files.",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }

plugins/3MFWriter/plugin.json

@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.1",
     "description": "Provides support for writing 3MF files.",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }

plugins/AMFReader/plugin.json

@@ -3,5 +3,5 @@
     "author": "fieldOfView",
     "version": "1.0.0",
     "description": "Provides support for reading AMF files.",
-    "api": "7.6.0"
+    "api": 7
 }

plugins/CuraDrive/plugin.json

@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "description": "Backup and restore your configuration.",
     "version": "1.2.0",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }

plugins/CuraDrive/src/CreateBackupJob.py

@@ -5,7 +5,6 @@ import threading
 from datetime import datetime
 from typing import Any, Dict, Optional
 
-import sentry_sdk
 from PyQt5.QtNetwork import QNetworkReply
 
 from UM.Job import Job
@@ -99,13 +98,7 @@ class CreateBackupJob(Job):
             if HttpRequestManager.safeHttpStatus(reply) == 400:
                 errors = json.loads(replyText)["errors"]
                 if "moreThanMaximum" in [error["code"] for error in errors if error["meta"] and error["meta"]["field_name"] == "backup_size"]:
-                    if self._backup_zip is None:  # will never happen; keep mypy happy
-                        zip_error = "backup is None."
-                    else:
-                        zip_error = "{} exceeds max size.".format(str(len(self._backup_zip)))
-                    sentry_sdk.capture_message("backup failed: {}".format(zip_error), level ="warning")
                     self.backup_upload_error_message = catalog.i18nc("@error:file_size", "The backup exceeds the maximum file size.")
-                    from sentry_sdk import capture_message
 
             self._job_done.set()
             return

plugins/CuraDrive/src/DriveApiService.py

@@ -93,7 +93,7 @@ class DriveApiService:
     def _onRestoreFinished(self, job: "RestoreBackupJob") -> None:
         if job.restore_backup_error_message != "":
             # If the job contains an error message we pass it along so the UI can display it.
-            self.restoringStateChanged.emit(is_restoring=False)
+            self.restoringStateChanged.emit(is_restoring = False)
         else:
             self.restoringStateChanged.emit(is_restoring = False, error_message = job.restore_backup_error_message)
 

plugins/CuraDrive/src/DrivePluginExtension.py

@@ -34,6 +34,9 @@ class DrivePluginExtension(QObject, Extension):
     # Signal emitted when preferences changed (like auto-backup).
     preferencesChanged = pyqtSignal()
 
+    # Signal emitted when the id of the backup-to-be-restored is changed
+    backupIdBeingRestoredChanged = pyqtSignal(arguments = ["backup_id_being_restored"])
+
     DATE_FORMAT = "%d/%m/%Y %H:%M:%S"
 
     def __init__(self) -> None:
@@ -45,6 +48,7 @@ class DrivePluginExtension(QObject, Extension):
         self._backups = []  # type: List[Dict[str, Any]]
         self._is_restoring_backup = False
         self._is_creating_backup = False
+        self._backup_id_being_restored = ""
 
         # Initialize services.
         preferences = CuraApplication.getInstance().getPreferences()
@@ -52,6 +56,7 @@ class DrivePluginExtension(QObject, Extension):
 
         # Attach signals.
         CuraApplication.getInstance().getCuraAPI().account.loginStateChanged.connect(self._onLoginStateChanged)
+        CuraApplication.getInstance().applicationShuttingDown.connect(self._onApplicationShuttingDown)
         self._drive_api_service.restoringStateChanged.connect(self._onRestoringStateChanged)
         self._drive_api_service.creatingStateChanged.connect(self._onCreatingStateChanged)
 
@@ -75,6 +80,10 @@ class DrivePluginExtension(QObject, Extension):
         if self._drive_window:
             self._drive_window.show()
 
+    def _onApplicationShuttingDown(self):
+        if self._drive_window:
+            self._drive_window.hide()
+
     def _autoBackup(self) -> None:
         preferences = CuraApplication.getInstance().getPreferences()
         if preferences.getValue(Settings.AUTO_BACKUP_ENABLED_PREFERENCE_KEY) and self._isLastBackupTooLongAgo():
@@ -100,10 +109,11 @@ class DrivePluginExtension(QObject, Extension):
         if logged_in:
             self.refreshBackups()
 
-    def _onRestoringStateChanged(self, is_restoring: bool = False, error_message: str = None) -> None:
+    def _onRestoringStateChanged(self, is_restoring: bool = False, error_message: Optional[str] = None) -> None:
         self._is_restoring_backup = is_restoring
         self.restoringStateChanged.emit()
         if error_message:
+            self.backupIdBeingRestored = ""
             Message(error_message, title = catalog.i18nc("@info:title", "Backup")).show()
 
     def _onCreatingStateChanged(self, is_creating: bool = False, error_message: str = None) -> None:
@@ -152,6 +162,7 @@ class DrivePluginExtension(QObject, Extension):
         for backup in self._backups:
             if backup.get("backup_id") == backup_id:
                 self._drive_api_service.restoreBackup(backup)
+                self.setBackupIdBeingRestored(backup_id)
                 return
         Logger.log("w", "Unable to find backup with the ID %s", backup_id)
 
@@ -166,3 +177,12 @@ class DrivePluginExtension(QObject, Extension):
     def _backupDeletedCallback(self, success: bool):
         if success:
             self.refreshBackups()
+
+    def setBackupIdBeingRestored(self, backup_id_being_restored: str) -> None:
+        if backup_id_being_restored != self._backup_id_being_restored:
+            self._backup_id_being_restored = backup_id_being_restored
+            self.backupIdBeingRestoredChanged.emit()
+
+    @pyqtProperty(str, fset = setBackupIdBeingRestored, notify = backupIdBeingRestoredChanged)
+    def backupIdBeingRestored(self) -> str:
+        return self._backup_id_being_restored

plugins/CuraDrive/src/qml/components/BackupListFooter.qml

@@ -20,7 +20,7 @@ RowLayout
     {
         id: infoButton
         text: catalog.i18nc("@button", "Want more?")
-        iconSource: UM.Theme.getIcon("info")
+        iconSource: UM.Theme.getIcon("Information")
         onClicked: Qt.openUrlExternally("https://goo.gl/forms/QACEP8pP3RV60QYG2")
         visible: backupListFooter.showInfoButton
     }
@@ -29,7 +29,7 @@ RowLayout
     {
         id: createBackupButton
         text: catalog.i18nc("@button", "Backup Now")
-        iconSource: UM.Theme.getIcon("plus")
+        iconSource: UM.Theme.getIcon("Plus")
         enabled: !CuraDrive.isCreatingBackup && !CuraDrive.isRestoringBackup
         onClicked: CuraDrive.createBackup()
         busy: CuraDrive.isCreatingBackup

plugins/CuraDrive/src/qml/components/BackupListItem.qml

@@ -38,7 +38,7 @@ Item
             height: UM.Theme.getSize("section_icon").height
             color: UM.Theme.getColor("small_button_text")
             hoverColor: UM.Theme.getColor("small_button_text_hover")
-            iconSource: UM.Theme.getIcon("info")
+            iconSource: UM.Theme.getIcon("Information")
             onClicked: backupListItem.showDetails = !backupListItem.showDetails
         }
 
@@ -71,6 +71,7 @@ Item
             text: catalog.i18nc("@button", "Restore")
             enabled: !CuraDrive.isCreatingBackup && !CuraDrive.isRestoringBackup
             onClicked: confirmRestoreDialog.visible = true
+            busy: CuraDrive.backupIdBeingRestored == modelData.backup_id && CuraDrive.isRestoringBackup
         }
 
         UM.SimpleButton
@@ -79,7 +80,7 @@ Item
             height: UM.Theme.getSize("message_close").height
             color: UM.Theme.getColor("small_button_text")
             hoverColor: UM.Theme.getColor("small_button_text_hover")
-            iconSource: UM.Theme.getIcon("cross1")
+            iconSource: UM.Theme.getIcon("Cancel")
             onClicked: confirmDeleteDialog.visible = true
         }
     }

plugins/CuraDrive/src/qml/components/BackupListItemDetails.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2018 Ultimaker B.V.
+// Copyright (c) 2021 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.7
@@ -17,7 +17,7 @@ ColumnLayout
     // Cura version
     BackupListItemDetailsRow
     {
-        iconSource: UM.Theme.getIcon("application")
+        iconSource: UM.Theme.getIcon("UltimakerCura")
         label: catalog.i18nc("@backuplist:label", "Cura Version")
         value: backupDetailsData.metadata.cura_release
     }
@@ -25,7 +25,7 @@ ColumnLayout
     // Machine count.
     BackupListItemDetailsRow
     {
-        iconSource: UM.Theme.getIcon("printer_single")
+        iconSource: UM.Theme.getIcon("Printer")
         label: catalog.i18nc("@backuplist:label", "Machines")
         value: backupDetailsData.metadata.machine_count
     }
@@ -33,7 +33,7 @@ ColumnLayout
     // Material count
     BackupListItemDetailsRow
     {
-        iconSource: UM.Theme.getIcon("category_material")
+        iconSource: UM.Theme.getIcon("Spool")
         label: catalog.i18nc("@backuplist:label", "Materials")
         value: backupDetailsData.metadata.material_count
     }
@@ -41,7 +41,7 @@ ColumnLayout
     // Profile count.
     BackupListItemDetailsRow
     {
-        iconSource: UM.Theme.getIcon("settings")
+        iconSource: UM.Theme.getIcon("Sliders")
         label: catalog.i18nc("@backuplist:label", "Profiles")
         value: backupDetailsData.metadata.profile_count
     }
@@ -49,7 +49,7 @@ ColumnLayout
     // Plugin count.
     BackupListItemDetailsRow
     {
-        iconSource: UM.Theme.getIcon("plugin")
+        iconSource: UM.Theme.getIcon("Plugin")
         label: catalog.i18nc("@backuplist:label", "Plugins")
         value: backupDetailsData.metadata.plugin_count
     }

plugins/CuraEngineBackend/plugin.json

@@ -2,7 +2,7 @@
     "name": "CuraEngine Backend",
     "author": "Ultimaker B.V.",
     "description": "Provides the link to the CuraEngine slicing backend.",
-    "api": "7.6.0",
+    "api": 7,
     "version": "1.0.1",
     "i18n-catalog": "cura"
 }

plugins/CuraProfileReader/plugin.json

@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.1",
     "description": "Provides support for importing Cura profiles.",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }

plugins/CuraProfileWriter/plugin.json

@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.1",
     "description": "Provides support for exporting Cura profiles.",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog":"cura"
 }

plugins/DigitalLibrary/plugin.json

@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "description": "Connects to the Digital Library, allowing Cura to open files from and save files to the Digital Library.",
     "version": "1.0.0",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }

plugins/FirmwareUpdateChecker/plugin.json

@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.1",
     "description": "Checks for firmware updates.",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }

plugins/FirmwareUpdater/plugin.json

@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.1",
     "description": "Provides a machine actions for updating firmware.",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }

plugins/GCodeGzReader/plugin.json

@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.1",
     "description": "Reads g-code from a compressed archive.",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }

plugins/GCodeGzWriter/plugin.json

@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.1",
     "description": "Writes g-code to a compressed archive.",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }

plugins/GCodeProfileReader/plugin.json

@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.1",
     "description": "Provides support for importing profiles from g-code files.",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }

plugins/GCodeReader/plugin.json

@@ -3,6 +3,6 @@
     "author": "Victor Larchenko, Ultimaker B.V.",
     "version": "1.0.1",
     "description": "Allows loading and displaying G-code files.",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }

plugins/GCodeWriter/plugin.json

@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.1",
     "description": "Writes g-code to a file.",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }

plugins/ImageReader/plugin.json

@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.1",
     "description": "Enables ability to generate printable geometry from 2D image files.",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }

plugins/LegacyProfileReader/plugin.json

@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.1",
     "description": "Provides support for importing profiles from legacy Cura versions.",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }

plugins/MachineSettingsAction/plugin.json

@@ -3,6 +3,6 @@
     "author": "fieldOfView, Ultimaker B.V.",
     "version": "1.0.1",
     "description": "Provides a way to change machine settings (such as build volume, nozzle size, etc.).",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }

plugins/ModelChecker/plugin.json

@@ -2,7 +2,7 @@
     "name": "Model Checker",
     "author": "Ultimaker B.V.",
     "version": "1.0.1",
-    "api": "7.6.0",
+    "api": 7,
     "description": "Checks models and print configuration for possible printing issues and give suggestions.",
     "i18n-catalog": "cura"
 }

plugins/MonitorStage/MonitorMain.qml

@@ -137,7 +137,7 @@ Rectangle
                 id: externalLinkIcon
                 anchors.verticalCenter: parent.verticalCenter
                 color: UM.Theme.getColor("text_link")
-                source: UM.Theme.getIcon("external_link")
+                source: UM.Theme.getIcon("LinkExternal")
                 width: UM.Theme.getSize("monitor_external_link_icon").width
                 height: UM.Theme.getSize("monitor_external_link_icon").height
             }

plugins/MonitorStage/plugin.json

@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.1",
     "description": "Provides a monitor stage in Cura.",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }

plugins/PerObjectSettingsTool/PerObjectCategory.qml

@@ -24,7 +24,7 @@ Button {
                 anchors.verticalCenter: parent.verticalCenter
                 height: (label.height / 2) | 0
                 width: height
-                source: control.checked ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_right");
+                source: control.checked ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleRight");
                 color: control.hovered ? palette.highlight : palette.buttonText
             }
             UM.RecolorImage

plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml

@@ -80,7 +80,7 @@ Item
             {
                 id: normalButton
                 text: catalog.i18nc("@label", "Normal model")
-                iconSource: UM.Theme.getIcon("pos_normal");
+                iconSource: UM.Theme.getIcon("Infill0");
                 property bool needBorder: true
                 checkable: true
                 onClicked: setMeshType(normalMeshType);
@@ -92,7 +92,7 @@ Item
             {
                 id: supportMeshButton
                 text: catalog.i18nc("@label", "Print as support")
-                iconSource: UM.Theme.getIcon("pos_print_as_support");
+                iconSource: UM.Theme.getIcon("MeshTypeSupport");
                 property bool needBorder: true
                 checkable:true
                 onClicked: setMeshType(supportMeshType)
@@ -104,7 +104,7 @@ Item
             {
                 id: overlapMeshButton
                 text: catalog.i18nc("@label", "Modify settings for overlaps")
-                iconSource: UM.Theme.getIcon("pos_modify_overlaps");
+                iconSource: UM.Theme.getIcon("MeshTypeIntersect");
                 property bool needBorder: true
                 checkable:true
                 onClicked: setMeshType(infillMeshType)
@@ -116,7 +116,7 @@ Item
             {
                 id: antiOverhangMeshButton
                 text:  catalog.i18nc("@label", "Don't support overlaps")
-                iconSource: UM.Theme.getIcon("pos_modify_dont_support_overlap");
+                iconSource: UM.Theme.getIcon("BlockSupportOverlaps");
                 property bool needBorder: true
                 checkable: true
                 onClicked: setMeshType(antiOverhangMeshType)
@@ -306,7 +306,7 @@ Item
                                         height: width
                                         sourceSize.height: width
                                         color: control.hovered ? UM.Theme.getColor("setting_control_button_hover") : UM.Theme.getColor("setting_control_button")
-                                        source: UM.Theme.getIcon("minus")
+                                        source: UM.Theme.getIcon("Minus")
                                     }
                                 }
                             }

plugins/PerObjectSettingsTool/__init__.py

@@ -13,7 +13,7 @@ def getMetaData():
         "tool": {
             "name": i18n_catalog.i18nc("@label", "Per Model Settings"),
             "description": i18n_catalog.i18nc("@info:tooltip", "Configure Per Model Settings"),
-            "icon": "tool_icon.svg",
+            "icon": "MeshType",
             "tool_panel": "PerObjectSettingsPanel.qml",
             "weight": 3
         },

plugins/PerObjectSettingsTool/plugin.json

@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.1",
     "description": "Provides the Per Model Settings.",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }

plugins/PerObjectSettingsTool/tool_icon.svg

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="30px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 57.1 (83088) - https://sketch.com -->
-    <title>per_model_settings</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M9.73076923,0 L9.226,1.345 L0.449,11 L0,11 L0.639,9.084 L8.896,0 L9.73076923,0 Z M8.49,3.472 L8.907,4.721 L3.199,11 L1.647,11 L8.49,3.472 Z M9.228,5.685 L9.645,6.935 L5.949,11 L4.397,11 L9.228,5.685 Z M9.966,7.899 L10.382,9.148 L8.699,11 L7.147,11 L9.966,7.899 Z M10.704,10.112 L11,11 L9.896,11 L10.704,10.112 Z M7.698,0 L1.332,7.004 L2.23,4.308 L6.146,0 L7.698,0 Z M4.948,0 L2.344,2.866 L1.89,1.656 L3.396,0 L4.948,0 Z M2.198,0 L1.54,0.724 L1.26923077,0 L2.198,0 Z" id="path-1"></path>
-    </defs>
-    <g id="per_model_settings" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Per-model" transform="translate(2.000000, 2.000000)">
-            <polygon id="Path-Copy-5" fill="#000" points="1.26923077 0 9.73076923 0 8.46153846 3.38461538 11 11 0 11 2.53846154 3.38461538"></polygon>
-            <polygon id="Path-Copy-8" fill="#000" points="14.2692308 13 22.7307692 13 21.4615385 16.3846154 24 24 13 24 15.5384615 16.3846154"></polygon>
-            <g id="stripe" transform="translate(13.000000, 0.000000)">
-                <mask id="mask-2" fill="white">
-                    <use xlink:href="#path-1"></use>
-                </mask>
-                <use id="Combined-Shape" fill="#000" xlink:href="#path-1"></use>
-            </g>
-            <path d="M1.990731,13.5 L3.06878027,16.374798 L0.693712943,23.5 L10.3062871,23.5 L7.93121973,16.374798 L9.009269,13.5 L1.990731,13.5 Z" id="Path-Copy-7" stroke="#000"></path>
-        </g>
-    </g>
-</svg>

plugins/PostProcessingPlugin/PostProcessingPlugin.qml

@@ -154,7 +154,7 @@ UM.Dialog
                                     height: Math.round(control.height / 2.7)
                                     sourceSize.height: width
                                     color: palette.text
-                                    source: UM.Theme.getIcon("cross1")
+                                    source: UM.Theme.getIcon("Cancel")
                                 }
                             }
                         }
@@ -188,7 +188,7 @@ UM.Dialog
                                     height: Math.round(control.height / 2.5)
                                     sourceSize.height: width
                                     color: control.enabled ? palette.text : disabledPalette.text
-                                    source: UM.Theme.getIcon("arrow_bottom")
+                                    source: UM.Theme.getIcon("ChevronSingleDown")
                                 }
                             }
                         }
@@ -222,7 +222,7 @@ UM.Dialog
                                     height: Math.round(control.height / 2.5)
                                     sourceSize.height: width
                                     color: control.enabled ? palette.text : disabledPalette.text
-                                    source: UM.Theme.getIcon("arrow_top")
+                                    source: UM.Theme.getIcon("ChevronSingleUp")
                                 }
                             }
                         }
@@ -517,7 +517,7 @@ UM.Dialog
             }
             toolTipContentAlignment: Cura.ToolTip.ContentAlignment.AlignLeft
             onClicked: dialog.show()
-            iconSource: "postprocessing.svg"
+            iconSource: "Script.svg"
             fixedWidthMode: false
         }
 
@@ -536,4 +536,4 @@ UM.Dialog
             labelText: activeScriptsList.count
         }
     }
-}
+}

plugins/PostProcessingPlugin/Script.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+	<polygon points="4.4,12 8.2,15.8 6.8,17.2 1.6,12 6.8,6.8 8.2,8.2" />
+	<polygon points="22.4,12 17.2,17.2 15.8,15.8 19.6,12 15.8,8.2 17.2,6.8" />
+	<rect x="3.9" y="11" transform="matrix(0.1236 -0.9923 0.9923 0.1236 -1.429 22.4317)" width="16.1" height="2" />
+</svg>

plugins/PostProcessingPlugin/plugin.json

@@ -2,7 +2,7 @@
     "name": "Post Processing",
     "author": "Ultimaker",
     "version": "2.2.1",
-    "api": "7.6.0",
+    "api": 7,
     "description": "Extension that allows for user created scripts for post processing",
     "catalog": "cura"
 }

plugins/PostProcessingPlugin/postprocessing.svg

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 16.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   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"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   width="512px"
-   height="512px"
-   viewBox="0 0 512 512"
-   style="enable-background:new 0 0 512 512;"
-   xml:space="preserve"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="postprocessing.svg"><metadata
-     id="metadata9"><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></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs7" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1104"
-     inkscape:window-height="1006"
-     id="namedview5"
-     showgrid="false"
-     inkscape:zoom="1.3359375"
-     inkscape:cx="256"
-     inkscape:cy="256"
-     inkscape:window-x="701"
-     inkscape:window-y="121"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="Layer_1" /><path
-     d="M 402.15234 0 C 371.74552 4.7369516e-015 345.79114 10.752017 324.21875 32.324219 C 302.57788 53.89652 291.82617 79.851497 291.82617 110.18945 C 291.82617 127.34315 295.26662 143.09419 302.16602 157.44531 L 238.38477 221.20312 C 227.77569 210.95036 218.04331 201.50935 209.66016 193.32422 C 207.33386 190.99792 202.68042 189.48707 198.60938 191.92969 L 191.74609 196.11719 C 165.34252 169.24836 154.17609 158.42965 150.57031 145.40234 C 146.84822 131.79345 150.22148 113.64862 153.71094 106.90234 C 156.61882 101.55183 165.69233 96.550326 173.36914 95.96875 L 183.37109 106.20508 C 185.69739 108.53139 189.30456 108.53139 191.63086 106.20508 L 227.57227 69.681641 C 229.89858 67.355335 229.89858 63.517712 227.57227 61.191406 L 169.53125 2.21875 C 167.20494 -0.10755598 163.48147 -0.10755598 161.27148 2.21875 L 125.33008 38.742188 C 123.00378 41.068494 123.00378 44.906116 125.33008 47.232422 L 129.16992 51.1875 C 129.16992 56.88695 128.35573 65.727167 123.70312 70.496094 C 116.49157 77.823958 102.18413 69.332919 92.878906 75.962891 C 83.689998 82.476548 72.05746 92.944493 64.613281 100.38867 C 57.285417 107.83285 29.138171 137.37722 9.015625 187.16016 C -11.106922 236.94311 4.3632369 283.12 15.296875 295.2168 C 21.11264 301.61414 31.696982 308.12804 29.835938 296.03125 C 27.974892 283.81815 24.951448 241.47942 38.792969 224.14844 C 52.634489 206.81746 70.894726 192.62799 94.623047 191.46484 C 117.42084 190.30169 130.56529 198.09417 160.10938 228.10352 L 156.85156 234.15234 C 154.75788 238.10706 155.92175 243.10728 158.24805 245.43359 C 161.95717 248.74082 172.37305 258.96006 186.52539 273.04297 L 6.9511719 452.54883 C 2.2984329 457.14417 1.1842379e-015 462.71497 0 469.14844 C -1.1842379e-015 475.69681 2.2984329 481.15473 6.9511719 485.51953 L 26.308594 505.22266 C 31.018838 509.76054 36.589603 512 42.908203 512 C 49.341623 512 54.800053 509.76054 59.337891 505.22266 L 238.96875 325.6582 C 317.6609 404.95524 424.21289 513.40234 424.21289 513.40234 L 482.25391 454.43164 C 437.71428 411.9686 358.71135 336.76293 291.93164 272.71484 L 354.68945 209.98047 C 369.08663 216.91399 384.90203 220.37891 402.15234 220.37891 C 425.29988 220.37891 446.52947 213.53073 465.77344 199.83398 C 485.08493 186.1372 498.57775 168.33291 506.31641 146.34961 C 510.08303 135.39222 512 126.69334 512 120.25586 C 512 117.79044 511.24662 115.80572 509.87695 114.16211 C 508.50726 112.5185 506.59041 111.69531 504.125 111.69531 C 502.61835 111.69531 496.86414 114.5734 486.72852 120.39453 C 476.6614 126.21564 465.50054 132.85752 453.37891 140.32227 C 441.18878 147.78698 434.7515 151.75888 433.92969 152.23828 L 386.40234 125.94141 L 386.40234 70.8125 L 458.51562 29.242188 C 461.18649 27.461587 462.48633 25.202356 462.48633 22.394531 C 462.48633 19.586706 461.1865 17.325625 458.51562 15.476562 C 451.32484 10.545729 442.4896 6.780346 432.08008 4.0410156 C 421.60206 1.3701797 411.67159 0 402.15234 0 z "
-     id="path3" /></svg>

plugins/PostProcessingPlugin/scripts/PauseAtHeight.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Ultimaker B.V.
+# Copyright (c) 2021 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
 from ..Script import Script
@@ -517,8 +517,13 @@ class PauseAtHeight(Script):
 
                     prepend_gcode += self.putValue(M = extrusion_mode_numeric) + " ; switch back to " + extrusion_mode_string + " E values\n"
 
-                # reset extrude value to pre pause value
+                    # reset extrude value to pre pause value
-                prepend_gcode += self.putValue(G = 92, E = current_e) + "\n"
+                    prepend_gcode += self.putValue(G = 92, E = current_e) + "\n"
+
+                elif redo_layer:
+                    # All other options reset the E value to what it was before the pause because E things were added.
+                    # If it's not yet reset, it still needs to be reset if there were any redo layers.
+                    prepend_gcode += self.putValue(G = 92, E = current_e) + "\n"
 
                 layer = prepend_gcode + layer
 

plugins/PrepareStage/PrepareMenu.qml

@@ -8,7 +8,6 @@ import QtQuick.Controls 2.3
 import UM 1.3 as UM
 import Cura 1.1 as Cura
 
-import QtGraphicalEffects 1.0 // For the dropshadow
 
 Item
 {
@@ -42,42 +41,34 @@ Item
             anchors.left: openFileButton.right
             anchors.right: parent.right
             anchors.leftMargin: UM.Theme.getSize("default_margin").width
+            property int machineSelectorWidth: Math.round((width - printSetupSelectorItem.width) / 3)
 
             height: parent.height
-            spacing: 0
+            // This is a trick to make sure that the borders of the two adjacent buttons' borders overlap. Otherwise
+            // there will be double border (one from each button)
+            spacing: -UM.Theme.getSize("default_lining").width
 
             Cura.MachineSelector
             {
                 id: machineSelection
                 headerCornerSide: Cura.RoundedRectangle.Direction.Left
-                Layout.minimumWidth: UM.Theme.getSize("machine_selector_widget").width
+                headerBackgroundBorder.width: UM.Theme.getSize("default_lining").width
-                Layout.maximumWidth: UM.Theme.getSize("machine_selector_widget").width
+                headerBackgroundBorder.color: UM.Theme.getColor("lining")
+                enableHeaderShadow: false
+                Layout.preferredWidth: parent.machineSelectorWidth
                 Layout.fillWidth: true
                 Layout.fillHeight: true
             }
 
-            // Separator line
-            Rectangle
-            {
-                height: parent.height
-                width: UM.Theme.getSize("default_lining").width
-                color: UM.Theme.getColor("lining")
-            }
-
             Cura.ConfigurationMenu
             {
                 id: printerSetup
+                enableHeaderShadow: false
+                headerBackgroundBorder.width: UM.Theme.getSize("default_lining").width
+                headerBackgroundBorder.color: UM.Theme.getColor("lining")
                 Layout.fillHeight: true
                 Layout.fillWidth: true
-                Layout.preferredWidth: itemRow.width - machineSelection.width - printSetupSelectorItem.width - 2 * UM.Theme.getSize("default_lining").width
+                Layout.preferredWidth: parent.machineSelectorWidth * 2
-            }
-
-            // Separator line
-            Rectangle
-            {
-                height: parent.height
-                width: UM.Theme.getSize("default_lining").width
-                color: UM.Theme.getColor("lining")
             }
 
             Item
@@ -106,7 +97,7 @@ Item
                 {
                     id: buttonIcon
                     anchors.centerIn: parent
-                    source: UM.Theme.getIcon("load")
+                    source: UM.Theme.getIcon("Folder")
                     width: UM.Theme.getSize("button_icon").width
                     height: UM.Theme.getSize("button_icon").height
                     color: UM.Theme.getColor("icon")
@@ -120,24 +111,12 @@ Item
                 id: background
                 height: UM.Theme.getSize("stage_menu").height
                 width: UM.Theme.getSize("stage_menu").height
+                border.color: UM.Theme.getColor("lining")
+                border.width: UM.Theme.getSize("default_lining").width
 
                 radius: UM.Theme.getSize("default_radius").width
                 color: openFileButton.hovered ? UM.Theme.getColor("action_button_hovered") : UM.Theme.getColor("action_button")
             }
-
-            DropShadow
-            {
-                id: shadow
-                // Don't blur the shadow
-                radius: 0
-                anchors.fill: background
-                source: background
-                verticalOffset: 2
-                visible: true
-                color: UM.Theme.getColor("action_button_shadow")
-                // Should always be drawn behind the background.
-                z: background.z - 1
-            }
         }
     }
 }

plugins/PrepareStage/plugin.json

@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.1",
     "description": "Provides a prepare stage in Cura.",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }

plugins/PreviewStage/plugin.json

@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.1",
     "description": "Provides a preview stage in Cura.",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }

plugins/RemovableDriveOutputDevice/plugin.json

@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "description": "Provides removable drive hotplugging and writing support.",
     "version": "1.0.1",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }

plugins/SentryLogger/plugin.json

@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.0",
     "description": "Logs certain events so that they can be used by the crash reporter",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }

plugins/SimulationView/SimulationViewMainComponent.qml

@@ -78,7 +78,7 @@ Item
     UM.SimpleButton
     {
         id: playButton
-        iconSource: !isSimulationPlaying ? "./resources/simulation_resume.svg": "./resources/simulation_pause.svg"
+        iconSource: !isSimulationPlaying ? "./resources/Play.svg": "./resources/Pause.svg"
         width: UM.Theme.getSize("small_button").width
         height: UM.Theme.getSize("small_button").height
         hoverColor: UM.Theme.getColor("slider_handle_active")
@@ -241,4 +241,4 @@ Item
             layerSlider.setUpperValue(UM.SimulationView.currentLayer)
         }
     }
-}
+}

plugins/SimulationView/SimulationViewMenuComponent.qml

@@ -211,7 +211,7 @@ Cura.ExpandableComponent
                     anchors.right: extrudersModelCheckBox.right
                     width: UM.Theme.getSize("layerview_legend_size").width
                     height: UM.Theme.getSize("layerview_legend_size").height
-                    source: UM.Theme.getIcon("extruder_button")
+                    source: UM.Theme.getIcon("Extruder", "medium")
                     color: model.color
                 }
 

plugins/SimulationView/plugin.json

@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.1",
     "description": "Provides the Simulation view.",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }

plugins/SimulationView/resources/Pause.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M8,21H6V3h2V21z M18,3h-2v18h2V3z" />
+</svg>

plugins/SimulationView/resources/Play.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M5,20V4c0-0.8,0.9-1.3,1.5-0.9l13,8c0.6,0.4,0.6,1.3,0,1.7l-13,8C5.9,21.3,5,20.8,5,20z M7,5.8v12.4
+	L17.1,12L7,5.8z"/>
+</svg>

plugins/SimulationView/resources/simulation_pause.svg

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   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="6mm"
-   height="6mm"
-   viewBox="0 0 5.9999999 6"
-   version="1.1"
-   id="svg877"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
-   sodipodi:docname="simulation_pause2.svg">
-  <defs
-     id="defs871" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.839192"
-     inkscape:cx="-5.3551409"
-     inkscape:cy="17.386031"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="2880"
-     inkscape:window-height="1675"
-     inkscape:window-x="-13"
-     inkscape:window-y="-13"
-     inkscape:window-maximized="1"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <metadata
-     id="metadata874">
-    <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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-11.163774,-122.8006)">
-    <g
-       id="g825"
-       transform="matrix(0.26458333,0,0,0.26458333,10.185689,121.85192)">
-      <rect
-         y="5"
-         x="19"
-         height="20"
-         width="2.7552757"
-         id="rect5192"
-         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.34745646;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <rect
-         y="5"
-         x="9"
-         height="20"
-         width="2.7552757"
-         id="rect5192-5"
-         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.34745646;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    </g>
-  </g>
-</svg>

plugins/SimulationView/resources/simulation_resume.svg

@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   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="6mm"
-   height="6mm"
-   viewBox="0 0 6 6"
-   version="1.1"
-   id="svg8"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
-   sodipodi:docname="simulation_resume2.svg">
-  <defs
-     id="defs2" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.839192"
-     inkscape:cx="-32.404712"
-     inkscape:cy="14.267522"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="2880"
-     inkscape:window-height="1675"
-     inkscape:window-x="-13"
-     inkscape:window-y="-13"
-     inkscape:window-maximized="1"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <metadata
-     id="metadata5">
-    <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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(81.024887,-389.647)">
-    <path
-       sodipodi:type="star"
-       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.50520164;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path847"
-       sodipodi:sides="3"
-       sodipodi:cx="-78.732257"
-       sodipodi:cy="392.65222"
-       sodipodi:r1="3.0592039"
-       sodipodi:r2="1.5296021"
-       sodipodi:arg1="0"
-       sodipodi:arg2="1.0471976"
-       inkscape:flatsided="true"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m -75.67305,392.65222 -4.588806,2.64935 v -5.2987 z"
-       inkscape:transform-center-x="0.75529536"
-       inkscape:transform-center-y="0.40090429" />
-  </g>
-</svg>

plugins/SliceInfoPlugin/SliceInfo.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Ultimaker B.V.
+# Copyright (c) 2021 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
 import json
@@ -87,8 +87,12 @@ class SliceInfo(QObject, Extension):
                 return None
             file_path = os.path.join(plugin_path, "example_data.html")
             if file_path:
-                with open(file_path, "r", encoding = "utf-8") as f:
+                try:
-                    self._example_data_content = f.read()
+                    with open(file_path, "r", encoding = "utf-8") as f:
+                        self._example_data_content = f.read()
+                except EnvironmentError as e:
+                    Logger.error(f"Unable to read example slice info data to show to the user: {e}")
+                    self._example_data_content = "<i>" + catalog.i18nc("@text", "Unable to read example data file.") + "</i>"
         return self._example_data_content
 
     @pyqtSlot(bool)

plugins/SliceInfoPlugin/plugin.json

@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.1",
     "description": "Submits anonymous slice info. Can be disabled through preferences.",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }

plugins/SolidView/plugin.json

@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.1",
     "description": "Provides a normal solid mesh view.",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }

plugins/SupportEraser/__init__.py

@@ -11,7 +11,7 @@ def getMetaData():
         "tool": {
             "name": i18n_catalog.i18nc("@label", "Support Blocker"),
             "description": i18n_catalog.i18nc("@info:tooltip", "Create a volume in which supports are not printed."),
-            "icon": "tool_icon.svg",
+            "icon": "SupportBlocker",
             "weight": 4
         }
     }

plugins/SupportEraser/plugin.json

@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.1",
     "description": "Creates an eraser mesh to block the printing of support in certain places",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }

plugins/SupportEraser/tool_icon.svg

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="30px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 57.1 (83088) - https://sketch.com -->
-    <title>support_blocker</title>
-    <desc>Created with Sketch.</desc>
-    <g id="support_blocker" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Group-3" transform="translate(3.000000, 2.000000)">
-            <g id="Print-as-support-Copy" fill="#000">
-                <path d="M0.833,19.65 L0.833,22.342 L0,22.3428571 L0.833,19.65 Z M4.166,8.879 L4.166,22.342 L2.499,22.342 L2.499,14.266 L4.166,8.879 Z M7.5,0.8 L7.5,22.342 L5.833,22.342 L5.833,0.8 L7.5,0.8 Z M10.833,0.8 L10.833,22.342 L9.166,22.342 L9.166,0.8 L10.833,0.8 Z M14.166,0.8 L14.166,14 L12.499,14 L12.499,0.8 L14.166,0.8 Z M15.833,8.879 L17.418,14 L15.833,14 L15.833,8.879 Z M4.166,0.8 L4.166,6.139 L2.499,1.351 L2.499,0.8 L4.166,0.8 Z M17.5,0.8 L17.5,1.351 L15.833,6.139 L15.833,0.8 L17.5,0.8 Z" id="Combined-Shape"></path>
-            </g>
-            <path d="M12,14 L22,14 L22,24 L12,24 L12,14 Z" id="Rectangle" stroke="#000" stroke-dasharray="1,1"></path>
-        </g>
-    </g>
-</svg>

plugins/Toolbox/plugin.json

@@ -2,6 +2,6 @@
     "name": "Toolbox",
     "author": "Ultimaker B.V.",
     "version": "1.0.1",
-    "api": "7.6.0",
+    "api": 7,
     "description": "Find, manage and install new Cura packages."
 }

plugins/Toolbox/resources/images/Shop.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M19,3H5C3.3,3,2,4.3,2,6v3c0,1.5,0.8,2.7,2,3.4V22h16v-9.6c1.2-0.7,2-2,2-3.4V6C22,4.3,20.7,3,19,3z
+	M10,5h4v4c0,1.1-0.9,2-2,2s-2-0.9-2-2V5z M4,9V5h4v4c0,1.1-0.9,2-2,2S4,10.1,4,9z M18,20h-4v-5h-4v5H6v-7c1.2,0,2.3-0.5,3-1.4
+	c0.7,0.8,1.8,1.4,3,1.4s2.3-0.5,3-1.4c0.7,0.8,1.8,1.4,3,1.4V20z M20,9c0,1.1-0.9,2-2,2s-2-0.9-2-2V5h4V9z" />
+</svg>

plugins/Toolbox/resources/images/shop.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <path d="M19,3H5A2.9,2.9,0,0,0,2,6V9a3.9,3.9,0,0,0,2,3.4V22H20V12.4A3.9,3.9,0,0,0,22,9V6A2.9,2.9,0,0,0,19,3ZM10,5h4V9a2,2,0,0,1-4,0ZM4,9V5H8V9A2,2,0,0,1,4,9ZM18,20H14V15H10v5H6V13a3.7,3.7,0,0,0,3-1.4A3.7,3.7,0,0,0,12,13a3.7,3.7,0,0,0,3-1.4A3.7,3.7,0,0,0,18,13ZM20,9a2,2,0,0,1-4,0V5h4Z" />
-</svg>

plugins/Toolbox/resources/qml/components/ToolboxBackColumn.qml

@@ -41,7 +41,7 @@ Item
                 height: height
             }
             color: button.enabled ? (button.hovered ? UM.Theme.getColor("primary") : UM.Theme.getColor("text")) : UM.Theme.getColor("text_inactive")
-            source: UM.Theme.getIcon("arrow_left")
+            source: UM.Theme.getIcon("ChevronSingleLeft")
         }
         width: UM.Theme.getSize("toolbox_back_button").width
         height: UM.Theme.getSize("toolbox_back_button").height

plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcaseTile.qml

@@ -4,7 +4,7 @@
 import QtQuick 2.10
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
-import QtGraphicalEffects 1.0
+
 import UM 1.1 as UM
 
 Rectangle

plugins/Toolbox/resources/qml/components/ToolboxHeader.qml

@@ -95,7 +95,7 @@ Item
         UM.RecolorImage
         {
             id: cloudMarketplaceButton
-            source: "../../images/shop.svg"
+            source: "../../images/Shop.svg"
             color: UM.Theme.getColor(webMarketplaceButtonTooltipArea.containsMouse ? "primary" : "text")
             height: parent.height / 2
             width: height

plugins/TrimeshReader/plugin.json

@@ -3,5 +3,5 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.0",
     "description": "Provides support for reading model files.",
-    "api": "7.6.0"
+    "api": 7
 }

plugins/UFPWriter/plugin.json

@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.1",
     "description": "Provides support for writing Ultimaker Format Packages.",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }

plugins/UM3NetworkPrinting/plugin.json

@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "description": "Manages network connections to Ultimaker networked printers.",
     "version": "2.0.0",
-    "api": "7.6.0",
+    "api": 7,
     "i18n-catalog": "cura"
 }

plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml

@@ -51,7 +51,7 @@ Item
                 anchors.centerIn: parent
                 color: UM.Theme.getColor("monitor_icon_primary")
                 height: parent.height
-                source: "../svg/icons/buildplate.svg"
+                source: "../svg/icons/Buildplate.svg"
                 width: height
                 visible: buildplate
             }

plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml

@@ -98,7 +98,7 @@ Item
                 sourceSize.width: width // TODO: Theme!
                 sourceSize.height: width // TODO: Theme!
                 color: UM.Theme.getColor("text")
-                source: UM.Theme.getIcon("arrow_left")
+                source: UM.Theme.getIcon("ChevronSingleLeft")
             }
         }
     }
@@ -177,7 +177,7 @@ Item
                 sourceSize.width: width // TODO: Theme!
                 sourceSize.height: width // TODO: Theme!
                 color: UM.Theme.getColor("text")
-                source: UM.Theme.getIcon("arrow_right")
+                source: UM.Theme.getIcon("ChevronSingleRight")
             }
         }
     }

plugins/UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml

@@ -22,7 +22,7 @@ Item
     property int size: 32 * screenScaleFactor // TODO: Theme!
 
     // THe extruder icon source; NOTE: This shouldn't need to be changed
-    property string iconSource: "../svg/icons/extruder.svg"
+    property string iconSource: "../svg/icons/Extruder.svg"
 
     height: size
     width: size

plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobPreview.qml

@@ -71,20 +71,20 @@ Item
             }
             if (printJob.configurationChanges.length > 0)
             {
-                return "../svg/warning-icon.svg"
+                return "../svg/Warning.svg"
             }
             switch(printJob.state)
             {
                 case "error":
-                    return "../svg/aborted-icon.svg"
+                    return "../svg/CancelCircle.svg"
                 case "wait_cleanup":
-                    return printJob.timeTotal > printJob.timeElapsed ? "../svg/aborted-icon.svg" : ""
+                    return printJob.timeTotal > printJob.timeElapsed ? "../svg/CancelCircle.svg" : ""
                 case "pausing":
-                    return "../svg/paused-icon.svg"
+                    return "../svg/PauseCircle.svg"
                 case "paused":
-                    return "../svg/paused-icon.svg"
+                    return "../svg/PauseCircle.svg"
                 case "resuming":
-                    return "../svg/paused-icon.svg"
+                    return "../svg/PauseCircle.svg"
                 default:
                     return ""
             }

plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml

@@ -164,7 +164,7 @@ Item
                             verticalCenter: managePrinterText.verticalCenter
                         }
                         color: UM.Theme.getColor("text_link")
-                        source: UM.Theme.getIcon("external_link")
+                        source: UM.Theme.getIcon("LinkExternal")
                         width: 12 * screenScaleFactor
                         height: 12 * screenScaleFactor
                     }
@@ -265,7 +265,7 @@ Item
                 bottom: parent.bottom
                 bottomMargin: 20 * screenScaleFactor // TODO: Theme!
             }
-            iconSource: "../svg/icons/camera.svg"
+            iconSource: "../svg/icons/CameraPhoto.svg"
             enabled: !cloudConnection
             visible: printer
         }

plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml

@@ -48,7 +48,7 @@ Item
             id: externalLinkIcon
             anchors.verticalCenter: manageQueueLabel.verticalCenter
             color: UM.Theme.getColor("text_link")
-            source: UM.Theme.getIcon("external_link")
+            source: UM.Theme.getIcon("LinkExternal")
             width: 16 * screenScaleFactor // TODO: Theme! (Y U NO USE 18 LIKE ALL OTHER ICONS?!)
             height: 16 * screenScaleFactor // TODO: Theme! (Y U NO USE 18 LIKE ALL OTHER ICONS?!)
         }

plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml

@@ -6,7 +6,6 @@ import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 import UM 1.3 as UM
 import Cura 1.0 as Cura
-import QtGraphicalEffects 1.0
 
 // This is the root component for the monitor stage.
 Component

plugins/UM3NetworkPrinting/resources/qml/PrinterVideoStream.qml

@@ -30,7 +30,7 @@ Item {
             top: cameraImage.top
             topMargin: UM.Theme.getSize("default_margin").height
         }
-        iconSource: UM.Theme.getIcon("cross1");
+        iconSource: UM.Theme.getIcon("Cancel");
         z: 999;
     }
 

plugins/UM3NetworkPrinting/resources/svg/Camera.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M22,6.4l-4,2V8c0-1.7-1.3-3-3-3H5C3.3,5,2,6.3,2,8v8c0,1.7,1.3,3,3,3h10c1.7,0,3-1.3,3-3v-0.4l4,2
+	V6.4z M16,17H4V7h12V17z M20,14.4l-2-1c0-0.9,0-1.8,0-2.8l2-1V14.4z" />
+</svg>

plugins/UM3NetworkPrinting/resources/svg/CancelCircle.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M12,2C6.5,2,2,6.5,2,12s4.5,10,10,10s10-4.5,10-10S17.5,2,12,2z M12,20c-4.4,0-8-3.6-8-8s3.6-8,8-8
+	s8,3.6,8,8S16.4,20,12,20z M16.7,8.7L13.4,12l3.3,3.3l-1.4,1.4L12,13.4l-3.3,3.3l-1.4-1.4l3.3-3.3L7.3,8.7l1.4-1.4l3.3,3.3l3.3-3.3
+	L16.7,8.7z" />
+</svg>

plugins/UM3NetworkPrinting/resources/svg/Check.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<polygon points="9.1,19.4 1.9,12.2 3.3,10.8 9.1,16.6 19.4,6.3 20.8,7.7" />
+</svg>

plugins/UM3NetworkPrinting/resources/svg/CheckCircle.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M12,2C6.5,2,2,6.5,2,12c0,5.5,4.5,10,10,10s10-4.5,10-10C22,6.5,17.5,2,12,2z M12,20
+	c-4.4,0-8-3.6-8-8c0-4.4,3.6-8,8-8s8,3.6,8,8C20,16.4,16.4,20,12,20z" />
+<polygon points="16.3,8.3 11,13.6 7.7,10.3 6.3,11.7 11,16.4 17.7,9.7" />
+</svg>

plugins/UM3NetworkPrinting/resources/svg/PauseCircle.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M12,2C6.5,2,2,6.5,2,12c0,5.5,4.5,10,10,10s10-4.5,10-10C22,6.5,17.5,2,12,2z M12,20
+	c-4.4,0-8-3.6-8-8c0-4.4,3.6-8,8-8s8,3.6,8,8C20,16.4,16.4,20,12,20z" />
+<rect x="13" y="8" width="2" height="8"/>
+<rect x="9" y="8" width="2" height="8"/>
+</svg>

plugins/UM3NetworkPrinting/resources/svg/Prohibition.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M12,2C6.5,2,2,6.5,2,12s4.5,10,10,10s10-4.5,10-10S17.5,2,12,2z M4,12c0-1.8,0.6-3.5,1.7-4.9
+	l11.2,11.2C15.5,19.4,13.8,20,12,20C7.6,20,4,16.4,4,12z M18.3,16.9L7.1,5.7C8.5,4.6,10.2,4,12,4c4.4,0,8,3.6,8,8
+	C20,13.8,19.4,15.5,18.3,16.9z" />
+</svg>

plugins/UM3NetworkPrinting/resources/svg/Warning.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M22,18L13.7,3.1c-0.4-0.6-1-1-1.7-1s-1.4,0.4-1.7,1L2,18c-0.3,0.6-0.3,1.4,0,2c0.4,0.6,1,1,1.7,1
+	h16.6c0.7,0,1.4-0.4,1.7-1C22.4,19.4,22.4,18.7,22,18z M3.7,19L12,4.1L20.3,19H3.7z M11,8h2v6h-2V8z M13,18h-2v-2h2V18z" />
+</svg>

plugins/UM3NetworkPrinting/resources/svg/aborted-icon.svg

@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><title>aborted-icon</title><path d="M16,0A16,16,0,1,0,32,16,16,16,0,0,0,16,0Zm1.69,28.89a13,13,0,1,1,11.2-11.2A13,13,0,0,1,17.69,28.89Z"/><polygon points="20.6 9.28 16 13.88 11.4 9.28 9.28 11.4 13.88 16 9.28 20.6 11.4 22.72 16 18.12 20.6 22.72 22.72 20.6 18.12 16 22.72 11.4 20.6 9.28"/></svg>

plugins/UM3NetworkPrinting/resources/svg/action-required-icon.svg

@@ -1,10 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" height="24" viewBox="0 0 24 24">
-    <defs>
-        <path id="a" d="M13.774 1.412l9.706 18.665A2 2 0 0 1 21.706 23H2.294A2 2 0 0 1 .52 20.077l9.706-18.665a2 2 0 0 1 3.548 0z"/>
-    </defs>
-    <g fill="none" fill-rule="evenodd">
-        <use fill="#FFF" xlink:href="#a"/>
-        <path stroke="#000" stroke-width="2.4" d="M12.71 1.966a.8.8 0 0 0-1.42 0L1.584 20.631a.8.8 0 0 0 .71 1.169h19.412a.8.8 0 0 0 .71-1.17L12.71 1.967z"/>
-        <path fill="#000" d="M13.144 14.995h-2.29L10.5 8h2.998l-.354 6.995zm-2.612 2.502c0-.475.13-.844.388-1.108.258-.263.633-.395 1.125-.395.488 0 .857.132 1.108.395.251.264.377.633.377 1.108 0 .47-.13.836-.39 1.1-.261.263-.626.395-1.095.395-.473 0-.843-.132-1.111-.396-.268-.263-.402-.63-.402-1.1z"/>
-    </g>
-</svg>

plugins/UM3NetworkPrinting/resources/svg/approved-icon.svg

@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><title>approved-icon</title><path d="M16,29A13,13,0,1,0,3,16,13,13,0,0,0,16,29ZM8,14.59l6,5.3L23.89,9l2.22,2L14.18,24.11,6,16.83Z" fill="none"/><path d="M16,32A16,16,0,1,0,0,16,16,16,0,0,0,16,32ZM16,3A13,13,0,1,1,3,16,13,13,0,0,1,16,3Z"/><polygon points="26.11 11.01 23.89 8.99 13.96 19.89 8 14.59 6 16.83 14.18 24.11 26.11 11.01"/></svg>

plugins/UM3NetworkPrinting/resources/svg/blocked-icon.svg

@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="25" height="24" viewBox="0 0 25 24">
-    <g fill="none" fill-rule="evenodd" stroke="#000" stroke-width="2.4" transform="translate(.567)">
-        <circle cx="12" cy="12" r="10.8"/>
-        <path stroke-linecap="square" d="M5.5 18.5L18.935 5.065"/>
-    </g>
-</svg>

plugins/UM3NetworkPrinting/resources/svg/camera-icon.svg

@@ -1,8 +0,0 @@
-<svg width="48px" height="48px" viewBox="0 0 48 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 51.3 (57544) - http://www.bohemiancoding.com/sketch -->
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <path d="M39.0204082,32.810726 L39.0204082,40 L0,40 L0,8 L39.0204082,8 L39.0204082,13.382823 L42.565076,11.9601033 C44.1116852,11.3414006 46.2176038,11.5575311 47.3294911,12.5468926 L48,13.1435139 L48,32.1994839 C48,32.8444894 47.6431099,33.4236728 46.9293296,33.9370341 C45.8586592,34.707076 45.395355,34.5806452 44.4537143,34.5806452 C43.7935857,34.5806452 43.1386795,34.4629571 42.5629467,34.2325919 L39.0204082,32.810726 Z M35.0204082,12 L4,12 L4,36 L35.0204082,36 L35.0204082,26.8950804 L37.7653798,27.9968275 L44,30.4992132 L44,15.6943364 L35.0204082,19.298468 L35.0204082,12 Z" id="Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
-    </g>
-</svg>

plugins/UM3NetworkPrinting/resources/svg/checkmark-icon.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-    <path fill="none" fill-rule="evenodd" stroke="#000" stroke-width="3" d="M3 10.71L10.068 17 21 5"/>
-</svg>

plugins/UM3NetworkPrinting/resources/svg/icons/Buildplate.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M18,21H6c-1.7,0-3-1.3-3-3V6c0-1.7,1.3-3,3-3h12c1.7,0,3,1.3,3,3v12C21,19.7,19.7,21,18,21z M5,19h14
+	V5H5V19z M14.7,7.7l-1.4-1.4l-7,7l1.4,1.4L14.7,7.7z M9.7,7.7L8.3,6.3l-2,2l1.4,1.4L9.7,7.7z" />
+</svg>

plugins/UM3NetworkPrinting/resources/svg/icons/CameraPhoto.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M19,6h-1.6l-2-2H8.6l-2,2H5C3.3,6,2,7.3,2,9v8c0,1.7,1.3,3,3,3h14c1.7,0,3-1.3,3-3V9
+	C22,7.3,20.7,6,19,6z M20,18H4V8h3.4l2-2h5.2l2,2H20V18z M12,8c-2.2,0-4,1.8-4,4s1.8,4,4,4s4-1.8,4-4S14.2,8,12,8z M12,14
+	c-1.1,0-2-0.9-2-2s0.9-2,2-2s2,0.9,2,2S13.1,14,12,14z" />
+</svg>

plugins/UM3NetworkPrinting/resources/svg/icons/Extruder.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30">
+<path d="M15,3C8.37,3,3,8.37,3,15v11h2v-4.36C7.15,24.87,10.83,27,15,27c6.63,0,12-5.37,12-12S21.63,3,15,3z M15,25
+	C9.49,25,5,20.51,5,15S9.49,5,15,5s10,4.49,10,10S20.51,25,15,25z"/>
+</svg>

plugins/UM3NetworkPrinting/resources/svg/icons/buildplate.svg

@@ -1,5 +0,0 @@
-<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <path d="M18,5 L18,6 L9,10 L0,6 L0,5 L9,1 L18,5 Z M18,8.18863507 L9,12.1886351 L0,8.18863507 L0,7.09431753 L9,11.0943175 L18,7.09431753 L18,8.18863507 Z M18,10.3772701 L9,14.3772701 L0,10.3772701 L0,9.2829526 L9,13.2829526 L18,9.2829526 L18,10.3772701 Z M18,12.5659052 L9,16.5659052 L0,12.5659052 L0,11.4715877 L9,15.4715877 L18,11.4715877 L18,12.5659052 Z" id="Combined-Shape" fill="#D10000" fill-rule="nonzero"></path>
-    </g>
-</svg>