Merge lp:~hid-iwata/qbzr/textedit-guidebar into lp:qbzr

[IWATA Hidetaka]

Add change-marker bar to qdiff, qannotate, qshelve and qunshelve.

[qdiff] Show positions of added, removed or modified lines.
http://dl.dropbox.com/u/16802579/guidebar-qdiff.png

[qannotate] Show positions of lines changed by selected revisions.
http://dl.dropbox.com/u/16802579/guidebar-qannotate.png

[ALL] Additionally, when searching words, show positions of matched words.
http://dl.dropbox.com/u/16802579/guidebar-qdiff-search.png

[Alexander Belchenko (bialix)]

IWATA Hidetaka пишет:
> IWATA Hidetaka has proposed merging lp:~hid-iwata/qbzr/textedit-guidebar into lp:qbzr.
>
> Requested reviews:
> QBzr Developers (qbzr-dev)
> Related bugs:
> Bug #827251 in QBzr: ""Complete" diff display could show change markers in the scroll bar"
> https://bugs.launchpad.net/qbzr/+bug/827251
>
> For more details, see:
> https://code.launchpad.net/~hid-iwata/qbzr/textedit-guidebar/+merge/91126
>
> Add change-marker bar to qdiff, qannotate, qshelve and qunshelve.
>
> [qdiff] Show positions of added, removed or modified lines.
> http://dl.dropbox.com/u/16802579/guidebar-qdiff.png
>
> [qannotate] Show positions of lines changed by selected revisions.
> http://dl.dropbox.com/u/16802579/guidebar-qannotate.png
>
> [ALL] Additionally, when searching words, show positions of matched words.
> http://dl.dropbox.com/u/16802579/guidebar-qdiff-search.png

\o/

that's so cool. thank you!

--
All the dude wanted was his rug back

[Martin Packman (gz)]

This looks really neat. I wonder if you could find a way to add some test coverage here? I've found it's not actually as hard to do in pyqt as it sometimes seems.

[Alexander Belchenko (bialix)]

Martin Packman пишет:
> This looks really neat. I wonder if you could find a way to add some test coverage here? I've found it's not actually as hard to do in pyqt as it sometimes seems.

I agree with Martin. Hidetaka, if you can, please add some tests for new
features. In the mean time I'll merge it in the current state to start
testing it now.

Thanks again!

--
All the dude wanted was his rug back

[lp:~hid-iwata/qbzr/textedit-guidebar]

1458. By IWATA Hidetaka on 2012-02-02

Render small marks more exactly.

1459. By IWATA Hidetaka on 2012-02-02

Fix : Guide bar of qunshelve does not show matched word positions

[IWATA Hidetaka (hid-iwata)]

OK, I'll write some test.

Now, I've pushed some revisions, please remerge them.
 * Fix: guide bar of qunshelve does not show search highlight positions.
 * Improve accuracy of 1-dot-height mark positions.

[Alexander Belchenko (bialix)]

IWATA Hidetaka пишет:
> OK, I'll write some test.
>
> Now, I've pushed some revisions, please remerge them.
> * Fix: guide bar of qunshelve does not show search highlight positions.
> * Improve accuracy of 1-dot-height mark positions.

Hidetaka, I'm sure you have write permissions not only because you're in
~qbzr-dev group, but also because you're so good contributor. Please,
land it if you think it has important improvements.
Thanks!

--
All the dude wanted was his rug back

=== modified file 'NEWS.txt'
--- NEWS.txt	2012-01-30 15:46:28 +0000
+++ NEWS.txt	2012-02-01 16:39:02 +0000
@@ -8,6 +8,9 @@
  * qannotate:
    * Vertically center the target line when using "Goto Line" in qannotate.
      (Benoît Pierre)
