Merge lp:~hid-iwata/qbzr/hlsearch into lp:qbzr

[IWATA Hidetaka]

Implement search highlight.
This change affects to qdiff, qshelve, qunshelve, qannotate.

http://dl.dropbox.com/u/16802579/qbzr-hlsearch.png

[Alexander Belchenko (bialix)]

W00t! So nice! Many thanks!

Could you please write some message to NEWS.txt next time for such nice and user-visible changes? I'll add the message right now to your patch while merging. But it will help me if you can provide some message with the patch. Thanks

review: Approve

[IWATA Hidetaka (hid-iwata)]

Sorry. I found the regression by this code.
I've fixed it and merged it to trunk now.

=== modified file 'lib/annotate.py'
--- lib/annotate.py	2011-05-11 14:22:57 +0000
+++ lib/annotate.py	2011-12-28 12:16:24 +0000
@@ -480,6 +480,8 @@
         self.annotate_bar.annotate = annotate
         self.text_edit.annotate = annotate
         self.annotate_bar.show_current_line = False
+
+        self.text_edit.emit(QtCore.SIGNAL("documentChangeFinished()"))
         
         self.processEvents()
         

=== modified file 'lib/diffwindow.py'
--- lib/diffwindow.py	2011-09-06 21:53:08 +0000
+++ lib/diffwindow.py	2011-12-28 12:16:24 +0000
@@ -340,7 +340,7 @@
 
         self.create_main_toolbar(allow_refresh)
         self.addToolBarBreak()
