rhythmbox r5752 - in trunk: . plugins/audioscrobbler plugins/cd-recorder plugins/iradio shell sources

[jmatthew svn gnome org]

Author: jmatthew
Date: Sun Jun 15 12:33:43 2008
New Revision: 5752
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=5752&view=rev

Log:
2008-06-15  Jonathan Matthew  <jonathan d14n org>

	patch by: Luca Ferretti  <elle uca libero it>

	* plugins/audioscrobbler/rb-lastfm-source.c:
	* plugins/cd-recorder/rb-cd-recorder-plugin.c: (impl_activate):
	* plugins/iradio/rb-iradio-source.c:
	(rb_iradio_source_constructor):
	* shell/rb-removable-media-manager.c:
	(rb_removable_media_manager_set_uimanager):
	* sources/rb-play-queue-source.c:
	(rb_play_queue_source_constructor):
	* sources/rb-podcast-source.c: (rb_podcast_source_constructor):
	Use short labels for toolbar buttons actions to avoid wasting space
	when the subject of the action is clear from context.  From #516846.


Modified:
   trunk/ChangeLog
   trunk/plugins/audioscrobbler/rb-lastfm-source.c
   trunk/plugins/cd-recorder/rb-cd-recorder-plugin.c
   trunk/plugins/iradio/rb-iradio-source.c
   trunk/shell/rb-removable-media-manager.c
   trunk/sources/rb-play-queue-source.c
   trunk/sources/rb-podcast-source.c

