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

Update Dialog imports to remove version

Browse source 
Update FileDialogs selectExisting -> fileMode and folder -> currentFolder

CURA-8640
This commit is contained in:
j.delarago 2022-04-01 16:08:35 +02:00
parent 90f03befc8
commit f327c2479b
9 changed files with 19 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
resources/qml/Cura.qml
View file

@ -3,7 +3,8 @@
import QtQuick 2.7 import QtQuick 2.7
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Dialogs 6.0 import QtQuick.Dialogs
import UM 1.5 as UM import UM 1.5 as UM
import Cura 1.1 as Cura import Cura 1.1 as Cura

2
resources/qml/MachineSettings/NumericTextFieldWithUnit.qml
View file

@ -1,7 +1,7 @@
// Copyright (c) 2020 Ultimaker B.V. // Copyright (c) 2020 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher. // Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10 import QtQuick 2.15
import QtQuick.Controls 2.3 import QtQuick.Controls 2.3
import UM 1.5 as UM import UM 1.5 as UM

2
resources/qml/Preferences/Materials/MaterialsBrandSection.qml
View file

@ -2,7 +2,7 @@
// Cura is released under the terms of the LGPLv3 or higher. // Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.7 import QtQuick 2.7
import QtQuick.Controls 1.4 import QtQuick.Controls 2.1
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import UM 1.5 as UM import UM 1.5 as UM

2
resources/qml/Preferences/Materials/MaterialsList.qml
View file

@ -2,8 +2,8 @@
// Uranium is released under the terms of the LGPLv3 or higher. // Uranium is released under the terms of the LGPLv3 or higher.
import QtQuick 2.7 import QtQuick 2.7
import QtQuick.Controls 1.4
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import QtQuick.Dialogs
import UM 1.2 as UM import UM 1.2 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura

10
resources/qml/Preferences/Materials/MaterialsPage.qml
View file

@ -3,7 +3,7 @@
import QtQuick 2.7 import QtQuick 2.7
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Dialogs 6.0 import QtQuick.Dialogs
import UM 1.5 as UM import UM 1.5 as UM
import Cura 1.5 as Cura import Cura 1.5 as Cura
@ -226,9 +226,9 @@ UM.ManagementPage
{ {
id: importMaterialDialog id: importMaterialDialog
title: catalog.i18nc("@title:window", "Import Material") title: catalog.i18nc("@title:window", "Import Material")
selectExisting: true fileMode: FileDialog.OpenFile
nameFilters: Cura.ContainerManager.getContainerNameFilters("material") nameFilters: Cura.ContainerManager.getContainerNameFilters("material")
folder: CuraApplication.getDefaultPath("dialog_material_path") currentFolder: CuraApplication.getDefaultPath("dialog_material_path")
onAccepted: onAccepted:
{ {
const result = Cura.ContainerManager.importMaterialContainer(fileUrl); const result = Cura.ContainerManager.importMaterialContainer(fileUrl);
@ -254,9 +254,9 @@ UM.ManagementPage
{ {
id: exportMaterialDialog id: exportMaterialDialog
title: catalog.i18nc("@title:window", "Export Material") title: catalog.i18nc("@title:window", "Export Material")
selectExisting: false fileMode: FileDialog.SaveFile
nameFilters: Cura.ContainerManager.getContainerNameFilters("material") nameFilters: Cura.ContainerManager.getContainerNameFilters("material")
folder: CuraApplication.getDefaultPath("dialog_material_path") currentFolder: CuraApplication.getDefaultPath("dialog_material_path")
onAccepted: onAccepted:
{ {
const result = Cura.ContainerManager.exportContainer(base.currentItem.root_material_id, selectedNameFilter, fileUrl); const result = Cura.ContainerManager.exportContainer(base.currentItem.root_material_id, selectedNameFilter, fileUrl);

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

@ -3,9 +3,10 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Dialogs 6.0 import QtQuick.Dialogs
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.15
import QtQuick.Window 2.1 import QtQuick.Window 2.1
import Cura 1.1 as Cura import Cura 1.1 as Cura
import UM 1.5 as UM import UM 1.5 as UM

2
resources/qml/Preferences/Materials/MaterialsTypeSection.qml
View file

@ -2,7 +2,7 @@
// Uranium is released under the terms of the LGPLv3 or higher. // Uranium is released under the terms of the LGPLv3 or higher.
import QtQuick 2.7 import QtQuick 2.7
import QtQuick.Controls 1.4 import QtQuick.Controls 2.4
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import UM 1.5 as UM import UM 1.5 as UM

2
resources/qml/Preferences/Materials/MaterialsView.qml
View file

@ -3,8 +3,8 @@
import QtQuick 2.7 import QtQuick 2.7
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Dialogs 6.0
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import QtQuick.Dialogs
import UM 1.5 as UM import UM 1.5 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura

10
resources/qml/Preferences/ProfilesPage.qml
View file

@ -4,7 +4,7 @@
import QtQuick 2.7 import QtQuick 2.7
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import QtQuick.Dialogs 6.0 import QtQuick.Dialogs
import UM 1.5 as UM import UM 1.5 as UM
import Cura 1.6 as Cura import Cura 1.6 as Cura
@ -349,9 +349,9 @@ UM.ManagementPage
{ {
id: exportDialog id: exportDialog
title: catalog.i18nc("@title:window", "Export Profile") title: catalog.i18nc("@title:window", "Export Profile")
selectExisting: false fileMode: FileDialog.SaveFile
nameFilters: base.qualityManagementModel.getFileNameFilters("profile_writer") nameFilters: base.qualityManagementModel.getFileNameFilters("profile_writer")
folder: CuraApplication.getDefaultPath("dialog_profile_path") currentFolder: CuraApplication.getDefaultPath("dialog_profile_path")
onAccepted: onAccepted:
{ {
var result = Cura.ContainerManager.exportQualityChangesGroup(base.currentItem.quality_changes_group, var result = Cura.ContainerManager.exportQualityChangesGroup(base.currentItem.quality_changes_group,
@ -414,9 +414,9 @@ UM.ManagementPage
{ {
id: importDialog id: importDialog
title: catalog.i18nc("@title:window", "Import Profile") title: catalog.i18nc("@title:window", "Import Profile")
selectExisting: true fileMode: FileDialog.OpenFile
nameFilters: base.qualityManagementModel.getFileNameFilters("profile_reader") nameFilters: base.qualityManagementModel.getFileNameFilters("profile_reader")
folder: CuraApplication.getDefaultPath("dialog_profile_path") currentFolder: CuraApplication.getDefaultPath("dialog_profile_path")
onAccepted: onAccepted:
{ {
var result = Cura.ContainerManager.importProfile(fileUrl); var result = Cura.ContainerManager.importProfile(fileUrl);