3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-19 12:47:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'replace_controls_1_for_controls_2' of github.com:Ultimaker/Cura into CURA-8688_qt6_cleanup

Browse source
This commit is contained in:
Jaime van Kessel 2022-02-28 11:26:47 +01:00
commit f82c0fe525
2 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
resources/qml/Actions.qml
View file

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

7
resources/qml/MainWindow/ApplicationMenu.qml
View file

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