first round of menu refactoring

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

1 files changed, 161 insertions, 165 deletions

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index a389a1fc1a..25958a3023 100644
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -26,10 +26,6 @@
                <menuitem action='FlushWastebasket'/>
            </menu>
            <separator/>
-#ifdef GTKOSX
-           <menuitem action='ToggleOptionsEditor'/>
-           <menuitem action='About'/>
-#endif
            <menuitem action='Quit'/>
         </menu>
 
@@ -130,41 +126,41 @@
        </menu>
 
        <menu name='Edit' action='Edit'>
-               <menuitem action='undo'/>
-               <menuitem action='redo'/>
-               <menuitem action='editor-cut'/>
-               <menuitem action='editor-copy'/>
-               <menuitem action='editor-paste'/>
-               <separator/>       
+		   <menuitem action='undo'/>
+		   <menuitem action='redo'/>
+		   <menuitem action='editor-cut'/>
+		   <menuitem action='editor-copy'/>
+		   <menuitem action='editor-paste'/>
+		   <menuitem action='editor-delete'/>
+		   <menuitem action='editor-crop'/>
+		   <menuitem action='split-region'/>
+		   <separator/>       
 	       <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'/>
+			   <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'/>
+			   <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'/>
 	       </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>
+				<separator/>
+				<menuitem action='split-region-at-transients'/>
+           </menu>
 	       <menu action="AlignMenu">
 		   <menuitem action='align-regions-start'/>
 		   <menuitem action='align-regions-start-relative'/>
@@ -185,43 +181,77 @@
 		   <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'/>
+			   <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/>
-	       <menu action='KeyMouseActions'>
-                   <menuitem action='select-next-route'/>
-                   <menuitem action='select-prev-route'/>
-		   <menuitem action='brush-at-mouse'/>
-		   <separator/>
-		   <menuitem action='step-mouse-mode'/>
-		   <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'/>
+	       <menu action="TempoMenu">
+	       	      <menuitem action='set-tempo-from-region'/>
+		      <menuitem action='set-tempo-from-edit-range'/>
+	       </menu>
+           <separator/>
+		   <menuitem action='select-next-route'/>
+		   <menuitem action='select-prev-route'/>
 		   <separator/>
-		   <menuitem action='boost-region-gain'/>
-		   <menuitem action='cut-region-gain'/>
+		   <menuitem action='brush-at-mouse'/>
 		   <separator/>
 		   <menuitem action='break-drag'/>
-             </menu>
-#ifndef GTKOSX
-	     <separator/>
-             <menuitem action='ToggleOptionsEditor'/>
-#endif
-        </menu>         
+           <separator/>       
+	       <menuitem action='remove-last-capture'/>
+	       <separator/>
+	       <menu action='KeyMouseActions'>
+ 		   	   <separator/>
+			   <menuitem action='cycle-edit-point'/>
+			   <menuitem action='cycle-edit-point-with-marker'/>
+		   	   <separator/>
+			   <menuitem action='toggle-edit-mode'/>
+			   <separator/>
+			   <menu name='MouseMode' action='MouseMode'>
+			   <menuitem action='step-mouse-mode'/>
+			   <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>
+			   <separator/>
+			   <menu name='SnapMode' action='SnapMode'>
+			   <menuitem action='cycle-snap-mode'/>
+			   <separator/>
+			   <menuitem action='snap-off'/>
+			   <menuitem action='snap-normal'/>
+			   <menuitem action='snap-magnetic'/>
+			   </menu>
+				   <menu name='SnapTo' action='SnapTo'>
+			   <menuitem action='cycle-snap-choice'/>
+			   <separator/>
+			   <menuitem action='snap-to-cd-frame'/>
+			   <menuitem action='snap-to-smpte-frame'/>
+			   <menuitem action='snap-to-smpte-seconds'/>
+			   <menuitem action='snap-to-smpte-minutes'/>
+			   <menuitem action='snap-to-seconds'/>
+			   <menuitem action='snap-to-minutes'/>
+			   <menuitem action='snap-to-thirtyseconds'/>
+			   <menuitem action='snap-to-asixteenthbeat'/>
+			   <menuitem action='snap-to-eighths'/>
+			   <menuitem action='snap-to-quarters'/>
+			   <menuitem action='snap-to-thirds'/>
+			   <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>
+       </menu>         
 
 	<menu action='RegionMenu'>
 	      <menuitem action='insert-region'/>
+	      <separator/>       
 	      <menuitem action='rename-region'/>
 	      <menuitem action='raise-region'/>
 	      <menuitem action='lower-region'/>
@@ -293,49 +323,6 @@
                    <menuitem action='zoom-focus-edit'/>
                    <menuitem action='zoom-focus-mouse'/>
                </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='cycle-snap-choice'/>
