a big menu cleanup; vertical auto-scrolling; some code cleanups; an unfinished (and broken) attempt to get escape to break out of a drag-in-progress

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3185 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 258 insertions, 188 deletions

diff --git a/gtk2_ardour/ardour.menus b/gtk2_ardour/ardour.menus
index 3f24ffb96b..f375e61c99 100644
--- a/gtk2_ardour/ardour.menus
+++ b/gtk2_ardour/ardour.menus
@@ -28,180 +28,228 @@
            <separator/>
            <menuitem action='Quit'/>
         </menu>
+
         <menu name='Transport' action='Transport'>
                <menuitem action='ToggleRoll'/>
-               <menuitem action='play-from-edit-point-and-return'/>
-               <menuitem action='play-edit-range'/>
+	       <menu action="PlayMenu">
+	       	     <menuitem action='play-selected-regions'/>
+		     <menuitem action='play-edit-range'/>
+                     <menuitem action='play-from-edit-point-and-return'/>
+		     <menuitem action='Loop'/>
+  	       </menu>
                <menuitem action='record-roll'/>
+               <menuitem action='Record'/>
                <menuitem action='ToggleRollForgetCapture'/>
-               <menuitem action='Loop'/>
-               <menuitem action='loop-region'/>
-               <menuitem action='PlaySelection'/>
-               <menuitem action='play-edit-range'/>
+	       <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='Forward'/>
                <menuitem action='Rewind'/>
-               <menuitem action='GotoZero'/>
-               <menuitem action='GotoStart'/>
-               <menuitem action='GotoEnd'/>
-	       <separator/>
-               <menuitem action='tab-to-transient-forwards'/>
-               <menuitem action='tab-to-transient-backwards'/>
-               <menuitem action='nudge-playhead-forward'/>
-               <menuitem action='nudge-playhead-backward'/>
-	       <separator/>
-               <menuitem action='Record'/>
-               <separator/> 
                <menuitem action='TransitionToRoll'/>
                <menuitem action='TransitionToReverse'/>
-               <separator/> 
-               <menuitem action='jump-forward-to-mark'/>
-               <menuitem action='jump-backward-to-mark'/>
-               <menuitem action='add-location-from-playhead'/>
-               <separator/> 
-               <menuitem action='playhead-to-next-region-boundary'/>
-               <menuitem action='playhead-to-previous-region-boundary'/>
-               <menuitem action='playhead-to-next-region-sync'/>
-               <menuitem action='playhead-to-previous-region-sync'/>
-               <menuitem action='center-playhead'/>
-               <menuitem action='playhead-to-edit'/>
-               <separator/>       
-               <menuitem action='playhead-to-range-start'/>
-               <menuitem action='playhead-to-range-end'/>
-               <menuitem action='focus-on-clock'/>
-	       <menu action='LocateToMarker'>
-			<menuitem action='goto-mark-1'/>
-			<menuitem action='goto-mark-2'/>
-			<menuitem action='goto-mark-3'/>
-			<menuitem action='goto-mark-4'/>
-			<menuitem action='goto-mark-5'/>
-			<menuitem action='goto-mark-6'/>
-			<menuitem action='goto-mark-7'/>
-			<menuitem action='goto-mark-8'/>
-			<menuitem action='goto-mark-9'/>
+	       <separator/>
+
+              
+	       <menu action="MovePlayHeadMenu">
+		   <menuitem action='set-playhead'/>
+                   <menuitem action='playhead-to-edit'/>
+  	           <menuitem action='center-playhead'/>
+	           <separator/>
+ 		   <menuitem action='nudge-playhead-forward'/>
+                   <menuitem action='nudge-playhead-backward'/>
+		   <separator/>
+                   <menuitem action='tab-to-transient-forwards'/>
+                   <menuitem action='tab-to-transient-backwards'/>
+	           <separator/>
+		   <menuitem action='playhead-forward-to-grid'/>
+		   <menuitem action='playhead-backward-to-grid'/>
+	           <separator/>
+		   <menuitem action='playhead-to-next-region-boundary'/>
+		   <menuitem action='playhead-to-previous-region-boundary'/>
+		   <menuitem action='playhead-to-next-region-sync'/>
+		   <menuitem action='playhead-to-previous-region-sync'/>
+		   <separator/>
+		   <menuitem action='jump-forward-to-mark'/>
+		   <menuitem action='jump-backward-to-mark'/>
+		   <separator/>
+		   <menuitem action='GotoZero'/>
+		   <menuitem action='GotoStart'/>
+		   <menuitem action='GotoEnd'/>
 	       </menu>
