[meld] Add currently-unused MsgAreas to DirDiff

[Kai Willadsen <kaiw src gnome org>]

commit 9b5bf97ed122bddb70720c1471d96c2a8b8e369c
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Fri Feb 4 18:47:19 2011 +1000

    Add currently-unused MsgAreas to DirDiff

 data/ui/dirdiff.ui |  238 ++++++++++++++++++++++++++++++++++------------------
 meld/dirdiff.py    |    6 +-
 2 files changed, 160 insertions(+), 84 deletions(-)
---
diff --git a/data/ui/dirdiff.ui b/data/ui/dirdiff.ui
index 0d29f3e..17ac2e7 100644
--- a/data/ui/dirdiff.ui
+++ b/data/ui/dirdiff.ui
@@ -18,62 +18,6 @@
             <property name="n_rows">2</property>
             <property name="n_columns">7</property>
             <child>
-              <object class="GtkScrolledWindow" id="scrolledwindow0">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="window_placement">top-right</property>
-                <property name="window_placement_set">True</property>
-                <child>
-                  <object class="GtkTreeView" id="treeview0">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="headers_visible">False</property>
-                    <signal name="button-press-event" handler="on_treeview_button_press_event" swapped="no"/>
-                    <signal name="row-expanded" handler="on_treeview_row_expanded" swapped="no"/>
-                    <signal name="key-press-event" handler="on_treeview_key_press_event" swapped="no"/>
-                    <signal name="cursor-changed" handler="on_treeview_cursor_changed" swapped="no"/>
-                    <signal name="row-collapsed" handler="on_treeview_row_collapsed" swapped="no"/>
-                    <signal name="row-activated" handler="on_treeview_row_activated" swapped="no"/>
-                    <signal name="popup-menu" handler="on_treeview_popup_menu" swapped="no"/>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkScrolledWindow" id="scrolledwindow1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <object class="GtkTreeView" id="treeview1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="headers_visible">False</property>
-                    <signal name="button-press-event" handler="on_treeview_button_press_event" swapped="no"/>
-                    <signal name="row-expanded" handler="on_treeview_row_expanded" swapped="no"/>
-                    <signal name="key-press-event" handler="on_treeview_key_press_event" swapped="no"/>
-                    <signal name="cursor-changed" handler="on_treeview_cursor_changed" swapped="no"/>
-                    <signal name="row-collapsed" handler="on_treeview_row_collapsed" swapped="no"/>
-                    <signal name="row-activated" handler="on_treeview_row_activated" swapped="no"/>
-                    <signal name="popup-menu" handler="on_treeview_popup_menu" swapped="no"/>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">3</property>
-                <property name="right_attach">4</property>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
               <object class="HistoryFileEntry" id="fileentry0">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
@@ -178,33 +122,6 @@
               </packing>
             </child>
             <child>
-              <object class="GtkScrolledWindow" id="scrolledwindow2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <object class="GtkTreeView" id="treeview2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="headers_visible">False</property>
-                    <signal name="button-press-event" handler="on_treeview_button_press_event" swapped="no"/>
-                    <signal name="row-expanded" handler="on_treeview_row_expanded" swapped="no"/>
-                    <signal name="key-press-event" handler="on_treeview_key_press_event" swapped="no"/>
-                    <signal name="cursor-changed" handler="on_treeview_cursor_changed" swapped="no"/>
-                    <signal name="row-collapsed" handler="on_treeview_row_collapsed" swapped="no"/>
-                    <signal name="row-activated" handler="on_treeview_row_activated" swapped="no"/>
-                    <signal name="popup-menu" handler="on_treeview_popup_menu" swapped="no"/>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">5</property>
-                <property name="right_attach">6</property>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
               <object class="GtkDrawingArea" id="linkmap0">
                 <property name="width_request">50</property>
                 <property name="visible">True</property>
@@ -257,6 +174,161 @@
                 <property name="y_options"></property>
               </packing>
             </child>
