From e25b8407b06917ecfd2c6a3d26580ed319a5d11b Mon Sep 17 00:00:00 2001
From: Anna Schumaker <Anna@NoWheyCreamery.com>
Date: Wed, 28 Sep 2016 09:11:38 -0400
Subject: [PATCH] gui: Widget spacing tweaks

Signed-off-by: Anna Schumaker <Anna@NoWheyCreamery.com>
---
 CHANGELOG                |   1 +
 share/ocarina/ocarina.ui | 354 ++++++++++++++++++---------------------
 2 files changed, 168 insertions(+), 187 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index b8331f2a..cf85506a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@
 - Save databases if they have been upgraded
 - Don't duplicate tracks in the library after a defrag
 - Remove "Add New ..." menubutton and replace with Add Library Path button
+- Various UI tweaks
 
 6.5.0-rc:
 - Convert to CMake/CTest
diff --git a/share/ocarina/ocarina.ui b/share/ocarina/ocarina.ui
index 53630e36..16ddb58f 100644
--- a/share/ocarina/ocarina.ui
+++ b/share/ocarina/ocarina.ui
@@ -73,18 +73,6 @@
       </object>
     </child>
   </object>
-  <object class="GtkImage" id="image9">
-    <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_name">media-playlist-shuffle</property>
-  </object>
-  <object class="GtkImage" id="o_cover">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_size">6</property>
-  </object>
   <object class="GtkImage" id="image3">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -120,14 +108,15 @@
       <object class="GtkGrid">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="column_spacing">5</property>
+        <property name="margin_left">3</property>
+        <property name="margin_right">3</property>
+        <property name="column_spacing">3</property>
         <child>
           <object class="GtkButtonBox" id="buttonbox1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="halign">start</property>
+            <property name="halign">center</property>
             <property name="valign">center</property>
-            <property name="margin_left">5</property>
             <property name="layout_style">start</property>
             <child>
               <object class="GtkButton" id="o_prev">
@@ -278,9 +267,17 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="receives_default">True</property>
-            <property name="image">o_cover</property>
             <property name="relief">none</property>
             <signal name="clicked" handler="__artwork_select_cover" swapped="no"/>
+            <child>
+              <object class="GtkImage" id="o_cover">
+                <property name="height_request">100</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="icon_name">image-missing</property>
+                <property name="icon_size">6</property>
+              </object>
+            </child>
           </object>
           <packing>
             <property name="left_attach">1</property>
@@ -292,18 +289,18 @@
           <object class="GtkScrolledWindow" id="o_tags">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="margin_top">5</property>
+            <property name="hexpand">True</property>
             <property name="vscrollbar_policy">never</property>
             <child>
               <object class="GtkViewport" id="viewport2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="margin_left">5</property>
                 <child>
                   <object class="GtkGrid">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
+                    <property name="valign">center</property>
                     <property name="row_spacing">5</property>
                     <property name="column_spacing">5</property>
                     <property name="row_homogeneous">True</property>
@@ -389,10 +386,8 @@
           <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">9</property>
-            <property name="margin_top">10</property>
+            <property name="valign">end</property>
+            <property name="layout_style">end</property>
             <child>
               <object class="GtkToggleButton" id="o_random">
                 <property name="visible">True</property>
@@ -401,8 +396,16 @@
                 <property name="tooltip_text" translatable="yes">Randomly pick tracks</property>
                 <property name="halign">start</property>
                 <property name="valign">center</property>
-                <property name="image">image9</property>
                 <signal name="toggled" handler="__queue_random" swapped="no"/>
+                <child>
+                  <object class="GtkImage" id="image9">
+                    <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_name">media-playlist-shuffle</property>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -458,6 +461,7 @@ audio-volume-medium</property>
           <packing>
             <property name="left_attach">3</property>
             <property name="top_attach">0</property>
+            <property name="width">2</property>
           </packing>
         </child>
         <child>
