From: Paul Davis <paul@linuxaudiosystems.com>
Date: Tue, 10 Jan 2006 04:41:09 +0000 (+0000)
Subject: renamed menu definition file
X-Git-Tag: 2.0beta4~474
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=bf5b28693abcaa1d9626b9b88c8f188ad3b35c28;p=ardour.git

renamed menu definition file


git-svn-id: svn://localhost/trunk/ardour2@254 d708f5d6-7413-0410-9779-e7cbd77b26cf
---

diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc
index b8bf6bd461..8827bc40ce 100644
--- a/gtk2_ardour/actions.cc
+++ b/gtk2_ardour/actions.cc
@@ -60,7 +60,7 @@ ActionManager::init ()
 	ui_manager = UIManager::create ();
 
 	try {
-		ui_manager->add_ui_from_file (ARDOUR::find_config_file("ardour-menus.xml"));
+		ui_manager->add_ui_from_file (ARDOUR::find_config_file("ardour.menus"));
 	} catch (Glib::MarkupError& err) {
 		error << "badly formatted UI definition file" << endmsg;
 	} catch (...) {
diff --git a/gtk2_ardour/ardour-menus.xml b/gtk2_ardour/ardour-menus.xml
deleted file mode 100644
index 8478abe789..0000000000
--- a/gtk2_ardour/ardour-menus.xml
+++ /dev/null
@@ -1,258 +0,0 @@
-<ui>
-
-    <menubar name='Main' action='MainMenu'>
-        <menu name='Session' action='Session'>
-           <menuitem action='New'/>
-           <menuitem action='Open'/>
-           <menuitem action='Recent'/>
-           <menuitem action='Close'/>
-           <separator/>
-           <menuitem action='Save'/>
-           <menuitem action='Snapshot'/>
-           <menuitem action='SaveTemplate'/>
-           <separator/>
-           <menuitem action='AddTrackBus'/>
-           <separator/>
-           <menu name='Export' action='Export'>
-               <menuitem action='ExportSession'/>
-               <menuitem action='ExportRange'/>
-           </menu>
-           <separator/>
-           <menu name='Cleanup' action='Cleanup'>
-               <menuitem action='CleanupUnused'/>
-               <menuitem action='FlushWastebasket'/>
-           </menu>
-           <separator/>
-           <menuitem action='Quit'/>
-        </menu>
-        <menu name='Transport' action='Transport'>
-               <menuitem action='ToggleRoll'/>
-               <menuitem action='ToggleRollForgetCapture'/>
-               <menuitem action='Loop'/>
-               <menuitem action='PlaySelection'/>
-               <menuitem action='Forward'/>
-               <menuitem action='Rewind'/>
-               <menuitem action='GotoStart'/>
-               <menuitem action='GotoEnd'/>
-               <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-start'/>
-               <menuitem action='playhead-to-next-region-end'/>
-               <menuitem action='playhead-to-previous-region-start'/>
-               <menuitem action='playhead-to-previous-region-end'/>
-               <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'/>
-               <separator/> 
-               <menuitem action='set-playhead'/>
-               <menuitem action='audition-at-mouse'/>
-               <menuitem action='brush-at-mouse'/>
-               <separator/> 
-               <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='ToggleFollowPlayhead'/>
-               </menu>
-       </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='extend-range-to-start-of-region'/>
-               <menuitem action='extend-range-to-end-of-region'/>
-               <separator/>       
-               <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'/>
-               <separator/>       
-               <menuitem action='edit-cursor-to-range-start'/>
-               <menuitem action='edit-cursor-to-range-end'/>
-               <separator/>
-               <menuitem action='crop'/>
-               <menuitem action='duplicate-region'/>
-               <menuitem action='insert-region'/>
-               <menuitem action='normalize-region'/>
-        </menu>         
-        <menu name='View' action = 'View'>
-               <menu name='ZoomFocus' action='ZoomFocus'>
-                   <menuitem action='zoom-focus-left'/>
-                   <menuitem action='zoom-focus-right'/>
-                   <menuitem action='zoom-focus-center'/>
-                   <menuitem action='zoom-focus-playhead'/>
-                   <menuitem action='zoom-focus-edit'/>
-               </menu>
-               <menu name='SnapTo' action='SnapTo'>
-                   <menuitem action='snap-to-beat'/>
-                   <menuitem action='snap-to-bar'/>
-               </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>
-
-               <separator/>
-
-               <menuitem action='temporal-zoom-in'/>
-               <menuitem action='temporal-zoom-out'/>
-               <menuitem action='zoom-to-session'/>
-               <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='ToggleWaveformVisibility'/>
-               <menuitem action='ToggleWaveformsWhileRecording'/>
-               <menuitem action='ToggleMeasureVisibility'/>
-         </menu>
-        <menu name='JACK' action='JACK'>
-               <menuitem action='JACKDisconnect'/>
-               <menuitem action='JACKReconnect'/>
-               <menu name='Latency' action='Latency'>
-                   <menuitem action='JACKLatency32'/>
-                   <menuitem action='JACKLatency64'/>
-                   <menuitem action='JACKLatency128'/>
-                   <menuitem action='JACKLatency256'/>
-                   <menuitem action='JACKLatency512'/>
-                   <menuitem action='JACKLatency1024'/>
-                   <menuitem action='JACKLatency2048'/>
-                   <menuitem action='JACKLatency4096'/>
-                   <menuitem action='JACKLatency8192'/>
-               </menu>
-        </menu>
-        <menu name='Windows' action = 'Windows'>
-               <menuitem action='GotoEditor'/>
-               <menuitem action='GotoMixer'/>
-               <menuitem action='ToggleOptionsEditor'/>
-               <menuitem action='ToggleSoundFileBrowser'/>
-               <menuitem action='ToggleConnections'/>
-               <menuitem action='ToggleLocations'/>
-               <menuitem action='ToggleBigClock'/>
-			    <separator/>
-			   <menuitem action='About'/>
-        </menu>
-        <menu name='Options' action='Options'>
-               <menu action='Autoconnect'>
-                   <menuitem action='AutoConnectNewTrackInputsToHardware'/>
-                   <menuitem action='AutoConnectNewTrackOutputsToHardware'/>
-                   <menuitem action='AutoConnectNewTrackOutputsToHardware'/>
-                   <menuitem action='ManuallyConnectNewTrackOutputs'/>
-               </menu>
-               <menu action='Monitoring'>
-                   <menuitem action='UseHardwareMonitoring'/>
-                   <menuitem action='UseSoftwareMonitoring'/>
-                   <menuitem action='UseExternalMonitoring'/>
-               </menu>
-               <menu action='Solo'>
-                   <menuitem action='LatchedSolo'/>
-                   <menuitem action='SoloInPlace'/>
-                   <menuitem action='SoloViaBus'/>
-               </menu>
-               <separator/>
-               <menuitem action='SendMTC'/>
-               <menuitem action='SendMMC'/>
-               <menuitem action='UseMMC'/>
-               <menuitem action='SendMIDIfeedback'/>
-               <menuitem action='UseMIDIcontrol'/>
-               <separator/>
-               <menuitem action='StopPluginsWithTransport'/>
-               <menuitem action='DoNotRunPluginsWhileRecording'/>
-               <separator/>
-               <menuitem action='VerifyRemoveLastCapture'/>
-               <menuitem action='StopRecordingOnXrun'/>
-               <menuitem action='StopTransportAtEndOfSession'/>
-               <menuitem action='GainReduceFastTransport'/>
-               <separator/>
-               <menuitem action='AutomaticallyCreateCrossfades'/>
-               <menuitem action='UnmuteNewFullCrossfades'/>
-         </menu>
-     </menubar>
-
-     <popup name='redirectmenu'>
-	 <menuitem action='newplugin'/>
-	 <menuitem action='newinsert'/>
-	 <menuitem action='newsend'/>
-	  <separator/>
-	 <menuitem action='clear'/>
-	  <separator/>
-	 <menuitem action='cut'/>
-	 <menuitem action='copy'/>
-	 <menuitem action='paste'/>
-	  <separator/>
-	 <menuitem action='rename'/>
-	  <separator/>
-	 <menuitem action='selectall'/>
-	 <menuitem action='deselectall'/>
-	  <separator/>
-	 <menuitem action='activate'/>
-	 <menuitem action='deactivate'/>
-	  <separator/>
-	 <menuitem action='activate_all'/>
-	 <menuitem action='deactivate_all'/>
-	  <separator/>
-	 <menuitem action='edit'/>
-      </popup>
-
-     <popup name='ShuttleUnitPopup'>
-	 <menuitem action='SetShuttleUnitsPercentage'/>
-	 <menuitem action='SetShuttleUnitsSemitones'/>
-     </popup>
-
-     <popup name='RegionListMenu'>
-         <menuitem action='rlAudition'/>
-         <menuitem action='rlHide'/>
-         <menuitem action='rlRemove'/>
-	  <separator/>
-         <menuitem action='rlShowAll'/>
-         <menuitem action='rlShowAuto'/>
-         <menu name='Sort' action='RegionListSort'>
-               <menuitem action='SortAscending'/>
-               <menuitem action='SortDescending'/>
-       	       <separator/>
-               <menuitem action='SortByRegionName'/>
-               <menuitem action='SortByRegionLength'/>
-               <menuitem action='SortByRegionPosition'/>
-               <menuitem action='SortByRegionTimestamp'/>
-               <menuitem action='SortByRegionStartinFile'/>
-               <menuitem action='SortByRegionEndinFile'/>
-               <menuitem action='SortBySourceFileName'/>
-               <menuitem action='SortBySourceFileLength'/>
-               <menuitem action='SortBySourceFileCreationDate'/>
-               <menuitem action='SortBySourceFilesystem'/>
-         </menu>
-         <separator/>
-         <menuitem action='rlEmbedAudio'/>
-         <menuitem action='rlImportAudio'/>
-     </popup>
-</ui>
diff --git a/gtk2_ardour/ardour.menus b/gtk2_ardour/ardour.menus
new file mode 100644
index 0000000000..8478abe789
--- /dev/null
+++ b/gtk2_ardour/ardour.menus
@@ -0,0 +1,258 @@
+<ui>
+
+    <menubar name='Main' action='MainMenu'>
+        <menu name='Session' action='Session'>
+           <menuitem action='New'/>
+           <menuitem action='Open'/>
+           <menuitem action='Recent'/>
+           <menuitem action='Close'/>
+           <separator/>
+           <menuitem action='Save'/>
+           <menuitem action='Snapshot'/>
+           <menuitem action='SaveTemplate'/>
+           <separator/>
+           <menuitem action='AddTrackBus'/>
+           <separator/>
+           <menu name='Export' action='Export'>
+               <menuitem action='ExportSession'/>
+               <menuitem action='ExportRange'/>
+           </menu>
+           <separator/>
+           <menu name='Cleanup' action='Cleanup'>
+               <menuitem action='CleanupUnused'/>
+               <menuitem action='FlushWastebasket'/>
+           </menu>
+           <separator/>
+           <menuitem action='Quit'/>
+        </menu>
+        <menu name='Transport' action='Transport'>
+               <menuitem action='ToggleRoll'/>
+               <menuitem action='ToggleRollForgetCapture'/>
+               <menuitem action='Loop'/>
+               <menuitem action='PlaySelection'/>
+               <menuitem action='Forward'/>
+               <menuitem action='Rewind'/>
+               <menuitem action='GotoStart'/>
+               <menuitem action='GotoEnd'/>
+               <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-start'/>
+               <menuitem action='playhead-to-next-region-end'/>
+               <menuitem action='playhead-to-previous-region-start'/>
+               <menuitem action='playhead-to-previous-region-end'/>
+               <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'/>
+               <separator/> 
+               <menuitem action='set-playhead'/>
+               <menuitem action='audition-at-mouse'/>
+               <menuitem action='brush-at-mouse'/>
+               <separator/> 
+               <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='ToggleFollowPlayhead'/>
+               </menu>
+       </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='extend-range-to-start-of-region'/>
+               <menuitem action='extend-range-to-end-of-region'/>
+               <separator/>       
+               <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'/>
+               <separator/>       
+               <menuitem action='edit-cursor-to-range-start'/>
+               <menuitem action='edit-cursor-to-range-end'/>
+               <separator/>
+               <menuitem action='crop'/>
+               <menuitem action='duplicate-region'/>
+               <menuitem action='insert-region'/>
+               <menuitem action='normalize-region'/>
+        </menu>         
+        <menu name='View' action = 'View'>
+               <menu name='ZoomFocus' action='ZoomFocus'>
+                   <menuitem action='zoom-focus-left'/>
+                   <menuitem action='zoom-focus-right'/>
+                   <menuitem action='zoom-focus-center'/>
+                   <menuitem action='zoom-focus-playhead'/>
+                   <menuitem action='zoom-focus-edit'/>
+               </menu>
+               <menu name='SnapTo' action='SnapTo'>
+                   <menuitem action='snap-to-beat'/>
+                   <menuitem action='snap-to-bar'/>
+               </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>
+
+               <separator/>
+
+               <menuitem action='temporal-zoom-in'/>
+               <menuitem action='temporal-zoom-out'/>
+               <menuitem action='zoom-to-session'/>
+               <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='ToggleWaveformVisibility'/>
+               <menuitem action='ToggleWaveformsWhileRecording'/>
+               <menuitem action='ToggleMeasureVisibility'/>
+         </menu>
+        <menu name='JACK' action='JACK'>
+               <menuitem action='JACKDisconnect'/>
+               <menuitem action='JACKReconnect'/>
+               <menu name='Latency' action='Latency'>
+                   <menuitem action='JACKLatency32'/>
+                   <menuitem action='JACKLatency64'/>
+                   <menuitem action='JACKLatency128'/>
+                   <menuitem action='JACKLatency256'/>
+                   <menuitem action='JACKLatency512'/>
+                   <menuitem action='JACKLatency1024'/>
+                   <menuitem action='JACKLatency2048'/>
+                   <menuitem action='JACKLatency4096'/>
+                   <menuitem action='JACKLatency8192'/>
+               </menu>
+        </menu>
+        <menu name='Windows' action = 'Windows'>
+               <menuitem action='GotoEditor'/>
+               <menuitem action='GotoMixer'/>
+               <menuitem action='ToggleOptionsEditor'/>
+               <menuitem action='ToggleSoundFileBrowser'/>
+               <menuitem action='ToggleConnections'/>
+               <menuitem action='ToggleLocations'/>
+               <menuitem action='ToggleBigClock'/>
+			    <separator/>
+			   <menuitem action='About'/>
+        </menu>
+        <menu name='Options' action='Options'>
+               <menu action='Autoconnect'>
+                   <menuitem action='AutoConnectNewTrackInputsToHardware'/>
+                   <menuitem action='AutoConnectNewTrackOutputsToHardware'/>
+                   <menuitem action='AutoConnectNewTrackOutputsToHardware'/>
+                   <menuitem action='ManuallyConnectNewTrackOutputs'/>
+               </menu>
+               <menu action='Monitoring'>
+                   <menuitem action='UseHardwareMonitoring'/>
+                   <menuitem action='UseSoftwareMonitoring'/>
+                   <menuitem action='UseExternalMonitoring'/>
+               </menu>
+               <menu action='Solo'>
+                   <menuitem action='LatchedSolo'/>
+                   <menuitem action='SoloInPlace'/>
+                   <menuitem action='SoloViaBus'/>
+               </menu>
+               <separator/>
+               <menuitem action='SendMTC'/>
+               <menuitem action='SendMMC'/>
+               <menuitem action='UseMMC'/>
+               <menuitem action='SendMIDIfeedback'/>
+               <menuitem action='UseMIDIcontrol'/>
+               <separator/>
+               <menuitem action='StopPluginsWithTransport'/>
+               <menuitem action='DoNotRunPluginsWhileRecording'/>
+               <separator/>
+               <menuitem action='VerifyRemoveLastCapture'/>
+               <menuitem action='StopRecordingOnXrun'/>
+               <menuitem action='StopTransportAtEndOfSession'/>
+               <menuitem action='GainReduceFastTransport'/>
+               <separator/>
+               <menuitem action='AutomaticallyCreateCrossfades'/>
+               <menuitem action='UnmuteNewFullCrossfades'/>
+         </menu>
+     </menubar>
+
+     <popup name='redirectmenu'>
+	 <menuitem action='newplugin'/>
+	 <menuitem action='newinsert'/>
+	 <menuitem action='newsend'/>
+	  <separator/>
+	 <menuitem action='clear'/>
+	  <separator/>
+	 <menuitem action='cut'/>
+	 <menuitem action='copy'/>
+	 <menuitem action='paste'/>
+	  <separator/>
+	 <menuitem action='rename'/>
+	  <separator/>
+	 <menuitem action='selectall'/>
+	 <menuitem action='deselectall'/>
+	  <separator/>
+	 <menuitem action='activate'/>
+	 <menuitem action='deactivate'/>
+	  <separator/>
+	 <menuitem action='activate_all'/>
+	 <menuitem action='deactivate_all'/>
+	  <separator/>
+	 <menuitem action='edit'/>
+      </popup>
+
+     <popup name='ShuttleUnitPopup'>
+	 <menuitem action='SetShuttleUnitsPercentage'/>
+	 <menuitem action='SetShuttleUnitsSemitones'/>
+     </popup>
+
+     <popup name='RegionListMenu'>
+         <menuitem action='rlAudition'/>
+         <menuitem action='rlHide'/>
+         <menuitem action='rlRemove'/>
+	  <separator/>
+         <menuitem action='rlShowAll'/>
+         <menuitem action='rlShowAuto'/>
+         <menu name='Sort' action='RegionListSort'>
+               <menuitem action='SortAscending'/>
+               <menuitem action='SortDescending'/>
+       	       <separator/>
+               <menuitem action='SortByRegionName'/>
+               <menuitem action='SortByRegionLength'/>
+               <menuitem action='SortByRegionPosition'/>
+               <menuitem action='SortByRegionTimestamp'/>
+               <menuitem action='SortByRegionStartinFile'/>
+               <menuitem action='SortByRegionEndinFile'/>
+               <menuitem action='SortBySourceFileName'/>
+               <menuitem action='SortBySourceFileLength'/>
+               <menuitem action='SortBySourceFileCreationDate'/>
+               <menuitem action='SortBySourceFilesystem'/>
+         </menu>
+         <separator/>
+         <menuitem action='rlEmbedAudio'/>
+         <menuitem action='rlImportAudio'/>
+     </popup>
+</ui>