-               <menu action='TransportOptions'>
-                    <menuitem action='ToggleTimeMaster'/>
-                    <menuitem action='TogglePunchIn'/>
-                    <menuitem action='TogglePunchOut'/>
-                    <menuitem action='ToggleAutoInput'/>
-                    <menuitem action='ToggleAutoPlay'/>
-                    <menuitem action='ToggleAutoReturn'/>
-                    <menuitem action='ToggleClick'/>
-                    <menuitem action='toggle-follow-playhead'/>
-                    <menuitem action='ToggleVideoSync'/>
-               </menu>
-	       <menuitem action='set-loop-from-edit-range'/>
-	       <menuitem action='set-loop-from-region'/>
-	       <menuitem action='set-punch-from-edit-range'/>
-	       <menuitem action='set-punch-from-region'/>
+
+	       <menu action="MoveActiveMarkMenu">
+                   <menuitem action='selected-marker-to-next-region-boundary'/>
+    	           <menuitem action='selected-marker-to-previous-region-boundary'/>
+	           <menuitem action='edit-cursor-to-next-region-sync'/>
+    	           <menuitem action='edit-cursor-to-previous-region-sync'/>
+		   <separator/>
+            	   <menuitem action='edit-to-playhead'/>
+		   <menuitem action='set-edit-point'/>
+	       </menu>
+
+	       <menu action="MarkerMenu">
+	       	   <menuitem action='add-location-from-playhead'/>
+		   <separator/>
+		   <menuitem action='goto-mark-1'/>
+		   <menuitem action='goto-mark-2'/>
+		   <menuitem action='goto-mark-3'/>
+		   <menuitem action='goto-mark-4'/>
+		   <menuitem action='goto-mark-5'/>
+		   <menuitem action='goto-mark-6'/>
+		   <menuitem action='goto-mark-7'/>
+		   <menuitem action='goto-mark-8'/>
+		   <menuitem action='goto-mark-9'/>
+	       </menu>
+
+	       <separator/>
+	       <menuitem action='ToggleTimeMaster'/>
+               <menuitem action='TogglePunch'/>
+               <menuitem action='TogglePunchIn'/>
+               <menuitem action='TogglePunchOut'/>
+               <menuitem action='ToggleAutoInput'/>
+               <menuitem action='ToggleAutoPlay'/>
+               <menuitem action='ToggleAutoReturn'/>
+               <menuitem action='ToggleClick'/>
+               <menuitem action='toggle-follow-playhead'/>
+	       <separator/>
        </menu>
+
        <menu name='Edit' action='Edit'>
                <menuitem action='undo'/>
                <menuitem action='redo'/>
                <menuitem action='editor-cut'/>
-               <menuitem action='editor-delete'/>
                <menuitem action='editor-copy'/>
                <menuitem action='editor-paste'/>
                <separator/>       
-               <menuitem action='editor-separate'/>
-               <menuitem action='editor-crop'/>
-               <menuitem action='split-region'/>
-               <separator/>       
-	       <menuitem action='remove-last-capture'/>
-               <separator/>       
-	       <menu action='EditCursorMovementOptions'>
-                   <menuitem action='edit-cursor-to-next-region-start'/>
-    	           <menuitem action='edit-cursor-to-next-region-end'/>
-       	           <menuitem action='edit-cursor-to-previous-region-start'/>
-            	   <menuitem action='edit-cursor-to-previous-region-end'/>
-	           <menuitem action='edit-cursor-to-next-region-sync'/>
-    	           <menuitem action='edit-cursor-to-previous-region-sync'/>
-        	   <menuitem action='center-edit-cursor'/>
-            	   <menuitem action='edit-to-playhead'/>
-    	           <menuitem action='edit-cursor-to-range-start'/>
-	           <menuitem action='edit-cursor-to-range-end'/>
-	       </menu>
-  	      <menuitem action='set-tempo-from-region'/>
-		   <menuitem action='set-tempo-from-edit-range'/>
-	       <menu action='KeyMouseActions'>
-	       		<menuitem action='play-selected-regions'/>
-               		<menuitem action='brush-at-mouse'/>
-               		<menuitem action='set-edit-point'/>
-               		<menuitem action='mute-unmute-region'/>
-              	 	<menuitem action='set-playhead'/>
-	       		<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'/>
-			<separator/>
-			<menuitem action='cycle-edit-point'/>
-			<menuitem action='cycle-edit-point-with-marker'/>
-			<menuitem action='toggle-edit-mode'/>
-			<separator/>
-			<menuitem action='boost-region-gain'/>
-			<menuitem action='cut-region-gain'/>
-          </menu>
-        </menu>         
-	<menu name='Select' action='Select'>
+	       <menu action="SelectMenu">	   
+	           <menuitem action='select-all'/>
+		   <menuitem action='deselect-all'/>
+		   <menuitem action='invert-selection'/>
+		   <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'/>
+		   <menuitem action='select-all-in-punch-range'/>
+		   <menuitem action='select-all-in-loop-range'/>
+		   <separator/>
                    <menuitem action='select-range-between-cursors'/>
                    <menuitem action='extend-range-to-start-of-region'/>
                    <menuitem action='extend-range-to-end-of-region'/>
                    <menuitem action='start-range'/>
                    <menuitem action='finish-range'/>
                    <menuitem action='finish-add-range'/>
