Merge lp:~hid-iwata/qbzr/curved-diff-handle into lp:qbzr

[IWATA Hidetaka]

Make configurable change marker style of qdiff(side by side view). Straight lines or curved lines.

Sample of curved line style is here.
http://dl.dropbox.com/u/16802579/qdiff-curved-change-marker.png

# This does nothing important, this is just matter of liking.
# Feel free to reject it.

[Jonathan Riddell (jr)]

I think these curved lines are a nice improvement.

I don't see a need to keep the current straight lines around as an option, it's not something users are likely to care enough about and the curved lines are nicer.

So I'll approve if the config option is not added.

Also all non-private methods should have a doc string to explain what they do (my rule, not qbzr's) so "def create_line" should be documented.

review: Needs Fixing

[lp:~hid-iwata/qbzr/curved-diff-handle]

1429. By IWATA Hidetaka on 2011-09-20

Revert qconfig, (Change marker style don't have to be configurable.)

1430. By IWATA Hidetaka on 2011-09-20

Update NEWS.

[IWATA Hidetaka (hid-iwata)]

Thank you for the review.
I've fixed my code by your suggestion now.

[Jonathan Riddell (jr)]

Approved, with the NEWS file updated

review: Approve

=== modified file 'NEWS.txt'
--- NEWS.txt	2011-09-06 21:53:08 +0000
+++ NEWS.txt	2011-09-20 18:38:23 +0000
@@ -11,10 +11,15 @@
      (IWATA Hidetaka)
    * Fixed ignore whitespace changes code.
      (Alexander Belchenko, Bug #827391)
+<<<<<<< TREE
    * In the case of file content has mixed encoding that cannot be safely
      decode to unicode qdiff don't fallback to use latin-1 encoding anymore,
      but try to decode such content in "replace" mode.
      (Alexander Belchenko, Bug #814117)
+=======
+   * Change appearance of change markers.
+     (IWATA Hidetaka)
+>>>>>>> MERGE-SOURCE
  * qlog:
    * Do not crash on ghost revisions.
      (Jonathan Riddell, Bug #785967)

=== modified file 'lib/diffview.py'
--- lib/diffview.py	2011-07-23 03:02:27 +0000
+++ lib/diffview.py	2011-09-20 18:38:23 +0000
@@ -165,7 +165,23 @@
         ry = self.view.browsers[1].verticalScrollBar().value() - frame
         w = self.width()
         h = self.height()
-        
+        painter.setRenderHints(QtGui.QPainter.Antialiasing, True)
+
+        C = 16 # Curve factor.
+
+        def create_line(ly, ry, right_to_left=False):
+            """
+            Create path which represents upper or lower line of change marker.
+            """
+            line = QtGui.QPainterPath()
+            if not right_to_left:
+                line.moveTo(0, ly)
+                line.cubicTo(C, ly, w - C, ry, w, ry)
+            else:
+                line.moveTo(w, ry)
+                line.cubicTo(w - C, ry, C, ly, 0, ly)
+            return line
+
         pen = QtGui.QPen(QtCore.Qt.black)
         pen.setWidth(2)
         painter.setPen(pen)
@@ -176,7 +192,8 @@
                 continue
             if block_ly > h and block_ry > h:
                 break
-            painter.drawLine(0, block_ly, w, block_ry)
+
+            painter.drawPath(create_line(block_ly, block_ry))
 
         for ly_top, ly_bot, ry_top, ry_bot, kind in self.changes:
             ly_top -= ly
@@ -189,17 +206,22 @@
             if ly_top > h and ly_bot > h and ry_top > h and ry_bot > h:
                 break
 
-            polygon = QtGui.QPolygon(4)
-            polygon.setPoints(0, ly_top, w, ry_top, w, ry_bot, 0, ly_bot)
-            painter.setPen(QtCore.Qt.NoPen)
-            painter.setBrush(brushes[kind][0])
-            painter.drawConvexPolygon(polygon)
-
+            upper_line = create_line(ly_top, ry_top)
+            lower_line = create_line(ly_bot, ry_bot, True)
+
+            region = QtGui.QPainterPath()
+            region.moveTo(0, ly_top)
+            region.connectPath(upper_line)
+            region.lineTo(w, ry_bot)
+            region.connectPath(lower_line)
+            region.closeSubpath()
+
+            painter.fillPath(region, brushes[kind][0])
             painter.setPen(colors[kind][1])
-            painter.setRenderHints(QtGui.QPainter.Antialiasing, ly_top != ry_top)
-            painter.drawLine(0, ly_top, w, ry_top)
-            painter.setRenderHints(QtGui.QPainter.Antialiasing, ly_bot != ry_bot)
-            painter.drawLine(0, ly_bot, w, ry_bot)
+            for path, aa in zip((upper_line, lower_line), 
+                                (ly_top != ry_top, ly_bot != ry_bot)):
+                painter.setRenderHints(QtGui.QPainter.Antialiasing, aa)
+                painter.drawPath(path)
         del painter
 
     def wheelEvent(self, event):