diff options
author | David Robillard <d@drobilla.net> | 2007-01-09 23:24:54 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2007-01-09 23:24:54 +0000 |
commit | 532f6aad4ac79ca15d69deccd18fca90e444c437 (patch) | |
tree | 0d4ca5449af8eb48ad56e163efcab42c4656e8de /gtk2_ardour/ardour.menus | |
parent | ef6b25432d9c46d71b08c0f7d5f2686df428c4e8 (diff) |
Merged with trunk R1283.
NOTE: Compiles, but broken (crash on adding MIDI track).
git-svn-id: svn://localhost/ardour2/branches/midi@1292 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour.menus')
-rw-r--r-- | gtk2_ardour/ardour.menus | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/gtk2_ardour/ardour.menus b/gtk2_ardour/ardour.menus index 97441e5023..cf56e2ad9f 100644 --- a/gtk2_ardour/ardour.menus +++ b/gtk2_ardour/ardour.menus @@ -81,6 +81,7 @@ <menuitem action='editor-delete'/> <menuitem action='editor-copy'/> <menuitem action='editor-paste'/> + <menuitem action='remove-last-capture'/> <separator/> <menu action="EditSelectRangeOptions"> <menuitem action='extend-range-to-start-of-region'/> @@ -122,6 +123,21 @@ <menuitem action="nudge-backward"/> <menuitem action="nudge-next-backward"/> </menu> + <menu name='KeyMouse Actions' action='KeyMouse Actions'> + <menuitem action='audition-at-mouse'/> + <menuitem action='brush-at-mouse'/> + <menuitem action='set-edit-cursor'/> + <menuitem action='mute-unmute-region'/> + <menuitem action='set-playhead'/> + <menuitem action='split-region'/> + <menuitem action='set-region-sync-position'/> + <separator/> + <menuitem action='set-mouse-mode-object'/> + <menuitem action='set-mouse-mode-range'/> + <menuitem action='set-mouse-mode-gain'/> + <menuitem action='set-mouse-mode-zoom'/> + <menuitem action='set-mouse-mode-timefx'/> + </menu> </menu> <menu name='View' action = 'View'> <menu name='ZoomFocus' action='ZoomFocus'> @@ -214,13 +230,11 @@ <menuitem action='goto-editor'/> <menuitem action='goto-mixer'/> <menuitem action='ToggleOptionsEditor'/> - <menuitem action='ToggleSoundFileBrowser'/> <menuitem action='ToggleInspector'/> <menuitem action='ToggleLocations'/> <menuitem action='ToggleColorManager'/> <menuitem action='ToggleBigClock'/> <separator/> - <menuitem action='About'/> </menu> <menu name='Options' action='Options'> <menu action='AudioFileFormat'> @@ -240,10 +254,10 @@ <menuitem action='Smpte24'/> <menuitem action='Smpte24976'/> <menuitem action='Smpte25'/> - <menuitem action='Smpte2997drop'/> <menuitem action='Smpte2997'/> - <menuitem action='Smpte30drop'/> + <menuitem action='Smpte2997drop'/> <menuitem action='Smpte30'/> + <menuitem action='Smpte30drop'/> <menuitem action='Smpte5994'/> <menuitem action='Smpte60'/> </menu> @@ -258,6 +272,10 @@ <menuitem action='PullupMinus4'/> <menuitem action='PullupMinus4Minus1'/> </menu> + <menu action='Subframes'> + <menuitem action='Subframes80'/> + <menuitem action='Subframes100'/> + </menu> <separator/> <menu action='Autoconnect'> <menuitem action='InputAutoConnectPhysical'/> @@ -324,21 +342,7 @@ <separator/> </menu> <menu name='Help' action='Help'> - <menu name='KeyMouse Actions' action='KeyMouse Actions'> - <menuitem action='audition-at-mouse'/> - <menuitem action='brush-at-mouse'/> - <menuitem action='set-edit-cursor'/> - <menuitem action='mute-unmute-region'/> - <menuitem action='set-playhead'/> - <menuitem action='split-region'/> - <menuitem action='set-region-sync-position'/> - <separator/> - <menuitem action='set-mouse-mode-object'/> - <menuitem action='set-mouse-mode-range'/> - <menuitem action='set-mouse-mode-gain'/> - <menuitem action='set-mouse-mode-zoom'/> - <menuitem action='set-mouse-mode-timefx'/> - </menu> + <menuitem action='About'/> </menu> </menubar> |