[Xfce4-commits] <parole:master> Removed unused alignment, sized controls to same size as sidebar panel.

Sean Davis noreply at xfce.org
Mon Jul 23 01:25:03 CEST 2012


Updating branch refs/heads/master
         to 7bc533582532cd3b4b3a0afc202eea748c1ca855 (commit)
       from eaf2ba9b53031fd16101581e1fa2705c5afe48d6 (commit)

commit 7bc533582532cd3b4b3a0afc202eea748c1ca855
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Wed Jul 18 16:26:31 2012 -0400

    Removed unused alignment, sized controls to same size as sidebar panel.

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

diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index 6f5940a..fdbfa79 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -45,16 +45,36 @@
     <property name="stock">gtk-file</property>
     <property name="icon-size">1</property>
   </object>
+  <object class="GtkImage" id="image17">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-media-previous</property>
+  </object>
   <object class="GtkImage" id="image18">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="stock">gtk-fullscreen</property>
   </object>
+  <object class="GtkImage" id="image19">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-media-play</property>
+  </object>
   <object class="GtkImage" id="image2">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="stock">gtk-index</property>
   </object>
+  <object class="GtkImage" id="image20">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-media-next</property>
+  </object>
+  <object class="GtkImage" id="image21">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-fullscreen</property>
+  </object>
   <object class="GtkImage" id="image3">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -559,103 +579,97 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <child>
-                                      <object class="GtkAlignment" id="alignment3">
+                                      <object class="GtkVBox" id="play-box">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="top_padding">5</property>
-                                        <property name="bottom_padding">4</property>
+                                        <property name="spacing">5</property>
                                         <child>
-                                          <object class="GtkVBox" id="play-box">
+                                          <object class="GtkHBox" id="hbox7">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="spacing">5</property>
                                             <child>
-                                              <object class="GtkHBox" id="hbox7">
+                                              <object class="GtkVBox" id="vbox6">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
+                                                <property name="spacing">5</property>
                                                 <child>
-                                                  <object class="GtkVBox" id="vbox6">
+                                                  <object class="GtkHBox" id="hbox6">
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">False</property>
                                                     <property name="spacing">5</property>
                                                     <child>
-                                                      <object class="GtkHBox" id="hbox6">
+                                                      <object class="GtkButton" id="back">
+                                                        <property name="visible">True</property>
+                                                        <property name="sensitive">False</property>
+                                                        <property name="can_focus">True</property>
+                                                        <property name="receives_default">True</property>
+                                                        <property name="use_action_appearance">False</property>
+                                                        <property name="image">image17</property>
+                                                        <property name="relief">none</property>
+                                                        <property name="focus_on_click">False</property>
+                                                        <signal name="clicked" handler="parole_player_back_cb" swapped="no"/>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="expand">False</property>
+                                                        <property name="fill">True</property>
+                                                        <property name="position">0</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkButton" id="play-pause">
+                                                        <property name="visible">True</property>
+                                                        <property name="sensitive">False</property>
+                                                        <property name="can_focus">True</property>
+                                                        <property name="receives_default">True</property>
+                                                        <property name="use_action_appearance">False</property>
+                                                        <property name="image">image19</property>
+                                                        <property name="relief">none</property>
+                                                        <property name="focus_on_click">False</property>
+                                                        <signal name="clicked" handler="parole_player_play_pause_clicked" swapped="no"/>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="expand">False</property>
+                                                        <property name="fill">True</property>
+                                                        <property name="position">1</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkButton" id="forward">
+                                                        <property name="visible">True</property>
+                                                        <property name="sensitive">False</property>
+                                                        <property name="can_focus">True</property>
+                                                        <property name="receives_default">True</property>
+                                                        <property name="use_action_appearance">False</property>
+                                                        <property name="image">image20</property>
+                                                        <property name="relief">none</property>
+                                                        <property name="focus_on_click">False</property>
+                                                        <signal name="clicked" handler="parole_player_forward_cb" swapped="no"/>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="expand">False</property>
+                                                        <property name="fill">True</property>
+                                                        <property name="position">2</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkHBox" id="playing_box">
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">False</property>
-                                                        <property name="spacing">5</property>
                                                         <child>
-                                                          <object class="GtkButton" id="back">
+                                                          <object class="GtkLabel" id="label_elapsed">
                                                             <property name="visible">True</property>
-                                                            <property name="sensitive">False</property>
-                                                            <property name="can_focus">True</property>
-                                                            <property name="receives_default">True</property>
-                                                            <property name="use_action_appearance">False</property>
-                                                            <property name="image">image1</property>
-                                                            <property name="relief">none</property>
-                                                            <property name="focus_on_click">False</property>
-                                                            <signal name="clicked" handler="parole_player_back_cb" swapped="no"/>
+                                                            <property name="can_focus">False</property>
+                                                            <property name="label" translatable="yes">0:00</property>
                                                           </object>
                                                           <packing>
                                                             <property name="expand">False</property>
                                                             <property name="fill">True</property>
