X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour.menus.in;h=27c030669ef73c14cd00d5fd1d69e552ebdae532;hb=b75a38089be96109cec2943dbd10902df048bc8b;hp=c60972495755d868804f9823a149f823e2eb71b9;hpb=915a840119132b7994e25796859d3bcdd6f9a775;p=ardour.git

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index c609724957..27c030669e 100644
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -8,8 +8,11 @@
       <separator/>
       <menuitem action='Save'/>
       <menuitem action='SaveAs'/>
+#ifndef WINDOWS // can't move open files.
       <menuitem action='Rename'/>
-      <menuitem action='Snapshot'/>
+      <menuitem action='SnapshotStay'/>
+      <menuitem action='SnapshotSwitch'/>
+#endif
       <menuitem action='SaveTemplate'/>
       <menu name='Metadata' action='Metadata'>
         <menuitem action='EditMetadata'/>
@@ -19,6 +22,9 @@
       <menuitem action='AddTrackBus'/>	
       <separator/>
       <menuitem action='addExistingAudioFiles'/>
+#ifdef PTFORMAT
+      <menuitem action='addExistingPTFiles'/>
+#endif
       <!--menuitem action='importFromSession'/-->
 
       <menuitem action='OpenVideo'/>
@@ -29,8 +35,8 @@
         <menuitem action='StemExport'/>
         <menuitem action='ExportVideo'/>
       </menu>
-      <menuitem action='bring-into-session'/>
       <menu name='Cleanup' action='Cleanup'>
+		<menuitem action='bring-into-session'/>
         <menuitem action='CleanupUnused'/>
         <menuitem action='FlushWastebasket'/>
       </menu>
@@ -51,28 +57,23 @@
     <menu name='Transport' action='Transport'>
       <menuitem action='ToggleRoll'/>
       <menu action="PlayMenu">
-        <menuitem action='main-menu-play-selected-regions'/>
-        <menuitem action='play-edit-range'/>
         <menuitem action='PlaySelection'/>
         <menuitem action='PlayPreroll'/>
+        <menuitem action='ToggleRollMaybe'/>
         <menuitem action='play-from-edit-point-and-return'/>
         <menuitem action='Loop'/>
       </menu>
       <menuitem action='record-roll'/>
-      <menuitem action='Record'/>
-      <menuitem action='ToggleRollMaybe'/>
       <menuitem action='ToggleRollForgetCapture'/>
+      <menuitem action='Record'/>
 #if 0
       <menuitem action='toggle-skip-playback'/>
 #endif
-      <menu action="SetLoopMenu">
-        <menuitem action='set-loop-from-edit-range'/>
-        <menuitem action='set-loop-from-region'/>
-      </menu>
-      <menu action="SetPunchMenu">
-        <menuitem action='set-punch-from-edit-range'/>
-        <menuitem action='set-punch-from-region'/>
-      </menu>
+
+      <separator/>
+      <menuitem action='set-loop-from-edit-range'/>
+      <menuitem action='set-punch-from-edit-range'/>
+      <menuitem action='set-session-from-edit-range'/>
 
       <separator/>
       <menuitem action='Forward'/>
@@ -132,6 +133,9 @@
         <menuitem action='goto-mark-7'/>
         <menuitem action='goto-mark-8'/>
         <menuitem action='goto-mark-9'/>
+        <separator/>
+		<menuitem action='set-session-start-from-playhead'/>
+		<menuitem action='set-session-end-from-playhead'/>
       </menu>
 
       <separator/>
@@ -145,6 +149,7 @@
       <menuitem action='ToggleAutoReturn'/>
       <menuitem action='ToggleClick'/>
       <menuitem action='toggle-follow-playhead'/>
+      <menuitem action='toggle-stationary-playhead'/>
       <menuitem action='ToggleFollowEdits'/>
       <menuitem action='panic'/>
      <separator/>
@@ -166,7 +171,12 @@
         <menuitem action='select-all-tracks'/>
         <menuitem action='deselect-all'/>
         <menuitem action='invert-selection'/>
-        <menuitem action='select-all-after-edit-cursor'/>
+        <separator/>
+	<menuitem action='select-loop-range'/>
+	<menuitem action='select-punch-range'/>
+	<menuitem action='select-from-regions'/>
+        <separator/>
+	<menuitem action='select-all-after-edit-cursor'/>
         <menuitem action='select-all-before-edit-cursor'/>
         <menuitem action='select-all-between-cursors'/>
         <menuitem action='select-all-within-cursors'/>
