From 7c154c78bf8eb1c43aa7837ac8cd3e5b84ab6547 Mon Sep 17 00:00:00 2001
From: fieldOfView <aldo@fieldofview.com>
Date: Wed, 11 May 2016 17:58:10 +0200
Subject: [PATCH] Add keyboard shortcuts for grouping/ungrouping

Contributes (in a way) to CURA-1054, \sa CURA-1531
---
 resources/qml/Actions.qml | 5 ++++-
 resources/qml/Cura.qml    | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml
index 003a3ceeec..33754c71ab 100644
--- a/resources/qml/Actions.qml
+++ b/resources/qml/Actions.qml
@@ -176,6 +176,7 @@ Item
         text: catalog.i18nc("@action:inmenu menubar:edit","&Group Objects");
         enabled: UM.Scene.numObjectsSelected > 1 ? true: false
         iconName: "object-group"
+        shortcut: "Ctrl+G";
     }
 
     Action
@@ -184,14 +185,16 @@ Item
         text: catalog.i18nc("@action:inmenu menubar:edit","Ungroup Objects");
         enabled: UM.Scene.isGroupSelected
         iconName: "object-ungroup"
+        shortcut: "Ctrl+Shift+G";
     }
-    
+
     Action
     {
         id: mergeObjectsAction
         text: catalog.i18nc("@action:inmenu menubar:edit","&Merge Objects");
         enabled: UM.Scene.numObjectsSelected > 1 ? true: false
         iconName: "merge";
+        shortcut: "Ctrl+Alt+G";
     }
 
     Action
diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index 1759eabfc6..ccaeb63c4e 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -680,6 +680,7 @@ UM.MainWindow
         MenuItem { action: actions.reloadAll; }
         MenuItem { action: actions.resetAllTranslation; }
         MenuItem { action: actions.resetAll; }
+        MenuSeparator { }
         MenuItem { action: actions.groupObjects; }
         MenuItem { action: actions.mergeObjects; }
         MenuItem { action: actions.unGroupObjects; }
@@ -692,6 +693,7 @@ UM.MainWindow
         MenuItem { action: actions.reloadAll; }
         MenuItem { action: actions.resetAllTranslation; }
         MenuItem { action: actions.resetAll; }
+        MenuSeparator { }
         MenuItem { action: actions.groupObjects; }
         MenuItem { action: actions.mergeObjects; }
         MenuItem { action: actions.unGroupObjects; }