Factor out the scene proxy

This commit is contained in:
Jaime van Kessel 2019-04-05 16:41:22 +02:00
parent 2dd4a30586
commit 495b24b87b

View File

@ -282,7 +282,7 @@ Item
{ {
id: groupObjectsAction id: groupObjectsAction
text: catalog.i18nc("@action:inmenu menubar:edit","&Group Models"); text: catalog.i18nc("@action:inmenu menubar:edit","&Group Models");
enabled: UM.Scene.numObjectsSelected > 1 ? true: false enabled: UM.Selection.selectionCount > 1 ? true: false
iconName: "object-group" iconName: "object-group"
shortcut: "Ctrl+G"; shortcut: "Ctrl+G";
onTriggered: CuraApplication.groupSelected(); onTriggered: CuraApplication.groupSelected();
@ -302,7 +302,7 @@ Item
{ {
id: unGroupObjectsAction id: unGroupObjectsAction
text: catalog.i18nc("@action:inmenu menubar:edit","Ungroup Models"); text: catalog.i18nc("@action:inmenu menubar:edit","Ungroup Models");
enabled: UM.Scene.isGroupSelected enabled: UM.Selection.isGroupSelected
iconName: "object-ungroup" iconName: "object-ungroup"
shortcut: "Ctrl+Shift+G"; shortcut: "Ctrl+Shift+G";
onTriggered: CuraApplication.ungroupSelected(); onTriggered: CuraApplication.ungroupSelected();
@ -312,7 +312,7 @@ Item
{ {
id: mergeObjectsAction id: mergeObjectsAction
text: catalog.i18nc("@action:inmenu menubar:edit","&Merge Models"); text: catalog.i18nc("@action:inmenu menubar:edit","&Merge Models");
enabled: UM.Scene.numObjectsSelected > 1 ? true: false enabled: UM.Selection.selectionCount > 1 ? true: false
iconName: "merge"; iconName: "merge";
shortcut: "Ctrl+Alt+G"; shortcut: "Ctrl+Alt+G";
onTriggered: CuraApplication.mergeSelected(); onTriggered: CuraApplication.mergeSelected();