@@ -465,12 +469,13 @@ audio-volume-medium</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="hexpand">True</property>
-            <property name="spacing">5</property>
+            <property name="spacing">3</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="halign">end</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>
@@ -503,6 +508,7 @@ audio-volume-medium</property>
               <object class="GtkLabel" id="o_duration">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="halign">start</property>
                 <property name="valign">center</property>
                 <property name="margin_right">15</property>
                 <property name="label" translatable="yes">&lt;span size='large'&gt;0:00&lt;/span&gt;</property>
@@ -521,144 +527,11 @@ audio-volume-medium</property>
           </packing>
         </child>
         <child>
-          <object class="GtkBox">
+          <object class="GtkLabel">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">end</property>
-            <property name="valign">start</property>
-            <property name="spacing">5</property>
-            <child>
-              <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">end</property>
-                <property name="label" translatable="yes">Pause after</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkComboBoxText" id="o_pause_after">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">end</property>
-                <property name="valign">center</property>
-                <property name="margin_right">9</property>
-                <property name="active">0</property>
-                <items>
-                  <item translatable="yes">(disabled)</item>
-                  <item translatable="yes">this track</item>
-                  <item translatable="yes">next track</item>
-                  <item translatable="yes">2 tracks</item>
-                  <item translatable="yes">3 tracks</item>
-                  <item translatable="yes">4 tracks</item>
-                  <item translatable="yes">5 tracks</item>
-                  <item translatable="yes">6 tracks</item>
-                  <item translatable="yes">7 tracks</item>
-                  <item translatable="yes">8 tracks</item>
-                  <item translatable="yes">9 tracks</item>
-                  <item translatable="yes">10 tracks</item>
-                  <item translatable="yes">11 tracks</item>
-                  <item translatable="yes">12 tracks</item>
-                  <item translatable="yes">13 tracks</item>
-                  <item translatable="yes">14 tracks</item>
-                  <item translatable="yes">15 tracks</item>
-                  <item translatable="yes">16 tracks</item>
-                  <item translatable="yes">17 tracks</item>
-                  <item translatable="yes">18 tracks</item>
-                  <item translatable="yes">19 tracks</item>
-                  <item translatable="yes">20 tracks</item>
-                  <item translatable="yes">21 tracks</item>
-                  <item translatable="yes">22 tracks</item>
-                  <item translatable="yes">23 tracks</item>
-                  <item translatable="yes">24 tracks</item>
-                  <item translatable="yes">25 tracks</item>
-                  <item translatable="yes">26 tracks</item>
-                  <item translatable="yes">27 tracks</item>
-                  <item translatable="yes">28 tracks</item>
-                  <item translatable="yes">29 tracks</item>
-                  <item translatable="yes">30 tracks</item>
-                  <item translatable="yes">31 tracks</item>
-                  <item translatable="yes">32 tracks</item>
-                  <item translatable="yes">33 tracks</item>
-                  <item translatable="yes">34 tracks</item>
-                  <item translatable="yes">35 tracks</item>
-                  <item translatable="yes">36 tracks</item>
-                  <item translatable="yes">37 tracks</item>
-                  <item translatable="yes">38 tracks</item>
-                  <item translatable="yes">39 tracks</item>
-                  <item translatable="yes">40 tracks</item>
-                  <item translatable="yes">41 tracks</item>
-                  <item translatable="yes">42 tracks</item>
-                  <item translatable="yes">43 tracks</item>
-                  <item translatable="yes">44 tracks</item>
-                  <item translatable="yes">45 tracks</item>
-                  <item translatable="yes">46 tracks</item>
-                  <item translatable="yes">47 tracks</item>
-                  <item translatable="yes">48 tracks</item>
-                  <item translatable="yes">49 tracks</item>
-                  <item translatable="yes">50 tracks</item>
-                  <item translatable="yes">51 tracks</item>
-                  <item translatable="yes">52 tracks</item>
-                  <item translatable="yes">53 tracks</item>
-                  <item translatable="yes">54 tracks</item>
-                  <item translatable="yes">55 tracks</item>
-                  <item translatable="yes">56 tracks</item>
-                  <item translatable="yes">57 tracks</item>
-                  <item translatable="yes">58 tracks</item>
-                  <item translatable="yes">59 tracks</item>
-                  <item translatable="yes">60 tracks</item>
-                  <item translatable="yes">61 tracks</item>
-                  <item translatable="yes">62 tracks</item>
-                  <item translatable="yes">63 tracks</item>
-                  <item translatable="yes">64 tracks</item>
-                  <item translatable="yes">65 tracks</item>
-                  <item translatable="yes">66 tracks</item>
-                  <item translatable="yes">67 tracks</item>
-                  <item translatable="yes">68 tracks</item>
-                  <item translatable="yes">69 tracks</item>
-                  <item translatable="yes">70 tracks</item>
-                  <item translatable="yes">71 tracks</item>
-                  <item translatable="yes">72 tracks</item>
-                  <item translatable="yes">73 tracks</item>
-                  <item translatable="yes">74 tracks</item>
-                  <item translatable="yes">75 tracks</item>
-                  <item translatable="yes">76 tracks</item>
-                  <item translatable="yes">77 tracks</item>
-                  <item translatable="yes">78 tracks</item>
-                  <item translatable="yes">79 tracks</item>
-                  <item translatable="yes">80 tracks</item>
-                  <item translatable="yes">81 tracks</item>
-                  <item translatable="yes">82 tracks</item>
-                  <item translatable="yes">83 tracks</item>
-                  <item translatable="yes">84 tracks</item>
-                  <item translatable="yes">85 tracks</item>
-                  <item translatable="yes">86 tracks</item>
-                  <item translatable="yes">87 tracks</item>
-                  <item translatable="yes">88 tracks</item>
-                  <item translatable="yes">89 tracks</item>
-                  <item translatable="yes">90 tracks</item>
-                  <item translatable="yes">91 tracks</item>
-                  <item translatable="yes">92 tracks</item>
-                  <item translatable="yes">93 tracks</item>
-                  <item translatable="yes">94 tracks</item>
-                  <item translatable="yes">95 tracks</item>
-                  <item translatable="yes">96 tracks</item>
-                  <item translatable="yes">97 tracks</item>
-                  <item translatable="yes">98 tracks</item>
-                  <item translatable="yes">99 tracks</item>
-                </items>
-                <signal name="changed" handler="__audio_pause_changed" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
+            <property name="label" translatable="yes">Pause after</property>
           </object>
           <packing>
             <property name="left_attach">3</property>
