From 9ef9b17b931f85ddef63da200994bf6ade5ef545 Mon Sep 17 00:00:00 2001
From: Anna Schumaker <Anna@OcarinaProject.net>
Date: Thu, 30 Jun 2016 09:36:37 -0400
Subject: [PATCH] gui: Fix up main GtkGrid

Somewhere along the line the grid formatting got messed up, probably
after several merges while other bugs were fixed.  This patch reworks
the grid so everything is formatted correctly.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
---
 share/ocarina/ocarina6.glade | 223 +++++++++++++++++------------------
 1 file changed, 108 insertions(+), 115 deletions(-)

diff --git a/share/ocarina/ocarina6.glade b/share/ocarina/ocarina6.glade
index 7a98c8c6..00d763e7 100644
--- a/share/ocarina/ocarina6.glade
+++ b/share/ocarina/ocarina6.glade
@@ -456,6 +456,20 @@
             <property name="height">3</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkImage" id="o_cover">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_left">10</property>
+            <property name="margin_right">10</property>
+            <property name="icon_size">6</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">0</property>
+            <property name="height">3</property>
+          </packing>
+        </child>
         <child>
           <object class="GtkScrolledWindow" id="o_tags">
             <property name="visible">True</property>
@@ -553,6 +567,56 @@
             <property name="height">2</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkButtonBox" id="buttonbox4">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">end</property>
+            <property name="valign">start</property>
+            <property name="margin_right">5</property>
+            <property name="margin_top">10</property>
+            <child>
+              <object class="GtkToggleButton" id="o_random">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Randomly pick tracks</property>
+                <property name="halign">center</property>
+                <property name="valign">center</property>
+                <property name="image">image9</property>
+                <signal name="toggled" handler="__queue_random" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+                <property name="non_homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToggleButton" id="o_repeat">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Repeat tracks</property>
+                <property name="halign">center</property>
+                <property name="valign">center</property>
+                <property name="image">image10</property>
+                <signal name="toggled" handler="__queue_repeat" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+                <property name="non_homogeneous">True</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="left_attach">3</property>
+            <property name="top_attach">0</property>
+          </packing>
+        </child>
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
@@ -759,56 +823,6 @@
             <property name="height">2</property>
           </packing>
         </child>
-        <child>
-          <object class="GtkButtonBox" id="buttonbox4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="halign">end</property>
-            <property name="valign">start</property>
-            <property name="margin_right">5</property>
-            <property name="margin_top">10</property>
-            <child>
-              <object class="GtkToggleButton" id="o_random">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Randomly pick tracks</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <property name="image">image9</property>
-                <signal name="toggled" handler="__queue_random" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-                <property name="non_homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkToggleButton" id="o_repeat">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Repeat tracks</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <property name="image">image10</property>
-                <signal name="toggled" handler="__queue_repeat" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-                <property name="non_homogeneous">True</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkPaned" id="o_sidebar">
             <property name="visible">True</property>
@@ -821,6 +835,7 @@
               <object class="GtkBox" id="box5">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="margin_left">2</property>
                 <property name="margin_right">3</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1051,15 +1066,17 @@
               </packing>
             </child>
             <child>
-              <object class="GtkBox" id="box1">
+              <object class="GtkGrid">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="margin_left">3</property>
-                <property name="orientation">vertical</property>
+                <property name="margin_right">2</property>
                 <child>
                   <object class="GtkStack" id="o_stack">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
                     <property name="transition_type">over-up-down</property>
                     <child>
                       <object class="GtkBox" id="box11">
@@ -1095,7 +1112,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="valign">center</property>
-                                <property name="margin_right">10</property>
+                                <property name="margin_right">8</property>
                                 <property name="active">True</property>
                                 <signal name="notify::active" handler="__queue_disabled" swapped="no"/>
                               </object>
@@ -1372,60 +1389,49 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                    <property name="width">3</property>
+                    <property name="height">2</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkBox" id="box3">
-                    <property name="visible">True</property>
+                  <object class="GtkProgressBar" id="o_idle_progress">
                     <property name="can_focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="valign">center</property>
                     <property name="margin_top">2</property>
-                    <property name="homogeneous">True</property>
-                    <child>
-                      <object class="GtkProgressBar" id="o_idle_progress">
-                        <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="valign">center</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="padding">5</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="o_sorting">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="halign">end</property>
-                      </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_runtime">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="halign">end</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="padding">5</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
+                    <property name="hexpand">True</property>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">3</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="o_sorting">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">end</property>
+                    <property name="margin_top">2</property>
+                    <property name="hexpand">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="o_runtime">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">end</property>
+                    <property name="margin_top">2</property>
+                    <property name="hexpand">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">2</property>
+                    <property name="top_attach">2</property>
                   </packing>
                 </child>
               </object>
@@ -1441,28 +1447,15 @@
             <property name="width">4</property>
           </packing>
         </child>
-        <child>
-          <object class="GtkImage" id="o_cover">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="margin_left">10</property>
-            <property name="margin_right">10</property>
-            <property name="icon_size">6</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="height">3</property>
-          </packing>
-        </child>
       </object>
     </child>
     <accelerator key="Escape" signal="grab-focus"/>
   </object>
   <object class="GtkSizeGroup">
     <widgets>
-      <widget name="o_pause_after"/>
+      <widget name="o_cover"/>
       <widget name="buttonbox4"/>
+      <widget name="o_pause_after"/>
       <widget name="o_enable"/>
     </widgets>
   </object>