View Issue Details

IDCategoryLast Update
0002973features2009-12-30 01:27
Reporterdx9sAssigned Topaul 
ReproducibilityN/A 
Status assignedResolutionopen 
Product Version2.8.4 
Fixed in Version 
Summary0002973: View/Menu re-organized and Toolbars when Maximized
DescriptionA feature patch I've had kicking around and about ready to toss, when Seablade suggested that I try/test on 3.0 (which I have yet to do). So I brought it up to date (2.8.4) and noticed some clean-up is required with ardour.menus.in (XML like file)

The ardour.menus.in file was not consistent and NEAR XML compliant. The biggies where things like:

<menu name='View' action = 'View'>
(BREAKS XML standard, *can't* have spaces before/after the equal character)

[rest below are all optional]

<menu action="ZoomMenu">
<menuitem action='temporal-zoom-in'/>
(inconsistent use of quotes, should TRY to pick on and stick with it)

and improper indenting, lack of decent use of blank lines, and no spaces before "/>".

All leading a hard to read source XML file.

Two patch paths:

Summary of view_window-reorder-2.8.4.patch.txt:
1) reformats the XML-like source (indenting, all single quotes, good use of blank lines, etc.)
2) removing the 'Maximise Editor Space' from Window menu and putting it at top of View menu (so people used to seeing it at top of Window can still easily find at top of View).
3) re-ordered View and used separators so it is more logically seperated

Summary of keep-toolbars-with-reorder-2.8.4.patch.txt:
1) depends on view_window-reorder-2.8.4.patch.txt
2) updates code (mainly in gtk2_ardour) to allow for save-able setting w/ session the code to keep/remove toolbars when 'Maximise Editor Space' is done
3) updates View menu just below "Toolbars when Maximized" to expose #2's option

Summary of keep-toolbars-no-reorder-2.8.4.patch.txt:
1) depends on base 2.8.4 code
2) updates code (mainly in gtk2_ardour) to allow for save-able setting w/ session the code to keep/remove toolbars when 'Maximise Editor Space' is done
3) updates View menu just below "Toolbars when Maximized" to expose #2's option

I **DO** recommend view_window-reorder-2.8.4.patch.txt followed by keep-toolbars-with-reorder-2.8.4.patch.txt **ONLY** !!

Also I did research on Maximise [http://m-w.com/dictionary/maximise] vs. Maximize. But I did NOT find a spelling for Maximised [http://m-w.com/dictionary/Maximised] vs. Maximized [http://m-w.com/dictionary/Maximized] even tho the FireFox spell checker likes Maximised.

So while my menu item I add in the keep-toolbars* has "Maximized", it doesn't match the spelling of "Maximise" just above it.

I am leaving it this way until somebody else makes a decision for Maximise/Maximised vs. Maximize/Maximized ! (Merriam-Webster isn't already correct are they?)

--Doug (dx9s)
Tagspolish

Activities

2009-12-25 20:21

 

keep-toolbars-no-reorder-2.8.4.patch.txt (6,512 bytes)
diff -p -r ardour-2.8.4-orig/gtk2_ardour/ardour.menus.in ardour-2.8.4-keep-toolbar/gtk2_ardour/ardour.menus.in
*** ardour-2.8.4-orig/gtk2_ardour/ardour.menus.in	2009-10-30 13:32:51.000000000 -0700
--- ardour-2.8.4-keep-toolbar/gtk2_ardour/ardour.menus.in	2009-12-22 23:58:48.741376729 -0800
***************
*** 381,386 ****
--- 381,387 ----
  	       </menu>
  
  	       <menuitem action='ToggleMaximalEditor'/>
+ 	       <menuitem action='KeepTearoffs'/>
  	       <menuitem action='show-editor-mixer'/>
             <menuitem action='ToggleMeasureVisibility'/>
  	       <menu action="WaveformMenu">
diff -p -r ardour-2.8.4-orig/gtk2_ardour/ardour_ui2.cc ardour-2.8.4-keep-toolbar/gtk2_ardour/ardour_ui2.cc
*** ardour-2.8.4-orig/gtk2_ardour/ardour_ui2.cc	2009-11-06 14:43:41.000000000 -0800
--- ardour-2.8.4-keep-toolbar/gtk2_ardour/ardour_ui2.cc	2009-12-22 23:59:56.571586954 -0800
*************** ARDOUR_UI::maximise_editing_space ()
*** 889,894 ****
--- 889,897 ----
  
  	transport_tearoff->set_visible (false);
  	editor->maximise_editing_space ();
+ 	if (Config->get_keep_tearoffs()) {
+ 		transport_tearoff->set_visible (true);
+ 	}
  }
  
  void
diff -p -r ardour-2.8.4-orig/gtk2_ardour/ardour_ui_ed.cc ardour-2.8.4-keep-toolbar/gtk2_ardour/ardour_ui_ed.cc
*** ardour-2.8.4-orig/gtk2_ardour/ardour_ui_ed.cc	2009-11-08 10:01:18.000000000 -0800
--- ardour-2.8.4-keep-toolbar/gtk2_ardour/ardour_ui_ed.cc	2009-12-23 00:02:10.459587193 -0800
*************** ARDOUR_UI::install_actions ()
*** 204,209 ****
--- 204,211 ----
          /* windows visibility actions */
  
  	ActionManager::register_toggle_action (common_actions, X_("ToggleMaximalEditor"), _("Maximise Editor Space"), mem_fun (*this, &ARDOUR_UI::toggle_editing_space));
+ 	act = ActionManager::register_toggle_action (common_actions, X_("KeepTearoffs"), _("Toolbars when Maximized"), mem_fun (*this, &ARDOUR_UI::toggle_keep_tearoffs));
+ 	ActionManager::session_sensitive_actions.push_back (act);
  
  	ActionManager::register_action (common_actions, X_("goto-editor"), _("Show Editor"),  mem_fun(*this, &ARDOUR_UI::goto_editor_window));
  	ActionManager::register_action (common_actions, X_("goto-mixer"), _("Show Mixer"),  mem_fun(*this, &ARDOUR_UI::goto_mixer_window));
diff -p -r ardour-2.8.4-orig/gtk2_ardour/ardour_ui.h ardour-2.8.4-keep-toolbar/gtk2_ardour/ardour_ui.h
*** ardour-2.8.4-orig/gtk2_ardour/ardour_ui.h	2009-11-11 05:33:01.000000000 -0800
--- ardour-2.8.4-keep-toolbar/gtk2_ardour/ardour_ui.h	2009-12-23 00:05:03.547586594 -0800
*************** class ARDOUR_UI : public Gtkmm2ext::UI
*** 172,177 ****
--- 172,178 ----
  	void toggle_connection_editor ();
  	void toggle_route_params_window ();
  	void toggle_editing_space();
+ 	void toggle_keep_tearoffs();
  
  	Gtk::Tooltips& tooltips() { return _tooltips; }
  
*************** class ARDOUR_UI : public Gtkmm2ext::UI
*** 738,743 ****
--- 739,745 ----
  
  	void mtc_port_changed ();
  	void map_solo_model ();
+ 	void map_keep_tearoffs ();
  	void map_monitor_model ();
  	void map_denormal_model ();
  	void map_denormal_protection ();
diff -p -r ardour-2.8.4-orig/gtk2_ardour/ardour_ui_options.cc ardour-2.8.4-keep-toolbar/gtk2_ardour/ardour_ui_options.cc
*** ardour-2.8.4-orig/gtk2_ardour/ardour_ui_options.cc	2009-10-29 12:28:13.000000000 -0700
--- ardour-2.8.4-keep-toolbar/gtk2_ardour/ardour_ui_options.cc	2009-12-23 00:13:05.130342401 -0800
*************** ARDOUR_UI::toggle_new_plugins_active ()
*** 538,543 ****
--- 538,551 ----
  }
  
  void
