From 7f0326be2999d4d8edecab35b5927ef16187c713 Mon Sep 17 00:00:00 2001
From: Anna Schumaker <Anna@OcarinaProject.net>
Date: Tue, 5 Jan 2016 10:46:19 -0500
Subject: [PATCH] gui: Adjust icon sizes

xfce does not seem to handle scaling icons on hidpi displayes, and I
configured everything based on really tiny icons.  This can lead to
way-too-large icons on non-hidpi screens.  If your DE doesn't handle
icon scaling properly, then you might want to consider running ocarina
with:

GDK_SCALE=2 GDK_DPI_SCALE=0.5 /bin/ocarina

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

diff --git a/share/ocarina/ocarina6.glade b/share/ocarina/ocarina6.glade
index d84d5085..103ceccc 100644
--- a/share/ocarina/ocarina6.glade
+++ b/share/ocarina/ocarina6.glade
@@ -200,16 +200,13 @@
     <property name="can_focus">False</property>
     <property name="xalign">0</property>
     <property name="xpad">5</property>
-    <property name="ypad">5</property>
     <property name="icon_name">emblem-favorite</property>
-    <property name="icon_size">3</property>
   </object>
   <object class="GtkImage" id="image7">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="xalign">0</property>
     <property name="xpad">5</property>
-    <property name="ypad">5</property>
     <property name="icon_name">face-sad</property>
   </object>
   <object class="GtkAdjustment" id="o_progress">
@@ -229,6 +226,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
+        <property name="spacing">5</property>
         <child>
           <object class="GtkBox" id="box14">
             <property name="visible">True</property>
@@ -238,13 +236,13 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="valign">center</property>
-                <property name="spacing">5</property>
-                <property name="layout_style">spread</property>
+                <property name="layout_style">start</property>
                 <child>
                   <object class="GtkButton" id="o_prev">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">True</property>
+                    <property name="halign">center</property>
                     <property name="valign">center</property>
                     <property name="focus_on_click">False</property>
                     <signal name="clicked" handler="audio_prev" swapped="no"/>
@@ -252,14 +250,15 @@
                       <object class="GtkImage" id="image4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="halign">center</property>
+                        <property name="valign">center</property>
                         <property name="xpad">5</property>
                         <property name="ypad">5</property>
                         <property name="icon_name">media-skip-backward</property>
-                        <property name="icon_size">3</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>
@@ -273,6 +272,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">True</property>
+                    <property name="halign">center</property>
                     <property name="valign">center</property>
                     <property name="focus_on_click">False</property>
                     <signal name="clicked" handler="audio_play" swapped="no"/>
@@ -280,25 +280,29 @@
                       <object class="GtkImage" id="image1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="halign">center</property>
+                        <property name="valign">center</property>
                         <property name="xpad">5</property>
                         <property name="ypad">5</property>
                         <property name="icon_name">media-playback-start</property>
-                        <property name="icon_size">6</property>
+                        <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>
                     <property name="fill">False</property>
                     <property name="position">1</property>
+                    <property name="non_homogeneous">True</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkButton" id="o_pause">
                     <property name="can_focus">False</property>
                     <property name="receives_default">True</property>
+                    <property name="halign">center</property>
                     <property name="valign">center</property>
                     <property name="focus_on_click">False</property>
                     <signal name="clicked" handler="audio_pause" swapped="no"/>
@@ -306,19 +310,22 @@
                       <object class="GtkImage" id="image2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="halign">center</property>
+                        <property name="valign">center</property>
                         <property name="xpad">5</property>
                         <property name="ypad">5</property>
                         <property name="icon_name">media-playback-pause</property>
-                        <property name="icon_size">6</property>
+                        <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>
                     <property name="fill">False</property>
                     <property name="position">2</property>
+                    <property name="non_homogeneous">True</property>
                   </packing>
                 </child>
                 <child>
@@ -326,6 +333,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">True</property>
+                    <property name="halign">center</property>
                     <property name="valign">center</property>
                     <property name="focus_on_click">False</property>
                     <signal name="clicked" handler="audio_stop" swapped="no"/>
@@ -333,14 +341,15 @@
                       <object class="GtkImage" id="image3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="halign">center</property>
+                        <property name="valign">center</property>
                         <property name="xpad">5</property>
                         <property name="ypad">5</property>
                         <property name="icon_name">media-playback-stop</property>
-                        <property name="icon_size">3</property>
                       </object>
                     </child>
-                    <accelerator key="AudioPlay" signal="clicked" modifiers="GDK_MOD1_MASK"/>
                     <accelerator key="space" signal="clicked" modifiers="GDK_MOD1_MASK"/>
+                    <accelerator key="AudioPlay" signal="clicked" modifiers="GDK_MOD1_MASK"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -354,6 +363,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">True</property>
+                    <property name="halign">center</property>
                     <property name="valign">center</property>
                     <property name="focus_on_click">False</property>
                     <signal name="clicked" handler="audio_next" swapped="no"/>
@@ -361,14 +371,15 @@
                       <object class="GtkImage" id="image5">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="halign">center</property>
+                        <property name="valign">center</property>
                         <property name="xpad">5</property>
                         <property name="ypad">5</property>
                         <property name="icon_name">media-skip-forward</property>
-                        <property name="icon_size">3</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>
@@ -380,7 +391,7 @@
               </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">True</property>
+                <property name="fill">False</property>
                 <property name="position">0</property>
               </packing>
             </child>
@@ -772,6 +783,7 @@ Manager</property>
               <object class="GtkGrid" id="grid1">
                 <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">5</property>
                 <property name="column_homogeneous">True</property>
@@ -908,6 +920,8 @@ Manager</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">False</property>