From 3e4c17160370617143d25753c2a4ecbb9114e85c Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 17 Jan 2022 11:09:42 +0100 Subject: [PATCH] Simplify the OpenFilesMenu CURA-8683 --- resources/qml/Menus/OpenFilesMenu.qml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/resources/qml/Menus/OpenFilesMenu.qml b/resources/qml/Menus/OpenFilesMenu.qml index dcce902170..de5ab00c76 100644 --- a/resources/qml/Menus/OpenFilesMenu.qml +++ b/resources/qml/Menus/OpenFilesMenu.qml @@ -20,10 +20,7 @@ Cura.Menu model: CuraApplication.getFileProviderModel() Cura.MenuItem { - text: - { - return model.displayText; - } + text: model.displayText onTriggered: { if (model.index == 0) // The 0th element is the "From Disk" option, which should activate the open local file dialog @@ -35,12 +32,10 @@ Cura.Menu CuraApplication.getFileProviderModel().trigger(model.name); } } - // Unassign the shortcuts when the submenu is invisible (i.e. when there is only one file provider) to avoid ambiguous shortcuts. - // When there is a single file provider, the openAction is assigned with the Ctrl+O shortcut instead. - shortcut: openFilesMenu.visible ? model.shortcut : "" - visible: openFilesMenu.visible + shortcut: model.shortcut } onObjectAdded: openFilesMenu.insertItem(index, object) + onObjectRemoved: openFilesMenu.removeItem(object) } }