3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-13 01:37:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '3.0' of github.com:Ultimaker/cura into 3.0

Browse source
This commit is contained in:
A.Sasin 2017-10-10 09:17:56 +02:00
commit d1bee922ab
8 changed files with 30 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/UM3NetworkPrinting/DiscoverUM3Action.qml
View file

@ -321,7 +321,7 @@ Cura.MachineAction
title: catalog.i18nc("@title:window", "Printer Address")
minimumWidth: 400 * screenScaleFactor
minimumHeight: 120 * screenScaleFactor
minimumHeight: 130 * screenScaleFactor
width: minimumWidth
height: minimumHeight

4
plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py
View file

@ -23,10 +23,8 @@ from PyQt5.QtWidgets import QMessageBox
import json
import os
import gzip
import zlib
from time import time
from time import sleep
i18n_catalog = i18nCatalog("cura")
@ -842,6 +840,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
Logger.log("d", "User aborted sending print to remote.")
self._progress_message.hide()
self._compressing_print = False
self._write_finished = True # post_reply does not always exist, so make sure we unblock writing
if self._post_reply:
self._finalizePostReply()
Application.getInstance().showPrintMonitor.emit(False)
@ -1183,6 +1182,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
# Remove cached post request items.
del self._material_post_objects[id(reply)]
elif "print_job" in reply_url:
self._onUploadFinished() # Make sure the upload flag is reset as reply.finished is not always triggered
try:
reply.uploadProgress.disconnect(self._onUploadProgress)
except:

6
plugins/UM3NetworkPrinting/PrinterInfoBlock.qml
View file

@ -189,7 +189,7 @@ Rectangle
PrintCoreConfiguration
{
id: leftExtruderInfo
width: (parent.width - extruderSeperator.width) / 2
width: Math.floor((parent.width - extruderSeperator.width) / 2)
printCoreConfiguration: printer.configuration[0]
}
@ -204,7 +204,7 @@ Rectangle
PrintCoreConfiguration
{
id: rightExtruderInfo
width: (parent.width - extruderSeperator.width) / 2
width: Math.floor((parent.width - extruderSeperator.width) / 2)
printCoreConfiguration: printer.configuration[1]
}
}
@ -404,6 +404,8 @@ Rectangle
anchors.left: parent.left
anchors.right: parent.right
elide: Text.ElideRight
wrapMode: Text.Wrap
font: UM.Theme.getFont("default")
}