[meld] preferences: Improve layout of text filter preferences pane



commit 1d5dd6be1e6965d8c32b87b35e94e7dcd3fd053d
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat May 24 09:59:05 2014 +1000

    preferences: Improve layout of text filter preferences pane

 data/ui/preferences.ui |   80 +++++++++++++++++++++++++++++++++++++++++++-----
 meld/preferences.py    |    2 +-
 2 files changed, 73 insertions(+), 9 deletions(-)
---
diff --git a/data/ui/preferences.ui b/data/ui/preferences.ui
index 2407ffc..9217d33 100644
--- a/data/ui/preferences.ui
+++ b/data/ui/preferences.ui
@@ -1226,22 +1226,86 @@
                 <property name="border_width">12</property>
                 <property name="spacing">12</property>
                 <child>
-                  <object class="GtkLabel" id="label86">
+                  <object class="GtkVBox" id="vbox9">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">When performing directory comparisons, you may 
filter out files and directories by name. Each pattern is a list of shell style wildcards separated by 
spaces.</property>
-                    <property name="wrap">True</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkLabel" id="label1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Filename filters</property>
+                        <property name="use_markup">True</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkHBox" id="hbox6">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkLabel" id="label2">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="xpad">12</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkVBox" id="file_filters_vbox">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="spacing">12</property>
+                            <child>
+                              <object class="GtkLabel" id="label86">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">When performing directory 
comparisons, you may filter out files and directories by name. Each pattern is a list of shell style 
wildcards separated by spaces.</property>
+                                <property name="wrap">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="fill">False</property>
+                    <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
-                <child>
-                  <placeholder/>
-                </child>
               </object>
               <packing>
                 <property name="position">3</property>
diff --git a/meld/preferences.py b/meld/preferences.py
index f1f5732..498ff09 100644
--- a/meld/preferences.py
+++ b/meld/preferences.py
@@ -220,7 +220,7 @@ class PreferencesDialog(Component):
         self.checkbutton_wrap_word.set_active(wrap_mode == Gtk.WrapMode.WORD)
 
         filefilter = FilterList("filename-filters", FilterEntry.SHELL)
-        self.file_filters_tab.pack_start(filefilter.widget, True, True, 0)
+        self.file_filters_vbox.pack_start(filefilter.widget, True, True, 0)
 
         textfilter = FilterList("text-filters", FilterEntry.REGEX)
         self.text_filters_tab.pack_start(textfilter.widget, True, True, 0)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]