Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown

cura/PrinterOutput/PrintJobOutputModel.py

@@ -118,17 +118,40 @@ class PrintJobOutputModel(QObject):
             self.nameChanged.emit()
 
     @pyqtProperty(int, notify = timeTotalChanged)
-    def timeTotal(self):
+    def timeTotal(self) -> int:
         return self._time_total
 
     @pyqtProperty(int, notify = timeElapsedChanged)
-    def timeElapsed(self):
+    def timeElapsed(self) -> int:
         return self._time_elapsed
 
+    @pyqtProperty(int, notify = timeElapsedChanged)
+    def timeRemaining(self) -> int:
+        # Never get a negative time remaining
+        return max(self.timeTotal - self.timeElapsed, 0)
+
+    @pyqtProperty(float, notify = timeElapsedChanged)
+    def progress(self) -> float:
+        result = self.timeElapsed / self.timeTotal
+        # Never get a progress past 1.0
+        return min(result, 1.0)
+
     @pyqtProperty(str, notify=stateChanged)
-    def state(self):
+    def state(self) -> str:
         return self._state
 
+    @pyqtProperty(bool, notify=stateChanged)
+    def isActive(self) -> bool:
+        inactiveStates = [
+            "pausing",
+            "paused",
+            "resuming",
+            "wait_cleanup"
+        ]
+        if self.state in inactiveStates and self.timeRemaining > 0:
+            return False
+        return True
+
     def updateTimeTotal(self, new_time_total):
         if self._time_total != new_time_total:
             self._time_total = new_time_total

plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobPreview.qml

@@ -21,7 +21,14 @@ Item
     {
         id: previewImage
         anchors.fill: parent
-        opacity: printJob && printJob.state == "error" ? 0.5 : 1.0
+        opacity:
+        {
+            if (printJob && (printJob.state == "error" || !printJob.isActive))
+            {
+                return 0.5
+            }
+            return 1.0
+        }
         source: printJob ? printJob.previewImageUrl : ""
         visible: printJob
     }
