3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-23 19:01:05 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Added merging for multi material

Browse source
This commit is contained in:
Jaime van Kessel 2015-07-27 14:25:27 +02:00
parent 4c1d86d28c
commit 19d711fb80
5 changed files with 54 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
resources/qml/Cura.qml
View file

@ -357,6 +357,11 @@ UM.MainWindow {
{
Printer.ungroupSelected()
}
mergeObjects.onTriggered:
{
Printer.mergeSelected()
}
deleteAll.onTriggered: Printer.deleteAll()
resetAllTranslation.onTriggered: Printer.resetAllTranslation()
@ -390,6 +395,7 @@ UM.MainWindow {
MenuItem { action: actions.resetAll; }
MenuItem { action: actions.groupObjects;}
MenuItem { action: actions.unGroupObjects;}
MenuItem { action: actions.mergeObjects;}
}
Menu {
@ -400,6 +406,7 @@ UM.MainWindow {
MenuItem { action: actions.resetAll; }
MenuItem { action: actions.groupObjects;}
MenuItem { action: actions.unGroupObjects;}
MenuItem { action: actions.mergeObjects;}
}
Connections {