replace Lock^Wshopping-bag icon with button-sensitivity

[ardour.git] / gtk2_ardour / actions.cc

diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc
index 0db4831e6fe3d8ba5a5aa29781d69b93651c1ec8..3b0133b5355fb6e691c6d50151f401ae4ca4a018 100644 (file)
--- a/gtk2_ardour/actions.cc
+++ b/gtk2_ardour/actions.cc
@@ -31,7 +31,6 @@
 #include "pbd/error.h"
 #include "pbd/file_utils.h"
 
-#include "ardour/ardour.h"
 #include "ardour/filesystem_paths.h"
 #include "ardour/rc_configuration.h"
 
@@ -64,21 +63,26 @@ vector<RefPtr<Gtk::Action> > ActionManager::jack_opposite_sensitive_actions;
 vector<RefPtr<Gtk::Action> > ActionManager::transport_sensitive_actions;
 vector<RefPtr<Gtk::Action> > ActionManager::edit_point_in_region_sensitive_actions;
 
+static Glib::RefPtr<UIManager> ui_manager;
 
 void
 ActionManager::init ()
 {
-       sys::path ui_file;
-
        ui_manager = UIManager::create ();
+}
+
+void
+ActionManager::load_menus ()
+{
+       std::string ui_file;
 
        find_file_in_search_path (ardour_config_search_path(), "ardour.menus", 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;