Updating branch refs/heads/master
to d0d209f31fc81971bc2c49368ad96619b06f9165 (commit)
from 39cb913bc4085e54160bfe3aaf6ee3e8449ffbec (commit)
commit d0d209f31fc81971bc2c49368ad96619b06f9165
Merge: 39cb913 99321f3
Author: Sean Davis <smd.seanda...@gmail.com>
Date: Wed Aug 21 20:15:41 2013 -0400
Merge branch 'bluesabre/gtk2' of ssh://git.xfce.org/apps/parole into
bluesabre/gtk3
commit 99321f39ffe24c137e22d9457665456d76a25402
Author: Simon Steinbeiss <simon.steinbe...@elfenbeinturm.at>
Date: Thu Aug 22 01:31:00 2013 +0200
Improve 32px app-icon
commit 9e9ae122090074909f06920cef016b68ada90b20
Merge: 8e4fb48 520cd96
Author: Simon Steinbeiss <simon.steinbe...@elfenbeinturm.at>
Date: Thu Aug 22 01:30:26 2013 +0200
Merge branch 'bluesabre/gtk3' of ssh://git.xfce.org/apps/parole into
bluesabre/gtk3
commit 8e4fb48b1bdce6f920d7db093163a402fa92fb81
Author: Simon Steinbeiss <simon.steinbe...@elfenbeinturm.at>
Date: Thu Aug 22 01:28:05 2013 +0200
Make a few more menuitems use symbolic icons
data/icons/32x32/parole.png | Bin 1257 -> 1171 bytes
src/parole-player.c | 35 ++++++++++++++++++++---------------
2 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/data/icons/32x32/parole.png b/data/icons/32x32/parole.png
index bcbb91b..f60a5db 100644
Binary files a/data/icons/32x32/parole.png and b/data/icons/32x32/parole.png
differ
diff --git a/src/parole-player.c b/src/parole-player.c
index e0faa0f..e0a759a 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -2021,7 +2021,7 @@ void parole_player_leave_fs_cb (GtkButton *button,
ParolePlayer *player)
static void
parole_player_show_menu (ParolePlayer *player, guint button, guint
activate_time)
{
- GtkWidget *menu, *mi;
+ GtkWidget *menu, *mi, *icon;
gboolean sensitive;
player->priv->current_media_type = parole_gst_get_current_stream_type
(PAROLE_GST (player->priv->gst));
@@ -2030,9 +2030,10 @@ parole_player_show_menu (ParolePlayer *player, guint
button, guint activate_time
/*Play menu item
*/
- mi = gtk_image_menu_item_new_from_stock (player->priv->state ==
PAROLE_STATE_PLAYING
- ? GTK_STOCK_MEDIA_PAUSE :
GTK_STOCK_MEDIA_PLAY,
- NULL);
+ mi = gtk_image_menu_item_new_with_mnemonic (player->priv->state ==
PAROLE_STATE_PLAYING ? _("_Pause"):_("_Play"));
+ icon = gtk_image_new_from_icon_name (player->priv->state ==
PAROLE_STATE_PLAYING ?
"media-playback-pause-symbolic":"media-playback-start-symbolic",
GTK_ICON_SIZE_MENU);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM(mi), GTK_WIDGET(icon));
+
g_object_get (G_OBJECT (player->priv->play_pause),
"sensitive", &sensitive,
@@ -2045,10 +2046,11 @@ parole_player_show_menu (ParolePlayer *player, guint
button, guint activate_time
gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
/*
- * Previous item in playlist.
+ * Next item in playlist.
*/
- mi = gtk_image_menu_item_new_from_stock (GTK_STOCK_MEDIA_NEXT, NULL);
-
+ mi = gtk_image_menu_item_new_with_mnemonic (_("_Next"));
+ icon = gtk_image_new_from_icon_name ("media-skip-forward-symbolic",
GTK_ICON_SIZE_MENU);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM(mi), GTK_WIDGET(icon));
gtk_widget_set_sensitive (mi, (player->priv->state >=
PAROLE_STATE_PAUSED));
gtk_widget_show (mi);
g_signal_connect (mi, "activate",
@@ -2056,10 +2058,11 @@ parole_player_show_menu (ParolePlayer *player, guint
button, guint activate_time
gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
/*
- * Next item in playlist.
+ * Previous item in playlist.
*/
- mi = gtk_image_menu_item_new_from_stock (GTK_STOCK_MEDIA_PREVIOUS, NULL);
-
+ mi = gtk_image_menu_item_new_with_mnemonic (_("_Previous"));
+ icon = gtk_image_new_from_icon_name ("media-skip-backward-symbolic",
GTK_ICON_SIZE_MENU);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM(mi), GTK_WIDGET(icon));
gtk_widget_set_sensitive (mi, (player->priv->state >=
PAROLE_STATE_PAUSED));
gtk_widget_show (mi);
g_signal_connect (mi, "activate",
@@ -2069,8 +2072,9 @@ parole_player_show_menu (ParolePlayer *player, guint
button, guint activate_time
/*
* Un/Full screen
*/
- mi = gtk_image_menu_item_new_from_stock (player->priv->full_screen ?
GTK_STOCK_LEAVE_FULLSCREEN:
- GTK_STOCK_FULLSCREEN, NULL);
+ mi = gtk_image_menu_item_new_with_mnemonic (player->priv->full_screen ?
_("_Leave Fullscreen"):_("_Fullscreen"));
+ icon = gtk_image_new_from_icon_name (player->priv->full_screen ?
"view-restore-symbolic":"view-fullscreen-symbolic", GTK_ICON_SIZE_MENU);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM(mi), GTK_WIDGET(icon));
gtk_widget_show (mi);
g_signal_connect_swapped (mi, "activate",
G_CALLBACK
(parole_player_full_screen_menu_item_activate), player);
@@ -2912,7 +2916,7 @@ parole_player_setup_multimedia_keys (ParolePlayer *player)
static void
parole_player_init (ParolePlayer *player)
{
- GtkWidget *output;
+ GtkWidget *output, *icon;
GtkBuilder *builder;
GdkScreen *screen;
gint w, h;
@@ -3066,8 +3070,9 @@ parole_player_init (ParolePlayer *player)
gtk_menu_shell_append(GTK_MENU_SHELL(player->priv->recent_menu),
recent_separator);
/* Clear Recent Menu Item */
- clear_recent = gtk_image_menu_item_new_from_stock(GTK_STOCK_CLEAR, NULL);
- gtk_menu_item_set_label (GTK_MENU_ITEM(clear_recent), _("Clear recent
items..."));
+ clear_recent = gtk_image_menu_item_new_with_mnemonic (_("_Clear recent
items..."));
+ icon = gtk_image_new_from_icon_name ("edit-clear-symbolic",
GTK_ICON_SIZE_MENU);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM(clear_recent),
GTK_WIDGET(icon));
g_signal_connect (clear_recent, "activate",
G_CALLBACK (parole_player_recent_menu_clear_activated_cb), player);
gtk_menu_shell_append(GTK_MENU_SHELL(player->priv->recent_menu),
clear_recent);
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
