[meld] Only show identical comparison filter note if a filter is active



commit 7086a86ad7e597a65d01b0777861bf5963fcdeb1
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Jul 31 09:31:39 2011 +1000

    Only show identical comparison filter note if a filter is active

 meld/filediff.py |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/meld/filediff.py b/meld/filediff.py
index 526011a..089129d 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -1124,7 +1124,8 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
                 # are active, and may be altering the comparison. It would be
                 # better if we only showed this message if the filters *did*
                 # change the text in question.
-                if self.text_filters:
+                active_filters = any([f.active for f in self.text_filters])
+                if active_filters:
                     secondary_text = _("Text filters are being used, and may "
                                        "be masking differences between files. "
                                        "Would you like to compare the "
@@ -1140,7 +1141,7 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
                 if index == 0:
                     button.props.label = _("Hi_de")
 
-                if self.text_filters:
+                if active_filters:
                     msgarea.add_button(_("Show without filters"),
                                        gtk.RESPONSE_OK)
 



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