GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 06:58:59 +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 2017-07-07 13:42:36 +02:00
commit ab467a65a2
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
resources/qml/Cura.qml
View File

@ -1,4 +1,4 @@
// Copyright (c) 2015 Ultimaker B.V. // Copyright (c) 2017 Ultimaker B.V.
// Cura is released under the terms of the AGPLv3 or higher. // Cura is released under the terms of the AGPLv3 or higher.
import QtQuick 2.2 import QtQuick 2.2
@ -25,7 +25,14 @@ UM.MainWindow
target: Printer target: Printer
onShowPrintMonitor: onShowPrintMonitor:
{ {
base.showPrintMonitor = show; if (show)
{
topbar.startMonitoringPrint()
}
else
{
topbar.stopMonitoringPrint()
}
} }
} }

4
resources/qml/SaveButton.qml
View File

@ -1,4 +1,4 @@
// Copyright (c) 2015 Ultimaker B.V. // Copyright (c) 2017 Ultimaker B.V.
// Cura is released under the terms of the AGPLv3 or higher. // Cura is released under the terms of the AGPLv3 or higher.
import QtQuick 2.2 import QtQuick 2.2
@ -24,7 +24,7 @@ Item {
{ {
if(!activity) if(!activity)
{ {
return catalog.i18nc("@label:PrintjobStatus", "Please load a 3d model"); return catalog.i18nc("@label:PrintjobStatus", "Please load a 3D model");
} }
switch(base.backendState) switch(base.backendState)