Merge lp:~sgringwe/beat-box/rating-merge into lp:beat-box

[Scott Ringwelski]

Merged your new rating widget.
I'm holding off on using the renderer though because it needs to behave as the widget does when hovering, otherwise it feels odd.

[Victor Martinez (victored)]

Looks fine to me. I can implement the on-hover stuff by letting the renderer be aware of the treeview or treeview column. Well, that's for later.

review: Approve

=== modified file 'src/Lists/GenericList.vala'
--- src/Lists/GenericList.vala	2012-06-02 19:34:06 +0000
+++ src/Lists/GenericList.vala	2012-06-20 02:00:29 +0000
@@ -140,8 +140,11 @@
 					insert_column_with_data_func(-1, tvc.title, new CellRendererText(), cellHelper.dateTreeViewFiller);
 				else if(tvc.title == "Last Played")
 					insert_column_with_data_func(-1, tvc.title, new CellRendererText(), cellHelper.dateTreeViewFiller);
-				else if(tvc.title == "Rating")
-					insert_column_with_data_func(-1, tvc.title, new CellRendererPixbuf(), cellHelper.ratingTreeViewFiller);
+				else if(tvc.title == "Rating") {
+					//var rating_renderer = new CellRendererRating();
+					//rating_renderer.rating_changed.connect(on_rating_cell_changed);
+					insert_column_with_data_func(-1, tvc.title, new CellRendererPixbuf() , cellHelper.ratingTreeViewFiller);
+				}
 				else if(tvc.title == "Year")
 					insert_column_with_data_func(-1, tvc.title, new CellRendererText(), cellHelper.intelligentTreeViewFiller);
 				else if(tvc.title == "#")
@@ -290,6 +293,19 @@
 		}
 	}
 	
