X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Factions.cc;h=1edbcafaa4e663184b82306d3bef13c0a5211dfa;hb=fdf63ace6a655f772a46e73719de14f9dd6fb940;hp=a1bdcdb36e391f1fd8d184d516d9071ce07437c1;hpb=813c5f0af9d1dac32b156ef3c72b890a7cf9eab5;p=ardour.git diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc index a1bdcdb36e..1edbcafaa4 100644 --- a/gtk2_ardour/actions.cc +++ b/gtk2_ardour/actions.cc @@ -31,15 +31,13 @@ #include "pbd/error.h" #include "pbd/file_utils.h" -#include "ardour/ardour.h" #include "ardour/filesystem_paths.h" #include "ardour/rc_configuration.h" #include "gtkmm2ext/actions.h" -#include "utils.h" #include "actions.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Gtk; @@ -47,49 +45,53 @@ using namespace Glib; using namespace PBD; using namespace ARDOUR; -vector > ActionManager::session_sensitive_actions; -vector > ActionManager::write_sensitive_actions; -vector > ActionManager::region_list_selection_sensitive_actions; -vector > ActionManager::plugin_selection_sensitive_actions; -vector > ActionManager::track_selection_sensitive_actions; -vector > ActionManager::point_selection_sensitive_actions; -vector > ActionManager::time_selection_sensitive_actions; -vector > ActionManager::line_selection_sensitive_actions; -vector > ActionManager::playlist_selection_sensitive_actions; -vector > ActionManager::mouse_edit_point_requires_canvas_actions; - -vector > ActionManager::range_sensitive_actions; -vector > ActionManager::jack_sensitive_actions; -vector > ActionManager::jack_opposite_sensitive_actions; -vector > ActionManager::transport_sensitive_actions; -vector > ActionManager::edit_point_in_region_sensitive_actions; - +typedef std::vector > RelatedActions; + +RelatedActions ActionManager::session_sensitive_actions; +RelatedActions ActionManager::write_sensitive_actions; +RelatedActions ActionManager::region_list_selection_sensitive_actions; +RelatedActions ActionManager::plugin_selection_sensitive_actions; +RelatedActions ActionManager::track_selection_sensitive_actions; +RelatedActions ActionManager::point_selection_sensitive_actions; +RelatedActions ActionManager::time_selection_sensitive_actions; +RelatedActions ActionManager::line_selection_sensitive_actions; +RelatedActions ActionManager::playlist_selection_sensitive_actions; +RelatedActions ActionManager::mouse_edit_point_requires_canvas_actions; +RelatedActions ActionManager::range_sensitive_actions; +RelatedActions ActionManager::engine_sensitive_actions; +RelatedActions ActionManager::engine_opposite_sensitive_actions; +RelatedActions ActionManager::transport_sensitive_actions; +RelatedActions ActionManager::edit_point_in_region_sensitive_actions; void ActionManager::init () { - sys::path ui_file; - ui_manager = UIManager::create (); +} + +void +ActionManager::load_menus (const string& menus_file) +{ + std::string ui_file; - find_file_in_search_path (ardour_config_search_path(), "ardour.menus", ui_file); + find_file (ardour_config_search_path(), menus_file, ui_file); bool loaded = false; try { - ui_manager->add_ui_from_file (ui_file.to_string()); - info << string_compose (_("Loading menus from %1"), ui_file.to_string()) << endmsg; + ui_manager->add_ui_from_file (ui_file); + info << string_compose (_("Loading menus from %1"), ui_file) << endmsg; loaded = true; } catch (Glib::MarkupError& err) { - error << string_compose (_("badly formatted UI definition file: %1"), err.what()) << endmsg; - cerr << string_compose (_("badly formatted UI definition file: %1"), err.what()) << endl; + error << string_compose (_("badly formatted menu definition file: %1"), err.what()) << endmsg; + cerr << string_compose (_("badly formatted menu definition file: %1"), err.what()) << endl; } catch (...) { error << string_compose (_("%1 menu definition file not found"), PROGRAM_NAME) << endmsg; } if (!loaded) { - cerr << string_compose (_("%1 will not work without a valid ardour.menus file"), PROGRAM_NAME) << endl; - error << string_compose (_("%1 will not work without a valid ardour.menus file"), PROGRAM_NAME) << endmsg; + cerr << string_compose (_("%1 will not work without a valid menu definition file"), PROGRAM_NAME) << endl; + error << string_compose (_("%1 will not work without a valid menu definition file"), PROGRAM_NAME) << endmsg; exit(1); } } @@ -119,6 +121,31 @@ ActionManager::toggle_config_state (const char* group, const char* action, bool } } +/** Examine the state of a Configuration setting and a toggle action, and toggle the Configuration + * setting if its state doesn't match the toggle action. + * @param group Action group. + * @param action Action name. + * @param Method to set the state of the Configuration setting. + * @param Method to get the state of the Configuration setting. + */ +void +ActionManager::toggle_config_state (const char* group, const char* action, bool (UIConfiguration::*set)(bool), bool (UIConfiguration::*get)(void) const) +{ + Glib::RefPtr act = ActionManager::get_action (group, action); + + if (act) { + Glib::RefPtr tact = Glib::RefPtr::cast_dynamic(act); + + if (tact) { + bool x = (UIConfiguration::instance().*get)(); + + if (x != tact->get_active()) { + (UIConfiguration::instance().*set) (!x); + } + } + } +} + void ActionManager::toggle_config_state_foo (const char* group, const char* action, sigc::slot set, sigc::slot get) { @@ -157,11 +184,30 @@ ActionManager::map_some_state (const char* group, const char* action, bool (RCCo if (tact->get_active() != x) { tact->set_active (x); } - } else { - cerr << group << ':' << action << " is not a toggle\n"; } - } else { - cerr << group << ':' << action << " not an action\n"; + } +} + +/** Set the state of a ToggleAction using a particular Configuration get() method + * @param group Action group. + * @param action Action name. + * @param get Method to obtain the state that the ToggleAction should have. + */ +void +ActionManager::map_some_state (const char* group, const char* action, bool (UIConfiguration::*get)() const) +{ + Glib::RefPtr act = ActionManager::get_action (group, action); + if (act) { + Glib::RefPtr tact = Glib::RefPtr::cast_dynamic(act); + + if (tact) { + + bool x = (UIConfiguration::instance().*get)(); + + if (tact->get_active() != x) { + tact->set_active (x); + } + } } }