+ ARDOUR_UI::toggle_keep_tearoffs()
+ {
+ 	ActionManager::toggle_config_state ("Common", "KeepTearoffs", &Configuration::set_keep_tearoffs, &Configuration::get_keep_tearoffs);
+ 
+ 	ARDOUR_UI::toggle_editing_space ();
+ }
+ 
+ void
  ARDOUR_UI::toggle_StopPluginsWithTransport()
  {
  	ActionManager::toggle_config_state ("options", "StopPluginsWithTransport", &Configuration::set_plugins_stop_with_transport, &Configuration::get_plugins_stop_with_transport);
*************** ARDOUR_UI::map_solo_model ()
*** 725,730 ****
--- 733,751 ----
  }
  
  void
+ ARDOUR_UI::map_keep_tearoffs ()
+ {
+ 	Glib::RefPtr<Action> act = ActionManager::get_action ("Common", X_("KeepTearoffs"));
+ 	Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
+ 
+ 	if (Config->get_keep_tearoffs()){
+ 		if (tact && !tact->get_active()) {
+ 		tact->set_active (true);
+ 		}
+ 	}
+ }
+ 
+ void
  ARDOUR_UI::map_monitor_model ()
  {
  	const char* on = 0;
*************** ARDOUR_UI::parameter_changed (const char
*** 1163,1168 ****
--- 1184,1191 ----
  	} else if (PARAM_IS ("seamless-loop")) {
  		ActionManager::map_some_state ("options", "toggle-seamless-loop", &Configuration::get_seamless_loop);
  
+ 	} else if (PARAM_IS ("keep-tearoffs")) {
+ 		ActionManager::map_some_state ("Common", "KeepTearoffs", &Configuration::get_keep_tearoffs);
  	} else if (PARAM_IS ("mmc-control")) {
  		ActionManager::map_some_state ("options", "UseMMC", &Configuration::get_mmc_control);
  
diff -p -r ardour-2.8.4-orig/gtk2_ardour/editor.cc ardour-2.8.4-keep-toolbar/gtk2_ardour/editor.cc
*** ardour-2.8.4-orig/gtk2_ardour/editor.cc	2009-11-13 06:06:21.000000000 -0800
--- ardour-2.8.4-keep-toolbar/gtk2_ardour/editor.cc	2009-12-23 00:14:46.079586039 -0800
*************** Editor::maximise_editing_space ()
*** 4260,4265 ****
--- 4260,4270 ----
  	} else {
  		edit_pane.set_position (post_maximal_pane_position);
  	}
+ 
+ 	if (Config->get_keep_tearoffs()) {
+ 		mouse_mode_tearoff->set_visible (true);
+ 		tools_tearoff->set_visible (true);
+ 	}
  }
  
  void
