[Xfce4-commits] <parole:master> Fixed button size for ShowHide button. Adjusted padding for controls bar.

[Sean Davis]

Updating branch refs/heads/master
         to 4c8dec4de48469f81f6c75cc972f50602f2c83eb (commit)
       from d7419a6dc75ddaa01477b3af47d26a63d17e02d6 (commit)

commit 4c8dec4de48469f81f6c75cc972f50602f2c83eb
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Thu Jul 19 21:43:03 2012 -0400

    Fixed button size for ShowHide button.  Adjusted padding for controls bar.

 data/interfaces/parole.ui |    1 +
 src/gst/parole-gst.c      |    1 -
 src/parole-player.c       |   10 ++++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index ddf37fb..91c21e6 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -919,6 +919,7 @@ audio-volume-medium</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">True</property>
+                                                <property name="no_show_all">True</property>
                                                 <property name="use_action_appearance">False</property>
                                                 <property name="image">show-hide-list-image</property>
                                                 <property name="relief">none</property>
diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index 2227313..162cd39 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -2296,7 +2296,6 @@ gst_set_current_subtitle_track( ParoleGst *gst, gint track_no )
 		  
 	sub = parole_get_subtitle_path(uri);
 	
-	GstTagList *tags;
 	gint flags;
 
 	g_object_get (gst->priv->playbin, "flags", &flags, NULL);
diff --git a/src/parole-player.c b/src/parole-player.c
index 6e8736b..88984d5 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -375,7 +375,7 @@ void parole_player_set_playlist_visible (ParolePlayer *player, gboolean visibili
 	if ( visibility )
 	{
 		gtk_widget_show_all (player->priv->playlist_nt);
-		gtk_image_set_from_stock( GTK_IMAGE( player->priv->show_hide_playlist_image ), "gtk-go-forward", GTK_ICON_SIZE_BUTTON );
+		gtk_image_set_from_stock( GTK_IMAGE( player->priv->show_hide_playlist_image ), "gtk-go-forward", GTK_ICON_SIZE_LARGE_TOOLBAR );
 		gtk_widget_set_tooltip_text( GTK_WIDGET( player->priv->show_hide_playlist_button ), "Hide playlist");
 		g_object_set (G_OBJECT (player->priv->conf),	
 		  "showhide-playlist", TRUE,
@@ -384,7 +384,7 @@ void parole_player_set_playlist_visible (ParolePlayer *player, gboolean visibili
 	else
 	{
 		gtk_widget_hide_all (player->priv->playlist_nt);
-		gtk_image_set_from_stock( GTK_IMAGE( player->priv->show_hide_playlist_image ), "gtk-go-back", GTK_ICON_SIZE_BUTTON );
+		gtk_image_set_from_stock( GTK_IMAGE( player->priv->show_hide_playlist_image ), "gtk-go-back", GTK_ICON_SIZE_LARGE_TOOLBAR );
 		gtk_widget_set_tooltip_text( GTK_WIDGET( player->priv->show_hide_playlist_button ), "Show playlist");
 		g_object_set (G_OBJECT (player->priv->conf),	
 		  "showhide-playlist", FALSE,
@@ -1355,7 +1355,7 @@ parole_player_full_screen (ParolePlayer *player, gboolean fullscreen)
     {
 	npages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (player->priv->main_nt));
 	gtk_widget_reparent (player->priv->play_box, player->priv->control);
-	gtk_box_set_child_packing( GTK_BOX(player->priv->control), GTK_WIDGET(player->priv->play_box), TRUE, TRUE, 4, GTK_PACK_START );
+	gtk_box_set_child_packing( GTK_BOX(player->priv->control), GTK_WIDGET(player->priv->play_box), TRUE, TRUE, 2, GTK_PACK_START );
 	gtk_widget_hide (player->priv->fs_window);
 	gtk_widget_show (player->priv->play_box);
 	gtk_widget_show (player->priv->menu_bar);
@@ -1363,6 +1363,7 @@ parole_player_full_screen (ParolePlayer *player, gboolean fullscreen)
 	parole_player_set_playlist_visible(player, TRUE);
 	gtk_widget_show (player->priv->go_fs);
 	gtk_widget_hide (player->priv->leave_fs);
+	gtk_widget_show (player->priv->show_hide_playlist_button);
 	
 	gtk_notebook_set_show_tabs (GTK_NOTEBOOK (player->priv->main_nt), npages > 1);
 	
@@ -1381,6 +1382,7 @@ parole_player_full_screen (ParolePlayer *player, gboolean fullscreen)
 	parole_player_set_playlist_visible(player, FALSE);
 	gtk_widget_hide (player->priv->go_fs);
 	gtk_widget_show (player->priv->leave_fs);
+	gtk_widget_hide (player->priv->show_hide_playlist_button);
 	
 	current_page = gtk_notebook_get_current_page (GTK_NOTEBOOK (player->priv->playlist_nt));
 	gtk_notebook_set_show_tabs (GTK_NOTEBOOK (player->priv->main_nt), FALSE);
@@ -2267,7 +2269,7 @@ parole_player_init (ParolePlayer *player)
     player->priv->leave_fs = GTK_WIDGET (gtk_builder_get_object (builder, "leave_fs"));
     player->priv->main_box = GTK_WIDGET (gtk_builder_get_object (builder, "main-box"));
     
-    gtk_box_set_child_packing( GTK_BOX(player->priv->control), GTK_WIDGET(player->priv->play_box), TRUE, TRUE, 4, GTK_PACK_START );
+    gtk_box_set_child_packing( GTK_BOX(player->priv->control), GTK_WIDGET(player->priv->play_box), TRUE, TRUE, 2, GTK_PACK_START );
     
     player->priv->hbox_infobar = GTK_WIDGET (gtk_builder_get_object (builder, "hbox_infobar"));
     player->priv->combobox_audiotrack = GTK_WIDGET (gtk_builder_get_object (builder, "combobox_audiotrack"));