GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-15 01:15:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jaime van Kessel 2019-07-23 13:42:29 +02:00
commit 87666eb6a1
3 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cura/ApplicationMetadata.py
View File

@ -9,7 +9,7 @@ DEFAULT_CURA_DISPLAY_NAME = "Ultimaker Cura"
DEFAULT_CURA_VERSION = "master" DEFAULT_CURA_VERSION = "master"
DEFAULT_CURA_BUILD_TYPE = "" DEFAULT_CURA_BUILD_TYPE = ""
DEFAULT_CURA_DEBUG_MODE = False DEFAULT_CURA_DEBUG_MODE = False
DEFAULT_CURA_SDK_VERSION = "6.1.0" DEFAULT_CURA_SDK_VERSION = "6.2.0"
try: try:
from cura.CuraVersion import CuraAppName # type: ignore 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 # 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 # 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. # CuraVersion.py.in template.
CuraSDKVersion = "6.1.0" CuraSDKVersion = "6.2.0"

13
plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml
View File

@ -243,10 +243,11 @@ Item
enabled: !contextMenuButton.enabled enabled: !contextMenuButton.enabled
} }
MonitorInfoBlurb // 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.") // id: contextMenuDisabledInfo
target: contextMenuButton // text: catalog.i18nc("@info", "Please update your printer's firmware to manage the queue remotely.")
} // target: contextMenuButton
// }
} }

19
plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml
View File

@ -81,7 +81,7 @@ Item
mipmap: true mipmap: true
} }
} }
Item Item
{ {
@ -99,7 +99,7 @@ Item
height: 18 * screenScaleFactor // TODO: Theme! height: 18 * screenScaleFactor // TODO: Theme!
width: parent.width width: parent.width
radius: 2 * screenScaleFactor // TODO: Theme! radius: 2 * screenScaleFactor // TODO: Theme!
Label Label
{ {
text: printer && printer.name ? printer.name : "" text: printer && printer.name ? printer.name : ""
@ -202,12 +202,13 @@ Item
enabled: !contextMenuButton.enabled enabled: !contextMenuButton.enabled
} }
MonitorInfoBlurb // 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.") // id: contextMenuDisabledInfo
target: contextMenuButton // text: catalog.i18nc("@info", "Please update your printer's firmware to manage the queue remotely.")
} // target: contextMenuButton
// }
CameraButton CameraButton
{ {
@ -454,4 +455,4 @@ Item
id: overrideConfirmationDialog id: overrideConfirmationDialog
printer: base.printer printer: base.printer
} }
} }