ardour/livetrax
13
0
Fork 0
Code

amend 31640a9a5b by reverting action name back to fork-region

Browse Source 
This avoids breaking bindings, and since the action name is generally not a part of the GUI,
really doesn't hurt anything in terms of understandability
This commit is contained in:
Paul Davis 2022-08-18 09:27:43 -06:00
parent 31640a9a5b
commit eadd26b379
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/ardour.menus.in
View File

@ -357,7 +357,7 @@
<menuitem action='legatize-region'/> <menuitem action='legatize-region'/>
<menuitem action='remove-overlap'/> <menuitem action='remove-overlap'/>
<menuitem action='transform-region'/> <menuitem action='transform-region'/>
<menuitem action='fork-selected-regions'/> <menuitem action='fork-region'/>
<menuitem action='fork-regions-from-unselected'/> <menuitem action='fork-regions-from-unselected'/>
<menuitem action='deinterlace-midi'/> <menuitem action='deinterlace-midi'/>
<menuitem action='show-region-list-editor'/> <menuitem action='show-region-list-editor'/>
@ -858,7 +858,7 @@
<menuitem action='legatize-region'/> <menuitem action='legatize-region'/>
<menuitem action='remove-overlap'/> <menuitem action='remove-overlap'/>
<menuitem action='transform-region'/> <menuitem action='transform-region'/>
<menuitem action='fork-selected-regions'/> <menuitem action='fork-region'/>
<menuitem action='fork-regions-from-unselected'/> <menuitem action='fork-regions-from-unselected'/>
<menuitem action='deinterlace-midi'/> <menuitem action='deinterlace-midi'/>
<menuitem action='show-region-list-editor'/> <menuitem action='show-region-list-editor'/>

2
gtk2_ardour/editor_actions.cc
View File

@ -1910,7 +1910,7 @@ Editor::register_region_actions ()
register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "remove-overlap", _("Remove Overlap"), sigc::bind(sigc::mem_fun (*this, &Editor::legatize_region), true)); register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "remove-overlap", _("Remove Overlap"), sigc::bind(sigc::mem_fun (*this, &Editor::legatize_region), true));
register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "insert-patch-change", _("Insert Patch Change..."), sigc::bind (sigc::mem_fun (*this, &Editor::insert_patch_change), false)); register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "insert-patch-change", _("Insert Patch Change..."), sigc::bind (sigc::mem_fun (*this, &Editor::insert_patch_change), false));
register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "insert-patch-change-context", _("Insert Patch Change..."), sigc::bind (sigc::mem_fun (*this, &Editor::insert_patch_change), true)); register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "insert-patch-change-context", _("Insert Patch Change..."), sigc::bind (sigc::mem_fun (*this, &Editor::insert_patch_change), true));
register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "fork-selected-regions", _("Unlink all selected regions"), sigc::mem_fun (*this, &Editor::fork_selected_regions)); register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "fork-region", _("Unlink all selected regions"), sigc::mem_fun (*this, &Editor::fork_selected_regions));
register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "fork-regions-from-unselected", _("Unlink from unselected"), sigc::mem_fun (*this, &Editor::fork_regions_from_unselected)); register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "fork-regions-from-unselected", _("Unlink from unselected"), sigc::mem_fun (*this, &Editor::fork_regions_from_unselected));
register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "strip-region-silence", _("Strip Silence..."), sigc::mem_fun (*this, &Editor::strip_region_silence)); register_region_action (_region_actions, RegionActionTarget (SelectedRegions|EnteredRegions), "strip-region-silence", _("Strip Silence..."), sigc::mem_fun (*this, &Editor::strip_region_silence));
register_region_action (_region_actions, RegionActionTarget (SelectedRegions), "set-selection-from-region", _("Set Range Selection"), sigc::mem_fun (*this, &Editor::set_selection_from_region)); register_region_action (_region_actions, RegionActionTarget (SelectedRegions), "set-selection-from-region", _("Set Range Selection"), sigc::mem_fun (*this, &Editor::set_selection_from_region));

2
gtk2_ardour/editor_selection.cc
View File

@ -1539,7 +1539,7 @@ Editor::sensitize_the_right_region_actions (bool because_canvas_crossing)
_region_actions->get_action("legatize-region")->set_sensitive (false); _region_actions->get_action("legatize-region")->set_sensitive (false);
_region_actions->get_action("remove-overlap")->set_sensitive (false); _region_actions->get_action("remove-overlap")->set_sensitive (false);
_region_actions->get_action("transform-region")->set_sensitive (false); _region_actions->get_action("transform-region")->set_sensitive (false);
_region_actions->get_action("fork-selected-regions")->set_sensitive (false); _region_actions->get_action("fork-region")->set_sensitive (false);
_region_actions->get_action("fork-regions-from-unselected")->set_sensitive (false); _region_actions->get_action("fork-regions-from-unselected")->set_sensitive (false);
_region_actions->get_action("insert-patch-change-context")->set_sensitive (false); _region_actions->get_action("insert-patch-change-context")->set_sensitive (false);
_region_actions->get_action("insert-patch-change")->set_sensitive (false); _region_actions->get_action("insert-patch-change")->set_sensitive (false);