@@ -47,11 +54,28 @@ Item
 
     UM.RecolorImage
     {
-        id: statusImage
+        id: overlayIcon
         anchors.centerIn: printJobPreview
         color: UM.Theme.getColor("monitor_image_overlay")
         height: 0.5 * printJobPreview.height
-        source: printJob && printJob.state == "error" ? "../svg/aborted-icon.svg" : ""
+        source:
+        {
+            switch(printJob.state)
+            {
+                case "error":
+                    return "../svg/aborted-icon.svg"
+                case "wait_cleanup":
+                    return printJob.timeTotal > printJob.timeElapsed ? "../svg/aborted-icon.svg" : ""
+                case "pausing":
+                    return "../svg/paused-icon.svg"
+                case "paused":
+                    return "../svg/paused-icon.svg"
+                case "resuming":
+                    return "../svg/paused-icon.svg"
+                default:
+                    return ""
+            }
+        }
         sourceSize
         {
             height: height

plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml

@@ -15,63 +15,10 @@ import UM 1.3 as UM
 Item
 {
     id: base
+
+    // The print job which all other information is dervied from
     property var printJob: null
-    property var progress:
+
-    {
-        if (!printJob)
-        {
-            return 0
-        }
-        var result = printJob.timeElapsed / printJob.timeTotal
-        if (result > 1.0)
-        {
-            result = 1.0
-        }
-        return result
-    }
-    property var remainingTime:
-    {
-        if (!printJob) {
-            return 0
-        }
-        /* Sometimes total minus elapsed is less than 0. Use Math.max() to prevent remaining
-            time from ever being less than 0. Negative durations cause strange behavior such
-            as displaying "-1h -1m". */
-        return Math.max(printer.activePrintJob.timeTotal - printer.activePrintJob.timeElapsed, 0)
-    }
-    property var progressText:
-    {
-        if (!printJob)
-        {
-            return "";
-        }
-        switch (printJob.state)
-        {
-            case "wait_cleanup":
-                if (printJob.timeTotal > printJob.timeElapsed)
-                {
-                    return catalog.i18nc("@label:status", "Aborted")
-                }
-                return catalog.i18nc("@label:status", "Finished")
-            case "pre_print":
-            case "sent_to_printer":
-                return catalog.i18nc("@label:status", "Preparing")
-            case "aborted":
-                return catalog.i18nc("@label:status", "Aborted")
-            case "wait_user_action":
-                return catalog.i18nc("@label:status", "Aborted")
-            case "pausing":
-                return catalog.i18nc("@label:status", "Pausing")
-            case "paused":
-                return OutputDevice.formatDuration( remainingTime )
-            case "resuming":
-                return catalog.i18nc("@label:status", "Resuming")
-            case "queued":
-                return catalog.i18nc("@label:status", "Action required")
-            default:
-                return OutputDevice.formatDuration( remainingTime )
-        }
-    }
     width: childrenRect.width
     height: 18 * screenScaleFactor // TODO: Theme!
 
@@ -82,12 +29,12 @@ Item
         {
             verticalCenter: parent.verticalCenter
         }
-        value: progress;
+        value: printJob ? printJob.progress : 0
         style: ProgressBarStyle
         {
             background: Rectangle
             {
-                color: "#e4e4f2" // TODO: Theme!
+                color: printJob && printJob.isActive ? "#e4e4f2" : "#f3f3f9" // TODO: Theme!
                 implicitHeight: visible ? 8 * screenScaleFactor : 0 // TODO: Theme!
                 implicitWidth: 180 * screenScaleFactor // TODO: Theme!
                 radius: 4 * screenScaleFactor // TODO: Theme!
@@ -95,41 +42,74 @@ Item
             progress: Rectangle
             {
                 id: progressItem;
-                color:
+                color: printJob && printJob.isActive ? "#0a0850" : "#9392b2" // TODO: Theme!
-                {
-                    if (printJob)
-                    {
-                        var state = printJob.state
-                        var inactiveStates = [
-                            "pausing",
-                            "paused",
-                            "resuming",
-                            "wait_cleanup"
-                        ]
-                        if (inactiveStates.indexOf(state) > -1 && remainingTime > 0)
-                        {
-                            return UM.Theme.getColor("monitor_progress_fill_inactive")
-                        }
-                    }
-                    return "#0a0850" // TODO: Theme!
-                }
                 radius: 4 * screenScaleFactor // TODO: Theme!
             }
         }
     }
     Label
     {
-        id: progressLabel
+        id: percentLabel
         anchors
         {
             left: progressBar.right
             leftMargin: 18 * screenScaleFactor // TODO: Theme!
         }
-        text: progressText
+        text: Math.round(printJob.progress * 100) + "%"
-        color: "#374355" // TODO: Theme!
+        color: printJob && printJob.isActive ? "#374355" : "#babac1" // TODO: Theme!
         width: contentWidth
         font: UM.Theme.getFont("medium") // 14pt, regular
 
+        // FIXED-LINE-HEIGHT:
+        height: 18 * screenScaleFactor // TODO: Theme!
+        verticalAlignment: Text.AlignVCenter
+    }
+    Label
+    {
+        id: statusLabel
+        anchors
+        {
+            left: percentLabel.right
+            leftMargin: 18 * screenScaleFactor // TODO: Theme!
+        }
+        color: "#374355" // TODO: Theme!
+        font: UM.Theme.getFont("medium") // 14pt, regular
+        text:
+        {
+            if (!printJob)
+            {
+                return ""
+            }
+            switch (printJob.state)
+            {
+                case "wait_cleanup":
+                    if (printJob.timeTotal > printJob.timeElapsed)
+                    {
+                        return catalog.i18nc("@label:status", "Aborted")
+                    }
+                    return catalog.i18nc("@label:status", "Finished")
+                case "sent_to_printer":
+                    return catalog.i18nc("@label:status", "Preparing...")
+                case "pre_print":
+                    return catalog.i18nc("@label:status", "Preparing...")
+                case "aborting": // NOTE: Doesn't exist but maybe should someday
+                    return catalog.i18nc("@label:status", "Aborting...")
+                case "aborted": // NOTE: Unused, see above
+                    return catalog.i18nc("@label:status", "Aborted")
+                case "pausing":
+                    return catalog.i18nc("@label:status", "Pausing...")
+                case "paused":
+                    return catalog.i18nc("@label:status", "Paused")
+                case "resuming":
+                    return catalog.i18nc("@label:status", "Resuming...")
+                case "queued":
+                    return catalog.i18nc("@label:status", "Action required")
+                default:
+                    return catalog.i18nc("@label:status", "Finishes %1 at %2".arg(OutputDevice.getDateCompleted( printJob.timeRemaining )).arg(OutputDevice.getTimeCompleted( printJob.timeRemaining )))
+            }
+        }
+        width: contentWidth
+
         // FIXED-LINE-HEIGHT:
         height: 18 * screenScaleFactor // TODO: Theme!
         verticalAlignment: Text.AlignVCenter

plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml

@@ -169,6 +169,32 @@ Item
             height: childrenRect.height
             spacing: 18 * screenScaleFactor // TODO: Theme!
 
+            Label
+            {
+                id: printerStatus
+                anchors
+                {
+                    verticalCenter: parent.verticalCenter
+                }
+                color: "#414054" // TODO: Theme!
+                font: UM.Theme.getFont("large") // 16pt, bold
+                text: {
+                    if (printer && printer.state == "disabled")
+                    {
+                        return catalog.i18nc("@label:status", "Unavailable")
+                    }
+                    if (printer && printer.state == "unreachable")
+                    {
+                        return catalog.i18nc("@label:status", "Unreachable")
+                    }
+                    if (printer && printer.state == "idle")
+                    {
+                        return catalog.i18nc("@label:status", "Idle")
+                    }
+                    return ""
+                }
+            }
+
             Item
             {
                 anchors
@@ -183,6 +209,7 @@ Item
                     printJob: base.printer.activePrintJob
                     size: parent.height
                 }
+                visible: printer.activePrintJob
             }
 
             Item
@@ -193,14 +220,15 @@ Item
                 }
                 width: 216 * screenScaleFactor // TODO: Theme!
                 height: printerNameLabel.height + printerFamilyPill.height + 6 * screenScaleFactor // TODO: Theme!
+                visible: printer.activePrintJob
 
                 Label
                 {
                     id: printerJobNameLabel
-                    text: base.printer.activePrintJob ? base.printer.activePrintJob.name : "Untitled" // TODO: I18N
+                    color: printer.activePrintJob && printer.activePrintJob.isActive ? "#414054" : "#babac1" // TODO: Theme!
-                    color: "#414054" // TODO: Theme!
                     elide: Text.ElideRight
                     font: UM.Theme.getFont("large") // 16pt, bold
+                    text: base.printer.activePrintJob ? base.printer.activePrintJob.name : "Untitled" // TODO: I18N
                     width: parent.width
 
                     // FIXED-LINE-HEIGHT:
@@ -217,10 +245,10 @@ Item
                         topMargin: 6 * screenScaleFactor // TODO: Theme!
                         left: printerJobNameLabel.left
                     }
-                    text: printer.activePrintJob ? printer.activePrintJob.owner : "Anonymous" // TODO: I18N
+                    color: printer.activePrintJob && printer.activePrintJob.isActive ? "#53657d" : "#babac1" // TODO: Theme!
-                    color: "#53657d" // TODO: Theme!
                     elide: Text.ElideRight
                     font: UM.Theme.getFont("very_small") // 12pt, regular
+                    text: printer.activePrintJob ? printer.activePrintJob.owner : "Anonymous" // TODO: I18N
                     width: parent.width
 
                     // FIXED-LINE-HEIGHT:
@@ -236,6 +264,7 @@ Item
                     verticalCenter: parent.verticalCenter
                 }
                 printJob: printer.activePrintJob
+                visible: printer.activePrintJob
             }
         }
     }

plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py

@@ -386,8 +386,24 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice):
     @pyqtSlot(int, result = str)
     def getDateCompleted(self, time_remaining: int) -> str:
         current_time = time()
-        datetime_completed = datetime.fromtimestamp(current_time + time_remaining)
+        completed = datetime.fromtimestamp(current_time + time_remaining)
-        return (datetime_completed.strftime("%a %b ") + "{day}".format(day=datetime_completed.day)).upper()
+        today = datetime.fromtimestamp(current_time)
+
+        # If finishing date is more than 7 days out, using "Mon Dec 3 at HH:MM" format
+        if completed.toordinal() > today.toordinal() + 7:
+            return completed.strftime("%a %b ") + "{day}".format(day=completed.day)
+        
+        # If finishing date is within the next week, use "Monday at HH:MM" format
+        elif completed.toordinal() > today.toordinal() + 1:
+            return completed.strftime("%a")
+        
+        # If finishing tomorrow, use "tomorrow at HH:MM" format
+        elif completed.toordinal() > today.toordinal():
+            return "tomorrow"
+
+        # If finishing today, use "today at HH:MM" format
+        else:
+            return "today"
 
     @pyqtSlot(str)
     def sendJobToTop(self, print_job_uuid: str) -> None:
@@ -592,6 +608,16 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice):
     def _createMaterialOutputModel(self, material_data: Dict[str, Any]) -> "MaterialOutputModel":
         material_manager = CuraApplication.getInstance().getMaterialManager()
         material_group_list = material_manager.getMaterialGroupListByGUID(material_data["guid"])
+        # This can happen if the connected machine has no material in one or more extruders (if GUID is empty), or the
+        # material is unknown to Cura, so we should return an "empty" or "unknown" material model.
+        if material_group_list is None:
+            material_name = "Empty" if len(material_data["guid"]) == 0 else "Unknown"
+            return MaterialOutputModel(guid = material_data["guid"],
+                                       type = material_data.get("type", ""),
+                                       color = material_data.get("color", ""),
+                                       brand = material_data.get("brand", ""),
+                                       name = material_data.get("name", material_name)
+                                       )
 
         # Sort the material groups by "is_read_only = True" first, and then the name alphabetically.
         read_only_material_group_list = list(filter(lambda x: x.is_read_only, material_group_list))

plugins/USBPrinting/AutoDetectBaudJob.py