diff -p -r ardour-2.8.4-orig/libs/ardour/ardour/configuration_vars.h ardour-2.8.4-keep-toolbar/libs/ardour/ardour/configuration_vars.h
*** ardour-2.8.4-orig/libs/ardour/ardour/configuration_vars.h	2009-06-14 06:12:03.000000000 -0700
--- ardour-2.8.4-keep-toolbar/libs/ardour/ardour/configuration_vars.h	2009-12-23 00:16:06.619587080 -0800
*************** CONFIG_VARIABLE (uint32_t, periodic_safe
*** 160,165 ****
--- 160,166 ----
  CONFIG_VARIABLE (float, automation_interval, "automation-interval", 50)
  CONFIG_VARIABLE (bool, sync_all_route_ordering, "sync-all-route-ordering", true)
  CONFIG_VARIABLE (bool, only_copy_imported_files, "only-copy-imported-files", false)
+ CONFIG_VARIABLE (bool, keep_tearoffs, "keep-tearoffs", false)
  CONFIG_VARIABLE (bool, new_plugins_active, "new-plugins-active", true)
  CONFIG_VARIABLE (std::string, keyboard_layout, "keyboard-layout", "ansi")
  CONFIG_VARIABLE (std::string, default_bindings, "default-bindings", "ardour")

2009-12-25 20:22

 

view_window-reorder-2.8.4.patch.txt (53,074 bytes)
diff -p -r ardour-2.8.4-orig/gtk2_ardour/ardour.menus.in ardour-2.8.4-view_window-reorder/gtk2_ardour/ardour.menus.in
*** ardour-2.8.4-orig/gtk2_ardour/ardour.menus.in	2009-10-30 13:32:51.000000000 -0700
--- ardour-2.8.4-view_window-reorder/gtk2_ardour/ardour.menus.in	2009-12-25 10:59:36.502597735 -0800
***************
*** 1,654 ****
  <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/>
!            <menuitem action='addExistingAudioFiles'/>
!            <separator/>
!            <menu name='Export' action='Export'>
!                <menuitem action='ExportSession'/>
!                <menuitem action='ExportSelection'/>
!                <menuitem action='export-region'/>
!                <menuitem action='ExportRangeMarkers'/>
!            </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'/>
! 	       <menu action="PlayMenu">
! 	       	     <menuitem action='play-selected-regions'/>
! 		     <menuitem action='play-edit-range'/>
! 		     <menuitem action='PlaySelection'/>
!                      <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'/>
! 	       <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='TransitionToRoll'/>
!                <menuitem action='TransitionToReverse'/>
! 	       <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-boundary-noselection'/>
! 		   <menuitem action='playhead-to-previous-region-boundary-noselection'/>
! 		   <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'/>
! 		   <menuitem action='GotoWallClock'/>
! 	       </menu>
! 
! 	       <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'/>
!                <menuitem action='toggle-stationary-playhead'/>
! 	       <separator/>
!        </menu>
! 
!        <menu name='Edit' action='Edit'>
! 		   <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'/>
! 		   <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'/>
! 	       </menu>	   
! 	       <separator/>
! 	       <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'/>
!                </menu>
! 	       <menu action="NudgeRegionMenu">
! 	           <menuitem action="nudge-forward"/>
! 	           <menuitem action="nudge-backward"/>
!                </menu>
! 	       <menu action="TrimMenu">
! 		   <menuitem action='trim-front'/>
! 		   <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/>
! 	       <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='brush-at-mouse'/>
! 		   <separator/>
! 		   <menuitem action='break-drag'/>
!            <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='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'/>
! 	      <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'/>
! 	      <menuitem action='toggle-opaque-region'/>
! 	      <menuitem action='toggle-selected-region-fade-in'/>
! 	      <menuitem action='toggle-selected-region-fade-out'/>
! 	      <menuitem action='toggle-selected-region-fades'/>
! 	      <separator/>
! 	      <menuitem action='duplicate-region'/>
! 	      <menuitem action='multi-duplicate-region'/>
! 	      <menuitem action='region-fill-track'/>
! 	      <separator/>
! 	      <menuitem action='loop-region'/>
! 	      <menuitem action='set-punch-from-region'/>
! 	      <menuitem action='add-range-marker-from-region'/>
! 	      <menuitem action='add-range-markers-from-region'/>
! 	</menu>
! 
!         <menu action='TrackMenu'>
! 	        <menuitem action='AddTrackBus'/>	
! 		<menuitem action='insert-time'/>
! 	        <menuitem action="move-selected-tracks-up"/>
! 	        <menuitem action="move-selected-tracks-down"/>
! 	        <menu action='TrackHeightMenu'>
! 		     <menuitem action='fit-tracks'/>
! 		     <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='linear-waveforms'/>
! 		      <menuitem action='logarithmic-waveforms'/>
! 		</menu>
! 		<menuitem action='track-record-enable-toggle'/>	
! 		<menuitem action='toggle-track-active'/>	
! 		<menuitem action='remove-track'/>	
! 	</menu>
! 
!         <menu name='View' action = 'View'>
! 	       <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='zoom-to-region-both-axes'/>
!                	     <menuitem action='toggle-zoom'/>
! 	       </menu>
!                <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'/>
!                    <menuitem action='zoom-focus-mouse'/>
!                </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="ScrollMenu">
!                	     <menuitem action='scroll-tracks-down'/>
!                	     <menuitem action='scroll-tracks-up'/>
!                	     <menuitem action='scroll-forward'/>
!                	     <menuitem action='scroll-backward'/>
! 	       </menu>
! 	       <menu action="SavedViewMenu">
!                	     <menuitem action='save-visual-state-1'/>
!                	     <menuitem action='goto-visual-state-1'/>
!                	     <menuitem action='save-visual-state-2'/>
!                	     <menuitem action='goto-visual-state-2'/>
!                	     <menuitem action='save-visual-state-3'/>
!                	     <menuitem action='goto-visual-state-3'/>
!                	     <menuitem action='save-visual-state-4'/>
!                	     <menuitem action='goto-visual-state-4'/>
!                	     <menuitem action='save-visual-state-5'/>
!                	     <menuitem action='goto-visual-state-5'/>
!                	     <menuitem action='save-visual-state-6'/>
!                	     <menuitem action='goto-visual-state-6'/>
!                	     <menuitem action='save-visual-state-7'/>
!                	     <menuitem action='goto-visual-state-7'/>
!                	     <menuitem action='save-visual-state-8'/>
!                	     <menuitem action='goto-visual-state-8'/>
!                	     <menuitem action='save-visual-state-9'/>
!                	     <menuitem action='goto-visual-state-9'/>
!                	     <menuitem action='save-visual-state-10'/>
!                	     <menuitem action='goto-visual-state-10'/>
!                	     <menuitem action='save-visual-state-11'/>
!                	     <menuitem action='goto-visual-state-11'/>
!                	     <menuitem action='save-visual-state-12'/>
!                	     <menuitem action='goto-visual-state-12'/>
! 	       </menu>
! 
! 	       <menuitem action='ToggleMaximalEditor'/>
! 	       <menuitem action='show-editor-mixer'/>
!            <menuitem action='ToggleMeasureVisibility'/>
! 	       <menu action="WaveformMenu">
!                <menuitem action='toggle-waveform-visible'/>
!                <menuitem action='toggle-waveform-rectified'/>
!                <menuitem action='ToggleWaveformsWhileRecording'/>
! 	       </menu>
! 	       <menuitem action='SyncEditorAndMixerTrackOrder'/>
! 	       <menuitem action='toggle-region-fades-visible'/>
!         </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 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='ToggleOptionsEditor'/>
!    	       <separator/>
!         </menu>
! 
!         <menu name='Options' action='Options'>
! 	       <menu action='AudioFileFormat'>
!                    <menu action='AudioFileFormatData'>
! 		        <menuitem action='FileDataFormatFloat'/>
! 		        <menuitem action='FileDataFormat24bit'/>
! 		        <menuitem action='FileDataFormat16bit'/>
! 		   </menu>
!                    <menu action='AudioFileFormatHeader'>
! 		        <menuitem action='FileHeaderFormatBWF'/>
! 		        <menuitem action='FileHeaderFormatWAVE'/>
! 		        <menuitem action='FileHeaderFormatWAVE64'/>
! 		        <menuitem action='FileHeaderFormatCAF'/>
! 		   </menu>
! 		   </menu>
! 	       <menu action='SyncMenu'>
!                <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/>
!                <menu action='Autoconnect'>
!                    <menuitem action='InputAutoConnectPhysical'/>
!                    <menuitem action='InputAutoConnectManual'/>
!     	           <separator/>
!                    <menuitem action='OutputAutoConnectPhysical'/>
!                    <menuitem action='OutputAutoConnectMaster'/>
!                    <menuitem action='OutputAutoConnectManual'/>
!                </menu>
!                <menu action='Monitoring'>
!                    <menuitem action='UseExternalMonitoring'/>
!                    <menuitem action='UseSoftwareMonitoring'/>
!                    <menuitem action='UseHardwareMonitoring'/>
!     	           <separator/>
!                	   <menuitem action='ToggleTapeMachineMode'/>
!                </menu>
! 	       <menu action='Metering'>
! 			<menuitem action='ShowTrackMeters'/>
!                    <menu action='MeteringFallOffRate'>
! 					<menuitem action='MeterFalloffOff'/>
! 					<menuitem action='MeterFalloffSlowest'/>
! 					<menuitem action='MeterFalloffSlow'/>
! 	                <menuitem action='MeterFalloffMedium'/>
! 	                <menuitem action='MeterFalloffFast'/>
! 	                <menuitem action='MeterFalloffFaster'/>
! 	                <menuitem action='MeterFalloffFastest'/>
!                    </menu>
!                    <menu action='MeteringHoldTime'>
! 	                <menuitem action='MeterHoldOff'/>
! 	                <menuitem action='MeterHoldShort'/>
! 	                <menuitem action='MeterHoldMedium'/>
! 	                <menuitem action='MeterHoldLong'/>
!                    </menu>
!                </menu>
!                <menu action='Solo'>
!                    <menuitem action='LatchedSolo'/>
!                    <menuitem action='SoloInPlace'/>
!                    <menuitem action='SoloViaBus'/>
!                    <menuitem action='ShowSoloMutes'/>
!                    <menuitem action='SoloMuteOverride'/>
!                </menu>
! 	       <menu action='Crossfades'>
! 		   <menuitem action='toggle-xfades-active'/>
! 		   <menuitem action='toggle-xfades-visible'/>
! 		   <menuitem action='toggle-auto-xfades'/>
! 		   <separator/>
! 		   <menuitem action='CrossfadesFull'/>
! 		   <menuitem action='CrossfadesShort'/>
! 	       </menu>
! 	       <menu action='Layering'>
! 		     <menuitem action='LayerLaterHigher'/>
! 		     <menuitem action='LayerMoveAddHigher'/>
! 		     <menuitem action='LayerAddHigher'/>
! 	       </menu>
! 		   <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='toggle-seamless-loop'/>
!                	     <menuitem action='UseOSC'/>
!                	     <menuitem action='NewPluginsActive'/>
!                	     <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='DefaultNarrowMS'/>
!                	     <menuitem action='link-region-and-track-selection'/>
! 	             <menuitem action='NameNewMarkers'/>
!                	     <menuitem action='RubberbandingSnapsToGrid'/>
!                	     <menuitem action='AutoAnalyseAudio'/>
!          </menu>
! 	</menu>
!          
! 	 <menu name='Help' action='Help'>
! 	     <menuitem action='About'/>
! 	     <menuitem action='Chat'/>
! 	 </menu>
! 	 
!      </menubar>
! 
!      <popup action="RulerMenuPopup">
! 	   <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-timecode-ruler"/>
! 	   <menuitem action="toggle-tempo-ruler"/>
! 	   <menuitem action="toggle-range-ruler"/>
! 	   <menuitem action="toggle-marker-ruler"/>
! 	   <menuitem action="toggle-cd-marker-ruler"/>
! 	   <menuitem action="toggle-loop-punch-ruler"/>
!      </popup>
! 
!      <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'/>
! 	 <menuitem action='delete'/>
! 	  <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='addExternalAudioToRegionList'/>	       
!      </popup>
  </ui>
--- 1,652 ----
  <ui>
  
! 	<menubar action='MainMenu' name='Main'>
! 
! 		<menu action='Session' name='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 />
! 			<menuitem action='addExistingAudioFiles' />
! 			<separator />
! 			<menu action='Export' name='Export'>
! 				<menuitem action='ExportSession' />
! 				<menuitem action='ExportSelection' />
! 				<menuitem action='export-region' />
! 				<menuitem action='ExportRangeMarkers' />
! 			</menu>
! 			<separator />
! 			<menu action='Cleanup' name='Cleanup'>
! 				<menuitem action='CleanupUnused' />
! 				<menuitem action='FlushWastebasket' />
! 			</menu>
! 			<separator />
! 			<menuitem action='Quit' />
! 		</menu>
! 
! 		<menu action='Transport' name='Transport'>
! 			<menuitem action='ToggleRoll' />
! 			<menu action='PlayMenu'>
! 				<menuitem action='play-selected-regions' />
! 				<menuitem action='play-edit-range' />
! 				<menuitem action='PlaySelection' />
! 				<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' />
! 			<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='TransitionToRoll' />
! 			<menuitem action='TransitionToReverse' />
! 			<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-boundary-noselection' />
! 				<menuitem action='playhead-to-previous-region-boundary-noselection' />
! 				<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' />
! 				<menuitem action='GotoWallClock' />
! 			</menu>
! 			<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' />
! 			<menuitem action='toggle-stationary-playhead' />
! 			<separator />
! 		</menu>
! 
! 		<menu action='Edit' name='Edit'>
! 			<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' />
! 				<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' />
! 			</menu>
! 			<separator />
! 			<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' />
! 			</menu>
! 			<menu action='NudgeRegionMenu'>
! 				<menuitem action='nudge-forward' />
! 				<menuitem action='nudge-backward' />
! 			</menu>
! 			<menu action='TrimMenu'>
! 				<menuitem action='trim-front' />
! 				<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 />
! 			<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='brush-at-mouse' />
! 			<separator />
! 			<menuitem action='break-drag' />
! 			<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 action='MouseMode' name='MouseMode'>
! 					<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 action='SnapMode' name='SnapMode'>
! 					<menuitem action='cycle-snap-mode' />
! 					<separator />
! 					<menuitem action='snap-off' />
! 					<menuitem action='snap-normal' />
! 					<menuitem action='snap-magnetic' />
! 				</menu>
! 				<menu action='SnapTo' name='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' />
! 			<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' />
! 			<menuitem action='toggle-opaque-region' />
! 			<menuitem action='toggle-selected-region-fade-in' />
! 			<menuitem action='toggle-selected-region-fade-out' />
! 			<menuitem action='toggle-selected-region-fades' />
! 			<separator />
! 			<menuitem action='duplicate-region' />
! 			<menuitem action='multi-duplicate-region' />
! 			<menuitem action='region-fill-track' />
! 			<separator />
! 			<menuitem action='loop-region' />
! 			<menuitem action='set-punch-from-region' />
! 			<menuitem action='add-range-marker-from-region' />
! 			<menuitem action='add-range-markers-from-region' />
! 		</menu>
! 
! 		<menu action='TrackMenu'>
! 			<menuitem action='AddTrackBus' />
! 			<menuitem action='insert-time' />
! 			<menuitem action='move-selected-tracks-up' />
! 			<menuitem action='move-selected-tracks-down' />
! 			<menu action='TrackHeightMenu'>
! 				<menuitem action='fit-tracks' />
! 				<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='linear-waveforms' />
! 				<menuitem action='logarithmic-waveforms' />
! 			</menu>
! 			<menuitem action='track-record-enable-toggle' />
! 			<menuitem action='toggle-track-active' />
! 			<menuitem action='remove-track' />
! 		</menu>
! 
! 		<menu action='View' name='View'>
! 			<menuitem action='ToggleMaximalEditor' />
! 			<separator />
! 			<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='zoom-to-region-both-axes' />
! 				<menuitem action='toggle-zoom' />
! 			</menu>
! 			<menu action='ZoomFocus' name='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' />
! 				<menuitem action='zoom-focus-mouse' />
! 			</menu>
! 			<separator />
! 			<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>
! 			<separator />
! 			<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='ScrollMenu'>
! 				<menuitem action='scroll-tracks-down' />
! 				<menuitem action='scroll-tracks-up' />
! 				<menuitem action='scroll-forward' />
! 				<menuitem action='scroll-backward' />
! 			</menu>
! 			<menu action='SavedViewMenu'>
! 				<menuitem action='save-visual-state-1' />
! 				<menuitem action='goto-visual-state-1' />
! 				<menuitem action='save-visual-state-2' />
! 				<menuitem action='goto-visual-state-2' />
! 				<menuitem action='save-visual-state-3' />
! 				<menuitem action='goto-visual-state-3' />
! 				<menuitem action='save-visual-state-4' />
! 				<menuitem action='goto-visual-state-4' />
! 				<menuitem action='save-visual-state-5' />
! 				<menuitem action='goto-visual-state-5' />
! 				<menuitem action='save-visual-state-6' />
! 				<menuitem action='goto-visual-state-6' />
! 				<menuitem action='save-visual-state-7' />
! 				<menuitem action='goto-visual-state-7' />
! 				<menuitem action='save-visual-state-8' />
! 				<menuitem action='goto-visual-state-8' />
! 				<menuitem action='save-visual-state-9' />
! 				<menuitem action='goto-visual-state-9' />
! 				<menuitem action='save-visual-state-10' />
! 				<menuitem action='goto-visual-state-10' />
! 				<menuitem action='save-visual-state-11' />
! 				<menuitem action='goto-visual-state-11' />
! 				<menuitem action='save-visual-state-12' />
! 				<menuitem action='goto-visual-state-12' />
! 			</menu>
! 			<menu action='WaveformMenu'>
! 				<menuitem action='toggle-waveform-visible' />
! 				<menuitem action='toggle-waveform-rectified' />
! 				<menuitem action='ToggleWaveformsWhileRecording' />
! 			</menu>
! 			<separator />
! 			<menuitem action='show-editor-mixer' />
! 			<menuitem action='ToggleMeasureVisibility' />
! 			<menuitem action='SyncEditorAndMixerTrackOrder' />
! 			<menuitem action='toggle-region-fades-visible' />
! 		</menu>
! 
! 		<menu action='JACK' name='JACK'>
! 			<menuitem action='JACKDisconnect' />
! 			<menuitem action='JACKReconnect' />
! 			<menu action='Latency' name='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 action='WindowMenu'>
! 			<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='ToggleOptionsEditor' />
! 			<separator />
! 		</menu>
! 
! 		<menu action='Options' name='Options'>
! 			<menu action='AudioFileFormat'>
! 				<menu action='AudioFileFormatData'>
! 					<menuitem action='FileDataFormatFloat' />
! 					<menuitem action='FileDataFormat24bit' />
! 					<menuitem action='FileDataFormat16bit' />
! 				</menu>
! 				<menu action='AudioFileFormatHeader'>
! 					<menuitem action='FileHeaderFormatBWF' />
! 					<menuitem action='FileHeaderFormatWAVE' />
! 					<menuitem action='FileHeaderFormatWAVE64' />
! 					<menuitem action='FileHeaderFormatCAF' />
! 				</menu>
! 			</menu>
! 			<menu action='SyncMenu'>
! 				<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 />
! 			<menu action='Autoconnect'>
! 				<menuitem action='InputAutoConnectPhysical' />
! 				<menuitem action='InputAutoConnectManual' />
! 				<separator />
! 				<menuitem action='OutputAutoConnectPhysical' />
! 				<menuitem action='OutputAutoConnectMaster' />
! 				<menuitem action='OutputAutoConnectManual' />
! 			</menu>
! 			<menu action='Monitoring'>
! 				<menuitem action='UseExternalMonitoring' />
! 				<menuitem action='UseSoftwareMonitoring' />
! 				<menuitem action='UseHardwareMonitoring' />
! 				<separator />
! 				<menuitem action='ToggleTapeMachineMode' />
! 			</menu>
! 			<menu action='Metering'>
! 				<menuitem action='ShowTrackMeters' />
! 				<menu action='MeteringFallOffRate'>
! 					<menuitem action='MeterFalloffOff' />
! 					<menuitem action='MeterFalloffSlowest' />
! 					<menuitem action='MeterFalloffSlow' />
! 					<menuitem action='MeterFalloffMedium' />
! 					<menuitem action='MeterFalloffFast' />
! 					<menuitem action='MeterFalloffFaster' />
! 					<menuitem action='MeterFalloffFastest' />
! 				</menu>
! 				<menu action='MeteringHoldTime'>
! 					<menuitem action='MeterHoldOff' />
! 					<menuitem action='MeterHoldShort' />
! 					<menuitem action='MeterHoldMedium' />
! 					<menuitem action='MeterHoldLong' />
! 				</menu>
! 			</menu>
! 			<menu action='Solo'>
! 				<menuitem action='LatchedSolo' />
! 				<menuitem action='SoloInPlace' />
! 				<menuitem action='SoloViaBus' />
! 				<menuitem action='ShowSoloMutes' />
! 				<menuitem action='SoloMuteOverride' />
! 			</menu>
! 			<menu action='Crossfades'>
! 				<menuitem action='toggle-xfades-active' />
! 				<menuitem action='toggle-xfades-visible' />
! 				<menuitem action='toggle-auto-xfades' />
! 				<separator />
! 				<menuitem action='CrossfadesFull' />
! 				<menuitem action='CrossfadesShort' />
! 			</menu>
! 			<menu action='Layering'>
! 				<menuitem action='LayerLaterHigher' />
! 				<menuitem action='LayerMoveAddHigher' />
! 				<menuitem action='LayerAddHigher' />
! 			</menu>
! 			<separator />
! 			<menu action='Performance'>
! 				<menuitem action='StopPluginsWithTransport' />
! 				<menuitem action='DoNotRunPluginsWhileRecording' />
! 				<menuitem action='toggle-region-fades' />
! 				<menu action='Denormals' name='Denormals'>
! 					<menuitem action='DenormalProtection' />
! 					<separator />
! 					<menuitem action='DenormalNone' />
! 					<menuitem action='DenormalFTZ' />
! 					<menuitem action='DenormalDAZ' />
! 					<menuitem action='DenormalFTZDAZ' />
! 				</menu>
! 			</menu>
! 			<menu action='MiscOptions'>
! 				<menuitem action='toggle-seamless-loop' />
! 				<menuitem action='UseOSC' />
! 				<menuitem action='NewPluginsActive' />
! 				<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='DefaultNarrowMS' />
! 				<menuitem action='link-region-and-track-selection' />
! 				<menuitem action='NameNewMarkers' />
! 				<menuitem action='RubberbandingSnapsToGrid' />
! 				<menuitem action='AutoAnalyseAudio' />
! 			</menu>
! 		</menu>
! 
! 		<menu action='Help' name='Help'>
! 			<menuitem action='About' />
! 			<menuitem action='Chat' />
! 		</menu>
! 
! 	</menubar>
! 
! 
! 	<popup action='RulerMenuPopup'>
! 		<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-timecode-ruler' />
! 		<menuitem action='toggle-tempo-ruler' />
! 		<menuitem action='toggle-range-ruler' />
! 		<menuitem action='toggle-marker-ruler' />
! 		<menuitem action='toggle-cd-marker-ruler' />
! 		<menuitem action='toggle-loop-punch-ruler' />
! 	</popup>
! 
! 	<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' />
! 		<menuitem action='delete' />
! 		<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 action='RegionListSort' name='Sort'>
! 			<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='addExternalAudioToRegionList' />
! 	</popup>
! 
  </ui>

2009-12-25 20:22

 

keep-toolbars-with-reorder-2.8.4.patch.txt (6,760 bytes)
diff -p -r ardour-2.8.4-view_window-reorder/gtk2_ardour/ardour.menus.in ardour-2.8.4-keep-toolbars/gtk2_ardour/ardour.menus.in
*** ardour-2.8.4-view_window-reorder/gtk2_ardour/ardour.menus.in	2009-12-25 10:59:36.502597735 -0800
--- ardour-2.8.4-keep-toolbars/gtk2_ardour/ardour.menus.in	2009-12-25 11:10:45.090097534 -0800
***************
*** 304,309 ****
--- 304,310 ----
  
  		<menu action='View' name='View'>
  			<menuitem action='ToggleMaximalEditor' />
+ 			<menuitem action='KeepTearoffs' />
  			<separator />
  			<menu action='ZoomMenu'>
  				<menuitem action='temporal-zoom-in' />
Only in ardour-2.8.4-keep-toolbars/gtk2_ardour: ardour.menus.in~
diff -p -r ardour-2.8.4-view_window-reorder/gtk2_ardour/ardour_ui2.cc ardour-2.8.4-keep-toolbars/gtk2_ardour/ardour_ui2.cc
*** ardour-2.8.4-view_window-reorder/gtk2_ardour/ardour_ui2.cc	2009-11-06 14:43:41.000000000 -0800
--- ardour-2.8.4-keep-toolbars/gtk2_ardour/ardour_ui2.cc	2009-12-25 11:09:08.754596730 -0800
*************** ARDOUR_UI::maximise_editing_space ()
*** 889,894 ****
--- 889,897 ----
  
  	transport_tearoff->set_visible (false);
  	editor->maximise_editing_space ();
+ 	if (Config->get_keep_tearoffs()) {
+ 		transport_tearoff->set_visible (true);
+ 	}
  }
  
  void
