[Xfce4-commits] <parole:0.2.2> Re-add the status bar.

Ali Abdallah noreply at xfce.org
Thu Dec 16 11:44:01 CET 2010


Updating branch refs/heads/0.2.2
         to 7ac7b70286e663921092495ad8f7ca27457e26ee (commit)
       from 88c21ec6ca28e8cc7405d62270b3c100732c2997 (commit)

commit 7ac7b70286e663921092495ad8f7ca27457e26ee
Author: Ali Abdallah <aliov at xfce.org>
Date:   Thu Dec 16 11:43:44 2010 +0100

    Re-add the status bar.

 data/interfaces/parole.ui | 1281 +++++++++++++++++++++++----------------------
 src/parole-player.c       |   10 +-
 src/parole-statusbar.c    |    4 +-
 3 files changed, 664 insertions(+), 631 deletions(-)

diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index dce5250..c60be1e 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -19,223 +19,229 @@
     <signal name="configure_event" handler="parole_player_configure_event_cb"/>
     <signal name="delete_event" handler="parole_player_delete_event_cb" after="yes"/>
     <child>
-      <object class="GtkHPaned" id="hpaned1">
+      <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="orientation">vertical</property>
         <child>
-          <object class="GtkAlignment" id="sidebar">
+          <object class="GtkHPaned" id="hpaned1">
             <property name="visible">True</property>
-            <property name="top_padding">2</property>
-            <property name="left_padding">5</property>
+            <property name="can_focus">True</property>
             <child>
-              <object class="GtkViewport" id="viewport1">
+              <object class="GtkAlignment" id="sidebar">
                 <property name="visible">True</property>
-                <property name="resize_mode">queue</property>
-                <property name="shadow_type">none</property>
+                <property name="top_padding">2</property>
+                <property name="left_padding">5</property>
                 <child>
-                  <object class="GtkVBox" id="vbox4">
+                  <object class="GtkViewport" id="viewport1">
                     <property name="visible">True</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">4</property>
-                    <child>
-                      <object class="GtkComboBox" id="combobox1">
-                        <property name="visible">True</property>
-                        <property name="model">sidebar-combo-liststore</property>
-                        <property name="active">0</property>
-                        <child>
-                          <object class="GtkCellRendererPixbuf" id="cellrenderertext1"/>
-                          <attributes>
-                            <attribute name="icon-name">0</attribute>
-                          </attributes>
-                        </child>
-                        <child>
-                          <object class="GtkCellRendererText" id="cellrenderertext2"/>
-                          <attributes>
-                            <attribute name="text">1</attribute>
-                          </attributes>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
+                    <property name="resize_mode">queue</property>
+                    <property name="shadow_type">none</property>
                     <child>
-                      <object class="GtkNotebook" id="sidebar-notebook">
+                      <object class="GtkVBox" id="vbox4">
                         <property name="visible">True</property>
-                        <property name="show_tabs">False</property>
-                        <property name="show_border">False</property>
-                        <child>
-                          <placeholder/>
-                        </child>
-                        <child type="tab">
-                          <placeholder/>
-                        </child>
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">4</property>
                         <child>
-                          <placeholder/>
-                        </child>
-                        <child type="tab">
-                          <placeholder/>
+                          <object class="GtkComboBox" id="combobox1">
+                            <property name="visible">True</property>
+                            <property name="model">sidebar-combo-liststore</property>
+                            <property name="active">0</property>
+                            <child>
+                              <object class="GtkCellRendererPixbuf" id="cellrenderertext1"/>
+                              <attributes>
+                                <attribute name="icon-name">0</attribute>
+                              </attributes>
+                            </child>
+                            <child>
+                              <object class="GtkCellRendererText" id="cellrenderertext2"/>
+                              <attributes>
+                                <attribute name="text">1</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
                         </child>
                         <child>
-                          <placeholder/>
-                        </child>
-                        <child type="tab">
-                          <placeholder/>
+                          <object class="GtkNotebook" id="sidebar-notebook">
+                            <property name="visible">True</property>
+                            <property name="show_tabs">False</property>
+                            <property name="show_border">False</property>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child type="tab">
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child type="tab">
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child type="tab">
+                              <placeholder/>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
                         </child>
                       </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
                     </child>
                   </object>
                 </child>
               </object>
+              <packing>
+                <property name="resize">False</property>
+                <property name="shrink">False</property>
+              </packing>
             </child>
-          </object>
-          <packing>
-            <property name="resize">False</property>
-            <property name="shrink">False</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkAlignment" id="alignment1">
-            <property name="visible">True</property>
             <child>
-              <object class="GtkVBox" id="vbox1">
+              <object class="GtkAlignment" id="alignment1">
                 <property name="visible">True</property>
-                <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkViewport" id="menu-view">
+                  <object class="GtkVBox" id="vbox2">
                     <property name="visible">True</property>
-                    <property name="resize_mode">queue</property>
-                    <property name="shadow_type">none</property>
+                    <property name="orientation">vertical</property>
                     <child>
-                      <object class="GtkHBox" id="hbox1">
+                      <object class="GtkViewport" id="menu-view">
                         <property name="visible">True</property>
-                        <property name="spacing">30</property>
-                        <child>
-                          <object class="GtkToggleButton" id="show-hide-list">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="image">image10</property>
-                            <property name="relief">none</property>
-                            <property name="focus_on_click">False</property>
-                            <signal name="toggled" handler="parole_player_show_hide_playlist"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
+                        <property name="resize_mode">queue</property>
+                        <property name="shadow_type">none</property>
                         <child>
-                          <object class="GtkHButtonBox" id="hbuttonbox2">
+                          <object class="GtkHBox" id="hbox1">
                             <property name="visible">True</property>
+                            <property name="spacing">30</property>
                             <child>
-                              <object class="GtkMenuBar" id="menubar1">
+                              <object class="GtkToggleButton" id="show-hide-list">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="image">image10</property>
+                                <property name="relief">none</property>
+                                <property name="focus_on_click">False</property>
+                                <signal name="toggled" handler="parole_player_show_hide_playlist"/>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHButtonBox" id="hbuttonbox2">
                                 <property name="visible">True</property>
                                 <child>
-                                  <object class="GtkImageMenuItem" id="menuitem1">
-                                    <property name="label" translatable="yes">_Media</property>
+                                  <object class="GtkMenuBar" id="menubar1">
                                     <property name="visible">True</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="image">image11</property>
