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

Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0

Browse Source
This commit is contained in:
Jaime van Kessel 2019-02-21 14:50:01 +01:00
commit 956b917cd6
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cura/OAuth2/AuthorizationHelpers.py
View File

@ -92,7 +92,7 @@ class AuthorizationHelpers:
}) })
except requests.exceptions.ConnectionError: except requests.exceptions.ConnectionError:
# Connection was suddenly dropped. Nothing we can do about that. # Connection was suddenly dropped. Nothing we can do about that.
Logger.logException("e", "Something failed while attempting to parse the JWT token") Logger.log("w", "Something failed while attempting to parse the JWT token")
return None return None
if token_request.status_code not in (200, 201): if token_request.status_code not in (200, 201):
Logger.log("w", "Could not retrieve token data from auth server: %s", token_request.text) Logger.log("w", "Could not retrieve token data from auth server: %s", token_request.text)

2
plugins/MonitorStage/MonitorMain.qml
View File

@ -11,7 +11,7 @@ Rectangle
{ {
id: viewportOverlay id: viewportOverlay
property bool isConnected: Cura.MachineManager.activeMachineHasActiveNetworkConnection || Cura.MachineManager.activeMachineHasActiveCloudConnection property bool isConnected: Cura.MachineManager.activeMachineHasNetworkConnection || Cura.MachineManager.activeMachineHasCloudConnection
property bool isNetworkConfigurable: ["Ultimaker 3", "Ultimaker 3 Extended", "Ultimaker S5"].indexOf(Cura.MachineManager.activeMachineDefinitionName) > -1 property bool isNetworkConfigurable: ["Ultimaker 3", "Ultimaker 3 Extended", "Ultimaker S5"].indexOf(Cura.MachineManager.activeMachineDefinitionName) > -1
property bool isNetworkConfigured: property bool isNetworkConfigured:
{ {

4
plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml
View File

@ -171,11 +171,11 @@ Item
// When printing over the cloud we don't recieve print jobs until there is one, so // When printing over the cloud we don't recieve print jobs until there is one, so
// unless there's at least one print job we'll be stuck with skeleton loading // unless there's at least one print job we'll be stuck with skeleton loading
// indefinitely. // indefinitely.
if (Cura.MachineManager.activeMachineHasActiveCloudConnection) if (Cura.MachineManager.activeMachineIsUsingCloudConnection || OutputDevice.receivedPrintJobs)
{ {
return OutputDevice.queuedPrintJobs return OutputDevice.queuedPrintJobs
} }
return OutputDevice.receivedPrintJobs ? OutputDevice.queuedPrintJobs : [null,null] return [null, null]
} }
spacing: 6 // TODO: Theme! spacing: 6 // TODO: Theme!
} }

2
resources/i18n/es_ES/fdmprinter.def.json.po
View File

@ -1604,7 +1604,7 @@ msgstr "El patrón de relleno se mueve esta distancia a lo largo del eje X."
#: fdmprinter.def.json #: fdmprinter.def.json
msgctxt "infill_offset_y label" msgctxt "infill_offset_y label"
msgid "Infill Y Offset" msgid "Infill Y Offset"
msgstr "Desplazamiento del relleno sobre el eje X" msgstr "Desplazamiento del relleno sobre el eje Y"
#: fdmprinter.def.json #: fdmprinter.def.json
msgctxt "infill_offset_y description" msgctxt "infill_offset_y description"