@@ -3,8 +3,8 @@
 
 from UM.Job import Job
 from UM.Logger import Logger
-from plugins.USBPrinting.avr_isp import ispBase
 
+from .avr_isp import ispBase
 from .avr_isp.stk500v2 import Stk500v2
 
 from time import time, sleep

plugins/USBPrinting/plugin.json

@@ -1,7 +1,7 @@
 {
     "name": "USB printing",
     "author": "Ultimaker B.V.",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "api": 5,
     "description": "Accepts G-Code and sends them to a printer. Plugin can also update firmware.",
     "i18n-catalog": "cura"

resources/bundled_packages/cura.json

@@ -532,7 +532,7 @@
             "package_type": "plugin",
             "display_name": "USB Printing",
             "description": "Accepts G-Code and sends them to a printer. Plugin can also update firmware.",
-            "package_version": "1.0.0",
+            "package_version": "1.0.1",
             "sdk_version": 5,
             "website": "https://ultimaker.com",
             "author": {

resources/definitions/alfawise_u20.def.json

@@ -7,7 +7,7 @@
         "author": "Samuel Pinches",
         "manufacturer": "Alfawise",
         "file_formats": "text/x-gcode",
-        "preferred_quality_type": "fine",
+        "preferred_quality_type": "fast",
         "machine_extruder_trains":
         {
             "0": "alfawise_u20_extruder_0"
@@ -53,9 +53,6 @@
         "material_bed_temperature": {
             "default_value": 50
         },
-        "layer_height": {
-            "default_value": 0.15
-        },
         "layer_height_0": {
             "default_value": 0.2
         },

resources/definitions/jgaurora_a1.def.json

@@ -7,7 +7,7 @@
         "author": "Samuel Pinches",
         "manufacturer": "JGAurora",
         "file_formats": "text/x-gcode",
-        "preferred_quality_type": "fine",
+        "preferred_quality_type": "fast",
         "machine_extruder_trains":
         {
             "0": "jgaurora_a1_extruder_0"
@@ -53,9 +53,6 @@
         "material_bed_temperature": {
             "default_value": 67
         },
-        "layer_height": {
-            "default_value": 0.15
-        },
         "layer_height_0": {
             "default_value": 0.12
         },

resources/definitions/jgaurora_a5.def.json

@@ -9,7 +9,7 @@
         "file_formats": "text/x-gcode",
         "platform": "jgaurora_a5.stl",
         "platform_offset": [-242, -101, 273],
-        "preferred_quality_type": "fine",
+        "preferred_quality_type": "fast",
         "machine_extruder_trains":
         {
             "0": "jgaurora_a5_extruder_0"
@@ -55,9 +55,6 @@
         "material_bed_temperature": {
             "default_value": 67
         },
-        "layer_height": {
-            "default_value": 0.15
-        },
         "layer_height_0": {
             "default_value": 0.12
         },

resources/definitions/jgaurora_z_603s.def.json

@@ -7,7 +7,7 @@
         "author": "Samuel Pinches",
         "manufacturer": "JGAurora",
         "file_formats": "text/x-gcode",
-        "preferred_quality_type": "fine",
+        "preferred_quality_type": "fast",
         "machine_extruder_trains":
         {
             "0": "jgaurora_z_603s_extruder_0"
@@ -53,9 +53,6 @@
         "material_bed_temperature": {
             "default_value": 55
         },
-        "layer_height": {
-            "default_value": 0.15
-        },
         "layer_height_0": {
             "default_value": 0.2
         },

resources/qml/ActionPanel/SliceProcessWidget.qml

@@ -137,6 +137,10 @@ Column
         {
             var autoSlice = UM.Preferences.getValue("general/auto_slice")
             prepareButtons.autoSlice = autoSlice
+            if(autoSlice)
+            {
+                CuraApplication.backend.forceSlice()
+            }
         }
     }
 

resources/qml/Preferences/SettingVisibilityPage.qml

@@ -25,11 +25,7 @@ UM.PreferencesPage
 
     function reset()
     {
-        UM.Preferences.resetPreference("general/visible_settings")
+        settingVisibilityPresetsModel.setActivePreset("basic")
-
-        // After calling this function update Setting visibility preset combobox.
-        // Reset should set default setting preset ("Basic")
-        visibilityPreset.currentIndex = 1
     }
     resetEnabled: true;
 
@@ -115,15 +111,16 @@ UM.PreferencesPage
 
             currentIndex:
             {
+                var idx = -1;
                 for(var i = 0; i < settingVisibilityPresetsModel.items.length; ++i)
                 {
                     if(settingVisibilityPresetsModel.items[i].presetId == settingVisibilityPresetsModel.activePreset)
                     {
-                        currentIndex = i;
+                        idx = i;
-                        return;
+                        break;
                     }
                 }
-                return -1
+                return idx;
             }
 
             onActivated: