smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-12 01:26:31 +01:00
Code Issues Projects Releases Wiki Activity

remove track-selection requirement so fit_selected_tracks works as coded. change name to fit-selection. remove action to zoom (both axes) because this can trivially be accomplished by clicking (f)it and (z)oom sequentially, and it frees a keybinding. remaining bug: Fitting a selection of MIDI regions doesnt work right

Browse source
This commit is contained in:
Ben Loftis 2015-01-11 11:46:36 -06:00
parent 03f0229bcf
commit c7affd79c2
6 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gtk2_ardour/ardour.menus.in
View file

@ -364,7 +364,7 @@
<menuitem action="move-selected-tracks-up"/> <menuitem action="move-selected-tracks-up"/>
<menuitem action="move-selected-tracks-down"/> <menuitem action="move-selected-tracks-down"/>
<menu action='TrackHeightMenu'> <menu action='TrackHeightMenu'>
<menuitem action='fit-tracks'/> <menuitem action='fit-selection'/>
<menuitem action='track-height-largest'/> <menuitem action='track-height-largest'/>
<menuitem action='track-height-larger'/> <menuitem action='track-height-larger'/>
<menuitem action='track-height-large'/> <menuitem action='track-height-large'/>
@ -405,7 +405,7 @@
<menuitem action='temporal-zoom-out'/> <menuitem action='temporal-zoom-out'/>
<menuitem action='zoom-to-session'/> <menuitem action='zoom-to-session'/>
<menuitem action='zoom-to-selection'/> <menuitem action='zoom-to-selection'/>
<menuitem action='zoom-to-selection-both-axes'/> <menuitem action='fit-selection'/>
<menuitem action='toggle-zoom'/> <menuitem action='toggle-zoom'/>
<menuitem action='expand-tracks'/> <menuitem action='expand-tracks'/>
<menuitem action='shrink-tracks'/> <menuitem action='shrink-tracks'/>

4
gtk2_ardour/editor.cc
View file

@ -3660,7 +3660,7 @@ Editor::build_track_count_menu ()
visible_tracks_selector.AddMenuElem (MenuElem (X_("24"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 24))); visible_tracks_selector.AddMenuElem (MenuElem (X_("24"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 24)));
visible_tracks_selector.AddMenuElem (MenuElem (X_("32"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 32))); visible_tracks_selector.AddMenuElem (MenuElem (X_("32"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 32)));
visible_tracks_selector.AddMenuElem (MenuElem (X_("64"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 64))); visible_tracks_selector.AddMenuElem (MenuElem (X_("64"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 64)));
visible_tracks_selector.AddMenuElem (MenuElem (_("Selected"), sigc::mem_fun(*this, &Editor::fit_selected_tracks))); visible_tracks_selector.AddMenuElem (MenuElem (_("Selection"), sigc::mem_fun(*this, &Editor::fit_selection)));
visible_tracks_selector.AddMenuElem (MenuElem (_("All"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 0))); visible_tracks_selector.AddMenuElem (MenuElem (_("All"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 0)));
} else { } else {
visible_tracks_selector.AddMenuElem (MenuElem (_("Fit 1 track"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 1))); visible_tracks_selector.AddMenuElem (MenuElem (_("Fit 1 track"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 1)));
@ -3672,7 +3672,7 @@ Editor::build_track_count_menu ()
visible_tracks_selector.AddMenuElem (MenuElem (_("Fit 32 tracks"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 32))); visible_tracks_selector.AddMenuElem (MenuElem (_("Fit 32 tracks"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 32)));
visible_tracks_selector.AddMenuElem (MenuElem (_("Fit 48 tracks"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 48))); visible_tracks_selector.AddMenuElem (MenuElem (_("Fit 48 tracks"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 48)));
visible_tracks_selector.AddMenuElem (MenuElem (_("Fit All tracks"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 0))); visible_tracks_selector.AddMenuElem (MenuElem (_("Fit All tracks"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 0)));
visible_tracks_selector.AddMenuElem (MenuElem (_("Fit Selected tracks"), sigc::mem_fun(*this, &Editor::fit_selected_tracks))); visible_tracks_selector.AddMenuElem (MenuElem (_("Fit Selection"), sigc::mem_fun(*this, &Editor::fit_selection)));
zoom_preset_selector.AddMenuElem (MenuElem (_("Zoom to 10 ms"), sigc::bind (sigc::mem_fun(*this, &Editor::set_zoom_preset), 10))); zoom_preset_selector.AddMenuElem (MenuElem (_("Zoom to 10 ms"), sigc::bind (sigc::mem_fun(*this, &Editor::set_zoom_preset), 10)));
zoom_preset_selector.AddMenuElem (MenuElem (_("Zoom to 100 ms"), sigc::bind (sigc::mem_fun(*this, &Editor::set_zoom_preset), 100))); zoom_preset_selector.AddMenuElem (MenuElem (_("Zoom to 100 ms"), sigc::bind (sigc::mem_fun(*this, &Editor::set_zoom_preset), 100)));

2
gtk2_ardour/editor.h
View file

@ -2129,7 +2129,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
RhythmFerret* rhythm_ferret; RhythmFerret* rhythm_ferret;
void fit_tracks (TrackViewList &); void fit_tracks (TrackViewList &);
void fit_selected_tracks (); void fit_selection ();
void set_track_height (Height); void set_track_height (Height);
void remove_tracks (); void remove_tracks ();

4
gtk2_ardour/editor_actions.cc
View file

@ -262,7 +262,6 @@ Editor::register_actions ()
reg_sens (editor_actions, "temporal-zoom-in", _("Zoom In"), sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_step), false)); reg_sens (editor_actions, "temporal-zoom-in", _("Zoom In"), sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_step), false));
reg_sens (editor_actions, "zoom-to-session", _("Zoom to Session"), sigc::mem_fun(*this, &Editor::temporal_zoom_session)); reg_sens (editor_actions, "zoom-to-session", _("Zoom to Session"), sigc::mem_fun(*this, &Editor::temporal_zoom_session));
reg_sens (editor_actions, "zoom-to-selection", _("Zoom to Selection"), sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_selection), false)); reg_sens (editor_actions, "zoom-to-selection", _("Zoom to Selection"), sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_selection), false));
reg_sens (editor_actions, "zoom-to-selection-both-axes", _("Zoom to Selection (Width and Height)"), sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_selection), true));
reg_sens (editor_actions, "toggle-zoom", _("Toggle Zoom State"), sigc::mem_fun(*this, &Editor::swap_visual_state)); reg_sens (editor_actions, "toggle-zoom", _("Toggle Zoom State"), sigc::mem_fun(*this, &Editor::swap_visual_state));
reg_sens (editor_actions, "expand-tracks", _("Expand Track Height"), sigc::bind (sigc::mem_fun (*this, &Editor::tav_zoom_step), false)); reg_sens (editor_actions, "expand-tracks", _("Expand Track Height"), sigc::bind (sigc::mem_fun (*this, &Editor::tav_zoom_step), false));
@ -409,8 +408,7 @@ Editor::register_actions ()
} }
ActionManager::track_selection_sensitive_actions.push_back (act); ActionManager::track_selection_sensitive_actions.push_back (act);
act = reg_sens (editor_actions, "fit-tracks", _("Fit Selected Tracks"), sigc::mem_fun(*this, &Editor::fit_selected_tracks)); act = reg_sens (editor_actions, "fit-selection", _("Fit Selection (Vertical)"), sigc::mem_fun(*this, &Editor::fit_selection));
ActionManager::track_selection_sensitive_actions.push_back (act);
act = reg_sens (editor_actions, "track-height-largest", _("Largest"), sigc::bind ( act = reg_sens (editor_actions, "track-height-largest", _("Largest"), sigc::bind (
sigc::mem_fun(*this, &Editor::set_track_height), HeightLargest)); sigc::mem_fun(*this, &Editor::set_track_height), HeightLargest));

4
gtk2_ardour/editor_ops.cc
View file

@ -1815,7 +1815,7 @@ Editor::temporal_zoom_selection (bool both_axes)
} }
if (both_axes) if (both_axes)
fit_selected_tracks(); fit_selection();
} }
} }
@ -6918,7 +6918,7 @@ Editor::insert_time (
} }
void void
Editor::fit_selected_tracks () Editor::fit_selection ()
{ {
if (!selection->tracks.empty()) { if (!selection->tracks.empty()) {
fit_tracks (selection->tracks); fit_tracks (selection->tracks);

2
gtk2_ardour/mnemonic-us.bindings.in
View file

@ -186,7 +186,7 @@ This mode provides many different operations on both regions and control points,
@rop|Region/duplicate-region|<@SECONDARY@>d|duplicate region (once) @rop|Region/duplicate-region|<@SECONDARY@>d|duplicate region (once)
@rop|Region/multi-duplicate-region|<@TERTIARY@>d|duplicate region (multi) @rop|Region/multi-duplicate-region|<@TERTIARY@>d|duplicate region (multi)
@select|Editor/select-all-in-punch-range|<@PRIMARY@>d|select all in punch range @select|Editor/select-all-in-punch-range|<@PRIMARY@>d|select all in punch range
@vis|Editor/fit-tracks|f|fit tracks vertically @vis|Editor/fit-selection|f|fit selection vertically
@trans|Editor/toggle-follow-playhead|<@PRIMARY@>f|toggle playhead tracking @trans|Editor/toggle-follow-playhead|<@PRIMARY@>f|toggle playhead tracking
@trans|Transport/ToggleFollowEdits|<@TERTIARY@>f|toggle playhead follows edits @trans|Transport/ToggleFollowEdits|<@TERTIARY@>f|toggle playhead follows edits
@wvis|Common/ToggleMaximalEditor|<@PRIMARY@><@SECONDARY@>f|maximise editor space @wvis|Common/ToggleMaximalEditor|<@PRIMARY@><@SECONDARY@>f|maximise editor space