diff -p -r ardour-2.8.4-view_window-reorder/gtk2_ardour/ardour_ui_ed.cc ardour-2.8.4-keep-toolbars/gtk2_ardour/ardour_ui_ed.cc
*** ardour-2.8.4-view_window-reorder/gtk2_ardour/ardour_ui_ed.cc	2009-11-08 10:01:18.000000000 -0800
--- ardour-2.8.4-keep-toolbars/gtk2_ardour/ardour_ui_ed.cc	2009-12-25 11:09:08.754596730 -0800
*************** ARDOUR_UI::install_actions ()
*** 204,209 ****
--- 204,211 ----
          /* windows visibility actions */
  
  	ActionManager::register_toggle_action (common_actions, X_("ToggleMaximalEditor"), _("Maximise Editor Space"), mem_fun (*this, &ARDOUR_UI::toggle_editing_space));
+ 	act = ActionManager::register_toggle_action (common_actions, X_("KeepTearoffs"), _("Toolbars when Maximized"), mem_fun (*this, &ARDOUR_UI::toggle_keep_tearoffs));
+ 	ActionManager::session_sensitive_actions.push_back (act);
  
  	ActionManager::register_action (common_actions, X_("goto-editor"), _("Show Editor"),  mem_fun(*this, &ARDOUR_UI::goto_editor_window));
  	ActionManager::register_action (common_actions, X_("goto-mixer"), _("Show Mixer"),  mem_fun(*this, &ARDOUR_UI::goto_mixer_window));
