[meld/VersionControlRework: 88/123] vcview: Move remaining cell renderer creation to UI file

[Kai Willadsen <kaiw src gnome org>]

commit 243d178aa4563d94026363369a398be6303a6bc6
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Apr 11 08:55:25 2015 +1000

    vcview: Move remaining cell renderer creation to UI file

 data/ui/vcview.ui       |    6 ++++++
 meld/ui/catalog.xml     |    2 ++
 meld/ui/gladesupport.py |    1 +
 meld/vcview.py          |   26 +++++++++++---------------
 4 files changed, 20 insertions(+), 15 deletions(-)
---
diff --git a/data/ui/vcview.ui b/data/ui/vcview.ui
index a7f91a0..1a446a8 100644
--- a/data/ui/vcview.ui
+++ b/data/ui/vcview.ui
@@ -511,6 +511,12 @@
                       <object class="GtkTreeViewColumn" id="name_column">
                         <property name="title" translatable="yes">Name</property>
                         <property name="resizable">True</property>
+                        <child>
+                          <object class="EmblemCellRenderer" id="emblem_renderer"/>
+                        </child>
+                        <child>
+                          <object class="GtkCellRendererText" id="name_renderer"/>
+                        </child>
                       </object>
                     </child>
                     <child>
diff --git a/meld/ui/catalog.xml b/meld/ui/catalog.xml
index 0bc2954..8941d7b 100644
--- a/meld/ui/catalog.xml
+++ b/meld/ui/catalog.xml
@@ -14,6 +14,7 @@
         <glade-widget-class title="MeldSourceView" name="MeldSourceView" generic-name="meldsourceview"/>
         <glade-widget-class title="MsgAreaController" name="MsgAreaController" 
generic-name="msgareacontroller"/>
         <glade-widget-class title="HistoryCombo" name="HistoryCombo" generic-name="historycombo"/>
+        <glade-widget-class title="EmblemCellRenderer" name="EmblemCellRenderer" 
generic-name="emblemcellrenderer"/>
     </glade-widget-classes>
 
     <glade-widget-group name="meld" title="Meld">
@@ -22,5 +23,6 @@
         <glade-widget-class-ref name="MeldSourceView"/>
         <glade-widget-class-ref name="MsgAreaController"/>
         <glade-widget-class-ref name="HistoryCombo"/>
+        <glade-widget-class-ref name="EmblemCellRenderer"/>
     </glade-widget-group>
 </glade-catalog>
diff --git a/meld/ui/gladesupport.py b/meld/ui/gladesupport.py
index ce77eae..4ea0442 100644
--- a/meld/ui/gladesupport.py
+++ b/meld/ui/gladesupport.py
@@ -4,6 +4,7 @@ from meld import diffmap
 from meld import linkmap
 from meld import preferences
 from meld import sourceview
+from meld.ui import emblemcellrenderer
 from meld.ui import historyentry
 from meld.ui import msgarea
 from meld.ui import statusbar
diff --git a/meld/vcview.py b/meld/vcview.py
index 7619b25..de0f863 100644
--- a/meld/vcview.py
+++ b/meld/vcview.py
@@ -198,21 +198,17 @@ class VcView(melddoc.MeldDoc, gnomeglade.Component):
         self.current_path, self.prev_path, self.next_path = None, None, None
 
         col_index = lambda col: self.model.column_index(col, 0)
-        column = self.name_column
-        renicon = emblemcellrenderer.EmblemCellRenderer()
-        column.pack_start(renicon, False)
-        column.set_attributes(renicon,
-                              icon_name=col_index(tree.COL_ICON),
-                              icon_tint=col_index(tree.COL_TINT))
-        rentext = Gtk.CellRendererText()
-        column.pack_start(rentext, True)
-        column.set_attributes(rentext,
-                              text=col_index(tree.COL_TEXT),
-                              foreground=col_index(tree.COL_FG),
-                              style=col_index(tree.COL_STYLE),
-                              weight=col_index(tree.COL_WEIGHT),
-                              strikethrough=col_index(tree.COL_STRIKE))
-
+        self.name_column.set_attributes(
+            self.emblem_renderer,
+            icon_name=col_index(tree.COL_ICON),
+            icon_tint=col_index(tree.COL_TINT))
+        self.name_column.set_attributes(
+            self.name_renderer,
+            text=col_index(tree.COL_TEXT),
+            foreground=col_index(tree.COL_FG),
+            style=col_index(tree.COL_STYLE),
+            weight=col_index(tree.COL_WEIGHT),
+            strikethrough=col_index(tree.COL_STRIKE))
         self.location_column.set_attributes(
             self.location_renderer, markup=col_index(COL_LOCATION))
         self.status_column.set_attributes(