From 08b1a9d52082612d99a209dc3841792a69010374 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 4 Jul 2014 07:48:41 -0400 Subject: [PATCH] add ActionManager::enable_accelerators(), which takes all known Actions and registers them via the UIManager as accelerators. This makes them available for use with key bindings/shortcuts/accelerators even if they have no proxy widget --- libs/gtkmm2ext/actions.cc | 46 ++++++++++++++++++++++++++++++ libs/gtkmm2ext/gtkmm2ext/actions.h | 1 + 2 files changed, 47 insertions(+) diff --git a/libs/gtkmm2ext/actions.cc b/libs/gtkmm2ext/actions.cc index f4159c71e2..5f853b0170 100644 --- a/libs/gtkmm2ext/actions.cc +++ b/libs/gtkmm2ext/actions.cc @@ -34,6 +34,8 @@ #include #include +#include + #include "pbd/error.h" #include "gtkmm2ext/actions.h" @@ -235,6 +237,50 @@ ActionManager::get_all_actions (vector& names, vector& paths, ve } } +void +ActionManager::enable_accelerators () +{ + /* the C++ API for functions used here appears to be broken in + gtkmm2.6, so we fall back to the C level. + */ + + GList* list = gtk_ui_manager_get_action_groups (ui_manager->gobj()); + GList* node; + GList* acts; + string ui_string = ""; + + /* get all actions, build a string describing them all as + */ + + for (node = list; node; node = g_list_next (node)) { + + GtkActionGroup* group = (GtkActionGroup*) node->data; + + for (acts = gtk_action_group_list_actions (group); acts; acts = g_list_next (acts)) { + ui_string += "data); + + ui_string += Glib::path_get_basename (fullpath); + ui_string += "\"/>"; + } + } + + ui_string += ""; + + /* and load it */ + + ui_manager->add_ui_from_string (ui_string); +} + struct ActionState { GtkAction* action; bool sensitive; diff --git a/libs/gtkmm2ext/gtkmm2ext/actions.h b/libs/gtkmm2ext/gtkmm2ext/actions.h index 536bd326be..d13a16f2d5 100644 --- a/libs/gtkmm2ext/gtkmm2ext/actions.h +++ b/libs/gtkmm2ext/gtkmm2ext/actions.h @@ -50,6 +50,7 @@ namespace ActionManager { LIBGTKMM2EXT_API extern void set_toggle_action (const char* group, const char* name, bool); LIBGTKMM2EXT_API extern void add_action_group (Glib::RefPtr); + LIBGTKMM2EXT_API extern void enable_accelerators (); LIBGTKMM2EXT_API extern Glib::RefPtr register_action (Glib::RefPtr group, const char * name, const char * label);