+   * Show change markers side of annotate view.
+     It represents where lines changed by selected revisions are.
+     (IWATA Hidetaka)
  * qbrowse:
    * Does not crash anymore when called for shared repository.
      (André Bachmann, Alexander Belchenko, Bug #578935)
@@ -28,6 +31,7 @@
      (Alexander Belchenko, Bug #814117)
    * Implement search highlight. This change affects to qdiff, qshelve, 
       qunshelve, qannotate. (IWATA Hidetaka, Bug #785565)
+   * Show change markers side of diff views. (IWATA Hidetaka Bug #827251)
  * qgetnew
    * Base directories for the source branch and the destination checkout folder
      can now be configured in qconfig, tab 'User Interface'. (André Bachmann)

=== modified file 'lib/annotate.py'
--- lib/annotate.py	2012-01-24 20:34:19 +0000
+++ lib/annotate.py	2012-02-01 16:39:02 +0000
@@ -23,6 +23,7 @@
 #  - better annotate algorithm on packs
 
 import sys, time
+from itertools import groupby
 from PyQt4 import QtCore, QtGui
 
 from bzrlib.revision import CURRENT_REVISION
@@ -41,6 +42,9 @@
     runs_in_loading_queue,
     )
 from bzrlib.plugins.qbzr.lib.widgets.toolbars import FindToolbar
+from bzrlib.plugins.qbzr.lib.widgets.texteditaccessory import (
+    GuideBarPanel, setup_guidebar_for_find
+)
 from bzrlib.plugins.qbzr.lib.uifactory import ui_current_widget
 from bzrlib.plugins.qbzr.lib.trace import reports_exception
 from bzrlib.plugins.qbzr.lib.logwidget import LogList
@@ -70,7 +74,8 @@
         self.get_revno = get_revno
         self.annotate = None
         self.rev_colors = {}
-        self.highlight_revids = set()
+        self._highlight_revids = set()
+        self.highlight_lines = []
         
         self.splitter = None
         self.adjustWidth(1, 999)
@@ -80,6 +85,31 @@
             self.edit_cursorPositionChanged)
         self.show_current_line = False
 
+    def get_highlight_revids(self):
+        return self._highlight_revids
+
+    def set_highlight_revids(self, value):
+        if self._highlight_revids == value:
+            return
+
+        self._highlight_revids = value
+        self.update_highlight_lines()
+
+    def update_highlight_lines(self):
+        self.highlight_lines = []
+        if not self.annotate:
+            return
+        lines = [i for i, (revno, istop) in enumerate(self.annotate)
+                 if revno in self._highlight_revids]
+
+        # Convert [0,1,2,5,6,9,14,15,16,17] to [(0,3),(5,2),(9,1),(14,4)]
+        def summarize(lines):
+            for k, g in groupby(enumerate(lines), key=lambda x:x[1]-x[0]):
+                yield [line for i, line in g]
+        self.highlight_lines = [(x[0], len(x)) for x in summarize(lines)]
+
+    highlight_revids = property(get_highlight_revids, set_highlight_revids)
+
     def edit_cursorPositionChanged(self):
         self.show_current_line = True
 
@@ -138,7 +168,7 @@
         if self.annotate and line_number-1 < len(self.annotate):
             revid, is_top = self.annotate[line_number - 1]
             if is_top:
-                if revid in self.highlight_revids:
+                if revid in self._highlight_revids:
                     font = painter.font()
                     font.setBold(True)
                     painter.setFont(font)
@@ -271,11 +301,13 @@
         self.text_edit.setLineWrapMode(QtGui.QPlainTextEdit.NoWrap)
         
         self.text_edit.document().setDefaultFont(get_monospace_font())
-        
+
+        self.guidebar_panel = GuideBarPanel(self.text_edit, parent=self)
+        self.guidebar_panel.add_entry('annotate', QtGui.QColor(255, 160, 180))
         self.annotate_bar = AnnotateBar(self.text_edit, self, self.get_revno)
         annotate_spliter = QtGui.QSplitter(QtCore.Qt.Horizontal, self)
         annotate_spliter.addWidget(self.annotate_bar)
-        annotate_spliter.addWidget(self.text_edit)
+        annotate_spliter.addWidget(self.guidebar_panel)
         self.annotate_bar.splitter = annotate_spliter
         self.text_edit_frame.hbox.addWidget(annotate_spliter)
         
@@ -284,7 +316,10 @@
                      self.edit_cursorPositionChanged)        
         self.connect(self.annotate_bar,
                      QtCore.SIGNAL("cursorPositionChanged()"),
-                     self.edit_cursorPositionChanged)        
+                     self.edit_cursorPositionChanged)
+        self.connect(self.text_edit,
+                     QtCore.SIGNAL("documentChangeFinished()"),
+                     self.edit_documentChangeFinished)
         
         self.log_list = AnnotateLogList(self.processEvents, self.throbber, self)
         self.log_list.header().hideSection(logmodel.COL_DATE)
@@ -372,6 +407,7 @@
         self.connect(self.show_find,
                      QtCore.SIGNAL("toggled (bool)"),
                      self.show_find_toggle)
+        setup_guidebar_for_find(self.guidebar_panel, self.find_toolbar, index=1)
         
         self.goto_line_toolbar = GotoLineToolbar(self, self.show_goto_line)
         self.goto_line_toolbar.hide()