diff -p -r ardour-2.8.4-view_window-reorder/gtk2_ardour/ardour_ui.h ardour-2.8.4-keep-toolbars/gtk2_ardour/ardour_ui.h
*** ardour-2.8.4-view_window-reorder/gtk2_ardour/ardour_ui.h	2009-11-11 05:33:01.000000000 -0800
--- ardour-2.8.4-keep-toolbars/gtk2_ardour/ardour_ui.h	2009-12-25 11:09:08.754596730 -0800
*************** class ARDOUR_UI : public Gtkmm2ext::UI
*** 172,177 ****
--- 172,178 ----
  	void toggle_connection_editor ();
  	void toggle_route_params_window ();
  	void toggle_editing_space();
+ 	void toggle_keep_tearoffs();
  
  	Gtk::Tooltips& tooltips() { return _tooltips; }
  
*************** class ARDOUR_UI : public Gtkmm2ext::UI
*** 738,743 ****
--- 739,745 ----
  
  	void mtc_port_changed ();
  	void map_solo_model ();
+ 	void map_keep_tearoffs ();
  	void map_monitor_model ();
  	void map_denormal_model ();
  	void map_denormal_protection ();
diff -p -r ardour-2.8.4-view_window-reorder/gtk2_ardour/ardour_ui_options.cc ardour-2.8.4-keep-toolbars/gtk2_ardour/ardour_ui_options.cc
*** ardour-2.8.4-view_window-reorder/gtk2_ardour/ardour_ui_options.cc	2009-10-29 12:28:13.000000000 -0700
--- ardour-2.8.4-keep-toolbars/gtk2_ardour/ardour_ui_options.cc	2009-12-25 11:09:08.754596730 -0800
*************** ARDOUR_UI::toggle_new_plugins_active ()
*** 538,543 ****
--- 538,551 ----
  }
  
  void
