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

Refactoring; no longer use "Printer" to identify CuraApplication

Browse source
This commit is contained in:
Jaime van Kessel 2017-03-30 20:19:05 +02:00
parent e0c77231e0
commit f82aecb7ca
14 changed files with 59 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

24
resources/qml/Cura.qml
View file

@ -21,7 +21,7 @@ UM.MainWindow
property bool monitoringPrint: false
Component.onCompleted:
{
Printer.setMinimumWindowSize(UM.Theme.getSize("window_minimum_size"))
CuraApplication.setMinimumWindowSize(UM.Theme.getSize("window_minimum_size"))
// Workaround silly issues with QML Action's shortcut property.
//
// Currently, there is no way to define shortcuts as "Application Shortcut".
@ -502,7 +502,7 @@ UM.MainWindow
icon: StandardIcon.Question
onYes:
{
Printer.deleteAll();
CuraApplication.deleteAll();
Cura.Actions.resetProfile.trigger();
}
}
@ -619,7 +619,7 @@ UM.MainWindow
{
if(objectContextMenu.objectId != 0)
{
Printer.deleteObject(objectContextMenu.objectId);
CuraApplication.deleteObject(objectContextMenu.objectId);
objectContextMenu.objectId = 0;
}
}
@ -652,7 +652,7 @@ UM.MainWindow
{
if(objectContextMenu.objectId != 0)
{
Printer.centerObject(objectContextMenu.objectId);
CuraApplication.centerObject(objectContextMenu.objectId);
objectContextMenu.objectId = 0;
}
}
@ -898,14 +898,14 @@ UM.MainWindow
{
id: messageDialog
modality: Qt.ApplicationModal
onAccepted: Printer.messageBoxClosed(clickedButton)
onApply: Printer.messageBoxClosed(clickedButton)
onDiscard: Printer.messageBoxClosed(clickedButton)
onHelp: Printer.messageBoxClosed(clickedButton)
onNo: Printer.messageBoxClosed(clickedButton)
onRejected: Printer.messageBoxClosed(clickedButton)
onReset: Printer.messageBoxClosed(clickedButton)
onYes: Printer.messageBoxClosed(clickedButton)
onAccepted: CuraApplication.messageBoxClosed(clickedButton)
onApply: CuraApplication.messageBoxClosed(clickedButton)
onDiscard: CuraApplication.messageBoxClosed(clickedButton)
onHelp: CuraApplication.messageBoxClosed(clickedButton)
onNo: CuraApplication.messageBoxClosed(clickedButton)
onRejected: CuraApplication.messageBoxClosed(clickedButton)
onReset: CuraApplication.messageBoxClosed(clickedButton)
onYes: CuraApplication.messageBoxClosed(clickedButton)
}
Connections