@@ -584,6 +620,10 @@
         if self.text_edit.annotate:
             rev_id, is_top = self.text_edit.annotate[current_line]
             self.log_list.select_revid(rev_id)
+            
+    def edit_documentChangeFinished(self):
+        self.annotate_bar.update_highlight_lines()
+        self.guidebar_panel.update_data(annotate=self.annotate_bar.highlight_lines)
 
     @runs_in_loading_queue
     def set_annotate_revision(self):
@@ -623,6 +663,7 @@
     def log_list_selectionChanged(self, selected, deselected):
         revids = self.log_list.get_selection_and_merged_revids()
         self.annotate_bar.highlight_revids = revids
+        self.guidebar_panel.update_data(annotate=self.annotate_bar.highlight_lines)
         self.annotate_bar.update()
     
     def show_find_toggle(self, state):

=== modified file 'lib/diffview.py'
--- lib/diffview.py	2011-09-20 18:33:50 +0000
+++ lib/diffview.py	2012-02-01 16:39:02 +0000
@@ -35,6 +35,9 @@
     CachedTTypeFormater,
     split_tokens_at_lines,
     )
+from bzrlib.plugins.qbzr.lib.widgets.texteditaccessory import (
+    GuideBarPanel,    GBAR_LEFT,  GBAR_RIGHT
+)
 
 have_pygments = True
 try:
@@ -378,6 +381,12 @@
         self.adjust_range()
 
 
+
+def setup_guidebar_entries(gb):
+    gb.add_entry('title', QtGui.QColor(80, 80, 80), -1)
+    for tag in ('delete', 'insert', 'replace'):
+        gb.add_entry(tag, colors[tag][0], 0)
+
 class _SidebySideDiffView(QtGui.QSplitter):
     """Widget to show differences in side-by-side format."""
 
@@ -413,19 +422,30 @@
                      QtGui.QTextDocument())
         self.browsers = (DiffSourceView(self),
                          DiffSourceView(self))
+
+        self.guidebar_panels = [
+            GuideBarPanel(b, align=a)
+            for (b, a) in zip(self.browsers, (GBAR_LEFT, GBAR_RIGHT))
+        ]
+        for g in self.guidebar_panels:
+            setup_guidebar_entries(g.bar)
+
+        self.reset_guidebar_data()
+
         for b in self.browsers:
             b.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
 
         self.cursors = [QtGui.QTextCursor(doc) for doc in self.docs]
         
-        for i, (browser, doc, cursor) in enumerate(zip(self.browsers, self.docs, self.cursors)):
+        for i, (panel, doc, cursor) in enumerate(zip(self.guidebar_panels,
+                                                     self.docs, self.cursors)):
             doc.setUndoRedoEnabled(False)
             doc.setDefaultFont(self.monospacedFont)
             
+            panel.edit.setDocument(doc)
+            self.addWidget(panel)
             self.setCollapsible(i, False)
-            browser.setDocument(doc)
-            self.addWidget(browser)
-            
+
             format = QtGui.QTextCharFormat()
             format.setAnchorNames(["top"])
             cursor.insertText("", format)
@@ -452,7 +472,13 @@
     def setTabStopWidths(self, pixels):
         for (pixel_width, browser) in zip(pixels, self.browsers):
             browser.setTabStopWidth(pixel_width)
-    
+
+    def reset_guidebar_data(self):
+        self.guidebar_data = [
+            dict(title=[], delete=[], insert=[], replace=[]), # for left view
+            dict(title=[], delete=[], insert=[], replace=[]), # for right view
+        ]
+
     def clear(self):
         self.browsers[0].clear()
         self.browsers[1].clear()
@@ -460,6 +486,7 @@
         self.scrollbar.clear()
         for doc in self.docs:
             doc.clear()
+        self.reset_guidebar_data()
         self.update()
 
     def set_complete(self, complete):
@@ -471,8 +498,12 @@
     def append_diff(self, paths, file_id, kind, status, dates,
                     present, binary, lines, groups, data, properties_changed):
         cursors = self.cursors
+
+        guidebar_data = self.guidebar_data
+
         for i in range(2):
             cursor = cursors[i]
+            guidebar_data[i]['title'].append((cursor.block().blockNumber(), 2))
             cursor.beginEditBlock()
             cursor.insertText(paths[i] or " ", self.titleFormat)    # None or " " => " "
             cursor.insertBlock()
@@ -633,6 +664,7 @@
                         insertIxs(ixs)
                     else:
                         y_top = [cursor.block().layout() for cursor in self.cursors]