-                                    <property name="use_stock">False</property>
-                                    <property name="always_show_image">True</property>
-                                    <child type="submenu">
-                                      <object class="GtkMenu" id="menu1">
+                                    <child>
+                                      <object class="GtkImageMenuItem" id="menuitem1">
+                                        <property name="label" translatable="yes">_Media</property>
                                         <property name="visible">True</property>
-                                        <child>
-                                          <object class="GtkImageMenuItem" id="menu-add">
-                                            <property name="label">gtk-open</property>
-                                            <property name="visible">True</property>
-                                            <property name="use_underline">True</property>
-                                            <property name="use_stock">True</property>
-                                            <signal name="activate" handler="parole_player_menu_add_cb"/>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkImageMenuItem" id="imagemenuitem2">
-                                            <property name="label" translatable="yes">_Open location</property>
-                                            <property name="visible">True</property>
-                                            <property name="use_underline">True</property>
-                                            <property name="image">image17</property>
-                                            <property name="use_stock">False</property>
-                                            <signal name="activate" handler="parole_player_menu_open_location_cb"/>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkSeparatorMenuItem" id="separatormenuitem1">
-                                            <property name="visible">True</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkImageMenuItem" id="imagemenuitem1">
-                                            <property name="label">gtk-quit</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="image">image11</property>
+                                        <property name="use_stock">False</property>
+                                        <property name="always_show_image">True</property>
+                                        <child type="submenu">
+                                          <object class="GtkMenu" id="menu1">
                                             <property name="visible">True</property>
-                                            <property name="use_underline">True</property>
-                                            <property name="use_stock">True</property>
-                                            <signal name="activate" handler="parole_player_menu_exit_cb"/>
+                                            <child>
+                                              <object class="GtkImageMenuItem" id="menu-add">
+                                                <property name="label">gtk-open</property>
+                                                <property name="visible">True</property>
+                                                <property name="use_underline">True</property>
+                                                <property name="use_stock">True</property>
+                                                <signal name="activate" handler="parole_player_menu_add_cb"/>
+                                              </object>
+                                            </child>
+                                            <child>
+                                              <object class="GtkImageMenuItem" id="imagemenuitem2">
+                                                <property name="label" translatable="yes">_Open location</property>
+                                                <property name="visible">True</property>
+                                                <property name="use_underline">True</property>
+                                                <property name="image">image17</property>
+                                                <property name="use_stock">False</property>
+                                                <signal name="activate" handler="parole_player_menu_open_location_cb"/>
+                                              </object>
+                                            </child>
+                                            <child>
+                                              <object class="GtkSeparatorMenuItem" id="separatormenuitem1">
+                                                <property name="visible">True</property>
+                                              </object>
+                                            </child>
+                                            <child>
+                                              <object class="GtkImageMenuItem" id="imagemenuitem1">
+                                                <property name="label">gtk-quit</property>
+                                                <property name="visible">True</property>
+                                                <property name="use_underline">True</property>
+                                                <property name="use_stock">True</property>
+                                                <signal name="activate" handler="parole_player_menu_exit_cb"/>
+                                              </object>
+                                            </child>
                                           </object>
                                         </child>
                                       </object>
                                     </child>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkImageMenuItem" id="menuitem2">
-                                    <property name="label" translatable="yes">_Device</property>
-                                    <property name="visible">True</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="image">image12</property>
-                                    <property name="use_stock">False</property>
-                                    <child type="submenu">
-                                      <object class="GtkMenu" id="menu3">
+                                    <child>
+                                      <object class="GtkImageMenuItem" id="menuitem2">
+                                        <property name="label" translatable="yes">_Device</property>
                                         <property name="visible">True</property>
-                                        <child>
-                                          <object class="GtkImageMenuItem" id="dvd-menu">
-                                            <property name="label" translatable="yes">_DVD</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="image">image12</property>
+                                        <property name="use_stock">False</property>
+                                        <child type="submenu">
+                                          <object class="GtkMenu" id="menu3">
                                             <property name="visible">True</property>
-                                            <property name="use_underline">True</property>
-                                            <property name="image">image18</property>
-                                            <property name="use_stock">False</property>
-                                            <child type="submenu">
-                                              <object class="GtkMenu" id="menu4">
+                                            <child>
+                                              <object class="GtkImageMenuItem" id="dvd-menu">
+                                                <property name="label" translatable="yes">_DVD</property>
                                                 <property name="visible">True</property>
-                                                <child>
-                                                  <object class="GtkImageMenuItem" id="dvd-iso-mi">
-                                                    <property name="label" translatable="yes">From _ISO image</property>
+                                                <property name="use_underline">True</property>
+                                                <property name="image">image18</property>
+                                                <property name="use_stock">False</property>
+                                                <child type="submenu">
+                                                  <object class="GtkMenu" id="menu4">
                                                     <property name="visible">True</property>
-                                                    <property name="use_underline">True</property>
-                                                    <property name="image">image19</property>
-                                                    <property name="use_stock">False</property>
-                                                    <signal name="activate" handler="dvd_iso_mi_activated_cb"/>
+                                                    <child>
+                                                      <object class="GtkImageMenuItem" id="dvd-iso-mi">
+                                                        <property name="label" translatable="yes">From _ISO image</property>
+                                                        <property name="visible">True</property>
+                                                        <property name="use_underline">True</property>
+                                                        <property name="image">image19</property>
+                                                        <property name="use_stock">False</property>
+                                                        <signal name="activate" handler="dvd_iso_mi_activated_cb"/>
+                                                      </object>
+                                                    </child>
                                                   </object>
                                                 </child>
                                               </object>
                                             </child>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkImageMenuItem" id="cd-menu">
-                                            <property name="label">gtk-cdrom</property>
-                                            <property name="visible">True</property>
-                                            <property name="use_underline">True</property>
-                                            <property name="use_stock">True</property>
-                                            <child type="submenu">
-                                              <object class="GtkMenu" id="menu5">
+                                            <child>
+                                              <object class="GtkImageMenuItem" id="cd-menu">
+                                                <property name="label">gtk-cdrom</property>
                                                 <property name="visible">True</property>
-                                                <child>
-                                                  <object class="GtkImageMenuItem" id="cd-iso-mi">
-                                                    <property name="label" translatable="yes">From _ISO image</property>
+                                                <property name="use_underline">True</property>
+                                                <property name="use_stock">True</property>
+                                                <child type="submenu">
+                                                  <object class="GtkMenu" id="menu5">
                                                     <property name="visible">True</property>