@@ -666,23 +539,140 @@ audio-volume-medium</property>
             <property name="height">2</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkComboBoxText" id="o_pause_after">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">end</property>
+            <property name="valign">center</property>
+            <property name="active">0</property>
+            <items>
+              <item translatable="yes">(disabled)</item>
+              <item translatable="yes">this track</item>
+              <item translatable="yes">next track</item>
+              <item translatable="yes">2 tracks</item>
+              <item translatable="yes">3 tracks</item>
+              <item translatable="yes">4 tracks</item>
+              <item translatable="yes">5 tracks</item>
+              <item translatable="yes">6 tracks</item>
+              <item translatable="yes">7 tracks</item>
+              <item translatable="yes">8 tracks</item>
+              <item translatable="yes">9 tracks</item>
+              <item translatable="yes">10 tracks</item>
+              <item translatable="yes">11 tracks</item>
+              <item translatable="yes">12 tracks</item>
+              <item translatable="yes">13 tracks</item>
+              <item translatable="yes">14 tracks</item>
+              <item translatable="yes">15 tracks</item>
+              <item translatable="yes">16 tracks</item>
+              <item translatable="yes">17 tracks</item>
+              <item translatable="yes">18 tracks</item>
+              <item translatable="yes">19 tracks</item>
+              <item translatable="yes">20 tracks</item>
+              <item translatable="yes">21 tracks</item>
+              <item translatable="yes">22 tracks</item>
+              <item translatable="yes">23 tracks</item>
+              <item translatable="yes">24 tracks</item>
+              <item translatable="yes">25 tracks</item>
+              <item translatable="yes">26 tracks</item>
+              <item translatable="yes">27 tracks</item>
+              <item translatable="yes">28 tracks</item>
+              <item translatable="yes">29 tracks</item>
+              <item translatable="yes">30 tracks</item>
+              <item translatable="yes">31 tracks</item>
+              <item translatable="yes">32 tracks</item>
+              <item translatable="yes">33 tracks</item>
+              <item translatable="yes">34 tracks</item>
+              <item translatable="yes">35 tracks</item>
+              <item translatable="yes">36 tracks</item>
+              <item translatable="yes">37 tracks</item>
+              <item translatable="yes">38 tracks</item>
+              <item translatable="yes">39 tracks</item>
+              <item translatable="yes">40 tracks</item>
+              <item translatable="yes">41 tracks</item>
+              <item translatable="yes">42 tracks</item>
+              <item translatable="yes">43 tracks</item>
+              <item translatable="yes">44 tracks</item>
+              <item translatable="yes">45 tracks</item>
+              <item translatable="yes">46 tracks</item>
+              <item translatable="yes">47 tracks</item>
+              <item translatable="yes">48 tracks</item>
+              <item translatable="yes">49 tracks</item>
+              <item translatable="yes">50 tracks</item>
+              <item translatable="yes">51 tracks</item>
+              <item translatable="yes">52 tracks</item>
+              <item translatable="yes">53 tracks</item>
+              <item translatable="yes">54 tracks</item>
+              <item translatable="yes">55 tracks</item>
+              <item translatable="yes">56 tracks</item>
+              <item translatable="yes">57 tracks</item>
+              <item translatable="yes">58 tracks</item>
+              <item translatable="yes">59 tracks</item>
+              <item translatable="yes">60 tracks</item>
+              <item translatable="yes">61 tracks</item>
+              <item translatable="yes">62 tracks</item>
+              <item translatable="yes">63 tracks</item>
+              <item translatable="yes">64 tracks</item>
+              <item translatable="yes">65 tracks</item>
+              <item translatable="yes">66 tracks</item>
+              <item translatable="yes">67 tracks</item>
+              <item translatable="yes">68 tracks</item>
+              <item translatable="yes">69 tracks</item>
+              <item translatable="yes">70 tracks</item>
+              <item translatable="yes">71 tracks</item>
+              <item translatable="yes">72 tracks</item>
+              <item translatable="yes">73 tracks</item>
+              <item translatable="yes">74 tracks</item>
+              <item translatable="yes">75 tracks</item>
+              <item translatable="yes">76 tracks</item>
+              <item translatable="yes">77 tracks</item>
+              <item translatable="yes">78 tracks</item>
+              <item translatable="yes">79 tracks</item>
+              <item translatable="yes">80 tracks</item>
+              <item translatable="yes">81 tracks</item>
+              <item translatable="yes">82 tracks</item>
+              <item translatable="yes">83 tracks</item>
+              <item translatable="yes">84 tracks</item>
+              <item translatable="yes">85 tracks</item>
+              <item translatable="yes">86 tracks</item>
+              <item translatable="yes">87 tracks</item>
+              <item translatable="yes">88 tracks</item>
+              <item translatable="yes">89 tracks</item>
+              <item translatable="yes">90 tracks</item>
+              <item translatable="yes">91 tracks</item>
+              <item translatable="yes">92 tracks</item>
+              <item translatable="yes">93 tracks</item>
+              <item translatable="yes">94 tracks</item>
+              <item translatable="yes">95 tracks</item>
+              <item translatable="yes">96 tracks</item>
+              <item translatable="yes">97 tracks</item>
+              <item translatable="yes">98 tracks</item>
+              <item translatable="yes">99 tracks</item>
+            </items>
+            <signal name="changed" handler="__audio_pause_changed" swapped="no"/>
+          </object>
+          <packing>
+            <property name="left_attach">4</property>
+            <property name="top_attach">1</property>
+            <property name="height">2</property>
+          </packing>
+        </child>
         <child>
           <object class="GtkPaned" id="o_sidebar">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="vexpand">True</property>
