3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-18 04:07:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge branch 'master' into CURA-6627_Store_extra_data_project_files

Browse source
This commit is contained in:
Ghostkeeper 2020-01-21 15:14:45 +01:00
commit a3825c1f14
No known key found for this signature in database
GPG key ID: 37E2020986774393
51 changed files with 1403 additions and 421 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -154,7 +154,7 @@ Item
}
}
// show the plugin browser dialog
// show the Toolbox
Connections
{
target: Cura.Actions.browsePackages
@ -163,4 +163,15 @@ Item
curaExtensions.callExtensionMethod("Toolbox", "launch")
}
}
// Show the Marketplace dialog at the materials tab
Connections
{
target: Cura.Actions.marketplaceMaterials
onTriggered:
{
curaExtensions.callExtensionMethod("Toolbox", "launch")
curaExtensions.callExtensionMethod("Toolbox", "setViewCategoryToMaterials")
}
}
}