use ActionManager namespace, rather than ActionMap objects

diff --git a/libs/surfaces/cc121/gui.cc b/libs/surfaces/cc121/gui.cc
index ca06887102c1050d03c92da42bfc139dd56ce027..e81e5655b737290bfb436b637a499f7b2ef008e2 100644 (file)
--- a/libs/surfaces/cc121/gui.cc
+++ b/libs/surfaces/cc121/gui.cc
@@ -26,6 +26,7 @@
 #include "pbd/strsplit.h"
 #include "pbd/file_utils.h"
 
 #include "pbd/strsplit.h"
 #include "pbd/file_utils.h"
 

+#include "gtkmm2ext/actions.h"

 #include "gtkmm2ext/bindings.h"
 #include "gtkmm2ext/gtk_ui.h"
 #include "gtkmm2ext/gui_thread.h"
 #include "gtkmm2ext/bindings.h"
 #include "gtkmm2ext/gtk_ui.h"
 #include "gtkmm2ext/gui_thread.h"


@@ -378,7 +379,7 @@ CC121GUI::build_available_action_menu ()
        vector<string> keys;
        vector<Glib::RefPtr<Gtk::Action> > actions;
 
        vector<string> keys;
        vector<Glib::RefPtr<Gtk::Action> > actions;
 

-       Gtkmm2ext::ActionMap::get_all_actions (paths, labels, tooltips, keys, actions);
+       ActionManager::get_all_actions (paths, labels, tooltips, keys, actions);

 
        typedef std::map<string,TreeIter> NodeMap;
        NodeMap nodes;
 
        typedef std::map<string,TreeIter> NodeMap;
        NodeMap nodes;

diff --git a/libs/surfaces/faderport/gui.cc b/libs/surfaces/faderport/gui.cc
index 68c89007b14534e26c6e1dde6814cc777c23134a..6f445380cc86bd8c30ff3586a551e44a89f4c7fe 100644 (file)
--- a/libs/surfaces/faderport/gui.cc
+++ b/libs/surfaces/faderport/gui.cc
@@ -25,6 +25,7 @@
 #include "pbd/strsplit.h"
 #include "pbd/file_utils.h"
 
 #include "pbd/strsplit.h"
 #include "pbd/file_utils.h"
 

+#include "gtkmm2ext/actions.h"

 #include "gtkmm2ext/bindings.h"
 #include "gtkmm2ext/gtk_ui.h"
 #include "gtkmm2ext/gui_thread.h"
 #include "gtkmm2ext/bindings.h"
 #include "gtkmm2ext/gtk_ui.h"
 #include "gtkmm2ext/gui_thread.h"


@@ -359,7 +360,7 @@ FPGUI::build_available_action_menu ()
        vector<string> keys;
        vector<Glib::RefPtr<Gtk::Action> > actions;
 
        vector<string> keys;
        vector<Glib::RefPtr<Gtk::Action> > actions;
 

-       Gtkmm2ext::ActionMap::get_all_actions (paths, labels, tooltips, keys, actions);
+       ActionManager::get_all_actions (paths, labels, tooltips, keys, actions);

 
        typedef std::map<string,TreeIter> NodeMap;
        NodeMap nodes;
 
        typedef std::map<string,TreeIter> NodeMap;
        NodeMap nodes;

diff --git a/libs/surfaces/faderport8/gui.cc b/libs/surfaces/faderport8/gui.cc
index 3a537de028fffc01417ce6d51f0f6d196d1beb26..a6e0731d33150028c49e425a3068ce2decb81f09 100644 (file)
--- a/libs/surfaces/faderport8/gui.cc
+++ b/libs/surfaces/faderport8/gui.cc
@@ -26,6 +26,7 @@
 #include "pbd/strsplit.h"
 #include "pbd/file_utils.h"
 
 #include "pbd/strsplit.h"
 #include "pbd/file_utils.h"
 

+#include "gtkmm2ext/actions.h"

 #include "gtkmm2ext/bindings.h"
 #include "gtkmm2ext/gtk_ui.h"
 #include "gtkmm2ext/gui_thread.h"
 #include "gtkmm2ext/bindings.h"
 #include "gtkmm2ext/gtk_ui.h"
 #include "gtkmm2ext/gui_thread.h"


