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

plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml

@@ -90,7 +90,7 @@ Item
                     verticalCenter: parent.verticalCenter
                 }
                 width: 180 * screenScaleFactor // TODO: Theme!
-                height: printerNameLabel.height + printerFamilyPill.height + 6 * screenScaleFactor // TODO: Theme!
+                height: childrenRect.height
 
                 Rectangle
                 {
@@ -135,6 +135,54 @@ Item
                     }
                     text: printer ? printer.type : ""
                 }
+                Item
+                {
+                    id: managePrinterLink
+                    anchors {
+                        top: printerFamilyPill.bottom
+                        topMargin: 6 * screenScaleFactor
+                    }
+                    height: 18 * screenScaleFactor // TODO: Theme!
+                    width: childrenRect.width
+  
+                    Label
+                    {
+                        id: managePrinterText
+                        anchors.verticalCenter: managePrinterLink.verticalCenter
+                        color: UM.Theme.getColor("monitor_text_link")
+                        font: UM.Theme.getFont("default")
+                        linkColor: UM.Theme.getColor("monitor_text_link")
+                        text: catalog.i18nc("@label link to Connect and Cloud interfaces", "Manage printer")
+                        renderType: Text.NativeRendering
+                    }
+                    UM.RecolorImage
+                    {
+                        id: externalLinkIcon
+                        anchors
+                        {
+                            left: managePrinterText.right
+                            leftMargin: 6 * screenScaleFactor
+                            verticalCenter: managePrinterText.verticalCenter
+                        }
+                        color: UM.Theme.getColor("monitor_text_link")
+                        source: UM.Theme.getIcon("external_link")
+                        width: 12 * screenScaleFactor
+                        height: 12 * screenScaleFactor
+                    }
+                }
+                MouseArea
+                {
+                    anchors.fill: managePrinterLink
+                    onClicked: OutputDevice.openPrintJobControlPanel()
+                    onEntered:
+                    {
+                        manageQueueText.font.underline = true
+                    }
+                    onExited:
+                    {
+                        manageQueueText.font.underline = false
+                    }
+                }
             }
 
             MonitorPrinterConfiguration

plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py

@@ -258,11 +258,11 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice):
 
     @pyqtSlot(name="openPrintJobControlPanel")
     def openPrintJobControlPanel(self) -> None:
-        QDesktopServices.openUrl(QUrl("https://mycloud.ultimaker.com"))
+        QDesktopServices.openUrl(QUrl(self.clusterCloudUrl))
 
     @pyqtSlot(name="openPrinterControlPanel")
     def openPrinterControlPanel(self) -> None:
-        QDesktopServices.openUrl(QUrl("https://mycloud.ultimaker.com"))
+        QDesktopServices.openUrl(QUrl(self.clusterCloudUrl))
 
     ## Gets the cluster response from which this device was created.
     @property
@@ -273,3 +273,9 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice):
     @clusterData.setter
     def clusterData(self, value: CloudClusterResponse) -> None:
         self._cluster = value
+        
+    ## Gets the URL on which to monitor the cluster via the cloud.
+    @property
+    def clusterCloudUrl(self) -> str:
+        root_url_prefix = "-staging" if self._account.is_staging else ""
+        return "https://mycloud{}.ultimaker.com/app/jobs/{}".format(root_url_prefix, self.clusterData.cluster_id)

resources/definitions/fdmprinter.def.json

@@ -7483,6 +7483,52 @@
                     "settable_per_mesh": false,
                     "settable_per_extruder": true,
                     "settable_per_meshgroup": false
+                },
+                "small_hole_max_size":
+                {
+                    "label": "Small Hole Max Size",
+                    "description": "Holes and part outlines with a diameter smaller than this will be printed using Small Feature Speed.",
+                    "unit": "mm",
+                    "type": "float",
+                    "minimum_value": "0",
+                    "default_value": 0,
+                    "settable_per_mesh": true
+                },
+                "small_feature_max_length":
+                {
+                    "label": "Small Feature Max Length",
+                    "description": "Feature outlines that are shorter than this length will be printed using Small Feature Speed.",
+                    "unit": "mm",
+                    "type": "float",
+                    "minimum_value": "0",
+                    "default_value": 0,
+                    "value": "small_hole_max_size * math.pi",
+                    "settable_per_mesh": true
+                },
+                "small_feature_speed_factor":
+                {
+                    "label": "Small Feature Speed",
+                    "description": "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy.",
+                    "unit": "%",
+                    "type": "float",
+                    "default_value": 50,
+                    "minimum_value": "1",
+                    "minimum_value_warning": "25",
+                    "maximum_value": "100",
+                    "settable_per_mesh": true
+                },
+                "small_feature_speed_factor_0":
+                {
+                    "label": "First Layer Speed",
+                    "description": "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy.",
+                    "unit": "%",
+                    "type": "float",
+                    "default_value": 50,
+                    "value": "small_feature_speed_factor",
+                    "minimum_value": "1",
+                    "minimum_value_warning": "25",
+                    "maximum_value": "100",
+                    "settable_per_mesh": true
                 }
             }
         },

resources/setting_visibility/expert.cfg

@@ -407,3 +407,7 @@ wipe_hop_speed
 wipe_brush_pos_x
 wipe_repeat_count
 wipe_move_distance
+small_hole_max_size
+small_feature_max_length
+small_feature_speed_factor
+small_feature_speed_factor_0