Merge remote-tracking branch 'origin/master' into WIP_improve_initialization

plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py

@@ -62,13 +62,26 @@ class FirmwareUpdateCheckerJob(Job):
                 # notify the user when no new firmware version is available.
                 if (checked_version != "") and (checked_version != current_version):
                     Logger.log("i", "SHOWING FIRMWARE UPDATE MESSAGE")
-                    message = Message(i18n_catalog.i18nc("@info Don't translate {machine_name}, since it gets replaced by a printer name!", "New features are available for your {machine_name}! It is recommended to update the firmware on your printer.").format(machine_name = machine_name),
-                                      title = i18n_catalog.i18nc("@info:title The %s gets replaced with the printer name.", "New %s firmware available") % machine_name)
-                    message.addAction("download", i18n_catalog.i18nc("@action:button", "How to update"), "[no_icon]", "[no_description]")
+
+                    message = Message(i18n_catalog.i18nc(
+                        "@info Don't translate {machine_name}, since it gets replaced by a printer name!",
+                        "New features are available for your {machine_name}! It is recommended to update the firmware on your printer.").format(
+                        machine_name=machine_name),
+                        title=i18n_catalog.i18nc(
+                                          "@info:title The %s gets replaced with the printer name.",
+                                          "New %s firmware available") % machine_name)
+
+                    message.addAction("download",
+                                      i18n_catalog.i18nc("@action:button", "How to update"),
+                                      "[no_icon]",
+                                      "[no_description]",
+                                      button_style=Message.ActionButtonStyle.LINK,
+                                      button_align=Message.ActionButtonStyle.BUTTON_ALIGN_LEFT)
+
 
                     # If we do this in a cool way, the download url should be available in the JSON file
                     if self._set_download_url_callback:
-                        self._set_download_url_callback("https://ultimaker.com/en/resources/23129-updating-the-firmware?utm_source=cura&utm_medium=software&utm_campaign=hw-update")
+                        self._set_download_url_callback("https://ultimaker.com/en/resources/20500-upgrade-firmware")
                     message.actionTriggered.connect(self._callback)
                     message.show()
 

plugins/ModelChecker/ModelChecker.py

@@ -27,7 +27,7 @@ class ModelChecker(QObject, Extension):
 
         self._caution_message = Message("", #Message text gets set when the message gets shown, to display the models in question.
             lifetime = 0,
-            title = catalog.i18nc("@info:title", "Model Checker Warning"))
+            title = catalog.i18nc("@info:title", "3D Model Assistant"))
 
         Application.getInstance().initializationFinished.connect(self._pluginsInitialized)
         Application.getInstance().getController().getScene().sceneChanged.connect(self._onChanged)

plugins/SliceInfoPlugin/SliceInfo.py

@@ -45,10 +45,11 @@ class SliceInfo(QObject, Extension):
                                                    dismissable = False,
                                                    title = catalog.i18nc("@info:title", "Collecting Data"))
 
-            self.send_slice_info_message.addAction("Dismiss", name = catalog.i18nc("@action:button", "Allow"), icon = None,
-                    description = catalog.i18nc("@action:tooltip", "Allow Cura to send anonymized usage statistics to help prioritize future improvements to Cura. Some of your preferences and settings are sent, the Cura version and a hash of the models you're slicing."))
             self.send_slice_info_message.addAction("MoreInfo", name = catalog.i18nc("@action:button", "More info"), icon = None,
                     description = catalog.i18nc("@action:tooltip", "See more information on what data Cura sends."), button_style = Message.ActionButtonStyle.LINK)
+
+            self.send_slice_info_message.addAction("Dismiss", name = catalog.i18nc("@action:button", "Allow"), icon = None,
+                    description = catalog.i18nc("@action:tooltip", "Allow Cura to send anonymized usage statistics to help prioritize future improvements to Cura. Some of your preferences and settings are sent, the Cura version and a hash of the models you're slicing."))
             self.send_slice_info_message.actionTriggered.connect(self.messageActionTriggered)
             self.send_slice_info_message.show()
 

plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml

@@ -31,8 +31,9 @@ Item
         frameVisible: false
         selectionMode: 0
         model: packageData.supported_configs