+            <child>
+              <object class="GtkVBox" id="vbox0">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <child>
+                  <object class="MsgAreaController" id="msgarea_mgr0">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkScrolledWindow" id="scrolledwindow0">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="window_placement">top-right</property>
+                    <property name="window_placement_set">True</property>
+                    <child>
+                      <object class="GtkTreeView" id="treeview0">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="headers_visible">False</property>
+                        <signal name="button-press-event" handler="on_treeview_button_press_event" swapped="no"/>
+                        <signal name="row-expanded" handler="on_treeview_row_expanded" swapped="no"/>
+                        <signal name="key-press-event" handler="on_treeview_key_press_event" swapped="no"/>
+                        <signal name="cursor-changed" handler="on_treeview_cursor_changed" swapped="no"/>
+                        <signal name="row-collapsed" handler="on_treeview_row_collapsed" swapped="no"/>
+                        <signal name="row-activated" handler="on_treeview_row_activated" swapped="no"/>
+                        <signal name="popup-menu" handler="on_treeview_popup_menu" swapped="no"/>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkVBox" id="vbox1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <child>
+                  <object class="MsgAreaController" id="msgarea_mgr1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkScrolledWindow" id="scrolledwindow1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <child>
+                      <object class="GtkTreeView" id="treeview1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="headers_visible">False</property>
+                        <signal name="button-press-event" handler="on_treeview_button_press_event" swapped="no"/>
+                        <signal name="row-expanded" handler="on_treeview_row_expanded" swapped="no"/>
+                        <signal name="key-press-event" handler="on_treeview_key_press_event" swapped="no"/>
+                        <signal name="cursor-changed" handler="on_treeview_cursor_changed" swapped="no"/>
+                        <signal name="row-collapsed" handler="on_treeview_row_collapsed" swapped="no"/>
+                        <signal name="row-activated" handler="on_treeview_row_activated" swapped="no"/>
+                        <signal name="popup-menu" handler="on_treeview_popup_menu" swapped="no"/>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">3</property>
+                <property name="right_attach">4</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkVBox" id="vbox2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <child>
+                  <object class="MsgAreaController" id="msgarea_mgr2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkScrolledWindow" id="scrolledwindow2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <child>
+                      <object class="GtkTreeView" id="treeview2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="headers_visible">False</property>
+                        <signal name="button-press-event" handler="on_treeview_button_press_event" swapped="no"/>
+                        <signal name="row-expanded" handler="on_treeview_row_expanded" swapped="no"/>
+                        <signal name="key-press-event" handler="on_treeview_key_press_event" swapped="no"/>
+                        <signal name="cursor-changed" handler="on_treeview_cursor_changed" swapped="no"/>
+                        <signal name="row-collapsed" handler="on_treeview_row_collapsed" swapped="no"/>
+                        <signal name="row-activated" handler="on_treeview_row_activated" swapped="no"/>
+                        <signal name="popup-menu" handler="on_treeview_popup_menu" swapped="no"/>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">5</property>
+                <property name="right_attach">6</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">True</property>
diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index 1233874..21250b5 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -250,7 +250,9 @@ class DirDiff(melddoc.MeldDoc, gnomeglade.Component):
                        "DirDelete", "Hide", "IgnoreCase", "ShowSame",
                        "ShowNew", "ShowModified", "CustomFilterMenu"):
             self.actiongroup.get_action(button).props.is_important = True
-        self.map_widgets_into_lists( ["treeview", "fileentry", "diffmap", "scrolledwindow", "linkmap"] )
+        self.map_widgets_into_lists(["treeview", "fileentry", "scrolledwindow",
+                                     "diffmap", "linkmap", "msgarea_mgr",
+                                     "vbox"])
         self.set_num_panes(num_panes)
         self.focus_in_events = []
         self.focus_out_events = []
@@ -906,9 +908,11 @@ class DirDiff(melddoc.MeldDoc, gnomeglade.Component):
                 self.treeview[i].set_model(self.model)
             toshow =  self.scrolledwindow[:n] + self.fileentry[:n]
             toshow += self.linkmap[:n-1] + self.diffmap[:n]
+            toshow += self.vbox[:n] + self.msgarea_mgr[:n]
             map( lambda x: x.show(), toshow )
             tohide =  self.scrolledwindow[n:] + self.fileentry[n:]
             tohide += self.linkmap[n-1:] + self.diffmap[n:]
+            tohide += self.vbox[n:] + self.msgarea_mgr[n:]
             map( lambda x: x.hide(), tohide )
             if self.num_panes != 0: # not first time through
                 self.num_panes = n