+ ARDOUR_UI::toggle_keep_tearoffs()
+ {
+ 	ActionManager::toggle_config_state ("Common", "KeepTearoffs", &Configuration::set_keep_tearoffs, &Configuration::get_keep_tearoffs);
+ 
+ 	ARDOUR_UI::toggle_editing_space ();
+ }
+ 
+ void
  ARDOUR_UI::toggle_StopPluginsWithTransport()
  {
  	ActionManager::toggle_config_state ("options", "StopPluginsWithTransport", &Configuration::set_plugins_stop_with_transport, &Configuration::get_plugins_stop_with_transport);
*************** ARDOUR_UI::map_solo_model ()
*** 725,730 ****
--- 733,751 ----
  }
  
  void
+ ARDOUR_UI::map_keep_tearoffs ()
+ {
+ 	Glib::RefPtr<Action> act = ActionManager::get_action ("Common", X_("KeepTearoffs"));
+ 	Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
+ 
+ 	if (Config->get_keep_tearoffs()){
+ 		if (tact && !tact->get_active()) {
+ 		tact->set_active (true);
+ 		}
+ 	}
+ }
+ 
+ void
  ARDOUR_UI::map_monitor_model ()
  {
  	const char* on = 0;
*************** ARDOUR_UI::parameter_changed (const char
*** 1163,1168 ****
--- 1184,1191 ----
  	} else if (PARAM_IS ("seamless-loop")) {
  		ActionManager::map_some_state ("options", "toggle-seamless-loop", &Configuration::get_seamless_loop);
  
+ 	} else if (PARAM_IS ("keep-tearoffs")) {
+ 		ActionManager::map_some_state ("Common", "KeepTearoffs", &Configuration::get_keep_tearoffs);
  	} else if (PARAM_IS ("mmc-control")) {
  		ActionManager::map_some_state ("options", "UseMMC", &Configuration::get_mmc_control);
  
diff -p -r ardour-2.8.4-view_window-reorder/gtk2_ardour/editor.cc ardour-2.8.4-keep-toolbars/gtk2_ardour/editor.cc
*** ardour-2.8.4-view_window-reorder/gtk2_ardour/editor.cc	2009-11-13 06:06:21.000000000 -0800
--- ardour-2.8.4-keep-toolbars/gtk2_ardour/editor.cc	2009-12-25 11:09:08.754596730 -0800
*************** Editor::maximise_editing_space ()
*** 4260,4265 ****
--- 4260,4270 ----
  	} else {
  		edit_pane.set_position (post_maximal_pane_position);
  	}
+ 
+ 	if (Config->get_keep_tearoffs()) {
+ 		mouse_mode_tearoff->set_visible (true);
+ 		tools_tearoff->set_visible (true);
+ 	}
  }
  
  void
