Merge lp:~s-dumbie/qbzr/ench_qdiff into lp:qbzr

[BumbleBee]

Few improvements for diff viewer.
All changes are done to the side by side diff viewer only.

Changed:
*Drop-down encodings lists are now one above another.

Added:
*Now one can scroll only one widow while shift is pressed. After shift
is released
 difference in left and right scrollers positions remains.
*Added the 'Diff' group:
** A button ('>=<') is added to synchronize vertical scrollers.
   When it is pressed left scrollers is moved to the same position as
the right one.
** Added two buttons ('<<' and '>>') to jump to the previous and the
next change respectively.
*Added the 'Search' group:
** The text field for the search string, buttons ('<<' and '>>') for
searching the previous and the next
   occurrence respectively. Search is done in the left window.
Changing the search text make search
   start from the beginning of the text. Otherwise search continues
from the position after the last found text entry.
** Now pressing the '/' button sets focus to the search text field.
** Now pressing 'Enter' while search text field is focused starts
search in the forward direction.

[Alexander Belchenko (bialix)]

Привет, извиняюсь за чересчур длительную задержку с твоим патчем.
Я закончил merge для ветки с переделкой qdiff на toolbar. По всей видимости теперь надо обновить твой патч под использование тулбара?

Теперь изменения касательно encoding drop-down list уже неактуальны.

Поиск по diff тоже уже реализован. Может быть немного не так как у тебя.

Из всего патча остается поддержка раздельного scroll. Можно его выделить в виде отдельного патча на основе текущего состояния qbzr trunk?

[Alexander Belchenko (bialix)]

As I understand, after I've landed toolbar for qdiff this patch should be significantly reworked. So I mark it as Work In Progress. Please ask if you need any help with updating your patch.

Unmerged revisions

1310. By bumble <bumble@starlight> on 2010-08-25

Few improvements for diff viewer.
All changes are done to the side by side diff viewer only.

Changed:
*Drop-down encodings lists are now one above another.

Added:
*Now one can scroll only one widow while shift is pressed. After shift
is released
 difference in left and right scrollers positions remains.
*Added the 'Diff' group:
** A button ('>=<') is added to synchronize vertical scrollers.
   When it is pressed left scrollers is moved to the same position as
the right one.
** Added two buttons ('<<' and '>>') to jump to the previous and the
next change respectively.
*Added the 'Search' group:
** The text field for the search string, buttons ('<<' and '>>') for
searching the previous and the next
   occurrence respectively. Search is done in the left window.
Changing the search text make search
   start from the beginning of the text. Otherwise search continues
from the position after the last found text entry.
** Now pressing the '/' button sets focus to the search text field.
** Now pressing 'Enter' while search text field is focused starts
search in the forward direction.

=== modified file 'lib/diffview.py'
--- lib/diffview.py	2010-03-24 05:23:19 +0000
+++ lib/diffview.py	2010-08-28 08:52:41 +0000
@@ -34,6 +34,7 @@
     CachedTTypeFormater,
     split_tokens_at_lines,
     )
+from PyQt4.QtCore import QEvent 
 
 have_pygments = True
 try:
@@ -256,6 +257,10 @@
         
         config = QBzrGlobalConfig()
         self.show_intergroup_colors = config.get_user_option("diff_show_intergroup_colors") in ("True", "1")
+        self.shift = 0
+        self.slider1_prev = self.browsers[0].verticalScrollBar().minimum()
+        self.slider2_prev = self.browsers[1].verticalScrollBar().minimum()
+        self.prevSearchString = True
     
     def clear(self):
         
@@ -526,45 +531,137 @@
             self.browsers[0].scrollToAnchor("top")
             self.browsers[1].scrollToAnchor("top")
 
-    def _syncSliders(self, slider1, slider2, value):
-        m = slider1.maximum()
-        if m:
-            value = slider2.minimum() + slider2.maximum() * (value - slider1.minimum()) / m
-            self.ignoreUpdate = True
-            slider2.setValue(value)
-            self.ignoreUpdate = False
+    def _syncSliders(self, slider1, slider2, value, diff):
+      if not self.shift:
+        self.ignoreUpdate = True
+        if diff == 0:
+          m = slider1.maximum()
+          if m:
+              value = slider2.minimum() + slider2.maximum() * (value - slider1.minimum()) / m
+              slider2.setValue(value)
+        else:
+          tmp = slider1.maximum() - slider1.minimum()
+          if tmp:
+            diff = (slider2.maximum() - slider2.minimum()) * diff / (tmp)
+            value += diff
+            slider2.setValue(value);
+        self.ignoreUpdate = False
+      return value
 
     def updateHandle1(self, value):
         if not self.ignoreUpdate:
             slider1 = self.browsers[0].verticalScrollBar()
             slider2 = self.browsers[1].verticalScrollBar()
