Skip to content

Commit 002647f

Browse files
kaiwkaiw
committed
preferences: Repack text filter preferences, and clarify trimming pref
1 parent 1d5dd6b commit 002647f

2 files changed

Lines changed: 136 additions & 19 deletions

File tree

‎data/ui/preferences.ui‎

Lines changed: 135 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1330,50 +1330,167 @@
13301330
<property name="border_width">12</property>
13311331
<property name="spacing">12</property>
13321332
<child>
1333-
<object class="GtkLabel" id="label87">
1333+
<object class="GtkVBox" id="vbox12">
13341334
<property name="visible">True</property>
13351335
<property name="can_focus">False</property>
1336-
<property name="xalign">0</property>
1337-
<property name="label" translatable="yes">When performing file comparisons, you may ignore certain types of changes. Each pattern here is a python regular expression which replaces matching text with the empty string before comparison is performed. If the expression contains groups, only the groups are replaced. See the user manual for more details.</property>
1338-
<property name="use_markup">True</property>
1339-
<property name="wrap">True</property>
1336+
<property name="spacing">6</property>
1337+
<child>
1338+
<object class="GtkLabel" id="label14">
1339+
<property name="visible">True</property>
1340+
<property name="can_focus">False</property>
1341+
<property name="xalign">0</property>
1342+
<property name="label" translatable="yes">Change trimming</property>
1343+
<property name="use_markup">True</property>
1344+
<attributes>
1345+
<attribute name="weight" value="bold"/>
1346+
</attributes>
1347+
</object>
1348+
<packing>
1349+
<property name="expand">False</property>
1350+
<property name="fill">False</property>
1351+
<property name="position">0</property>
1352+
</packing>
1353+
</child>
1354+
<child>
1355+
<object class="GtkHBox" id="hbox10">
1356+
<property name="visible">True</property>
1357+
<property name="can_focus">False</property>
1358+
<child>
1359+
<object class="GtkLabel" id="label15">
1360+
<property name="visible">True</property>
1361+
<property name="can_focus">False</property>
1362+
<property name="xpad">12</property>
1363+
</object>
1364+
<packing>
1365+
<property name="expand">False</property>
1366+
<property name="fill">False</property>
1367+
<property name="position">0</property>
1368+
</packing>
1369+
</child>
1370+
<child>
1371+
<object class="GtkVBox" id="change_trimming_vbox">
1372+
<property name="visible">True</property>
1373+
<property name="can_focus">False</property>
1374+
<property name="spacing">12</property>
1375+
<child>
1376+
<object class="GtkCheckButton" id="checkbutton_ignore_blank_lines">
1377+
<property name="label" translatable="yes">Trim blank line differences from the start and end of changes</property>
1378+
<property name="visible">True</property>
1379+
<property name="can_focus">True</property>
1380+
<property name="receives_default">False</property>
1381+
<property name="use_underline">True</property>
1382+
<property name="xalign">0</property>
1383+
<property name="draw_indicator">True</property>
1384+
</object>
1385+
<packing>
1386+
<property name="expand">False</property>
1387+
<property name="fill">False</property>
1388+
<property name="position">0</property>
1389+
</packing>
1390+
</child>
1391+
</object>
1392+
<packing>
1393+
<property name="expand">False</property>
1394+
<property name="fill">True</property>
1395+
<property name="position">1</property>
1396+
</packing>
1397+
</child>
1398+
</object>
1399+
<packing>
1400+
<property name="expand">False</property>
1401+
<property name="fill">True</property>
1402+
<property name="position">1</property>
1403+
</packing>
1404+
</child>
13401405
</object>
13411406
<packing>
13421407
<property name="expand">False</property>
1343-
<property name="fill">False</property>
1408+
<property name="fill">True</property>
13441409
<property name="position">0</property>
13451410
</packing>
13461411
</child>
13471412
<child>
1348-
<object class="GtkHBox" id="hbox39">
1413+
<object class="GtkVBox" id="vbox11">
13491414
<property name="visible">True</property>
13501415
<property name="can_focus">False</property>
1416+
<property name="spacing">6</property>
13511417
<child>
1352-
<object class="GtkCheckButton" id="checkbutton_ignore_blank_lines">
1353-
<property name="label" translatable="yes">Ignore changes which insert or delete blank lines</property>
1418+
<object class="GtkLabel" id="label12">
13541419
<property name="visible">True</property>
1355-
<property name="can_focus">True</property>
1356-
<property name="receives_default">False</property>
1357-
<property name="use_underline">True</property>
1358-
<property name="xalign">0.5</property>
1359-
<property name="draw_indicator">True</property>
1420+
<property name="can_focus">False</property>
1421+
<property name="xalign">0</property>
1422+
<property name="label" translatable="yes">Text filters</property>
1423+
<property name="use_markup">True</property>
1424+
<attributes>
1425+
<attribute name="weight" value="bold"/>
1426+
</attributes>
13601427
</object>
13611428
<packing>
13621429
<property name="expand">False</property>
13631430
<property name="fill">False</property>
13641431
<property name="position">0</property>
13651432
</packing>
13661433
</child>
1434+
<child>
1435+
<object class="GtkHBox" id="hbox9">
1436+
<property name="visible">True</property>
1437+
<property name="can_focus">False</property>
1438+
<child>
1439+
<object class="GtkLabel" id="label13">
1440+
<property name="visible">True</property>
1441+
<property name="can_focus">False</property>
1442+
<property name="xpad">12</property>
1443+
</object>
1444+
<packing>
1445+
<property name="expand">True</property>
1446+
<property name="fill">True</property>
1447+
<property name="position">0</property>
1448+
</packing>
1449+
</child>
1450+
<child>
1451+
<object class="GtkVBox" id="text_filters_vbox">
1452+
<property name="visible">True</property>
1453+
<property name="can_focus">False</property>
1454+
<property name="spacing">12</property>
1455+
<child>
1456+
<object class="GtkLabel" id="label87">
1457+
<property name="visible">True</property>
1458+
<property name="can_focus">False</property>
1459+
<property name="xalign">0</property>
1460+
<property name="label" translatable="yes">When performing file comparisons, you may ignore certain types of changes. Each pattern here is a python regular expression which replaces matching text with the empty string before comparison is performed. If the expression contains groups, only the groups are replaced. See the user manual for more details.</property>
1461+
<property name="use_markup">True</property>
1462+
<property name="wrap">True</property>
1463+
</object>
1464+
<packing>
1465+
<property name="expand">False</property>
1466+
<property name="fill">False</property>
1467+
<property name="position">0</property>
1468+
</packing>
1469+
</child>
1470+
<child>
1471+
<placeholder/>
1472+
</child>
1473+
</object>
1474+
<packing>
1475+
<property name="expand">False</property>
1476+
<property name="fill">True</property>
1477+
<property name="position">1</property>
1478+
</packing>
1479+
</child>
1480+
</object>
1481+
<packing>
1482+
<property name="expand">False</property>
1483+
<property name="fill">True</property>
1484+
<property name="position">1</property>
1485+
</packing>
1486+
</child>
13671487
</object>
13681488
<packing>
13691489
<property name="expand">False</property>
1370-
<property name="fill">False</property>
1490+
<property name="fill">True</property>
13711491
<property name="position">1</property>
13721492
</packing>
13731493
</child>
1374-
<child>
1375-
<placeholder/>
1376-
</child>
13771494
</object>
13781495
<packing>
13791496
<property name="position">4</property>

‎meld/preferences.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ def __init__(self, parent):
223223
self.file_filters_vbox.pack_start(filefilter.widget, True, True, 0)
224224

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

228228
columnlist = ColumnList("folder-columns")
229229
self.column_list_vbox.pack_start(columnlist.widget, True, True, 0)

0 commit comments

Comments
 (0)