[Xfce4-commits] <parole:master> Merge the playback gtk-scale and the control hbox

[Simon Steinbeiss]

Updating branch refs/heads/master
         to b1308b2be1dba297d00b5a68081be70a837a744e (commit)
       from 48c3e6c6214338fce645930dffccd26235189d45 (commit)

commit b1308b2be1dba297d00b5a68081be70a837a744e
Author: Simon Steinbeiss <ochosi at xfce.org>
Date:   Wed Jul 11 03:28:27 2012 +0200

    Merge the playback gtk-scale and the control hbox

 data/interfaces/parole.ui |   35 ++++++++++++++++++-----------------
 1 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index 4ffad80..2350121 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -494,22 +494,6 @@
                                               </packing>
                                             </child>
                                             <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"/>
-                                                <signal name="scroll_event" handler="parole_player_scroll_event_cb"/>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="position">1</property>
-                                              </packing>
-                                            </child>
-                                            <child>
                                               <object class="GtkHBox" id="hbox7">
                                                 <property name="visible">True</property>
                                                 <child>
@@ -585,6 +569,22 @@
                                                             <property name="position">3</property>
                                                           </packing>
                                                         </child>
+					      		<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"/>
+            		                                    <signal name="scroll_event" handler="parole_player_scroll_event_cb"/>
+            		                                  </object>
+            		                                  <packing>
+            		                                    <property name="expand">True</property>
+            		                                    <property name="position">4</property>
+            		                                  </packing>
+            		                                </child>
                                                         <child>
                                                           <object class="GtkHBox" id="hbox8">
                                                             <property name="visible">True</property>
@@ -617,9 +617,10 @@
                                                             </child>
                                                           </object>
                                                           <packing>
+							    <property name="expand">False</property>
                                                             <property name="padding">30</property>
                                                             <property name="pack_type">end</property>
-                                                            <property name="position">4</property>
+                                                            <property name="position">5</property>
                                                           </packing>
                                                         </child>
                                                       </object>