GNOME.org
 

rhythmbox r6060 - in trunk: . data/glade plugins/iradio podcast widgets

Author: jmatthew
Date: Sun Nov 16 11:21:57 2008
New Revision: 6060
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=6060&view=rev

Log:
2008-11-16  Jonathan Matthew  <jonathan d14n org>

	patch partly by:  Patrick Wade  <patrick wade sun com>
	
	* plugins/iradio/rb-station-properties-dialog.c:
	(rb_station_properties_dialog_constructor):
	* podcast/rb-feed-podcast-properties-dialog.c:
	* podcast/rb-podcast-properties-dialog.c:
	(rb_podcast_properties_dialog_init):
	* widgets/rb-song-info.c: (rb_song_info_constructor):
	* data/glade/song-info.glade:
	Add relationships between the 'rating' label and the rating widget.

	* widgets/rb-rating-helper.c: (rb_rating_set_accessible_name):
	* widgets/rb-rating-helper.h:
	Add helper function for setting the accessible name of a rating widget
	to describe the current rating.

	* widgets/rb-rating.c: (rb_rating_class_init), (rb_rating_init),
	(rb_rating_set_rating), (rb_rating_set_property), (rb_rating_new),
	(rb_rating_realize), (rb_rating_expose),
	(rb_rating_button_press_cb), (rb_rating_set_rating_cb),
	(rb_rating_adjust_rating_cb), (rb_rating_focus):
	* widgets/rb-rating.h:
	Add key bindings to adjust the rating, set the accessible name of the
	widget when the rating changes.

	From #368641.


Modified:
   trunk/ChangeLog
   trunk/data/glade/song-info.glade
   trunk/plugins/iradio/rb-station-properties-dialog.c
   trunk/podcast/rb-feed-podcast-properties-dialog.c
   trunk/podcast/rb-podcast-properties-dialog.c
   trunk/widgets/rb-rating-helper.c
   trunk/widgets/rb-rating-helper.h
   trunk/widgets/rb-rating.c
   trunk/widgets/rb-rating.h
   trunk/widgets/rb-song-info.c

Modified: trunk/data/glade/song-info.glade
==============================================================================
--- trunk/data/glade/song-info.glade	(original)
+++ trunk/data/glade/song-info.glade	Sun Nov 16 11:21:57 2008
@@ -902,7 +902,6 @@
 	      <property name="yalign">0</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">song_info_rating_container</property>
 	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 	      <property name="width_chars">-1</property>
 	      <property name="single_line_mode">False</property>
@@ -923,6 +922,7 @@
 	      <property name="visible">True</property>
 	      <property name="homogeneous">False</property>
 	      <property name="spacing">0</property>
+	      <property name="can_focus">False</property>
 
 	      <child>
 		<placeholder/>

Modified: trunk/plugins/iradio/rb-station-properties-dialog.c
==============================================================================
--- trunk/plugins/iradio/rb-station-properties-dialog.c	(original)
+++ trunk/plugins/iradio/rb-station-properties-dialog.c	Sun Nov 16 11:21:57 2008
@@ -161,6 +161,7 @@
 	RBStationPropertiesDialog *dialog;
 	GladeXML *xml;
 	char *gladefile;
+	AtkObject *lobj, *robj;
 
 	dialog = RB_STATION_PROPERTIES_DIALOG (G_OBJECT_CLASS (rb_station_properties_dialog_parent_class)
 			->constructor (type, n_construct_properties, construct_properties));
@@ -221,6 +222,14 @@
 				 G_OBJECT (dialog), 0);
 	gtk_container_add (GTK_CONTAINER (glade_xml_get_widget (xml, "ratingVBox")),
 			   dialog->priv->rating);
+
+	/* add relationship between the rating label and the rating widget */
+	lobj = gtk_widget_get_accessible (glade_xml_get_widget (xml, "ratingLabel"));
+	robj = gtk_widget_get_accessible (dialog->priv->rating);
+
+	atk_object_add_relationship (lobj, ATK_RELATION_LABEL_FOR, robj);
+	atk_object_add_relationship (robj, ATK_RELATION_LABELLED_BY, lobj);
+
 	g_object_unref (xml);
 
 	return G_OBJECT (dialog);

Modified: trunk/podcast/rb-feed-podcast-properties-dialog.c
==============================================================================
--- trunk/podcast/rb-feed-podcast-properties-dialog.c	(original)
+++ trunk/podcast/rb-feed-podcast-properties-dialog.c	Sun Nov 16 11:21:57 2008
@@ -42,7 +42,6 @@
 #include "rb-file-helpers.h"
 #include "rb-glade-helpers.h"
 #include "rb-dialog.h"
-#include "rb-rating.h"
 #include "rb-cut-and-paste-code.h"
 #include "rhythmdb.h"
 

Modified: trunk/podcast/rb-podcast-properties-dialog.c
==============================================================================
--- trunk/podcast/rb-podcast-properties-dialog.c	(original)
+++ trunk/podcast/rb-podcast-properties-dialog.c	Sun Nov 16 11:21:57 2008
@@ -137,6 +137,7 @@
 rb_podcast_properties_dialog_init (RBPodcastPropertiesDialog *dialog)
 {
 	GladeXML *xml;
+	AtkObject *lobj, *robj;
 
 	dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE (dialog,
 						    RB_TYPE_PODCAST_PROPERTIES_DIALOG,
@@ -197,6 +198,14 @@
 				 G_OBJECT (dialog), 0);
 	gtk_container_add (GTK_CONTAINER (glade_xml_get_widget (xml, "ratingVBox")),
 			   dialog->priv->rating);
+
+	/* add relationship between the rating label and the rating widget */
+	lobj = gtk_widget_get_accessible (glade_xml_get_widget (xml, "ratingDescLabel"));
+	robj = gtk_widget_get_accessible (dialog->priv->rating);
+	
+	atk_object_add_relationship (lobj, ATK_RELATION_LABEL_FOR, robj);
+	atk_object_add_relationship (robj, ATK_RELATION_LABELLED_BY, lobj);
+
 	g_object_unref (G_OBJECT (xml));
 }
 

Modified: trunk/widgets/rb-rating-helper.c
==============================================================================
--- trunk/widgets/rb-rating-helper.c	(original)
+++ trunk/widgets/rb-rating-helper.c	Sun Nov 16 11:21:57 2008
@@ -30,10 +30,15 @@
 
 #include "config.h"
 
+#include <math.h>
+
+#include <glib/gi18n.h>
+
 #include "rb-cut-and-paste-code.h"
 #include "rb-rating-helper.h"
 #include "rb-stock-icons.h"
 
+
 /**
  * SECTION:rb-rating-helper
  * @short_description: helper functions for displaying song ratings
@@ -281,3 +286,32 @@
 
 	return rating;
 }
+
+/**
+ * rb_rating_set_accessible_name:
+ * @widget: a #GtkWidget for which to set the accessible name
+ * @rating: the rating value to set
+ *
+ * Sets the accessible object name for the specified widget to reflect the
+ * rating.
+ */
+void
+rb_rating_set_accessible_name (GtkWidget *widget, gdouble rating)
+{
+	AtkObject *aobj;
+	int stars;
+	char *aname;
+
+	aobj = gtk_widget_get_accessible (widget);
+
+	stars = floor (rating);
+	if (stars == 0) {
+		aname = g_strdup (_("No Stars"));		/* is this really necessary */
+	} else {
+		aname = g_strdup_printf (ngettext ("%d Star", "%d Stars", stars), stars);
+	}
+
+	atk_object_set_name (aobj, aname);
+	g_free (aname);
+}
+

Modified: trunk/widgets/rb-rating-helper.h
==============================================================================
--- trunk/widgets/rb-rating-helper.h	(original)
+++ trunk/widgets/rb-rating-helper.h	Sun Nov 16 11:21:57 2008
@@ -52,4 +52,6 @@
 
 void   rb_rating_install_rating_property (GObjectClass *klass, gulong prop);
 
+void	rb_rating_set_accessible_name (GtkWidget *widget, gdouble rating);
+
 #endif

Modified: trunk/widgets/rb-rating.c
==============================================================================
--- trunk/widgets/rb-rating.c	(original)
+++ trunk/widgets/rb-rating.c	Sun Nov 16 11:21:57 2008
@@ -32,6 +32,7 @@
 
 #include <string.h>
 #include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
 
 #include "rb-rating.h"
 #include "rb-rating-helper.h"
@@ -44,11 +45,6 @@
 /* Vertical offset */
 #define Y_OFFSET 2
 
-/* Number of stars */
-#define MAX_SCORE 5
-
-#define COLOR_OFFSET 120
-
 static void rb_rating_class_init (RBRatingClass *class);
 static void rb_rating_init (RBRating *label);
 static void rb_rating_finalize (GObject *object);
@@ -60,13 +56,16 @@
 				    guint param_id,
 				    const GValue *value,
 				    GParamSpec *pspec);
+static void rb_rating_realize (GtkWidget *widget);
 static void rb_rating_size_request (GtkWidget *widget,
 				    GtkRequisition *requisition);
 static gboolean rb_rating_expose (GtkWidget *widget,
 				  GdkEventExpose *event);
+static gboolean rb_rating_focus (GtkWidget *widget, GtkDirectionType direction);
+static gboolean rb_rating_set_rating_cb (RBRating *rating, gdouble score);
+static gboolean rb_rating_adjust_rating_cb (RBRating *rating, gdouble adjust);
 static gboolean rb_rating_button_press_cb (GtkWidget *widget,
-					   GdkEventButton *event,
-					   RBRating *rating);
+					   GdkEventButton *event);
 
 struct _RBRatingPrivate
 {
@@ -74,7 +73,7 @@
 	RBRatingPixbufs *pixbufs;
 };
 