diff -p -r ardour-2.8.4-view_window-reorder/libs/ardour/ardour/configuration_vars.h ardour-2.8.4-keep-toolbars/libs/ardour/ardour/configuration_vars.h
*** ardour-2.8.4-view_window-reorder/libs/ardour/ardour/configuration_vars.h	2009-06-14 06:12:03.000000000 -0700
--- ardour-2.8.4-keep-toolbars/libs/ardour/ardour/configuration_vars.h	2009-12-25 11:09:08.754596730 -0800
*************** CONFIG_VARIABLE (uint32_t, periodic_safe
*** 160,165 ****
--- 160,166 ----
  CONFIG_VARIABLE (float, automation_interval, "automation-interval", 50)
  CONFIG_VARIABLE (bool, sync_all_route_ordering, "sync-all-route-ordering", true)
  CONFIG_VARIABLE (bool, only_copy_imported_files, "only-copy-imported-files", false)
+ CONFIG_VARIABLE (bool, keep_tearoffs, "keep-tearoffs", false)
  CONFIG_VARIABLE (bool, new_plugins_active, "new-plugins-active", true)
  CONFIG_VARIABLE (std::string, keyboard_layout, "keyboard-layout", "ansi")
  CONFIG_VARIABLE (std::string, default_bindings, "default-bindings", "ardour")

dx9s

2009-12-25 20:35

reporter   ~0007251

BLEW.. how this thing deals with URLs.. redoing the text about Maximised here:

Also I did research on Maximise http://m-w.com/dictionary/maximise vs. Maximize. But I did NOT find a spelling for Maximised http://m-w.com/dictionary/Maximised vs. Maximized http://m-w.com/dictionary/Maximized even tho the FireFox spell checker likes Maximise/Maximised.

seablade

2009-12-30 01:27

manager   ~0007272

Assigned to Paul to take a look. I glanced through the 3.0 patch and didn't notice anything bad, so I would bet this is probably about the same.

    Seablade

Issue History

Date Modified Username Field Change
2009-12-25 20:21 dx9s New Issue
2009-12-25 20:21 dx9s File Added: keep-toolbars-no-reorder-2.8.4.patch.txt
2009-12-25 20:22 dx9s File Added: view_window-reorder-2.8.4.patch.txt
2009-12-25 20:22 dx9s File Added: keep-toolbars-with-reorder-2.8.4.patch.txt
2009-12-25 20:24 dx9s Tag Attached: polish
2009-12-25 20:35 dx9s Note Added: 0007251
2009-12-30 01:26 seablade Status new => assigned
2009-12-30 01:26 seablade Assigned To => paul
2009-12-30 01:27 seablade Note Added: 0007272