From 288aeec2dbfa11f22a35adc5193a029c10d4a4d3 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 17 Jan 2022 15:32:27 +0100 Subject: [PATCH] Disable menuItems if they aren't visible This prevents the shortcuts from breaking --- resources/qml/Menus/FileMenu.qml | 3 ++- resources/qml/Menus/SaveProjectMenu.qml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/qml/Menus/FileMenu.qml b/resources/qml/Menus/FileMenu.qml index f247c91726..de5c4bfb90 100644 --- a/resources/qml/Menus/FileMenu.qml +++ b/resources/qml/Menus/FileMenu.qml @@ -25,6 +25,7 @@ Cura.Menu id: openMenu action: Cura.Actions.open visible: base.fileProviderModel.count == 1 + enabled: base.fileProviderModel.count == 1 } OpenFilesMenu @@ -42,7 +43,7 @@ Cura.Menu shortcut: StandardKey.Save text: catalog.i18nc("@title:menu menubar:file", "&Save Project...") visible: saveProjectMenu.model.count == 1 - enabled: UM.WorkspaceFileHandler.enabled + enabled: UM.WorkspaceFileHandler.enabled && saveProjectMenu.model.count == 1 onTriggered: { var args = { "filter_by_machine": false, "file_type": "workspace", "preferred_mimetypes": "application/vnd.ms-package.3dmanufacturing-3dmodel+xml" }; diff --git a/resources/qml/Menus/SaveProjectMenu.qml b/resources/qml/Menus/SaveProjectMenu.qml index 2d59c593c0..3f43289993 100644 --- a/resources/qml/Menus/SaveProjectMenu.qml +++ b/resources/qml/Menus/SaveProjectMenu.qml @@ -41,6 +41,7 @@ Cura.Menu } } shortcut: model.shortcut + enabled: saveProjectMenu.shouldBeVisible } onObjectAdded: saveProjectMenu.insertItem(index, object) onObjectRemoved: saveProjectMenu.removeItem(object)