Skip to content

Commit 1d5dd6b

Browse files
kaiwkaiw
committed
preferences: Improve layout of text filter preferences pane
1 parent ebd989b commit 1d5dd6b

2 files changed

Lines changed: 73 additions & 9 deletions

File tree

‎data/ui/preferences.ui‎

Lines changed: 72 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1226,22 +1226,86 @@
12261226
<property name="border_width">12</property>
12271227
<property name="spacing">12</property>
12281228
<child>
1229-
<object class="GtkLabel" id="label86">
1229+
<object class="GtkVBox" id="vbox9">
12301230
<property name="visible">True</property>
12311231
<property name="can_focus">False</property>
1232-
<property name="xalign">0</property>
1233-
<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>
1234-
<property name="wrap">True</property>
1232+
<property name="spacing">6</property>
1233+
<child>
1234+
<object class="GtkLabel" id="label1">
1235+
<property name="visible">True</property>
1236+
<property name="can_focus">False</property>
1237+
<property name="xalign">0</property>
1238+
<property name="label" translatable="yes">Filename filters</property>
1239+
<property name="use_markup">True</property>
1240+
<attributes>
1241+
<attribute name="weight" value="bold"/>
1242+
</attributes>
1243+
</object>
1244+
<packing>
1245+
<property name="expand">False</property>
1246+
<property name="fill">False</property>
1247+
<property name="position">0</property>
1248+
</packing>
1249+
</child>
1250+
<child>
1251+
<object class="GtkHBox" id="hbox6">
1252+
<property name="visible">True</property>
1253+
<property name="can_focus">False</property>
1254+
<child>
1255+
<object class="GtkLabel" id="label2">
1256+
<property name="visible">True</property>
1257+
<property name="can_focus">False</property>
1258+
<property name="xpad">12</property>
1259+
</object>
1260+
<packing>
1261+
<property name="expand">False</property>
1262+
<property name="fill">False</property>
1263+
<property name="position">0</property>
1264+
</packing>
1265+
</child>
1266+
<child>
1267+
<object class="GtkVBox" id="file_filters_vbox">
1268+
<property name="visible">True</property>
1269+
<property name="can_focus">False</property>
1270+
<property name="spacing">12</property>
1271+
<child>
1272+
<object class="GtkLabel" id="label86">
1273+
<property name="visible">True</property>
1274+
<property name="can_focus">False</property>
1275+
<property name="xalign">0</property>
1276+
<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>
1277+
<property name="wrap">True</property>
1278+
</object>
1279+
<packing>
1280+
<property name="expand">False</property>
1281+
<property name="fill">False</property>
1282+
<property name="position">0</property>
1283+
</packing>
1284+
</child>
1285+
<child>
1286+
<placeholder/>
1287+
</child>
1288+
</object>
1289+
<packing>
1290+
<property name="expand">False</property>
1291+
<property name="fill">True</property>
1292+
<property name="position">1</property>
1293+
</packing>
1294+
</child>
1295+
</object>
1296+
<packing>
1297+
<property name="expand">False</property>
1298+
<property name="fill">True</property>
1299+
<property name="position">1</property>
1300+
</packing>
1301+
</child>
12351302
</object>
12361303
<packing>
12371304
<property name="expand">False</property>
1238-
<property name="fill">False</property>
1305+
<property name="fill">True</property>
12391306
<property name="position">0</property>
12401307
</packing>
12411308
</child>
1242-
<child>
1243-
<placeholder/>
1244-
</child>
12451309
</object>
12461310
<packing>
12471311
<property name="position">3</property>

‎meld/preferences.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ def __init__(self, parent):
220220
self.checkbutton_wrap_word.set_active(wrap_mode == Gtk.WrapMode.WORD)
221221

222222
filefilter = FilterList("filename-filters", FilterEntry.SHELL)
223-
self.file_filters_tab.pack_start(filefilter.widget, True, True, 0)
223+
self.file_filters_vbox.pack_start(filefilter.widget, True, True, 0)
224224

225225
textfilter = FilterList("text-filters", FilterEntry.REGEX)
226226
self.text_filters_tab.pack_start(textfilter.widget, True, True, 0)

0 commit comments

Comments
 (0)