gutterrendererchunk: Refactor some ugliness and create new consts module

Author: kaiw

meld/const.py

@@ -0,0 +1,5 @@
+
+# Chunk action mode, set by filediff and used in gutterrendererchunk
+MODE_REPLACE = 0
+MODE_DELETE = 1
+MODE_INSERT = 2

meld/filediff.py

@@ -45,6 +45,7 @@
 from .ui import findbar
 from .ui import gnomeglade
 
+from meld.const import MODE_REPLACE, MODE_DELETE, MODE_INSERT
 from meld.settings import meldsettings, settings
 from .util.compat import text_type
 from meld.sourceview import LanguageManager
@@ -103,7 +104,6 @@ def clean(self, size_hint):
 
 
 MASK_SHIFT, MASK_CTRL = 1, 2
-MODE_REPLACE, MODE_DELETE, MODE_INSERT = 0, 1, 2
 
 
 class CursorDetails(object):

meld/gutterrendererchunk.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 Kai Willadsen <kai.willadsen@gmail.com>
+# Copyright (C) 2013-2014 Kai Willadsen <kai.willadsen@gmail.com>
 #
 # 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
@@ -17,34 +17,32 @@
 from gi.repository import GtkSource
 
 from meld.conf import _
+from meld.const import MODE_REPLACE, MODE_DELETE, MODE_INSERT
 
+# Fixed size of the renderer. Ideally this would be font-dependent and
+# would adjust to other textview attributes, but that's both quite difficult
+# and not necessarily desirable.
+LINE_HEIGHT = 16
 
-# FIXME: This is obviously beyond horrible
-line_height = 16
-icon_theme = Gtk.IconTheme.get_default()
-load = lambda x: icon_theme.load_icon(x, line_height, 0)
-pixbuf_apply0 = load("meld-change-apply-right")
-pixbuf_apply1 = load("meld-change-apply-left")
-pixbuf_delete = load("meld-change-delete")
-pixbuf_copy = load("meld-change-copy")
 
-# FIXME: import order issues
-MODE_REPLACE, MODE_DELETE, MODE_INSERT = 0, 1, 2
+def load(icon_name):
+    icon_theme = Gtk.IconTheme.get_default()
+    return icon_theme.load_icon(icon_name, LINE_HEIGHT, 0)
 
 
 class GutterRendererChunkAction(GtkSource.GutterRendererPixbuf):
     __gtype_name__ = "GutterRendererChunkAction"
 
     ACTION_MAP = {
         'LTR': {
-            MODE_REPLACE: pixbuf_apply0,
-            MODE_DELETE: pixbuf_delete,
-            MODE_INSERT: pixbuf_copy,
+            MODE_REPLACE: load("meld-change-apply-right"),
+            MODE_DELETE: load("meld-change-delete"),
+            MODE_INSERT: load("meld-change-copy"),
         },
         'RTL': {
-            MODE_REPLACE: pixbuf_apply1,
-            MODE_DELETE: pixbuf_delete,
-            MODE_INSERT: pixbuf_copy,
+            MODE_REPLACE: load("meld-change-apply-left"),
+            MODE_DELETE: load("meld-change-delete"),
+            MODE_INSERT: load("meld-change-copy"),
         }
     }
 
@@ -58,7 +56,7 @@ def __init__(self, from_pane, to_pane, views, filediff, linediffer):
         # FIXME: Don't pass in the linediffer; pass a generator like elsewhere
         self.linediffer = linediffer
         self.mode = MODE_REPLACE
-        self.set_size(line_height)
+        self.set_size(LINE_HEIGHT)
         direction = 'LTR' if from_pane < to_pane else 'RTL'
         self.action_map = self.ACTION_MAP[direction]
         self.filediff = filediff