-G_DEFINE_TYPE (RBRating, rb_rating, GTK_TYPE_EVENT_BOX)
+G_DEFINE_TYPE (RBRating, rb_rating, GTK_TYPE_WIDGET)
 #define RB_RATING_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), RB_TYPE_RATING, RBRatingPrivate))
 
 /**
@@ -94,6 +93,8 @@
 enum
 {
 	RATED,
+	SET_RATING,
+	ADJUST_RATING,
 	LAST_SIGNAL
 };
 
@@ -104,6 +105,7 @@
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 	GtkWidgetClass *widget_class;
+	GtkBindingSet *binding_set;
 
 	widget_class = (GtkWidgetClass*) klass;
 
@@ -111,8 +113,14 @@
 	object_class->get_property = rb_rating_get_property;
 	object_class->set_property = rb_rating_set_property;
 
+	widget_class->realize = rb_rating_realize;
 	widget_class->expose_event = rb_rating_expose;
 	widget_class->size_request = rb_rating_size_request;
+	widget_class->button_press_event = rb_rating_button_press_cb;
+	widget_class->focus = rb_rating_focus;
+
+	klass->set_rating = rb_rating_set_rating_cb;
+	klass->adjust_rating = rb_rating_adjust_rating_cb;
 
 	/**
 	 * RBRating:rating:
@@ -139,7 +147,42 @@
 			      G_TYPE_NONE,
 			      1,
 			      G_TYPE_DOUBLE);
+	rb_rating_signals[SET_RATING] =
+		g_signal_new ("set-rating",
+			      G_OBJECT_CLASS_TYPE (object_class),
+			      G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+			      G_STRUCT_OFFSET (RBRatingClass, set_rating),
+			      NULL, NULL,
+			      g_cclosure_marshal_VOID__DOUBLE,
+			      G_TYPE_NONE,
+			      1,
+			      G_TYPE_DOUBLE);
+	rb_rating_signals[ADJUST_RATING] =
+		g_signal_new ("adjust-rating",
+			      G_OBJECT_CLASS_TYPE (object_class),
+			      G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+			      G_STRUCT_OFFSET (RBRatingClass, adjust_rating),
+			      NULL, NULL,
+			      g_cclosure_marshal_VOID__DOUBLE,
+			      G_TYPE_NONE,
+			      1,
+			      G_TYPE_DOUBLE);
 
+	binding_set = gtk_binding_set_by_class (klass);
+	gtk_binding_entry_add_signal (binding_set, GDK_Home, 0, "set-rating", 1, G_TYPE_DOUBLE, 0.0);
+	gtk_binding_entry_add_signal (binding_set, GDK_End, 0, "set-rating", 1, G_TYPE_DOUBLE, (double)RB_RATING_MAX_SCORE);
+
+	gtk_binding_entry_add_signal (binding_set, GDK_equal, 0, "adjust-rating", 1, G_TYPE_DOUBLE, 1.0);
+	gtk_binding_entry_add_signal (binding_set, GDK_plus, 0, "adjust-rating", 1, G_TYPE_DOUBLE, 1.0);
+	gtk_binding_entry_add_signal (binding_set, GDK_KP_Add, 0, "adjust-rating", 1, G_TYPE_DOUBLE, 1.0);
+	gtk_binding_entry_add_signal (binding_set, GDK_Right, 0, "adjust-rating", 1, G_TYPE_DOUBLE, 1.0);
+	gtk_binding_entry_add_signal (binding_set, GDK_KP_Right, 0, "adjust-rating", 1, G_TYPE_DOUBLE, 1.0);
+	
+	gtk_binding_entry_add_signal (binding_set, GDK_minus, 0, "adjust-rating", 1, G_TYPE_DOUBLE, -1.0);
+	gtk_binding_entry_add_signal (binding_set, GDK_KP_Subtract, 0, "adjust-rating", 1, G_TYPE_DOUBLE, -1.0);
+	gtk_binding_entry_add_signal (binding_set, GDK_Left, 0, "adjust-rating", 1, G_TYPE_DOUBLE, -1.0);
+	gtk_binding_entry_add_signal (binding_set, GDK_KP_Left, 0, "adjust-rating", 1, G_TYPE_DOUBLE, -1.0);
+	
 	g_type_class_add_private (klass, sizeof (RBRatingPrivate));
 }
 
@@ -150,12 +193,8 @@
 
 	/* create the needed icons */
 	rating->priv->pixbufs = rb_rating_pixbufs_new ();
-
-	/* register some signals */
-	g_signal_connect_object (G_OBJECT (rating),
-				 "button_press_event",
-				 G_CALLBACK (rb_rating_button_press_cb),
-				 rating, 0);
+	
+	rb_rating_set_accessible_name (GTK_WIDGET (rating), 0.0);
 }
 
 static void
@@ -191,17 +230,35 @@
 }
 
 static void