-                                                    <property name="use_underline">True</property>
-                                                    <property name="image">image20</property>
-                                                    <property name="use_stock">False</property>
-                                                    <signal name="activate" handler="cd_iso_mi_activated_cb"/>
+                                                    <child>
+                                                      <object class="GtkImageMenuItem" id="cd-iso-mi">
+                                                        <property name="label" translatable="yes">From _ISO image</property>
+                                                        <property name="visible">True</property>
+                                                        <property name="use_underline">True</property>
+                                                        <property name="image">image20</property>
+                                                        <property name="use_stock">False</property>
+                                                        <signal name="activate" handler="cd_iso_mi_activated_cb"/>
+                                                      </object>
+                                                    </child>
                                                   </object>
                                                 </child>
                                               </object>
@@ -244,548 +250,587 @@
                                         </child>
                                       </object>
                                     </child>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkImageMenuItem" id="edit-menu">
-                                    <property name="label" translatable="yes">_Edit</property>
-                                    <property name="visible">True</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="image">image13</property>
-                                    <property name="use_stock">False</property>
-                                    <child type="submenu">
-                                      <object class="GtkMenu" id="menu2">
+                                    <child>
+                                      <object class="GtkImageMenuItem" id="edit-menu">
+                                        <property name="label" translatable="yes">_Edit</property>
                                         <property name="visible">True</property>
-                                        <child>
-                                          <object class="GtkCheckMenuItem" id="menu-repeat">
-                                            <property name="visible">True</property>
-                                            <property name="label" translatable="yes">Repeat</property>
-                                            <property name="use_underline">True</property>
-                                            <signal name="toggled" handler="parole_player_repeat_toggled_cb"/>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkCheckMenuItem" id="menu-shuffle">
-                                            <property name="visible">True</property>
-                                            <property name="label" translatable="yes">Shuffle</property>
-                                            <property name="use_underline">True</property>
-                                            <signal name="toggled" handler="parole_player_shuffle_toggled_cb"/>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkSeparatorMenuItem" id="separatormenuitem2">
-                                            <property name="visible">True</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkMenuItem" id="plugins-menu-item">
-                                            <property name="visible">True</property>
-                                            <property name="label" translatable="yes">Plugins</property>
-                                            <property name="use_underline">True</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkImageMenuItem" id="preferences">
-                                            <property name="label">gtk-preferences</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="image">image13</property>
+                                        <property name="use_stock">False</property>
+                                        <child type="submenu">
+                                          <object class="GtkMenu" id="menu2">
                                             <property name="visible">True</property>
-                                            <property name="use_underline">True</property>
-                                            <property name="use_stock">True</property>
-                                            <signal name="activate" handler="parole_player_open_preferences_cb"/>
+                                            <child>
+                                              <object class="GtkCheckMenuItem" id="menu-repeat">
+                                                <property name="visible">True</property>
+                                                <property name="label" translatable="yes">Repeat</property>
+                                                <property name="use_underline">True</property>
+                                                <signal name="toggled" handler="parole_player_repeat_toggled_cb"/>
+                                              </object>
+                                            </child>
+                                            <child>
+                                              <object class="GtkCheckMenuItem" id="menu-shuffle">
+                                                <property name="visible">True</property>
+                                                <property name="label" translatable="yes">Shuffle</property>
+                                                <property name="use_underline">True</property>
+                                                <signal name="toggled" handler="parole_player_shuffle_toggled_cb"/>
+                                              </object>
+                                            </child>
+                                            <child>
+                                              <object class="GtkSeparatorMenuItem" id="separatormenuitem2">
+                                                <property name="visible">True</property>
+                                              </object>
+                                            </child>
+                                            <child>
+                                              <object class="GtkMenuItem" id="plugins-menu-item">
+                                                <property name="visible">True</property>
+                                                <property name="label" translatable="yes">Plugins</property>
+                                                <property name="use_underline">True</property>
+                                              </object>
+                                            </child>
+                                            <child>
+                                              <object class="GtkImageMenuItem" id="preferences">
+                                                <property name="label">gtk-preferences</property>
+                                                <property name="visible">True</property>
+                                                <property name="use_underline">True</property>
+                                                <property name="use_stock">True</property>
+                                                <signal name="activate" handler="parole_player_open_preferences_cb"/>
+                                              </object>
+                                            </child>
                                           </object>
                                         </child>
                                       </object>
                                     </child>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkImageMenuItem" id="menuitem4">
-                                    <property name="label" translatable="yes">_Video</property>
-                                    <property name="visible">True</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="image">image14</property>
-                                    <property name="use_stock">False</property>
-                                    <child type="submenu">
-                                      <object class="GtkMenu" id="menu8">
+                                    <child>
+                                      <object class="GtkImageMenuItem" id="menuitem4">
+                                        <property name="label" translatable="yes">_Video</property>
                                         <property name="visible">True</property>
-                                        <child>
-                                          <object class="GtkMenuItem" id="menuitem7">
+                                        <property name="use_underline">True</property>
+                                        <property name="image">image14</property>
+                                        <property name="use_stock">False</property>
+                                        <child type="submenu">
+                                          <object class="GtkMenu" id="menu8">
                                             <property name="visible">True</property>
-                                            <property name="label" translatable="yes">Aspect Ratio</property>
-                                            <property name="use_underline">True</property>
-                                            <child type="submenu">
-                                              <object class="GtkMenu" id="menu9">
+                                            <child>
+                                              <object class="GtkMenuItem" id="menuitem7">
                                                 <property name="visible">True</property>
-                                                <child>
-                                                  <object class="GtkRadioMenuItem" id="ratio_none">
+                                                <property name="label" translatable="yes">Aspect Ratio</property>
+                                                <property name="use_underline">True</property>
+                                                <child type="submenu">
+                                                  <object class="GtkMenu" id="menu9">
                                                     <property name="visible">True</property>
