[meld] Use MsgAreas for file encoding error display



commit f825f01291f7dbac9686c3aec7c8d8c7f1c33384
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Aug 30 10:41:25 2009 +1000

    Use MsgAreas for file encoding error display

 meld/filediff.py |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/meld/filediff.py b/meld/filediff.py
index 6331ec0..03f61a2 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -613,12 +613,11 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
                         t.text = []
                     else:
                         print "codec error fallback", err
-                        t.buf.delete( t.buf.get_start_iter(), t.buf.get_end_iter() )
-                        misc.run_dialog(
-                            "%s\n\n%s" % (
-                                _("Could not read from '%s'") % t.filename,
-                                _("I tried encodings %s.") % try_codecs ),
-                            parent = self)
+                        t.buf.delete(*t.buf.get_bounds())
+                        add_dismissable_msg(t.pane, gtk.STOCK_DIALOG_ERROR,
+                                        _("Could not read file"),
+                                        _("%s is not in encodings: %s") %
+                                            (t.filename, try_codecs))
                         tasks.remove(t)
                 except IOError, ioerr:
                     misc.run_dialog(



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