-        self.find_toolbar = FindToolbar(self, self.diffview.browsers[0],
+        self.find_toolbar = FindToolbar(self, self.diffview.browsers,
                 self.show_find)
         self.find_toolbar.hide()
         self.addToolBar(self.find_toolbar)
@@ -523,7 +523,7 @@
     def eventFilter(self, object, event):
         if event.type() == QtCore.QEvent.FocusIn:
             if object in self.diffview.browsers:
-                self.find_toolbar.text_edit = object
+                self.find_toolbar.set_text_edit(object)
         return QBzrWindow.eventFilter(self, object, event)
         # Why doesn't this work?
         #return super(DiffWindow, self).eventFilter(object, event)
@@ -666,18 +666,20 @@
             QtGui.QMessageBox.information(self, gettext('Diff'),
                 gettext('No changes found.'),
                 gettext('&OK'))
+        for t in self.views[0].browsers + (self.views[1],):
+            t.emit(QtCore.SIGNAL("documentChangeFinished()"))
         self.view_refresh.setEnabled(self.can_refresh())
 
     def click_toggle_view_mode(self, checked):
         if checked:
             view = self.sdiffview
-            self.find_toolbar.text_edit = view
+            self.find_toolbar.set_text_edits([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)
         else:
             view = self.diffview
-            self.find_toolbar.text_edit = view.browsers[0]
+            self.find_toolbar.set_text_edits(view.browsers)
             self.tab_width_selector_left.menuAction().setVisible(True)
             self.tab_width_selector_right.menuAction().setVisible(True)
             self.tab_width_selector_unidiff.menuAction().setVisible(False)

=== modified file 'lib/widgets/shelve.py'
--- lib/widgets/shelve.py	2011-09-06 15:31:11 +0000
+++ lib/widgets/shelve.py	2011-12-28 12:16:24 +0000
@@ -992,6 +992,7 @@
         if self.hunk_list:
             self._set_focused_hunk(0)
 
+        self.emit(QtCore.SIGNAL("documentChangeFinished()"))
         self.update()
 
     def update(self):
@@ -1002,6 +1003,7 @@
         QtGui.QTextBrowser.clear(self)
         del(self.hunk_list[:])
         self._set_focused_hunk(-1)
+        self.emit(QtCore.SIGNAL("documentChangeFinished()"))
 
     def paintEvent(self, event):
         if not self.hunk_list:

=== modified file 'lib/widgets/shelvelist.py'
--- lib/widgets/shelvelist.py	2011-10-04 15:23:49 +0000
+++ lib/widgets/shelvelist.py	2011-12-28 12:16:24 +0000
@@ -128,7 +128,7 @@
                 N_("&View Options"), view_menu, icon_name="document-properties",
                 shortcut="Alt+V")
 
-        self.find_toolbar = FindToolbar(self, self.diffviews[0].browsers[0], show_find)
+        self.find_toolbar = FindToolbar(self, self.diffviews[0].browsers, show_find)
         diff_panel.add_widget(self.find_toolbar)
         diff_panel.add_widget(self.stack)
         self.find_toolbar.hide()
@@ -405,6 +405,8 @@
                     break
         finally:
             self._interrupt_switch = False
+            for view in self.diffviews[0].browsers + (self.diffviews[1],):
+                view.emit(QtCore.SIGNAL("documentChangeFinished()"))
 
     def selected_shelve_changed(self):
         self._change_current_shelve()
@@ -453,9 +455,9 @@
         self.diffviews[index].rewind()
         self.stack.setCurrentIndex(index)
         if index == 0:
-            self.find_toolbar.text_edit = self.diffviews[0].browsers[0]
+            self.find_toolbar.set_text_edits(self.diffviews[0].browsers)
         else:
-            self.find_toolbar.text_edit = self.diffviews[1]
+            self.find_toolbar.set_text_edits([self.diffviews[1]])
 
     def complete_toggled(self, state):
         self.complete = state
@@ -520,7 +522,7 @@
     def eventFilter(self, object, event):
         if event.type() == QtCore.QEvent.FocusIn:
             if object in self.diffviews[0].browsers:
-                self.find_toolbar.text_edit = object
+                self.find_toolbar.set_text_edit(object)
         return ToolbarPanel.eventFilter(self, object, event)
     
     def load_settings(self):

=== modified file 'lib/widgets/toolbars.py'
--- lib/widgets/toolbars.py	2011-05-17 04:51:07 +0000
+++ lib/widgets/toolbars.py	2011-12-28 12:16:24 +0000
@@ -16,7 +16,6 @@
 # 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 bzrlib.plugins.qbzr.lib.util import (
     get_icon,
     show_shortcut_hint
@@ -24,6 +23,7 @@
 
 from PyQt4 import QtCore, QtGui
 from bzrlib.plugins.qbzr.lib.i18n import gettext, N_
+from bzrlib.plugins.qbzr.lib.decorators import lazy_call
 
 def create_toolbar_button(text, parent=None, icon_name=None, icon_size=22,
                 enabled=True, checkable=False, checked=False, 
@@ -61,8 +61,11 @@
 
     def __init__(self, window, text_edit, show_action):
         QtGui.QToolBar.__init__(self, gettext("Find"), window)
-        self.text_edit = text_edit
-        if 0: self.text_edit = QtGui.QTextEdit()
+        self.text_edits = []
+        if isinstance(text_edit, list) or isinstance(text_edit, tuple):
+            self.set_text_edits(text_edit)
+        else:
+            self.set_text_edits([text_edit])
         self.show_action = show_action
         
         self.setToolButtonStyle(QtCore.Qt.ToolButtonTextBesideIcon)
@@ -141,6 +144,7 @@
     
     def find_text_changed(self, text):
         self.find_avoid_moving()
+        self.highlight()
     
     def find_get_flags(self):
         flags = QtGui.QTextDocument.FindFlags()
@@ -183,11 +187,52 @@
             self.text_edit.setTextCursor(cursor)
             self.find_text.setPalette(self.found_palette)
 
-    def set_text_edit(self, new_text_edit):
-        if self.text_edit:
-            self.text_edit.setTextCursor(QtGui.QTextCursor())
-        self.text_edit = new_text_edit
-
+    def set_text_edits(self, text_edits):
+        if len(text_edits) == 0:
+            raise ValueError('text_edits is empty.')
+
+        for t in self.text_edits:
+            self.disconnect(t, QtCore.SIGNAL("documentChangeFinished()"), 
+                    self.highlight)
+            t.setExtraSelections([])
+
+        for t in text_edits:
+            self.connect(t, QtCore.SIGNAL("documentChangeFinished()"), 
+                    self.highlight)
+
+        self.text_edits = text_edits
+        self.text_edit = text_edits[0]
+        self.highlight()
+
+    def set_text_edit(self, text_edit):
+        if text_edit in self.text_edits:
+            self.text_edit = text_edit
+        else:
+            raise ValueError('Invalid text_edit instance.')
+
+    @lazy_call(200, per_instance=True)
+    def highlight(self):
+        """Highlight matched words in the text edits."""
+        text = self.find_text.text()
+        flags = self.find_get_flags()
+        for text_edit in self.text_edits:
+            selections = []
+            if text:
+                find = text_edit.document().find
+                pos = 0
+                fmt = QtGui.QTextCharFormat()
+                fmt.setBackground(QtCore.Qt.yellow)
+                while True:
+                    cursor = find(text, pos, flags)
+                    if cursor.isNull():
+                        break
+
+                    sel = QtGui.QTextEdit.ExtraSelection()
+                    sel.cursor, sel.format = cursor, fmt
+                    selections.append(sel)
+                    pos = cursor.selectionEnd()
+
+            text_edit.setExtraSelections(selections)
 
 class ToolbarPanel(QtGui.QWidget):
     def __init__(self, slender=True, icon_size=16, parent=None):