[meld] dirdiff.ui: Resave with modern glade and update expand flags

[Kai Willadsen <kaiw src gnome org>]

commit 8318369e1920fac49cba7851990a3907a83fcbd2
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Dec 15 07:10:00 2013 +1000

    dirdiff.ui: Resave with modern glade and update expand flags

 data/ui/dirdiff.ui |   40 ++++++++++++++++++++++++++++------------
 1 files changed, 28 insertions(+), 12 deletions(-)
---
diff --git a/data/ui/dirdiff.ui b/data/ui/dirdiff.ui
index 209d94f..b935cad 100644
--- a/data/ui/dirdiff.ui
+++ b/data/ui/dirdiff.ui
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 2.12 -->
+  <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires meld.ui.gladesupport 0.0 -->
-  <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkActionGroup" id="DirdiffActions">
     <child>
       <object class="GtkAction" id="DirCompare">
@@ -67,7 +66,6 @@
         <signal name="toggled" handler="on_filter_state_toggled" swapped="no"/>
       </object>
     </child>
-
     <child>
       <object class="GtkToggleAction" id="ShowNew">
         <property name="label" translatable="yes">New</property>
@@ -112,7 +110,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
-                <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
+                <property name="action">select-folder</property>
                 <signal name="file-set" handler="on_fileentry_file_set" swapped="no"/>
               </object>
               <packing>
@@ -127,7 +125,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
-                <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
+                <property name="action">select-folder</property>
                 <signal name="file-set" handler="on_fileentry_file_set" swapped="no"/>
               </object>
               <packing>
@@ -142,7 +140,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
-                <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
+                <property name="action">select-folder</property>
                 <signal name="file-set" handler="on_fileentry_file_set" swapped="no"/>
               </object>
               <packing>
@@ -155,6 +153,8 @@
             <child>
               <object class="DiffMap" id="diffmap1">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="vexpand">True</property>
               </object>
               <packing>
                 <property name="left_attach">6</property>
@@ -169,6 +169,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="vexpand">True</property>
               </object>
               <packing>
                 <property name="left_attach">4</property>
@@ -180,6 +181,8 @@
             <child>
               <object class="DiffMap" id="diffmap0">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="vexpand">True</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -194,6 +197,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="vexpand">True</property>
               </object>
               <packing>
                 <property name="left_attach">2</property>
@@ -277,6 +281,7 @@
                   <object class="GtkScrolledWindow" id="scrolledwindow0">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="vexpand">True</property>
                     <property name="window_placement">top-right</property>
                     <property name="window_placement_set">True</property>
                     <child>
@@ -285,12 +290,15 @@
                         <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="cursor-changed" handler="on_treeview_cursor_changed" 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="row-collapsed" handler="on_treeview_row_collapsed" swapped="no"/>
                         <signal name="popup-menu" handler="on_treeview_popup_menu" swapped="no"/>
+                        <child internal-child="selection">
+                          <object class="GtkTreeSelection" id="treeview-selection1"/>
+                        </child>
                       </object>
                     </child>
                   </object>
@@ -331,18 +339,22 @@
                   <object class="GtkScrolledWindow" id="scrolledwindow1">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="vexpand">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="cursor-changed" handler="on_treeview_cursor_changed" 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="row-collapsed" handler="on_treeview_row_collapsed" swapped="no"/>
                         <signal name="popup-menu" handler="on_treeview_popup_menu" swapped="no"/>
+                        <child internal-child="selection">
+                          <object class="GtkTreeSelection" id="treeview-selection2"/>
+                        </child>
                       </object>
                     </child>
                   </object>
@@ -383,18 +395,22 @@
                   <object class="GtkScrolledWindow" id="scrolledwindow2">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="vexpand">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="cursor-changed" handler="on_treeview_cursor_changed" 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="row-collapsed" handler="on_treeview_row_collapsed" swapped="no"/>
                         <signal name="popup-menu" handler="on_treeview_popup_menu" swapped="no"/>
+                        <child internal-child="selection">
+                          <object class="GtkTreeSelection" id="treeview-selection3"/>
+                        </child>
                       </object>
                     </child>
                   </object>