[meld] filediff: Fix and reformat per-pane widget hiding

[Kai Willadsen <kaiw src gnome org>]

commit fb718af956a5b7bbdd26d9d3819eea09749ea924
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Thu Feb 6 06:58:17 2014 +1000

    filediff: Fix and reformat per-pane widget hiding

 meld/filediff.py |   19 ++++++++-----------
 1 files changed, 8 insertions(+), 11 deletions(-)
---
diff --git a/meld/filediff.py b/meld/filediff.py
index 86def32..9e704b8 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -173,6 +173,7 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
             "diffmap", "file_save_button", "file_toolbar", "fileentry",
             "fileentry_toolitem", "linkmap", "msgarea_mgr", "readonlytoggle",
             "scrolledwindow", "selector_hbox", "textview", "vbox",
+            "dummy_toolbar_linkmap"
         ]
         self.map_widgets_into_lists(widget_lists)
 
@@ -1843,20 +1844,16 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
             lm.queue_draw()
 
     def set_num_panes(self, n):
-        if n != self.num_panes and n in (1,2,3):
+        if n != self.num_panes and n in (1, 2, 3):
             self.num_panes = n
-            toshow =  self.scrolledwindow[:n] + self.fileentry[:n]
-            toshow += self.vbox[:n] + self.msgarea_mgr[:n]
-            toshow += self.linkmap[:n-1] + self.diffmap[:n]
-            toshow += self.selector_hbox[:n] + self.file_toolbar[:n]
-            for widget in toshow:
+            for widget in (
+                    self.vbox[:n] + self.file_toolbar[:n] + self.diffmap[:n] +
+                    self.linkmap[:n - 1] + self.dummy_toolbar_linkmap[:n - 1]):
                 widget.show()
 
-            tohide = self.scrolledwindow[n:] + self.fileentry[n:]
-            tohide += self.vbox[n:] + self.msgarea_mgr[n:]
-            tohide += self.linkmap[n-1:] + self.diffmap[n:]
-            tohide += self.selector_hbox[n:] + self.file_toolbar[n:]
-            for widget in tohide:
+            for widget in (
+                    self.vbox[n:] + self.file_toolbar[n:] + self.diffmap[n:] +
+                    self.linkmap[n - 1:] + self.dummy_toolbar_linkmap[n - 1:]):
                 widget.hide()
 
             self.actiongroup.get_action("MakePatch").set_sensitive(n > 1)