-                                                    <property name="label" translatable="yes">None</property>
-                                                    <property name="use_underline">True</property>
-                                                    <property name="draw_as_radio">True</property>
-                                                    <signal name="toggled" handler="ratio_none_toggled_cb"/>
-                                                  </object>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkRadioMenuItem" id="ratio_auto">
-                                                    <property name="visible">True</property>
-                                                    <property name="label" translatable="yes">Auto</property>
-                                                    <property name="use_underline">True</property>
-                                                    <property name="draw_as_radio">True</property>
-                                                    <signal name="toggled" handler="ratio_auto_toggled_cb"/>
-                                                  </object>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkRadioMenuItem" id="ratio_square">
-                                                    <property name="visible">True</property>
-                                                    <property name="label" translatable="yes">Square</property>
-                                                    <property name="use_underline">True</property>
-                                                    <property name="draw_as_radio">True</property>
-                                                    <signal name="toggled" handler="ratio_square_toggled_cb"/>
-                                                  </object>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkRadioMenuItem" id="ratio_4_3">
-                                                    <property name="visible">True</property>
-                                                    <property name="label" translatable="yes">4:3 (TV)</property>
-                                                    <property name="use_underline">True</property>
-                                                    <property name="draw_as_radio">True</property>
-                                                    <signal name="toggled" handler="ratio_4_3_toggled_cb"/>
-                                                  </object>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkRadioMenuItem" id="ratio_16_9">
-                                                    <property name="visible">True</property>
-                                                    <property name="label" translatable="yes">16:9 (Widescreen)</property>
-                                                    <property name="use_underline">True</property>
-                                                    <property name="draw_as_radio">True</property>
-                                                    <signal name="toggled" handler="ratio_16_9_toggled_cb"/>
-                                                  </object>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkRadioMenuItem" id="ratio_20_9">
-                                                    <property name="visible">True</property>
-                                                    <property name="label" translatable="yes">20:9 (DVB)</property>
-                                                    <property name="use_underline">True</property>
-                                                    <property name="draw_as_radio">True</property>
-                                                    <signal name="toggled" handler="ratio_20_9_toggled_cb"/>
+                                                    <child>
+                                                      <object class="GtkRadioMenuItem" id="ratio_none">
+                                                        <property name="visible">True</property>
+                                                        <property name="label" translatable="yes">None</property>
+                                                        <property name="use_underline">True</property>
+                                                        <property name="draw_as_radio">True</property>
+                                                        <signal name="toggled" handler="ratio_none_toggled_cb"/>
+                                                      </object>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkRadioMenuItem" id="ratio_auto">
+                                                        <property name="visible">True</property>
+                                                        <property name="label" translatable="yes">Auto</property>
+                                                        <property name="use_underline">True</property>
+                                                        <property name="draw_as_radio">True</property>
+                                                        <signal name="toggled" handler="ratio_auto_toggled_cb"/>
+                                                      </object>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkRadioMenuItem" id="ratio_square">
+                                                        <property name="visible">True</property>
+                                                        <property name="label" translatable="yes">Square</property>
+                                                        <property name="use_underline">True</property>
+                                                        <property name="draw_as_radio">True</property>
+                                                        <signal name="toggled" handler="ratio_square_toggled_cb"/>
+                                                      </object>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkRadioMenuItem" id="ratio_4_3">
+                                                        <property name="visible">True</property>
+                                                        <property name="label" translatable="yes">4:3 (TV)</property>
+                                                        <property name="use_underline">True</property>
+                                                        <property name="draw_as_radio">True</property>
+                                                        <signal name="toggled" handler="ratio_4_3_toggled_cb"/>
+                                                      </object>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkRadioMenuItem" id="ratio_16_9">
+                                                        <property name="visible">True</property>
+                                                        <property name="label" translatable="yes">16:9 (Widescreen)</property>
+                                                        <property name="use_underline">True</property>
+                                                        <property name="draw_as_radio">True</property>
+                                                        <signal name="toggled" handler="ratio_16_9_toggled_cb"/>
+                                                      </object>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkRadioMenuItem" id="ratio_20_9">
+                                                        <property name="visible">True</property>
+                                                        <property name="label" translatable="yes">20:9 (DVB)</property>
+                                                        <property name="use_underline">True</property>
+                                                        <property name="draw_as_radio">True</property>
+                                                        <signal name="toggled" handler="ratio_20_9_toggled_cb"/>
+                                                      </object>
+                                                    </child>
                                                   </object>
                                                 </child>
                                               </object>
                                             </child>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkSeparatorMenuItem" id="separatormenuitem3">
-                                            <property name="visible">True</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkImageMenuItem" id="imagemenuitem6">
-                                            <property name="label">gtk-fullscreen</property>
-                                            <property name="visible">True</property>
-                                            <property name="use_underline">True</property>
-                                            <property name="use_stock">True</property>
-                                            <signal name="activate" handler="parole_player_full_screen_activated_cb"/>
+                                            <child>
+                                              <object class="GtkSeparatorMenuItem" id="separatormenuitem3">
+                                                <property name="visible">True</property>
+                                              </object>
+                                            </child>
+                                            <child>
+                                              <object class="GtkImageMenuItem" id="imagemenuitem6">
+                                                <property name="label">gtk-fullscreen</property>
+                                                <property name="visible">True</property>
+                                                <property name="use_underline">True</property>
+                                                <property name="use_stock">True</property>
+                                                <signal name="activate" handler="parole_player_full_screen_activated_cb"/>
+                                              </object>
+                                            </child>
                                           </object>
                                         </child>
                                       </object>
                                     </child>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkImageMenuItem" id="menuitem5">
-                                    <property name="label" translatable="yes">_Volume</property>
-                                    <property name="visible">True</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="image">image15</property>
-                                    <property name="use_stock">False</property>
-                                    <child type="submenu">
-                                      <object class="GtkMenu" id="menu7">
+                                    <child>
+                                      <object class="GtkImageMenuItem" id="menuitem5">
+                                        <property name="label" translatable="yes">_Volume</property>
                                         <property name="visible">True</property>
-                                        <child>
-                                          <object class="GtkImageMenuItem" id="imagemenuitem4">
-                                            <property name="label" translatable="yes">_Mute</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="image">image15</property>
+                                        <property name="use_stock">False</property>
+                                        <child type="submenu">
+                                          <object class="GtkMenu" id="menu7">
                                             <property name="visible">True</property>
