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

Move code and status related to uploading materials to separate class

Browse source 
There's quite a lot of status to track, errors and progress. It's better kept separate.

Contributes to issue CURA-8609.
This commit is contained in:
Ghostkeeper 2021-10-12 09:43:21 +02:00
parent c3d392c5cf
commit 4661b02e4c
No known key found for this signature in database
GPG key ID: 68F39EA88EEED5FF
4 changed files with 176 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

18
resources/qml/Preferences/Materials/MaterialsSyncDialog.qml
View file

@ -21,7 +21,7 @@ Window
height: minimumHeight
modality: Qt.ApplicationModal
property variant materialManagementModel
property variant syncModel
property alias pageIndex: swipeView.currentIndex
property alias syncStatusText: syncStatusLabel.text
@ -195,21 +195,21 @@ Window
State
{
name: "idle"
when: typeof materialManagementModel === "undefined" || materialManagementModel.exportUploadStatus == "idle" || materialManagementModel.exportUploadStatus == "uploading"
when: typeof syncModel === "undefined" || syncModel.exportUploadStatus == "idle" || syncModel.exportUploadStatus == "uploading"
PropertyChanges { target: printerListHeader; text: catalog.i18nc("@title:header", "The following printers will receive the new material profiles:") }
PropertyChanges { target: printerListHeaderIcon; status: UM.StatusIcon.Status.NEUTRAL }
},
State
{
name: "error"
when: typeof materialManagementModel !== "undefined" && materialManagementModel.exportUploadStatus == "error"
when: typeof syncModel !== "undefined" && syncModel.exportUploadStatus == "error"
PropertyChanges { target: printerListHeader; text: catalog.i18nc("@title:header", "Something went wrong when sending the materials to the printers.") }
PropertyChanges { target: printerListHeaderIcon; status: UM.StatusIcon.Status.ERROR }
},
State
{
name: "success"
when: typeof materialManagementModel !== "undefined" && materialManagementModel.exportUploadStatus == "success"
when: typeof syncModel !== "undefined" && syncModel.exportUploadStatus == "success"
PropertyChanges { target: printerListHeader; text: catalog.i18nc("@title:header", "Material profiles successfully synced with the following printers:") }
PropertyChanges { target: printerListHeaderIcon; status: UM.StatusIcon.Status.POSITIVE }
}
@ -399,14 +399,14 @@ Window
id: syncButton
anchors.right: parent.right
text: catalog.i18nc("@button", "Sync")
onClicked: materialManagementModel.exportUpload()
onClicked: syncModel.exportUpload()
visible:
{
if(!materialManagementModel) //When the dialog is created, this is not set yet.
if(!syncModel) //When the dialog is created, this is not set yet.
{
return true;
}
return materialManagementModel.exportUploadStatus != "uploading";
return syncModel.exportUploadStatus != "uploading";
}
}
Item
@ -610,7 +610,7 @@ Window
text: catalog.i18nc("@button", "Export material archive")
onClicked:
{
exportUsbDialog.folder = materialManagementModel.getPreferredExportAllPath();
exportUsbDialog.folder = syncModel.getPreferredExportAllPath();
exportUsbDialog.open();
}
}
@ -641,7 +641,7 @@ Window
nameFilters: ["Material archives (*.umm)", "All files (*)"]
onAccepted:
{
materialManagementModel.exportAll(fileUrl);
syncModel.exportAll(fileUrl);
CuraApplication.setDefaultPath("dialog_material_path", folder);
}
}