merge once again with master
This commit is contained in:
parent
0e7ea01896
commit
f6721344bd
|
@ -37,6 +37,7 @@ namespace ActionManager {
|
||||||
extern std::vector<Glib::RefPtr<Gtk::Action> > session_sensitive_actions;
|
extern std::vector<Glib::RefPtr<Gtk::Action> > session_sensitive_actions;
|
||||||
extern std::vector<Glib::RefPtr<Gtk::Action> > write_sensitive_actions;
|
extern std::vector<Glib::RefPtr<Gtk::Action> > write_sensitive_actions;
|
||||||
extern std::vector<Glib::RefPtr<Gtk::Action> > region_list_selection_sensitive_actions;
|
extern std::vector<Glib::RefPtr<Gtk::Action> > region_list_selection_sensitive_actions;
|
||||||
|
extern std::vector<Glib::RefPtr<Gtk::Action> > plugin_selection_sensitive_actions;
|
||||||
|
|
||||||
extern std::vector<Glib::RefPtr<Gtk::Action> > track_selection_sensitive_actions;
|
extern std::vector<Glib::RefPtr<Gtk::Action> > track_selection_sensitive_actions;
|
||||||
extern std::vector<Glib::RefPtr<Gtk::Action> > point_selection_sensitive_actions;
|
extern std::vector<Glib::RefPtr<Gtk::Action> > point_selection_sensitive_actions;
|
||||||
|
|
|
@ -2829,11 +2829,11 @@ ProcessorBox::register_actions ()
|
||||||
|
|
||||||
/* standard editing stuff */
|
/* standard editing stuff */
|
||||||
|
|
||||||
cut_action = Actions.register_action (popup_act_grp, X_("cut"), _("Cut"),
|
cut_action = processor_box_actions.register_action (popup_act_grp, X_("cut"), _("Cut"),
|
||||||
sigc::ptr_fun (ProcessorBox::rb_cut));
|
sigc::ptr_fun (ProcessorBox::rb_cut));
|
||||||
copy_action = Actions.register_action (popup_act_grp, X_("copy"), _("Copy"),
|
copy_action = processor_box_actions.register_action (popup_act_grp, X_("copy"), _("Copy"),
|
||||||
sigc::ptr_fun (ProcessorBox::rb_copy));
|
sigc::ptr_fun (ProcessorBox::rb_copy));
|
||||||
delete_action = Actions.register_action (popup_act_grp, X_("delete"), _("Delete"),
|
delete_action = processor_box_actions.register_action (popup_act_grp, X_("delete"), _("Delete"),
|
||||||
sigc::ptr_fun (ProcessorBox::rb_delete));
|
sigc::ptr_fun (ProcessorBox::rb_delete));
|
||||||
|
|
||||||
ActionManager::plugin_selection_sensitive_actions.push_back (cut_action);
|
ActionManager::plugin_selection_sensitive_actions.push_back (cut_action);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user