-                                            <property name="use_underline">True</property>
-                                            <property name="image">image21</property>
-                                            <property name="use_stock">False</property>
-                                            <signal name="activate" handler="parole_player_volume_mute"/>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkImageMenuItem" id="imagemenuitem5">
-                                            <property name="label" translatable="yes">Volume _Up</property>
-                                            <property name="visible">True</property>
-                                            <property name="use_underline">True</property>
-                                            <property name="image">image22</property>
-                                            <property name="use_stock">False</property>
-                                            <signal name="activate" handler="parole_player_volume_up"/>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkImageMenuItem" id="imagemenuitem7">
-                                            <property name="label" translatable="yes">Volume _Down</property>
-                                            <property name="visible">True</property>
-                                            <property name="use_underline">True</property>
-                                            <property name="image">image24</property>
-                                            <property name="use_stock">False</property>
-                                            <signal name="activate" handler="parole_player_volume_down"/>
+                                            <child>
+                                              <object class="GtkImageMenuItem" id="imagemenuitem4">
+                                                <property name="label" translatable="yes">_Mute</property>
+                                                <property name="visible">True</property>
+                                                <property name="use_underline">True</property>
+                                                <property name="image">image21</property>
+                                                <property name="use_stock">False</property>
+                                                <signal name="activate" handler="parole_player_volume_mute"/>
+                                              </object>
+                                            </child>
+                                            <child>
+                                              <object class="GtkImageMenuItem" id="imagemenuitem5">
+                                                <property name="label" translatable="yes">Volume _Up</property>
+                                                <property name="visible">True</property>
+                                                <property name="use_underline">True</property>
+                                                <property name="image">image22</property>
+                                                <property name="use_stock">False</property>
+                                                <signal name="activate" handler="parole_player_volume_up"/>
+                                              </object>
+                                            </child>
+                                            <child>
+                                              <object class="GtkImageMenuItem" id="imagemenuitem7">
+                                                <property name="label" translatable="yes">Volume _Down</property>
+                                                <property name="visible">True</property>
+                                                <property name="use_underline">True</property>
+                                                <property name="image">image24</property>
+                                                <property name="use_stock">False</property>
+                                                <signal name="activate" handler="parole_player_volume_down"/>
+                                              </object>
+                                            </child>
                                           </object>
                                         </child>
                                       </object>
                                     </child>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkImageMenuItem" id="menuitem6">
-                                    <property name="label" translatable="yes">_Help</property>
-                                    <property name="visible">True</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="image">image16</property>
-                                    <property name="use_stock">False</property>
-                                    <child type="submenu">
-                                      <object class="GtkMenu" id="menu6">
+                                    <child>
+                                      <object class="GtkImageMenuItem" id="menuitem6">
+                                        <property name="label" translatable="yes">_Help</property>
                                         <property name="visible">True</property>
-                                        <child>
-                                          <object class="GtkImageMenuItem" id="imagemenuitem3">
-                                            <property name="label">gtk-about</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="image">image16</property>
+                                        <property name="use_stock">False</property>
+                                        <child type="submenu">
+                                          <object class="GtkMenu" id="menu6">
                                             <property name="visible">True</property>
-                                            <property name="use_underline">True</property>
-                                            <property name="use_stock">True</property>
-                                            <signal name="activate" handler="parole_show_about"/>
+                                            <child>
+                                              <object class="GtkImageMenuItem" id="imagemenuitem3">
+                                                <property name="label">gtk-about</property>
+                                                <property name="visible">True</property>
+                                                <property name="use_underline">True</property>
+                                                <property name="use_stock">True</property>
+                                                <signal name="activate" handler="parole_show_about"/>
+                                              </object>
+                                            </child>
                                           </object>
                                         </child>
                                       </object>
                                     </child>
                                   </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="padding">50</property>
+                                    <property name="position">0</property>
+                                  </packing>
                                 </child>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="padding">50</property>
-                                <property name="position">0</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="label1">
+                                <property name="visible">True</property>
+                              </object>
+                              <packing>
+                                <property name="position">2</property>
                               </packing>
                             </child>
                           </object>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label1">
-                            <property name="visible">True</property>
-                          </object>
-                          <packing>
-                            <property name="position">2</property>
-                          </packing>
                         </child>
                       </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="position">0</property>
+                      </packing>
                     </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkAlignment" id="video-view">
-                    <property name="visible">True</property>
-                    <property name="right_padding">4</property>
                     <child>
-                      <object class="GtkViewport" id="videoport">
+                      <object class="GtkAlignment" id="video-view">
                         <property name="visible">True</property>
-                        <property name="resize_mode">queue</property>
-                        <property name="shadow_type">out</property>
+                        <property name="right_padding">4</property>
                         <child>
-                          <object class="GtkHBox" id="output">
+                          <object class="GtkViewport" id="videoport">
                             <property name="visible">True</property>
+                            <property name="resize_mode">queue</property>
+                            <property name="shadow_type">out</property>
                             <child>
-                              <placeholder/>
+                              <object class="GtkHBox" id="output">
+                                <property name="visible">True</property>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                              </object>
                             </child>
                           </object>
                         </child>
                       </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
                     </child>
-                  </object>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkAlignment" id="control">
-                    <property name="visible">True</property>
-                    <property name="top_padding">2</property>
-                    <property name="bottom_padding">2</property>
-                    <property name="left_padding">2</property>
-                    <property name="right_padding">2</property>
                     <child>
-                      <object class="GtkVBox" id="play-box">
+                      <object class="GtkAlignment" id="control">
                         <property name="visible">True</property>
-                        <property name="orientation">vertical</property>
+                        <property name="top_padding">2</property>
+                        <property name="bottom_padding">2</property>
+                        <property name="left_padding">2</property>
+                        <property name="right_padding">2</property>
                         <child>
-                          <object class="GtkAlignment" id="scale-container">
+                          <object class="GtkVBox" id="play-box">
                             <property name="visible">True</property>
-                            <property name="left_padding">5</property>
-                            <property name="right_padding">5</property>
+                            <property name="orientation">vertical</property>
                             <child>
-                              <object class="GtkHScale" id="scale">
+                              <object class="GtkAlignment" id="scale-container">
                                 <property name="visible">True</property>
-                                <property name="sensitive">False</property>
-                                <property name="can_focus">True</property>
-                                <property name="draw_value">False</property>
-                                <signal name="button_press_event" handler="parole_player_range_button_press"/>
-                                <signal name="value_changed" handler="parole_player_range_value_changed"/>
-                                <signal name="button_release_event" handler="parole_player_range_button_release"/>
+                                <property name="left_padding">5</property>
+                                <property name="right_padding">5</property>
+                                <child>
+                                  <object class="GtkHScale" id="scale">
+                                    <property name="visible">True</property>
+                                    <property name="sensitive">False</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="draw_value">False</property>
+                                    <signal name="button_press_event" handler="parole_player_range_button_press"/>
+                                    <signal name="value_changed" handler="parole_player_range_value_changed"/>
+                                    <signal name="button_release_event" handler="parole_player_range_button_release"/>
+                                  </object>
+                                </child>
                               </object>
