GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 07:38:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix few more instances of old usage of fileUrl vs selectedFile

Browse Source
This commit is contained in:
Jaime van Kessel 2022-04-19 17:12:58 +02:00
parent f070a695b1
commit e85420f9fa
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml
View File

@ -95,7 +95,7 @@ Cura.MachineAction
onAccepted: onAccepted:
{ {
updateProgressDialog.visible = true; updateProgressDialog.visible = true;
activeOutputDevice.updateFirmware(fileUrl); activeOutputDevice.updateFirmware(selectedFile);
} }
} }

2
resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml
View File

@ -40,7 +40,7 @@ UM.Dialog
} }
} }
onAccepted: loadModelFiles(base.fileUrls) onAccepted: loadModelFiles(base.selectedFiles)
UM.Label UM.Label
{ {

6
resources/qml/Preferences/Materials/MaterialsPage.qml
View File

@ -239,10 +239,10 @@ UM.ManagementPage
switch (result.status) switch (result.status)
{ {
case "success": 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; break;
default: 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; break;
} }
messageDialog.open(); messageDialog.open();
@ -267,7 +267,7 @@ UM.ManagementPage
switch (result.status) switch (result.status)
{ {
case "error": 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; break;
case "success": 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); messageDialog.text = catalog.i18nc("@info:status Don't translate the XML tag <filename>!", "Successfully exported material to <filename>%1</filename>").arg(result.path);

2
resources/qml/Preferences/Materials/MaterialsSyncDialog.qml
View File

@ -735,7 +735,7 @@ Window
nameFilters: ["Material archives (*.umm)", "All files (*)"] nameFilters: ["Material archives (*.umm)", "All files (*)"]
onAccepted: onAccepted:
{ {
syncModel.exportAll(fileUrl); syncModel.exportAll(selectedFile);
CuraApplication.setDefaultPath("dialog_material_path", folder); CuraApplication.setDefaultPath("dialog_material_path", folder);
materialsSyncDialog.hasExportedUsb = true; materialsSyncDialog.hasExportedUsb = true;
} }