-            self._syncSliders(slider1, slider2, value)
+            self.slider2_prev = self._syncSliders(slider1, slider2, self.slider2_prev , value -
+                self.slider1_prev)
+            self.slider1_prev = value
             self.handle(1).update()
 
     def updateHandle2(self, value):
         if not self.ignoreUpdate:
             slider1 = self.browsers[0].verticalScrollBar()
             slider2 = self.browsers[1].verticalScrollBar()
-            self._syncSliders(slider2, slider1, value)
+            self.slider1_prev = self._syncSliders(slider2, slider1, self.slider1_prev, value -
+                self.slider2_prev)
+            self.slider2_prev = value
             self.handle(1).update()
 
     def syncHorizontalSlider1(self, value):
         if not self.ignoreUpdate:
             slider1 = self.browsers[0].horizontalScrollBar()
             slider2 = self.browsers[1].horizontalScrollBar()
-            self._syncSliders(slider1, slider2, value)
+            self._syncSliders(slider1, slider2, value, 0)
             self.handle(1).update()
 
     def syncHorizontalSlider2(self, value):
         if not self.ignoreUpdate:
             slider1 = self.browsers[0].horizontalScrollBar()
             slider2 = self.browsers[1].horizontalScrollBar()
-            self._syncSliders(slider2, slider1, value)
+            self._syncSliders(slider2, slider1, value, 0)
             self.handle(1).update()
 
     def createHandle(self):
         return DiffViewHandle(self)
 
+    def search(self, searchString, dir):
+        doc = self.docs[1]
+        if (not searchString == self.prevSearchString):
+          # Start new search
+          self.cursors[1].setPosition(0)
+          self.prevSearchString = searchString
+
+        if dir:
+          found = doc.find(searchString, self.cursors[1])
+        else:
+          found = doc.find(searchString, self.cursors[1],
+                           QtGui.QTextDocument.FindBackward)
+        if (not found.isNull() and not found.atEnd()):
+          self.browsers[1].setTextCursor(found)
+          self.cursors[1] = found
+          self.browsers[1].ensureCursorVisible()
+
+    def event(self, event):
+        if (event.type()==QEvent.KeyPress) and (event.key()==QtCore.Qt.Key_Shift):
+            self.shift = 1
+            return True
+        if (event.type()==QEvent.KeyRelease) and (event.key()==QtCore.Qt.Key_Shift):
+            self.shift = 0
+            return True
+        return QtGui.QSplitter.event(self, event)
+
+    # Jump to the next diff
+    def nextdiff(self):
+      ly = -1
+      y = self.browsers[1].verticalScrollBar().value()
+      half = self.browsers[1].height() / 2
+      y += half
+      for ry, ly in [(chr[0], chl[0]) for chr, chl in
+        zip(self.browsers[0].changes,self.browsers[1].changes)]:
+        if ly <= y:
+            continue
+        break
+      if ly > 0:
+        slider1 = self.browsers[0].verticalScrollBar()
+        slider2 = self.browsers[1].verticalScrollBar()
+        self.ignoreUpdate = True
+        slider1.setValue(ry - half)
+        slider2.setValue(ly - half)
+        self.slider1_prev = ry - half
+        self.slider2_prev = ly - half
+        self.ignoreUpdate = False
+        self.handle(1).update()
+
+    def prevdiff(self):
+      prev_ly = -1
+      y = self.browsers[1].verticalScrollBar().value()
+      half = self.browsers[1].height() / 2
+      y += half
+      for ry, ly in [(chr[0], chl[0]) for chr, chl in
+        zip(self.browsers[0].changes,self.browsers[1].changes)]:
+        if ly < y:
+          prev_ly = ly
+          prev_ry = ry
+          continue
+        break
+      if prev_ly > 0:
+        slider1 = self.browsers[0].verticalScrollBar()
+        slider2 = self.browsers[1].verticalScrollBar()
+        self.ignoreUpdate = True
+        slider1.setValue(prev_ry - half)
+        slider2.setValue(prev_ly - half)
+        self.slider1_prev = prev_ry - half
+        self.slider2_prev = prev_ly - half
+        self.ignoreUpdate = False
+        self.handle(1).update()
+
+    def sync_scrl(self):
+        if not self.ignoreUpdate:
+          slider1 = self.browsers[0].verticalScrollBar()
+          slider2 = self.browsers[1].verticalScrollBar()
+          self.slider1_prev = self._syncSliders(slider2, slider1, self.slider2_prev, 0)
+          self.handle(1).update()
+
+
 
 class SimpleDiffView(QtGui.QTextBrowser):
     """Widget to show differences in unidiff format."""
@@ -690,3 +787,15 @@
         self.cursor.insertText("\n")
         self.cursor.endEditBlock()
         self.update()
+
+    def set_search(self, search_text):
+#        self.browsers[1].set_search(search_text)
+        pass
+
+    def scrollTo(self, pos):
+        pass
+
+    def currentIndex(self):
+        return 0
+
+