@@ -354,7 +355,7 @@ FP8GUI::build_available_action_menu ()
        vector<string> keys;
        vector<Glib::RefPtr<Gtk::Action> > actions;
 
        vector<string> keys;
        vector<Glib::RefPtr<Gtk::Action> > actions;
 

-       Gtkmm2ext::ActionMap::get_all_actions (paths, labels, tooltips, keys, actions);
+       ActionManager::get_all_actions (paths, labels, tooltips, keys, actions);

 
        typedef std::map<string,TreeIter> NodeMap;
        NodeMap nodes;
 
        typedef std::map<string,TreeIter> NodeMap;
        NodeMap nodes;

diff --git a/libs/surfaces/mackie/gui.cc b/libs/surfaces/mackie/gui.cc
index 708fc5328c9aa618c3fb6db73a79cd8d674db7d7..b2dc987c133cb23f7705fcfaac92114d2ceb35d3 100644 (file)
--- a/libs/surfaces/mackie/gui.cc
+++ b/libs/surfaces/mackie/gui.cc
@@ -460,7 +460,7 @@ MackieControlProtocolGUI::build_available_action_menu ()
        NodeMap nodes;
        NodeMap::iterator r;
 
        NodeMap nodes;
        NodeMap::iterator r;
 

-       Gtkmm2ext::ActionMap::get_all_actions (paths, labels, tooltips, keys, actions);
+       ActionManager::get_all_actions (paths, labels, tooltips, keys, actions);

 
        vector<string>::iterator k;
        vector<string>::iterator p;
 
        vector<string>::iterator k;
        vector<string>::iterator p;

diff --git a/libs/surfaces/maschine2/callbacks.cc b/libs/surfaces/maschine2/callbacks.cc
index 32466fc7beaf013f1baaccf8aa8e1f18af3ed5f6..b95f29032c59ef29b32d4c6f5680da2c56387f71 100644 (file)
--- a/libs/surfaces/maschine2/callbacks.cc
+++ b/libs/surfaces/maschine2/callbacks.cc
@@ -51,23 +51,23 @@ Maschine2::connect_signals ()
        /* Actions */
        Glib::RefPtr<Gtk::Action> act;
 #if 0
        /* Actions */
        Glib::RefPtr<Gtk::Action> act;
 #if 0

-       act = ActionManager::get_action (X_("Editor"), X_("ToggleMeasureVisibility"));
+       act = ActionManager::find_action (X_("Editor"), X_("ToggleMeasureVisibility"));

        if (act) {
                Glib::RefPtr<Gtk::ToggleAction> tact = Glib::RefPtr<Gtk::ToggleAction>::cast_dynamic (act);
                tact->signal_toggled ().connect (sigc::mem_fun (*this, &Maschine2::notify_grid_change));
        }
 #endif
        if (act) {
                Glib::RefPtr<Gtk::ToggleAction> tact = Glib::RefPtr<Gtk::ToggleAction>::cast_dynamic (act);
                tact->signal_toggled ().connect (sigc::mem_fun (*this, &Maschine2::notify_grid_change));
        }
 #endif

-       act = ActionManager::get_action (X_("Editor"), X_("snap-off"));
+       act = ActionManager::find_action (X_("Editor"), X_("snap-off"));

        if (act) {
                Glib::RefPtr<Gtk::RadioAction> ract = Glib::RefPtr<Gtk::RadioAction>::cast_dynamic (act);
                ract->signal_toggled ().connect (sigc::mem_fun (*this, &Maschine2::notify_snap_change));
        }
        if (act) {
                Glib::RefPtr<Gtk::RadioAction> ract = Glib::RefPtr<Gtk::RadioAction>::cast_dynamic (act);
                ract->signal_toggled ().connect (sigc::mem_fun (*this, &Maschine2::notify_snap_change));
        }

-       act = ActionManager::get_action (X_("Editor"), X_("snap-magnetic"));
+       act = ActionManager::find_action (X_("Editor"), X_("snap-magnetic"));

        if (act) {
                Glib::RefPtr<Gtk::RadioAction> ract = Glib::RefPtr<Gtk::RadioAction>::cast_dynamic (act);
                ract->signal_toggled ().connect (sigc::mem_fun (*this, &Maschine2::notify_snap_change));
        }
        if (act) {
                Glib::RefPtr<Gtk::RadioAction> ract = Glib::RefPtr<Gtk::RadioAction>::cast_dynamic (act);
                ract->signal_toggled ().connect (sigc::mem_fun (*this, &Maschine2::notify_snap_change));
        }