@@ -188,10 +198,8 @@
       <menuitem action='editor-delete'/>
       <menuitem action='editor-crop'/>
       <menuitem action='split-region'/>
-      <menuitem action='split-region-at-transients'/>
       <menu action="SeparateMenu">
         <menuitem action='separate-under-region'/>
-        <menuitem action='editor-separate'/>
         <menuitem action='separate-from-loop'/>
         <menuitem action='separate-from-punch'/>
         <separator/>
@@ -205,6 +213,7 @@
         <menuitem action='align-regions-sync-relative'/>
       </menu>
       <menu action="FadeMenu">
+        <menuitem action='editor-fade-range'/>
         <menuitem action='set-fade-in-length'/>
         <menuitem action='toggle-region-fade-in'/>
         <menuitem action='set-fade-out-length'/>
@@ -217,6 +226,49 @@
         <menuitem action='cycle-edit-point'/>
         <menuitem action='cycle-edit-point-with-marker'/>
       </menu>
+      <menu name='SnapMode' action='SnapMode'>
+        <menuitem action='snap-off'/>
+        <menuitem action='snap-normal'/>
+        <menuitem action='snap-magnetic'/>
+        <separator/>
+        <menuitem action='cycle-snap-mode'/>
+        <menuitem action='next-snap-choice'/>
+        <menuitem action='prev-snap-choice'/>
+        <menuitem action='next-snap-choice-music-only'/>
+        <menuitem action='prev-snap-choice-music-only'/>
+      </menu>
+      <menu name='SnapTo' action='SnapTo'>
+        <menuitem action='snap-to-cd-frame'/>
+        <menuitem action='snap-to-timecode-frame'/>
+        <menuitem action='snap-to-timecode-seconds'/>
+        <menuitem action='snap-to-timecode-minutes'/>
+        <menuitem action='snap-to-seconds'/>
+        <menuitem action='snap-to-minutes'/>
+        <menuitem action='snap-to-onetwentyeighths'/>
+        <menuitem action='snap-to-sixtyfourths'/>
+        <menuitem action='snap-to-thirtyseconds'/>
+        <menuitem action='snap-to-twentyeighths'/>
+        <menuitem action='snap-to-twentyfourths'/>
+        <menuitem action='snap-to-twentieths'/>
+        <menuitem action='snap-to-asixteenthbeat'/>
+        <menuitem action='snap-to-fourteenths'/>
+        <menuitem action='snap-to-twelfths'/>
+        <menuitem action='snap-to-tenths'/>
+        <menuitem action='snap-to-eighths'/>
+        <menuitem action='snap-to-sevenths'/>
+        <menuitem action='snap-to-sixths'/>
+        <menuitem action='snap-to-fifths'/>
+        <menuitem action='snap-to-quarters'/>
+        <menuitem action='snap-to-thirds'/>
+        <menuitem action='snap-to-halves'/>
+        <menuitem action='snap-to-beat'/>
+        <menuitem action='snap-to-bar'/>
+        <menuitem action='snap-to-mark'/>
+        <menuitem action='snap-to-region-start'/>
+        <menuitem action='snap-to-region-end'/>
+        <menuitem action='snap-to-region-sync'/>
+        <menuitem action='snap-to-region-boundary'/>
+      </menu>
       <separator/>
       <menu action="TempoMenu">
         <menuitem action='set-tempo-from-region'/>
@@ -235,12 +287,12 @@
       <menuitem action='loop-region'/>
       <menuitem action='rename-region'/>
       <menuitem action='show-region-properties'/>
+      <menuitem action='analyze-region'/>
       <menu action='RegionMenuEdit'>
          <menuitem action='combine-regions'/>
          <menuitem action='uncombine-regions'/>
-         <menuitem action='analyze-region'/>
          <menuitem action='pitch-shift-region'/>
-         <menuitem action='split-region'/>
+         <menuitem action='split-region-at-transients'/>
          <menuitem action='split-multichannel-region'/>
          <menuitem action='close-region-gaps'/>
          <menuitem action='place-transient' />
@@ -326,10 +378,11 @@
       <menuitem action='track-mute-toggle'/>
       <separator/>
       <menuitem action='insert-time'/>