-	       </menu>
-               <menu name='SnapTo' action='SnapTo'>
-		   <menuitem action='snap-to-cd-frame'/>
-		   <menuitem action='snap-to-smpte-frame'/>
-		   <menuitem action='snap-to-smpte-seconds'/>
-		   <menuitem action='snap-to-smpte-minutes'/>
-		   <menuitem action='snap-to-seconds'/>
-		   <menuitem action='snap-to-minutes'/>
-		   <menuitem action='snap-to-thirtyseconds'/>
-		   <menuitem action='snap-to-asixteenthbeat'/>
-		   <menuitem action='snap-to-eighths'/>
-		   <menuitem action='snap-to-quarters'/>
-		   <menuitem action='snap-to-thirds'/>
-		   <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 name='MeterFalloff' action='MeterFalloff'>
-                    <menuitem action='MeterFalloffOff'/>
-                    <menuitem action='MeterFalloffSlowest'/>
-                    <menuitem action='MeterFalloffSlow'/>
-                    <menuitem action='MeterFalloffMedium'/>
-                    <menuitem action='MeterFalloffFast'/>
-                    <menuitem action='MeterFalloffFaster'/>
-                    <menuitem action='MeterFalloffFastest'/>
-               </menu>
-               <menu name='MeterHold' action='MeterHold'>
-                   <menuitem action='MeterHoldOff'/>
-                   <menuitem action='MeterHoldShort'/>
-                   <menuitem action='MeterHoldMedium'/>
-                   <menuitem action='MeterHoldLong'/>
-               </menu>
 	       <menu action="PrimaryClockMenu">
 	       	     <menuitem action="primary-clock-bbt"/>
 	       	     <menuitem action="primary-clock-minsec"/>
@@ -400,6 +387,7 @@
 	       <menuitem action='SyncEditorAndMixerTrackOrder'/>
 	       <menuitem action='toggle-region-fades-visible'/>
         </menu>
+
         <menu name='JACK' action='JACK'>
                <menuitem action='JACKDisconnect'/>
                <menuitem action='JACKReconnect'/>
@@ -415,20 +403,26 @@
                    <menuitem action='JACKLatency8192'/>
                </menu>
         </menu>
+
         <menu action = 'WindowMenu'>
 	       <menuitem action='ToggleMaximalEditor'/>
 	       <separator/>
                <menuitem action='goto-editor'/>
                <menuitem action='goto-mixer'/>
                <menuitem action='toggle-editor-mixer-on-top'/>
+		       <separator/>
+               <menuitem action='ToggleBigClock'/>
+		       <separator/>
                <menuitem action='ToggleInspector'/>
                <menuitem action='ToggleLocations'/>
+               <menuitem action='toggle-rhythm-ferret'/>
+		       <separator/>
                <menuitem action='ToggleKeyEditor'/>
                <menuitem action='ToggleThemeManager'/>
-               <menuitem action='ToggleBigClock'/>
-               <menuitem action='toggle-rhythm-ferret'/>
+               <menuitem action='ToggleOptionsEditor'/>
    	       <separator/>
         </menu>
+
         <menu name='Options' action='Options'>
 	       <menu action='AudioFileFormat'>
                    <menu action='AudioFileFormatData'>
@@ -442,44 +436,49 @@
 		        <menuitem action='FileHeaderFormatWAVE64'/>
 		        <menuitem action='FileHeaderFormatCAF'/>
 		   </menu>
-               </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'/>
-		   <menuitem action='Smpte24976'/>
-		   <menuitem action='Smpte25'/>
-		   <menuitem action='Smpte2997'/>
-		   <menuitem action='Smpte2997drop'/>
-		   <menuitem action='Smpte30'/>
-		   <menuitem action='Smpte30drop'/>
-		   <menuitem action='Smpte5994'/>
-		   <menuitem action='Smpte60'/>
-               </menu>
-	       <menu action='Pullup'>
-		   <menuitem action='PullupPlus4Plus1'/>
-		   <menuitem action='PullupPlus4'/>
-		   <menuitem action='PullupPlus4Minus1'/>
-		   <menuitem action='PullupPlus1'/>
-		   <menuitem action='PullupNone'/>
-		   <menuitem action='PullupMinus1'/>
-		   <menuitem action='PullupMinus4Plus1'/>
-		   <menuitem action='PullupMinus4'/>
-		   <menuitem action='PullupMinus4Minus1'/>
-               </menu>
-	       <menu action='Subframes'>
-		   <menuitem action='Subframes80'/>
-		   <menuitem action='Subframes100'/>
+               <menuitem action='SendMTC'/>
+               <menuitem action='SendMMC'/>
+               <menuitem action='UseMMC'/>
+			   <separator/>
+			   <menu action='Timecode'>
+			   <menuitem action='Smpte23976'/>
+			   <menuitem action='Smpte24'/>
+			   <menuitem action='Smpte24976'/>
+			   <menuitem action='Smpte25'/>
+			   <menuitem action='Smpte2997'/>
+			   <menuitem action='Smpte2997drop'/>
+			   <menuitem action='Smpte30'/>
+			   <menuitem action='Smpte30drop'/>
+			   <menuitem action='Smpte5994'/>
+			   <menuitem action='Smpte60'/>
+				   </menu>
+			   <menu action='Pullup'>
+			   <menuitem action='PullupPlus4Plus1'/>
+			   <menuitem action='PullupPlus4'/>
+			   <menuitem action='PullupPlus4Minus1'/>
+			   <menuitem action='PullupPlus1'/>
+			   <menuitem action='PullupNone'/>
+			   <menuitem action='PullupMinus1'/>
+			   <menuitem action='PullupMinus4Plus1'/>
+			   <menuitem action='PullupMinus4'/>
+			   <menuitem action='PullupMinus4Minus1'/>
+				   </menu>
+			   <menu action='Subframes'>
+			   <menuitem action='Subframes80'/>
+			   <menuitem action='Subframes100'/>
+				   </menu>
+		   </menu>
+              <separator/>
+	       <menu action='ControlSurfaces'>
+                   <menuitem action='RemoteUserDefined'/>
+                   <menuitem action='RemoteMixerDefined'/>
+                   <menuitem action='RemoteEditorDefined'/>
+    	           <separator/>
+                   <menuitem action='AutoRebinding'/>
                </menu>
