From 3e37f2a09d2317475797f6dbcd8e13b240ea2a9b Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Wed, 31 Oct 2018 10:31:20 +0100 Subject: [PATCH 1/5] Reset the list of generic materials to emtpy when creating the models. Contributes to CURA-5873. --- plugins/Toolbox/src/Toolbox.py | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/Toolbox/src/Toolbox.py b/plugins/Toolbox/src/Toolbox.py index 3e2085277a..9318e90719 100644 --- a/plugins/Toolbox/src/Toolbox.py +++ b/plugins/Toolbox/src/Toolbox.py @@ -845,6 +845,7 @@ class Toolbox(QObject, Extension): def buildMaterialsModels(self) -> None: self._metadata["materials_showcase"] = [] self._metadata["materials_available"] = [] + self._metadata["materials_generic"] = [] processed_authors = [] # type: List[str] From 903054190d6089bd90ebc4afcd5eb6d3212d0a8d Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Wed, 31 Oct 2018 11:23:57 +0100 Subject: [PATCH 2/5] Fixing some spacing issues with camera button Contributes to CL-1063 --- .../resources/qml/PrinterCard.qml | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml b/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml index 5dfda15edd..6c6df7d7fb 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml @@ -36,7 +36,7 @@ Item { return UM.Theme.getColor("monitor_card_background"); } } - height: childrenRect.height; + height: childrenRect.height + UM.Theme.getSize("default_margin").height; layer.effect: DropShadow { radius: root.shadowRadius; verticalOffset: root.shadowOffset; @@ -46,6 +46,11 @@ Item { width: parent.width - 2 * shadowRadius; Column { + id: cardContents; + anchors { + top: parent.top; + topMargin: UM.Theme.getSize("default_margin").height; + } height: childrenRect.height; width: parent.width; spacing: UM.Theme.getSize("default_margin").height; @@ -53,7 +58,7 @@ Item { // Main card Item { id: mainCard; - height: 60 * screenScaleFactor + UM.Theme.getSize("default_margin").width; + height: 60 * screenScaleFactor; width: parent.width; // Machine icon @@ -109,7 +114,7 @@ Item { id: printerInfo; anchors { left: machineIcon.right; - leftMargin: UM.Theme.getSize("default_margin").width; + leftMargin: UM.Theme.getSize("wide_margin").width; right: collapseIcon.left; verticalCenter: machineIcon.verticalCenter; } @@ -250,11 +255,16 @@ Item { iconSource: "../svg/camera-icon.svg"; visible: root.printer && root.printJob; } + } - // Progress bar - PrinterCardProgressBar { - visible: printer && printer.activePrintJob != null; + // Progress bar + PrinterCardProgressBar { + anchors { + top: cardContents.bottom; + topMargin: UM.Theme.getSize("default_margin").height; } + visible: printer && printer.activePrintJob != null; + width: parent.width; } } } From 3548f9f23cc26cf907cbd743ed26968638f79064 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Wed, 31 Oct 2018 11:31:05 +0100 Subject: [PATCH 3/5] Fix typo in the bundled packages. --- resources/bundled_packages/cura.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/bundled_packages/cura.json b/resources/bundled_packages/cura.json index 714407adc0..8ec0c3d29d 100644 --- a/resources/bundled_packages/cura.json +++ b/resources/bundled_packages/cura.json @@ -1149,7 +1149,7 @@ "website": "http://fiberlogy.com/en/fiberlogy-filaments/filament-hd-pla/", "author": { "author_id": "Fiberlogy", - "diplay_name": "Fiberlogy S.A.", + "display_name": "Fiberlogy S.A.", "email": "grzegorz.h@fiberlogy.com", "website": "http://fiberlogy.com" } From ac7a566ae1e88a8750c7fd46a838c9cb7e45b644 Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Wed, 31 Oct 2018 11:45:30 +0100 Subject: [PATCH 4/5] Do not show "move to top" on print jobs waiting for configuration change Contributes to CL-1118 --- .../resources/qml/PrintJobContextMenu.qml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml b/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml index bddefa036b..843865cd00 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml @@ -12,6 +12,7 @@ Item { id: root; property var printJob: null; property var running: isRunning(printJob); + property var assigned: isAssigned(printJob); Button { id: button; @@ -102,7 +103,7 @@ Item { PrintJobContextMenuItem { enabled: { - if (printJob && printJob.state == "queued") { + if (printJob && printJob.state == "queued" && !assigned) { if (OutputDevice && OutputDevice.queuedPrintJobs[0]) { return OutputDevice.queuedPrintJobs[0].key != printJob.key; } @@ -117,7 +118,6 @@ Item { } PrintJobContextMenuItem { - enabled: printJob && printJob.state == "queued"; onClicked: { deleteConfirmationDialog.visible = true; popup.close(); @@ -210,4 +210,10 @@ Item { } return ["paused", "printing", "pre_print"].indexOf(job.state) !== -1; } + function isAssigned(job) { + if (!job) { + return false; + } + return job.assignedPrinter ? true : false; + } } From 7960772ac8ba1f3764840da01c759642f82eeeac Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Wed, 31 Oct 2018 11:46:19 +0100 Subject: [PATCH 5/5] Do show "delete" on print jobs waiting for configuration change Contributes to CL-1118 --- plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml b/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml index 843865cd00..473fd87a34 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml @@ -118,6 +118,7 @@ Item { } PrintJobContextMenuItem { + enabled: printJob && !running; onClicked: { deleteConfirmationDialog.visible = true; popup.close();