Movie list view: add date cell renderer, access cell renderers directly

Stop using set_data/get_data methods to get to the cell renderer objects.

diff --git a/src/movie-list-view.vala b/src/movie-list-view.vala
index 30a5780..a84654a 100644 (file)
--- a/src/movie-list-view.vala
+++ b/src/movie-list-view.vala
@@ -25,6 +25,10 @@ public class MovieListView : PannableArea {
        public TreeSortable sorted_store;
 
        private bool more_movies_available;
+       private CellRendererText title_renderer;
+       private CellRendererText secondary_renderer;
+       private CellRendererText rating_renderer;
+       private CellRendererText date_renderer;
 
        public signal void movie_activated (Movie movie);
 
@@ -67,37 +71,22 @@ public class MovieListView : PannableArea {
                // Add text to column
                var vbox_renderer = new CellRendererVBox ();
 
-               var renderer = new CellRendererText ();
-               renderer.yalign = 1.0f;
-               renderer.ellipsize = Pango.EllipsizeMode.END;
+               title_renderer = new CellRendererText ();
+               title_renderer.yalign = 1.0f;
+               title_renderer.ellipsize = Pango.EllipsizeMode.END;
 
-               vbox_renderer.append (renderer, true);
-               vbox_renderer.set_data ("title", renderer);
+               vbox_renderer.append (title_renderer, true);
 
                // Add secondary text to column (Genres, Director, etc.)
-               renderer = new CellRendererText ();
-               renderer.yalign = 0;
-               renderer.ellipsize = Pango.EllipsizeMode.END;
-
-               Pango.AttrList attr_list = new Pango.AttrList ();
-               var style = Gtk.rc_get_style_by_paths (Gtk.Settings.get_default (), "SmallSystemFont", null, typeof (void));
-               if (style != null) {
-                       var attr_font_desc = new Pango.AttrFontDesc (style.font_desc.copy ());
-                       attr_list.insert ((owned) attr_font_desc);
-               }
-               Gdk.Color color;
-               window.ensure_style ();
-               if (window.style.lookup_color ("SecondaryTextColor", out color)) {
-                       Pango.Attribute attr_color = Pango.attr_foreground_new (color.red, color.green, color.blue);
-                       attr_list.insert ((owned) attr_color);
-               }
-               renderer.attributes = attr_list;
+               secondary_renderer = new CellRendererText ();
+               secondary_renderer.yalign = 0;
+               secondary_renderer.ellipsize = Pango.EllipsizeMode.END;
+               secondary_renderer.attributes = get_attributes (window, "SmallSystemFont", "SecondaryColor");
 
-               vbox_renderer.append (renderer, true);
-               vbox_renderer.set_data ("secondary", renderer);
+               vbox_renderer.append (secondary_renderer, true);
 
                title_column.pack_start (vbox_renderer, true);
-               title_column.set_cell_data_func (vbox_renderer, vbox_data_func);
+               title_column.set_cell_data_func (vbox_renderer, title_data_func);
 
                tree.append_column (title_column);
 
@@ -105,7 +94,7 @@ public class MovieListView : PannableArea {
                sorted_store.set_sort_column_id (MovieListStore.Columns.TITLE, SortType.ASCENDING);
 
                // Year column
-               renderer = new CellRendererText ();
+               var renderer = new CellRendererText ();
                var year_column = new TreeViewColumn ();
                year_column.set_title (_("Rating"));
                year_column.set_sort_column_id (MovieListStore.Columns.YEAR);
@@ -116,15 +105,29 @@ public class MovieListView : PannableArea {
                tree.append_column (year_column);
 
                // Rating column
-               renderer = new CellRendererText ();
                var rating_column = new TreeViewColumn ();
                rating_column.set_title (_("Rating"));
                rating_column.set_sort_column_id (MovieListStore.Columns.RATING);
                rating_column.set_reorderable (false);
                rating_column.set_sort_order (SortType.DESCENDING);
-               rating_column.pack_start (renderer, true);
-               rating_column.set_cell_data_func (renderer, rating_data_func);
                rating_column.xalign = (float) 1.0;
+
+               vbox_renderer = new CellRendererVBox ();
+
+               rating_renderer = new CellRendererText ();
+       //      rating_renderer.yalign = 1.0f;
+
+               vbox_renderer.append (rating_renderer, true);
+
+               date_renderer = new CellRendererText ();
+               date_renderer.yalign = 0;
+               date_renderer.attributes = get_attributes (window, "SmallSystemFont", "SecondaryColor");
+
+       //      vbox_renderer.append (date_renderer, true);
+
+               rating_column.pack_start (vbox_renderer, true);
+               rating_column.set_cell_data_func (vbox_renderer, rating_data_func);
+
                tree.append_column (rating_column);
 
                // Connect signals
@@ -149,6 +152,22 @@ public class MovieListView : PannableArea {
                return tree.get_selection ();
        }
 
+       private Pango.AttrList get_attributes (Gtk.Window window, string font_name, string color_name) {
+               Pango.AttrList attr_list = new Pango.AttrList ();
+               var style = Gtk.rc_get_style_by_paths (Gtk.Settings.get_default (), font_name, null, typeof (void));
+               if (style != null) {
+                       var attr_font_desc = new Pango.AttrFontDesc (style.font_desc.copy ());
+                       attr_list.insert ((owned) attr_font_desc);
+               }
+               Gdk.Color color;
+               window.ensure_style ();
+               if (window.style.lookup_color (color_name, out color)) {
+                       Pango.Attribute attr_color = Pango.attr_foreground_new (color.red, color.green, color.blue);
+                       attr_list.insert ((owned) attr_color);
+               }
+               return attr_list;
+       }
+
        // TODO: after scrolling down 80% of the list, load more
        //       results if available.
        private void on_adjustment_value_changed () {
@@ -176,17 +195,12 @@ public class MovieListView : PannableArea {
                more_movies_available = (movies > 100); // FIXME
        }
 
-       private void vbox_data_func (CellLayout cell_layout, CellRenderer cell, TreeModel model, TreeIter iter) {
+       private void title_data_func (CellLayout cell_layout, CellRenderer cell, TreeModel model, TreeIter iter) {
                Movie movie;
-               CellRendererText renderer;
 
                model.get (iter, MovieListStore.Columns.MOVIE, out movie);
-
-               renderer = cell.get_data ("title");
-               renderer.text = movie.title;
-
-               renderer = cell.get_data ("secondary");
-               renderer.text = movie.secondary;
+               title_renderer.text = movie.title;
+               secondary_renderer.text = movie.secondary;
        }
 
        private void year_data_func (CellLayout cell_layout, CellRenderer cell, TreeModel model, TreeIter iter) {
@@ -198,8 +212,11 @@ public class MovieListView : PannableArea {
 
        private void rating_data_func (CellLayout cell_layout, CellRenderer cell, TreeModel model, TreeIter iter) {
                int rating;
+               Movie movie;
 
-               model.get (iter, MovieListStore.Columns.RATING, out rating);
-               ((CellRendererText) cell).text = (rating > 0) ? "%d.%d".printf (rating / 10, rating % 10) : "";
+               model.get (iter, MovieListStore.Columns.RATING, out rating,
+                                MovieListStore.Columns.MOVIE, out movie);
+               rating_renderer.text = (rating > 0) ? "%d.%d".printf (rating / 10, rating % 10) : "";
+               date_renderer.text = "%u".printf (movie.julian_date);
        }
 }