Editor::transport_punch*_line has no "outline_pixels".

[ardour.git] / gtk2_ardour / actions.cc

diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc
index 86ca2284f3a1118a39f40f21fb442794d0f8f954..8a5928c3f83d3f469a8ba7e89875a637a0dc01d9 100644 (file)
--- a/gtk2_ardour/actions.cc
+++ b/gtk2_ardour/actions.cc
@@ -23,13 +23,16 @@
 #include <gtkmm/accelmap.h>
 #include <gtkmm/uimanager.h>
 
+#include <pbd/error.h>
+
+#include <ardour/ardour.h>
+
 #include "actions.h"
 
 using namespace std;
 using namespace Gtk;
 using namespace Glib;
 using namespace sigc;
-using namespace ActionManager;
 
 vector<RefPtr<Gtk::Action> > ActionManager::session_sensitive_actions;
 vector<RefPtr<Gtk::Action> > ActionManager::region_list_selection_sensitive_actions;
@@ -38,18 +41,26 @@ vector<RefPtr<Gtk::Action> > ActionManager::track_selection_sensitive_actions;
 vector<RefPtr<Gtk::Action> > ActionManager::plugin_selection_sensitive_actions;
 vector<RefPtr<Gtk::Action> > ActionManager::range_sensitive_actions;
 vector<RefPtr<Gtk::Action> > ActionManager::jack_sensitive_actions;
+RefPtr<UIManager> ActionManager::ui_manager;
 string ActionManager::unbound_string = "--";
 
-static vector<RefPtr<UIManager> > ui_managers;
-
 void
-register_ui_manager (RefPtr<UIManager> uim)
+ActionManager::init ()
 {
-       ui_managers.push_back (uim);
+       ui_manager = UIManager::create ();
+
+       try {
+         ui_manager->add_ui_from_file (ARDOUR::find_config_file("ardour-menus.xml"));
+       } catch (Glib::MarkupError& err) {
+               error << "badly formatted UI definition file" << endmsg;
+       } catch (...) {
+         std::cerr << "ardour action xml file not found" << endl;
+       }
+    
 }
 
 RefPtr<Action>