-               <separator/>
+              <separator/>
                <menu action='Autoconnect'>
                    <menuitem action='InputAutoConnectPhysical'/>
                    <menuitem action='InputAutoConnectManual'/>
@@ -488,13 +487,6 @@
                    <menuitem action='OutputAutoConnectMaster'/>
                    <menuitem action='OutputAutoConnectManual'/>
                </menu>
-	       <menu action='ControlSurfaces'>
-                   <menuitem action='RemoteUserDefined'/>
-                   <menuitem action='RemoteMixerDefined'/>
-                   <menuitem action='RemoteEditorDefined'/>
-    	           <separator/>
-                   <menuitem action='AutoRebinding'/>
-               </menu>
                <menu action='Monitoring'>
                    <menuitem action='UseExternalMonitoring'/>
                    <menuitem action='UseSoftwareMonitoring'/>
@@ -505,9 +497,9 @@
 	       <menu action='Metering'>
 			<menuitem action='ShowTrackMeters'/>
                    <menu action='MeteringFallOffRate'>
-		        <menuitem action='MeterFalloffOff'/>
-   		        <menuitem action='MeterFalloffSlowest'/>
-			<menuitem action='MeterFalloffSlow'/>
+					<menuitem action='MeterFalloffOff'/>
+					<menuitem action='MeterFalloffSlowest'/>
+					<menuitem action='MeterFalloffSlow'/>
 	                <menuitem action='MeterFalloffMedium'/>
 	                <menuitem action='MeterFalloffFast'/>
 	                <menuitem action='MeterFalloffFaster'/>
@@ -540,20 +532,23 @@
 		     <menuitem action='LayerMoveAddHigher'/>
 		     <menuitem action='LayerAddHigher'/>
 	       </menu>
-	       <menu name='Denormals' action='Denormals'>
-                      <menuitem action='DenormalProtection'/>
-		      <separator/>
-                      <menuitem action='DenormalNone'/>
-                      <menuitem action='DenormalFTZ'/>
-                      <menuitem action='DenormalDAZ'/>
-	              <menuitem action='DenormalFTZDAZ'/>
-               </menu>
-               <separator/>
+		   <separator/>
+	       <menu action='Performance'>
+        	   <menuitem action='StopPluginsWithTransport'/>
+           	   <menuitem action='DoNotRunPluginsWhileRecording'/>
+       	       <menuitem action='toggle-region-fades'/>
+			   <menu name='Denormals' action='Denormals'>
+						  <menuitem action='DenormalProtection'/>
+				  <separator/>
+						  <menuitem action='DenormalNone'/>
+						  <menuitem action='DenormalFTZ'/>
+						  <menuitem action='DenormalDAZ'/>
+					  <menuitem action='DenormalFTZDAZ'/>
+				   </menu>
+		   </menu>
 	       <menu action='MiscOptions'>
                	     <menuitem action='UseOSC'/>
-               	     <menuitem action='StopPluginsWithTransport'/>
                	     <menuitem action='NewPluginsActive'/>
-               	     <menuitem action='DoNotRunPluginsWhileRecording'/>
                	     <menuitem action='LatchedRecordEnable'/>
                	     <menuitem action='RegionEquivalentsOverlap'/>
                	     <menuitem action='PeriodicSafetyBackups'/>
@@ -570,13 +565,14 @@
 	             <menuitem action='NameNewMarkers'/>
                	     <menuitem action='RubberbandingSnapsToGrid'/>
                	     <menuitem action='AutoAnalyseAudio'/>
-               	     <menuitem action='toggle-region-fades'/>
-		</menu>
          </menu>
+	</menu>
+         
 	 <menu name='Help' action='Help'>
 	     <menuitem action='About'/>
 	     <menuitem action='Chat'/>
-	</menu>
+	 </menu>
+	 
      </menubar>
 
      <popup action="RulerMenuPopup">