Merge lp:~kkapp/lernid/bugfix-lp-530821 into lp:lernid

[Алексей Капранов (Alex Kapranoff)]

Add xchat-like thin red line above new data which arrived while window was in background.

[Алексей Капранов (Alex Kapranoff) (kkapp)]

I'd like people to test it a little.

Testing things which depend on focus in/out is somewhat non-trivial so I might miss something.

[Алексей Капранов (Alex Kapranoff) (kkapp)]

I tested it more during today's sessions of Opportunistic Week. Works like a charm.

[Michael Budde (mbudde)]

Looks good. Thanks.

review: Approve

=== modified file 'bin/lernid'
--- bin/lernid	2010-03-04 12:40:09 +0000
+++ bin/lernid	2010-03-05 00:48:19 +0000
@@ -68,8 +68,8 @@
 
     def __init__(self):
         """__init__ - This function is typically not called directly.
-        Creation a LernidWindow requires redeading the associated ui
-        file and parsing the ui definition extrenally,
+        Creation a LernidWindow requires rereading the associated ui
+        file and parsing the ui definition externally,
         and then calling LernidWindow.finish_initializing().
 
         Use the convenience function NewLernidWindow to create

=== modified file 'lernid/widgets/IrcWidget.py'
--- lernid/widgets/IrcWidget.py	2010-03-03 18:06:49 +0000
+++ lernid/widgets/IrcWidget.py	2010-03-05 00:48:19 +0000
@@ -19,7 +19,6 @@
 
 import gtk
 import gobject
-import gtkmozembed
 import pango
 import time
 import re
@@ -28,8 +27,6 @@
 from lernid.CouchDBPreferences import Preferences
 
 from lernid import IrcBackend
-from lernid.LernidOptions import Options
-from lernid.Statusbar import Statusbar
 
 class IrcWidget(Widget):
 
@@ -38,15 +35,24 @@
 
     def do_event_connect(self, event_man, event):
         self._browser = event_man.get_widget_by_name('browser')
+        self.get_toplevel().connect('focus-out-event', self._focus_out)
 
     def _init_hyperlinks(self):
         hyperlink_tag = self._buffer.create_tag('hyperlink', foreground='#0000ff',
                                                 underline=pango.UNDERLINE_SINGLE)
         self._buffer.connect('mark-set', self._mark_set, hyperlink_tag)
         self._textview.connect('motion-notify-event', self._motion_notify, hyperlink_tag)
+        self._textview.connect('expose-event', self._draw_red_line)
+
+        self._red_line_mark = self._buffer.create_mark(None, self._buffer.get_end_iter(), True)
+        self._visited_since_last_update = False
 
     def _append_to_buffer(self, text, sender=None, msgtype=None):
         iend = self._buffer.get_end_iter()
+        if self._visited_since_last_update and not self.get_toplevel().is_active():
+            self._buffer.move_mark(self._red_line_mark, iend)
+            self._textview.queue_draw()
+            self._visited_since_last_update = False
         if Preferences.get('show_irc_time'):
             self._buffer.insert(iend, '\n[{0}] '.format(time.strftime(_('%H:%M'))))
         else:
@@ -65,10 +71,12 @@
                 self._buffer.insert_with_tags_by_name(iend, text, 'highlight')
             else:
                 self._buffer.insert(iend, text)
+
         for url in re.finditer(r"https?://\S+", unicode(text, 'utf-8')):
             self._buffer.apply_tag_by_name('hyperlink',
                 self._buffer.get_iter_at_offset(start_pos + url.start()),
                 self._buffer.get_iter_at_offset(start_pos + url.end()))
+
         self._at_bottom = (self._adjust.value == self._adjust.upper -
                            self._adjust.page_size)
 
@@ -88,3 +96,18 @@
         else:
             text_view.get_window(gtk.TEXT_WINDOW_TEXT).set_cursor(self.regular_cursor)
         return False
+
+    def _focus_out(self, widget, event):
+        self._visited_since_last_update = True
+        return False
+
+    def _draw_red_line(self, widget, event):
+        if self._buffer.get_char_count() > 0:
+            iter = self._buffer.get_iter_at_mark(self._red_line_mark)
+            if (iter.get_offset() > 0):
+                top, h = self._textview.get_line_yrange(iter)
+                w_x, w_y = self._textview.buffer_to_window_coords(gtk.TEXT_WINDOW_TEXT, 0, top + h)
+                win = self._textview.get_window(gtk.TEXT_WINDOW_TEXT)
+                gc = gtk.gdk.GC(win)
+                gc.set_rgb_fg_color(gtk.gdk.Color('darkred'))
+                win.draw_line(gc, 0, w_y, (win.get_size())[0], w_y)