diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 53dae66715..9f3009e258 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -1268,10 +1268,11 @@ class CuraApplication(QtApplication): if other_bb is not None: scene_bounding_box = scene_bounding_box + node.getBoundingBox() - if print_information: print_information.setPreSliced(is_block_slicing_node) + self.getWorkspaceFileHandler().setEnabled(not is_block_slicing_node) + if not scene_bounding_box: scene_bounding_box = AxisAlignedBox.Null diff --git a/resources/qml/Menus/FileMenu.qml b/resources/qml/Menus/FileMenu.qml index 5ea1c9bc06..681e0b06ce 100644 --- a/resources/qml/Menus/FileMenu.qml +++ b/resources/qml/Menus/FileMenu.qml @@ -40,6 +40,7 @@ Menu shortcut: visible ? StandardKey.Save : "" text: catalog.i18nc("@title:menu menubar:file", "&Save Project...") visible: saveProjectMenu.model.count == 1 + enabled: UM.WorkspaceFileHandler.enabled onTriggered: { var args = { "filter_by_machine": false, "file_type": "workspace", "preferred_mimetypes": "application/vnd.ms-package.3dmanufacturing-3dmodel+xml" }; @@ -62,6 +63,7 @@ Menu id: saveProjectMenu model: projectOutputDevicesModel visible: model.count > 1 + enabled: UM.WorkspaceFileHandler.enabled } MenuSeparator { } diff --git a/resources/qml/Menus/SaveProjectMenu.qml b/resources/qml/Menus/SaveProjectMenu.qml index dd17324e58..afc6008717 100644 --- a/resources/qml/Menus/SaveProjectMenu.qml +++ b/resources/qml/Menus/SaveProjectMenu.qml @@ -23,6 +23,11 @@ Menu text: model.name onTriggered: { + if(!UM.WorkspaceFileHandler.enabled) + { + // Prevent shortcut triggering if the item is disabled! + return + } var args = { "filter_by_machine": false, "file_type": "workspace", "preferred_mimetypes": "application/vnd.ms-package.3dmanufacturing-3dmodel+xml" }; if (UM.Preferences.getValue("cura/dialog_on_project_save")) {