allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

use ActionManager namespace, rather than ActionMap objects

Browse Source
This commit is contained in:
Paul Davis
2018-12-10 08:32:56 -05:00
parent d1d8fd197d
commit 00df619d21
6 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libs/surfaces/cc121/gui.cc
View File

@@ -26,6 +26,7 @@
#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"
@@ -378,7 +379,7 @@ CC121GUI::build_available_action_menu ()
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;

3
libs/surfaces/faderport/gui.cc
View File

@@ -25,6 +25,7 @@
#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"
@@ -359,7 +360,7 @@ FPGUI::build_available_action_menu ()
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;

3
libs/surfaces/faderport8/gui.cc
View File

@@ -26,6 +26,7 @@
#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"
@@ -354,7 +355,7 @@ FP8GUI::build_available_action_menu ()
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;

2
libs/surfaces/mackie/gui.cc
View File

@@ -460,7 +460,7 @@ MackieControlProtocolGUI::build_available_action_menu ()
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;

24
libs/surfaces/maschine2/callbacks.cc
View File

@@ -51,23 +51,23 @@ Maschine2::connect_signals ()
/* 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
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));
}
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));
}
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));
@@ -167,7 +167,7 @@ Maschine2::notify_parameter_changed (std::string param)
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);
@@ -183,12 +183,12 @@ Maschine2::notify_snap_change ()
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; }
}
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; }
@@ -257,7 +257,7 @@ Maschine2::button_action (const std::string& group, const std::string& item)
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 ());
@@ -288,19 +288,19 @@ Maschine2::button_snap_released ()
_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"; }
}
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"; }
}
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"; }
@@ -311,7 +311,7 @@ Maschine2::button_snap_released ()
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);

2
libs/surfaces/us2400/gui.cc
View File

@@ -375,7 +375,7 @@ US2400ProtocolGUI::build_available_action_menu ()
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;