From 7300f95a4284d5c6e817da3b87540a75d08b83c8 Mon Sep 17 00:00:00 2001 From: ChrisTerBeke Date: Mon, 22 Jul 2019 21:21:18 +0200 Subject: [PATCH 1/2] Hide incorrect tooltip The preffered solution was to change the copywriting, but since we are after stringfreeze we cannot do this. This is the next best solution to prevent user confusion. --- .../resources/qml/MonitorPrintJobCard.qml | 13 +++++++------ .../resources/qml/MonitorPrinterCard.qml | 19 ++++++++++--------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml index b863712481..ea6da9c25d 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml @@ -243,10 +243,11 @@ Item enabled: !contextMenuButton.enabled } - MonitorInfoBlurb - { - id: contextMenuDisabledInfo - text: catalog.i18nc("@info", "Please update your printer's firmware to manage the queue remotely.") - target: contextMenuButton - } + // TODO: uncomment this tooltip as soon as the required firmware is released + // MonitorInfoBlurb + // { + // id: contextMenuDisabledInfo + // text: catalog.i18nc("@info", "Please update your printer's firmware to manage the queue remotely.") + // target: contextMenuButton + // } } diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml index 1f5a4cfcb2..8562cec59d 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml @@ -81,7 +81,7 @@ Item mipmap: true } } - + Item { @@ -99,7 +99,7 @@ Item height: 18 * screenScaleFactor // TODO: Theme! width: parent.width radius: 2 * screenScaleFactor // TODO: Theme! - + Label { text: printer && printer.name ? printer.name : "" @@ -202,12 +202,13 @@ Item enabled: !contextMenuButton.enabled } - MonitorInfoBlurb - { - id: contextMenuDisabledInfo - text: catalog.i18nc("@info", "Please update your printer's firmware to manage the queue remotely.") - target: contextMenuButton - } + // TODO: uncomment this tooltip as soon as the required firmware is released + // MonitorInfoBlurb + // { + // id: contextMenuDisabledInfo + // text: catalog.i18nc("@info", "Please update your printer's firmware to manage the queue remotely.") + // target: contextMenuButton + // } CameraButton { @@ -454,4 +455,4 @@ Item id: overrideConfirmationDialog printer: base.printer } -} \ No newline at end of file +} From 5f74ed080f7b685c36830a85d7488604423a1534 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 23 Jul 2019 13:32:48 +0200 Subject: [PATCH 2/2] Increment SDK version to 6.2 --- cura/ApplicationMetadata.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/ApplicationMetadata.py b/cura/ApplicationMetadata.py index 73eb9bb288..eeb283a72b 100644 --- a/cura/ApplicationMetadata.py +++ b/cura/ApplicationMetadata.py @@ -9,7 +9,7 @@ DEFAULT_CURA_DISPLAY_NAME = "Ultimaker Cura" DEFAULT_CURA_VERSION = "master" DEFAULT_CURA_BUILD_TYPE = "" DEFAULT_CURA_DEBUG_MODE = False -DEFAULT_CURA_SDK_VERSION = "6.1.0" +DEFAULT_CURA_SDK_VERSION = "6.2.0" try: from cura.CuraVersion import CuraAppName # type: ignore @@ -45,4 +45,4 @@ except ImportError: # Each release has a fixed SDK version coupled with it. It doesn't make sense to make it configurable because, for # example Cura 3.2 with SDK version 6.1 will not work. So the SDK version is hard-coded here and left out of the # CuraVersion.py.in template. -CuraSDKVersion = "6.1.0" +CuraSDKVersion = "6.2.0"