[Xfce4-commits] <parole:bluesabre/gtk3> More general fixes

[Sean Davis]

Updating branch refs/heads/bluesabre/gtk3
         to b285c76bcac9b894c871716f8ee2b9144cd2b7b6 (commit)
       from ed702ea8a2560b0af83bc5fbef240b23d20cca4c (commit)

commit b285c76bcac9b894c871716f8ee2b9144cd2b7b6
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Sun Aug 11 20:16:34 2013 -0400

    More general fixes

 data/interfaces/parole-3.ui |   13 ++++++++++++-
 src/parole-player.c         |    3 +--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/data/interfaces/parole-3.ui b/data/interfaces/parole-3.ui
index 6cd66ea..f147a29 100644
--- a/data/interfaces/parole-3.ui
+++ b/data/interfaces/parole-3.ui
@@ -44,6 +44,12 @@
     <property name="pixel_size">16</property>
     <property name="icon_name">document-open-symbolic</property>
   </object>
+  <object class="GtkImage" id="image8">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="pixel_size">16</property>
+    <property name="icon_name">parole-extension</property>
+  </object>
   <object class="GtkImage" id="image_media_fullscreen">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -76,6 +82,9 @@
   </object>
   <object class="GtkWindow" id="main-window">
     <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Parole Media Player</property>
+    <property name="window_position">center</property>
+    <property name="icon_name">parole</property>
     <signal name="destroy" handler="parole_player_destroy_cb" swapped="no"/>
     <signal name="configure-event" handler="parole_player_configure_event_cb" swapped="no"/>
     <signal name="key-press-event" handler="parole_player_key_press" swapped="no"/>
@@ -206,6 +215,7 @@
                         <property name="label" translatable="yes">Plugins</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="image">image8</property>
                         <property name="use_stock">False</property>
                       </object>
                     </child>
@@ -821,6 +831,7 @@ audio-volume-medium-symbolic</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="receives_default">True</property>
+                            <property name="no_show_all">True</property>
                             <property name="image">image_media_toggleplaylist</property>
                             <property name="relief">none</property>
                             <signal name="clicked" handler="parole_player_show_hide_playlist" swapped="no"/>
@@ -854,8 +865,8 @@ audio-volume-medium-symbolic</property>
             </child>
             <child>
               <object class="GtkNotebook" id="notebook-playlist">
-                <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="no_show_all">True</property>
                 <child>
                   <placeholder/>
                 </child>
diff --git a/src/parole-player.c b/src/parole-player.c
index 9995246..0a5a604 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -456,13 +456,13 @@ void parole_player_set_playlist_visible (ParolePlayer *player, gboolean visibili
         playlist_w = 220;
 
     gtk_check_menu_item_set_active( GTK_CHECK_MENU_ITEM(player->priv->show_hide_playlist), visibility );
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(player->priv->show_hide_playlist_button), visibility );
     if ( visibility )
     {
         if ( !player->priv->full_screen )
             gtk_window_resize(GTK_WINDOW (player->priv->window), window_w+playlist_w+player->priv->handle_width, window_h);
         
         gtk_widget_show (player->priv->playlist_nt);
-        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,
@@ -471,7 +471,6 @@ void parole_player_set_playlist_visible (ParolePlayer *player, gboolean visibili
     else
     {
         gtk_widget_hide (player->priv->playlist_nt);
-        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,