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

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

Browse Source
This commit is contained in:
Jaime van Kessel 2016-09-05 15:51:49 +02:00
commit 122d117ef6
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/definitions/fdmprinter.def.json
View File

@ -3764,6 +3764,7 @@
"type": "float", "type": "float",
"unit": "mm", "unit": "mm",
"default_value": 3, "default_value": 3,
"value": "machine_nozzle_head_distance",
"minimum_value": "0.0001", "minimum_value": "0.0001",
"maximum_value_warning": "20", "maximum_value_warning": "20",
"enabled": "wireframe_enabled", "enabled": "wireframe_enabled",

15
resources/qml/MonitorButton.qml
View File

@ -4,6 +4,7 @@
import QtQuick 2.2 import QtQuick 2.2
import QtQuick.Controls 1.1 import QtQuick.Controls 1.1
import QtQuick.Controls.Styles 1.1 import QtQuick.Controls.Styles 1.1
import QtQuick.Dialogs 1.1
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import UM 1.1 as UM import UM 1.1 as UM
@ -160,7 +161,7 @@ Rectangle
anchors.rightMargin: UM.Theme.getSize("default_margin").width anchors.rightMargin: UM.Theme.getSize("default_margin").width
text: catalog.i18nc("@label:", "Abort Print") text: catalog.i18nc("@label:", "Abort Print")
onClicked: Cura.MachineManager.printerOutputDevices[0].setJobState("abort") onClicked: confirmationDialog.visible = true
style: ButtonStyle style: ButtonStyle
{ {
@ -216,6 +217,18 @@ Rectangle
} }
} }
MessageDialog
{
id: confirmationDialog
title: catalog.i18nc("@window:title", "Abort print")
icon: StandardIcon.Warning
text: catalog.i18nc("@label", "Are you sure you want to abort the print?")
standardButtons: StandardButton.Yes | StandardButton.No
Component.onCompleted: visible = false
onYes: Cura.MachineManager.printerOutputDevices[0].setJobState("abort")
}
Button Button
{ {
id: pauseResumeButton id: pauseResumeButton