+                              <packing>
+                                <property name="position">0</property>
+                              </packing>
                             </child>
-                          </object>
-                          <packing>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkAlignment" id="alignment6">
-                            <property name="visible">True</property>
                             <child>
-                              <object class="GtkHBox" id="hbox2">
+                              <object class="GtkAlignment" id="alignment6">
                                 <property name="visible">True</property>
                                 <child>
-                                  <object class="GtkHButtonBox" id="hbuttonbox1">
+                                  <object class="GtkHBox" id="hbox2">
                                     <property name="visible">True</property>
                                     <child>
-                                      <object class="GtkHBox" id="hbox3">
+                                      <object class="GtkHButtonBox" id="hbuttonbox1">
                                         <property name="visible">True</property>
-                                        <property name="spacing">2</property>
-                                        <child>
-                                          <object class="GtkToggleButton" id="shuffle">
-                                            <property name="visible">True</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="toggled" handler="parole_player_shuffle_toggled_cb"/>
-                                          </object>
-                                          <packing>
-                                            <property name="position">0</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkToggleButton" id="repeat">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="receives_default">True</property>
-                                            <property name="image">image5</property>
-                                            <property name="relief">none</property>
-                                            <property name="focus_on_click">False</property>
-                                            <signal name="toggled" handler="parole_player_repeat_toggled_cb"/>
-                                          </object>
-                                          <packing>
-                                            <property name="position">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkButton" id="stop">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="receives_default">True</property>
-                                            <property name="image">image4</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="position">2</property>
-                                          </packing>
-                                        </child>
                                         <child>
-                                          <object class="GtkViewport" id="viewport3">
+                                          <object class="GtkHBox" id="hbox3">
                                             <property name="visible">True</property>
-                                            <property name="resize_mode">queue</property>
-                                            <property name="shadow_type">out</property>
+                                            <property name="spacing">2</property>
                                             <child>
-                                              <object class="GtkHBox" id="hbox4">
+                                              <object class="GtkToggleButton" id="shuffle">
                                                 <property name="visible">True</property>
-                                                <property name="spacing">2</property>
-                                                <child>
-                                                  <object class="GtkButton" id="backward">
-                                                    <property name="width_request">60</property>
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">True</property>
-                                                    <property name="image">image3</property>
-                                                    <property name="relief">none</property>
-                                                    <property name="focus_on_click">False</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="fill">False</property>
-                                                    <property name="position">0</property>
-                                                  </packing>
-                                                </child>
+                                                <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="toggled" handler="parole_player_shuffle_toggled_cb"/>
+                                              </object>
+                                              <packing>
+                                                <property name="position">0</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkToggleButton" id="repeat">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">True</property>
+                                                <property name="image">image5</property>
+                                                <property name="relief">none</property>
+                                                <property name="focus_on_click">False</property>
+                                                <signal name="toggled" handler="parole_player_repeat_toggled_cb"/>
+                                              </object>
+                                              <packing>
+                                                <property name="position">1</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkButton" id="stop">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">True</property>
+                                                <property name="image">image4</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="position">2</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkViewport" id="viewport3">
+                                                <property name="visible">True</property>
+                                                <property name="resize_mode">queue</property>
+                                                <property name="shadow_type">out</property>
                                                 <child>
-                                                  <object class="GtkAlignment" id="play-container">
+                                                  <object class="GtkHBox" id="hbox4">
                                                     <property name="visible">True</property>
+                                                    <property name="spacing">2</property>
                                                     <child>
-                                                      <object class="GtkButton" id="play">
-                                                        <property name="width_request">80</property>
-                                                        <property name="height_request">35</property>
+                                                      <object class="GtkButton" id="backward">
+                                                        <property name="width_request">60</property>
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">True</property>
                                                         <property name="receives_default">True</property>
-                                                        <property name="image">image1</property>
-                                                        <property name="relief">half</property>
+                                                        <property name="image">image3</property>
+                                                        <property name="relief">none</property>
                                                         <property name="focus_on_click">False</property>
-                                                        <signal name="clicked" handler="parole_player_play_pause_clicked"/>
                                                       </object>
+                                                      <packing>
+                                                        <property name="expand">False</property>
+                                                        <property name="fill">False</property>
+                                                        <property name="position">0</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkAlignment" id="play-container">
+                                                        <property name="visible">True</property>
+                                                        <child>
+                                                          <object class="GtkButton" id="play">
+                                                            <property name="width_request">80</property>
+                                                            <property name="height_request">35</property>
+                                                            <property name="visible">True</property>
+                                                            <property name="can_focus">True</property>
+                                                            <property name="receives_default">True</property>
+                                                            <property name="image">image1</property>
+                                                            <property name="relief">half</property>
+                                                            <property name="focus_on_click">False</property>
+                                                            <signal name="clicked" handler="parole_player_play_pause_clicked"/>
+                                                          </object>
+                                                        </child>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="position">1</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkButton" id="forward">
+                                                        <property name="width_request">60</property>
+                                                        <property name="visible">True</property>
+                                                        <property name="can_focus">True</property>
+                                                        <property name="receives_default">True</property>
+                                                        <property name="image">image2</property>
+                                                        <property name="relief">none</property>
+                                                        <property name="focus_on_click">False</property>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="expand">False</property>
+                                                        <property name="fill">False</property>
+                                                        <property name="position">2</property>
+                                                      </packing>
                                                     </child>
                                                   </object>
-                                                  <packing>
-                                                    <property name="position">1</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkButton" id="forward">
-                                                    <property name="width_request">60</property>
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">True</property>
-                                                    <property name="image">image2</property>
-                                                    <property name="relief">none</property>
-                                                    <property name="focus_on_click">False</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="fill">False</property>
-                                                    <property name="position">2</property>
-                                                  </packing>
                                                 </child>
                                               </object>
