[Xfce4-commits] <parole:master> Add fullscreen-button

[Simon Steinbeiss]

Updating branch refs/heads/master
         to b7d5382b3642ebfb7a61e95069bae3474a745fb3 (commit)
       from ce55c1808052e61ff69f44efd218f7a4ec9db61b (commit)

commit b7d5382b3642ebfb7a61e95069bae3474a745fb3
Author: Simon Steinbeiss <ochosi at xfce.org>
Date:   Wed Jul 11 04:21:23 2012 +0200

    Add fullscreen-button

 data/interfaces/parole.ui |   45 ++++++++++++++-------------------------------
 src/parole-player.c       |    4 ++++
 2 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index 9393765..774730f 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -529,22 +529,6 @@
                                                             <property name="position">0</property>
                                                           </packing>
                                                         </child>
-                                                        <!--<child>
-                                                          <object class="GtkButton" id="stop">
-                                                            <property name="visible">True</property>
-                                                            <property name="sensitive">False</property>
-                                                            <property name="can_focus">True</property>
-                                                            <property name="receives_default">True</property>
-                                                            <property name="image">image7</property>
-                                                            <property name="relief">none</property>
-                                                            <property name="focus_on_click">False</property>
-                                                            <signal name="clicked" handler="parole_player_stop_clicked"/>
-                                                          </object>
-                                                          <packing>
-                                                            <property name="expand">False</property>
-                                                            <property name="position">1</property>
-                                                          </packing>
-                                                        </child>-->
                                                         <child>
                                                           <object class="GtkButton" id="play-pause">
                                                             <property name="visible">True</property>
@@ -641,38 +625,37 @@
                                                     <property name="position">0</property>
                                                   </packing>
                                                 </child>
-                                                <child>
-                                                  <object class="GtkButton" id="leave_fs">
-                                                    <property name="label">gtk-leave-fullscreen</property>
+						<child>
+                                                  <object class="GtkButton" id="go_fs">
+						    <property name="image">image18</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="relief">none</property>
                                                     <property name="use_stock">True</property>
-                                                    <signal name="clicked" handler="parole_player_leave_fs_cb"/>
+                                                    <signal name="clicked" handler="parole_player_full_screen_activated_cb"/>
                                                   </object>
                                                   <packing>
                                                     <property name="expand">False</property>
-                                                    <property name="position">2</property>
+                                                    <property name="position">1</property>
                                                   </packing>
                                                 </child>
-                                                <!--<child>
-                                                  <object class="GtkButton" id="show-hide-list">
-                                                    <property name="visible">True</property>
+                                                <child>
+                                                  <object class="GtkButton" id="leave_fs">
+                                                    <property name="label">gtk-leave-fullscreen</property>
                                                     <property name="can_focus">True</property>
                                                     <property name="receives_default">True</property>
                                                     <property name="no_show_all">True</property>
-                                                    <property name="image">image18</property>
                                                     <property name="relief">none</property>
-                                                    <signal name="clicked" handler="parole_player_show_hide_playlist"/>
+                                                    <property name="use_stock">True</property>
+                                                    <signal name="clicked" handler="parole_player_leave_fs_cb"/>
                                                   </object>
                                                   <packing>
                                                     <property name="expand">False</property>
-                                                    <property name="fill">False</property>
-                                                    <property name="pack_type">end</property>
-                                                    <property name="position">1</property>
+                                                    <property name="position">2</property>
                                                   </packing>
-                                                </child>-->
+                                                </child>
                                               </object>
                                               <packing>
                                                 <property name="expand">False</property>
@@ -835,7 +818,7 @@
   </object>
   <object class="GtkImage" id="image18">
     <property name="visible">True</property>
-    <property name="stock">gtk-go-forward</property>
+    <property name="stock">gtk-fullscreen</property>
   </object>
   <object class="GtkImage" id="image5">
     <property name="visible">True</property>
diff --git a/src/parole-player.c b/src/parole-player.c
index d5c5a24..8d4e5f2 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -244,6 +244,7 @@ struct ParolePlayerPrivate
 				     * when in full screen mode
 				     */
     GtkWidget		*control; /* contains all play button*/
+    GtkWidget		*go_fs;
     GtkWidget		*leave_fs;
     
     GtkWidget		*main_box;
@@ -1086,6 +1087,7 @@ parole_player_full_screen (ParolePlayer *player, gboolean fullscreen)
 	gtk_widget_show (player->priv->menu_bar);
 	gtk_widget_show (player->priv->playlist_nt);
 	gtk_widget_show (player->priv->show_hide_playlist);
+	gtk_widget_show (player->priv->go_fs);
 	gtk_widget_hide (player->priv->leave_fs);
 	
 	gtk_notebook_set_show_tabs (GTK_NOTEBOOK (player->priv->main_nt), npages > 1);
@@ -1106,6 +1108,7 @@ parole_player_full_screen (ParolePlayer *player, gboolean fullscreen)
 	gtk_widget_hide (player->priv->menu_bar);
 	gtk_widget_hide (player->priv->playlist_nt);
 	gtk_widget_hide (player->priv->show_hide_playlist);
+	gtk_widget_hide (player->priv->go_fs);
 	gtk_widget_show (player->priv->leave_fs);
 	
 	current_page = gtk_notebook_get_current_page (GTK_NOTEBOOK (player->priv->playlist_nt));
@@ -1961,6 +1964,7 @@ parole_player_init (ParolePlayer *player)
     player->priv->playlist_nt = GTK_WIDGET (gtk_builder_get_object (builder, "notebook-playlist"));
     player->priv->show_hide_playlist = GTK_WIDGET (gtk_builder_get_object (builder, "show-hide-list"));
     player->priv->control = GTK_WIDGET (gtk_builder_get_object (builder, "control"));
+    player->priv->go_fs = GTK_WIDGET (gtk_builder_get_object (builder, "go_fs"));
     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"));