=== modified file 'lib/diffwindow.py'
--- lib/diffwindow.py	2010-05-05 12:40:43 +0000
+++ lib/diffwindow.py	2010-08-28 08:52:41 +0000
@@ -206,14 +206,59 @@
                      self.click_refresh)
         self.refresh_button = refresh
 
+        # Search in diff field
+        searchgroup = QtGui.QGroupBox("Search", self)
+        self.searchbox = QtGui.QHBoxLayout(searchgroup)
+#        self.searchbox.setSpacing(3)
+        self.search_edit = QtGui.QLineEdit()
+        self.search_edit.setSizePolicy(QtGui.QSizePolicy.Minimum |
+          QtGui.QSizePolicy.ExpandFlag, QtGui.QSizePolicy.Fixed)
+        self.search_edit.setMinimumWidth(200)
+        self.searchbox.addWidget(self.search_edit)
+
+        prevsrch_btn = QtGui.QPushButton(gettext('<<'), self)
+        nextsrch_btn = QtGui.QPushButton(gettext('>>'), self)
+        prevsrch_btn.setMaximumWidth(30)
+        nextsrch_btn.setMaximumWidth(30)
+        QtCore.QObject.connect(prevsrch_btn, QtCore.SIGNAL("clicked(bool)"),
+            self.prevsrch_click)
+        QtCore.QObject.connect(nextsrch_btn, QtCore.SIGNAL("clicked(bool)"),
+            self.nextsrch_click)
+        self.searchbox.addWidget(prevsrch_btn)
+        self.searchbox.addWidget(nextsrch_btn)
+
+        diffgroup = QtGui.QGroupBox("Diff", self)
+        diffbox = QtGui.QHBoxLayout(diffgroup)
+#        diffbox.setSpacing(5)
+        prevdiff_button = QtGui.QPushButton(gettext('<<'), self)
+        nextdiff_button = QtGui.QPushButton(gettext('>>'), self)
+        prevdiff_button.setMaximumWidth(30)
+        nextdiff_button.setMaximumWidth(30)
+        QtCore.QObject.connect(prevdiff_button, QtCore.SIGNAL("clicked(bool)"),
+            self.prevdiff_click)
+        QtCore.QObject.connect(nextdiff_button, QtCore.SIGNAL("clicked(bool)"),
+            self.nextdiff_click)
+        sync_scrl_button = QtGui.QPushButton(gettext('>=<'), self)
+        QtCore.QObject.connect(sync_scrl_button, QtCore.SIGNAL("clicked(bool)"),
+            self.sync_scrl_click)
+        sync_scrl_button.setMaximumWidth(35)
+        diffbox.addWidget(prevdiff_button)
+        diffbox.addWidget(nextdiff_button)
+        diffbox.addWidget(sync_scrl_button)
+
         hbox = QtGui.QHBoxLayout()
         hbox.addWidget(diffsidebyside)
         hbox.addWidget(unidiff)
         hbox.addWidget(complete)
         if has_ext_diff():
             hbox.addWidget(ext_diff_button)
-        hbox.addWidget(self.encoding_selector_left)
-        hbox.addWidget(self.encoding_selector_right)
+        tmpvbox = QtGui.QVBoxLayout()
+        tmpvbox.addWidget(self.encoding_selector_left)
+        tmpvbox.addWidget(self.encoding_selector_right)
+        tmpvbox.setSpacing(0)
+        hbox.addLayout(tmpvbox)
+        hbox.addWidget(searchgroup)
+        hbox.addWidget(diffgroup)
         hbox.addWidget(buttonbox)
         vbox.addLayout(hbox)
 
@@ -452,3 +497,38 @@
     def ext_diff_triggered(self, ext_diff):
         """@param ext_diff: path to external diff executable."""
         show_diff(self.arg_provider, ext_diff=ext_diff, parent_window = self)
+
+    @ui_current_widget
+    def updateSearch(self, dir):
+        searchString = unicode(self.search_edit.text())
+        if (searchString == ""):
+          return
+        self.diffview.search(searchString, dir)
+
+    def prevdiff_click(self):
+        self.diffview.prevdiff()
+
+    def nextdiff_click(self):
+        self.diffview.nextdiff()
+
+    def prevsrch_click(self):
+        self.updateSearch(0)
+
+    def nextsrch_click(self):
+        self.updateSearch(1)
+
+    def sync_scrl_click(self):
+        self.diffview.sync_scrl()
+
+    def event(self, event):
+        if (event.type()==QtCore.QEvent.KeyPress):
+          if (event.key()==QtCore.Qt.Key_Slash) and not (self.search_edit.hasFocus()):
+            self.search_edit.setFocus()
+            self.search_edit.selectAll()
+            return True
+          if (event.key()==QtCore.Qt.Key_Return) and (self.search_edit.hasFocus()):
+            self.updateSearch(1)
+            return True
+        return QBzrWindow.event(self, event)
+
+