From 11060e010b770af4d8b2215ec02e11cb9413a29e Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 21 Sep 2017 12:52:07 +0200 Subject: [PATCH 1/6] Clarify message title The title should add something to the message, such as a summary. --- plugins/USBPrinting/USBPrinterOutputDevice.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/USBPrinting/USBPrinterOutputDevice.py b/plugins/USBPrinting/USBPrinterOutputDevice.py index 4b4c24c5d2..4d3b8446a3 100644 --- a/plugins/USBPrinting/USBPrinterOutputDevice.py +++ b/plugins/USBPrinting/USBPrinterOutputDevice.py @@ -150,7 +150,7 @@ class USBPrinterOutputDevice(PrinterOutputDevice): def printGCode(self, gcode_list): Logger.log("d", "Started printing g-code") if self._progress or self._connection_state != ConnectionState.connected: - self._error_message = Message(catalog.i18nc("@info:status", "Unable to start a new job because the printer is busy or not connected."), title = catalog.i18nc("@info:title", "Print Details")) + self._error_message = Message(catalog.i18nc("@info:status", "Unable to start a new job because the printer is busy or not connected."), title = catalog.i18nc("@info:title", "Printer Unavailable")) self._error_message.show() Logger.log("d", "Printer is busy or not connected, aborting print") self.writeError.emit(self) From 382fcdb4feda6081479053d908d4280f15189401 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 21 Sep 2017 12:54:04 +0200 Subject: [PATCH 2/6] Better title for export succeeded message --- cura/Settings/CuraContainerRegistry.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Settings/CuraContainerRegistry.py b/cura/Settings/CuraContainerRegistry.py index 5b7f4199d8..1c2d76c3b2 100644 --- a/cura/Settings/CuraContainerRegistry.py +++ b/cura/Settings/CuraContainerRegistry.py @@ -153,7 +153,7 @@ class CuraContainerRegistry(ContainerRegistry): m.show() return m = Message(catalog.i18nc("@info:status Don't translate the XML tag !", "Exported profile to {0}", file_name), - title = catalog.i18nc("@info:title", "Export Details")) + title = catalog.i18nc("@info:title", "Export succeeded")) m.show() ## Gets the plugin object matching the criteria From adb41a19b751b14db667a79fe13b745954909034 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 21 Sep 2017 12:59:46 +0200 Subject: [PATCH 3/6] Fix typos in description of Zig Zaggify Infill --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 5c3dc44f24..ece8fd48a4 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1389,7 +1389,7 @@ "zig_zaggify_infill": { "label": "Connect Infill Lines", - "description": "Connect the ends where the infill pattern meets the inner wall using a lines which follows the shape of the inner wall. Enabling this setting can make the infill adhere to the walls better and reduces the effects on infill on the quality of vertical surfaces. Disabling this setting reduces the amount of material used.", + "description": "Connect the ends where the infill pattern meets the inner wall using a line which follows the shape of the inner wall. Enabling this setting can make the infill adhere to the walls better and reduce the effects of infill on the quality of vertical surfaces. Disabling this setting reduces the amount of material used.", "type": "bool", "default_value": true, "enabled": "infill_pattern == 'cross' or infill_pattern == 'cross_3d'", From f7d14c5b7f0d2471cbbc2959ca88ce45e7a5cb09 Mon Sep 17 00:00:00 2001 From: Mark Date: Thu, 21 Sep 2017 16:08:46 +0200 Subject: [PATCH 4/6] dont disappear when click on splashscreen CURA-4343 --- cura/CuraSplashScreen.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cura/CuraSplashScreen.py b/cura/CuraSplashScreen.py index 4fc81e815f..eedf1e3d53 100644 --- a/cura/CuraSplashScreen.py +++ b/cura/CuraSplashScreen.py @@ -41,6 +41,10 @@ class CuraSplashScreen(QSplashScreen): self._loading_image_rotation_angle -= 10 self.repaint() + # Override the mousePressEvent so the splashscreen doesn't disappear when clicked + def mousePressEvent(self, mouse_event): + pass + def drawContents(self, painter): if self._to_stop: return From 191854adefd6a5582041bf2d263c5cb362c0ecaa Mon Sep 17 00:00:00 2001 From: alekseisasin Date: Fri, 22 Sep 2017 12:52:03 +0200 Subject: [PATCH 5/6] Added tooltip text for the infill icons CURA-4303 --- resources/qml/SidebarSimple.qml | 43 +++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/resources/qml/SidebarSimple.qml b/resources/qml/SidebarSimple.qml index c91c1fcb93..3732339774 100644 --- a/resources/qml/SidebarSimple.qml +++ b/resources/qml/SidebarSimple.qml @@ -479,6 +479,49 @@ Item } } } + + MouseArea { + id: enableGradualInfillMouseArea_1 + + anchors.fill: parent + hoverEnabled: true + enabled: true + + onEntered: { + + var selectedStep = parseInt(infillSlider.value) / parseInt(infillSlider.stepSize) + + var tooltipText = "" + + if( enableGradualInfillCheckBox.checked){ + tooltipText = catalog.i18nc("@label", "Gradual infill will gradually increase the amount of infill towards the top."); + } + else{ + + switch(selectedStep){ + case 0: tooltipText = catalog.i18nc("@label", "Empty infill will leave your model hollow with low strength."); break; + case 1: + case 2: + case 3: + case 4: tooltipText = catalog.i18nc("@label", "Light infill will give your model an average strength."); break; + case 5: + case 6: + case 7: + case 8: tooltipText = catalog.i18nc("@label", "Dense infill will give your model an above average strength."); break; + case 9: + case 10: tooltipText = catalog.i18nc("@label", "Solid infill will make your model completely solid."); break; + } + } + + if(tooltipText != "") + base.showTooltip(base, Qt.point(0,infillCellRight.y + infillIcon.y),tooltipText) + } + + onExited: { + base.hideTooltip() + } + + } } // Gradual Support Infill Checkbox From 07161f5d5018f122d5b62fa8d9ca2b636fae032e Mon Sep 17 00:00:00 2001 From: ChrisTerBeke Date: Fri, 22 Sep 2017 13:40:55 +0200 Subject: [PATCH 6/6] CURA-4341 use existing signals instead to update topbar monitoring --- resources/qml/Cura.qml | 19 ++++--------------- resources/qml/Topbar.qml | 19 +++++++++++-------- 2 files changed, 15 insertions(+), 23 deletions(-) diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index 702864f01b..5877656acc 100755 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -23,17 +23,10 @@ UM.MainWindow Connections { target: Printer - onShowPrintMonitor: - { - topbar.monitoringChanged(show) - - if (show) - { - + onShowPrintMonitor: { + if (show) { topbar.startMonitoringPrint() - } - else - { + } else { topbar.stopMonitoringPrint() } } @@ -352,17 +345,13 @@ UM.MainWindow } } - function isMonitoringPrint () { - return base.showPrintMonitor - } - Topbar { id: topbar anchors.left:parent.left anchors.right: parent.right anchors.top: parent.top - monitoringPrint: isMonitoringPrint() + monitoringPrint: base.showPrintMonitor onStartMonitoringPrint: base.showPrintMonitor = true onStopMonitoringPrint: base.showPrintMonitor = false } diff --git a/resources/qml/Topbar.qml b/resources/qml/Topbar.qml index 4cd684339f..5e208a40b4 100644 --- a/resources/qml/Topbar.qml +++ b/resources/qml/Topbar.qml @@ -22,19 +22,22 @@ Rectangle property bool printerConnected: Cura.MachineManager.printerOutputDevices.length != 0 property bool printerAcceptsCommands: printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands - - // monitoring status - property bool monitoringPrint - - // incoming signal - function monitoringChanged (isNowMonitoring) { - monitoringPrint = isNowMonitoring - } + property bool monitoringPrint: false // outgoing signal signal startMonitoringPrint() signal stopMonitoringPrint() + // update monitoring status when event was triggered outside topbar + Component.onCompleted: { + startMonitoringPrint.connect(function () { + base.monitoringPrint = true + }) + stopMonitoringPrint.connect(function () { + base.monitoringPrint = false + }) + } + UM.I18nCatalog { id: catalog