[meld] preferences: Remove padding-only Alignment from editable list template

[Kai Willadsen <kaiw src gnome org>]

commit ebd989b4797516006faf50fdfea596e5cc45446f
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat May 24 09:58:18 2014 +1000

    preferences: Remove padding-only Alignment from editable list template

 data/ui/EditableList.ui |  276 +++++++++++++++++++++++------------------------
 meld/preferences.py     |    2 +-
 2 files changed, 134 insertions(+), 144 deletions(-)
---
diff --git a/data/ui/EditableList.ui b/data/ui/EditableList.ui
index 12d7821..0bd158c 100644
--- a/data/ui/EditableList.ui
+++ b/data/ui/EditableList.ui
@@ -180,181 +180,171 @@
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Editable List</property>
     <child>
-      <object class="GtkAlignment" id="list_alignment">
+      <object class="GtkVBox" id="list_vbox">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="top_padding">8</property>
-        <property name="bottom_padding">8</property>
-        <property name="left_padding">8</property>
-        <property name="right_padding">8</property>
         <child>
-          <object class="GtkVBox" id="list_vbox">
+          <object class="GtkScrolledWindow" id="scrolledwindow1">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can_focus">True</property>
+            <property name="hscrollbar_policy">automatic</property>
+            <property name="vscrollbar_policy">automatic</property>
+            <property name="shadow_type">in</property>
             <child>
-              <object class="GtkScrolledWindow" id="scrolledwindow1">
+              <object class="GtkTreeView" id="EditableList">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="hscrollbar_policy">automatic</property>
-                <property name="vscrollbar_policy">automatic</property>
-                <property name="shadow_type">in</property>
+                <property name="model">EditableListStore</property>
+                <property name="headers_clickable">False</property>
+                <property name="reorderable">True</property>
+                <property name="search_column">0</property>
+                <property name="show_expanders">False</property>
+                <property name="rubber_banding">True</property>
                 <child>
-                  <object class="GtkTreeView" id="EditableList">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="model">EditableListStore</property>
-                    <property name="headers_clickable">False</property>
-                    <property name="reorderable">True</property>
-                    <property name="search_column">0</property>
-                    <property name="show_expanders">False</property>
-                    <property name="rubber_banding">True</property>
+                  <object class="GtkTreeViewColumn" id="treeviewcolumn1">
+                    <property name="title" translatable="yes">Active</property>
                     <child>
-                      <object class="GtkTreeViewColumn" id="treeviewcolumn1">
-                        <property name="title" translatable="yes">Active</property>
-                        <child>
-                          <object class="GtkCellRendererToggle" id="cellrenderertoggle1">
-                            <signal name="toggled" handler="on_cellrenderertoggle_toggled" swapped="no"/>
-                          </object>
-                          <attributes>
-                            <attribute name="activatable">3</attribute>
-                            <attribute name="active">1</attribute>
-                          </attributes>
-                        </child>
+                      <object class="GtkCellRendererToggle" id="cellrenderertoggle1">
+                        <signal name="toggled" handler="on_cellrenderertoggle_toggled" swapped="no"/>
+                      </object>
+                      <attributes>
+                        <attribute name="activatable">3</attribute>
+                        <attribute name="active">1</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkTreeViewColumn" id="treeviewcolumn2">
+                    <property name="title" translatable="yes">Name</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="cellrenderertext1">
+                        <property name="editable">True</property>
+                        <signal name="edited" handler="on_name_edited" swapped="no"/>
                       </object>
+                      <attributes>
+                        <attribute name="text">0</attribute>
+                      </attributes>
                     </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkTreeViewColumn" id="pattern_column">
+                    <property name="title" translatable="yes">Pattern</property>
                     <child>
-                      <object class="GtkTreeViewColumn" id="treeviewcolumn2">
-                        <property name="title" translatable="yes">Name</property>
-                        <child>
-                          <object class="GtkCellRendererText" id="cellrenderertext1">
-                            <property name="editable">True</property>
-                            <signal name="edited" handler="on_name_edited" swapped="no"/>
-                          </object>
-                          <attributes>
-                            <attribute name="text">0</attribute>
-                          </attributes>
-                        </child>
+                      <object class="GtkCellRendererPixbuf" id="validity_renderer">
+                        <property name="width">16</property>
+                        <property name="height">16</property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkTreeViewColumn" id="pattern_column">
-                        <property name="title" translatable="yes">Pattern</property>
-                        <child>
-                          <object class="GtkCellRendererPixbuf" id="validity_renderer">
-                            <property name="width">16</property>
-                            <property name="height">16</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkCellRendererText" id="cellrenderertext2">
-                            <property name="editable">True</property>
-                            <signal name="edited" handler="on_pattern_edited" swapped="no"/>
-                          </object>
-                          <attributes>
-                            <attribute name="text">2</attribute>
-                          </attributes>
-                        </child>
+                      <object class="GtkCellRendererText" id="cellrenderertext2">
+                        <property name="editable">True</property>
+                        <signal name="edited" handler="on_pattern_edited" swapped="no"/>
                       </object>
