anna
/
ocarina
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

gui: Move remaning window setup into window.cpp 

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
This commit is contained in:
Anna Schumaker 2014-09-11 08:03:39 -04:00
parent acdeb785f5
commit 62cdc4c909
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gui/gui.cpp
View File

@ -158,13 +158,6 @@ Gtk::Window *setup_gui()
position->signal_change_value().connect(sigc::ptr_fun(on_seek));
/* Keyboard shortcuts */
Gtk::Window *window = window_init();
window->set_can_focus();
window->set_icon_from_file(lib :: share_file("ocarina.png"));
/* Favorite and ban buttons */
Gtk::ToggleButton *ban = lib :: get_widget<Gtk::ToggleButton>("o_ban");
Gtk::ToggleButton *fav = lib :: get_widget<Gtk::ToggleButton>("o_favorite");
@ -176,6 +169,5 @@ Gtk::Window *setup_gui()
/* Set up other tabs */
collection_mgr_init();
init_tabs();
return window;
return window_init();
}

3
gui/window.cpp
View File

@ -61,7 +61,10 @@ Gtk::Window *window_init()
{
Gtk::Window *window = lib :: get_widget<Gtk::Window>("o_window");
window->set_can_focus();
window->set_title(appname + get_version());
window->set_icon_from_file(lib :: 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));