+                        g_top = [cursor.block().blockNumber() for cursor in self.cursors]
                         if tag == "replace":
                             insertIxsWithChangesHighlighted(ixs)
                         else:
@@ -640,7 +672,11 @@
                         linediff += n[0] - n[1]
                         y_bot = [cursor.block().layout() for cursor in self.cursors]
                         changes.append((y_top[0], y_bot[0], y_top[1], y_bot[1], tag))
-                
+
+                        g_bot = [cursor.block().blockNumber() for cursor in self.cursors]
+                        for data, top, bot in zip(guidebar_data, g_top, g_bot):
+                            data[tag].append((top, bot - top))
+
                 if linediff == 0:
                     continue
                 if not self.complete:
@@ -728,6 +764,8 @@
             or self.browsers[1].horizontalScrollBar().isVisible()):
             self.browsers[0].setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn)
             self.browsers[1].setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn)
+
+        self.update_guidebar()
         self.update()
     
     def rewind(self):
@@ -761,8 +799,26 @@
     def createHandle(self):
         return DiffViewHandle(self)
 
-
-class SimpleDiffView(QtGui.QTextBrowser):
+    def update_guidebar(self):
+        for gb, data in zip(self.guidebar_panels, self.guidebar_data):
+            gb.bar.update_data(**data)
+
+class SimpleDiffView(GuideBarPanel):
+    def __init__(self, parent):
+        self.view = _SimpleDiffView(parent)
+        GuideBarPanel.__init__(self, self.view, parent=parent)
+        setup_guidebar_entries(self)
+
+    def append_diff(self, *args, **kwargs):
+        self.view.append_diff(*args, **kwargs)
+        self.update_data(**self.view.guidebar_data)
+
+    def __getattr__(self, name):
+        """Delegate unknown methods to internal diffview."""
+        return getattr(self.view, name)
+
+
+class _SimpleDiffView(QtGui.QTextBrowser):
     """Widget to show differences in unidiff format."""
 
     def __init__(self, parent=None):
@@ -807,6 +863,8 @@
         self.monospacedHunkFormat.setFont(monospacedItalicFont)
         self.monospacedHunkFormat.setForeground(QtGui.QColor(153, 30, 199))
 
+        self.reset_guidebar_data()
+
     def rewind(self):
         if not self.rewinded:
             self.rewinded = True
@@ -817,6 +875,8 @@
 
     def append_diff(self, paths, file_id, kind, status, dates,
                     present, binary, lines, groups, data, properties_changed):
+        guidebar_data = self.guidebar_data
+        guidebar_data['title'].append((self.cursor.block().blockNumber(), 2))
         self.cursor.beginEditBlock()
         path_info = paths[1] or paths[0]
         if status in ('renamed', 'renamed and modified'):
@@ -878,13 +938,24 @@
                         text = "".join(" " + l for l in a[i0:i1])
                         self.cursor.insertText(text, self.monospacedFormat)
                     else:
+                        start = self.cursor.block().blockNumber()
                         text = "".join("-" + l for l in a[i0:i1])
                         self.cursor.insertText(text, self.monospacedDeleteFormat)
                         text = "".join("+" + l for l in b[j0:j1])
                         self.cursor.insertText(text, self.monospacedInsertFormat)
+                        end = self.cursor.block().blockNumber()
+                        guidebar_data[tag].append((start, end - start))
         else:
             self.cursor.insertText("Binary files %s %s and %s %s differ\n" % \
                                    (paths[0], dates[0], paths[1], dates[1]))
         self.cursor.insertText("\n")
         self.cursor.endEditBlock()
         self.update()
+
+    def clear(self):
+        QtGui.QTextBrowser.clear(self)
+        self.reset_guidebar_data()
+
+    def reset_guidebar_data(self):
+        self.guidebar_data = dict(title=[], delete=[], insert=[], replace=[])
+

=== modified file 'lib/diffwindow.py'
--- lib/diffwindow.py	2012-01-24 20:34:19 +0000
+++ lib/diffwindow.py	2012-02-01 16:39:02 +0000
@@ -66,6 +66,7 @@
 from bzrlib.plugins.qbzr.lib.trace import reports_exception
 from bzrlib.plugins.qbzr.lib.encoding_selector import EncodingMenuSelector
 from bzrlib.plugins.qbzr.lib.widgets.tab_width_selector import TabWidthMenuSelector
+from bzrlib.plugins.qbzr.lib.widgets.texteditaccessory import setup_guidebar_for_find
 
 
 
@@ -158,6 +159,9 @@
                 self.show_find)
         self.find_toolbar.hide()
         self.addToolBar(self.find_toolbar)