+                                                            <property name="padding">6</property>
                                                             <property name="position">0</property>
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <object class="GtkButton" id="play-pause">
-                                                            <property name="visible">True</property>
-                                                            <property name="sensitive">False</property>
-                                                            <property name="can_focus">True</property>
-                                                            <property name="receives_default">True</property>
-                                                            <property name="use_action_appearance">False</property>
-                                                            <property name="image">image8</property>
-                                                            <property name="relief">none</property>
-                                                            <property name="focus_on_click">False</property>
-                                                            <signal name="clicked" handler="parole_player_play_pause_clicked" swapped="no"/>
-                                                          </object>
-                                                          <packing>
-                                                            <property name="expand">False</property>
-                                                            <property name="fill">True</property>
-                                                            <property name="position">1</property>
-                                                          </packing>
-                                                        </child>
-                                                        <child>
-                                                          <object class="GtkButton" id="forward">
-                                                            <property name="visible">True</property>
-                                                            <property name="sensitive">False</property>
-                                                            <property name="can_focus">True</property>
-                                                            <property name="receives_default">True</property>
-                                                            <property name="use_action_appearance">False</property>
-                                                            <property name="image">image4</property>
-                                                            <property name="relief">none</property>
-                                                            <property name="focus_on_click">False</property>
-                                                            <signal name="clicked" handler="parole_player_forward_cb" swapped="no"/>
-                                                          </object>
-                                                          <packing>
-                                                            <property name="expand">False</property>
-                                                            <property name="fill">True</property>
-                                                            <property name="position">2</property>
-                                                          </packing>
-                                                        </child>
-                                                        <child>
-                                                          <object class="GtkHBox" id="playing_box">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <child>
-                                                            <object class="GtkLabel" id="label_elapsed">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">0:00</property>
-                                                            </object>
-                                                            <packing>
-                                                            <property name="expand">False</property>
-                                                            <property name="fill">True</property>
-                                                            <property name="padding">6</property>
-                                                            <property name="position">0</property>
-                                                            </packing>
-                                                            </child>
-                                                            <child>
-                                                            <object class="GtkHScale" id="scale">
+                                                          <object class="GtkHScale" id="scale">
                                                             <property name="visible">True</property>
                                                             <property name="sensitive">False</property>
                                                             <property name="can_focus">True</property>
@@ -664,75 +678,68 @@
                                                             <signal name="button-release-event" handler="parole_player_range_button_release" swapped="no"/>
                                                             <signal name="value-changed" handler="parole_player_range_value_changed" swapped="no"/>
                                                             <signal name="scroll-event" handler="parole_player_scroll_event_cb" swapped="no"/>
-                                                            </object>
-                                                            <packing>
-                                                            <property name="expand">True</property>
-                                                            <property name="fill">True</property>
-                                                            <property name="position">1</property>
-                                                            </packing>
-                                                            </child>
-                                                            <child>
-                                                            <object class="GtkLabel" id="label_duration">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">0:00</property>
-                                                            </object>
-                                                            <packing>
-                                                            <property name="expand">False</property>
-                                                            <property name="fill">True</property>
-                                                            <property name="padding">6</property>
-                                                            <property name="position">2</property>
-                                                            </packing>
-                                                            </child>
                                                           </object>
                                                           <packing>
                                                             <property name="expand">True</property>
                                                             <property name="fill">True</property>
-                                                            <property name="padding">6</property>
-                                                            <property name="position">3</property>
-                                                          </packing>
-                                                        </child>
-                                                        <child>
-                                                          <object class="GtkProgressBar" id="progressbar_buffering">
-                                                            <property name="can_focus">False</property>
-                                                            <property name="no_show_all">True</property>
-                                                            <property name="show_text">True</property>
-                                                            <property name="text" translatable="yes">Buffering (0%)</property>
-                                                          </object>
-                                                          <packing>
-                                                            <property name="expand">True</property>
-                                                            <property name="fill">False</property>
-                                                            <property name="position">4</property>
+                                                            <property name="position">1</property>
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <object class="GtkVolumeButton" id="volume">
+                                                          <object class="GtkLabel" id="label_duration">
                                                             <property name="visible">True</property>
