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

Merge branch '2.3'

Browse source 
Conflicts:
	resources/qml/MonitorButton.qml
This commit is contained in:
Ghostkeeper 2016-09-06 10:43:54 +02:00
commit fcbf4a93f3
No known key found for this signature in database
GPG key ID: 701948C5954A7385
15 changed files with 140 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

7
resources/qml/MonitorButton.qml
View file

@ -4,7 +4,6 @@
import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Styles 1.1
import QtQuick.Dialogs 1.1
import QtQuick.Layouts 1.1
import UM 1.1 as UM
@ -161,7 +160,7 @@ Rectangle
anchors.rightMargin: UM.Theme.getSize("default_margin").width
text: catalog.i18nc("@label:", "Abort Print")
onClicked: confirmationDialog.visible = true
onClicked: Cura.MachineManager.printerOutputDevices[0].setJobState("abort")
style: ButtonStyle
{
@ -221,9 +220,9 @@ Rectangle
{
id: confirmationDialog
title: catalog.i18nc("@text:MessageDialog", "Abort print")
title: catalog.i18nc("@window:title", "Abort print")
icon: StandardIcon.Warning
text: catalog.i18nc("@text:MessageDialog", "Do you really want to abort the print?")
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")