+                                              <packing>
+                                                <property name="padding">5</property>
+                                                <property name="position">3</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkToggleButton" id="volume-image">
+                                                <property name="height_request">10</property>
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">True</property>
+                                                <property name="image">image6</property>
+                                                <property name="relief">none</property>
+                                                <property name="focus_on_click">False</property>
+                                                <signal name="toggled" handler="parole_player_volume_toggled"/>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">False</property>
+                                                <property name="position">4</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkHScale" id="volume">
+                                                <property name="width_request">80</property>
+                                                <property name="height_request">2</property>
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="show_fill_level">True</property>
+                                                <property name="draw_value">False</property>
+                                                <signal name="value_changed" handler="parole_player_volume_value_changed_cb"/>
+                                                <signal name="scroll_event" handler="parole_player_volume_scroll_event_cb"/>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">False</property>
+                                                <property name="pack_type">end</property>
+                                                <property name="position">5</property>
+                                              </packing>
                                             </child>
                                           </object>
                                           <packing>
-                                            <property name="padding">5</property>
-                                            <property name="position">3</property>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                            <property name="position">0</property>
                                           </packing>
                                         </child>
+                                      </object>
+                                      <packing>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkVBox" id="vbox3">
+                                        <property name="visible">True</property>
+                                        <property name="orientation">vertical</property>
                                         <child>
-                                          <object class="GtkToggleButton" id="volume-image">
-                                            <property name="height_request">10</property>
+                                          <object class="GtkButton" id="leave-fs">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
-                                            <property name="image">image6</property>
+                                            <property name="image">image8</property>
                                             <property name="relief">none</property>
                                             <property name="focus_on_click">False</property>
-                                            <signal name="toggled" handler="parole_player_volume_toggled"/>
+                                            <signal name="clicked" handler="parole_player_full_screen_activated_cb"/>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
-                                            <property name="position">4</property>
+                                            <property name="position">0</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkHScale" id="volume">
-                                            <property name="width_request">80</property>
-                                            <property name="height_request">2</property>
+                                          <object class="GtkButton" id="min-view">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
-                                            <property name="show_fill_level">True</property>
-                                            <property name="draw_value">False</property>
-                                            <signal name="value_changed" handler="parole_player_volume_value_changed_cb"/>
-                                            <signal name="scroll_event" handler="parole_player_volume_scroll_event_cb"/>
+                                            <property name="receives_default">True</property>
+                                            <property name="image">image9</property>
+                                            <property name="relief">none</property>
+                                            <property name="focus_on_click">False</property>
+                                            <signal name="clicked" handler="parole_player_minimize_clicked_cb"/>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
-                                            <property name="pack_type">end</property>
-                                            <property name="position">5</property>
+                                            <property name="position">1</property>
                                           </packing>
                                         </child>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
-                                        <property name="position">0</property>
+                                        <property name="pack_type">end</property>
+                                        <property name="position">1</property>
                                       </packing>
                                     </child>
                                   </object>
-                                  <packing>
-                                    <property name="position">0</property>
-                                  </packing>
                                 </child>
+                              </object>
+                              <packing>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkAlignment" id="alignment2">
+                                <property name="visible">True</property>
+                                <property name="top_padding">2</property>
+                                <property name="bottom_padding">2</property>
+                                <property name="left_padding">5</property>
+                                <property name="right_padding">5</property>
                                 <child>
-                                  <object class="GtkVBox" id="vbox3">
+                                  <object class="GtkHBox" id="statusbox">
                                     <property name="visible">True</property>
-                                    <property name="orientation">vertical</property>
-                                    <child>
-                                      <object class="GtkButton" id="leave-fs">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">True</property>
-                                        <property name="image">image8</property>
-                                        <property name="relief">none</property>
-                                        <property name="focus_on_click">False</property>
-                                        <signal name="clicked" handler="parole_player_full_screen_activated_cb"/>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
+                                    <property name="spacing">5</property>
                                     <child>
-                                      <object class="GtkButton" id="min-view">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">True</property>
-                                        <property name="image">image9</property>
-                                        <property name="relief">none</property>
-                                        <property name="focus_on_click">False</property>
-                                        <signal name="clicked" handler="parole_player_minimize_clicked_cb"/>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="position">1</property>
-                                      </packing>
+                                      <placeholder/>
                                     </child>
                                   </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="pack_type">end</property>
-                                    <property name="position">1</property>
-                                  </packing>
                                 </child>
                               </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="position">2</property>
+                              </packing>
                             </child>
                           </object>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
                         </child>
                       </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">2</property>
+                      </packing>
                     </child>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">2</property>
-                  </packing>
                 </child>
               </object>
+              <packing>
+                <property name="resize">True</property>
+                <property name="shrink">False</property>
+              </packing>
             </child>
           </object>
           <packing>
-            <property name="resize">True</property>
-            <property name="shrink">False</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </object>
     </child>
   </object>
+  <object class="GtkListStore" id="sidebar-combo-liststore">
+    <columns>
+      <!-- column-name pix -->
+      <column type="gchararray"/>
+      <!-- column-name title -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">playlist</col>
+        <col id="1" translatable="yes">Playlist</col>
+      </row>
+    </data>
+  </object>
   <object class="GtkImage" id="image10">
     <property name="visible">True</property>
     <property name="stock">gtk-go-back</property>
@@ -795,11 +840,28 @@
     <property name="stock">gtk-new</property>
     <property name="icon-size">1</property>
   </object>
+  <object class="GtkImage" id="image17">
+    <property name="visible">True</property>
+    <property name="stock">gtk-network</property>
+  </object>
   <object class="GtkImage" id="image12">
     <property name="visible">True</property>
     <property name="stock">gtk-cdrom</property>
     <property name="icon-size">1</property>
   </object>
+  <object class="GtkImage" id="image18">
+    <property name="visible">True</property>
+    <property name="stock">gtk-cdrom</property>
+  </object>
+  <object class="GtkImage" id="image19">
+    <property name="visible">True</property>
+    <property name="stock">gtk-file</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image20">
+    <property name="visible">True</property>
+    <property name="stock">gtk-cdrom</property>
+  </object>
   <object class="GtkImage" id="image13">
     <property name="visible">True</property>
     <property name="stock">gtk-edit</property>
@@ -816,6 +878,21 @@
     <property name="icon_name">multimedia-volume-control</property>
     <property name="icon-size">1</property>
   </object>
