diff options
| -rw-r--r-- | grc/src/gui/Dialogs.py | 2 | ||||
| -rw-r--r-- | grc/src/platforms/gui/FlowGraph.py | 14 |
2 files changed, 10 insertions, 6 deletions
diff --git a/grc/src/gui/Dialogs.py b/grc/src/gui/Dialogs.py index 738109673..5f278e343 100644 --- a/grc/src/gui/Dialogs.py +++ b/grc/src/gui/Dialogs.py @@ -122,7 +122,7 @@ class HotKeysDialog(gtk.Dialog): ('Paste Block', 'Ctrl + v'), ('Undo Change', 'Ctrl + z'), ('Redo Change', 'Ctrl + y'), - ('Delete Block', 'Delete'), + ('Delete Element', 'Delete'), ('Modify Parameters', 'Enter'), ('Rotate Block', 'Right'), ('Rotate Block', 'Left'), diff --git a/grc/src/platforms/gui/FlowGraph.py b/grc/src/platforms/gui/FlowGraph.py index e130a05fe..5b40154c4 100644 --- a/grc/src/platforms/gui/FlowGraph.py +++ b/grc/src/platforms/gui/FlowGraph.py @@ -24,7 +24,8 @@ from ... gui.Constants import \ MOTION_DETECT_REDRAWING_SENSITIVITY from ... gui.Actions import \ ELEMENT_CREATE, ELEMENT_SELECT, \ - BLOCK_PARAM_MODIFY, BLOCK_MOVE + BLOCK_PARAM_MODIFY, BLOCK_MOVE, \ + ELEMENT_DELETE import Colors import Utils from ... import utils @@ -63,9 +64,9 @@ class FlowGraph(Element): self._old_selected_port = None self._new_selected_port = None -########################################################################### -# Access Drawing Area -########################################################################### + ########################################################################### + # Access Drawing Area + ########################################################################### def get_drawing_area(self): return self.drawing_area def get_gc(self): return self.get_drawing_area().gc def get_pixmap(self): return self.get_drawing_area().pixmap @@ -545,7 +546,10 @@ class FlowGraph(Element): elif pos-adj_val < SCROLL_PROXIMITY_SENSITIVITY: adj.set_value(adj_val-SCROLL_DISTANCE) adj.emit('changed') - #move the selected element and record the new coordinate + #remove the connection if selected in drag event + if len(self.get_selected_elements()) == 1 and self.get_selected_element().is_connection(): + self.handle_states(ELEMENT_DELETE) + #move the selected elements and record the new coordinate X, Y = self.get_coordinate() if not self.get_ctrl_mask(): self.move_selected((int(x - X), int(y - Y))) self.draw() |