Merge lp:~spud/spud/copy-paste-fix into lp:spud

[Fraser Waters]

Copy paste signals were being swallowed by treeview and not going to other controls. This branch fixes that so the focused control gets copy paste signals.

[Stephan Kramer (s-kramer)]

Just tried out your fix. Everything works again as expected. Thanks

[Stephan Kramer (s-kramer)]

review: Approve

=== modified file 'diamond/diamond/interface.py'
--- diamond/diamond/interface.py	2011-07-11 11:11:00 +0000
+++ diamond/diamond/interface.py	2011-07-13 15:52:44 +0000
@@ -644,7 +644,21 @@
     clipboard.set_text(name)
     clipboard.store()
 
+  def _get_focus_widget(self, parent):
+    """Gets the widget that is a child of parent with the focus."""
+    focus = parent.get_focus_child()
+    if focus is None or (focus.flags() & gtk.HAS_FOCUS):
+      return focus
+    else:
+      return self._get_focus_widget(focus)
+
   def on_copy(self, widget=None):
+    
+    widget = self._get_focus_widget(self.main_window)
+    if widget is not self.treeview and gobject.signal_lookup("copy-clipboard", widget):
+      widget.emit("copy-clipboard")
+      return
+
     if isinstance(self.selected_node, MixedTree):
       node = self.selected_node.parent
     else:
@@ -662,6 +676,12 @@
     return
 
   def on_paste(self, widget=None):
+
+    widget = self._get_focus_widget(self.main_window)
+    if widget is not self.treeview and gobject.signal_lookup("paste-clipboard", widget):
+      widget.emit("paste-clipboard")
+      return
+
     clipboard = gtk.clipboard_get()
     ios = StringIO.StringIO(clipboard.wait_for_text())