diff options
| author | Jaime van Kessel <nallath@gmail.com> | 2022-04-19 18:12:58 +0300 |
|---|---|---|
| committer | Jaime van Kessel <nallath@gmail.com> | 2022-04-19 18:12:58 +0300 |
| commit | e85420f9fa87a3988c7317ea1e4b661c9e0b47ae (patch) | |
| tree | 70c82c910a80e5ca512fe1b6c1ad9539a9e07e2a /resources/qml | |
| parent | f070a695b1c8faf1ac6aa154198ddedd19909b39 (diff) | |
Fix few more instances of old usage of fileUrl vs selectedFile
Diffstat (limited to 'resources/qml')
3 files changed, 5 insertions, 5 deletions
diff --git a/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml b/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml index 18891cebee..c33cce1505 100644 --- a/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml +++ b/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml @@ -40,7 +40,7 @@ UM.Dialog } } - onAccepted: loadModelFiles(base.fileUrls) + onAccepted: loadModelFiles(base.selectedFiles) UM.Label { diff --git a/resources/qml/Preferences/Materials/MaterialsPage.qml b/resources/qml/Preferences/Materials/MaterialsPage.qml index 813ad2b0f1..1e783c9b4d 100644 --- a/resources/qml/Preferences/Materials/MaterialsPage.qml +++ b/resources/qml/Preferences/Materials/MaterialsPage.qml @@ -239,10 +239,10 @@ UM.ManagementPage switch (result.status) { case "success": - messageDialog.text = catalog.i18nc("@info:status Don't translate the XML tag <filename>!", "Successfully imported material <filename>%1</filename>").arg(fileUrl); + messageDialog.text = catalog.i18nc("@info:status Don't translate the XML tag <filename>!", "Successfully imported material <filename>%1</filename>").arg(selectedFile); break; default: - messageDialog.text = catalog.i18nc("@info:status Don't translate the XML tags <filename> or <message>!", "Could not import material <filename>%1</filename>: <message>%2</message>").arg(fileUrl).arg(result.message); + messageDialog.text = catalog.i18nc("@info:status Don't translate the XML tags <filename> or <message>!", "Could not import material <filename>%1</filename>: <message>%2</message>").arg(selectedFile).arg(result.message); break; } messageDialog.open(); @@ -267,7 +267,7 @@ UM.ManagementPage switch (result.status) { case "error": - messageDialog.text = catalog.i18nc("@info:status Don't translate the XML tags <filename> and <message>!", "Failed to export material to <filename>%1</filename>: <message>%2</message>").arg(fileUrl).arg(result.message); + messageDialog.text = catalog.i18nc("@info:status Don't translate the XML tags <filename> and <message>!", "Failed to export material to <filename>%1</filename>: <message>%2</message>").arg(selectedFile).arg(result.message); break; case "success": messageDialog.text = catalog.i18nc("@info:status Don't translate the XML tag <filename>!", "Successfully exported material to <filename>%1</filename>").arg(result.path); diff --git a/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml b/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml index 4fb8d78b2f..e4fa1bb8c3 100644 --- a/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml +++ b/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml @@ -735,7 +735,7 @@ Window nameFilters: ["Material archives (*.umm)", "All files (*)"] onAccepted: { - syncModel.exportAll(fileUrl); + syncModel.exportAll(selectedFile); CuraApplication.setDefaultPath("dialog_material_path", folder); materialsSyncDialog.hasExportedUsb = true; } |