-register_action (RefPtr<ActionGroup> group, string name, string label, slot<void> sl, guint key, Gdk::ModifierType mods)
+ActionManager::register_action (RefPtr<ActionGroup> group, string name, string label, slot<void> sl, guint key, Gdk::ModifierType mods)
 {
        RefPtr<Action> act = register_action (group, name, label, sl);
        AccelMap::add_entry (act->get_accel_path(), key, mods);
@@ -58,7 +69,7 @@ register_action (RefPtr<ActionGroup> group, string name, string label, slot<void
 }
 
 RefPtr<Action>
-register_action (RefPtr<ActionGroup> group, string name, string label, slot<void> sl)
+ActionManager::register_action (RefPtr<ActionGroup> group, string name, string label, slot<void> sl)
 {
        RefPtr<Action> act = register_action (group, name, label);
        group->add (act, sl);
@@ -67,7 +78,7 @@ register_action (RefPtr<ActionGroup> group, string name, string label, slot<void
 }
 
 RefPtr<Action>
-register_action (RefPtr<ActionGroup> group, string name, string label)
+ActionManager::register_action (RefPtr<ActionGroup> group, string name, string label)
 {
        RefPtr<Action> act;
 
@@ -79,7 +90,7 @@ register_action (RefPtr<ActionGroup> group, string name, string label)
 
 
 RefPtr<Action>
-register_radio_action (RefPtr<ActionGroup> group, RadioAction::Group rgroup, string name, string label, slot<void> sl, guint key, Gdk::ModifierType mods)
+ActionManager::register_radio_action (RefPtr<ActionGroup> group, RadioAction::Group rgroup, string name, string label, slot<void> sl, guint key, Gdk::ModifierType mods)
 {
        RefPtr<Action> act = register_radio_action (group, rgroup, name, label, sl);
        AccelMap::add_entry (act->get_accel_path(), key, mods);
@@ -88,7 +99,7 @@ register_radio_action (RefPtr<ActionGroup> group, RadioAction::Group rgroup, str
 }
 
 RefPtr<Action>
-register_radio_action (RefPtr<ActionGroup> group, RadioAction::Group rgroup, string name, string label, slot<void> sl)
+ActionManager::register_radio_action (RefPtr<ActionGroup> group, RadioAction::Group rgroup, string name, string label, slot<void> sl)
 {
        RefPtr<Action> act;
 
@@ -100,7 +111,7 @@ register_radio_action (RefPtr<ActionGroup> group, RadioAction::Group rgroup, str
 
 
 RefPtr<Action>
-register_toggle_action (RefPtr<ActionGroup> group, string name, string label, slot<void> sl, guint key, Gdk::ModifierType mods)
+ActionManager::register_toggle_action (RefPtr<ActionGroup> group, string name, string label, slot<void> sl, guint key, Gdk::ModifierType mods)
 {
        RefPtr<Action> act = register_toggle_action (group,name, label, sl);
        AccelMap::add_entry (act->get_accel_path(), key, mods);
@@ -109,7 +120,7 @@ register_toggle_action (RefPtr<ActionGroup> group, string name, string label, sl
 }
 
 RefPtr<Action>
-register_toggle_action (RefPtr<ActionGroup> group, string name, string label, slot<void> sl)
+ActionManager::register_toggle_action (RefPtr<ActionGroup> group, string name, string label, slot<void> sl)
 {
        RefPtr<Action> act;
 
@@ -119,7 +130,8 @@ register_toggle_action (RefPtr<ActionGroup> group, string name, string label, sl
        return act;
 }
 
-bool lookup_entry (const ustring accel_path, Gtk::AccelKey& key)
+bool 
+ActionManager::lookup_entry (const ustring accel_path, Gtk::AccelKey& key)
 {
        GtkAccelKey gkey;
        bool known = gtk_accel_map_lookup_entry (accel_path.c_str(), &gkey);
@@ -134,47 +146,51 @@ bool lookup_entry (const ustring accel_path, Gtk::AccelKey& key)
 }
 
 void
-merge_actions (RefPtr<ActionGroup> dst, const RefPtr<ActionGroup> src)
+ActionManager::get_all_actions (vector<string>& names, vector<string>& paths, vector<string>& keys, vector<AccelKey>& bindings)
 {
-       ListHandle<RefPtr<Action> > group_actions = src->get_actions();
-
-       for (ListHandle<RefPtr<Action> >::iterator a = group_actions.begin(); a != group_actions.end(); ++a) {
-               RefPtr<Action> act = Action::create ((*a)->get_name(), (*a)->property_label());
-               dst->add (act);
+       ListHandle<RefPtr<ActionGroup> > uim_groups = ui_manager->get_action_groups ();
+       
+       for (ListHandle<RefPtr<ActionGroup> >::iterator g = uim_groups.begin(); g != uim_groups.end(); ++g) {
+               
+               ListHandle<RefPtr<Action> > group_actions = (*g)->get_actions();
+               
+               for (ListHandle<RefPtr<Action> >::iterator a = group_actions.begin(); a != group_actions.end(); ++a) {
+                       
+                       ustring accel_path;
+                       
+                       accel_path = (*a)->get_accel_path();
+                       
+                       names.push_back ((*a)->get_name());
+                       paths.push_back (accel_path);
+                       
+                       AccelKey key;
+                       bool known = lookup_entry (accel_path, key);
+                       
+                       if (known) {
+                               keys.push_back (ui_manager->get_accel_group()->name (key.get_key(), Gdk::ModifierType (key.get_mod())));
+                       } else {
+                               keys.push_back (unbound_string);
+                       }
+                       
+                       bindings.push_back (AccelKey (key.get_key(), Gdk::ModifierType (key.get_mod())));
+               }
        }
 }
 
 void
-get_all_actions (vector<string>& names, vector<string>& paths, vector<string>& keys, vector<AccelKey>& bindings)
+ActionManager::add_action_group (RefPtr<ActionGroup> grp)
 {
-       for (vector<RefPtr<UIManager> >::iterator u = ui_managers.begin(); u != ui_managers.end(); ++u) {
-
-               ListHandle<RefPtr<ActionGroup> > uim_groups = (*u)->get_action_groups ();
-
-               for (ListHandle<RefPtr<ActionGroup> >::iterator g = uim_groups.begin(); g != uim_groups.end(); ++g) {
-
-                       ListHandle<RefPtr<Action> > group_actions = (*g)->get_actions();
-
-                       for (ListHandle<RefPtr<Action> >::iterator a = group_actions.begin(); a != group_actions.end(); ++a) {
-                               
-                               ustring accel_path;
-                               
-                               accel_path = (*a)->get_accel_path();
-                               
-                               names.push_back ((*a)->get_name());
-                               paths.push_back (accel_path);
-
-                               AccelKey key;
-                               bool known = lookup_entry (accel_path, key);
+       ui_manager->insert_action_group (grp);
+}
 
-                               if (known) {
-                                       keys.push_back ((*u)->get_accel_group()->name (key.get_key(), Gdk::ModifierType (key.get_mod())));
-                               } else {
-                                       keys.push_back (unbound_string);
-                               }
+Widget*
+ActionManager::get_widget (ustring name)
+{
+       return ui_manager->get_widget (name);
+}
 
-                               bindings.push_back (AccelKey (key.get_key(), Gdk::ModifierType (key.get_mod())));
-                       }
-               }
-       }
+RefPtr<Action>
+ActionManager::get_action (ustring name)
+{
+       return ui_manager->get_action (name);
 }