-		   <separator/>
-                   <menuitem action='select-all'/>
-                   <menuitem action='deselect-all'/>
-	           <menuitem action='invert-selection'/>
-                   <menuitem action='select-all-after-edit-cursor'/>
-                   <menuitem action='select-all-before-edit-cursor'/>
-                   <menuitem action='select-all-after-playhead'/>
-                   <menuitem action='select-all-before-playhead'/>
-                   <menuitem action='select-all-between-cursors'/>
-                   <menuitem action='select-all-within-cursors'/>
-                   <menuitem action='select-all-in-punch-range'/>
-                   <menuitem action='select-all-in-loop-range'/>
-		   <separator/>
-                   <menuitem action='select-next-route'/>
-                   <menuitem action='select-prev-route'/>
-	</menu>
-	<menu action='RegionMenu'>
-                   <menuitem action='split-region-at-transients'/>
-                   <menuitem action='crop'/>
-                   <menuitem action='duplicate-region'/>
-                   <menuitem action='multi-duplicate-region'/>
-                   <menuitem action='insert-region'/>
-               	   <menuitem action='normalize-region'/>
-                   <separator/>       
-	           <menuitem action="nudge-forward"/>
-	           <menuitem action="nudge-backward"/>
-        	   <menuitem action='split-region'/>
-	       	   <menuitem action='set-region-sync-position'/>
-                   <separator/>       
+	       </menu>	   
+	       <separator/>
+               <menuitem action='editor-delete'/>
+               <menuitem action='editor-crop'/>
+               <menuitem action='split-region'/>
+	       <menu action="SeparateMenu">
+	            <menuitem action='editor-separate'/>
+	            <menuitem action='separate-from-loop'/>
+	            <menuitem action='separate-from-punch'/>
+		    <separator/>
+		    <menuitem action='split-region-at-transients'/>
+               </menu>
+	       <menu action="AlignMenu">
 		   <menuitem action='align-regions-start'/>
 		   <menuitem action='align-regions-start-relative'/>
 		   <menuitem action='align-regions-end'/>
 		   <menuitem action='align-regions-end-relative'/>
 		   <menuitem action='align-regions-sync'/>
 		   <menuitem action='align-regions-sync-relative'/>
-                   <separator/>       
-		   <menuitem action='set-fade-in-length'/>
-		   <menuitem action='set-fade-out-length'/>
-		   <menuitem action='toggle-fade-in-active'/>
-		   <menuitem action='toggle-fade-out-active'/>
-                   <separator/>       
-		   <menuitem action='trim-back'/>
+               </menu>
+	       <menu action="NudgeRegionMenu">
+	           <menuitem action="nudge-forward"/>
+	           <menuitem action="nudge-backward"/>
+               </menu>
+	       <menu action="TrimMenu">
 		   <menuitem action='trim-front'/>
-		   <menuitem action='trim-from-start'/>
-		   <menuitem action='trim-to-end'/>
+		   <menuitem action='trim-back'/>
+		   <menuitem action='crop'/>
 		   <menuitem action='trim-region-to-loop'/>
 		   <menuitem action='trim-region-to-punch'/>
+	       </menu>
+	       <menu action="FadeMenu">
+		   <menuitem action='set-fade-in-length'/>
+		   <menuitem action='toggle-fade-in-active'/>
+		   <menuitem action='set-fade-out-length'/>
+		   <menuitem action='toggle-fade-out-active'/>
+               </menu>
+               <separator/>       
+	       <menuitem action='remove-last-capture'/>
+	       <separator/>
+	       <menu action='KeyMouseActions'>
+                   <menuitem action='select-next-route'/>
+                   <menuitem action='select-prev-route'/>
+		   <menuitem action='brush-at-mouse'/>
+		   <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'/>
+		   <separator/>
+		   <menuitem action='cycle-edit-point'/>
+		   <menuitem action='cycle-edit-point-with-marker'/>
+		   <menuitem action='toggle-edit-mode'/>
 		   <separator/>