+                      <attributes>
+                        <attribute name="text">2</attribute>
+                      </attributes>
                     </child>
                   </object>
                 </child>
               </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkToolbar" id="list_toolbar">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="toolbar_style">icons</property>
+            <property name="show_arrow">False</property>
+            <property name="icon_size">1</property>
+            <property name="icon_size_set">True</property>
+            <child>
+              <object class="GtkToolButton" id="add">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="tooltip_text" translatable="yes">Add new filter</property>
+                <property name="use_action_appearance">False</property>
+                <property name="label" translatable="yes">_Add</property>
+                <property name="use_underline">True</property>
+                <property name="icon_name">list-add</property>
+                <signal name="clicked" handler="on_add_clicked" swapped="no"/>
+              </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
               </packing>
             </child>
             <child>
-              <object class="GtkToolbar" id="list_toolbar">
+              <object class="GtkToolButton" id="remove">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="toolbar_style">icons</property>
-                <property name="show_arrow">False</property>
-                <property name="icon_size">1</property>
-                <property name="icon_size_set">True</property>
-                <child>
-                  <object class="GtkToolButton" id="add">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Add new filter</property>
-                    <property name="use_action_appearance">False</property>
-                    <property name="label" translatable="yes">_Add</property>
-                    <property name="use_underline">True</property>
-                    <property name="icon_name">list-add</property>
-                    <signal name="clicked" handler="on_add_clicked" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkToolButton" id="remove">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Remove selected filter</property>
-                    <property name="use_action_appearance">False</property>
-                    <property name="label" translatable="yes">_Remove</property>
-                    <property name="use_underline">True</property>
-                    <property name="icon_name">list-remove</property>
-                    <signal name="clicked" handler="on_remove_clicked" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkSeparatorToolItem" id="up_down_sep">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkToolButton" id="move_up">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Move item up</property>
-                    <property name="use_action_appearance">False</property>
-                    <property name="label" translatable="yes">Move _Up</property>
-                    <property name="use_underline">True</property>
-                    <property name="icon_name">go-up</property>
-                    <signal name="clicked" handler="on_move_up_clicked" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkToolButton" id="move_down">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Move item down</property>
-                    <property name="use_action_appearance">False</property>
-                    <property name="label" translatable="yes">Move _Down</property>
-                    <property name="use_underline">True</property>
-                    <property name="icon_name">go-down</property>
-                    <signal name="clicked" handler="on_move_down_clicked" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
+                <property name="tooltip_text" translatable="yes">Remove selected filter</property>
+                <property name="use_action_appearance">False</property>
+                <property name="label" translatable="yes">_Remove</property>
+                <property name="use_underline">True</property>
+                <property name="icon_name">list-remove</property>
+                <signal name="clicked" handler="on_remove_clicked" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSeparatorToolItem" id="up_down_sep">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="move_up">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="tooltip_text" translatable="yes">Move item up</property>
+                <property name="use_action_appearance">False</property>
+                <property name="label" translatable="yes">Move _Up</property>
+                <property name="use_underline">True</property>
+                <property name="icon_name">go-up</property>
+                <signal name="clicked" handler="on_move_up_clicked" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="move_down">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="tooltip_text" translatable="yes">Move item down</property>
+                <property name="use_action_appearance">False</property>
+                <property name="label" translatable="yes">Move _Down</property>
+                <property name="use_underline">True</property>
+                <property name="icon_name">go-down</property>
+                <signal name="clicked" handler="on_move_down_clicked" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
               </packing>
             </child>
           </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
         </child>
       </object>
     </child>
diff --git a/meld/preferences.py b/meld/preferences.py
index d059040..f1f5732 100644
--- a/meld/preferences.py
+++ b/meld/preferences.py
@@ -32,7 +32,7 @@ class FilterList(ListWidget):
     def __init__(self, key, filter_type):
         default_entry = [_("label"), False, _("pattern"), True]
         ListWidget.__init__(self, "EditableList.ui",
-                            "list_alignment", ["EditableListStore"],
+                            "list_vbox", ["EditableListStore"],
                             "EditableList", default_entry)
         self.key = key
         self.filter_type = filter_type