Merge lp:~fraser-waters08/spud/subtree-expand-collapse into lp:spud

[Fraser Waters]

Pressing the left or right arrow keys while a row in the LHS treeview is selected and has focus will collapse or expand that subtree node.

[Patrick Farrell (pefarrell)]

That works beautifully.

Expanding on the idea of the original bug report: maybe can you add more keyboard interaction
functionality? Use your common sense, but I am thinking it would be handy if

Enter -- activate inactive option / add a new instance of a zero-or-more/one-or-more
Delete -- deactivate active option / delete instance of ^^^^^^^^^^^^^^^^^^^^^^^^

Can you think of any more?

That being said, I'm very happy for this to be merged as-is; it fixes the existing bug report

=== modified file 'diamond/diamond/interface.py'
--- diamond/diamond/interface.py	2011-07-04 09:57:05 +0000
+++ diamond/diamond/interface.py	2011-07-04 14:02:31 +0000
@@ -667,6 +667,7 @@
 
     self.treeview = optionsTree = self.gui.get_widget("optionsTree")
     self.treeview.connect("row-collapsed", self.on_treeview_row_collapsed)
+    self.treeview.connect("key_press_event", self.on_treeview_key_press)
     try:  # allow for possibility of no tooltips (like elsewhere)
       self.treeview.connect("query-tooltip", self.on_tooltip)
       self.treeview.set_property("has-tooltip", False)
@@ -1168,6 +1169,20 @@
 
     return True
 
+  def on_treeview_key_press(self, treeview, event):
+    """
+    Called when treeview intercepts a key press. Collapse and expand rows.
+    """
+
+    if event.keyval == gtk.keysyms.Right:
+      self.treeview.expand_row(self.get_selected_row(), open_all = False)
+
+    if event.keyval == gtk.keysyms.Left:
+      self.treeview.collapse_row(self.get_selected_row())
+  
+    return
+
+
   def on_select_row(self, selection=None):
     """
     Called when a row is selected. Update the options frame.