View Issue Details
| ID | Project | Category | View Status | Date Submitted | Last Update |
|---|---|---|---|---|---|
| 0002974 | ardour | features | public | 2009-12-26 03:59 | 2020-04-19 20:14 |
| Reporter | dx9s | Assigned To | paul | ||
| Priority | normal | Severity | feature | Reproducibility | N/A |
| Status | closed | Resolution | fixed | ||
| Platform | Linux | OS | Ubuntu | OS Version | 9.10 |
| Target Version | 3.0-beta1 | ||||
| Summary | 0002974: [PATCH] 1) reorganizes View/Window menus 2) Keep Toolbars | ||||
| Description | with a little help on upgrading to boost 1.40 (and related boost dev) from Paul, and after updating old feature patches to 2.8.4 (see http://tracker.ardour.org/view.php?id=2973 )... I think I ported them to 3.0 (rev 6398) successfully!! REALLY, I was really expecting a few things to give me problems. Attached are three files (PNG of the two menus original, post first patch, and post both patches) AND the two patch files! Have fun! (I am sure there is some coding standard I broke and things will need cleaning up or something). --Doug (dx9s) | ||||
| Additional Information | See attached image to get a preview of the changes. | ||||
| Tags | No tags attached. | ||||
|
2009-12-26 03:59
|
view_window_reorder-6398.patch.txt (41,632 bytes)
diff -p -r ardour3.0-6398-orig/gtk2_ardour/ardour.menus.in ardour3.0-6398-view_window-reorder/gtk2_ardour/ardour.menus.in *** ardour3.0-6398-orig/gtk2_ardour/ardour.menus.in 2009-12-25 17:12:56.818596689 -0800 --- ardour3.0-6398-view_window-reorder/gtk2_ardour/ardour.menus.in 2009-12-25 17:28:29.946098615 -0800 *************** *** 1,512 **** <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'/> ! <menu name='Metadata' action='Metadata'> ! <menuitem action='EditMetadata'/> ! <menuitem action='ImportMetadata'/> ! </menu> ! <separator/> ! <menuitem action='AddTrackBus'/> ! <separator/> ! <menuitem action='addExistingAudioFiles'/> ! <menuitem action='importFromSession'/> ! <separator/> ! <menu name='Export' action='Export'> ! <menuitem action='ExportAudio'/> ! </menu> ! <separator/> ! <menu name='Cleanup' action='Cleanup'> ! <menuitem action='CleanupUnused'/> ! <menuitem action='FlushWastebasket'/> ! </menu> ! <separator/> ! <menuitem action='ToggleSessionOptionsEditor'/> ! <separator/> #ifdef GTKOSX ! <menuitem action='ToggleRCOptionsEditor'/> ! <menuitem action='About'/> #endif ! <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='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/> ! <menu action='SyncMenu'> ! <menuitem action='SendMTC'/> ! <menuitem action='SendMMC'/> ! <menuitem action='UseMMC'/> ! <menuitem action='SendMidiClock'/> ! </menu> ! <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='panic'/> ! <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'/> ! <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/> ! <menuitem action='editor-delete'/> ! <menuitem action='editor-crop'/> ! <menuitem action='split-region'/> ! <menu action="SeparateMenu"> ! <menuitem action='editor-separate'/> ! <menuitem action='separate-from-loop'/> ! <menuitem action='separate-from-punch'/> ! <separator/> ! <menuitem action='split-region-at-transients'/> ! </menu> ! <menu action="AlignMenu"> ! <menuitem action='align-regions-start'/> ! <menuitem action='align-regions-start-relative'/> ! <menuitem action='align-regions-end'/> ! <menuitem action='align-regions-end-relative'/> ! <menuitem action='align-regions-sync'/> ! <menuitem action='align-regions-sync-relative'/> ! </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'/> ! <menuitem action='trim-to-previous-region'/> ! <menuitem action='trim-to-next-region'/> ! </menu> ! <menu action="FadeMenu"> ! <menuitem action='set-fade-in-length'/> ! <menuitem action='toggle-fade-in-active'/> ! <menuitem action='set-fade-out-length'/> ! <menuitem action='toggle-fade-out-active'/> ! </menu> ! <separator/> ! <menuitem action='remove-last-capture'/> ! <separator/> ! <menu action='KeyMouseActions'> ! <menuitem action='select-next-route'/> ! <menuitem action='select-prev-route'/> ! <menuitem action='brush-at-mouse'/> ! <separator/> ! <menuitem action='step-mouse-mode'/> ! <menuitem action='set-mouse-mode-object'/> ! <menuitem action='set-mouse-mode-range'/> ! <menuitem action='set-mouse-mode-gain'/> ! <menuitem action='set-mouse-mode-zoom'/> ! <menuitem action='set-mouse-mode-timefx'/> ! <separator/> ! <menuitem action='toggle-internal-edit'/> ! <separator/> ! <menuitem action='cycle-edit-point'/> ! <menuitem action='cycle-edit-point-with-marker'/> ! <menuitem action='toggle-edit-mode'/> ! <separator/> ! <menuitem action='boost-region-gain'/> ! <menuitem action='cut-region-gain'/> ! <separator/> ! <menuitem action='break-drag'/> ! </menu> ! <menu action="TempoMenu"> ! <menuitem action='set-tempo-from-region'/> ! <menuitem action='set-tempo-from-edit-range'/> ! </menu> #ifndef GTKOSX ! <separator/> ! <menuitem action='ToggleRCOptionsEditor'/> #endif ! </menu> ! <menu action='RegionMenu'> ! <menuitem action='insert-region'/> ! <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> ! <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-mouse'/> ! <menuitem action='zoom-focus-edit'/> ! </menu> ! <menu name='SnapMode' action='SnapMode'> ! <menuitem action='snap-off'/> ! <menuitem action='snap-normal'/> ! <menuitem action='snap-magnetic'/> ! <separator/> ! <menuitem action='cycle-snap-mode'/> ! <menuitem action='cycle-snap-choice'/> ! </menu> ! <menu name='SnapTo' action='SnapTo'> ! <menuitem action='snap-to-cd-frame'/> ! <menuitem action='snap-to-timecode-frame'/> ! <menuitem action='snap-to-timecode-seconds'/> ! <menuitem action='snap-to-timecode-minutes'/> ! <menuitem action='snap-to-seconds'/> ! <menuitem action='snap-to-minutes'/> ! <menuitem action='snap-to-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 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='show-editor-list'/> ! <menuitem action='ToggleMeasureVisibility'/> ! <menuitem action='ToggleWaveformsWhileRecording'/> ! <menuitem action='ToggleSummary'/> ! <menuitem action='ToggleGroupTabs'/> ! </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'/> ! <menuitem action='ToggleInspector'/> ! <menuitem action='ToggleLocations'/> ! <menuitem action='ToggleKeyEditor'/> ! <menuitem action='ToggleBundleManager'/> ! <menuitem action='ToggleThemeManager'/> ! <menuitem action='ToggleBigClock'/> ! <menuitem action='toggle-rhythm-ferret'/> ! <menuitem action='toggle-audio-connection-manager'/> ! <menuitem action='toggle-midi-connection-manager'/> ! <menuitem action='toggle-log-window'/> ! <separator/> ! </menu> ! <menu name='Help' action='Help'> ! <menuitem action='About'/> ! </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='processormenu'> ! <menuitem action='newplugin'/> ! <menuitem action='newinsert'/> ! <menuitem action='newsend'/> ! <menuitem action='newaux'/> ! <separator/> ! <menuitem action='clear'/> ! <menuitem action='clear_pre'/> ! <menuitem action='clear_post'/> ! <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_all'/> ! <menuitem action='deactivate_all'/> ! <menuitem action='ab_plugins'/> ! <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,530 ---- <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'/> ! <menu action='Metadata' name='Metadata'> ! <menuitem action='EditMetadata'/> ! <menuitem action='ImportMetadata'/> ! </menu> ! <separator/> ! <menuitem action='AddTrackBus'/> ! <separator/> ! <menuitem action='addExistingAudioFiles'/> ! <menuitem action='importFromSession'/> ! <separator/> ! <menu action='Export' name='Export'> ! <menuitem action='ExportAudio'/> ! </menu> ! <separator/> ! <menu action='Cleanup' name='Cleanup'> ! <menuitem action='CleanupUnused'/> ! <menuitem action='FlushWastebasket'/> ! </menu> ! <separator/> ! <menuitem action='ToggleSessionOptionsEditor'/> ! <separator/> #ifdef GTKOSX ! <menuitem action='ToggleRCOptionsEditor'/> ! <menuitem action='About'/> #endif ! <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='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/> ! <menu action='SyncMenu'> ! <menuitem action='SendMTC'/> ! <menuitem action='SendMMC'/> ! <menuitem action='UseMMC'/> ! <menuitem action='SendMidiClock'/> ! </menu> ! <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='panic'/> ! <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'/> ! <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/> ! <menuitem action='editor-delete'/> ! <menuitem action='editor-crop'/> ! <menuitem action='split-region'/> ! <menu action='SeparateMenu'> ! <menuitem action='editor-separate'/> ! <menuitem action='separate-from-loop'/> ! <menuitem action='separate-from-punch'/> ! <separator/> ! <menuitem action='split-region-at-transients'/> ! </menu> ! <menu action='AlignMenu'> ! <menuitem action='align-regions-start'/> ! <menuitem action='align-regions-start-relative'/> ! <menuitem action='align-regions-end'/> ! <menuitem action='align-regions-end-relative'/> ! <menuitem action='align-regions-sync'/> ! <menuitem action='align-regions-sync-relative'/> ! </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'/> ! <menuitem action='trim-to-previous-region'/> ! <menuitem action='trim-to-next-region'/> ! </menu> ! <menu action='FadeMenu'> ! <menuitem action='set-fade-in-length'/> ! <menuitem action='toggle-fade-in-active'/> ! <menuitem action='set-fade-out-length'/> ! <menuitem action='toggle-fade-out-active'/> ! </menu> ! <separator/> ! <menuitem action='remove-last-capture'/> ! <separator/> ! <menu action='KeyMouseActions'> ! <menuitem action='select-next-route'/> ! <menuitem action='select-prev-route'/> ! <menuitem action='brush-at-mouse'/> ! <separator/> ! <menuitem action='step-mouse-mode'/> ! <menuitem action='set-mouse-mode-object'/> ! <menuitem action='set-mouse-mode-range'/> ! <menuitem action='set-mouse-mode-gain'/> ! <menuitem action='set-mouse-mode-zoom'/> ! <menuitem action='set-mouse-mode-timefx'/> ! <separator/> ! <menuitem action='toggle-internal-edit'/> ! <separator/> ! <menuitem action='cycle-edit-point'/> ! <menuitem action='cycle-edit-point-with-marker'/> ! <menuitem action='toggle-edit-mode'/> ! <separator/> ! <menuitem action='boost-region-gain'/> ! <menuitem action='cut-region-gain'/> ! <separator/> ! <menuitem action='break-drag'/> ! </menu> ! <menu action='TempoMenu'> ! <menuitem action='set-tempo-from-region'/> ! <menuitem action='set-tempo-from-edit-range'/> ! </menu> #ifndef GTKOSX ! <separator/> ! <menuitem action='ToggleRCOptionsEditor'/> #endif ! </menu> ! ! ! <menu action='RegionMenu'> ! <menuitem action='insert-region'/> ! <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> ! <menuitem action='toggle-track-active'/> ! <menuitem action='remove-track'/> ! </menu> ! ! <menu action='View' name='View'> ! <menuitem action='ToggleMaximalEditor'/> ! <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='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-mouse'/> ! <menuitem action='zoom-focus-edit'/> ! </menu> ! <menu action='SnapMode' name='SnapMode'> ! <menuitem action='snap-off'/> ! <menuitem action='snap-normal'/> ! <menuitem action='snap-magnetic'/> ! <separator/> ! <menuitem action='cycle-snap-mode'/> ! <menuitem action='cycle-snap-choice'/> ! </menu> ! <menu action='SnapTo' name='SnapTo'> ! <menuitem action='snap-to-cd-frame'/> ! <menuitem action='snap-to-timecode-frame'/> ! <menuitem action='snap-to-timecode-seconds'/> ! <menuitem action='snap-to-timecode-minutes'/> ! <menuitem action='snap-to-seconds'/> ! <menuitem action='snap-to-minutes'/> ! <menuitem action='snap-to-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 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> ! <separator/> ! <menuitem action='show-editor-mixer'/> ! <menuitem action='show-editor-list'/> ! <menuitem action='ToggleMeasureVisibility'/> ! <menuitem action='ToggleWaveformsWhileRecording'/> ! <menuitem action='ToggleSummary'/> ! <menuitem action='ToggleGroupTabs'/> </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='ToggleInspector'/> ! <menuitem action='ToggleLocations'/> ! <menuitem action='ToggleKeyEditor'/> ! <menuitem action='ToggleBundleManager'/> ! <menuitem action='ToggleThemeManager'/> ! <menuitem action='ToggleBigClock'/> ! <separator/> ! <menuitem action='toggle-rhythm-ferret'/> ! <menuitem action='toggle-audio-connection-manager'/> ! <menuitem action='toggle-midi-connection-manager'/> ! <menuitem action='toggle-log-window'/> ! <separator/> ! </menu> ! ! ! <menu action='Help' name='Help'> ! <menuitem action='About'/> ! </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='processormenu'> ! <menuitem action='newplugin'/> ! <menuitem action='newinsert'/> ! <menuitem action='newsend'/> ! <menuitem action='newaux'/> ! <separator/> ! <menuitem action='clear'/> ! <menuitem action='clear_pre'/> ! <menuitem action='clear_post'/> ! <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_all'/> ! <menuitem action='deactivate_all'/> ! <menuitem action='ab_plugins'/> ! <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-26 04:00
|
keep-toolbar-with-reorder-6398.patch.txt (6,364 bytes)
diff -p -r ardour3.0-6398-view_window-reorder/gtk2_ardour/ardour.menus.in ardour3.0-6398-keep-toolbars/gtk2_ardour/ardour.menus.in
*** ardour3.0-6398-view_window-reorder/gtk2_ardour/ardour.menus.in 2009-12-25 17:28:29.946098615 -0800
--- ardour3.0-6398-keep-toolbars/gtk2_ardour/ardour.menus.in 2009-12-25 17:29:54.394098734 -0800
***************
*** 294,299 ****
--- 294,300 ----
<menu action='View' name='View'>
<menuitem action='ToggleMaximalEditor'/>
+ <menuitem action='KeepTearoffs'/>
<separator/>
<menu action='PrimaryClockMenu'>
<menuitem action='primary-clock-bbt'/>
diff -p -r ardour3.0-6398-view_window-reorder/gtk2_ardour/ardour_ui2.cc ardour3.0-6398-keep-toolbars/gtk2_ardour/ardour_ui2.cc
*** ardour3.0-6398-view_window-reorder/gtk2_ardour/ardour_ui2.cc 2009-12-25 13:12:28.000000000 -0800
--- ardour3.0-6398-keep-toolbars/gtk2_ardour/ardour_ui2.cc 2009-12-25 17:35:58.154098362 -0800
*************** ARDOUR_UI::maximise_editing_space ()
*** 893,898 ****
--- 893,901 ----
transport_tearoff->set_visible (false);
editor->maximise_editing_space ();
+ if (Config->get_keep_tearoffs()) {
+ transport_tearoff->set_visible (true);
+ }
}
void
diff -p -r ardour3.0-6398-view_window-reorder/gtk2_ardour/ardour_ui_ed.cc ardour3.0-6398-keep-toolbars/gtk2_ardour/ardour_ui_ed.cc
*** ardour3.0-6398-view_window-reorder/gtk2_ardour/ardour_ui_ed.cc 2009-12-25 13:12:28.000000000 -0800
--- ardour3.0-6398-keep-toolbars/gtk2_ardour/ardour_ui_ed.cc 2009-12-25 17:40:06.570098693 -0800
*************** ARDOUR_UI::install_actions ()
*** 201,206 ****
--- 201,208 ----
/* windows visibility actions */
ActionManager::register_toggle_action (common_actions, X_("ToggleMaximalEditor"), _("Maximise Editor Space"), sigc::mem_fun (*this, &ARDOUR_UI::toggle_editing_space));
+ act = ActionManager::register_toggle_action (common_actions, X_("KeepTearoffs"), _("Toolbars when Maximised"), 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"), sigc::mem_fun(*this, &ARDOUR_UI::goto_editor_window));
ActionManager::register_action (common_actions, X_("goto-mixer"), _("Show Mixer"), sigc::mem_fun(*this, &ARDOUR_UI::goto_mixer_window));
diff -p -r ardour3.0-6398-view_window-reorder/gtk2_ardour/ardour_ui.h ardour3.0-6398-keep-toolbars/gtk2_ardour/ardour_ui.h
*** ardour3.0-6398-view_window-reorder/gtk2_ardour/ardour_ui.h 2009-12-25 13:12:28.000000000 -0800
--- ardour3.0-6398-keep-toolbars/gtk2_ardour/ardour_ui.h 2009-12-25 17:44:31.754099123 -0800
*************** class ARDOUR_UI : public Gtkmm2ext::UI,
*** 172,177 ****
--- 172,179 ----
void toggle_big_clock_window ();
void toggle_route_params_window ();
void toggle_editing_space();
+ void toggle_keep_tearoffs();
+ void map_keep_tearoffs (); // this was in different place under 2.8.4
Gtk::Tooltips& tooltips() { return _tooltips; }
diff -p -r ardour3.0-6398-view_window-reorder/gtk2_ardour/ardour_ui_options.cc ardour3.0-6398-keep-toolbars/gtk2_ardour/ardour_ui_options.cc
*** ardour3.0-6398-view_window-reorder/gtk2_ardour/ardour_ui_options.cc 2009-12-25 13:12:28.000000000 -0800
--- ardour3.0-6398-keep-toolbars/gtk2_ardour/ardour_ui_options.cc 2009-12-25 17:56:53.322098849 -0800
*************** using namespace ARDOUR;
*** 47,52 ****
--- 47,73 ----
using namespace PBD;
void
+ ARDOUR_UI::toggle_keep_tearoffs()
+ {
+ ActionManager::toggle_config_state ("Common", "KeepTearoffs", &RCConfiguration::set_keep_tearoffs, &RCConfiguration::get_keep_tearoffs);
+
+ ARDOUR_UI::toggle_editing_space ();
+ }
+
+ 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::toggle_external_sync()
{
ActionManager::toggle_config_state_foo ("Transport", "ToggleExternalSync", sigc::mem_fun (_session->config, &SessionConfiguration::set_external_sync), sigc::mem_fun (_session->config, &SessionConfiguration::get_external_sync));
*************** ARDOUR_UI::parameter_changed (std::strin
*** 334,339 ****
--- 355,362 ----
}
#endif
+ } else if (p == "keep-tearoffs") {
+ ActionManager::map_some_state ("Common", "KeepTearoffs", &RCConfiguration::get_keep_tearoffs);
} else if (p == "mmc-control") {
ActionManager::map_some_state ("options", "UseMMC", &RCConfiguration::get_mmc_control);
} else if (p == "midi-feedback") {
diff -p -r ardour3.0-6398-view_window-reorder/gtk2_ardour/editor.cc ardour3.0-6398-keep-toolbars/gtk2_ardour/editor.cc
*** ardour3.0-6398-view_window-reorder/gtk2_ardour/editor.cc 2009-12-25 13:12:28.000000000 -0800
--- ardour3.0-6398-keep-toolbars/gtk2_ardour/editor.cc 2009-12-25 17:58:19.902099533 -0800
*************** Editor::maximise_editing_space ()
*** 3942,3947 ****
--- 3942,3952 ----
} 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 ardour3.0-6398-view_window-reorder/libs/ardour/ardour/rc_configuration_vars.h ardour3.0-6398-keep-toolbars/libs/ardour/ardour/rc_configuration_vars.h
*** ardour3.0-6398-view_window-reorder/libs/ardour/ardour/rc_configuration_vars.h 2009-12-25 13:12:36.000000000 -0800
--- ardour3.0-6398-keep-toolbars/libs/ardour/ardour/rc_configuration_vars.h 2009-12-25 17:25:34.314099165 -0800
*************** CONFIG_VARIABLE (uint32_t, periodic_safe
*** 137,142 ****
--- 137,143 ----
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", true)
+ 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-26 04:01
|
|
|
|
BTW I went with Maximised (as Firefox likes it, who cares if the word doesn't appear in Webster). FWIW: cross link to Ardour Forums for some more history on this feature patch + menu reorganising: http://ardour.org/node/1276 |
|
|
Assigned to Paul to take a look at the patch. Looks decent to me with the exception of the formatting of the first patch seems odd to me(I have never seen a patch formatted like that). Seablade |
|
|
note for dx9s: there's a new tearoff called _zoom_tearoff created at around line 2985 in editor.cc |
|
2010-07-22 16:47
|
keep-toolbar-with-some-menu-reorder-7463.patch.txt (10,369 bytes)
diff -p -r ardour-3.0-7463-orig/gtk2_ardour/ardour.menus.in ardour-3.0-7463-keep-tear/gtk2_ardour/ardour.menus.in
*** ardour-3.0-7463-orig/gtk2_ardour/ardour.menus.in 2010-07-21 18:04:22.000000000 -0700
--- ardour-3.0-7463-keep-tear/gtk2_ardour/ardour.menus.in 2010-07-22 07:37:00.131394591 -0700
***************
*** 297,302 ****
--- 297,322 ----
</menu>
<menu name='View' action = 'View'>
+ <menuitem action='ToggleMaximalEditor'/>
+ <menuitem action='KeepTearoffs'/>
+
+ <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="ZoomMenu">
<menuitem action='temporal-zoom-in'/>
<menuitem action='temporal-zoom-out'/>
***************
*** 341,358 ****
<menuitem action='snap-to-region-sync'/>
<menuitem action='snap-to-region-boundary'/>
</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"/>
--- 361,367 ----
<menuitem action='snap-to-region-sync'/>
<menuitem action='snap-to-region-boundary'/>
</menu>
!
<menu action="RulerMenu">
<menuitem action="toggle-minsec-ruler"/>
<menuitem action="toggle-samples-ruler"/>
***************
*** 397,403 ****
<menuitem action='goto-visual-state-12'/>
</menu>
! <menuitem action='ToggleMaximalEditor'/>
<menuitem action='show-editor-mixer'/>
<menuitem action='show-editor-list'/>
<menuitem action='ToggleMeasureVisibility'/>
--- 406,413 ----
<menuitem action='goto-visual-state-12'/>
</menu>
! <separator/>
!
<menuitem action='show-editor-mixer'/>
<menuitem action='show-editor-list'/>
<menuitem action='ToggleMeasureVisibility'/>
***************
*** 420,436 ****
</menu>
</menu>
<menu action = 'WindowMenu'>
- <menuitem action='ToggleMaximalEditor'/>
- <separator/>
<menuitem action='goto-editor'/>
<menuitem action='goto-mixer'/>
<menuitem action='toggle-editor-mixer-on-top'/>
<menuitem action='ToggleInspector'/>
<menuitem action='ToggleLocations'/>
<menuitem action='ToggleKeyEditor'/>
<menuitem action='ToggleBundleManager'/>
<menuitem action='ToggleThemeManager'/>
<menuitem action='ToggleBigClock'/>
<menuitem action='NewMIDITracer'/>
<menuitem action='toggle-audio-connection-manager'/>
<menuitem action='toggle-midi-connection-manager'/>
--- 430,450 ----
</menu>
</menu>
<menu action = 'WindowMenu'>
<menuitem action='goto-editor'/>
<menuitem action='goto-mixer'/>
<menuitem action='toggle-editor-mixer-on-top'/>
+
+ <separator/>
+
<menuitem action='ToggleInspector'/>
<menuitem action='ToggleLocations'/>
<menuitem action='ToggleKeyEditor'/>
<menuitem action='ToggleBundleManager'/>
<menuitem action='ToggleThemeManager'/>
<menuitem action='ToggleBigClock'/>
+
+ <separator/>
+
<menuitem action='NewMIDITracer'/>
<menuitem action='toggle-audio-connection-manager'/>
<menuitem action='toggle-midi-connection-manager'/>
diff -p -r ardour-3.0-7463-orig/gtk2_ardour/ardour_ui2.cc ardour-3.0-7463-keep-tear/gtk2_ardour/ardour_ui2.cc
*** ardour-3.0-7463-orig/gtk2_ardour/ardour_ui2.cc 2010-07-21 18:04:22.000000000 -0700
--- ardour-3.0-7463-keep-tear/gtk2_ardour/ardour_ui2.cc 2010-07-22 09:24:30.247892843 -0700
*************** ARDOUR_UI::maximise_editing_space ()
*** 949,954 ****
--- 949,957 ----
transport_tearoff->set_visible (false);
editor->maximise_editing_space ();
+ if (Config->get_keep_tearoffs()) {
+ transport_tearoff->set_visible (true);
+ }
}
void
diff -p -r ardour-3.0-7463-orig/gtk2_ardour/ardour_ui_ed.cc ardour-3.0-7463-keep-tear/gtk2_ardour/ardour_ui_ed.cc
*** ardour-3.0-7463-orig/gtk2_ardour/ardour_ui_ed.cc 2010-07-21 18:04:22.000000000 -0700
--- ardour-3.0-7463-keep-tear/gtk2_ardour/ardour_ui_ed.cc 2010-07-22 09:25:26.215892957 -0700
*************** ARDOUR_UI::install_actions ()
*** 212,217 ****
--- 212,219 ----
/* windows visibility actions */
ActionManager::register_toggle_action (common_actions, X_("ToggleMaximalEditor"), _("Maximise Editor Space"), sigc::mem_fun (*this, &ARDOUR_UI::toggle_editing_space));
+ act = ActionManager::register_toggle_action (common_actions, X_("KeepTearoffs"), _("Toolbars when Maximised"), 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"), sigc::mem_fun(*this, &ARDOUR_UI::goto_editor_window));
ActionManager::register_action (common_actions, X_("goto-mixer"), _("Show Mixer"), sigc::mem_fun(*this, &ARDOUR_UI::goto_mixer_window));
diff -p -r ardour-3.0-7463-orig/gtk2_ardour/ardour_ui.h ardour-3.0-7463-keep-tear/gtk2_ardour/ardour_ui.h
*** ardour-3.0-7463-orig/gtk2_ardour/ardour_ui.h 2010-07-21 18:04:22.000000000 -0700
--- ardour-3.0-7463-keep-tear/gtk2_ardour/ardour_ui.h 2010-07-22 09:26:15.395895590 -0700
*************** class ARDOUR_UI : public Gtkmm2ext::UI,
*** 168,173 ****
--- 168,175 ----
void new_midi_tracer_window ();
void toggle_route_params_window ();
void toggle_editing_space();
+ void toggle_keep_tearoffs();
+ void map_keep_tearoffs();
Gtk::Tooltips& tooltips() { return _tooltips; }
diff -p -r ardour-3.0-7463-orig/gtk2_ardour/ardour_ui_options.cc ardour-3.0-7463-keep-tear/gtk2_ardour/ardour_ui_options.cc
*** ardour-3.0-7463-orig/gtk2_ardour/ardour_ui_options.cc 2010-07-21 18:04:22.000000000 -0700
--- ardour-3.0-7463-keep-tear/gtk2_ardour/ardour_ui_options.cc 2010-07-22 09:26:51.215895816 -0700
*************** using namespace ARDOUR;
*** 47,52 ****
--- 47,73 ----
using namespace PBD;
void
+ ARDOUR_UI::toggle_keep_tearoffs ()
+ {
+ ActionManager::toggle_config_state ("Common", "KeepTearoffs", &RCConfiguration::set_keep_tearoffs, &RCConfiguration::get_keep_tearoffs);
+
+ ARDOUR_UI::toggle_editing_space ();
+ }
+
+ 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::toggle_external_sync()
{
ActionManager::toggle_config_state_foo ("Transport", "ToggleExternalSync", sigc::mem_fun (_session->config, &SessionConfiguration::set_external_sync), sigc::mem_fun (_session->config, &SessionConfiguration::get_external_sync));
*************** ARDOUR_UI::parameter_changed (std::strin
*** 334,339 ****
--- 355,362 ----
}
#endif
+ } else if (p == "keep-tearoffs") {
+ ActionManager::map_some_state ("Common", "KeepTearoffs", &RCConfiguration::get_keep_tearoffs);
} else if (p == "mmc-control") {
ActionManager::map_some_state ("options", "UseMMC", &RCConfiguration::get_mmc_control);
} else if (p == "midi-feedback") {
diff -p -r ardour-3.0-7463-orig/gtk2_ardour/editor.cc ardour-3.0-7463-keep-tear/gtk2_ardour/editor.cc
*** ardour-3.0-7463-orig/gtk2_ardour/editor.cc 2010-07-21 18:04:22.000000000 -0700
--- ardour-3.0-7463-keep-tear/gtk2_ardour/editor.cc 2010-07-22 09:11:01.310342295 -0700
*************** Editor::maximise_editing_space ()
*** 4171,4176 ****
--- 4171,4182 ----
} else {
editor_summary_pane.set_position (post_maximal_vertical_pane_position);
}
+
+ if (Config->get_keep_tearoffs()) {
+ _mouse_mode_tearoff->set_visible (true);
+ _tools_tearoff->set_visible (true);
+ _zoom_tearoff->set_visible (true);
+ }
}
void
diff -p -r ardour-3.0-7463-orig/libs/ardour/ardour/rc_configuration_vars.h ardour-3.0-7463-keep-tear/libs/ardour/ardour/rc_configuration_vars.h
*** ardour-3.0-7463-orig/libs/ardour/ardour/rc_configuration_vars.h 2010-07-21 18:04:28.000000000 -0700
--- ardour-3.0-7463-keep-tear/libs/ardour/ardour/rc_configuration_vars.h 2010-07-22 08:49:26.418397130 -0700
*************** CONFIG_VARIABLE (uint32_t, periodic_safe
*** 136,141 ****
--- 136,142 ----
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")
|
|
|
uploaded a long named (descriptive) updated version of the patches composited together... It keeps all three tearoffs and saves the setting with the project as a common option (option setting stays with a project), etc. keep-toolbar-with-some-menu-reorder-7463.patch.txt The menu layout was cleaned up a little bit and looks similar to the older PNG attached to this .. but the ALT-F Rhythem Ferret is in a new menu at this point in time (only real difference between then and now) plus added some dividers to help read/view-ability of the two menus (View and Window ) Hopefully this is usable as-is. |
|
|
Applied to SVN. Thanks! |
|
|
Issue has been closed automatically, by Trigger Close Plugin. Feel free to re-open with additional information if you think the issue is not resolved. |
| Date Modified | Username | Field | Change |
|---|---|---|---|
| 2009-12-26 03:59 | dx9s | New Issue | |
| 2009-12-26 03:59 | dx9s | File Added: view_window_reorder-6398.patch.txt | |
| 2009-12-26 04:00 | dx9s | File Added: keep-toolbar-with-reorder-6398.patch.txt | |
| 2009-12-26 04:01 | dx9s | File Added: compare_orig6298_w_patches.png | |
| 2009-12-26 04:02 | dx9s | Note Added: 0007252 | |
| 2009-12-26 04:55 | dx9s | Note Edited: 0007252 | |
| 2009-12-30 01:25 | seablade | Status | new => assigned |
| 2009-12-30 01:25 | seablade | Assigned To | => paul |
| 2009-12-30 01:25 | seablade | Note Added: 0007271 | |
| 2010-07-21 15:50 | cth103 | cost | => 0.00 |
| 2010-07-21 15:50 | cth103 | Target Version | => 3.0-beta1 |
| 2010-07-21 15:50 | cth103 | Summary | Two patches 1) reorganizes View/Window menus 2) Keep Toolbars => [PATCH] 1) reorganizes View/Window menus 2) Keep Toolbars |
| 2010-07-21 23:49 | cth103 | Note Added: 0008542 | |
| 2010-07-22 16:47 | dx9s | File Added: keep-toolbar-with-some-menu-reorder-7463.patch.txt | |
| 2010-07-22 16:50 | dx9s | Note Added: 0008600 | |
| 2010-07-25 23:29 | cth103 | Note Added: 0008644 | |
| 2010-07-25 23:29 | cth103 | Status | assigned => resolved |
| 2010-07-25 23:29 | cth103 | Resolution | open => fixed |
| 2020-04-19 20:14 | system | Note Added: 0022017 | |
| 2020-04-19 20:14 | system | Status | resolved => closed |