-            <property name="position">125</property>
+            <property name="position">140</property>
             <property name="position_set">True</property>
+            <property name="wide_handle">True</property>
             <signal name="notify::position" handler="__sidebar_resize" swapped="no"/>
             <child>
               <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="margin_bottom">4</property>
+                <property name="margin_bottom">3</property>
                 <property name="orientation">vertical</property>
-                <property name="spacing">5</property>
+                <property name="spacing">3</property>
                 <child>
                   <object class="GtkButtonBox" id="buttonbox2">
                     <property name="visible">True</property>
@@ -746,7 +736,7 @@ audio-volume-medium</property>
                   <object class="GtkScrolledWindow" id="scrolledwindow3">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="margin_right">1</property>
+                    <property name="vexpand">True</property>
                     <property name="shadow_type">in</property>
                     <child>
                       <object class="GtkTreeView" id="o_playlist_view">
@@ -821,14 +811,15 @@ audio-volume-medium</property>
               <object class="GtkGrid">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="margin_left">3</property>
-                <property name="margin_right">2</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
                 <property name="row_spacing">3</property>
+                <property name="column_homogeneous">True</property>
                 <child>
                   <object class="GtkBox" id="box10">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="spacing">5</property>
+                    <property name="spacing">3</property>
                     <child>
                       <object class="GtkComboBoxText" id="filter_how">
                         <property name="visible">True</property>