-        headerDelegate: Item
+        headerDelegate: Rectangle
         {
+            color: UM.Theme.getColor("sidebar")
             height: UM.Theme.getSize("toolbox_chart_row").height
             Label
             {

plugins/Toolbox/resources/qml/ToolboxDownloadsPage.qml

@@ -18,6 +18,8 @@ ScrollView
         spacing: UM.Theme.getSize("default_margin").height
         padding: UM.Theme.getSize("wide_margin").height
         height: childrenRect.height + 2 * padding
+
+        /* Hide for 3.4
         ToolboxDownloadsShowcase
         {
             id: showcase
@@ -29,6 +31,8 @@ ScrollView
             width: parent.width
             height: UM.Theme.getSize("default_lining").height
         }
+        */
+
         ToolboxDownloadsGrid
         {
             id: allPlugins

plugins/Toolbox/resources/qml/ToolboxHeader.qml

@@ -33,6 +33,8 @@ Item
                 toolbox.viewPage = "overview"
             }
         }
+
+        /* Hide for 3.4
         ToolboxTabButton
         {
             text: catalog.i18nc("@title:tab", "Materials")
@@ -45,6 +47,7 @@ Item
                 toolbox.viewPage = "overview"
             }
         }
+        */
     }
     ToolboxTabButton
     {

plugins/Toolbox/resources/qml/ToolboxProgressButton.qml

@@ -150,7 +150,7 @@ Item
     {
         id: loader
         visible: active
-        source: "../images/loading.gif"
+        source: visible ? "../images/loading.gif" : ""
         width: UM.Theme.getSize("toolbox_loader").width
         height: UM.Theme.getSize("toolbox_loader").height
         anchors.right: button.left

plugins/Toolbox/src/Toolbox.py

@@ -28,7 +28,8 @@ i18n_catalog = i18nCatalog("cura")
 ##  The Toolbox class is responsible of communicating with the server through the API
 class Toolbox(QObject, Extension):
 
-    DEFAULT_PACKAGES_API_ROOT = "https://api.ultimaker.com"
+    DEFAULT_CLOUD_API_ROOT = "https://api.ultimaker.com"
+    DEFAULT_CLOUD_API_VERSION = 1
 
     def __init__(self, parent=None) -> None:
         super().__init__(parent)
@@ -36,14 +37,11 @@ class Toolbox(QObject, Extension):
         self._application = Application.getInstance()
         self._package_manager = None
         self._plugin_registry = Application.getInstance().getPluginRegistry()
-        self._packages_api_root = self._getPackagesApiRoot()
-        self._packages_version = self._getPackagesVersion()
-        self._api_version = 1
-        self._api_url = "{api_root}/cura-packages/v{api_version}/cura/v{package_version}".format(
-            api_root = self._packages_api_root,
-            api_version = self._api_version,
-            package_version = self._packages_version
-        )
+
+        self._sdk_version = None
+        self._cloud_api_version = None
+        self._cloud_api_root = None
+        self._api_url = None
 
         # Network:
         self._get_packages_request = None
@@ -64,12 +62,7 @@ class Toolbox(QObject, Extension):
                 )
             )
         ]
-        self._request_urls = {
-            "authors":            QUrl("{base_url}/authors".format(base_url = self._api_url)),
-            "packages":           QUrl("{base_url}/packages".format(base_url = self._api_url)),
-            "plugins_showcase":   QUrl("{base_url}/showcase".format(base_url = self._api_url)),
-            "materials_showcase": QUrl("{base_url}/showcase".format(base_url = self._api_url))
-        }
+        self._request_urls = {}
         self._to_update = []  # Package_ids that are waiting to be updated
 
         # Data:
@@ -161,22 +154,50 @@ class Toolbox(QObject, Extension):
     # this is initialized. Therefore, we wait until the application is ready.
     def _onAppInitialized(self) -> None:
         self._package_manager = Application.getInstance().getCuraPackageManager()
+        self._sdk_version = self._getSDKVersion()
+        self._cloud_api_version = self._getCloudAPIVersion()
+        self._cloud_api_root = self._getCloudAPIRoot()
+        self._api_url = "{cloud_api_root}/cura-packages/v{cloud_api_version}/cura/v{sdk_version}".format(
+            cloud_api_root=self._cloud_api_root,
+            cloud_api_version=self._cloud_api_version,
+            sdk_version=self._sdk_version
+        )
+        self._request_urls = {
+            "authors": QUrl("{base_url}/authors".format(base_url=self._api_url)),
+            "packages": QUrl("{base_url}/packages".format(base_url=self._api_url)),
+            "plugins_showcase": QUrl("{base_url}/showcase".format(base_url=self._api_url)),
+            "materials_showcase": QUrl("{base_url}/showcase".format(base_url=self._api_url))
+        }
 
     # Get the API root for the packages API depending on Cura version settings.
-    def _getPackagesApiRoot(self) -> str:
+    def _getCloudAPIRoot(self) -> str:
         if not hasattr(cura, "CuraVersion"):
