Package: meld
Version: 1.8.4-1
Severity: normal
Tags: patch
Dear Maintainer,
Although meld code gives the possibility to hide files and dirs in the dirdiff
view, meld gui does not show this feature. So we can not hide items ourself.
The attached patch adds "Hide" to the menu, the toolbar and the popup.
Also, this bug seems to affect the 3.11.1 from experimental.
Thanks,
Anaël.
-- System Information:
Debian Release: jessie/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.14-1-amd64 (SMP w/8 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages meld depends on:
ii patch 2.7.1-5
ii python-glade2 2.24.0-3+b1
ii python-gobject-2 2.28.6-12+b1
ii python-gtk2 2.24.0-3+b1
pn python:any <none>
Versions of packages meld recommends:
ii python-gconf 2.28.1+dfsg-1
pn python-gnome2 <none>
pn python-gtksourceview2 <none>
pn yelp <none>
meld suggests no packages.
-- no debconf information
diff -Nru meld-1.8.4.orig/data/ui/dirdiff-ui.xml meld-1.8.4/data/ui/dirdiff-ui.xml
--- meld-1.8.4.orig/data/ui/dirdiff-ui.xml 2014-01-22 21:09:02.000000000 +0100
+++ meld-1.8.4/data/ui/dirdiff-ui.xml 2014-06-09 12:41:06.448380841 +0200
@@ -15,6 +15,7 @@
<menuitem action="DirCopyLeft" />
<menuitem action="DirCopyRight" />
<menuitem action="DirDelete" />
+ <menuitem action="Hide" />
<separator/>
<menuitem action="DirCompare" />
<menuitem action="OpenExternal" />
@@ -31,6 +32,7 @@
<toolitem action="DirCopyLeft" />
<toolitem action="DirCopyRight" />
<toolitem action="DirDelete" />
+ <toolitem action="Hide" />
</placeholder>
<placeholder name="FilterActions">
<toolitem action="ShowSame" />
@@ -48,6 +50,7 @@
<menuitem action="DirCopyLeft" />
<menuitem action="DirCopyRight" />
<menuitem action="DirDelete" />
+ <menuitem action="Hide" />
<separator/>
<menuitem action="OpenExternal" />
</popup>
diff -Nru meld-1.8.4.orig/meld/dirdiff.py meld-1.8.4/meld/dirdiff.py
--- meld-1.8.4.orig/meld/dirdiff.py 2014-01-22 21:09:02.000000000 +0100
+++ meld-1.8.4/meld/dirdiff.py 2014-06-09 14:22:04.970474207 +0200
@@ -298,7 +298,7 @@
self.on_text_filters_changed)]
for button in ("DirCompare", "DirCopyLeft", "DirCopyRight",
- "DirDelete", "ShowSame",
+ "DirDelete", "Hide", "ShowSame",
"ShowNew", "ShowModified", "CustomFilterMenu"):
self.actiongroup.get_action(button).props.is_important = True
self.map_widgets_into_lists(["treeview", "fileentry", "scrolledwindow",