@@ -880,7 +871,7 @@ audio-volume-medium</property>
                   <object class="GtkScrolledWindow" id="scrolledwindow1">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="margin_top">2</property>
+                    <property name="hexpand">True</property>
                     <property name="vexpand">True</property>
                     <property name="shadow_type">in</property>
                     <child>
@@ -1074,8 +1065,8 @@ audio-volume-medium</property>
                   <object class="GtkProgressBar" id="o_idle_progress">
                     <property name="can_focus">False</property>
                     <property name="tooltip_text" translatable="yes">0%</property>
-                    <property name="halign">start</property>
                     <property name="valign">center</property>
+                    <property name="margin_left">3</property>
                     <property name="hexpand">True</property>
                   </object>
                   <packing>
@@ -1087,8 +1078,7 @@ audio-volume-medium</property>
                   <object class="GtkLabel" id="o_sorting">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="hexpand">True</property>
+                    <property name="halign">center</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -1100,7 +1090,6 @@ audio-volume-medium</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">end</property>
-                    <property name="hexpand">True</property>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
@@ -1117,7 +1106,7 @@ audio-volume-medium</property>
           <packing>
             <property name="left_attach">0</property>
             <property name="top_attach">3</property>
-            <property name="width">4</property>
+            <property name="width">5</property>
           </packing>
         </child>
       </object>
@@ -1128,15 +1117,6 @@ audio-volume-medium</property>
     <widgets>
       <widget name="button1"/>
       <widget name="buttonbox4"/>
-      <widget name="o_pause_after"/>
-    </widgets>
-  </object>
-  <object class="GtkSizeGroup">
-    <property name="mode">vertical</property>
-    <widgets>
-      <widget name="o_pause_after"/>
-      <widget name="buttonbox2"/>
-      <widget name="filter_how"/>
     </widgets>
   </object>
   <object class="GtkSizeGroup">
@@ -1145,11 +1125,11 @@ audio-volume-medium</property>
       <widget name="o_volume"/>
     </widgets>
   </object>
-  <object class="GtkSizeGroup" id="sizegroup1">
-    <property name="ignore_hidden">True</property>
+  <object class="GtkSizeGroup">
+    <property name="mode">vertical</property>
     <widgets>
-      <widget name="buttonbox1"/>
-      <widget name="o_idle_progress"/>
+      <widget name="buttonbox2"/>
+      <widget name="filter_how"/>
     </widgets>
   </object>
 </interface>