-		   <menuitem action='pitch-shift-region'/>
+		   <menuitem action='boost-region-gain'/>
+		   <menuitem action='cut-region-gain'/>
+		   <separator/>
+		   <menuitem action='break-drag'/>
+             </menu>
+        </menu>         
+
+	<menu action='RegionMenu'>
+	      <menuitem action='insert-region'/>
+	      <menuitem action='rename-region'/>
+	      <menuitem action='auto-rename-region'/>
+	      <menuitem action='raise-region'/>
+	      <menuitem action='lower-region'/>
+	      <menuitem action='naturalize-region'/>
+	      <menuitem action='lock-region'/>
+	      <menuitem action='set-region-sync-position'/>
+	      <menuitem action='remove-region-sync'/>
+              <menuitem action='mute-unmute-region'/>
+	      <separator/>       
+              <menuitem action='reverse-region'/>    
+	      <menuitem action='monoize-region'/>
+	      <menuitem action='normalize-region'/>
+	      <menuitem action='boost-region-gain'/>
+	      <menuitem action='cut-region-gain'/>      		   
+	      <menuitem action='pitch-shift-region'/>
+	      <separator/>
+	      <menuitem action='duplicate-region'/>
+	      <menuitem action='multi-duplicate-region'/>
+	      <menuitem action='region-fill-track'/>
+	</menu>
+
+        <menu action='TrackMenu'>
+	        <menuitem action='AddTrackBus'/>	
+	        <menu action='TrackHeightMenu'>
+		     <menuitem action='track-height-largest'/>
+		     <menuitem action='track-height-large'/>
+		     <menuitem action='track-height-larger'/>
+		     <menuitem action='track-height-normal'/>
+		     <menuitem action='track-height-smaller'/>
+		     <menuitem action='track-height-small'/>
+		</menu>
+		<menu action='WaveformMenu'>
+		      <menuitem action='toggle-waveform-visible'/>
+		      <menuitem action='linear-waveforms'/>
+		      <menuitem action='logarithmic-waveforms'/>
+		</menu>
+		<menuitem action='toggle-track-active'/>	
+		<menuitem action='remove-track'/>	
 	</menu>
+
         <menu name='View' action = 'View'>
                <menu name='ZoomFocus' action='ZoomFocus'>
                    <menuitem action='zoom-focus-left'/>
@@ -254,33 +302,50 @@
                    <menuitem action='MeterHoldMedium'/>
                    <menuitem action='MeterHoldLong'/>
                </menu>
+	       <menu action="PrimaryClockMenu">
+	       	     <menuitem action="primary-clock-bbt"/>
+	       	     <menuitem action="primary-clock-minsec"/>
+	       	     <menuitem action="primary-clock-samples"/>
+	       	     <menuitem action="primary-clock-off"/>
+	       </menu>
+	       <menu action="SecondaryClockMenu">
+	       	     <menuitem action="secondary-clock-bbt"/>
+	       	     <menuitem action="secondary-clock-minsec"/>
+	       	     <menuitem action="secondary-clock-samples"/>
+	       	     <menuitem action="secondary-clock-off"/>
+	       </menu>
+	       <menu action="RulerMenu">
+	       	     <menuitem action="toggle-minsec-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-loop-punch-ruler"/>
+	       	     <menuitem action="toggle-cd-marker-ruler"/>
+	       	     <menuitem action="toggle-marker-ruler"/>
+	       </menu>
+	       <menu action="ZoomMenu">
+               	     <menuitem action='temporal-zoom-in'/>
+               	     <menuitem action='temporal-zoom-out'/>
+               	     <menuitem action='zoom-to-session'/>
+               	     <menuitem action='zoom-to-region'/>
+               	     <menuitem action='toggle-zoom'/>
+	       </menu>
+	       <menu action="ScrollMenu">
+               	     <menuitem action='scroll-tracks-down'/>
+               	     <menuitem action='scroll-tracks-up'/>
+               	     <menuitem action='scroll-forward'/>
+               	     <menuitem action='scroll-backward'/>
+	       </menu>
 
