From 1b9101cf26af60835cb18601c20e7ad878043307 Mon Sep 17 00:00:00 2001
From: Anna Schumaker <Anna@NoWheyCreamery.com>
Date: Mon, 15 Aug 2016 09:33:41 -0400
Subject: [PATCH] gui/collection: Replace Add Library Path GtkButton with a
 GtkMenuButton

This lets me add new options without needing to clutter the gui with
lots of rarely-used buttons.

Signed-off-by: Anna Schumaker <Anna@NoWheyCreamery.com>
---
 gui/collection.c             |  2 +-
 share/ocarina/ocarina6.glade | 68 ++++++++++++++++++++++++++++++++----
 2 files changed, 62 insertions(+), 8 deletions(-)

diff --git a/gui/collection.c b/gui/collection.c
index c1e2ca92..77ff6aec 100644
--- a/gui/collection.c
+++ b/gui/collection.c
@@ -19,7 +19,7 @@ static void __collection_add(GtkFileChooser *chooser)
 	g_free(filename);
 }
 
-void __collection_choose(GtkButton *button, gpointer data)
+void __collection_choose(GtkMenuItem *item, gpointer data)
 {
 	GtkFileFilter *filter;
 	GtkWidget *dialog;
diff --git a/share/ocarina/ocarina6.glade b/share/ocarina/ocarina6.glade
index 03f43427..52b22243 100644
--- a/share/ocarina/ocarina6.glade
+++ b/share/ocarina/ocarina6.glade
@@ -66,11 +66,25 @@
       </object>
     </child>
   </object>
-  <object class="GtkImage" id="image3">
+  <object class="GtkImage" id="image21">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="icon_name">folder-new</property>
   </object>
+  <object class="GtkMenu" id="menu1">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkImageMenuItem">
+        <property name="label" translatable="yes">Library Path</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="image">image21</property>
+        <property name="use_stock">False</property>
+        <signal name="activate" handler="__collection_choose" swapped="no"/>
+      </object>
+    </child>
+  </object>
   <object class="GtkImage" id="image9">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -765,19 +779,59 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkButton">
-                    <property name="label" translatable="yes">Add Library Path</property>
+                  <object class="GtkMenuButton">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="image">image3</property>
-                    <property name="always_show_image">True</property>
-                    <signal name="clicked" handler="__collection_choose" swapped="no"/>
+                    <property name="popup">menu1</property>
+                    <property name="direction">up</property>
+                    <child>
+                      <object class="GtkBox">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkImage">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="icon_name">list-add</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">Add New ...</property>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkArrow">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="arrow_type">up</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="position">2</property>
+                    <property name="position">3</property>
                   </packing>
                 </child>
               </object>