+  <object class="GtkImage" id="image21">
+    <property name="visible">True</property>
+    <property name="pixel_size">18</property>
+    <property name="icon_name">audio-volume-muted</property>
+  </object>
+  <object class="GtkImage" id="image22">
+    <property name="visible">True</property>
+    <property name="pixel_size">18</property>
+    <property name="icon_name">audio-volume-high</property>
+  </object>
+  <object class="GtkImage" id="image24">
+    <property name="visible">True</property>
+    <property name="pixel_size">18</property>
+    <property name="icon_name">audio-volume-low</property>
+  </object>
   <object class="GtkImage" id="image16">
     <property name="visible">True</property>
     <property name="stock">gtk-about</property>
@@ -837,6 +914,10 @@
     <property name="visible">True</property>
     <property name="stock">gtk-media-previous</property>
   </object>
+  <object class="GtkImage" id="image1">
+    <property name="visible">True</property>
+    <property name="stock">gtk-media-play</property>
+  </object>
   <object class="GtkImage" id="image2">
     <property name="visible">True</property>
     <property name="stock">gtk-media-next</property>
@@ -855,54 +936,4 @@
     <property name="stock">gtk-remove</property>
     <property name="icon-size">1</property>
   </object>
-  <object class="GtkImage" id="image17">
-    <property name="visible">True</property>
-    <property name="stock">gtk-network</property>
-  </object>
-  <object class="GtkImage" id="image18">
-    <property name="visible">True</property>
-    <property name="stock">gtk-cdrom</property>
-  </object>
-  <object class="GtkImage" id="image19">
-    <property name="visible">True</property>
-    <property name="stock">gtk-file</property>
-    <property name="icon-size">1</property>
-  </object>
-  <object class="GtkImage" id="image20">
-    <property name="visible">True</property>
-    <property name="stock">gtk-cdrom</property>
-  </object>
-  <object class="GtkImage" id="image21">
-    <property name="visible">True</property>
-    <property name="pixel_size">18</property>
-    <property name="icon_name">audio-volume-muted</property>
-  </object>
-  <object class="GtkImage" id="image22">
-    <property name="visible">True</property>
-    <property name="pixel_size">18</property>
-    <property name="icon_name">audio-volume-high</property>
-  </object>
-  <object class="GtkImage" id="image24">
-    <property name="visible">True</property>
-    <property name="pixel_size">18</property>
-    <property name="icon_name">audio-volume-low</property>
-  </object>
-  <object class="GtkListStore" id="sidebar-combo-liststore">
-    <columns>
-      <!-- column-name pix -->
-      <column type="gchararray"/>
-      <!-- column-name title -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">playlist</col>
-        <col id="1" translatable="yes">Playlist</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkImage" id="image1">
-    <property name="visible">True</property>
-    <property name="stock">gtk-media-play</property>
-  </object>
 </interface>
diff --git a/src/parole-player.c b/src/parole-player.c
index 3a5ad20..89c92c2 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -229,7 +229,7 @@ struct _ParolePlayer
     
     DBusGConnection     *bus;
     ParoleMediaList	*list;
-    //ParoleStatusbar     *status;
+    ParoleStatusbar     *statusbar;
     ParoleDisc          *disc;
     ParoleScreenSaver   *screen_saver;
     ParoleConf          *conf;
@@ -1113,7 +1113,7 @@ parole_player_full_screen (ParolePlayer *player, gboolean fullscreen)
     {
 	//npages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (player->main_nt));
 
-	//parole_statusbar_set_visible (player->status, TRUE);
+	parole_statusbar_set_visible (player->statusbar, TRUE);
 
 	gtk_alignment_set_padding (GTK_ALIGNMENT (player->video_view), 0, 0, 0, 4);
 	gtk_viewport_set_shadow_type (GTK_VIEWPORT (player->videoport), GTK_SHADOW_OUT);
@@ -1147,7 +1147,7 @@ parole_player_full_screen (ParolePlayer *player, gboolean fullscreen)
 	}
 	parole_player_move_fs_window (player);
 
-	//parole_statusbar_set_visible (player->status, FALSE);
+	parole_statusbar_set_visible (player->statusbar, FALSE);
 	
 	gtk_widget_hide (player->control);
 	gtk_widget_hide (player->menu_view);
@@ -1578,7 +1578,7 @@ parole_player_finalize (GObject *object)
     
     g_object_unref (player->conf);
     g_object_unref (player->video_filter);
-    //g_object_unref (player->status);
+    g_object_unref (player->statusbar);
     //g_object_unref (player->disc);
     g_object_unref (player->screen_saver);
     
@@ -2068,7 +2068,7 @@ parole_player_init (ParolePlayer *player)
     
     player->gst = parole_gst_new (player->conf);
 
-    //player->status = parole_statusbar_new ();
+    player->statusbar = parole_statusbar_new ();
 
     //player->disc = parole_disc_new ();
     //g_signal_connect (player->disc, "disc-selected",
diff --git a/src/parole-statusbar.c b/src/parole-statusbar.c
index 0bc2687..70425be 100644
--- a/src/parole-statusbar.c
+++ b/src/parole-statusbar.c
@@ -282,6 +282,7 @@ parole_statusbar_init (ParoleStatusbar *statusbar)
     statusbar->priv->sep = GTK_WIDGET (gtk_builder_get_object (builder, "status-sep"));
     
     statusbar->priv->progress = gtk_progress_bar_new ();
+    gtk_widget_set_no_show_all (statusbar->priv->progress, TRUE);
     gtk_widget_hide (statusbar->priv->progress);
     statusbar->priv->label_text = gtk_label_new (NULL);
 
@@ -291,7 +292,7 @@ parole_statusbar_init (ParoleStatusbar *statusbar)
 		  "ellipsize", PANGO_ELLIPSIZE_END, 
 		  NULL);
 
-    gtk_widget_set_size_request (statusbar->priv->progress, 180, 20);
+    gtk_widget_set_size_request (statusbar->priv->progress, 160, 10);
 
     statusbar->priv->label_duration = gtk_label_new (NULL);
     
@@ -306,6 +307,7 @@ parole_statusbar_init (ParoleStatusbar *statusbar)
     gtk_widget_show (box);
     gtk_widget_show (statusbar->priv->label_text);
     gtk_widget_show (statusbar->priv->label_duration);
+    gtk_label_set_text (GTK_LABEL (statusbar->priv->label_duration), _("Stopped"));
     g_object_unref (builder);
     statusbar->priv->box = box;
     



More information about the Xfce4-commits mailing list