ui.listselectors: Move template setup into a class decorator

Author: kaiw

meld/ui/bufferselectors.py

@@ -1,13 +1,13 @@
 
-from gi.repository import GLib
 from gi.repository import GObject
 from gi.repository import Gtk
 from gi.repository import GtkSource
 
-from meld.conf import _, ui_file
-from meld.ui.listselector import FilteredListSelector
+from meld.conf import _
+from meld.ui.listselector import FilteredListSelector, with_template_file
 
 
+@with_template_file('encoding-selector.ui')
 class EncodingSelector(FilteredListSelector, Gtk.Grid):
     # The subclassing here is weird; the Selector must directly
     # subclass Gtk.Grid, or the template building explodes.
@@ -33,18 +33,18 @@ def get_value_label(self, enc):
             name=enc.get_name(), charset=enc.get_charset())
 
 
-template = open(ui_file('encoding-selector.ui'), 'rb').read()
-template_bytes = GLib.Bytes.new(template)
-EncodingSelector.set_template(template_bytes)
-
-
 # SourceLangSelector was intially based on gedit's
 # GeditHighlightModeSelector
 # Copyright (C) 2013 - Ignacio Casal Quinteiro
 # Python translation and adaptations
 # Copyright (C) 2015, 2017 Kai Willadsen <kai.willadsen@gmail.com>
 
 
+# TODO: When there's proper pygobject support for widget templates,
+# make both selectors here use a generic UI file. We can't do this
+# currently due to subclassing issues.
+
+@with_template_file('language-selector.ui')
 class SourceLangSelector(FilteredListSelector, Gtk.Grid):
     # The subclassing here is weird; the Selector must directly
     # subclass Gtk.Grid, or the template building explodes.
@@ -72,11 +72,3 @@ def get_value_label(self, lang):
         if not lang:
             return _("Plain Text")
         return lang.get_name()
-
-
-# TODO: When there's proper pygobject support for widget templates,
-# make both selectors here use a generic UI file. We can't do this
-# currently due to subclassing issues.
-template = open(ui_file('language-selector.ui'), 'rb').read()
-template_bytes = GLib.Bytes.new(template)
-SourceLangSelector.set_template(template_bytes)

meld/ui/listselector.py

@@ -1,6 +1,22 @@
 
+from gi.repository import GLib
 from gi.repository import Gtk
 
+from meld.conf import ui_file
+
+
+def with_template_file(template_file):
+    """Class decorator for setting a widget template"""
+
+    def add_template(cls):
+        template_path = ui_file(template_file)
+        template = open(template_path, 'rb').read()
+        template_bytes = GLib.Bytes.new(template)
+        cls.set_template(template_bytes)
+        return cls
+
+    return add_template
+
 
 class TemplateHackMixin(object):