+rb_rating_set_rating (RBRating *rating, gdouble value)
+{
+	/* clip to the value rating range */
+	if (value > RB_RATING_MAX_SCORE) {
+		value = RB_RATING_MAX_SCORE;
+	} else if (value < 0.0) {
+		value = 0.0;
+	}
+
+	rating->priv->rating = value;
+
+	/* update accessible object name */
+	rb_rating_set_accessible_name (GTK_WIDGET (rating), value);
+
+	gtk_widget_queue_draw (GTK_WIDGET (rating));
+}
+
+
+static void
 rb_rating_set_property (GObject *object,
 			guint param_id,
 			const GValue *value,
 			GParamSpec *pspec)
 {
-	RBRating *rating= RB_RATING (object);
+	RBRating *rating = RB_RATING (object);
 
 	switch (param_id) {
 	case PROP_RATING:
-		rating->priv->rating = g_value_get_double (value);
-		gtk_widget_queue_draw (GTK_WIDGET (rating));
+		rb_rating_set_rating (rating, g_value_get_double (value));
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
@@ -219,7 +276,7 @@
 {
 	RBRating *rating;
 
-	rating = g_object_new (RB_TYPE_RATING, NULL, NULL);
+	rating = g_object_new (RB_TYPE_RATING, NULL);
 
 	g_return_val_if_fail (rating->priv != NULL, NULL);
 
@@ -227,6 +284,33 @@
 }
 
 static void
+rb_rating_realize (GtkWidget *widget)
+{
+	GdkWindowAttr attributes;
+	int attributes_mask;
+
+	GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED | GTK_CAN_FOCUS);
+
+	attributes.x = widget->allocation.x;
+	attributes.y = widget->allocation.y;
+	attributes.width = widget->allocation.width;
+	attributes.height = widget->allocation.height;
+	attributes.wclass = GDK_INPUT_OUTPUT;
+	attributes.window_type = GDK_WINDOW_CHILD;
+	attributes.event_mask = gtk_widget_get_events (widget) | GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_FOCUS_CHANGE_MASK;
+	attributes.visual = gtk_widget_get_visual (widget);
+	attributes.colormap = gtk_widget_get_colormap (widget);
+
+	attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
+	widget->window = gdk_window_new (gtk_widget_get_parent_window (widget), &attributes, attributes_mask);
+	widget->style = gtk_style_attach (widget->style, widget->window);
+
+	gdk_window_set_user_data (widget->window, widget);
+
+	gtk_style_set_background (widget->style, widget->window, GTK_STATE_ACTIVE);
+}
+
+static void
 rb_rating_size_request (GtkWidget *widget,
 			GtkRequisition *requisition)
 {
@@ -244,41 +328,46 @@
 rb_rating_expose (GtkWidget *widget,
 		  GdkEventExpose *event)
 {
-	int icon_size;
 	gboolean ret;
+	RBRating *rating;
+	int x = 0;
+	int y = 0;
+	int width;
+	int height;
+	int focus_width;
 
 	g_return_val_if_fail (RB_IS_RATING (widget), FALSE);
-
-	gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &icon_size, NULL);
+	if (GTK_WIDGET_DRAWABLE (widget) == FALSE) {
+		return FALSE;
+	}
 
 	ret = FALSE;
+	rating = RB_RATING (widget);
 
-	if (GTK_WIDGET_DRAWABLE (widget) == TRUE) {
-		RBRating *rating = RB_RATING (widget);
+	gdk_drawable_get_size (widget->window, &width, &height);
 
-		/* make the widget prettier */
-		gtk_paint_flat_box (widget->style, widget->window,
-				    GTK_STATE_NORMAL, GTK_SHADOW_IN,
-				    NULL, widget, "entry_bg", 0, 0,
-				    widget->allocation.width,
-				    widget->allocation.height);
-
-		gtk_paint_shadow (widget->style, widget->window,
-				  GTK_STATE_NORMAL, GTK_SHADOW_IN,
-				  NULL, widget, "text", 0, 0,
-				  widget->allocation.width,
-				  widget->allocation.height);
-
-		/* draw the stars */
-		if (rating->priv->pixbufs != NULL) {
-			ret = rb_rating_render_stars (widget,
-						      widget->window,
-						      rating->priv->pixbufs,
-						      0, 0,
-						      X_OFFSET, Y_OFFSET,
-						      rating->priv->rating,
-						      FALSE);
-		}
+	gtk_widget_style_get (widget, "focus-line-width", &focus_width, NULL);
+	if (GTK_WIDGET_HAS_FOCUS (widget)) {
+		x += focus_width;
+		y += focus_width;
+		width -= 2 * focus_width;
+		height -= 2 * focus_width;
+	}
+
+	gtk_paint_flat_box (widget->style, widget->window,
+			    GTK_STATE_NORMAL, GTK_SHADOW_IN,
+			    NULL, widget, "entry_bg", x, y,
+			    width, height);
+
+	/* draw the stars */
+	if (rating->priv->pixbufs != NULL) {
+		ret = rb_rating_render_stars (widget,
+					      widget->window,
+					      rating->priv->pixbufs,
+					      0, 0,
+					      X_OFFSET, Y_OFFSET,
+					      rating->priv->rating,
+					      FALSE);
 	}
 
 	return ret;
@@ -286,14 +375,16 @@
 
 static gboolean
 rb_rating_button_press_cb (GtkWidget *widget,
-			   GdkEventButton *event,
-			   RBRating *rating)
+			   GdkEventButton *event)
 {
 	int mouse_x, mouse_y;
 	double new_rating;
-
+	RBRating *rating;
+	
 	g_return_val_if_fail (widget != NULL, FALSE);
-	g_return_val_if_fail (RB_IS_RATING (rating), FALSE);
+	g_return_val_if_fail (RB_IS_RATING (widget), FALSE);
+
+	rating = RB_RATING (widget);
 
 	gtk_widget_get_pointer (widget, &mouse_x, &mouse_y);
 
@@ -301,12 +392,33 @@
 						       widget->allocation.width,
 						       rating->priv->rating);
 
-	if (new_rating == -1.0) {
-		return FALSE;
-	} else {
+	if (new_rating > -0.0001) {
 		g_signal_emit (G_OBJECT (rating),
 			       rb_rating_signals[RATED],
 			       0, new_rating);
-		return TRUE;
 	}
+
+	gtk_widget_grab_focus (widget);
+
+	return FALSE;
+}
+
+static gboolean
+rb_rating_set_rating_cb (RBRating *rating, gdouble score)
+{
+	rb_rating_set_rating (rating, score);
+	return TRUE;
+}
+
+static gboolean
+rb_rating_adjust_rating_cb (RBRating *rating, gdouble adjust)
+{
+	rb_rating_set_rating (rating, rating->priv->rating + adjust);
+	return TRUE;
+}
+
+static gboolean
+rb_rating_focus (GtkWidget *widget, GtkDirectionType direction)
+{
+	return (GTK_WIDGET_CLASS (rb_rating_parent_class))->focus (widget, direction);
 }

Modified: trunk/widgets/rb-rating.h
==============================================================================
--- trunk/widgets/rb-rating.h	(original)
+++ trunk/widgets/rb-rating.h	Sun Nov 16 11:21:57 2008
@@ -46,16 +46,18 @@
 
 struct _RBRating
 {
-	GtkEventBox parent;
+	GtkWidget parent;
 
 	RBRatingPrivate *priv;
 };
 
 struct _RBRatingClass
 {
-	GtkEventBoxClass parent;
+	GtkWidgetClass parent;
 
 	void (*rated) (RBRating *rating, double score);
+	gboolean (*set_rating) (RBRating *rating, double score);
+	gboolean (*adjust_rating) (RBRating *rating, double adjust);
 };
 
 GtkType    rb_rating_get_type (void);

Modified: trunk/widgets/rb-song-info.c
==============================================================================
--- trunk/widgets/rb-song-info.c	(original)
+++ trunk/widgets/rb-song-info.c	Sun Nov 16 11:21:57 2008
@@ -446,6 +446,7 @@
 	GList *tem;
 	gboolean editable = TRUE;
 	RBShell *shell;
+	AtkObject *lobj, *robj;
 
 	klass = RB_SONG_INFO_CLASS (g_type_class_peek (RB_TYPE_SONG_INFO));
 
@@ -541,6 +542,13 @@
 	gtk_container_add (GTK_CONTAINER (glade_xml_get_widget (xml, "song_info_rating_container")),
 			   song_info->priv->rating);
 
+	/* add relationship between the rating label and the rating widget */
+	lobj = gtk_widget_get_accessible (glade_xml_get_widget (xml, "rating_label"));
+	robj = gtk_widget_get_accessible (song_info->priv->rating);
+
+	atk_object_add_relationship (lobj, ATK_RELATION_LABEL_FOR, robj);
+	atk_object_add_relationship (robj, ATK_RELATION_LABELLED_BY, lobj);
+
 	gtk_editable_set_editable (GTK_EDITABLE (song_info->priv->artist), editable);
 	gtk_editable_set_editable (GTK_EDITABLE (song_info->priv->album), editable);
 	gtk_editable_set_editable (GTK_EDITABLE (song_info->priv->genre), editable);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]