gui/audio: Control keyboard shortcuts from GtkBuilder
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
This commit is contained in:
parent
f95a6d02ed
commit
d8754e9a45
|
@ -37,10 +37,6 @@ static bool on_window_key_pressed(GdkEventKey *event)
|
||||||
notebook->set_current_page(tempq_count() + 1);
|
notebook->set_current_page(tempq_count() + 1);
|
||||||
else if (key == "m")
|
else if (key == "m")
|
||||||
notebook->set_current_page(tempq_count() + 3);
|
notebook->set_current_page(tempq_count() + 3);
|
||||||
else if (key == "n")
|
|
||||||
audio_next();
|
|
||||||
else if (key == "N")
|
|
||||||
audio_prev();
|
|
||||||
else if (key == "p")
|
else if (key == "p")
|
||||||
notebook->set_current_page(tempq_count() + 2);
|
notebook->set_current_page(tempq_count() + 2);
|
||||||
else
|
else
|
||||||
|
@ -48,20 +44,6 @@ static bool on_window_key_pressed(GdkEventKey *event)
|
||||||
return true;
|
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_init()
|
||||||
{
|
{
|
||||||
Gtk::Window *window = Glib :: wrap(GTK_WINDOW(gui_builder_widget("o_window")), false);
|
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->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_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;
|
return window;
|
||||||
}
|
}
|
||||||
|
|
|
@ -258,6 +258,8 @@
|
||||||
<property name="icon_size">3</property>
|
<property name="icon_size">3</property>
|
||||||
</object>
|
</object>
|
||||||
</child>
|
</child>
|
||||||
|
<accelerator key="AudioPrev" signal="clicked"/>
|
||||||
|
<accelerator key="n" signal="clicked" modifiers="GDK_SHIFT_MASK"/>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="expand">False</property>
|
<property name="expand">False</property>
|
||||||
|
@ -284,6 +286,8 @@
|
||||||
<property name="icon_size">6</property>
|
<property name="icon_size">6</property>
|
||||||
</object>
|
</object>
|
||||||
</child>
|
</child>
|
||||||
|
<accelerator key="AudioPlay" signal="clicked"/>
|
||||||
|
<accelerator key="space" signal="clicked"/>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="expand">False</property>
|
<property name="expand">False</property>
|
||||||
|
@ -308,6 +312,8 @@
|
||||||
<property name="icon_size">6</property>
|
<property name="icon_size">6</property>
|
||||||
</object>
|
</object>
|
||||||
</child>
|
</child>
|
||||||
|
<accelerator key="AudioPlay" signal="clicked"/>
|
||||||
|
<accelerator key="space" signal="clicked"/>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="expand">False</property>
|
<property name="expand">False</property>
|
||||||
|
@ -333,6 +339,8 @@
|
||||||
<property name="icon_size">3</property>
|
<property name="icon_size">3</property>
|
||||||
</object>
|
</object>
|
||||||
</child>
|
</child>
|
||||||
|
<accelerator key="space" signal="clicked" modifiers="GDK_MOD1_MASK"/>
|
||||||
|
<accelerator key="AudioPlay" signal="clicked" modifiers="GDK_MOD1_MASK"/>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="expand">False</property>
|
<property name="expand">False</property>
|
||||||
|
@ -359,6 +367,8 @@
|
||||||
<property name="icon_size">3</property>
|
<property name="icon_size">3</property>
|
||||||
</object>
|
</object>
|
||||||
</child>
|
</child>
|
||||||
|
<accelerator key="AudioNext" signal="clicked"/>
|
||||||
|
<accelerator key="n" signal="clicked"/>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="expand">False</property>
|
<property name="expand">False</property>
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
settings
|
|
||||||
builder
|
builder
|
||||||
|
settings
|
||||||
|
|
|
@ -23,10 +23,9 @@ def GuiTest(name):
|
||||||
return run
|
return run
|
||||||
|
|
||||||
|
|
||||||
res += [ GuiTest("settings") ]
|
|
||||||
|
|
||||||
env.UsePackage("gmodule-export-2.0")
|
env.UsePackage("gmodule-export-2.0")
|
||||||
res += [ GuiTest("builder") ]
|
res += [ GuiTest("builder") ]
|
||||||
|
res += [ GuiTest("settings") ]
|
||||||
|
|
||||||
ignore.close()
|
ignore.close()
|
||||||
Return("res")
|
Return("res")
|
||||||
|
|
Loading…
Reference in New Issue