diff --git a/plugins/3MFWriter/SettingSelection.qml b/plugins/3MFWriter/SettingSelection.qml index 478c2d393c..a50c02f11c 100644 --- a/plugins/3MFWriter/SettingSelection.qml +++ b/plugins/3MFWriter/SettingSelection.qml @@ -19,7 +19,7 @@ RowLayout Layout.preferredWidth: UM.Theme.getSize("setting").width checked: modelData.selected onClicked: modelData.selected = checked - enabled: modelData.selectable + } UM.Label diff --git a/plugins/3MFWriter/ThreeMFWriter.py b/plugins/3MFWriter/ThreeMFWriter.py index 3389941ed8..5583059a2f 100644 --- a/plugins/3MFWriter/ThreeMFWriter.py +++ b/plugins/3MFWriter/ThreeMFWriter.py @@ -135,13 +135,16 @@ class ThreeMFWriter(MeshWriter): stack = um_node.callDecoration("getStack") if stack is not None: changed_setting_keys = stack.getTop().getAllKeys() - # Ensure that we save the extruder used for this object in a multi-extrusion setup - if stack.getProperty("machine_extruder_count", "value") > 1: - changed_setting_keys.add("extruder_nr") - # Get values for all changed settings & save them. - for key in changed_setting_keys: - savitar_node.setSetting("cura:" + key, str(stack.getProperty(key, "value"))) - if exported_settings is not None: + + if exported_settings is None: + # Ensure that we save the extruder used for this object in a multi-extrusion setup + if stack.getProperty("machine_extruder_count", "value") > 1: + changed_setting_keys.add("extruder_nr") + + # Get values for all changed settings & save them. + for key in changed_setting_keys: + savitar_node.setSetting("cura:" + key, str(stack.getProperty(key, "value"))) + else: # We want to export only the specified settings if um_node.getName() in exported_settings: model_exported_settings = exported_settings[um_node.getName()] diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index b01cd192c3..a07bb598d8 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -703,7 +703,6 @@ UM.MainWindow { var projectFile = projectFileUrlList[0] var is_ucp = CuraActions.isProjectUcp(projectFile); - print("this file is ucp", is_ucp); if (is_ucp) { askOpenAsProjectOrUcpOrImportModelsDialog.fileUrl = projectFile; @@ -790,7 +789,6 @@ UM.MainWindow function onOpenProjectFile(project_file, add_to_recent_files) { var is_ucp = CuraActions.isProjectUcp(project_file); - print("this file is ucp", is_ucp); if (is_ucp) { diff --git a/resources/qml/Dialogs/AskOpenAsProjectOrUcpOrImportModel.qml b/resources/qml/Dialogs/AskOpenAsProjectOrUcpOrImportModel.qml index 9791a3e451..a68c48b4a6 100644 --- a/resources/qml/Dialogs/AskOpenAsProjectOrUcpOrImportModel.qml +++ b/resources/qml/Dialogs/AskOpenAsProjectOrUcpOrImportModel.qml @@ -29,13 +29,6 @@ UM.Dialog property var fileUrl property var addToRecent: true //Whether to add this file to the recent files list after reading it. - // load the entire project - function loadProjectFile() { - - UM.WorkspaceFileHandler.readLocalFile(base.fileUrl, base.addToRecent); - - base.hide() - } // load the project file as separated models function loadModelFiles() { @@ -57,10 +50,8 @@ UM.Dialog // when hitting 'enter', we always open as project unless open_as_model was explicitly stored as preference if (openAsPreference == "open_as_model") { loadModelFiles() - } else if (openAsPreference == "open_as_ucp"){ + } else{ loadUcpFiles() - }else { - loadProjectFile() } } @@ -78,21 +69,17 @@ UM.Dialog } } - onAccepted: loadProjectFile() + onAccepted: loadUcpFile() onRejected: loadModelFiles() buttonSpacing: UM.Theme.getSize("thin_margin").width rightButtons: [ - Cura.SecondaryButton - { - text: catalog.i18nc("@action:button", "Open as project") - onClicked: loadProjectFile() - }, Cura.PrimaryButton { text: catalog.i18nc("@action:button", "Open as UCP") + iconSource: UM.Theme.getIcon("CuraShareIcon") onClicked: loadUcpFiles() }, Cura.SecondaryButton diff --git a/resources/themes/cura-light/icons/default/CuraShareIcon.svg b/resources/themes/cura-light/icons/default/CuraShareIcon.svg new file mode 100644 index 0000000000..fb9a6b922c --- /dev/null +++ b/resources/themes/cura-light/icons/default/CuraShareIcon.svg @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +