Tidy up the region menu a bit, and hopefully clarify what regions will be

operated on in different circumstances.  Make the main menubar Region menu
the same as the context one, and use the same logic to sensitize/desensitize
actions for them.


git-svn-id: svn://localhost/ardour2/branches/3.0@7954 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 26 insertions, 26 deletions

diff --git a/gtk2_ardour/mnemonic-us.bindings.in b/gtk2_ardour/mnemonic-us.bindings.in
index b8ce5e26f2..b2645ca136 100644
--- a/gtk2_ardour/mnemonic-us.bindings.in
+++ b/gtk2_ardour/mnemonic-us.bindings.in
@@ -107,25 +107,25 @@ This mode provides many different operations on both regions and control points,
 @trans|Transport/ToggleRollForgetCapture|<@PRIMARY@>space|stop and destroy
 @trans|Transport/record-roll|<@TERTIARY@>space|start recording
 
-@rop|Editor/set-fade-in-length|slash|set fade in length
-@rop|Editor/set-fade-out-length|<@PRIMARY@>slash|toggle fade in active
-@rop|Editor/toggle-fade-out-active|backslash|set fade out length
-@rop|Editor/toggle-fade-out-active|<@PRIMARY@>backslash|toggle fade out active
+@rop|Region/set-fade-in-length|slash|set fade in length
+@rop|Region/toggle-region-fade-out|<@PRIMARY@>slash|toggle fade in active
+@rop|Region/set-fade-out-length|backslash|set fade out length
+@rop|Region/toggle-region-fade-out|<@PRIMARY@>backslash|toggle fade out active
 
-@eep|Editor/trim-from-start|<@TERTIARY@>braceleft|trim region start to edit point
-@eep|Editor/trim-to-end|<@TERTIARY@>braceright|trim region end to edit point
+@eep|Region/trim-from-start|<@TERTIARY@>braceleft|trim region start to edit point
+@eep|Region/trim-to-end|<@TERTIARY@>braceright|trim region end to edit point
 
 @eep|Editor/trim-to-previous-region|<@PRIMARY@>j|trim region to end of previous region
 @eep|Editor/trim-to-next-region|<@PRIMARY@>k|trim region to start of next region
 
 @ranges|Editor/set-loop-from-edit-range|bracketright|set loop range from edit range
-@ranges|Editor/set-loop-from-region|<@SECONDARY@>bracketright|set loop range from region(s)
+@ranges|Region/set-loop-from-region|<@SECONDARY@>bracketright|set loop range from region(s)
 
 @ranges|Editor/set-punch-from-edit-range|bracketleft|set punch range from edit range
-@ranges|Editor/set-punch-from-region|<@SECONDARY@>bracketleft|set punch range from region(s)
+@ranges|Region/set-punch-from-region|<@SECONDARY@>bracketleft|set punch range from region(s)
 
-@rop|Editor/boost-region-gain|asciicircum|increase region gain
-@rop|Editor/cut-region-gain|ampersand|reduce region gain
+@rop|Region/boost-region-gain|asciicircum|increase region gain
+@rop|Region/cut-region-gain|ampersand|reduce region gain
 
 ;; letters
 ;; TOP ROW
@@ -134,31 +134,31 @@ This mode provides many different operations on both regions and control points,
 
 ;; note that ctrl-w is special and consumed by the keyboard snooper
 
-@rop|Editor/set-edit-point|e|set fade out length
+@rop|Region/set-edit-point|e|set fade out length
 @select|Editor/select-all-before-edit-cursor|<@PRIMARY@>e|select all before EP
-@rop|Editor/export-region|<@PRIMARY@><@LEVEL4@>e|export selected region(s)
+@rop|Region/export-region|<@PRIMARY@><@LEVEL4@>e|export selected region(s)
 @sess|Main/ExportSession|<@LEVEL4@>e|export session
 @select|Editor/select-all-after-edit-cursor|<@PRIMARY@><@TERTIARY@>e|select all after EP
 @vis|Editor/show-editor-mixer|<@TERTIARY@>e|toggle editor window mixer
 @wvis|Common/goto-editor|<@WINDOW@>e|toggle editor window
 @mmode|MouseMode/set-mouse-mode-range|r|range mode
 @edit|Editor/redo|<@PRIMARY@>r|redo
-@rop|Editor/reverse-region|<@SECONDARY@>r|reverse
+@rop|Region/reverse-region|<@SECONDARY@>r|reverse
 @trans|Transport/Record|<@TERTIARY@>r|engage record
 @mmode|MouseMode/set-mouse-mode-timefx|t|timefx mode
-@rop|Editor/pitch-shift-region|<@SECONDARY@>t|transpose
+@rop|Region/pitch-shift-region|<@SECONDARY@>t|transpose
 @eep|Editor/insert-time|<@PRIMARY@>t|insert time
 @mmode|MouseMode/set-mouse-mode-object-range|y|link object/range tools
 @select|Editor/select-all-between-cursors|<@PRIMARY@>u|all enclosed by edit range
 @select|Editor/select-all-within-cursors|u|all present in edit range
-@eep|Editor/insert-region|i|insert from region list
+@eep|Region/insert-region-from-region-list|i|insert from region list
 @select|Editor/invert-selection|<@TERTIARY@>i|invert selection
 @sess|Editor/addExistingAudioFiles|<@SECONDARY@>i|import audio files
 @mmode|MouseMode/set-mouse-mode-object|o|object mode
 @sess|Main/Open|<@PRIMARY@>o|open an existing session
 @sess|Main/Recent|<@PRIMARY@><@TERTIARY@>o|open a recent session
 @wvis|Common/ToggleOptionsEditor|<@WINDOW@>o|toggle preferences dialog
-@rop|Editor/naturalize-region|<@LEVEL4@>o|move to original position
+@rop|Region/naturalize-region|<@LEVEL4@>o|move to original position
 @trans|Editor/set-playhead|p|toggle auto-punch status
 @select|Editor/select-all-before-playhead|<@PRIMARY@>p|all before playhead
 @midi|MIDI/panic|<@SECONDARY@>p|MIDI panic (stop all notes etc)
@@ -172,17 +172,17 @@ This mode provides many different operations on both regions and control points,
 @aep|Editor/align-regions-sync|<@TERTIARY@>a|align sync points
 @aep|Editor/align-regions-start|<@PRIMARY@><@LEVEL4@>a|align start(s)
 @aep|Editor/align-regions-start-relative|<@LEVEL4@>a|align start(s) relative
-@rop|Editor/split-region|s|split
+@rop|Region/split-region|s|split
 @sess|Common/Save|<@PRIMARY@>s|save session
 @sess|Main/Snapshot|<@PRIMARY@><@TERTIARY@>s|snapshot session
-@rop|Editor/duplicate-region|d|duplicate region (once)
-@rop|Editor/multi-duplicate-region|<@TERTIARY@>d|duplicate region (multi)
+@rop|Region/duplicate-region|d|duplicate region (once)
+@rop|Region/multi-duplicate-region|<@TERTIARY@>d|duplicate region (multi)
 @select|Editor/select-all-in-punch-range|<@PRIMARY@>d|select all in punch range
 @vis|Editor/fit-tracks|f|fit tracks vertically
 @trans|Editor/toggle-follow-playhead|<@PRIMARY@>f|toggle playhead tracking
-@wvis|Editor/toggle-rhythm-ferret|<@WINDOW@>f|toggle rhythm ferret window 
+@wvis|Region/show-rhythm-ferret|<@WINDOW@>f|show rhythm ferret window 
 @mmode|MouseMode/set-mouse-mode-gain|g|region gain mode
-@epp|Editor/play-selected-regions|h|play selected region(s)
+@epp|Region/play-selected-regions|h|play selected region(s)
 @eep|Editor/trim-front|j|trim front
 @eep|Editor/trim-back|k|trim back
 @wvis|Common/ToggleKeyEditor|<@WINDOW@>k|toggle key bindings editor
@@ -200,16 +200,16 @@ This mode provides many different operations on both regions and control points,
 @edit|Editor/editor-cut|<@PRIMARY@>x|cut
 @edit|Editor/editor-copy|<@PRIMARY@>c|copy
 @wvis|Common/ToggleColorManager|<@WINDOW@>c|toggle color manager
-@rop|Editor/set-region-sync-position|v|set region sync point
+@rop|Region/set-region-sync-position|v|set region sync point
 @edit|Editor/editor-paste|<@PRIMARY@>v|paste
 @-group|Editor/brush-at-mouse|<@PRIMARY@>b|some text
 @trans|Editor/track-record-enable-toggle|<@SECONDARY@>b|toggle track rec-enable 
 @wvis|Common/ToggleBigClock|<@WINDOW@>b|toggle big clock
-@rop|Editor/normalize-region|n|normalize
+@rop|Region/normalize-region|n|normalize
 @sess|Main/AddTrackBus|<@PRIMARY@><@TERTIARY@>n|add track(s) or bus(ses)
 @sess|Main/New|<@PRIMARY@>n|open a new session
 @mmode|MouseMode/toggle-internal-edit|m|toggle MIDI note editing
-@rop|Editor/mute-unmute-region|<@PRIMARY@>m|mute/unmute
+@rop|Region/toggle-region-mute|<@PRIMARY@>m|mute/unmute
 @wvis|Common/toggle-editor-mixer-on-top|<@WINDOW@>m|rotate editor \& mixer window
 
 ;; arrow keys, navigation etc.
@@ -256,13 +256,13 @@ This mode provides many different operations on both regions and control points,
 
 ;; keypad
 
-@rop|Editor/nudge-backward|KP_Subtract|nudge backward
+@rop|Region/nudge-backward|KP_Subtract|nudge backward
 @-group|Editor/nudge-next-backward|<@PRIMARY@>KP_Subtract|some text
 
 @movp|Editor/jump-forward-to-mark|<@PRIMARY@>KP_Right|to next mark
 @movp|Editor/jump-backward-to-mark|<@PRIMARY@>KP_Left|to previous mark
 
-@rop|Editor/nudge-forward|KP_Add|nudge forward
+@rop|Region/nudge-forward|KP_Add|nudge forward
 @-group|Editor/nudge-next-forward|<@PRIMARY@>KP_Add|some text
 
 @-group|Editor/start-range|<@PRIMARY@>KP_Down|some text