+        setup_guidebar_for_find(self.sdiffview, self.find_toolbar, 1)
+        for gb in self.diffview.guidebar_panels:
+            setup_guidebar_for_find(gb, self.find_toolbar, 1)
 
     def connect_later(self, *args, **kwargs):
         """Schedules a signal to be connected after loading CLI arguments.
@@ -487,7 +491,7 @@
     def click_toggle_view_mode(self, checked):
         if checked:
             view = self.sdiffview
-            self.find_toolbar.set_text_edits([view])
+            self.find_toolbar.set_text_edits([view.view])
             self.tab_width_selector_left.menuAction().setVisible(False)
             self.tab_width_selector_right.menuAction().setVisible(False)
             self.tab_width_selector_unidiff.menuAction().setVisible(True)

=== modified file 'lib/widgets/shelve.py'
--- lib/widgets/shelve.py	2011-12-28 06:35:12 +0000
+++ lib/widgets/shelve.py	2012-02-01 16:39:02 +0000
@@ -37,6 +37,9 @@
     FindToolbar, ToolbarPanel, LayoutSelector
     )
 from bzrlib.plugins.qbzr.lib.widgets.tab_width_selector import TabWidthMenuSelector
+from bzrlib.plugins.qbzr.lib.widgets.texteditaccessory import (
+    GuideBar, setup_guidebar_for_find
+    )
 from bzrlib.plugins.qbzr.lib.decorators import lazy_call
 from bzrlib import errors
 from bzrlib.plugins.qbzr.lib.uifactory import ui_current_widget
@@ -329,6 +332,8 @@
         hunk_panel.add_widget(self.hunk_view)
         find_toolbar.hide()
 
+        setup_guidebar_for_find(self.hunk_view.guidebar, find_toolbar, index=1)
+
         layout = QtGui.QVBoxLayout()
         layout.setMargin(10)
         layout.addWidget(self.splitter)
@@ -778,10 +783,13 @@
         layout.setSpacing(0)
         layout.setMargin(0)
         self.browser = HunkTextBrowser(complete, self)
+        self.guidebar = GuideBar(self.browser, parent=self)
+        self.guidebar.add_entry('hunk', self.browser.focus_color)
         self.selector = HunkSelector(self.browser, self)
         layout.addWidget(self.selector)
         layout.addWidget(self.browser)
-        self.connect(self.browser, QtCore.SIGNAL("focusedHunkChanged()"), 
+        layout.addWidget(self.guidebar)
+        self.connect(self.browser, QtCore.SIGNAL("focusedHunkChanged()"),
                      self.update)
 
         def selected_hunk_changed():
@@ -814,6 +822,7 @@
         self.change = change
         self.encoding = encoding
         self.browser.set_parsed_patch(change, encoding)
+        self.guidebar.update_data(hunk=self.browser.guidebar_deta)
         self.update()
 
     def update(self):
@@ -930,6 +939,7 @@
 
         self.complete = complete
         self._focused_index = -1
+        self.guidebar_deta = []
 
     def rewind(self):
         if not self.rewinded:
@@ -972,9 +982,11 @@
                     cursor.insertText(lines, self.monospacedInactiveFormat)
                 start = hunk.mod_pos + hunk.mod_range - 1
                 y1 = cursor.block().layout().position().y()
+                l1 = cursor.block().blockNumber()
                 print_hunk(hunk, hunk_texts)
                 y2 = cursor.block().layout().position().y()
-
+                l2 = cursor.block().blockNumber()
+                self.guidebar_deta.append((l1, l2 - l1))
             else:
                 y1 = cursor.block().layout().position().y()
                 cursor.insertText(str(hunk.get_header()), self.monospacedHunkFormat)
@@ -1003,6 +1015,7 @@
         QtGui.QTextBrowser.clear(self)
         del(self.hunk_list[:])
         self._set_focused_hunk(-1)
+        self.guidebar_deta = []
         self.emit(QtCore.SIGNAL("documentChangeFinished()"))
 
     def paintEvent(self, event):

=== modified file 'lib/widgets/shelvelist.py'
--- lib/widgets/shelvelist.py	2012-01-30 00:25:46 +0000
+++ lib/widgets/shelvelist.py	2012-02-01 16:39:02 +0000
@@ -456,7 +456,7 @@
         if index == 0:
             self.find_toolbar.set_text_edits(self.diffviews[0].browsers)
         else:
-            self.find_toolbar.set_text_edits([self.diffviews[1]])
+            self.find_toolbar.set_text_edits([self.diffviews[1].view])
         self.stack.setCurrentIndex(index)
 
     def complete_toggled(self, state):

=== added file 'lib/widgets/texteditaccessory.py'
--- lib/widgets/texteditaccessory.py	1970-01-01 00:00:00 +0000
+++ lib/widgets/texteditaccessory.py	2012-02-01 16:39:02 +0000
@@ -0,0 +1,294 @@
+# -*- coding: utf-8 -*-
+#
+# QBzr - Qt frontend to Bazaar commands
+# Copyright (C) 2011 QBzr Developers
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+from PyQt4 import QtCore, QtGui
+
+GBAR_LEFT  = 1
+GBAR_RIGHT = 2
+
+class _Entry(object):
+    """
+    Represent each group of guide bar.
+
+    :key:   string key to identify this group
+    :color: color or marker
+    :data:  marker positions, list of tuple (block index, num of blocks)
+    :index: index of the column to render this entry.
+            * Two or more groups can be rendered on same columns.
+            * If index == -1, the group is renderd on all columns.
+    """
+    __slots__ = ['key', 'color', 'data', 'index']
+    def __init__(self, key, color, index=0):
+        self.key = key
+        self.color = color
+        self.data = []
+        self.index = index
+
+class PlainTextEditHelper(QtCore.QObject):
+    """
+    Helper class to encapsulate gap between QPlainTextEdit and QTextEdit
+    """
+    def __init__(self, edit):
+        QtCore.QObject.__init__(self)
+        if not isinstance(edit, QtGui.QPlainTextEdit):
+            raise ValueError('edit must be QPlainTextEdit')
+        self.edit = edit
+
+        self.connect(edit, QtCore.SIGNAL("updateRequest(const QRect&, int)"),
+                     self.onUpdateRequest)
+
+    def onUpdateRequest(self, rect, dy):
+        self.emit(QtCore.SIGNAL("updateRequest()"))
+
+    def center_block(self, block):
+        """
+        scroll textarea as specified block locates to center
+
+        NOTE: This code is based on Qt source code (qplaintextedit.cpp)
+        """
+        edit = self.edit
+        height = edit.viewport().rect().height() / 2
+        h = self.edit.blockBoundingRect(block).center().y()
+        def iter_visible_block_backward(b):
+            while True:
+                b = b.previous()
+                if not b.isValid(): return
+                if b.isVisible():   yield b
+        for block in iter_visible_block_backward(block):
+            h += edit.blockBoundingRect(block).height()
+            if height < h:
+                break
+        edit.verticalScrollBar().setValue(block.firstLineNumber())
+
+class TextEditHelper(QtCore.QObject):
+    """
+    Helper class to encapsulate gap between QPlainTextEdit and QTextEdit
+    """
+    def __init__(self, edit):
+        QtCore.QObject.__init__(self)
+        if not isinstance(edit, QtGui.QTextEdit):
+            raise ValueError('edit must be QTextEdit')
+        self.edit = edit
+
+        self.connect(edit.verticalScrollBar(), QtCore.SIGNAL("valueChanged(int)"),
+                     self.onVerticalScroll)
+
+    def onVerticalScroll(self, value):
+        self.emit(QtCore.SIGNAL("updateRequest()"))
+
+    def center_block(self, block):
+        """
+        scroll textarea as specified block locates to center
+        """
+        y = block.layout().position().y()
+        vscroll = self.edit.verticalScrollBar()
+        vscroll.setValue(y - vscroll.pageStep() / 2)
+
+def get_edit_helper(edit):
+    if isinstance(edit, QtGui.QPlainTextEdit):
+        return PlainTextEditHelper(edit)
+    if isinstance(edit, QtGui.QTextEdit):
+        return TextEditHelper(edit)
+    raise ValueError("edit is unsupported type.")
+
+class GuideBar(QtGui.QWidget):
+    """
+    Vertical bar attached to TextEdit.
+    This shows that where changed or highlighted lines are.
+
+    Guide bar can have multiple columns.
+    """
+    def __init__(self, edit, base_width=10, parent=None):
+        """
+        :edit:          target widget, must be QPlainTextEdit or QTextEdit
+        :base_width:    width of each column.
+        """
+        QtGui.QWidget.__init__(self, parent)
+        self.base_width = base_width
+        self.edit = edit
+        self._helper = get_edit_helper(edit)
+        self.block_count = 0
+
+        self.connect(edit, QtCore.SIGNAL("documentChangeFinished()"), 
+                     self.reset_gui)
+        self.connect(edit.verticalScrollBar(), QtCore.SIGNAL("rangeChanged(int, int)"),
+                     self.vscroll_rangeChanged)
+
+        self.connect(self._helper, QtCore.SIGNAL("updateRequest()"), self.update)
+
+        self.entries = {}
+        self.vscroll_visible = None
+
+    def add_entry(self, key, color, index=0):
+        """
+        Add marker group
+        """
+        entry = _Entry(key, color, index)
+        self.entries[key] = entry
+
+    def vscroll_rangeChanged(self, min, max):
+        vscroll_visible = (min < max)
+        if self.vscroll_visible != vscroll_visible:
+            self.vscroll_visible = vscroll_visible
+            self.reset_gui()
+        self.update()
+
+    def reset_gui(self):
+        """
+        Determine show or hide, and num of columns.
+        """
+        # Hide when vertical scrollbar is not shown.
+        if not self.vscroll_visible:
+            self.setVisible(False)
+            return
+        valid_entries = [e for e in self.entries.itervalues() if e.data]
+        if not valid_entries:
+            self.setVisible(False)
+            return
+
+        self.setVisible(True)
+        self.repeats = len(set([e.index for e in valid_entries if e.index >= 0]))
+        if self.repeats == 0:
+            self.repeats = 1
+        self.setFixedWidth(self.repeats * self.base_width + 4)
+
+        self.block_count = self.edit.document().blockCount()
+        self.update()
+
+    def update_data(self, **data):
+        """
+        Update each marker positions.
+
+        :arg_name:  marker key
+        :value:     list of marker positions.
+                    Each position is tuple of (block index, num of blocks).
+        """
+        for key, value in data.iteritems():
+            self.entries[key].data[:] = value
+        self.reset_gui()
+
+    def get_visible_block_range(self):
+        """
+        Return tuple of (index of first visible block, num of visible block)
+        """
+        pos = QtCore.QPoint(0, 1)
+        block = self.edit.cursorForPosition(pos).block()
+        first_visible_block = block.blockNumber()
+
+        y = self.edit.viewport().height()
+
+        pos = QtCore.QPoint(0, y)
+        block = self.edit.cursorForPosition(pos).block()
+        if block.isValid():
+            visible_blocks = block.blockNumber() - first_visible_block + 1
+        else:
+            visible_blocks = self.block_count - first_visible_block + 1
+
+        return first_visible_block, visible_blocks
+
+    def paintEvent(self, event):
+        QtGui.QWidget.paintEvent(self, event)
+        painter = QtGui.QPainter(self)
+        painter.fillRect(event.rect(), QtCore.Qt.white)
+        if self.block_count == 0:
+            return
+        painter.setRenderHints(QtGui.QPainter.Antialiasing, True)
+        block_height = float(self.height()) / self.block_count
+
+        # Draw entries
+        x_origin = 2
+        index = -1
+        prev_index = -1
+        for e in sorted(self.entries.itervalues(), 
+                        key=lambda x:x.index if x.index >= 0 else 999):
+            if not e.data:
+                continue
+            if e.index < 0:
+                x, width = 0, self.width()
+            else:
+                if e.index != prev_index:
+                    index += 1
+                    prev_index = e.index
+                x, width = x_origin + index * self.base_width, self.base_width
+            for block_index, block_num in e.data:
+                y = block_index * block_height
+                height = max(1, block_num * block_height)
+                painter.fillRect(x, y, width, height, e.color)
+
+        # Draw scroll indicator.
+        x, width = 0, self.width()
+        first_block, visible_blocks = self.get_visible_block_range()
+        y, height = first_block * block_height, max(1, visible_blocks * block_height)
+        painter.fillRect(x, y, width, height, QtGui.QColor(0, 0, 0, 24))
+
+    def mousePressEvent(self, event):
+        QtGui.QWidget.mousePressEvent(self, event)
+        if event.button() == QtCore.Qt.LeftButton:
+            self.scroll_to_pos(event.y())
+
+    def mouseMoveEvent(self, event):
+        QtGui.QWidget.mouseMoveEvent(self, event)
+        self.scroll_to_pos(event.y())
+
+    def scroll_to_pos(self, y):
+        block_no = int(float(y) / self.height() * self.block_count)
+        block = self.edit.document().findBlockByNumber(block_no)
+        if not block.isValid():
+            return
+        self._helper.center_block(block)
+
+class GuideBarPanel(QtGui.QWidget):
+    """
+    Composite widget of TextEdit and GuideBar
+    """
+    def __init__(self, edit, base_width=10, align=GBAR_RIGHT, parent=None):
+        QtGui.QWidget.__init__(self, parent)
+        hbox = QtGui.QHBoxLayout(self)
+        hbox.setSpacing(0)
+        hbox.setMargin(0)
+        self.bar = GuideBar(edit, base_width=base_width, parent=parent)
+        self.edit = edit
+        if align == GBAR_RIGHT:
+            hbox.addWidget(self.edit)
+            hbox.addWidget(self.bar)
+        else:
+            hbox.addWidget(self.bar)
+            hbox.addWidget(self.edit)
+
+    def add_entry(self, key, color, index=0):
+        self.bar.add_entry(key, color, index)
+
+    def reset_gui(self):
+        self.bar.reset_gui()
+
+    def update_data(self, **data):
+        return self.bar.update_data(**data)
+
+def setup_guidebar_for_find(guidebar, find_toolbar, index=0):
+    """
+    Make guidebar enable to show positions that highlighted by FindToolBar
+    """
+    def on_highlight_changed():
+        if guidebar.edit in find_toolbar.text_edits:
+            guidebar.update_data(
+                find=[(n, 1) for n in guidebar.edit.highlight_lines]
+            )
+    guidebar.add_entry('find', QtGui.QColor(255, 196, 0), index) # Gold
+    guidebar.connect(find_toolbar, QtCore.SIGNAL("highlightChanged()"),
+                     on_highlight_changed)

=== modified file 'lib/widgets/toolbars.py'
--- lib/widgets/toolbars.py	2011-12-28 12:06:42 +0000
+++ lib/widgets/toolbars.py	2012-02-01 16:39:02 +0000
@@ -48,7 +48,7 @@
         parent.connect(button, QtCore.SIGNAL(signal), onclick)
     return button
 
-def add_toolbar_button(toolbar, text, parent, icon_name=None, icon_size=22, 
+def add_toolbar_button(toolbar, text, parent, icon_name=None, icon_size=22,
                         enabled=True, checkable=False, checked=False,
                         shortcut=None, onclick=None): 
     button = create_toolbar_button(text, parent, icon_name, icon_size, 
@@ -56,7 +56,7 @@
     toolbar.addAction(button)
     return button
 
-        
+
 class FindToolbar(QtGui.QToolBar):
 
     def __init__(self, window, text_edit, show_action):
@@ -131,7 +131,7 @@
         self.connect(self.find_text,
                      QtCore.SIGNAL("returnPressed()"),
                      self.find_next)        
-        
+
     def show_action_toggle(self, state):
         self.setVisible(state)
         if state:
@@ -197,6 +197,7 @@
             t.setExtraSelections([])
 
         for t in text_edits:
+            t.highlight_lines = []
             self.connect(t, QtCore.SIGNAL("documentChangeFinished()"), 
                     self.highlight)
 
@@ -217,6 +218,7 @@
         flags = self.find_get_flags()
         for text_edit in self.text_edits:
             selections = []
+            highlight_lines = []
             if text:
                 find = text_edit.document().find
                 pos = 0
@@ -230,9 +232,13 @@
                     sel = QtGui.QTextEdit.ExtraSelection()
                     sel.cursor, sel.format = cursor, fmt
                     selections.append(sel)
+                    highlight_lines.append(cursor.blockNumber())
                     pos = cursor.selectionEnd()
 
             text_edit.setExtraSelections(selections)
+            text_edit.highlight_lines = highlight_lines
+
+        self.emit(QtCore.SIGNAL("highlightChanged()"))
 
 class ToolbarPanel(QtGui.QWidget):
     def __init__(self, slender=True, icon_size=16, parent=None):
@@ -255,7 +261,7 @@
 
     def add_toolbar_button(self, text, icon_name=None, icon_size=0, enabled=True, 
             checkable=False, checked=False, shortcut=None, onclick=None, menu=None):
-        button = create_toolbar_button(text, self, icon_name=icon_name, 
+        button = create_toolbar_button(text, self, icon_name=icon_name,
                 icon_size=icon_size or self.icon_size, enabled=enabled, 
                 checkable=checkable, checked=checked, shortcut=shortcut, onclick=onclick)
         if menu is not None:
@@ -273,7 +279,7 @@
             show_shortcut_hint(widget)
         return button
 
-    def create_button(self, text, icon_name=None, icon_size=0, enabled=True, 
+    def create_button(self, text, icon_name=None, icon_size=0, enabled=True,
             checkable=False, checked=False, shortcut=None, onclick=None):
         return create_toolbar_button(text, self, icon_name=icon_name, 
                 icon_size=icon_size or self.icon_size, enabled=enabled,