-            return self.DEFAULT_PACKAGES_API_ROOT
-        if not hasattr(cura.CuraVersion, "CuraPackagesApiRoot"):
-            return self.DEFAULT_PACKAGES_API_ROOT
-        return cura.CuraVersion.CuraPackagesApiRoot
+            return self.DEFAULT_CLOUD_API_ROOT
+        if not hasattr(cura.CuraVersion, "CuraCloudAPIRoot"):
+            return self.DEFAULT_CLOUD_API_ROOT
+        if not cura.CuraVersion.CuraCloudAPIRoot:
+            return self.DEFAULT_CLOUD_API_ROOT
+        return cura.CuraVersion.CuraCloudAPIRoot
+
+    # Get the cloud API version from CuraVersion
+    def _getCloudAPIVersion(self) -> int:
+        if not hasattr(cura, "CuraVersion"):
+            return self.DEFAULT_CLOUD_API_VERSION
+        if not hasattr(cura.CuraVersion, "CuraCloudAPIVersion"):
+            return self.DEFAULT_CLOUD_API_VERSION
+        if not cura.CuraVersion.CuraCloudAPIVersion:
+            return self.DEFAULT_CLOUD_API_VERSION
+        return cura.CuraVersion.CuraCloudAPIVersion
 
     # Get the packages version depending on Cura version settings.
-    def _getPackagesVersion(self) -> int:
+    def _getSDKVersion(self) -> int:
         if not hasattr(cura, "CuraVersion"):
             return self._plugin_registry.APIVersion
-        if not hasattr(cura.CuraVersion, "CuraPackagesVersion"):
+        if not hasattr(cura.CuraVersion, "CuraSDKVersion"):
             return self._plugin_registry.APIVersion
-        return cura.CuraVersion.CuraPackagesVersion
+        if not cura.CuraVersion.CuraSDKVersion:
+            return self._plugin_registry.APIVersion
+        return cura.CuraVersion.CuraSDKVersion
 
     @pyqtSlot()
     def browsePackages(self) -> None:
@@ -383,7 +404,10 @@ class Toolbox(QObject, Extension):
 
     def resetDownload(self) -> None:
         if self._download_reply:
-            self._download_reply.downloadProgress.disconnect(self._onDownloadProgress)
+            try:
+                self._download_reply.downloadProgress.disconnect(self._onDownloadProgress)
+            except TypeError: #Raised when the method is not connected to the signal yet.
+                pass #Don't need to disconnect.
             self._download_reply.abort()
         self._download_reply = None
         self._download_request = None

plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py

@@ -148,6 +148,10 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice):
     def selectPrinter(self, target_printer: str = "") -> None:
         self._sending_job.send(target_printer)
 
+    @pyqtSlot()
+    def cancelPrintSelection(self) -> None:
+        self._sending_gcode = False
+
     ##  Greenlet to send a job to the printer over the network.
     #
     #   This greenlet gets called asynchronously in requestWrite. It is a

plugins/UM3NetworkPrinting/PrintWindow.qml

@@ -90,6 +90,7 @@ UM.Dialog
             onClicked: {
                 base.visible = false;
                 printerSelectionCombobox.currentIndex = 0
+                OutputDevice.cancelPrintSelection()
             }
         }
     ]

plugins/VersionUpgrade/VersionUpgrade33to34/VersionUpgrade33to34.py

@@ -6,6 +6,9 @@ import io #To serialise the preference files afterwards.
 
 from UM.VersionUpgrade import VersionUpgrade #We're inheriting from this.
 
+_renamed_settings = {
+    "infill_hollow": "infill_support_enabled"
+}
 
 ##  Upgrades configurations from the state they were in at version 3.3 to the
 #   state they should be in at version 3.4.
@@ -38,6 +41,17 @@ class VersionUpgrade33to34(VersionUpgrade):
         # Update version number.
         parser["general"]["version"] = "4"
 
+        if "values" in parser:
+            #If infill_hollow was enabled and the overhang angle was adjusted, copy that overhang angle to the new infill support angle.
+            if "infill_hollow" in parser["values"] and parser["values"]["infill_hollow"] and "support_angle" in parser["values"]:
+                parser["values"]["infill_support_angle"] = parser["values"]["support_angle"]
+
+            #Renamed settings.
+            for original, replacement in _renamed_settings.items():
+                if original in parser["values"]:
+                    parser["values"][replacement] = parser["values"][original]
+                    del parser["values"][original]
+
         result = io.StringIO()
         parser.write(result)
-        return [filename], [result.getvalue()]
+        return [filename], [result.getvalue()]