[meld] Allow customization of current chunk highlight colour (bgo#701574)

[Kai Willadsen <kaiw src gnome org>]

commit 538f811bad18de5f3b419c53c62ddeaa07f7df07
Author: Louis des Landes <louis obsidian com au>
Date:   Wed Jun 5 11:40:12 2013 +1000

    Allow customization of current chunk highlight colour (bgo#701574)

 data/gtkrc       |    2 ++
 meld/filediff.py |    8 ++++++--
 meld/linkmap.py  |    4 +++-
 3 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/data/gtkrc b/data/gtkrc
index 56bc0b0..1885d9b 100644
--- a/data/gtkrc
+++ b/data/gtkrc
@@ -29,6 +29,8 @@ style "meld-color-scheme"
     color["current-line-highlight"] = "#ffff00"
 
     color["syncpoint-outline"] = "#555555"
+
+    color["current-chunk-highlight"] = "#ffffff"
 }
 widget "meldapp.*" style : lowest "meld-color-scheme"
 
diff --git a/meld/filediff.py b/meld/filediff.py
index 9a31e8c..1580c95 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -352,7 +352,9 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
         self.fill_colors = {"insert"  : lookup("insert-bg", "DarkSeaGreen1"),
                             "delete"  : lookup("insert-bg", "DarkSeaGreen1"),
                             "conflict": lookup("conflict-bg", "Pink"),
-                            "replace" : lookup("replace-bg", "#ddeeff")}
+                            "replace" : lookup("replace-bg", "#ddeeff"),
+                            "current-chunk-highlight":
+                                lookup("current-chunk-highlight", '#ffffff')}
         self.line_colors = {"insert"  : lookup("insert-outline", "#77f077"),
                             "delete"  : lookup("insert-outline", "#77f077"),
                             "conflict": lookup("conflict-outline", "#f0768b"),
@@ -1433,7 +1435,9 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
                 context.set_source_color(self.fill_colors[change[0]])
                 context.fill_preserve()
                 if self.linediffer.locate_chunk(pane, change[1])[0] == self.cursor.chunk:
-                    context.set_source_rgba(1.0, 1.0, 1.0, 0.5)
+                    h = self.fill_colors['current-chunk-highlight']
+                    context.set_source_rgba(
+                        h.red_float, h.green_float, h.blue_float, 0.5)
                     context.fill_preserve()
 
             context.set_source_color(self.line_colors[change[0]])
diff --git a/meld/linkmap.py b/meld/linkmap.py
index ed85a64..427999e 100644
--- a/meld/linkmap.py
+++ b/meld/linkmap.py
@@ -222,7 +222,9 @@ class LinkMap(gtk.DrawingArea):
 
             chunk_idx = self.filediff.linediffer.locate_chunk(left, c[1])[0]
             if chunk_idx == self.filediff.cursor.chunk:
-                context.set_source_rgba(1.0, 1.0, 1.0, 0.5)
+                h = self.fill_colors['current-chunk-highlight']
+                context.set_source_rgba(
+                    h.red_float, h.green_float, h.blue_float, 0.5)
                 context.fill_preserve()
 
             context.set_source_color(self.line_colors[c[0]])