-       act = ActionManager::get_action (X_("Editor"), X_("snap-normal"));
+       act = ActionManager::find_action (X_("Editor"), X_("snap-normal"));

        if (act) {
                Glib::RefPtr<Gtk::RadioAction> ract = Glib::RefPtr<Gtk::RadioAction>::cast_dynamic (act);
                ract->signal_toggled ().connect (sigc::mem_fun (*this, &Maschine2::notify_snap_change));
        if (act) {
                Glib::RefPtr<Gtk::RadioAction> ract = Glib::RefPtr<Gtk::RadioAction>::cast_dynamic (act);
                ract->signal_toggled ().connect (sigc::mem_fun (*this, &Maschine2::notify_snap_change));


@@ -167,7 +167,7 @@ Maschine2::notify_parameter_changed (std::string param)
 void
 Maschine2::notify_grid_change ()
 {
 void
 Maschine2::notify_grid_change ()
 {

-       Glib::RefPtr<Gtk::Action> act = ActionManager::get_action (X_("Editor"), X_("ToggleMeasureVisibility"));
+       Glib::RefPtr<Gtk::Action> act = ActionManager::find_action (X_("Editor"), X_("ToggleMeasureVisibility"));

        if (act) {
                Glib::RefPtr<Gtk::ToggleAction> tact = Glib::RefPtr<Gtk::ToggleAction>::cast_dynamic (act);
                _ctrl->button (M2Contols::Grid)->set_color (tact->get_active () ? COLOR_WHITE : 0);
        if (act) {
                Glib::RefPtr<Gtk::ToggleAction> tact = Glib::RefPtr<Gtk::ToggleAction>::cast_dynamic (act);
                _ctrl->button (M2Contols::Grid)->set_color (tact->get_active () ? COLOR_WHITE : 0);


@@ -183,12 +183,12 @@ Maschine2::notify_snap_change ()
                return;
        }
 
                return;
        }
 

-       Glib::RefPtr<Gtk::Action> act = ActionManager::get_action (X_("Editor"), X_("snap-magnetic"));
+       Glib::RefPtr<Gtk::Action> act = ActionManager::find_action (X_("Editor"), X_("snap-magnetic"));

        if (act) {
                Glib::RefPtr<Gtk::RadioAction> ract = Glib::RefPtr<Gtk::RadioAction>::cast_dynamic (act);
                if (ract->get_active ()) { rgba = COLOR_GRAY; }
        }
        if (act) {
                Glib::RefPtr<Gtk::RadioAction> ract = Glib::RefPtr<Gtk::RadioAction>::cast_dynamic (act);
                if (ract->get_active ()) { rgba = COLOR_GRAY; }
        }

-       act = ActionManager::get_action (X_("Editor"), X_("snap-normal"));
+       act = ActionManager::find_action (X_("Editor"), X_("snap-normal"));

        if (act) {
                Glib::RefPtr<Gtk::RadioAction> ract = Glib::RefPtr<Gtk::RadioAction>::cast_dynamic (act);
                if (ract->get_active ()) { rgba = COLOR_WHITE; }
        if (act) {
                Glib::RefPtr<Gtk::RadioAction> ract = Glib::RefPtr<Gtk::RadioAction>::cast_dynamic (act);
                if (ract->get_active ()) { rgba = COLOR_WHITE; }


@@ -257,7 +257,7 @@ Maschine2::button_action (const std::string& group, const std::string& item)
 void
 Maschine2::button_grid ()
 {
 void
 Maschine2::button_grid ()
 {

-       Glib::RefPtr<Gtk::Action> act = ActionManager::get_action (X_("Editor"), X_("ToggleMeasureVisibility"));
+       Glib::RefPtr<Gtk::Action> act = ActionManager::find_action (X_("Editor"), X_("ToggleMeasureVisibility"));

        if (act) {
                Glib::RefPtr<Gtk::ToggleAction> tact = Glib::RefPtr<Gtk::ToggleAction>::cast_dynamic (act);
                tact->set_active (!tact->get_active ());
        if (act) {
                Glib::RefPtr<Gtk::ToggleAction> tact = Glib::RefPtr<Gtk::ToggleAction>::cast_dynamic (act);
                tact->set_active (!tact->get_active ());


@@ -288,19 +288,19 @@ Maschine2::button_snap_released ()
        _ctrl->button (M2Contols::Grid)->set_blinking (false);
 
        const char* action = 0;
        _ctrl->button (M2Contols::Grid)->set_blinking (false);
 
        const char* action = 0;

-       Glib::RefPtr<Gtk::Action> act = ActionManager::get_action (X_("Editor"), X_("snap-off"));
+       Glib::RefPtr<Gtk::Action> act = ActionManager::find_action (X_("Editor"), X_("snap-off"));

        if (act) {
                Glib::RefPtr<Gtk::RadioAction> ract = Glib::RefPtr<Gtk::RadioAction>::cast_dynamic (act);
                if (ract->get_active ()) { action = "snap-normal"; }
        }
 
        if (act) {
                Glib::RefPtr<Gtk::RadioAction> ract = Glib::RefPtr<Gtk::RadioAction>::cast_dynamic (act);
                if (ract->get_active ()) { action = "snap-normal"; }
        }
 

-       act = ActionManager::get_action (X_("Editor"), X_("snap-normal"));
+       act = ActionManager::find_action (X_("Editor"), X_("snap-normal"));

        if (act) {
                Glib::RefPtr<Gtk::RadioAction> ract = Glib::RefPtr<Gtk::RadioAction>::cast_dynamic (act);
                if (ract->get_active ()) { action = "snap-magnetic"; }
        }
 
        if (act) {
                Glib::RefPtr<Gtk::RadioAction> ract = Glib::RefPtr<Gtk::RadioAction>::cast_dynamic (act);
                if (ract->get_active ()) { action = "snap-magnetic"; }
        }
 

-       act = ActionManager::get_action (X_("Editor"), X_("snap-magnetic"));
+       act = ActionManager::find_action (X_("Editor"), X_("snap-magnetic"));

        if (act) {
                Glib::RefPtr<Gtk::RadioAction> ract = Glib::RefPtr<Gtk::RadioAction>::cast_dynamic (act);
                if (ract->get_active ()) { action = "snap-off"; }
        if (act) {
                Glib::RefPtr<Gtk::RadioAction> ract = Glib::RefPtr<Gtk::RadioAction>::cast_dynamic (act);
                if (ract->get_active ()) { action = "snap-off"; }


@@ -311,7 +311,7 @@ Maschine2::button_snap_released ()
                return;
        }
 
                return;
        }
 

-       act = ActionManager::get_action (X_("Editor"), action);
+       act = ActionManager::find_action (X_("Editor"), action);

        if (act) {
                Glib::RefPtr<Gtk::RadioAction> ract = Glib::RefPtr<Gtk::RadioAction>::cast_dynamic (act);
                ract->set_active (true);
        if (act) {
                Glib::RefPtr<Gtk::RadioAction> ract = Glib::RefPtr<Gtk::RadioAction>::cast_dynamic (act);
                ract->set_active (true);

diff --git a/libs/surfaces/us2400/gui.cc b/libs/surfaces/us2400/gui.cc
index 3d115cbd7b9adf5de9ab73df47e901d99547bca8..7a81033b11d55de7d98900b59d7ebf0bf46a2d00 100644 (file)
--- a/libs/surfaces/us2400/gui.cc
+++ b/libs/surfaces/us2400/gui.cc
@@ -375,7 +375,7 @@ US2400ProtocolGUI::build_available_action_menu ()
        NodeMap nodes;
        NodeMap::iterator r;
 
        NodeMap nodes;
        NodeMap::iterator r;
 

-       Gtkmm2ext::ActionMap::get_all_actions (paths, labels, tooltips, keys, actions);
+       ActionManager::get_all_actions (paths, labels, tooltips, keys, actions);

 
        vector<string>::iterator k;
        vector<string>::iterator p;
 
        vector<string>::iterator k;
        vector<string>::iterator p;