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

Merge branch '3.0' into layerview-slider-refactor

Browse Source
This commit is contained in:
ChrisTerBeke 2017-10-09 16:14:17 +02:00
commit 30a14dd7d6
3 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/3MFReader/WorkspaceDialog.py
View File

@ -272,12 +272,26 @@ class WorkspaceDialog(QObject):
def notifyClosed(self): def notifyClosed(self):
self._result = {} # The result should be cleared before hide, because after it is released the main thread lock self._result = {} # The result should be cleared before hide, because after it is released the main thread lock
self._visible = False self._visible = False
self._lock.release() try:
self._lock.release()
except:
pass
def hide(self): def hide(self):
self._visible = False self._visible = False
self._view.hide() self._view.hide()
self._lock.release() try:
self._lock.release()
except:
pass
@pyqtSlot(bool)
def _onVisibilityChanged(self, visible):
if not visible:
try:
self._lock.release()
except:
pass
@pyqtSlot() @pyqtSlot()
def onOkButtonClicked(self): def onOkButtonClicked(self):
@ -290,7 +304,6 @@ class WorkspaceDialog(QObject):
self._view.hide() self._view.hide()
self.hide() self.hide()
## Block thread until the dialog is closed. ## Block thread until the dialog is closed.
def waitForClose(self): def waitForClose(self):
if self._visible: if self._visible:

10
plugins/3MFReader/WorkspaceDialog.qml
View File

@ -10,6 +10,7 @@ import UM 1.1 as UM
UM.Dialog UM.Dialog
{ {
id: base
title: catalog.i18nc("@title:window", "Open Project") title: catalog.i18nc("@title:window", "Open Project")
minimumWidth: 500 * screenScaleFactor minimumWidth: 500 * screenScaleFactor
@ -30,6 +31,7 @@ UM.Dialog
materialResolveComboBox.currentIndex = 0 materialResolveComboBox.currentIndex = 0
} }
} }
Item Item
{ {
anchors.fill: parent anchors.fill: parent
@ -377,7 +379,7 @@ UM.Dialog
anchors.right: ok_button.left anchors.right: ok_button.left
anchors.rightMargin: 2 * screenScaleFactor anchors.rightMargin: 2 * screenScaleFactor
} }
Button Button
{ {
id: ok_button id: ok_button
text: catalog.i18nc("@action:button","Open"); text: catalog.i18nc("@action:button","Open");
@ -386,4 +388,10 @@ UM.Dialog
anchors.right: parent.right anchors.right: parent.right
} }
} }
function reject() {
manager.onCancelButtonClicked();
base.visible = false;
base.rejected();
}
} }

1
plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py
View File

@ -836,6 +836,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
Logger.log("d", "User aborted sending print to remote.") Logger.log("d", "User aborted sending print to remote.")
self._progress_message.hide() self._progress_message.hide()
self._compressing_print = False self._compressing_print = False
self._write_finished = True # post_reply does not always exist, so make sure we unblock writing
if self._post_reply: if self._post_reply:
self._finalizePostReply() self._finalizePostReply()
Application.getInstance().showPrintMonitor.emit(False) Application.getInstance().showPrintMonitor.emit(False)