Browse Source

Fix marketplace opening

Jaime van Kessel 3 years ago
parent
commit
26262e3cac
2 changed files with 4 additions and 11 deletions
  1. 0 8
      resources/qml/Actions.qml
  2. 4 3
      resources/qml/MainWindow/ApplicationMenu.qml

+ 0 - 8
resources/qml/Actions.qml

@@ -71,7 +71,6 @@ Item
     property alias configureSettingVisibility: configureSettingVisibilityAction
 
     property alias browsePackages: browsePackagesAction
-    property alias openMarketplace: openMarketplaceAction
 
     UM.I18nCatalog{id: catalog; name: "cura"}
 
@@ -483,11 +482,4 @@ Item
         text: "&Marketplace"
         icon.name: "plugins_browse"
     }
-
-    Action
-    {
-        id: openMarketplaceAction
-        text: catalog.i18nc("@action:menu", "&Marketplace")
-        icon.name: "plugins_browse"
-    }
 }

+ 4 - 3
resources/qml/MainWindow/ApplicationMenu.qml

@@ -97,7 +97,8 @@ Item
         target: Cura.Actions.browsePackages
         function onTriggered()
         {
-            extensionMenu.extensionModel.callExtensionMethod("Toolbox", "launch")
+        print("beepboop")
+            extensionMenu.extensionModel.callExtensionMethod("Marketplace", "show")
         }
     }
 
@@ -107,8 +108,8 @@ Item
         target: Cura.Actions.marketplaceMaterials
         function onTriggered()
         {
-            extensionMenu.extensionModel.callExtensionMethod("Toolbox", "launch")
-            extensionMenu.extensionModel.callExtensionMethod("Toolbox", "setViewCategoryToMaterials")
+            extensionMenu.extensionModel.callExtensionMethod("Marketplace", "show")
+            extensionMenu.extensionModel.callExtensionMethod("Marketplace", "setVisibleTabToMaterials")
         }
     }
 }