Merge pull request #2399 from alicevision/dev/cutNodeGraphEditor

[ui] Cut option available in GraphEditor

meshroom/ui/qml/GraphEditor/GraphEditor.qml

@@ -130,6 +130,9 @@ Item {
             }
         } else if (event.key === Qt.Key_D) {
             duplicateNode(event.modifiers === Qt.AltModifier)
+        } else if (event.key === Qt.Key_X && event.modifiers === Qt.ControlModifier) {
+            copyNodes()
+            uigraph.removeNodes(uigraph.selectedNodes)
         } else if (event.key === Qt.Key_C && event.modifiers === Qt.ControlModifier) {
             copyNodes()
         } else if (event.key === Qt.Key_V && event.modifiers === Qt.ControlModifier) {
@@ -476,6 +479,16 @@ Item {
                     onTriggered: Qt.openUrlExternally(Filepath.stringToUrl(nodeMenu.currentNode.internalFolder))
                 }
                 MenuSeparator {}
+                MenuItem {
+                    text: "Cut Node(s)"
+                    enabled: true
+                    ToolTip.text: "Copy selection to the clipboard and remove it"
+                    ToolTip.visible: hovered
+                    onTriggered: {
+                        copyNodes()
+                        uigraph.removeNodes(uigraph.selectedNodes)
+                    }
+                }
                 MenuItem {
                     text: "Copy Node(s)"
                     enabled: true

meshroom/ui/qml/main.qml

@@ -521,18 +521,6 @@ ApplicationWindow {
         enabled: _reconstruction ? _reconstruction.undoStack.canRedo && !_reconstruction.undoStack.lockedRedo : false
         onTriggered: _reconstruction.undoStack.redo()
     }
-    Action {
-        id: copyAction
-
-        property string tooltip: {
-            var s = "Copy selected node"
-            s += (_reconstruction && _reconstruction.selectedNodes.count > 1 ? "s (" : " (") + getSelectedNodesName()
-            s += ") to the clipboard"
-            return s
-        }
-        text: "Copy Node" + (_reconstruction && _reconstruction.selectedNodes.count > 1 ? "s " : " ")
-        enabled: _reconstruction ? _reconstruction.selectedNodes.count > 0 : false
-        onTriggered: graphEditor.copyNodes()
 
     function getSelectedNodesName()
     {
@@ -548,6 +536,35 @@ ApplicationWindow {
         }
         return nodesName
     }
+    Action {
+        id: cutAction
+
+        property string tooltip: {
+            var s = "Copy selected node"
+            s += (_reconstruction && _reconstruction.selectedNodes.count > 1 ? "s (" : " (") + getSelectedNodesName()
+            s += ") to the clipboard and remove them from the graph"
+            return s
+        }
+        text: "Cut Node" + (_reconstruction && _reconstruction.selectedNodes.count > 1 ? "s " : " ")
+        enabled: _reconstruction ? _reconstruction.selectedNodes.count > 0 : false
+        onTriggered: {
+            graphEditor.copyNodes()
+            graphEditor.uigraph.removeNodes(graphEditor.uigraph.selectedNodes)
+        }
+    }
+
+    Action {
+        id: copyAction
+
+        property string tooltip: {
+            var s = "Copy selected node"
+            s += (_reconstruction && _reconstruction.selectedNodes.count > 1 ? "s (" : " (") + getSelectedNodesName()
+            s += ") to the clipboard"
+            return s
+        }
+        text: "Copy Node" + (_reconstruction && _reconstruction.selectedNodes.count > 1 ? "s " : " ")
+        enabled: _reconstruction ? _reconstruction.selectedNodes.count > 0 : false
+        onTriggered: graphEditor.copyNodes()
     }
 
     Action {
@@ -558,6 +575,7 @@ ApplicationWindow {
         onTriggered: graphEditor.pasteNodes()
     }
 
+
     Action {
         id: loadTemplateAction
 
@@ -794,6 +812,11 @@ ApplicationWindow {
                 ToolTip.visible: hovered
                 ToolTip.text: redoAction.tooltip
             }
+            MenuItem {
+                action: cutAction
+                ToolTip.visible: hovered
+                ToolTip.text: cutAction.tooltip
+            }
             MenuItem {
                 action: copyAction
                 ToolTip.visible: hovered