-                                                            <property name="can_focus">True</property>
-                                                            <property name="receives_default">True</property>
-                                                            <property name="use_action_appearance">False</property>
-                                                            <property name="relief">none</property>
-                                                            <property name="focus_on_click">False</property>
-                                                            <property name="orientation">vertical</property>
-                                                            <property name="size">button</property>
-                                                            <property name="icons">audio-volume-muted
-audio-volume-high
-audio-volume-low
-audio-volume-medium</property>
-                                                            <signal name="value-changed" handler="parole_player_volume_value_changed_cb" swapped="no"/>
-                                                            <signal name="scroll-event" handler="parole_player_volume_scroll_event_cb" swapped="no"/>
+                                                            <property name="can_focus">False</property>
+                                                            <property name="label" translatable="yes">0:00</property>
                                                           </object>
                                                           <packing>
                                                             <property name="expand">False</property>
                                                             <property name="fill">True</property>
-                                                            <property name="position">5</property>
+                                                            <property name="padding">6</property>
+                                                            <property name="position">2</property>
                                                           </packing>
                                                         </child>
                                                       </object>
                                                       <packing>
                                                         <property name="expand">True</property>
                                                         <property name="fill">True</property>
-                                                        <property name="position">0</property>
+                                                        <property name="padding">6</property>
+                                                        <property name="position">3</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkProgressBar" id="progressbar_buffering">
+                                                        <property name="can_focus">False</property>
+                                                        <property name="no_show_all">True</property>
+                                                        <property name="show_text">True</property>
+                                                        <property name="text" translatable="yes">Buffering (0%)</property>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="expand">True</property>
+                                                        <property name="fill">False</property>
+                                                        <property name="position">4</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkVolumeButton" id="volume">
+                                                        <property name="visible">True</property>
+                                                        <property name="can_focus">True</property>
+                                                        <property name="receives_default">True</property>
+                                                        <property name="use_action_appearance">False</property>
+                                                        <property name="relief">none</property>
+                                                        <property name="focus_on_click">False</property>
+                                                        <property name="orientation">vertical</property>
+                                                        <property name="size">button</property>
+                                                        <property name="icons">audio-volume-muted
+audio-volume-high
+audio-volume-low
+audio-volume-medium</property>
+                                                        <signal name="value-changed" handler="parole_player_volume_value_changed_cb" swapped="no"/>
+                                                        <signal name="scroll-event" handler="parole_player_volume_scroll_event_cb" swapped="no"/>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="expand">False</property>
+                                                        <property name="fill">True</property>
+                                                        <property name="position">5</property>
                                                       </packing>
                                                     </child>
                                                   </object>
@@ -742,49 +749,54 @@ audio-volume-medium</property>
                                                     <property name="position">0</property>
                                                   </packing>
                                                 </child>
-                                                <child>
-                                                  <object class="GtkButton" id="go_fs">
-                                                    <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">image18</property>
-                                                    <property name="relief">none</property>
-                                                    <property name="use_stock">True</property>
-                                                    <signal name="clicked" handler="parole_player_full_screen_activated_cb" swapped="no"/>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="fill">True</property>
-                                                    <property name="position">1</property>
-                                                  </packing>
-                                                </child>
-                                                <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="use_action_appearance">False</property>
-                                                    <property name="relief">none</property>
-                                                    <property name="use_stock">True</property>
-                                                    <signal name="clicked" handler="parole_player_leave_fs_cb" swapped="no"/>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="fill">True</property>
-                                                    <property name="position">2</property>
-                                                  </packing>
-                                                </child>
                                               </object>
                                               <packing>
-                                                <property name="expand">False</property>
+                                                <property name="expand">True</property>
                                                 <property name="fill">True</property>
                                                 <property name="position">0</property>
                                               </packing>
                                             </child>
+                                            <child>
+                                              <object class="GtkButton" id="go_fs">
+                                                <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">image21</property>
+                                                <property name="relief">none</property>
+                                                <property name="use_stock">True</property>
+                                                <signal name="clicked" handler="parole_player_full_screen_activated_cb" swapped="no"/>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">True</property>
+                                                <property name="position">1</property>
+                                              </packing>
+                                            </child>
+                                            <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="use_action_appearance">False</property>
+                                                <property name="relief">none</property>
+                                                <property name="use_stock">True</property>
+                                                <signal name="clicked" handler="parole_player_leave_fs_cb" swapped="no"/>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">True</property>
+                                                <property name="position">2</property>
+                                              </packing>
+                                            </child>
                                           </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
                                         </child>
                                       </object>
                                       <packing>
diff --git a/src/parole-player.c b/src/parole-player.c
index e4023ab..7b92213 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -1162,6 +1162,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_widget_hide (player->priv->fs_window);
 	gtk_widget_show (player->priv->play_box);
 	gtk_widget_show (player->priv->menu_bar);
@@ -2087,6 +2088,8 @@ 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_scale_button_set_value (GTK_SCALE_BUTTON (player->priv->volume), 
 			 (gdouble) (parole_rc_read_entry_int ("volume", PAROLE_RC_GROUP_GENERAL, 100)/100.));
     /*


More information about the Xfce4-commits mailing list