From 4cae9aaf2b8404bd3cee7217f2d202ba8d47e015 Mon Sep 17 00:00:00 2001 From: Anna Schumaker Date: Wed, 21 Jan 2015 08:06:10 -0500 Subject: [PATCH] gui: Have collection manager handle keypresses directly Signed-off-by: Anna Schumaker --- gui/manager.cpp | 3 ++- include/lib/lib.h | 1 - lib/lib.cpp | 11 ----------- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/gui/manager.cpp b/gui/manager.cpp index 669f33c4..963067b5 100644 --- a/gui/manager.cpp +++ b/gui/manager.cpp @@ -149,8 +149,9 @@ static bool on_key_pressed(GdkEventKey *event) { Library *lib; Gtk::TreeModel::Row row; + std::string key = gdk_keyval_name(event->keyval); - if (lib :: key_name(event) != "Delete") + if (key != "Delete") return false; lib = current_library_and_row(row); diff --git a/include/lib/lib.h b/include/lib/lib.h index 64e6321f..002355a5 100644 --- a/include/lib/lib.h +++ b/include/lib/lib.h @@ -13,7 +13,6 @@ namespace lib void init(int *, char ***, const std::string &); const std::string share_file(const std::string &); Glib::RefPtr &get_builder(); - const std::string key_name(GdkEventKey *); void schedule(bool (*)(), unsigned int); template diff --git a/lib/lib.cpp b/lib/lib.cpp index 82a13f0b..1cdac3fb 100644 --- a/lib/lib.cpp +++ b/lib/lib.cpp @@ -41,17 +41,6 @@ Glib::RefPtr &lib :: get_builder() return builder; } -const std::string lib :: key_name(GdkEventKey *event) -{ - std::string key = gdk_keyval_name(event->keyval); - return key; -} - -void lib :: idle(bool (*func)()) -{ - Glib :: signal_idle().connect(sigc::ptr_fun(func)); -} - void lib :: schedule(bool (*func)(), unsigned int milliseconds) { Glib :: signal_timeout().connect(sigc::ptr_fun(func), milliseconds);