From 31af8482de18604e4f08082c40aa6d616d4277af Mon Sep 17 00:00:00 2001
From: Anna Schumaker <schumaker.anna@gmail.com>
Date: Sat, 18 Jan 2014 10:56:31 -0500
Subject: [PATCH] gui: Adjust widget spacing

I add a little bit of spacing between widgets so they're not so crowded
together.  I also adjust things away from the edges of the window
because I tihnk it looks better this way.

Signed-off-by: Anna Schumaker <schumaker.anna@gmail.com>
---
 gui/ocarina6.glade | 55 +++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 52 insertions(+), 3 deletions(-)

diff --git a/gui/ocarina6.glade b/gui/ocarina6.glade
index 29bd3f69..949378ab 100644
--- a/gui/ocarina6.glade
+++ b/gui/ocarina6.glade
@@ -12,6 +12,40 @@
       <mime-type>inode/directory</mime-type>
     </mime-types>
   </object>
+  <object class="GtkImage" id="image12">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-refresh</property>
+    <property name="icon_size">1</property>
+  </object>
+  <object class="GtkImage" id="image13">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">user-trash-full</property>
+    <property name="icon_size">1</property>
+  </object>
+  <object class="GtkMenu" id="o_collection_rc">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkImageMenuItem" id="o_collection_rc_update">
+        <property name="label" translatable="yes">Update</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="image">image12</property>
+        <property name="use_stock">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkImageMenuItem" id="o_collection_rc_delete">
+        <property name="label" translatable="yes">Delete</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="image">image13</property>
+        <property name="use_stock">False</property>
+      </object>
+    </child>
+  </object>
   <object class="GtkListStore" id="o_collection_dirs">
     <columns>
       <!-- column-name id -->
@@ -42,10 +76,12 @@
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
-          <object class="GtkNotebook" id="notebook1">
+          <object class="GtkNotebook" id="o_notebook">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="tab_pos">left</property>
+            <property name="scrollable">True</property>
+            <property name="enable_popup">True</property>
             <child>
               <object class="GtkBox" id="box8">
                 <property name="visible">True</property>
@@ -89,14 +125,14 @@
                                 <child>
                                   <object class="GtkCellRendererToggle" id="cellrenderertoggle1"/>
                                   <attributes>
-                                    <attribute name="activatable">1</attribute>
+                                    <attribute name="active">1</attribute>
                                   </attributes>
                                 </child>
                               </object>
                             </child>
                             <child>
                               <object class="GtkTreeViewColumn" id="treeviewcolumn2">
-                                <property name="fixed_width">50</property>
+                                <property name="fixed_width">60</property>
                                 <property name="title" translatable="yes">Size</property>
                                 <child>
                                   <object class="GtkCellRendererText" id="cellrenderertext1"/>
@@ -123,6 +159,7 @@
                       <packing>
                         <property name="expand">True</property>
                         <property name="fill">True</property>
+                        <property name="padding">5</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
@@ -173,6 +210,7 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
+                            <property name="padding">5</property>
                             <property name="position">0</property>
                           </packing>
                         </child>
@@ -217,6 +255,7 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
+                            <property name="padding">5</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
@@ -261,6 +300,7 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
+                            <property name="padding">5</property>
                             <property name="position">2</property>
                           </packing>
                         </child>
@@ -268,6 +308,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
+                        <property name="padding">5</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -275,6 +316,7 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
+                    <property name="padding">5</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -284,6 +326,7 @@
               <object class="GtkBox" id="box1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="spacing">5</property>
                 <child>
                   <object class="GtkImage" id="image8">
                     <property name="visible">True</property>
@@ -328,6 +371,8 @@ Manager</property>
           <object class="GtkGrid" id="grid1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="margin_left">5</property>
+            <property name="margin_right">5</property>
             <property name="column_homogeneous">True</property>
             <child>
               <object class="GtkBox" id="box3">
@@ -681,6 +726,7 @@ Manager</property>
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
+            <property name="padding">2</property>
             <property name="position">3</property>
           </packing>
         </child>
@@ -695,6 +741,7 @@ Manager</property>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
+                <property name="padding">5</property>
                 <property name="position">0</property>
               </packing>
             </child>
@@ -719,6 +766,7 @@ Manager</property>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
+                <property name="padding">5</property>
                 <property name="position">2</property>
               </packing>
             </child>
@@ -726,6 +774,7 @@ Manager</property>
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
+            <property name="padding">1</property>
             <property name="position">4</property>
           </packing>
         </child>