Modified: trunk/plugins/audioscrobbler/rb-lastfm-source.c
==============================================================================
--- trunk/plugins/audioscrobbler/rb-lastfm-source.c	(original)
+++ trunk/plugins/audioscrobbler/rb-lastfm-source.c	Sun Jun 15 12:33:43 2008
@@ -273,10 +273,10 @@
 
 static GtkActionEntry rb_lastfm_source_actions [] =
 {
-	{ "LastfmLoveSong", GTK_STOCK_ADD, N_("Love Song"), NULL,
+	{ "LastfmLoveSong", GTK_STOCK_ADD, N_("Love"), NULL,
 	  N_("Mark this song as loved"),
 	  G_CALLBACK (rb_lastfm_source_love_track) },
-	{ "LastfmBanSong", GTK_STOCK_CANCEL, N_("Ban Song"), NULL,
+	{ "LastfmBanSong", GTK_STOCK_CANCEL, N_("Ban"), NULL,
 	  N_("Ban the current track from being played again"),
 	  G_CALLBACK (rb_lastfm_source_ban_track) },
 	{ "LastfmStationDelete", GTK_STOCK_DELETE, N_("Delete Station"), NULL,

Modified: trunk/plugins/cd-recorder/rb-cd-recorder-plugin.c
==============================================================================
--- trunk/plugins/cd-recorder/rb-cd-recorder-plugin.c	(original)
+++ trunk/plugins/cd-recorder/rb-cd-recorder-plugin.c	Sun Jun 15 12:33:43 2008
@@ -326,6 +326,7 @@
 {
 	RBCdRecorderPlugin *pi = RB_CD_RECORDER_PLUGIN (plugin);
 	GtkUIManager       *uimanager = NULL;
+	GtkAction          *action;
 	int                 i;
 
 	pi->enabled = TRUE;
@@ -364,6 +365,13 @@
 				       FALSE);
 	}
 
+        action = gtk_action_group_get_action (pi->action_group,
+					      "MusicPlaylistBurnPlaylist");
+	/* Translators: this is the toolbar button label for */
+	/* Create Audio CD action                            */
+	g_object_set (action, "short-label", _("Burn"), NULL);
+
+
 	update_source (pi, shell);
 }
 

Modified: trunk/plugins/iradio/rb-iradio-source.c
==============================================================================
--- trunk/plugins/iradio/rb-iradio-source.c	(original)
+++ trunk/plugins/iradio/rb-iradio-source.c	Sun Jun 15 12:33:43 2008
@@ -280,6 +280,7 @@
 {
 	RBIRadioSource *source;
 	RBShell *shell;
+	GtkAction *action;
 
 	source = RB_IRADIO_SOURCE (G_OBJECT_CLASS (rb_iradio_source_parent_class)
 			->constructor (type, n_construct_properties, construct_properties));
@@ -299,6 +300,14 @@
 								       G_N_ELEMENTS (rb_iradio_source_actions),
 								       source);
 
+	action = gtk_action_group_get_action (source->priv->action_group,
+                                              "MusicNewInternetRadioStation");
+        /* Translators: this is the toolbar button label for 
+           New Interner Radio Station action.
+           Don't include the prefix "radio|" in the translation. */
+        g_object_set (action, "short-label", Q_("radio|New"), NULL);
+
+
 	/* set up stations view */
 	source->priv->stations = rb_entry_view_new (source->priv->db, G_OBJECT (source->priv->player),
 						    CONF_STATE_IRADIO_SORTING,

Modified: trunk/shell/rb-removable-media-manager.c
==============================================================================
--- trunk/shell/rb-removable-media-manager.c	(original)
+++ trunk/shell/rb-removable-media-manager.c	Sun Jun 15 12:33:43 2008
@@ -141,7 +141,7 @@
 	{ "RemovableSourceEject", GNOME_MEDIA_EJECT, N_("_Eject"), NULL,
 	  N_("Eject this medium"),
 	  G_CALLBACK (rb_removable_media_manager_cmd_eject_medium) },
-	{ "RemovableSourceCopyAllTracks", GTK_STOCK_CDROM, N_("_Copy to library"), NULL,
+	{ "RemovableSourceCopyAllTracks", GTK_STOCK_CDROM, N_("_Extract to Library"), NULL,
 	  N_("Copy all tracks to the library"),
 	  G_CALLBACK (rb_removable_media_manager_cmd_copy_tracks) },
 	{ "MusicScanMedia", NULL, N_("_Scan Removable Media"), NULL,
@@ -493,6 +493,7 @@
 					  GtkUIManager *uimanager)
 {
 	RBRemovableMediaManagerPrivate *priv = REMOVABLE_MEDIA_MANAGER_GET_PRIVATE (mgr);
+	GtkAction *action;
 
 	if (priv->uimanager != NULL) {
 		if (priv->actiongroup != NULL) {
@@ -531,6 +532,13 @@
 	gtk_ui_manager_insert_action_group (priv->uimanager,
 					    priv->actiongroup,
 					    0);
+
+	action = gtk_action_group_get_action (priv->actiongroup,
+					      "RemovableSourceCopyAllTracks");
+	/* Translators: this is the toolbar button label
+	   for Copy to Library action. */
+	g_object_set (G_OBJECT (action), "short-label", _("Extract"), NULL);
+
 }
 
 static void

Modified: trunk/sources/rb-play-queue-source.c
==============================================================================
--- trunk/sources/rb-play-queue-source.c	(original)
+++ trunk/sources/rb-play-queue-source.c	Sun Jun 15 12:33:43 2008
@@ -224,6 +224,7 @@
 	RhythmDB *db = rb_playlist_source_get_db (RB_PLAYLIST_SOURCE (source));
 	GtkCellRenderer *renderer;
 	RhythmDBQueryModel *model;
+	GtkAction *action;
 
 	g_object_get (source, "shell", &shell, NULL);
 	shell_player = rb_shell_get_player (shell);
@@ -236,6 +237,10 @@
 							       rb_play_queue_source_actions,
 							       G_N_ELEMENTS (rb_play_queue_source_actions),
 							       source);
+	action = gtk_action_group_get_action (priv->action_group,
+					      "ClearQueue");
+	/* Translators: this is the toolbutton label for Clear Queue action */
+	g_object_set (G_OBJECT (action), "short-label", _("Clear"), NULL);
 
 	priv->sidebar = rb_entry_view_new (db, shell_player, NULL, TRUE, TRUE);
 

Modified: trunk/sources/rb-podcast-source.c
==============================================================================
--- trunk/sources/rb-podcast-source.c	(original)
+++ trunk/sources/rb-podcast-source.c	Sun Jun 15 12:33:43 2008
@@ -559,6 +559,7 @@
 	RBShell *shell;
 	RhythmDBQueryModel *query_model;
 	GPtrArray *query;
+	GtkAction *action;
 
 	klass = RB_PODCAST_SOURCE_CLASS (g_type_class_peek (RB_TYPE_PODCAST_SOURCE));
 
@@ -573,6 +574,20 @@
 								       rb_podcast_source_actions,
 								       G_N_ELEMENTS (rb_podcast_source_actions),
 								       source);
+
+	action = gtk_action_group_get_action (source->priv->action_group,
+					      "MusicNewPodcast");
+	/* Translators: this is the toolbar button label
+	   for New Podcast Feed action.
+	   Don't include the prefix "podcast|" in the translation. */
+	g_object_set (G_OBJECT (action), "short-label", Q_("podcast|New"), NULL);
+
+	action = gtk_action_group_get_action (source->priv->action_group,
+					      "PodcastUpdateAllFeeds");
+	/* Translators: this is the toolbar button label
+	   for Update All Feeds action. */
+	g_object_set (G_OBJECT (action), "short-label", _("Update"), NULL);
+
 	gtk_action_group_add_radio_actions (source->priv->action_group,
 					    rb_podcast_source_radio_actions,
 					    G_N_ELEMENTS (rb_podcast_source_radio_actions),