From 68e943265edf04e63a8e8b8f62bab20f99d9c637 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 10 Sep 2008 15:03:30 +0000 Subject: merge from 2.0-ongoing @ 3581 git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf --- manual/xml/editor_aligning_key_bindings.xml | 18 ++- manual/xml/editor_canvas_key_bindings.xml | 44 ++---- .../editor_edit_cursor_position_key_bindings.xml | 122 +++++++++++++++-- manual/xml/editor_locations_marks_key_bindings.xml | 118 +++++++++++++++- manual/xml/editor_marker_bindings.xml | 32 +++++ manual/xml/editor_miscellaneous_key_bindings.xml | 66 ++++++++- manual/xml/editor_nudging_key_bindings.xml | 30 +---- manual/xml/editor_play_position_key_bindings.xml | 113 +++++++++++++--- .../xml/editor_range_operations_key_bindings.xml | 29 +--- .../xml/editor_region_operations_key_bindings.xml | 149 +++++++++++++++++++-- manual/xml/editor_selection_key_bindings.xml | 142 ++++++++++++++++++++ manual/xml/editor_zoom_key_bindings.xml | 60 ++++++++- manual/xml/general_key_bindings.xml | 58 +------- manual/xml/key_bindings.xml | 10 +- manual/xml/transport_key_bindings.xml | 17 +-- manual/xml/window_key_bindings.xml | 112 ++++++++++++++++ 16 files changed, 918 insertions(+), 202 deletions(-) create mode 100644 manual/xml/editor_marker_bindings.xml create mode 100644 manual/xml/editor_selection_key_bindings.xml create mode 100644 manual/xml/window_key_bindings.xml (limited to 'manual') diff --git a/manual/xml/editor_aligning_key_bindings.xml b/manual/xml/editor_aligning_key_bindings.xml index 8a6c677272..3fbbd7acc4 100644 --- a/manual/xml/editor_aligning_key_bindings.xml +++ b/manual/xml/editor_aligning_key_bindings.xml @@ -25,43 +25,41 @@ - a + a - relative alignment of region sync points or starts + align regions using sync points and keeping relative positions - Metaa + Alta - absolute alignment of region sync points or starts + align region ends - CtrlShifta - + Shifta - relative alignment of region ends + align region sync points without keeping relative positions - CtrlMetaa - + Mod4a - align region ends + align region starts and keeping relative positions diff --git a/manual/xml/editor_canvas_key_bindings.xml b/manual/xml/editor_canvas_key_bindings.xml index e9b3eb4d08..1a3bae8082 100644 --- a/manual/xml/editor_canvas_key_bindings.xml +++ b/manual/xml/editor_canvas_key_bindings.xml @@ -25,81 +25,61 @@ - left arrow + f - move editor timeline earlier + fit tracks - Ctrlb + Up - move editor timeline earlier + step tracks up - right arrow + Down - move editor timeline later + step tracks down - Ctrlf + Page_Down - move editor timeline later + scroll tracks down - Page_Up + Page_Up - scroll track display up + scroll tracks up - Page_Down + Shifte - scroll track display down - - - - - - Up arrow - - - - step track display up - - - - - - Down arrow - - - - step track display down + show editor mixer diff --git a/manual/xml/editor_edit_cursor_position_key_bindings.xml b/manual/xml/editor_edit_cursor_position_key_bindings.xml index 1190e3efa7..25fc749c53 100644 --- a/manual/xml/editor_edit_cursor_position_key_bindings.xml +++ b/manual/xml/editor_edit_cursor_position_key_bindings.xml @@ -23,13 +23,113 @@ + + + ` + + + + cycle-edit-point + + + + + + Ctrl~ + + + + cycle-edit-point-with-marker + + + + + + e + + + + set-edit-point + + + + + + AltReturn + + + + edit-to-playhead + + + + + + F1 + + + + edit-cursor-to-range-start + + + + + + F2 + + + + edit-cursor-to-range-end + + + + + + ' + + + + edit-cursor-to-previous-region-sync + + + + + + ; + + + + edit-cursor-to-next-region-sync + + + + + + CtrlShiftLeft + + + + selected-marker-to-previous-region-boundary + + + + + + CtrlShiftRight + + + + selected-marker-to-next-region-boundary + + + e - position edit cursor at mouse pointer + position selected marker at mouse pointer @@ -40,7 +140,7 @@ - move edit cursor to playhead + move selected marker to playhead @@ -50,7 +150,7 @@ - move edit cursor to earlier region start + move selected marker to earlier region start @@ -60,7 +160,7 @@ - move edit cursor to earlier region end + move selected marker to earlier region end @@ -70,7 +170,7 @@ - move edit cursor to next region start + move selected marker to next region start @@ -80,17 +180,17 @@ - move edit cursor to next region end + move selected marker to next region end - ””’ + ' - move edit cursor to next region sync + move selected marker to next region sync @@ -100,7 +200,7 @@ - moved edit cursor to previous region sync + moved selected marker to previous region sync @@ -110,7 +210,7 @@ - move edit cursor to start of range selection (if defined) + move selected marker to start of range selection (if defined) @@ -120,7 +220,7 @@ - move edit cursor to end of range selection (if defined) + move selected marker to end of range selection (if defined) diff --git a/manual/xml/editor_locations_marks_key_bindings.xml b/manual/xml/editor_locations_marks_key_bindings.xml index d83c446578..62cabda4bd 100644 --- a/manual/xml/editor_locations_marks_key_bindings.xml +++ b/manual/xml/editor_locations_marks_key_bindings.xml @@ -35,21 +35,131 @@ - Keypad > + ] - move playhead to next marker + set loop range from edit range - Keypad < + Alt] - move playhead to previous marker + set loop range from selected region(s) + + + + + + [ + + + + set punch range from edit range + + + + + + Alt[ + + + + set punch range from selected region(s) + + + + + + KP_1 + + + + goto mark 1 + + + + + + KP_2 + + + + goto mark 2 + + + + + + KP_3 + + + + goto mark 3 + + + + + + KP_4 + + + + goto mark 4 + + + + + + KP_5 + + + + goto mark 5 + + + + + + KP_6 + + + + goto mark 6 + + + + + + KP_7 + + + + goto mark 7 + + + + + + KP_8 + + + + goto mark 8 + + + + + + KP_9 + + + + goto mark 9 diff --git a/manual/xml/editor_marker_bindings.xml b/manual/xml/editor_marker_bindings.xml new file mode 100644 index 0000000000..b7ecc11033 --- /dev/null +++ b/manual/xml/editor_marker_bindings.xml @@ -0,0 +1,32 @@ + + + + +
+ Mark & Range Key Bindings + + Editor Canvas Key Bindings + + + + + + + Key Binding + + + + Action + + + + + +
+ +
diff --git a/manual/xml/editor_miscellaneous_key_bindings.xml b/manual/xml/editor_miscellaneous_key_bindings.xml index 1fd40d13ea..343869357b 100644 --- a/manual/xml/editor_miscellaneous_key_bindings.xml +++ b/manual/xml/editor_miscellaneous_key_bindings.xml @@ -25,23 +25,83 @@ - l + 1 - toggle auto loop + toggle edit mode - f + 2 + + + + cycle snap mode + + + + + + 3 + + + + cycle snap choice + + + + + + Ctrlf toggle follow playhead + + + + 9 + + + + set tempo from region + + + + + + 0 + + + + set tempo from edit range + + + + + + Ctrlt + + + + insert time + + + + + + CtrlDelete + + + + remove last capture + + diff --git a/manual/xml/editor_nudging_key_bindings.xml b/manual/xml/editor_nudging_key_bindings.xml index 8c0560d0b8..0d9ce0ff32 100644 --- a/manual/xml/editor_nudging_key_bindings.xml +++ b/manual/xml/editor_nudging_key_bindings.xml @@ -6,6 +6,11 @@
Nudging Key Bindings + + Nudging will move selected regions if there are any, otherwise the + playhead. + + Nudging Key Bindings @@ -25,7 +30,7 @@ - + (keypad) + Keypad + @@ -35,34 +40,13 @@ - Ctrl+ - (keypad) - - - - nudge next forward - - - - - - - (keypad) + Keypad - nudge backward - - - - Ctrl- - - - - nudge next backward - -
diff --git a/manual/xml/editor_play_position_key_bindings.xml b/manual/xml/editor_play_position_key_bindings.xml index 52024cbb59..5edb25911d 100644 --- a/manual/xml/editor_play_position_key_bindings.xml +++ b/manual/xml/editor_play_position_key_bindings.xml @@ -23,6 +23,26 @@ + + + Home + + + + Move playhead to session start + + + + + + End + + + + Move playhead to session end + + + p @@ -39,77 +59,140 @@ - move playhead to edit cursor + move playhead to selected marker (if any) + + + + + + AltReturn + + + + + move selected marker (if any) to playhead + + + + + + . + + + + playhead to next region boundary + + + + + + Ctrl. + + + + playhead to next region sync + + + + + + , + + + + playhead to previous region boundary + + + + + + Ctrl, + + + + playhead to previous region sync + + + + + + CtrlRight + + + + tab to transient forwards - Tab + CtrlLeft - move playhead to later region start + tab to transient backwards - CtrlTab + Left - move playhead to later region end + playhead to previous region boundary - ` + AltLeft - move playhead to earlier region start + nudge playhead backward - Ctrl` + Right - move playhead to next mark + playhead to next region boundary - | (keypad) + AltRight - move playhead to previous mark + nudge playhead forward - Ctrll + CtrlKeypad + Right - center screen around playhead + jump forward to mark - Ctrlg + CtrlKeypad + Left - goto + jump backward to mark diff --git a/manual/xml/editor_range_operations_key_bindings.xml b/manual/xml/editor_range_operations_key_bindings.xml index 111de889de..b6d20e8504 100644 --- a/manual/xml/editor_range_operations_key_bindings.xml +++ b/manual/xml/editor_range_operations_key_bindings.xml @@ -25,27 +25,17 @@ - Keypad Down arrow + F6 - begin range definition while transport rolls + select range using edit range - Keypad Up arrow - - - - end range definition while transport rolls - - - - - - ShiftTab + > @@ -55,24 +45,13 @@ - CtrlShiftTab - + < extend range to start of region - - - - Metas - - - - duplicate range - - diff --git a/manual/xml/editor_region_operations_key_bindings.xml b/manual/xml/editor_region_operations_key_bindings.xml index e830c2c338..8896588c65 100644 --- a/manual/xml/editor_region_operations_key_bindings.xml +++ b/manual/xml/editor_region_operations_key_bindings.xml @@ -6,6 +6,13 @@
Region Operations Key Bindings + + Region operations generally operate on the currently selected regions, + if any. If none are selected but 1 or more tracks are selected then + regions in those tracks at the edit point will be used. If no tracks are + selected, then any region at the edit point will be used. + + Region Operation Key Bindings @@ -29,57 +36,177 @@ - split region(s) at mouse + split region(s) at edit point - Alts + i - split region(s) at edit cursor + insert region (from region list) - Insert + d - insert selected region (from region list) + duplicate region - Metad + n - duplicate region + normalize region - Altr + m - reverse region + mute/unmute region - Altn + ~ - normalize region + boost region gain + + + + + + & + + + + cut region gain + + + + + + h + + + + play selected regions + + + + + + j + + + + trim to start at edit point + + + + + + k + + + + trim to end at edit point + + + + + + / + + + + set fade in length (via edit point) + + + + + + \ + + + + set fade out length (via edit point) + + + + + + Shift{ + + + + trim from start to edit point + + + + + + Shift} + + + + trim from edit point to end + + + + + + F3 + + + + crop (to edit range) + + + + + + F4 + + + + separate (using edit range) + + + + + + v + + + + set region sync point(s) at edit point + + + + + + F5 + + + + pitch shift region diff --git a/manual/xml/editor_selection_key_bindings.xml b/manual/xml/editor_selection_key_bindings.xml new file mode 100644 index 0000000000..d8f2e627d4 --- /dev/null +++ b/manual/xml/editor_selection_key_bindings.xml @@ -0,0 +1,142 @@ + + + + +
+ Selection Key Bindings +
+ Selection Key Bindings + + + + + + + Key Binding + + + + Action + + + + + + + Ctrla + + + + select all + + + + + + Ctrlp + + + + select all before playhead + + + + + + ShiftCtrlp + + + + select all after playhead + + + + + + u + + + + select all within edit range + + + + + + Shifti + + + + invert selection + + + + + + ShiftCtrle + + + + select all after edit cursor + + + + + + Ctrle + + + + select all before edit cursor + + + + + + Ctrld + + + + select all in punch range + + + + + + Ctrll + + + + select all in loop range + + + + + + AltUp + + + + select prev route + + + + + + AltDown + + + + select next route + + + + +
+ +
diff --git a/manual/xml/editor_zoom_key_bindings.xml b/manual/xml/editor_zoom_key_bindings.xml index b8afa14bfe..1b30a217ca 100644 --- a/manual/xml/editor_zoom_key_bindings.xml +++ b/manual/xml/editor_zoom_key_bindings.xml @@ -5,7 +5,12 @@ ]>
- Zoom Key Bindings + Zoom and Visual State Key Bindings + + By default, 12 function keys (F1-F12) are assigned to visual state + management. All of them are represented in the table as "Fn". + + Editor Zoom Key Bindings @@ -45,13 +50,64 @@ - Z + z switch zoom focus to playhead + + + + CtrlAltz + + + + + Zoom to fit selected region(s) (time axis only) + + + + + + Altz + + + + Zoom to fit selected region(s) (time axis & vertical axis) + + + + + + Shiftz + + + + Undo zoom change + + + + + + CtrlFn + + + + Save current visual state as VS #n (hold for 2 secs) + + + + + + CtrlFn + + + + Restore visual state #n (occurs on key release) + +
diff --git a/manual/xml/general_key_bindings.xml b/manual/xml/general_key_bindings.xml index edf77ad113..79b8693798 100644 --- a/manual/xml/general_key_bindings.xml +++ b/manual/xml/general_key_bindings.xml @@ -33,46 +33,6 @@ - - - Alte - - - - Raise the Editor Window - - - - - - Altm - - - - Toggle display of the locations window - - - - - - Altc - - - - Toggle display of the options editor - - - - - - Ctrlt - - - - Add a track or bus - - - Ctrls @@ -85,31 +45,21 @@ - Ctrlq - - - - Quit - - - - - - Ctrlu + Alti - Starts a prefix entry sequence + Import existing files into a session. - Ctrlm + Ctrlq - Toggle sending MIDI feedback + Quit diff --git a/manual/xml/key_bindings.xml b/manual/xml/key_bindings.xml index f3b50810a7..3aff10c6d4 100644 --- a/manual/xml/key_bindings.xml +++ b/manual/xml/key_bindings.xml @@ -10,15 +10,15 @@ Key Bindings Note that all keyboard bindings can be changed in either the system or - the user's Ardour configuration file - ($HOME/.ardour/ardour.rc). + the user's Ardour key bindings file + ($HOME/.ardour2/ardour.bindings). + href="window_key_bindings.xml" /> + href="transport_key_bindings.xml" /> + - CtrlShiftspace + Ctrlspace - Raise the Editor Window + One-touch record (start transport & recording) - Shiftr + CtrlShiftspace - Toggle transport record-enable state + Toggle transport motion, deleting any recorded material if + recording - Home + Shiftr - Move playhead to start + Toggle transport record-enable state - End + l - Move playhead to end + toggle looping diff --git a/manual/xml/window_key_bindings.xml b/manual/xml/window_key_bindings.xml new file mode 100644 index 0000000000..e75bf5a3ae --- /dev/null +++ b/manual/xml/window_key_bindings.xml @@ -0,0 +1,112 @@ + + + + +
+ Window Visibility Key Bindings + + Window Visibility Key Bindings + + + + + + + Key Binding + + + + Action + + + + + + + Alte + + + + Raise editor window + + + + + + Altm + + + + Raise mixer window + + + + + + Altl + + + + Toggle locations window + + + + + + Altb + + + + Toggle "big clock" window + + + + + + Altk + + + + Toggle key bindings window + + + + + + Altf + + + + Toggle Rhythm Ferret window + + + + + + Alto + + + + Toggle preferences window + + + + + + Altc + + + + Toggle color manager window + + + + +
+ +
-- cgit v1.2.3