From cdf91cc59ba62132449fac28e8463e0f2b51717a Mon Sep 17 00:00:00 2001
From: Anna Schumaker <Anna@OcarinaProject.net>
Date: Sat, 14 May 2016 08:03:56 -0400
Subject: [PATCH] gui: Move position slider into the current track header

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
---
 CHANGELOG                    |   1 +
 share/ocarina/ocarina6.glade | 160 +++++++++++++++++++----------------
 2 files changed, 88 insertions(+), 73 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index a42c1526..1ad48b40 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,5 @@
 6.4.12:
+- Move current position slider into the top section
 - Tooltip updates
 - Swap position of random/repeat and favorite/hide buttons
 
diff --git a/share/ocarina/ocarina6.glade b/share/ocarina/ocarina6.glade
index 960eb4a7..c6c1a792 100644
--- a/share/ocarina/ocarina6.glade
+++ b/share/ocarina/ocarina6.glade
@@ -302,7 +302,8 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
-                <property name="valign">center</property>
+                <property name="valign">start</property>
+                <property name="margin_top">5</property>
                 <property name="layout_style">start</property>
                 <child>
                   <object class="GtkButton" id="o_prev">
@@ -328,8 +329,8 @@
                         <property name="icon_name">media-skip-backward</property>
                       </object>
                     </child>
-                    <accelerator key="n" signal="clicked" modifiers="GDK_SHIFT_MASK"/>
                     <accelerator key="AudioPrev" signal="clicked"/>
+                    <accelerator key="n" signal="clicked" modifiers="GDK_SHIFT_MASK"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -363,8 +364,8 @@
                         <property name="icon_size">5</property>
                       </object>
                     </child>
-                    <accelerator key="space" signal="clicked"/>
                     <accelerator key="AudioPlay" signal="clicked"/>
+                    <accelerator key="space" signal="clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -397,8 +398,8 @@
                         <property name="icon_size">5</property>
                       </object>
                     </child>
-                    <accelerator key="space" signal="clicked"/>
                     <accelerator key="AudioPlay" signal="clicked"/>
+                    <accelerator key="space" signal="clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -431,8 +432,8 @@
                         <property name="icon_name">media-skip-forward</property>
                       </object>
                     </child>
-                    <accelerator key="n" signal="clicked"/>
                     <accelerator key="AudioNext" signal="clicked"/>
+                    <accelerator key="n" signal="clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -446,6 +447,7 @@
                 <property name="left_attach">0</property>
                 <property name="top_attach">0</property>
                 <property name="width">2</property>
+                <property name="height">2</property>
               </packing>
             </child>
             <child>
@@ -590,6 +592,65 @@
               <packing>
                 <property name="left_attach">5</property>
                 <property name="top_attach">0</property>
+                <property name="height">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="spacing">5</property>
+                <child>
+                  <object class="GtkLabel" id="o_position">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="has_tooltip">True</property>
+                    <property name="valign">center</property>
+                    <property name="label" translatable="yes">&lt;span size='large'&gt;0:00&lt;/span&gt;</property>
+                    <property name="use_markup">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkScale" id="o_seek">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="valign">center</property>
+                    <property name="adjustment">o_progress</property>
+                    <property name="round_digits">0</property>
+                    <property name="draw_value">False</property>
+                    <property name="value_pos">left</property>
+                    <signal name="change-value" handler="__audio_seek" swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="o_duration">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="valign">center</property>
+                    <property name="label" translatable="yes">&lt;span size='large'&gt;0:00&lt;/span&gt;</property>
+                    <property name="use_markup">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="top_attach">1</property>
+                <property name="width">3</property>
               </packing>
             </child>
           </object>
@@ -999,55 +1060,35 @@
                     <property name="can_focus">False</property>
                     <property name="margin_top">2</property>
                     <child>
-                      <object class="GtkLabel" id="o_position">
+                      <object class="GtkLabel" id="label5">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="has_tooltip">True</property>
-                        <property name="valign">center</property>
-                        <property name="margin_left">15</property>
                         <property name="margin_right">5</property>
-                        <property name="label" translatable="yes">&lt;span size='large'&gt;0:00&lt;/span&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes"> songs</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
+                        <property name="pack_type">end</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSpinButton" id="o_pause_count">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="caps_lock_warning">False</property>
+                        <property name="adjustment">adjustment1</property>
+                        <property name="numeric">True</property>
+                        <signal name="changed" handler="__audio_pause_count" swapped="no"/>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="pack_type">end</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="GtkScale" id="o_seek">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="adjustment">o_progress</property>
-                        <property name="round_digits">0</property>
-                        <property name="draw_value">False</property>
-                        <property name="value_pos">left</property>
-                        <signal name="change-value" handler="__audio_seek" swapped="no"/>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="o_duration">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="margin_left">5</property>
-                        <property name="margin_right">15</property>
-                        <property name="label" translatable="yes">&lt;span size='large'&gt;0:00&lt;/span&gt;</property>
-                        <property name="use_markup">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
                     <child>
                       <object class="GtkCheckButton" id="o_pause_enabled">
                         <property name="label" translatable="yes">Pause after </property>
@@ -1061,35 +1102,8 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">4</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkSpinButton" id="o_pause_count">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="caps_lock_warning">False</property>
-                        <property name="adjustment">adjustment1</property>
-                        <property name="numeric">True</property>
-                        <signal name="changed" handler="__audio_pause_count" swapped="no"/>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">5</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label5">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="margin_right">5</property>
-                        <property name="label" translatable="yes"> songs</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">6</property>
+                        <property name="pack_type">end</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
                   </object>