From bab931128467a955a95c2efd180eb5700050f11e Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 14 Jan 2022 13:14:15 +0100 Subject: [PATCH] Fix opening of marketplace button CURA-8684 --- resources/qml/MainWindow/ApplicationMenu.qml | 8 ++++---- resources/qml/Menus/ExtensionMenu.qml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/qml/MainWindow/ApplicationMenu.qml b/resources/qml/MainWindow/ApplicationMenu.qml index 06fbc7a47a..269f918ad2 100644 --- a/resources/qml/MainWindow/ApplicationMenu.qml +++ b/resources/qml/MainWindow/ApplicationMenu.qml @@ -40,7 +40,7 @@ Item title: (Qt.platform.os == "osx") ? "&Settings" : catalog.i18nc("@title:menu menubar:toplevel", "&Settings") } - ExtensionMenu {} + ExtensionMenu { id: extensionMenu } PreferencesMenu {} @@ -99,7 +99,7 @@ Item target: Cura.Actions.browsePackages function onTriggered() { - curaExtensions.callExtensionMethod("Toolbox", "launch") + extensionMenu.extensionModel.callExtensionMethod("Toolbox", "launch") } } @@ -109,8 +109,8 @@ Item target: Cura.Actions.marketplaceMaterials function onTriggered() { - curaExtensions.callExtensionMethod("Toolbox", "launch") - curaExtensions.callExtensionMethod("Toolbox", "setViewCategoryToMaterials") + extensionMenu.extensionModel.callExtensionMethod("Toolbox", "launch") + extensionMenu.extensionModel.callExtensionMethod("Toolbox", "setViewCategoryToMaterials") } } } \ No newline at end of file diff --git a/resources/qml/Menus/ExtensionMenu.qml b/resources/qml/Menus/ExtensionMenu.qml index 2504c7a9e1..4cde8158cc 100644 --- a/resources/qml/Menus/ExtensionMenu.qml +++ b/resources/qml/Menus/ExtensionMenu.qml @@ -11,7 +11,7 @@ Menu { id: extensionMenu title: catalog.i18nc("@title:menu menubar:toplevel", "E&xtensions") - + property var extensionModel: UM.ExtensionModel { } Component { id: extensionsMenuItem @@ -33,7 +33,7 @@ Menu Instantiator { id: extensions - model: UM.ExtensionModel { } + model: extensionModel UM.Menu {