From d8754e9a45b9f228570c9337d027ce15aaf04034 Mon Sep 17 00:00:00 2001
From: Anna Schumaker <Anna@OcarinaProject.net>
Date: Fri, 25 Dec 2015 12:08:31 -0500
Subject: [PATCH] gui/audio: Control keyboard shortcuts from GtkBuilder

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
---
 gui/window.cpp               | 19 -------------------
 share/ocarina/ocarina6.glade | 10 ++++++++++
 tests/gui/.gitignore         |  2 +-
 tests/gui/Sconscript         |  3 +--
 4 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/gui/window.cpp b/gui/window.cpp
index ee13788b..91fbde3c 100644
--- a/gui/window.cpp
+++ b/gui/window.cpp
@@ -37,10 +37,6 @@ static bool on_window_key_pressed(GdkEventKey *event)
 		notebook->set_current_page(tempq_count() + 1);
 	else if (key == "m")
 		notebook->set_current_page(tempq_count() + 3);
-	else if (key == "n")
-		audio_next();
-	else if (key == "N")
-		audio_prev();
 	else if (key == "p")
 		notebook->set_current_page(tempq_count() + 2);
 	else
@@ -48,20 +44,6 @@ static bool on_window_key_pressed(GdkEventKey *event)
 	return true;
 }
 
-static bool on_window_key_released(GdkEventKey *event)
-{
-	std::string key = gdk_keyval_name(event->keyval);
-
-	if (key != "space")
-		return false;
-
-	if (audio_cur_state() == GST_STATE_PLAYING)
-		audio_pause();
-	else
-		audio_play();
-	return true;
-}
-
 Gtk::Window *window_init()
 {
 	Gtk::Window *window = Glib :: wrap(GTK_WINDOW(gui_builder_widget("o_window")), false);
@@ -71,7 +53,6 @@ Gtk::Window *window_init()
 	window->set_icon_from_file(gui :: share_file("ocarina.png"));
 
 	window->signal_key_press_event().connect(sigc::ptr_fun(on_window_key_pressed));
-	window->signal_key_release_event().connect(sigc::ptr_fun(on_window_key_released));
 
 	return window;
 }
diff --git a/share/ocarina/ocarina6.glade b/share/ocarina/ocarina6.glade
index 525ba57d..3e6a882f 100644
--- a/share/ocarina/ocarina6.glade
+++ b/share/ocarina/ocarina6.glade
@@ -258,6 +258,8 @@
                         <property name="icon_size">3</property>
                       </object>
                     </child>
+                    <accelerator key="AudioPrev" signal="clicked"/>
+                    <accelerator key="n" signal="clicked" modifiers="GDK_SHIFT_MASK"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -284,6 +286,8 @@
                         <property name="icon_size">6</property>
                       </object>
                     </child>
+                    <accelerator key="AudioPlay" signal="clicked"/>
+                    <accelerator key="space" signal="clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -308,6 +312,8 @@
                         <property name="icon_size">6</property>
                       </object>
                     </child>
+                    <accelerator key="AudioPlay" signal="clicked"/>
+                    <accelerator key="space" signal="clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -333,6 +339,8 @@
                         <property name="icon_size">3</property>
                       </object>
                     </child>
+                    <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>
@@ -359,6 +367,8 @@
                         <property name="icon_size">3</property>
                       </object>
                     </child>
+                    <accelerator key="AudioNext" signal="clicked"/>
+                    <accelerator key="n" signal="clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
diff --git a/tests/gui/.gitignore b/tests/gui/.gitignore
index f46d2890..d8471cc8 100644
--- a/tests/gui/.gitignore
+++ b/tests/gui/.gitignore
@@ -1,2 +1,2 @@
-settings
 builder
+settings
diff --git a/tests/gui/Sconscript b/tests/gui/Sconscript
index dcd0aa62..ee754f23 100644
--- a/tests/gui/Sconscript
+++ b/tests/gui/Sconscript
@@ -23,10 +23,9 @@ def GuiTest(name):
 	return run
 
 
-res += [ GuiTest("settings") ]
-
 env.UsePackage("gmodule-export-2.0")
 res += [ GuiTest("builder")  ]
+res += [ GuiTest("settings") ]
 
 ignore.close()
 Return("res")