+      <menuitem action='remove-time'/>
       <menuitem action="move-selected-tracks-up"/>
       <menuitem action="move-selected-tracks-down"/>
       <menu action='TrackHeightMenu'>
-        <menuitem action='fit-tracks'/>
+        <menuitem action='fit-selection'/>
         <menuitem action='track-height-largest'/>
         <menuitem action='track-height-larger'/>
         <menuitem action='track-height-large'/>
@@ -370,7 +423,7 @@
         <menuitem action='temporal-zoom-out'/>
         <menuitem action='zoom-to-session'/>
         <menuitem action='zoom-to-selection'/>
-        <menuitem action='zoom-to-selection-both-axes'/>
+        <menuitem action='fit-selection'/>
         <menuitem action='toggle-zoom'/>
         <menuitem action='expand-tracks'/>
         <menuitem action='shrink-tracks'/>
@@ -384,57 +437,16 @@
         <menuitem action='zoom-focus-edit'/>
         <menuitem action='cycle-zoom-focus'/>
       </menu>
-      <menu name='SnapMode' action='SnapMode'>
-        <menuitem action='snap-off'/>
-        <menuitem action='snap-normal'/>
-        <menuitem action='snap-magnetic'/>
-        <separator/>
-        <menuitem action='cycle-snap-mode'/>
-        <menuitem action='next-snap-choice'/>
-        <menuitem action='prev-snap-choice'/>
-        <menuitem action='next-snap-choice-music-only'/>
-        <menuitem action='prev-snap-choice-music-only'/>
-      </menu>
-      <menu name='SnapTo' action='SnapTo'>
-        <menuitem action='snap-to-cd-frame'/>
-        <menuitem action='snap-to-timecode-frame'/>
-        <menuitem action='snap-to-timecode-seconds'/>
-        <menuitem action='snap-to-timecode-minutes'/>
-        <menuitem action='snap-to-seconds'/>
-        <menuitem action='snap-to-minutes'/>
-        <menuitem action='snap-to-onetwentyeighths'/>
-        <menuitem action='snap-to-sixtyfourths'/>
-        <menuitem action='snap-to-thirtyseconds'/>
-        <menuitem action='snap-to-twentyeighths'/>
-        <menuitem action='snap-to-twentyfourths'/>
-        <menuitem action='snap-to-twentieths'/>
-        <menuitem action='snap-to-asixteenthbeat'/>
-        <menuitem action='snap-to-fourteenths'/>
-        <menuitem action='snap-to-twelfths'/>
-        <menuitem action='snap-to-tenths'/>
-        <menuitem action='snap-to-eighths'/>
-        <menuitem action='snap-to-sevenths'/>
-        <menuitem action='snap-to-sixths'/>
-        <menuitem action='snap-to-fifths'/>
-        <menuitem action='snap-to-quarters'/>
-        <menuitem action='snap-to-thirds'/>
-        <menuitem action='snap-to-halves'/>
-        <menuitem action='snap-to-beat'/>
-        <menuitem action='snap-to-bar'/>
-        <menuitem action='snap-to-mark'/>
-        <menuitem action='snap-to-region-start'/>
-        <menuitem action='snap-to-region-end'/>
-        <menuitem action='snap-to-region-sync'/>
-        <menuitem action='snap-to-region-boundary'/>
-      </menu>
 
       <menu action="RulerMenu">
         <menuitem action="toggle-minsec-ruler"/>
+        <menuitem action="toggle-timecode-ruler"/>
         <menuitem action="toggle-samples-ruler"/>
         <menuitem action="toggle-bbt-ruler"/>
         <separator/>
         <menuitem action="toggle-meter-ruler"/>
         <menuitem action="toggle-tempo-ruler"/>
+        <menuitem action="toggle-range-ruler"/>
         <menuitem action="toggle-loop-punch-ruler"/>
         <menuitem action="toggle-cd-marker-ruler"/>
         <menuitem action="toggle-marker-ruler"/>
@@ -494,9 +506,6 @@
       <menuitem action='ToggleGroupTabs'/>
       <menuitem action='show-marker-lines'/>
 
-      <separator/>
-      <menuitem action='show-ui-prefs'/>
-
     </menu>
     <menu action = 'WindowMenu'>
       <menuitem action='toggle-audio-midi-setup'/>