-               <separator/>
-
-               <menuitem action='temporal-zoom-in'/>
-               <menuitem action='temporal-zoom-out'/>
-               <menuitem action='zoom-to-session'/>
-               <menuitem action='zoom-to-region'/>
-               <menuitem action='toggle-zoom'/>
-               <menuitem action='scroll-tracks-down'/>
-               <menuitem action='scroll-tracks-up'/>
-               <menuitem action='scroll-tracks-down'/>
-               <menuitem action='step-tracks-up'/>
-               <menuitem action='step-tracks-down'/>
-   	       <separator/>
-               <menuitem action='scroll-forward'/>
-               <menuitem action='scroll-backward'/>
-   	       <separator/>
-               <menuitem action='scroll-playhead-forward'/>
-               <menuitem action='scroll-playhead-backward'/>
-   	       <separator/>
+	       <menuitem action='ToggleMaximalEditor'/>
+	       <menuitem action='show-editor-mixer'/>
+               <menuitem action='ToggleMeasureVisibility'/>
                <menuitem action='toggle-waveform-visible'/>
                <menuitem action='ToggleWaveformsWhileRecording'/>
-               <menuitem action='ToggleMeasureVisibility'/>
-	       <separator/>
-	       <menuitem action='show-editor-mixer'/>
 	       <menuitem action='SyncEditorAndMixerTrackOrder'/>
-         </menu>
+        </menu>
         <menu name='JACK' action='JACK'>
                <menuitem action='JACKDisconnect'/>
                <menuitem action='JACKReconnect'/>
@@ -324,6 +389,15 @@
 		        <menuitem action='FileHeaderFormatCAF'/>
 		   </menu>
                </menu>
+	       <menu action='SyncMenu'>
+               	     <menuitem action='SendMTC'/>
+               	     <menuitem action='SendMMC'/>
+               	     <menuitem action='UseMMC'/>
+	       </menu>
+	       <menu action="TempoMenu">
+	       	      <menuitem action='set-tempo-from-region'/>
+		      <menuitem action='set-tempo-from-edit-range'/>
+	       </menu>
 	       <menu action='Timecode'>
 		   <menuitem action='Smpte23976'/>
 		   <menuitem action='Smpte24'/>
@@ -419,31 +493,27 @@
 	              <menuitem action='DenormalFTZDAZ'/>
                </menu>
                <separator/>
-               <menuitem action='SendMTC'/>
-               <menuitem action='SendMMC'/>
-               <menuitem action='UseMMC'/>
-               <separator/>
-               <menuitem action='UseOSC'/>
-               <menuitem action='StopPluginsWithTransport'/>
-               <menuitem action='DoNotRunPluginsWhileRecording'/>
-               <menuitem action='LatchedRecordEnable'/>
-               <menuitem action='RegionEquivalentsOverlap'/>
-               <separator/>
-               <menuitem action='PeriodicSafetyBackups'/>
-               <menuitem action='VerifyRemoveLastCapture'/>
-               <menuitem action='StopRecordingOnXrun'/>
-				<menuitem action='CreateXrunMarker'/>
-               <menuitem action='StopTransportAtEndOfSession'/>
-               <menuitem action='GainReduceFastTransport'/>
-	       <menuitem action='PrimaryClockDeltaEditCursor'/>
-	       <menuitem action='SecondaryClockDeltaEditCursor'/>
-	       <menuitem action='OnlyCopyImportedFiles'/>
-    	       <menuitem action='ShowTrackMeters'/>
-	       <menuitem action='DefaultNarrowMS'/>
-               <menuitem action='link-region-and-track-selection'/>
-               <menuitem action='RubberbandingSnapsToGrid'/>
-			
-	       <separator/>
+	       <menu action='MiscOptions'>
+               	     <menuitem action='UseOSC'/>
+               	     <menuitem action='StopPluginsWithTransport'/>
+               	     <menuitem action='DoNotRunPluginsWhileRecording'/>
+               	     <menuitem action='LatchedRecordEnable'/>
+               	     <menuitem action='RegionEquivalentsOverlap'/>
+               	     <menuitem action='PeriodicSafetyBackups'/>
+               	     <menuitem action='VerifyRemoveLastCapture'/>
+               	     <menuitem action='StopRecordingOnXrun'/>
+		     <menuitem action='CreateXrunMarker'/>
+		     <menuitem action='StopTransportAtEndOfSession'/>
+		     <menuitem action='GainReduceFastTransport'/>
+	       	     <menuitem action='PrimaryClockDeltaEditCursor'/>
+	       	     <menuitem action='SecondaryClockDeltaEditCursor'/>
+	       	     <menuitem action='OnlyCopyImportedFiles'/>
+    	       	     <menuitem action='ShowTrackMeters'/>
+	       	     <menuitem action='DefaultNarrowMS'/>
+               	     <menuitem action='link-region-and-track-selection'/>
+               	     <menuitem action='RubberbandingSnapsToGrid'/>
+               	     <menuitem action='AutoAnalyseAudio'/>
+		</menu>
          </menu>
 	 <menu name='Help' action='Help'>
 	     <menuitem action='About'/>