+	// When the user clicks over a cell in the rating column, that cell renderer
+	// emits the rating_changed signal. We need to update that rating...
+	/*void on_rating_cell_changed (int new_rating, Gtk.Widget widget, string path, Gtk.CellRendererState flags) {
+		var m = get_media_from_index(int.parse(path));
+
+		if(m == null)
+			return;
+
+		m.rating = new_rating;
+		
+		lm.update_media(m, true, true, true);
+	}*/
+	
 	public void* take_action () {
 		Media s = get_selected_medias().nth_data(0);
 		if(s == null)

=== modified file 'src/Lists/MusicList.vala'
--- src/Lists/MusicList.vala	2012-06-18 21:45:00 +0000
+++ src/Lists/MusicList.vala	2012-06-20 02:00:29 +0000
@@ -49,7 +49,7 @@
 	Gtk.MenuItem mediaMenuQueue;
 	Gtk.MenuItem mediaMenuNewPlaylist;
 	Gtk.MenuItem mediaMenuAddToPlaylist; // make menu on fly
-	RatingWidgetMenu mediaRateMedia;
+	RatingMenuItem mediaRateMedia;
 	Gtk.MenuItem mediaRemove;
 	Gtk.MenuItem importToLibrary;
 	Gtk.MenuItem mediaScrollToCurrent;
@@ -231,7 +231,7 @@
 		mediaRemove = new Gtk.MenuItem.with_label(_("Remove Song"));
 		importToLibrary = new Gtk.MenuItem.with_label(_("Import to Library"));
 		mediaScrollToCurrent = new Gtk.MenuItem.with_label(_("Scroll to Current Song"));
-		mediaRateMedia = new RatingWidgetMenu();
+		mediaRateMedia = new RatingMenuItem();
 		mediaMenuActionMenu.append(mediaEditMedia);
 		mediaMenuActionMenu.append(mediaFileBrowse);
 		mediaMenuActionMenu.append(mediaRateMedia);

=== modified file 'src/Lists/PodcastList.vala'
--- src/Lists/PodcastList.vala	2012-06-18 21:45:00 +0000
+++ src/Lists/PodcastList.vala	2012-06-20 02:00:29 +0000
@@ -46,7 +46,7 @@
 	Gtk.MenuItem mediaMenuQueue;
 	Gtk.MenuItem mediaMenuNewPlaylist;
 	Gtk.MenuItem mediaMenuAddToPlaylist; // make menu on fly
-	RatingWidgetMenu mediaRateMedia;
+	RatingMenuItem mediaRateMedia;
 	Gtk.MenuItem mediaRemove;
 	Gtk.MenuItem mediaSaveLocally;
 	Gtk.MenuItem importToLibrary;
@@ -164,7 +164,7 @@
 		mediaRemove = new Gtk.MenuItem.with_label(_("Remove Episode"));
 		mediaSaveLocally = new Gtk.MenuItem.with_label(_("Download"));
 		importToLibrary = new Gtk.MenuItem.with_label(_("Import to Library"));
-		mediaRateMedia = new RatingWidgetMenu();
+		mediaRateMedia = new RatingMenuItem();
 		mediaMenuActionMenu.append(mediaEditMedia);
 		mediaMenuActionMenu.append(mediaFileBrowse);
 		mediaMenuActionMenu.append(mediaSaveLocally);

=== modified file 'src/Lists/RadioList.vala'
--- src/Lists/RadioList.vala	2012-06-01 22:48:28 +0000
+++ src/Lists/RadioList.vala	2012-06-20 02:00:29 +0000
@@ -34,7 +34,7 @@
 	Gtk.Menu mediaMenuActionMenu;
 	Gtk.MenuItem mediaEditMedia;
 	Gtk.MenuItem mediaRemove;
-	RatingWidgetMenu mediaRateMedia;
+	RatingMenuItem mediaRateMedia;
 	
 	public enum RadioColumn {
 		ROWID = 0,
@@ -100,7 +100,7 @@
 		mediaMenuActionMenu = new Gtk.Menu();
 		mediaEditMedia = new Gtk.MenuItem.with_label(_("Edit Station"));
 		mediaRemove = new Gtk.MenuItem.with_label(_("Remove Station"));
-		mediaRateMedia = new RatingWidgetMenu();
+		mediaRateMedia = new RatingMenuItem();
 		mediaMenuActionMenu.append(mediaEditMedia);
 		mediaMenuActionMenu.append(mediaRateMedia);
 		mediaMenuActionMenu.append(new SeparatorMenuItem());

=== modified file 'src/Views/NowPlayingView.vala'
--- src/Views/NowPlayingView.vala	2012-06-13 23:54:06 +0000
+++ src/Views/NowPlayingView.vala	2012-06-20 02:00:29 +0000
@@ -208,7 +208,7 @@
 		HBox rate_box = new HBox(false, 0);
 		loveMedia = new Button();
 		banMedia = new Button();
-		rating = new RatingWidget(null, true, IconSize.MENU);
+		rating = new RatingWidget(true, IconSize.MENU, false, null);
 		meta_year = new Label("");
 		summary_text = new Label("");
 		lyrics = new Label("");

=== modified file 'src/Views/PopupListView.vala'
--- src/Views/PopupListView.vala	2012-06-01 22:48:28 +0000
+++ src/Views/PopupListView.vala	2012-06-20 02:00:29 +0000
@@ -162,7 +162,7 @@
 		list_scroll.add(list);
 
 		// add rating
-		rating = new RatingWidget(get_style_context(), true, IconSize.BUTTON, true);
+		rating = new RatingWidget(true, IconSize.BUTTON, true, get_style_context());
 		rating.set_transparent (true);
 
 		var all_area = new Box(Orientation.VERTICAL, 0);

=== modified file 'src/Widgets/InfoPanel.vala'
--- src/Widgets/InfoPanel.vala	2012-06-01 22:48:28 +0000
+++ src/Widgets/InfoPanel.vala	2012-06-20 02:00:29 +0000
@@ -67,7 +67,7 @@
 		banMedia = new Button();
 		coverArt = new Gtk.Image();
 		coverArt.set_size_request (Icons.ALBUM_VIEW_IMAGE_SIZE, Icons.ALBUM_VIEW_IMAGE_SIZE);
-		rating = new RatingWidget(null, true, IconSize.MENU);
+		rating = new RatingWidget(true, IconSize.MENU, false, null);
 		album = new Label("Album");
 		year = new Label("Year");
 		ssv = new SimilarMediasView(lm, lw);

=== modified file 'src/Widgets/RatingWidget.vala'
--- src/Widgets/RatingWidget.vala	2012-05-03 04:19:07 +0000
+++ src/Widgets/RatingWidget.vala	2012-06-20 02:00:29 +0000
@@ -1,8 +1,9 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
 /*-
- * Copyright (c) 2011-2012       Scott Ringwelski <[e-mail]>
+ * Copyright (c) 2012 BeatBox Developers
  *
- * Originally Written by Scott Ringwelski for BeatBox Music Player
- * BeatBox Music Player: http://www.launchpad.net/beat-box
+ * Originally written by Lucas Baudin for BeatBox Music Player
+ * BeatBox Music Player: http://launchpad.net/beat-box
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -18,36 +19,73 @@
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
+ *
+ * Authored by: Lucas Baudin <[e-mail]>
+ *              Victor Eduardo <[e-mail]>
  */
-using Cairo;
-using Gtk;
-using Gdk;
 
+// When/if this widget ends up in Granite, we will use that.
+// Until then, follow normal BeatBox class naming scheme.
 public class BeatBox.RatingWidget : Gtk.EventBox {
-    internal int rating;
-
-    private int hover_rating;
-
-    private bool centered;
-    private bool menuItem;
-    private Pixbuf _canvas;
-    private Pixbuf not_starred;
-    private Pixbuf starred;
-
-    public signal void rating_changed(int new_rating);
-
-    public RatingWidget(Gtk.StyleContext? context, bool centered, IconSize size, bool symbolic = false) {
+
+    public signal void rating_changed (int new_rating);
+
+    private bool symbolic = false;
+    private Gtk.IconSize size = Gtk.IconSize.MENU;
+    private Gtk.StyleContext? context = null;
+
+    private int rating = 0;
+    private int hover_rating = 0;
+    private int n_stars = 5;
+    private int spacing = 0;
+
+    private int item_width = -1;
+    private int item_height = -1;
+
+    private bool centered = false;
+    protected bool is_menu_item = false;
+
+    private Gdk.Pixbuf _canvas;
+    private Gdk.Pixbuf not_starred;
+    private Gdk.Pixbuf starred;
+
+    /**
+     * It's not necessary to set a context. In most cases it should be 'null'.
+     */
+    public RatingWidget (bool centered, Gtk.IconSize size, bool symbolic = false, Gtk.StyleContext? ctx = null) {
         this.centered = centered;
-
-        if (context != null)  {
-            menuItem = context.has_class (Gtk.STYLE_CLASS_MENUITEM);
-            Gdk.RGBA color = context.get_background_color(Gtk.StateFlags.NORMAL);
-            set_background_color (color);
-        } else {
-            menuItem = false;
-            set_transparent (true);
-        }
-
+        this.symbolic = symbolic;
+        this.size = size;
+
+        if (ctx != null)
+            this.context = ctx;
+        else
+            this.context = get_style_context ();
+
+        this.context.changed.connect (render_stars);
+
+        this.is_menu_item = this.context.has_class (Gtk.STYLE_CLASS_MENUITEM);
+
+        set_transparent (true);
+        render_stars ();
+
+        // this handles size allocation and connects the draw signal as well
+        set_star_spacing (3);
+
+        // force a redraw...
+        redraw ();
+
+        add_events(Gdk.EventMask.BUTTON_PRESS_MASK
+                  | Gdk.EventMask.BUTTON_RELEASE_MASK
+                  | Gdk.EventMask.POINTER_MOTION_MASK
+                  | Gdk.EventMask.LEAVE_NOTIFY_MASK);
+
+        button_press_event.connect (on_button_press);
+        state_flags_changed.connect (render_stars);
+    }
+
+    private void render_stars () {
+        // TODO: This needs to be icon-system-independent in order to be included in Granite.
         if (symbolic) {
             starred = Icons.STARRED_SYMBOLIC.render (size, context);
             not_starred = Icons.NOT_STARRED_SYMBOLIC.render (size, context);
@@ -57,92 +95,155 @@
             not_starred = Icons.NOT_STARRED.render (size, null);
         }
 
-        width_request  = starred.width * 5;
-        height_request = starred.height;
-        _canvas = new Gdk.Pixbuf(Gdk.Colorspace.RGB, true, 8, width_request, height_request);
-
-        set_rating(0);
-        updateRating(0);
-
-        add_events(Gdk.EventMask.BUTTON_PRESS_MASK
-                  | Gdk.EventMask.BUTTON_RELEASE_MASK
-                  | Gdk.EventMask.POINTER_MOTION_MASK
-                  | Gdk.EventMask.LEAVE_NOTIFY_MASK);
-        //motion_notify_event.connect(mouseOver);
-        button_press_event.connect(buttonPress);
-        draw.connect(exposeEvent);
+        redraw ();
+    }
+
+    internal Gdk.Pixbuf get_canvas () {
+        return _canvas;
     }
 
     public void set_background_color (Gdk.RGBA color) {
         override_background_color (Gtk.StateFlags.NORMAL, color);
         override_background_color (Gtk.StateFlags.ACTIVE, color);
         override_background_color (Gtk.StateFlags.PRELIGHT, color);
+        redraw ();
     }
 
-	public void set_transparent (bool val) {
-		// Make the eventbox transparent
+    public void set_transparent (bool val) {
+        // Make the eventbox transparent
         this.set_above_child (val);
         this.set_visible_window (!val);
-	}
-
-    public override bool leave_notify_event(Gdk.EventCrossing ev) {
-        updateRating(rating);
-        return true;
-    }
-
-    public void set_rating(int new_rating) {
+    }
+
+    public void set_star_spacing (int spacing) {
+        if (spacing < 0) {
+            warning ("Spacing values must be equal or greater than 0");
+            return;
+        }
+
+        draw.disconnect (on_expose_event);
+
+        this.spacing = spacing;
+
+        // Decide size
+        item_width  = (starred.width  > not_starred.width)  ? starred.width  : not_starred.width;
+        item_height = (starred.height > not_starred.height) ? starred.height : not_starred.height;
+
+        width_request = item_width * n_stars + spacing * (n_stars - 1);
+        height_request = item_height;
+
+        // Generate canvas pixbuf
+        _canvas = new Gdk.Pixbuf (Gdk.Colorspace.RGB, true, 8, width_request, height_request);
+
+        draw.connect (on_expose_event);
+
+        redraw ();
+    }
+
+    public void redraw () {
+        // No need to duplicate code. update_rating() does exactly this
+        // and also calls queue_draw().
+        update_rating (rating);    
+    }
+
+    public int get_star_spacing () {
+        return spacing;
+    }
+
+    public void set_rating (int new_rating) {
         if(rating == new_rating)
             return;
 
-        rating = (new_rating > 5)? 5 : new_rating;
-        updateRating(rating);
+        rating = (new_rating > n_stars) ? n_stars : new_rating;
+        update_rating(rating);
         rating_changed(rating);
     }
 
-    public int get_rating() {
+    public int get_rating () {
         return rating;
     }
 
-    /** just draw new rating **/
-    public override bool motion_notify_event(EventMotion event) {
-        hover_rating = get_new_rating(event.x);
-        updateRating(hover_rating);
+    /**
+     * Returns the total number of stars. It also represents the maximum possible rating.
+     *
+     * @return total number of stars.
+     */
+    public int get_n_stars () {
+        return n_stars;
+    }
+
+    /**
+     * Sets the total number of stars. It also represents the maximum rating possible.
+     * That is, possible ratings are between 0 and n_stars.
+     *
+     * @param n_stars total number of stars. Allowed values: >= 0. Default: 5.
+     */
+    public void set_n_stars (int n_stars) {
+        if (this.n_stars == n_stars)
+            return;
+
+        if (n_stars <= 0) {
+            warning ("The number of stars must be greater than 0");
+            return;
+        }
+
+        this.n_stars = n_stars;
+
+        // Validate and potentially redraw current rating just in case...
+        set_rating (rating);
+
+        // Allocate new area
+        set_star_spacing (this.spacing);
+
+        redraw ();
+    }
+
+
+    /** Just draw new rating. Needed by menuitems **/
+    public override bool motion_notify_event (Gdk.EventMotion event) {
+        hover_rating = get_new_rating (event.x);
+        update_rating (hover_rating);
         return true;
     }
 
     /** draw new rating AND update rating **/
-    public virtual bool buttonPress(Gdk.EventButton event) {
-        set_rating(hover_rating);
-        return true;
-    }
-
-    public void updateRating(int fake_rating) {
-            _canvas.fill((uint) 0xffffff00);
-
-            /* generate the canvas image */
-
-            for (int i = 0; i < 5; i++) {
-                if (i < fake_rating) {
-                    starred.copy_area(0, 0, starred.width, starred.height, _canvas, i * starred.width, 0);
-                }
-                else {
-                    not_starred.copy_area(0, 0, not_starred.width, not_starred.height, _canvas, i * not_starred.width, 0);
-                }
-            }
-
-            queue_draw();
+    public virtual bool on_button_press (Gdk.EventButton event) {
+        set_rating (hover_rating);
+        return true;
+    }
+
+    public override bool leave_notify_event (Gdk.EventCrossing ev) {
+        update_rating (rating);
+        return true;
+    }
+
+    internal void update_rating (int fake_rating) {
+        if (_canvas == null)
+            return;
+
+        _canvas.fill ((uint)0xffffff00);
+
+        /* generate the canvas image */
+        for (int i = 0; i < n_stars; i++) {
+            if (i < fake_rating)
+                starred.copy_area (0, 0, item_width, item_height, _canvas, i * (item_width + (i > 0 ? spacing : 0)), 0);
+            else
+                not_starred.copy_area (0, 0, item_width, item_height, _canvas, i * (item_width + (i > 0 ? spacing : 0)), 0);
         }
 
+        queue_draw();
+    }
+
     /** @override on_expose_event to paint our own custom widget **/
-    public virtual bool exposeEvent(Cairo.Context cairo) {
-        Allocation al;
+    public virtual bool on_expose_event (Cairo.Context cairo) {
+        Gtk.Allocation al;
         get_allocation(out al);
 
         if(centered) {
-            Gdk.cairo_set_source_pixbuf(cairo, _canvas, (al.width - width_request) / 2, (al.height - height_request) / 2);
+            Gdk.cairo_set_source_pixbuf (cairo, _canvas, (al.width - width_request) / 2, (al.height - height_request) / 2);
         }
         else {
-            Gdk.cairo_set_source_pixbuf(cairo, _canvas, 0, 0);
+            Gdk.cairo_set_source_pixbuf (cairo, _canvas, 0,  (al.height - height_request) / 2);
         }
 
         cairo.paint();
@@ -150,65 +251,233 @@
         return true;
     }
 
-    private int get_new_rating(double x) {
+
+    /**
+     * Returns a new rating value between 0 and n_stars based on the cursor position
+     * (relative to the left side of the widget - x=0).
+     *
+     * LEGEND:
+     * X : A STAR
+     * - : SPACE
+     *
+     * |   x_offset   | | spacing | | spacing | | spacing | | spacing  ...  | remaining space...
+     * <-------------> X --------- X --------- X --------- X --------- ... X ------------->
+     * ... 0 stars    |   1 star  |  2 stars  |  3 stars  |   4 stars  ...| n_stars stars...
+     *
+     * The first row in the graphic above represents the values involved:
+     * - x_offset : the value added in front of the first star.
+     * - spacing  : space inserted between stars.
+     * - n_stars  : total number of stars. It also represents the maximum rating.
+     *
+     * If you want the next star to be activated when the cursor is at least halfway
+     * towards it, just modify x_offset. It should be similar for other cases as well.
+     *
+     * For instance:
+     *
+     *   x_offset = ... // compute offset
+     *   x_offset -= spacing / 2;
+     *
+     * Now the next rating will start halfway earlier, rather than at the start of every star
+     * (as shown in the representation above). Don't modify other values for this purpose!
+     */
+
+    internal int get_new_rating (double x) {
+        int x_offset = 0;
+
+        if (centered) {
+            Gtk.Allocation al;
+            get_allocation(out al);
+            x_offset = (al.width - width_request) / 2;
+        }
+
+        if (is_menu_item) // Workaround. Move the offset one star to the left for menuitems.
+            x_offset += (item_width + spacing);
+
+        // If you want the next rating (value, not actual star!) to begin in the middle
+        // between two stars, use:
+        //    x_offset -= (int) ((double)spacing / (1.0 - 1.0 / 2.0));
+        // For it to start when the cursor is 2/3 towards the next rating, use:
+        //    x_offset -= (int) ((double)spacing * (1.0 - 2.0/3.0));
+        // In general:
+        //    x_offset -= (int) ((double)spacing * (1.0 - f_num / f_den));
+
+        int cursor_x_pos = (int)x;
         int new_rating = 0;
 
-        Allocation al;
-        get_allocation(out al);
-
-        int offset = 0;
-        if(centered)
-            offset = (al.width - width_request) / 2;
-        else if(menuItem)
-            offset = (4 * starred.width) / 3;
-
-        if((int)x - offset > 5)
-            new_rating = ((int)x - offset + 12) / starred.width;
-        else
-            new_rating = 0;
+        for (int i = 0; i < n_stars; i++) {
+            if (cursor_x_pos > x_offset + i * (item_width + spacing))
+                new_rating ++;
+        }
 
         return new_rating;
     }
 }
 
-public class BeatBox.RatingWidgetMenu : Gtk.MenuItem {
-    RatingWidget rating;
-    public bool already_drawn = false;
+
+public class BeatBox.RatingMenuItem : Gtk.MenuItem {
+
+    protected RatingWidget rating;
 
     public int rating_value {
         get {
-            return rating.get_rating();
+            return rating.get_rating ();
         }
         set {
-            rating.set_rating(value);
+            rating.set_rating (value);
         }
     }
 
-    public RatingWidgetMenu() {
-        get_style_context().add_class(Gtk.STYLE_CLASS_MENU);
-        rating = new RatingWidget(get_style_context(), false, IconSize.MENU);
-        add(rating);
-    }
+    public RatingMenuItem () {
+        rating = new RatingWidget (false, Gtk.IconSize.MENU, false, get_style_context ());
+        add (rating);
+
+        // Force the NORMAL state flag
+        this.state_flags_changed.connect ( () => {
+            var current_flags = this.get_state_flags ();
+            if (current_flags != Gtk.StateFlags.NORMAL)
+                unset_state_flags (current_flags);
+        });
+    }
+
+    public void set_background_color (Gdk.RGBA color) {
+        rating.set_background_color (color);
+    }
+
+    public void set_transparent (bool val) {
+        rating.set_transparent (val);
+    }
+
+    public void set_star_spacing (int spacing) {
+        rating.set_star_spacing (spacing);
+    }
+
+    public int get_rating () {
+        return rating.get_rating ();
+    }
+
+    public void set_rating (int new_rating) {
+        rating.set_rating (new_rating);
+    }
+
+    public int get_star_spacing () {
+        return rating.get_star_spacing ();
+    }
+
+    public void set_n_stars (int n_stars) {
+        rating.set_n_stars (n_stars);
+    }
+
+    public int get_n_stars () {
+        return rating.get_n_stars ();
+    }
+
+    /**
+     * /!\ Don't use these methods
+     */
 
     public override bool motion_notify_event(Gdk.EventMotion ev) {
-        rating.motion_notify_event(ev);
+        rating.motion_notify_event (ev);
         rating.queue_draw();
         return true;
     }
 
-    public override bool draw(Cairo.Context context) {
-        already_drawn = true;
-        return false;
-    }
-
     public override bool button_press_event(Gdk.EventButton ev) {
-		rating.button_press_event(ev);
-		return false;
+        rating.button_press_event(ev);
+        activate();
+        return true;
     }
 
     public override bool leave_notify_event(Gdk.EventCrossing ev) {
-        rating.updateRating(rating.rating);
-        return true;
-    }
-}
-
+        rating.update_rating (rating_value);
+        return true;
+    }
+}
+
+public class BeatBox.CellRendererRating : Gtk.CellRendererPixbuf {
+
+    /** Only emmited when the rating changes by clicking over the cellrenderer **/
+    public signal void rating_changed (int new_rating, Gtk.Widget widget, string path,
+                                         Gtk.CellRendererState flags);
+
+    /**
+     * This class is here to make setting the rating from a cell possible.
+     * Unlike the other widgets, it only allows doing so by clicking over a
+     * star, and it's not possible to get an in-hover preview (it actually is
+     * but that would require this widget to be aware of the GtkTreeView).
+     *
+     * We use a normal rating widget. It does the drawing and all we need
+     * internally, and after that we set the rendered image as this cell renderer's
+     * pixbuf.
+     */
+    protected RatingWidget? rating = null;
+
+    public CellRendererRating (Gtk.IconSize icon_size = Gtk.IconSize.MENU) {
+        rating = new RatingWidget (false, icon_size);
+        this.pixbuf = rating.get_canvas ();
+
+        xalign = 0.0f; // left-aligned
+
+        // Make this cell renderer activatable. This allows receiving click (activate) events.
+        this.mode = Gtk.CellRendererMode.ACTIVATABLE;
+    }
+
+    /** Common Rating API functions **/
+
+    public void set_star_spacing (int spacing) {
+        rating.set_star_spacing (spacing);
+        this.pixbuf = rating.get_canvas ();
+        this.width = this.pixbuf.width;
+    }
+
+    public int get_star_spacing () {
+        return rating.get_star_spacing ();
+    }
+
+    public int get_rating () {
+        return rating.get_rating ();
+    }
+
+    public void set_rating (int new_rating) {
+        rating.set_rating (new_rating);
+        this.pixbuf = rating.get_canvas ();
+    }
+
+    public void set_n_stars (int n_stars) {
+        rating.set_n_stars (n_stars);
+        this.pixbuf = rating.get_canvas ();
+        this.width = this.pixbuf.width;
+    }
+
+    public int get_n_stars () {
+        return rating.get_n_stars ();
+    }
+
+    /** Handles activate events (clicks) **/
+    public override bool activate (Gdk.Event event, Gtk.Widget widget, string path,
+                                      Gdk.Rectangle background_area, Gdk.Rectangle cell_area,
+                                      Gtk.CellRendererState flags)
+    {
+        int old_rating = get_rating ();
+        int new_rating = rating.get_new_rating (event.button.x - (double) cell_area.x);
+
+        /* If the user clicks again over the same star, decrease the rating
+         * (i.e. "unset" the star)
+         */
+        if (new_rating == old_rating) {
+            new_rating--;
+        }
+
+        /* We don't re-draw automatically since doing so modifies the entire
+         * treeview column in most cases. Let's pass off the responsability to the
+         * rating_changed signal handler. It must take care of setting the new rating
+         * on the proper cell.
+         */
+        // rating.set_rating (new_rating);
+        //this.pixbuf = rating.get_canvas ();
+
+        // emit signal
+        rating_changed (new_rating, widget, path, flags);
+
+        return true;
+    }
+}

=== modified file 'src/Windows/Editors/PodcastEditor.vala'
--- src/Windows/Editors/PodcastEditor.vala	2012-06-13 23:54:06 +0000
+++ src/Windows/Editors/PodcastEditor.vala	2012-06-20 02:00:29 +0000
@@ -140,7 +140,7 @@
 		fields.set("Genre", new FieldEditor("Genre", sum.genre, new Entry()));
 		fields.set("Comment", new FieldEditor("Comment", sum.comment, new TextView()));
 		fields.set("Episode", new FieldEditor("Track", sum.track.to_string(), new SpinButton.with_range(0, 500, 1)));
-		fields.set("Rating", new FieldEditor("Rating", sum.rating.to_string(), new RatingWidget(null, false, IconSize.MENU)));
+		fields.set("Rating", new FieldEditor("Rating", sum.rating.to_string(), new RatingWidget(false, IconSize.MENU, false, null)));
 		fields.set("Media Type", new FieldEditor("Media Type", ((int)sum.mediatype).to_string(), new ComboBoxText()));
 		
 		padding = new HBox(false, 10);

=== modified file 'src/Windows/Editors/SongEditor.vala'
--- src/Windows/Editors/SongEditor.vala	2012-06-13 23:54:06 +0000
+++ src/Windows/Editors/SongEditor.vala	2012-06-20 02:00:29 +0000
@@ -185,7 +185,7 @@
 		fields.set("Track", new FieldEditor("Track", sum.track.to_string(), new SpinButton.with_range(0, 500, 1)));
 		fields.set("Disc", new FieldEditor("Disc", sum.album_number.to_string(), new SpinButton.with_range(0, 500, 1)));
 		fields.set("Year", new FieldEditor("Year", sum.year.to_string(), new SpinButton.with_range(0, 9999, 1)));
-		fields.set("Rating", new FieldEditor("Rating", sum.rating.to_string(), new RatingWidget(null, false, IconSize.MENU)));
+		fields.set("Rating", new FieldEditor("Rating", sum.rating.to_string(), new RatingWidget(false, IconSize.MENU, false, null)));
 		fields.set("Media Type", new FieldEditor("Media Type", ((int)sum.mediatype).to_string(), new ComboBoxText()));
 		
 		content = new VBox(false, 10);

=== modified file 'src/Windows/Editors/StationEditor.vala'
--- src/Windows/Editors/StationEditor.vala	2012-05-03 04:19:07 +0000
+++ src/Windows/Editors/StationEditor.vala	2012-06-20 02:00:29 +0000
@@ -126,7 +126,7 @@
 		
 		fields.set("Station", new FieldEditor("Station", sum.album_artist, new Entry()));
 		fields.set("Genre", new FieldEditor("Genre", sum.genre, new Entry()));
-		fields.set("Rating", new FieldEditor("Rating", sum.rating.to_string(), new RatingWidget(null, false, IconSize.MENU)));
+		fields.set("Rating", new FieldEditor("Rating", sum.rating.to_string(), new RatingWidget(false, IconSize.MENU, false, null)));
 		
 		padding = new HBox(false, 10);
 		vert = new VBox(false, 0);