radio actions now display correctly, region list sorting works

[ardour.git] / gtk2_ardour / actions.h

diff --git a/gtk2_ardour/actions.h b/gtk2_ardour/actions.h
index 2ea2794ab3756ff5b671398d60c625febe995b85..b842693eba3804d3404e4e6b6eafbfaf61bde54e 100644 (file)
--- a/gtk2_ardour/actions.h
+++ b/gtk2_ardour/actions.h
@@ -26,35 +26,40 @@ class ActionManager
        static std::vector<Glib::RefPtr<Gtk::Action> > track_selection_sensitive_actions;
        static std::vector<Glib::RefPtr<Gtk::Action> > plugin_selection_sensitive_actions;
        static std::vector<Glib::RefPtr<Gtk::Action> > range_sensitive_actions;
+       static std::vector<Glib::RefPtr<Gtk::Action> > transport_sensitive_actions;
        static std::vector<Glib::RefPtr<Gtk::Action> > jack_sensitive_actions;
+       static std::vector<Glib::RefPtr<Gtk::Action> > jack_opposite_sensitive_actions;
+       static std::vector<Glib::RefPtr<Gtk::Action> > edit_cursor_in_region_sensitive_actions;
+
+       static void set_sensitive (std::vector<Glib::RefPtr<Gtk::Action> >& actions, bool);
 
        static std::string unbound_string;  /* the key string returned if an action is not bound */
        static Glib::RefPtr<Gtk::UIManager> ui_manager;
 
-       static Gtk::Widget* get_widget (Glib::ustring name);
-       static Glib::RefPtr<Gtk::Action> get_action (Glib::ustring name);
+       static Gtk::Widget* get_widget (const char * name);
+       static Glib::RefPtr<Gtk::Action> get_action (const char* group, const char* name);
 
        static void add_action_group (Glib::RefPtr<Gtk::ActionGroup>);
 
        static Glib::RefPtr<Gtk::Action> register_action (Glib::RefPtr<Gtk::ActionGroup> group, 
-                                                  std::string name, std::string label);
+                                                  const char * name, const char * label);
        static Glib::RefPtr<Gtk::Action> register_action (Glib::RefPtr<Gtk::ActionGroup> group, 
-                                                  std::string name, std::string label, sigc::slot<void> sl, 
+                                                  const char * name, const char * label, sigc::slot<void> sl, 
                                                   guint key, Gdk::ModifierType mods);
        static Glib::RefPtr<Gtk::Action> register_action (Glib::RefPtr<Gtk::ActionGroup> group, 
-                                                  std::string name, std::string label, sigc::slot<void> sl);
+                                                  const char * name, const char * label, sigc::slot<void> sl);
        
-       static Glib::RefPtr<Gtk::Action> register_radio_action (Glib::RefPtr<Gtk::ActionGroup> group, Gtk::RadioAction::Group, 
-                                                        std::string name, std::string label, sigc::slot<void> sl, 
+       static Glib::RefPtr<Gtk::Action> register_radio_action (Glib::RefPtr<Gtk::ActionGroup> group, Gtk::RadioAction::Group&, 
+                                                        const char * name, const char * label, sigc::slot<void> sl, 
                                                         guint key, Gdk::ModifierType mods);
-       static Glib::RefPtr<Gtk::Action> register_radio_action (Glib::RefPtr<Gtk::ActionGroup> group, Gtk::RadioAction::Group, 
-                                                        std::string name, std::string label, sigc::slot<void> sl);
+       static Glib::RefPtr<Gtk::Action> register_radio_action (Glib::RefPtr<Gtk::ActionGroup> group, Gtk::RadioAction::Group&, 
+                                                        const char * name, const char * label, sigc::slot<void> sl);
        
        static Glib::RefPtr<Gtk::Action> register_toggle_action (Glib::RefPtr<Gtk::ActionGroup> group, 
-                                                         std::string name, std::string label, sigc::slot<void> sl, 
+                                                         const char * name, const char * label, sigc::slot<void> sl, 
                                                          guint key, Gdk::ModifierType mods);
        static Glib::RefPtr<Gtk::Action> register_toggle_action (Glib::RefPtr<Gtk::ActionGroup> group, 
-                                                         std::string name, std::string label, sigc::slot<void> sl);
+                                                         const char * name, const char * label, sigc::slot<void> sl);
 
        static bool lookup_entry (const Glib::ustring accel_path, Gtk::AccelKey& key);
 
@@ -62,7 +67,8 @@ class ActionManager
                                     std::vector<std::string>& paths, 
                                     std::vector<std::string>& keys, 
                                     std::vector<Gtk::AccelKey>& bindings);
-       
+
+       static void uncheck_toggleaction (const char * actionname);
 };
 
 #endif /* __ardour_gtk_actions_h__ */