3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 05:23:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Add on-exit callback management and check for active USB printing

Browse source 
CURA-5384
This commit is contained in:
Lipu Fei 2018-07-13 09:16:09 +02:00
parent ac3d3bc5c0
commit c0b7e40b0d
5 changed files with 158 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

42
resources/qml/Cura.qml
View file

@ -1,11 +1,11 @@
// Copyright (c) 2017 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Styles 1.1
import QtQuick 2.7
import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.1
import QtQuick.Dialogs 1.1
import QtQuick.Dialogs 1.2
import UM 1.3 as UM
import Cura 1.0 as Cura
@ -700,10 +700,42 @@ UM.MainWindow
id: contextMenu
}
onPreClosing:
{
close.accepted = CuraApplication.getIsAllChecksPassed();
if (!close.accepted)
{
CuraApplication.checkAndExitApplication();
}
}
MessageDialog
{
id: exitConfirmationDialog
title: catalog.i18nc("@title:window", "Closing Cura")
text: catalog.i18nc("@label", "Are you sure you want to exit Cura?")
icon: StandardIcon.Question
modality: Qt.ApplicationModal
standardButtons: StandardButton.Yes | StandardButton.No
onYes: CuraApplication.callConfirmExitDialogCallback(true)
onNo: CuraApplication.callConfirmExitDialogCallback(false)
onRejected: CuraApplication.callConfirmExitDialogCallback(false)
}
Connections
{
target: CuraApplication
onShowConfirmExitDialog:
{
exitConfirmationDialog.text = message;
exitConfirmationDialog.open();
}
}
Connections
{
target: Cura.Actions.quit
onTriggered: CuraApplication.closeApplication();
onTriggered: CuraApplication.exitApplication();
}
Connections