From 4a0f94395d130a55107249a74f1adf4b758afd76 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 5 Feb 2008 15:34:13 +0000 Subject: [PATCH] adjusting region fade in/out lengths makes the fade in/out active; new font sizes; new font generation code in gtk2_ardour/SConscript; move mixer strip/group pane over to the RHS to match the editor; clean up ardour-sae-de.bindings.in; fix glue-to-music-time menu item (was always active) git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3010 d708f5d6-7413-0410-9779-e7cbd77b26cf --- SConstruct | 1 + gtk2_ardour/SConscript | 120 +++-- gtk2_ardour/ardour-sae-de.bindings.in | 683 ++++++++++++++------------ gtk2_ardour/ardour.bindings.in | 4 +- gtk2_ardour/ardour2_ui_dark.rc.in | 18 +- gtk2_ardour/ardour2_ui_light.rc.in | 19 +- gtk2_ardour/ardour_ui.cc | 1 - gtk2_ardour/audio_clock.cc | 7 +- gtk2_ardour/editor.cc | 2 +- gtk2_ardour/editor_mouse.cc | 2 + gtk2_ardour/editor_ops.cc | 2 + gtk2_ardour/mixer_ui.cc | 4 +- 12 files changed, 448 insertions(+), 415 deletions(-) diff --git a/SConstruct b/SConstruct index 87295b9fc0..6839618cc4 100644 --- a/SConstruct +++ b/SConstruct @@ -31,6 +31,7 @@ opts.AddOptions( BoolOption('COREAUDIO', 'Compile with Apple\'s CoreAudio library', 0), BoolOption('GTKOSX', 'Compile for use with GTK-OSX, not GTK-X11', 0), BoolOption('NATIVE_OSX_KEYS', 'Build key bindings file that matches OS X conventions', 0), + BoolOption('OLDFONTS', 'Old school font sizes', 0), BoolOption('DEBUG', 'Set to build with debugging information and no optimizations', 0), PathOption('DESTDIR', 'Set the intermediate install "prefix"', '/'), EnumOption('DIST_TARGET', 'Build target for cross compiling packagers', 'auto', allowed_values=('auto', 'i386', 'i686', 'x86_64', 'powerpc', 'tiger', 'panther', 'leopard', 'none' ), ignorecase=2), diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript index b6baecf320..b54f5d1897 100644 --- a/gtk2_ardour/SConscript +++ b/gtk2_ardour/SConscript @@ -323,74 +323,66 @@ if gtkardour['IS_OSX']: # # OS X font rendering is different even with X11 # - my_font_dict['%FONT_TINY%'] = 'Lucida Grande 7' - my_font_dict['%FONT_SMALLERER%'] = 'Lucida Grande 8' - my_font_dict['%FONT_SMALLER%'] = 'Lucida Grande 9' - my_font_dict['%FONT_SMALL%'] = 'Lucida Grande 10' - my_font_dict['%FONT_NORMAL%'] = 'Lucida Grande 11' - my_font_dict['%FONT_BIG%'] = 'Lucida Grande 12' - my_font_dict['%FONT_BIGGER%'] = 'Lucida Grande 14' - my_font_dict['%FONT_LARGE%'] = 'Lucida Grande 18' - my_font_dict['%FONT_LARGER%'] = 'Lucida Grande 28' - my_font_dict['%FONT_HUGER%'] = 'Lucida Grande 36' - my_font_dict['%FONT_MASSIVE%'] = 'Lucida Grande 60' - my_font_dict['%FONT_BOLD_TINY%'] = 'Lucida Grande bold 7' - my_font_dict['%FONT_BOLD_SMALLER%'] = 'Lucida Grande bold 9' - my_font_dict['%FONT_BOLD_SMALL%'] = 'Lucida Grande bold 10' - my_font_dict['%FONT_BOLD_NORMAL%'] = 'Lucida Grande bold 11' - my_font_dict['%FONT_BOLD_BIG%'] = 'Lucida Grande bold 13' - my_font_dict['%FONT_BOLD_BIGGER%'] = 'Lucida Grande bold 14' - my_font_dict['%FONT_BOLD_LARGE%'] = 'Lucida Grande bold 20' - my_font_dict['%FONT_BOLD_LARGER%'] = 'Lucida Grande bold 25' - my_font_dict['%FONT_BOLD_HUGER%'] = 'Lucida Grande bold 36' - my_font_dict['%FONT_BOLD_MASSIVE%'] = 'Lucida Grande bold 60' - my_font_dict['%FONT_ITALIC_TINY%'] = 'Lucida Grande italic 7' - my_font_dict['%FONT_ITALIC_SMALLER%'] = 'Lucida Grande italic 9' - my_font_dict['%FONT_ITALIC_SMALL%'] = 'Lucida Grande italic 10' - my_font_dict['%FONT_ITALIC_NORMAL%'] = 'Lucida Grande italic 11' - my_font_dict['%FONT_ITALIC_BIG%'] = 'Lucida Grande italic 15' - my_font_dict['%FONT_ITALIC_BIGGER%'] = 'Lucida Grande italic 16' - my_font_dict['%FONT_ITALIC_LARGE%'] = 'Lucida Grande italic 20' - my_font_dict['%FONT_ITALIC_LARGER%'] = 'Lucida Grande italic 28' - my_font_dict['%FONT_ITALIC_HUGER%'] = 'Lucida Grande italic 36' - my_font_dict['%FONT_ITALIC_MASSIVE%'] = 'Lucida Grande italic 60' + + font_sizes = { + 'TINY' : '7', + 'SMALLER' : '9', + 'SMALL' : '10', + 'NORMAL' : '11', + 'BIG' : '12', + 'BIGGER' : '14', + 'LARGE' : '18', + 'LARGER' : '28', + 'HUGER' : '36', + 'MASSIVE' : '60' + } + basefont = "Lucida Grande" + else: # # Linux/X11 font rendering # - my_font_dict['%FONT_TINY%'] = 'sans 4' - my_font_dict['%FONT_SMALLERER%'] = 'sans 6' - my_font_dict['%FONT_SMALLER%'] = 'sans 6' - my_font_dict['%FONT_SMALL%'] = 'sans 7' - my_font_dict['%FONT_NORMAL%'] = 'sans 8' - my_font_dict['%FONT_BIG%'] = 'sans 12' - my_font_dict['%FONT_BIGGER%'] = 'sans 14' - my_font_dict['%FONT_LARGE%'] = 'sans 18' - my_font_dict['%FONT_LARGER%'] = 'sans 24' - my_font_dict['%FONT_HUGER%'] = 'sans 34' - my_font_dict['%FONT_MASSIVE%'] = 'sans 60' - my_font_dict['%FONT_BOLD_TINY%'] = 'sans bold 4' - my_font_dict['%FONT_BOLD_SMALLER%'] = 'sans bold 6' - my_font_dict['%FONT_BOLD_SMALL%'] = 'sans bold 7' - my_font_dict['%FONT_BOLD_NORMAL%'] = 'sans bold 8' - my_font_dict['%FONT_BOLD_BIG%'] = 'sans bold 12' - my_font_dict['%FONT_BOLD_BIGGER%'] = 'sans bold 14' - my_font_dict['%FONT_BOLD_LARGE%'] = 'sans bold 18' - my_font_dict['%FONT_BOLD_LARGER%'] = 'sans bold 24' - my_font_dict['%FONT_BOLD_HUGE%'] = 'sans bold 25' - my_font_dict['%FONT_BOLD_HUGER%'] = 'sans bold 34' - my_font_dict['%FONT_BOLD_MASSIVE%'] = 'sans bold 60' - my_font_dict['%FONT_ITALIC_TINY%'] = 'sans italic 4' - my_font_dict['%FONT_ITALIC_SMALLER%'] = 'sans italic 6' - my_font_dict['%FONT_ITALIC_SMALL%'] = 'sans italic 7' - my_font_dict['%FONT_ITALIC_NORMAL%'] = 'sans italic 8' - my_font_dict['%FONT_ITALIC_BIG%'] = 'sans italic 12' - my_font_dict['%FONT_ITALIC_BIGGER%'] = 'sans italic 14' - my_font_dict['%FONT_ITALIC_LARGE%'] = 'sans italic 18' - my_font_dict['%FONT_ITALIC_LARGER%'] = 'sans italic 24' - my_font_dict['%FONT_ITALIC_HUGE%'] = 'sans italic 25' - my_font_dict['%FONT_ITALIC_HUGER%'] = 'sans italic 34' - my_font_dict['%FONT_ITALIC_MASSIVE%'] = 'sans italic 60' + + if gtkardour['OLDFONTS']: + font_sizes = { + 'TINY' : '4', + 'SMALLER' : '6', + 'SMALL' : '7', + 'NORMAL' : '8', + 'BIG' : '12', + 'BIGGER' : '14', + 'LARGE' : '18', + 'LARGER' : '24', + 'HUGER' : '34', + 'MASSIVE' : '60' + } + else: + font_sizes = { + 'TINY' : '6', + 'SMALLER' : '8', + 'SMALL' : '9', + 'NORMAL' : '10', + 'BIG' : '14', + 'BIGGER' : '16', + 'LARGE' : '18', + 'LARGER' : '24', + 'HUGER' : '34', + 'MASSIVE' : '60' + } + + basefont = "sans" + +for style in ['', 'BOLD', 'ITALIC']: + for sizename,points in font_sizes.iteritems(): + if (len (style)): + key = "_".join (['FONT',style,sizename]) + fontstyle = " ".join ([basefont,style.lower(),points]) + else: + key = "_".join (['FONT',sizename]) + fontstyle = " ".join ([basefont,points]) + + key = '%' + key + '%' + my_font_dict[key] = fontstyle ardour_dark_theme = env.SubstInFile ('ardour2_ui_dark.rc', 'ardour2_ui_dark.rc.in', SUBST_DICT = my_font_dict) ardour_light_theme = env.SubstInFile ('ardour2_ui_light.rc', 'ardour2_ui_light.rc.in', SUBST_DICT = my_font_dict) diff --git a/gtk2_ardour/ardour-sae-de.bindings.in b/gtk2_ardour/ardour-sae-de.bindings.in index 68f9b13b0b..e0758e5c04 100644 --- a/gtk2_ardour/ardour-sae-de.bindings.in +++ b/gtk2_ardour/ardour-sae-de.bindings.in @@ -1,348 +1,399 @@ -; ardour GtkAccelMap rc-file -*- scheme -*- -; this file is an automated accelerator map dump +; ardour-2.2 GtkAccelMap rc-file -*- scheme -*- +; this file is a hand-edited map that is processed by scons +; to produce a real accelmap. ; -; (gtk_accel_path "/RegionList/RegionListSort" "") -(gtk_accel_path "/Common/Quit" "<%PRIMARY%>q") -(gtk_accel_path "/Common/Save" "<%PRIMARY%>s") -; (gtk_accel_path "/Editor/Pullup" "") -(gtk_accel_path "/Editor/zoom-to-session" "<%SECONDARY%>z") -; (gtk_accel_path "/JACK/JACKReconnect" "") -; (gtk_accel_path "/Editor/Autoconnect" "") -; (gtk_accel_path "/Editor/Edit" "") -(gtk_accel_path "/Editor/cycle-edit-point" "asciicircum") -(gtk_accel_path "/Editor/cycle-edit-point-with-marker" "<%SECONDARY%>asciicircum") -(gtk_accel_path "/Editor/toggle-edit-mode" "1") -(gtk_accel_path "/Editor/cycle-snap-mode" "2") -(gtk_accel_path "/Editor/cycle-snap-choice" "3") -; (gtk_accel_path "/redirectmenu/copy" "") -; (gtk_accel_path "/options/MeterFalloffFaster" "") + +;; punctuation + +(gtk_accel_path "/Transport/ToggleRoll" "space") (gtk_accel_path "/Transport/ToggleRollForgetCapture" "<%PRIMARY%>space") (gtk_accel_path "/Transport/record-roll" "<%TERTIARY%>space") -(gtk_accel_path "/Transport/Record" "<%TERTIARY%>r") -; (gtk_accel_path "/RegionList/SortByRegionLength" "") -; (gtk_accel_path "/options/MeterFalloffSlowest" "") -; (gtk_accel_path "/Editor/playhead-to-previous-region-sync" "") -; (gtk_accel_path "/redirectmenu/deactivate_all" "") -; (gtk_accel_path "/RegionList/SortByRegionPosition" "") -; (gtk_accel_path "/Editor/ZoomFocus" "") -(gtk_accel_path "/Editor/addExistingAudioFiles" "<%PRIMARY%>i") -; (gtk_accel_path "/options/MeterFalloffSlow" "") -; (gtk_accel_path "/RegionList/rlHide" "") -; (gtk_accel_path "/Main/Metering" "") -(gtk_accel_path "/Editor/playhead-to-next-region-boundary" "rightarrow") -(gtk_accel_path "/Editor/selected-marker-to-next-region-boundary" "<%PRIMARY%><%TERTIARY%>rightarrow") -; (gtk_accel_path "/Zoom/zoom-focus-playhead" "") -; (gtk_accel_path "/Editor/center-edit-cursor" "") -; (gtk_accel_path "/Editor/Monitoring" "") -; (gtk_accel_path "/redirectmenu/deactivate" "") -; (gtk_accel_path "/options/LatchedRecordEnable" "") -; (gtk_accel_path "/Transport/TogglePunchIn" "") -; (gtk_accel_path "/ShuttleActions/SetShuttleUnitsPercentage" "") -(gtk_accel_path "/Main/Close" "<%PRIMARY%>w") -(gtk_accel_path "/Main/New" "<%PRIMARY%>n") -(gtk_accel_path "/Editor/nudge-next-backward" "<%PRIMARY%>KP_Subtract") -; (gtk_accel_path "/Editor/EditSelectRangeOptions" "") -; (gtk_accel_path "/Transport/ToggleTimeMaster" "") -; (gtk_accel_path "/Snap/snap-to-thirds" "") -(gtk_accel_path "/Editor/align-regions-start-relative" "<%LEVEL4%>less") -(gtk_accel_path "/Editor/align-regions-start" "<%LEVEL4%><%SECONDARY%>less") -; (gtk_accel_path "/Main/Export" "<%PRIMARY%>e") -(gtk_accel_path "/Editor/jump-forward-to-mark" "<%PRIMARY%>KP_6") -; (gtk_accel_path "/Editor/Smpte30" "") -; (gtk_accel_path "/Editor/playhead-to-range-start" "") -; (gtk_accel_path "/Editor/Subframes" "") -; (gtk_accel_path "/Editor/Smpte2997drop" "") -(gtk_accel_path "/Main/AddTrackBus" "<%PRIMARY%><%TERTIARY%>n") + (gtk_accel_path "/Editor/align-regions-end" "<%PRIMARY%><%SECONDARY%>less") (gtk_accel_path "/Editor/align-regions-end-relative" "<%PRIMARY%>less") -; (gtk_accel_path "/JACK/JACKDisconnect" "") -; (gtk_accel_path "/options/MeterFalloffFast" "") -; (gtk_accel_path "/options/FileDataFormatFloat" "") -; (gtk_accel_path "/Snap/snap-to-region-end" "") +(gtk_accel_path "/Editor/align-regions-start" "<%LEVEL4%><%SECONDARY%>less") +(gtk_accel_path "/Editor/align-regions-start-relative" "<%LEVEL4%>less") +(gtk_accel_path "/Editor/align-regions-sync" "<%SECONDARY%>less") +(gtk_accel_path "/Editor/align-regions-sync-relative" "less") + (gtk_accel_path "/Editor/edit-cursor-to-next-region-sync" "semicolon") -; (gtk_accel_path "/options/StopRecordingOnXrun" "") -; (gtk_accel_path "/RegionList/SortDescending" "") -; (gtk_accel_path "/options/DoNotRunPluginsWhileRecording" "") -; (gtk_accel_path "/Editor/PullupNone" "") -(gtk_accel_path "/MouseMode/set-mouse-mode-range" "r") -(gtk_accel_path "/Editor/jump-backward-to-mark" "<%PRIMARY%>KP_4") -; (gtk_accel_path "/Main/AudioFileFormatData" "") -; (gtk_accel_path "/options/MeterFalloffFastest" "") +(gtk_accel_path "/Editor/edit-cursor-to-previous-region-sync" "apostrophe") +(gtk_accel_path "/Editor/cycle-edit-point" "asciicircum") +(gtk_accel_path "/Editor/cycle-edit-point-with-marker" "<%SECONDARY%>asciicircum") + +(gtk_accel_path "/Editor/extend-range-to-end-of-region" "rightanglebracket") +(gtk_accel_path "/Editor/extend-range-to-start-of-region" "leftanglebracket") + +(gtk_accel_path "/Editor/set-loop-from-edit-range" "bracketright") +(gtk_accel_path "/Editor/set-loop-from-region" "<%PRIMARY%><%SECONDARY%>bracketright") +(gtk_accel_path "/Editor/loop-region" "<%PRIMARY%>bracketright") + +(gtk_accel_path "/Editor/set-punch-from-edit-range" "bracketleft") + +(gtk_accel_path "/Editor/trim-from-start" "<%TERTIARY%>braceleft") +(gtk_accel_path "/Editor/trim-to-end" "<%TERTIARY%>braceright") + +;; letters + +;; OBERE ZEILE + +(gtk_accel_path "/Editor/set-fade-in-length" "q") +(gtk_accel_path "/Common/Quit" "<%PRIMARY%>q") +(gtk_accel_path "/Editor/toggle-fade-in-active" "<%SECONDARY%>q") + +;; note that ctrl-w is special and consumed by the keyboard snooper + (gtk_accel_path "/Editor/audition-at-mouse" "w") -(gtk_accel_path "/Transport/Forward" "<%PRIMARY%>rightarrow") -; (gtk_accel_path "/Snap/snap-to-smpte-seconds" "") -; (gtk_accel_path "/Snap/snap-to-smpte-frame" "") -; (gtk_accel_path "/Main/ExportSelection" "") -; (gtk_accel_path "/options/StopPluginsWithTransport" "") -(gtk_accel_path "/Editor/editor-paste" "<%PRIMARY%>v") -(gtk_accel_path "/Editor/scroll-tracks-down" "Page_Down") -(gtk_accel_path "/Editor/select-next-route" "downarrow") -(gtk_accel_path "/Editor/select-prev-route" "uparrow") -; (gtk_accel_path "/Snap/snap-to-smpte-minutes" "") -; (gtk_accel_path "/Main/FlushWastebasket" "") -(gtk_accel_path "/Editor/normalize-region" "n") -(gtk_accel_path "/Editor/nudge-forward" "h") -; (gtk_accel_path "/RegionList/SortByRegionEndinFile" "") -; (gtk_accel_path "/Editor/ToggleMeasureVisibility" "") -; (gtk_accel_path "/Zoom/zoom-focus-center" "") -(gtk_accel_path "/Editor/nudge-backward" "g") -; (gtk_accel_path "/options/LatchedSolo" "") -; (gtk_accel_path "/options/MeterHoldOff" "") -; (gtk_accel_path "/options/OutputAutoConnectMaster" "") -; (gtk_accel_path "/JACK/JACKLatency64" "") -(gtk_accel_path "/Editor/undo" "<%PRIMARY%>z") +(gtk_accel_path "/Main/Close" "<%PRIMARY%>w") +(gtk_accel_path "/Editor/set-fade-out-length" "e") +(gtk_accel_path "/Main/ExportSession" "<%PRIMARY%>e") +(gtk_accel_path "/Editor/select-all-before-edit-cursor" "<%PRIMARY%>e") +(gtk_accel_path "/Editor/toggle-fade-out-active" "<%SECONDARY%>e") +(gtk_accel_path "/Editor/show-editor-mixer" "<%TERTIARY%>e") +(gtk_accel_path "/Common/goto-editor" "<%WINDOW%>e") +(gtk_accel_path "/Editor/select-all-after-edit-cursor" "<%TERTIARY%><%PRIMARY%>e") +(gtk_accel_path "/MouseMode/set-mouse-mode-range" "r") +(gtk_accel_path "/Editor/redo" "<%PRIMARY%>r") +(gtk_accel_path "/Transport/Record" "<%TERTIARY%>r") +(gtk_accel_path "/Editor/temporal-zoom-out" "r") +(gtk_accel_path "/Editor/temporal-zoom-in" "t") +(gtk_accel_path "/Editor/split-region" "y") +(gtk_accel_path "/Editor/set-region-sync-position" "u") (gtk_accel_path "/Editor/insert-region" "i") -; (gtk_accel_path "/Editor/center-playhead" "") -; (gtk_accel_path "/Snap/snap-to-region-start" "") -; (gtk_accel_path "/Editor/View" "") -; (gtk_accel_path "/Editor/Layering" "") -; (gtk_accel_path "/JACK/JACKLatency4096" "") -(gtk_accel_path "/Editor/scroll-tracks-up" "Page_Up") +(gtk_accel_path "/Editor/addExistingAudioFiles" "<%PRIMARY%>i") +(gtk_accel_path "/Editor/invert-selection" "<%TERTIARY%>i") +(gtk_accel_path "/Common/ToggleOptionsEditor" "<%WINDOW%>o") +(gtk_accel_path "/Main/Open" "<%PRIMARY%>o") +(gtk_accel_path "/Main/Recent" "<%PRIMARY%><%TERTIARY%>o") +(gtk_accel_path "/Editor/set-playhead" "p") +(gtk_accel_path "/Editor/select-all-in-punch-range" "<%TERTIARY%>p") + +;; MITTELZEILE + +(gtk_accel_path "/Editor/trim-front" "a") +(gtk_accel_path "/Editor/select-all" "<%PRIMARY%>a") +(gtk_accel_path "/Editor/trim-back" "s") +(gtk_accel_path "/Common/Save" "<%PRIMARY%>s") +(gtk_accel_path "/Main/Snapshot" "<%PRIMARY%><%TERTIARY%>s") +(gtk_accel_path "/Editor/duplicate-region" "d") +(gtk_accel_path "/Editor/multi-duplicate-region" "<%SECONDARY%>d") +(gtk_accel_path "/Editor/toggle-follow-playhead" "f") (gtk_accel_path "/Editor/set-edit-point" "g") -; (gtk_accel_path "/Editor/Smpte30drop" "") -; (gtk_accel_path "/Zoom/zoom-focus-edit" "") +(gtk_accel_path "/MouseMode/set-mouse-mode-gain" "g") +(gtk_accel_path "/Editor/nudge-backward" "g") +(gtk_accel_path "/Editor/nudge-forward" "h") +(gtk_accel_path "/Common/ToggleKeyEditor" "<%WINDOW%>k") +(gtk_accel_path "/Common/ToggleLocations" "<%WINDOW%>l") +(gtk_accel_path "/Transport/Loop" "l") +(gtk_accel_path "/Editor/select-all-in-loop-range" "<%TERTIARY%>l") + +;; UNTERE ZEILE + +(gtk_accel_path "/Editor/zoom-to-region" "z") +(gtk_accel_path "/Editor/undo" "<%PRIMARY%>z") +(gtk_accel_path "/Editor/zoom-to-session" "<%SECONDARY%>z") +(gtk_accel_path "/Editor/toggle-zoom" "<%TERTIARY%>z") +(gtk_accel_path "/Editor/editor-separate" "x") +(gtk_accel_path "/Editor/editor-cut" "<%PRIMARY%>x") +(gtk_accel_path "/Editor/crop" "c") +(gtk_accel_path "/Editor/editor-copy" "<%PRIMARY%>c") +(gtk_accel_path "/Common/ToggleColorManager" "<%WINDOW%>c") +(gtk_accel_path "/Editor/editor-paste" "<%PRIMARY%>v") +(gtk_accel_path "/Common/ToggleBigClock" "<%WINDOW%>b") +(gtk_accel_path "/Editor/normalize-region" "n") +(gtk_accel_path "/Main/New" "<%PRIMARY%>n") +(gtk_accel_path "/Main/AddTrackBus" "<%PRIMARY%><%TERTIARY%>n") +(gtk_accel_path "/Common/goto-mixer" "<%WINDOW%>m") +(gtk_accel_path "/Editor/add-location-from-playhead" "m") +(gtk_accel_path "/Editor/mute-unmute-region" "<%SECONDARY%>m") + +;; arrow keys, navigation etc. + +(gtk_accel_path "/Editor/playhead-to-edit" "Return") +(gtk_accel_path "/Editor/edit-to-playhead" "<%SECONDARY%>Return") +(gtk_accel_path "/Editor/editor-delete" "BackSpace") +(gtk_accel_path "/Editor/remove-last-capture" "<%PRIMARY%>Delete") + (gtk_accel_path "/Editor/playhead-to-previous-region-boundary" "leftarrow") +(gtk_accel_path "/Transport/Rewind" "<%PRIMARY%>leftarrow") +(gtk_accel_path "/Editor/tab-to-transient-backwards" "<%SECONDARY%>leftarrow") +(gtk_accel_path "/Editor/nudge-playhead-backward" "<%TERTIARY%>leftarrow") (gtk_accel_path "/Editor/selected-marker-to-previous-region-boundary" "<%PRIMARY%><%TERTIARY%>leftarrow") -; (gtk_accel_path "/Editor/EditCursorMovementOptions" "") -; (gtk_accel_path "/redirectmenu/activate_all" "") -; (gtk_accel_path "/redirectmenu/paste" "") -; (gtk_accel_path "/Editor/Smpte25" "") -; (gtk_accel_path "/options/RegionEquivalentsOverlap" "") -; (gtk_accel_path "/Main/MeteringFallOffRate" "") -; (gtk_accel_path "/options/UseHardwareMonitoring" "") -; (gtk_accel_path "/Editor/Smpte24" "") -; (gtk_accel_path "/Snap/snap-to-mark" "") -; (gtk_accel_path "/Editor/CrossfadesShort" "") -; (gtk_accel_path "/Editor/Smpte5994" "") -; (gtk_accel_path "/JACK/JACKLatency8192" "") -; (gtk_accel_path "/Editor/toggle-xfades-visible" "") -(gtk_accel_path "/Editor/extend-range-to-end-of-region" "rightanglebracket") + +(gtk_accel_path "/Editor/playhead-to-next-region-boundary" "rightarrow") +(gtk_accel_path "/Transport/Forward" "<%PRIMARY%>rightarrow") +(gtk_accel_path "/Editor/tab-to-transient-forwards" "<%SECONDARY%>rightarrow") +(gtk_accel_path "/Editor/nudge-playhead-forward" "<%TERTIARY%>rightarrow") +(gtk_accel_path "/Editor/selected-marker-to-next-region-boundary" "<%PRIMARY%><%TERTIARY%>rightarrow") + +(gtk_accel_path "/Editor/scroll-tracks-down" "Page_Down") +(gtk_accel_path "/Editor/scroll-tracks-up" "Page_Up") + +(gtk_accel_path "/Transport/GotoEnd" "End") +(gtk_accel_path "/Editor/select-all-after-edit-cursor" "<%TERTIARY%>End") +(gtk_accel_path "/Editor/select-all-after-playhead" "<%TERTIARY%><%PRIMARY%>End") + +(gtk_accel_path "/Transport/GotoStart" "Home") +(gtk_accel_path "/Editor/select-all-before-edit-cursor" "<%TERTIARY%>Home") +(gtk_accel_path "/Editor/select-all-before-playhead" "<%TERTIARY%>Home") + +(gtk_accel_path "/Editor/select-prev-route" "uparrow") +(gtk_accel_path "/Transport/TransitionToRoll" "<%PRIMARY%>uparrow") +(gtk_accel_path "/Editor/select-next-route" "downarrow") +(gtk_accel_path "/Transport/TransitionToReverse" "<%PRIMARY%>downarrow") + +;; keypad + +(gtk_accel_path "/Editor/finish-add-range" "<%TERTIARY%><%PRIMARY%>KP_Up") +(gtk_accel_path "/Editor/goto-mark-1" "KP_1") +(gtk_accel_path "/Editor/goto-mark-2" "KP_2") +(gtk_accel_path "/Editor/goto-mark-3" "KP_3") +(gtk_accel_path "/Editor/goto-mark-4" "KP_4") +(gtk_accel_path "/Editor/jump-backward-to-mark" "<%PRIMARY%>KP_4") +(gtk_accel_path "/Editor/goto-mark-5" "KP_5") +(gtk_accel_path "/Editor/goto-mark-6" "KP_6") +(gtk_accel_path "/Editor/jump-forward-to-mark" "<%PRIMARY%>KP_6") +(gtk_accel_path "/Editor/goto-mark-7" "KP_7") +(gtk_accel_path "/Editor/goto-mark-8" "KP_8") +(gtk_accel_path "/Editor/goto-mark-9" "KP_9") +(gtk_accel_path "/Editor/nudge-next-backward" "<%PRIMARY%>KP_Subtract") +(gtk_accel_path "/Editor/nudge-next-forward" "<%PRIMARY%>KP_Add") +(gtk_accel_path "/Transport/GotoZero" "KP_Insert") + +;; F-N keys + (gtk_accel_path "/Editor/start-range" "F1") -; (gtk_accel_path "/ShuttleActions/SetShuttleUnitsSemitones" "") -; (gtk_accel_path "/JACK/JACKLatency128" "") -; (gtk_accel_path "/Snap/snap-to-beat" "") -; (gtk_accel_path "/Editor/RegionEditOps" "") -; (gtk_accel_path "/Editor/snap-magnetic" "") -; (gtk_accel_path "/Editor/playhead-to-range-end" "") -(gtk_accel_path "/Editor/scroll-playhead-forward" "<%TERTIARY%>rightarrow") -(gtk_accel_path "/Editor/align-regions-sync-relative" "less") -(gtk_accel_path "/Editor/align-regions-sync" "<%SECONDARY%>less") +(gtk_accel_path "/Editor/edit-cursor-to-range-start" "<%TERTIARY%>F1") +(gtk_accel_path "/Editor/finish-range" "F2") +(gtk_accel_path "/Editor/edit-cursor-to-range-end" "<%TERTIARY%>F2") +(gtk_accel_path "/Editor/brush-at-mouse" "F3") +(gtk_accel_path "/Common/ToggleMaximalEditor" "F11") +(gtk_accel_path "/Editor/select-all" "F14") +(gtk_accel_path "/Editor/invert-selection" "F15") +(gtk_accel_path "/Editor/select-all-between-cursors" "F16") + +;; numbers + +(gtk_accel_path "/Editor/toggle-edit-mode" "1") +(gtk_accel_path "/Editor/cycle-snap-mode" "2") +(gtk_accel_path "/Editor/cycle-snap-choice" "3") +(gtk_accel_path "/Transport/ToggleAutoReturn" "4") +(gtk_accel_path "/Transport/ToggleClick" "5") +(gtk_accel_path "/Editor/set-tempo-from-region" "9") +(gtk_accel_path "/Editor/set-tempo-from-edit-range" "0") + +;; +;; unbound actions +;; + + + + +; (gtk_accel_path "/Common/About" "") +; (gtk_accel_path "/Common/ToggleInspector" "") +; (gtk_accel_path "/Editor/Autoconnect" "") +; (gtk_accel_path "/Editor/Crossfades" "") +; (gtk_accel_path "/Editor/CrossfadesFull" "") +; (gtk_accel_path "/Editor/CrossfadesShort" "") +; (gtk_accel_path "/Editor/Edit" "") +; (gtk_accel_path "/Editor/EditCursorMovementOptions" "") +; (gtk_accel_path "/Editor/EditSelectRangeOptions" "") ; (gtk_accel_path "/Editor/EditSelectRegionOptions" "") -(gtk_accel_path "/Editor/crop" "c") -; (gtk_accel_path "/redirectmenu/newsend" "") -; (gtk_accel_path "/Editor/ToggleGeneric MIDISurfaceSubMenu" "") +; (gtk_accel_path "/Editor/LayerAddHigher" "") +; (gtk_accel_path "/Editor/LayerLaterHigher" "") +; (gtk_accel_path "/Editor/LayerMoveAddHigher" "") +; (gtk_accel_path "/Editor/Layering" "") ; (gtk_accel_path "/Editor/MeterFalloff" "") -; (gtk_accel_path "/RegionList/rlRemove" "") -(gtk_accel_path "/Transport/GotoStart" "Home") -(gtk_accel_path "/Editor/select-all-before-edit-cursor" "<%TERTIARY%>Home") -(gtk_accel_path "/Editor/scroll-playhead-backward" "<%TERTIARY%>leftarrow") -(gtk_accel_path "/Editor/split-region" "y") -; (gtk_accel_path "/Transport/ToggleAutoInput" "") -; (gtk_accel_path "/Snap/snap-to-thirtyseconds" "") -; (gtk_accel_path "/Snap/snap-to-minutes" "") -; (gtk_accel_path "/Main/Windows" "") -; (gtk_accel_path "/Main/CleanupUnused" "") -; (gtk_accel_path "/redirectmenu/deselectall" "<%PRIMARY%><%TERTIARY%>a") -; (gtk_accel_path "/options/SoloViaBus" "") -; (gtk_accel_path "/RegionList/rlAudition" "") -(gtk_accel_path "/Editor/set-region-sync-position" "u") +; (gtk_accel_path "/Editor/MeterHold" "") +; (gtk_accel_path "/Editor/Monitoring" "") +; (gtk_accel_path "/Editor/Pullup" "") +; (gtk_accel_path "/Editor/PullupMinus1" "") +; (gtk_accel_path "/Editor/PullupMinus4" "") +; (gtk_accel_path "/Editor/PullupMinus4Minus1" "") +; (gtk_accel_path "/Editor/PullupMinus4Plus1" "") +; (gtk_accel_path "/Editor/PullupNone" "") +; (gtk_accel_path "/Editor/PullupPlus1" "") +; (gtk_accel_path "/Editor/PullupPlus4" "") +; (gtk_accel_path "/Editor/PullupPlus4Minus1" "") ; (gtk_accel_path "/Editor/PullupPlus4Plus1" "") -; (gtk_accel_path "/Snap/snap-to-region-boundary" "") -; (gtk_accel_path "/JACK/JACK" "") -(gtk_accel_path "/Editor/editor-cut" "<%PRIMARY%>x") -(gtk_accel_path "/Editor/editor-separate" "x") -; (gtk_accel_path "/RegionList/SortAscending" "") -; (gtk_accel_path "/Main/Help" "") -; (gtk_accel_path "/options/UseExternalMonitoring" "") +; (gtk_accel_path "/Editor/RegionEditOps" "") ; (gtk_accel_path "/Editor/Smpte23976" "") -(gtk_accel_path "/Common/goto-editor" "<%PRIMARY%>e") -(gtk_accel_path "/Editor/select-all" "<%PRIMARY%>a") -(gtk_accel_path "/Editor/invert-selection" "<%TERTIARY%>i") -(gtk_accel_path "/Editor/nudge-next-forward" "<%PRIMARY%>KP_Add") -; (gtk_accel_path "/options/ShowSoloMutes" "") -; (gtk_accel_path "/Snap/snap-to-eighths" "") -(gtk_accel_path "/Editor/select-all-after-playhead" "<%TERTIARY%><%PRIMARY%>End") -(gtk_accel_path "/Common/ToggleMaximalEditor" "F11") -; (gtk_accel_path "/RegionList/SortBySourceFileLength" "") +; (gtk_accel_path "/Editor/Smpte24" "") +; (gtk_accel_path "/Editor/Smpte24976" "") +; (gtk_accel_path "/Editor/Smpte25" "") +; (gtk_accel_path "/Editor/Smpte2997" "") +; (gtk_accel_path "/Editor/Smpte2997drop" "") +; (gtk_accel_path "/Editor/Smpte30" "") +; (gtk_accel_path "/Editor/Smpte30drop" "") +; (gtk_accel_path "/Editor/Smpte5994" "") +; (gtk_accel_path "/Editor/Smpte60" "") +; (gtk_accel_path "/Editor/SnapMode" "") +; (gtk_accel_path "/Editor/SnapTo" "") +; (gtk_accel_path "/Editor/Solo" "") +; (gtk_accel_path "/Editor/Subframes" "") +; (gtk_accel_path "/Editor/Subframes100" "") +; (gtk_accel_path "/Editor/Subframes80" "") ; (gtk_accel_path "/Editor/Timecode" "") -; (gtk_accel_path "/Transport/PlaySelection" "") -; (gtk_accel_path "/Editor/PullupMinus4Minus1" "") -(gtk_accel_path "/Editor/select-all-after-edit-cursor" "<%TERTIARY%><%PRIMARY%>e") -; (gtk_accel_path "/RegionList/SortBySourceFileName" "") -(gtk_accel_path "/Editor/finish-range" "F2") -(gtk_accel_path "/Editor/select-range-between-cursors" "F16") -(gtk_accel_path "/Transport/Loop" "l") -; (gtk_accel_path "/Editor/CrossfadesFull" "") -(gtk_accel_path "/Editor/finish-add-range" "<%TERTIARY%><%PRIMARY%>KP_Up") -; (gtk_accel_path "/options/SendMTC" "") -; (gtk_accel_path "/Transport/TogglePunchOut" "") -(gtk_accel_path "/Editor/select-all-in-loop-range" "<%TERTIARY%>l") -(gtk_accel_path "/Editor/show-editor-mixer" "<%TERTIARY%>e") -; (gtk_accel_path "/options/SoloInPlace" "") +; (gtk_accel_path "/Editor/ToggleGeneric MIDISurface" "") +; (gtk_accel_path "/Editor/ToggleGeneric MIDISurfaceFeedback" "") +; (gtk_accel_path "/Editor/ToggleGeneric MIDISurfaceSubMenu" "") +; (gtk_accel_path "/Editor/ToggleMeasureVisibility" "") +; (gtk_accel_path "/Editor/ToggleWaveformVisibility" "") +; (gtk_accel_path "/Editor/ToggleWaveformsWhileRecording" "") +; (gtk_accel_path "/Editor/View" "") +; (gtk_accel_path "/Editor/ZoomFocus" "") +; (gtk_accel_path "/Editor/center-edit-cursor" "") +; (gtk_accel_path "/Editor/center-playhead" "") +; (gtk_accel_path "/Editor/playhead-to-next-region-sync" "") +; (gtk_accel_path "/Editor/playhead-to-previous-region-sync" "") +; (gtk_accel_path "/Editor/playhead-to-range-end" "") +; (gtk_accel_path "/Editor/playhead-to-range-start" "") +; (gtk_accel_path "/Editor/snap-magnetic" "") +; (gtk_accel_path "/Editor/snap-normal" "") +; (gtk_accel_path "/Editor/toggle-auto-xfades" "") +; (gtk_accel_path "/Editor/toggle-xfades-active" "") +; (gtk_accel_path "/Editor/toggle-xfades-visible" "") +; (gtk_accel_path "/JACK/JACK" "") +; (gtk_accel_path "/JACK/JACKDisconnect" "") +; (gtk_accel_path "/JACK/JACKLatency1024" "") +; (gtk_accel_path "/JACK/JACKLatency128" "") +; (gtk_accel_path "/JACK/JACKLatency2048" "") +; (gtk_accel_path "/JACK/JACKLatency256" "") +; (gtk_accel_path "/JACK/JACKLatency32" "") +; (gtk_accel_path "/JACK/JACKLatency4096" "") +; (gtk_accel_path "/JACK/JACKLatency512" "") +; (gtk_accel_path "/JACK/JACKLatency64" "") +; (gtk_accel_path "/JACK/JACKLatency8192" "") +; (gtk_accel_path "/JACK/JACKReconnect" "") +; (gtk_accel_path "/JACK/Latency" "") +; (gtk_accel_path "/Main/AudioFileFormat" "") +; (gtk_accel_path "/Main/AudioFileFormatData" "") +; (gtk_accel_path "/Main/AudioFileFormatHeader" "") +; (gtk_accel_path "/Main/Cleanup" "") +; (gtk_accel_path "/Main/CleanupUnused" "") +; (gtk_accel_path "/Main/ControlSurfaces" "") +; (gtk_accel_path "/Main/Export" "<%PRIMARY%>e") +; (gtk_accel_path "/Main/ExportRangeMarkers" "") +; (gtk_accel_path "/Main/ExportSelection" "") +; (gtk_accel_path "/Main/FlushWastebasket" "") +; (gtk_accel_path "/Main/Help" "") +; (gtk_accel_path "/Main/KeyMouse Actions" "") +; (gtk_accel_path "/Main/Metering" "") +; (gtk_accel_path "/Main/MeteringFallOffRate" "") +; (gtk_accel_path "/Main/MeteringHoldTime" "") ; (gtk_accel_path "/Main/Options" "") -; (gtk_accel_path "/options/MeterFalloffMedium" "") -(gtk_accel_path "/Editor/toggle-follow-playhead" "f") ; (gtk_accel_path "/Main/SaveTemplate" "") -(gtk_accel_path "/Transport/TransitionToRoll" "<%PRIMARY%>uparrow") -; (gtk_accel_path "/RegionList/SortByRegionStartinFile" "") -; (gtk_accel_path "/options/GainReduceFastTransport" "") -; (gtk_accel_path "/Common/ToggleInspector" "") -; (gtk_accel_path "/Transport/ToggleAutoPlay" "") -; (gtk_accel_path "/Editor/playhead-to-next-region-sync" "") -(gtk_accel_path "/Editor/edit-to-playhead" "<%SECONDARY%>Return") -; (gtk_accel_path "/Editor/LayerMoveAddHigher" "") -; (gtk_accel_path "/Editor/Smpte60" "") -(gtk_accel_path "/Main/Open" "<%PRIMARY%>o") -; (gtk_accel_path "/Zoom/zoom-focus-left" "") -; (gtk_accel_path "/Main/TransportOptions" "") -; (gtk_accel_path "/Main/ControlSurfaces" "") -; (gtk_accel_path "/options/FileHeaderFormatBWF" "") -; (gtk_accel_path "/Transport/ToggleAutoReturn" "") -; (gtk_accel_path "/Editor/Smpte2997" "") -; (gtk_accel_path "/Editor/ToggleWaveformVisibility" "") -(gtk_accel_path "/Editor/redo" "<%PRIMARY%>r") -(gtk_accel_path "/Main/ExportSession" "<%PRIMARY%>e") -; (gtk_accel_path "/options/InputAutoConnectPhysical" "") -; (gtk_accel_path "/Snap/snap-to-edit-cursor" "") -(gtk_accel_path "/Editor/temporal-zoom-in" "t") -; (gtk_accel_path "/JACK/Latency" "") -(gtk_accel_path "/Editor/edit-cursor-to-range-end" "<%TERTIARY%>F2") -; (gtk_accel_path "/redirectmenu/rename" "") -; (gtk_accel_path "/RegionList/rlShowAuto" "") -(gtk_accel_path "/Editor/select-all-before-playhead" "<%TERTIARY%>Home") ; (gtk_accel_path "/Main/Session" "") -(gtk_accel_path "/Editor/edit-cursor-to-range-start" "<%TERTIARY%>F1") -; (gtk_accel_path "/Main/AudioFileFormat" "") -; (gtk_accel_path "/Transport/Transport" "") +; (gtk_accel_path "/Main/TransportOptions" "") +; (gtk_accel_path "/Main/Windows" "") ; (gtk_accel_path "/MouseMode/set-mouse-mode-timefx" "t") +; (gtk_accel_path "/RegionList/RegionListSort" "") +; (gtk_accel_path "/RegionList/SortAscending" "") +; (gtk_accel_path "/RegionList/SortByRegionEndinFile" "") +; (gtk_accel_path "/RegionList/SortByRegionLength" "") ; (gtk_accel_path "/RegionList/SortByRegionName" "") -; (gtk_accel_path "/Main/KeyMouse Actions" "") -(gtk_accel_path "/MouseMode/set-mouse-mode-gain" "g") -; (gtk_accel_path "/Snap/snap-to-frame" "") -; (gtk_accel_path "/Editor/SnapTo" "") -(gtk_accel_path "/Transport/TransitionToReverse" "<%PRIMARY%>downarrow") -; (gtk_accel_path "/Editor/Crossfades" "") -; (gtk_accel_path "/Editor/PullupPlus4" "") -; (gtk_accel_path "/Main/MeteringHoldTime" "") -; (gtk_accel_path "/Editor/PullupPlus1" "") -; (gtk_accel_path "/Editor/Smpte24976" "") -; (gtk_accel_path "/options/FileDataFormat24bit" "") -; (gtk_accel_path "/Editor/SnapMode" "") -(gtk_accel_path "/Common/ToggleOptionsEditor" "<%PRIMARY%>o") -; (gtk_accel_path "/Editor/PullupMinus4" "") -(gtk_accel_path "/Common/goto-mixer" "<%PRIMARY%>m") +; (gtk_accel_path "/RegionList/SortByRegionPosition" "") +; (gtk_accel_path "/RegionList/SortByRegionStartinFile" "") +; (gtk_accel_path "/RegionList/SortByRegionTimestamp" "") ; (gtk_accel_path "/RegionList/SortBySourceFileCreationDate" "") -; (gtk_accel_path "/redirectmenu/activate" "") -(gtk_accel_path "/Editor/extend-range-to-start-of-region" "leftanglebracket") -; (gtk_accel_path "/Editor/PullupMinus1" "") -; (gtk_accel_path "/Editor/snap-normal" "") -(gtk_accel_path "/Common/ToggleBigClock" "<%PRIMARY%>b") -(gtk_accel_path "/Common/ToggleKeyEditor" "<%PRIMARY%>k") +; (gtk_accel_path "/RegionList/SortBySourceFileLength" "") +; (gtk_accel_path "/RegionList/SortBySourceFileName" "") +; (gtk_accel_path "/RegionList/SortBySourceFilesystem" "") +; (gtk_accel_path "/RegionList/SortDescending" "") +; (gtk_accel_path "/RegionList/rlAudition" "") +; (gtk_accel_path "/RegionList/rlHide" "") +; (gtk_accel_path "/RegionList/rlRemove" "") +; (gtk_accel_path "/RegionList/rlShowAll" "") +; (gtk_accel_path "/RegionList/rlShowAuto" "") +; (gtk_accel_path "/ShuttleActions/SetShuttleUnitsPercentage" "") +; (gtk_accel_path "/ShuttleActions/SetShuttleUnitsSemitones" "") ; (gtk_accel_path "/Snap/snap-to-asixteenthbeat" "") -(gtk_accel_path "/Editor/select-all-in-punch-range" "<%TERTIARY%>p") -; (gtk_accel_path "/redirectmenu/edit" "") -(gtk_accel_path "/Editor/duplicate-region" "d") -(gtk_accel_path "/Editor/multi-duplicate-region" "<%SECONDARY%>d") -; (gtk_accel_path "/JACK/JACKLatency2048" "") -; (gtk_accel_path "/Editor/ToggleWaveformsWhileRecording" "") -; (gtk_accel_path "/Zoom/zoom-focus-right" "") -(gtk_accel_path "/Editor/remove-last-capture" "<%PRIMARY%>Delete") -; (gtk_accel_path "/options/FileHeaderFormatWAVE" "") -(gtk_accel_path "/Transport/GotoZero" "KP_Insert") -(gtk_accel_path "/Editor/select-all-after-edit-cursor" "<%TERTIARY%>End") -; (gtk_accel_path "/redirectmenu/cut" "") -; (gtk_accel_path "/redirectmenu/newinsert" "") -; (gtk_accel_path "/options/UseMMC" "") -; (gtk_accel_path "/options/MeterFalloffOff" "") -;(gtk_accel_path "/MouseMode/set-mouse-mode-object" "o") -; (gtk_accel_path "/Editor/PullupMinus4Plus1" "") -; (gtk_accel_path "/Editor/MeterHold" "") +; (gtk_accel_path "/Snap/snap-to-bar" "") +; (gtk_accel_path "/Snap/snap-to-beat" "") ; (gtk_accel_path "/Snap/snap-to-cd-frame" "") -; (gtk_accel_path "/options/StopTransportAtEndOfSession" "") -; (gtk_accel_path "/Main/Cleanup" "") -(gtk_accel_path "/Main/Snapshot" "<%PRIMARY%><%TERTIARY%>s") +; (gtk_accel_path "/Snap/snap-to-edit-cursor" "") +; (gtk_accel_path "/Snap/snap-to-eighths" "") +; (gtk_accel_path "/Snap/snap-to-frame" "") +; (gtk_accel_path "/Snap/snap-to-mark" "") +; (gtk_accel_path "/Snap/snap-to-minutes" "") +; (gtk_accel_path "/Snap/snap-to-quarters" "") +; (gtk_accel_path "/Snap/snap-to-region-boundary" "") +; (gtk_accel_path "/Snap/snap-to-region-end" "") +; (gtk_accel_path "/Snap/snap-to-region-start" "") +; (gtk_accel_path "/Snap/snap-to-region-sync" "") +; (gtk_accel_path "/Snap/snap-to-seconds" "") +; (gtk_accel_path "/Snap/snap-to-smpte-frame" "") +; (gtk_accel_path "/Snap/snap-to-smpte-minutes" "") +; (gtk_accel_path "/Snap/snap-to-smpte-seconds" "") +; (gtk_accel_path "/Snap/snap-to-thirds" "") +; (gtk_accel_path "/Snap/snap-to-thirtyseconds" "") +; (gtk_accel_path "/Transport/PlaySelection" "") +; (gtk_accel_path "/Transport/ToggleAutoInput" "") +; (gtk_accel_path "/Transport/ToggleAutoPlay" "") +; (gtk_accel_path "/Transport/ToggleAutoReturn" "") +; (gtk_accel_path "/Transport/TogglePunchIn" "") +; (gtk_accel_path "/Transport/TogglePunchOut" "") +; (gtk_accel_path "/Transport/ToggleTimeMaster" "") ; (gtk_accel_path "/Transport/ToggleVideoSync" "") -(gtk_accel_path "/Transport/ToggleRoll" "space") -; (gtk_accel_path "/RegionList/SortBySourceFilesystem" "") -(gtk_accel_path "/Common/ToggleColorManager" "<%PRIMARY%>c") -; (gtk_accel_path "/Common/About" "") -; (gtk_accel_path "/JACK/JACKLatency32" "") -(gtk_accel_path "/Editor/playhead-to-edit" "Return") +; (gtk_accel_path "/Transport/Transport" "") +; (gtk_accel_path "/Zoom/zoom-focus-center" "") +; (gtk_accel_path "/Zoom/zoom-focus-edit" "") +; (gtk_accel_path "/Zoom/zoom-focus-left" "") +; (gtk_accel_path "/Zoom/zoom-focus-playhead" "") +; (gtk_accel_path "/Zoom/zoom-focus-right" "") +; (gtk_accel_path "/options/DoNotRunPluginsWhileRecording" "") +; (gtk_accel_path "/options/FileDataFormat24bit" "") +; (gtk_accel_path "/options/FileDataFormatFloat" "") +; (gtk_accel_path "/options/FileHeaderFormatBWF" "") +; (gtk_accel_path "/options/FileHeaderFormatCAF" "") +; (gtk_accel_path "/options/FileHeaderFormatWAVE" "") ; (gtk_accel_path "/options/FileHeaderFormatWAVE64" "") -(gtk_accel_path "/Editor/brush-at-mouse" "F3") -; (gtk_accel_path "/RegionList/rlShowAll" "") -(gtk_accel_path "/Transport/Rewind" "<%PRIMARY%>leftarrow") -; (gtk_accel_path "/RegionList/SortByRegionTimestamp" "") -; (gtk_accel_path "/options/VerifyRemoveLastCapture" "") +; (gtk_accel_path "/options/GainReduceFastTransport" "") +; (gtk_accel_path "/options/InputAutoConnectManual" "") +; (gtk_accel_path "/options/InputAutoConnectPhysical" "") +; (gtk_accel_path "/options/LatchedRecordEnable" "") +; (gtk_accel_path "/options/LatchedSolo" "") +; (gtk_accel_path "/options/MeterFalloffFast" "") +; (gtk_accel_path "/options/MeterFalloffFaster" "") +; (gtk_accel_path "/options/MeterFalloffFastest" "") +; (gtk_accel_path "/options/MeterFalloffMedium" "") +; (gtk_accel_path "/options/MeterFalloffOff" "") +; (gtk_accel_path "/options/MeterFalloffSlow" "") +; (gtk_accel_path "/options/MeterFalloffSlowest" "") +; (gtk_accel_path "/options/MeterHoldLong" "") +; (gtk_accel_path "/options/MeterHoldMedium" "") +; (gtk_accel_path "/options/MeterHoldOff" "") +; (gtk_accel_path "/options/MeterHoldShort" "") +; (gtk_accel_path "/options/OutputAutoConnectManual" "") +; (gtk_accel_path "/options/OutputAutoConnectMaster" "") ; (gtk_accel_path "/options/OutputAutoConnectPhysical" "") +; (gtk_accel_path "/options/RegionEquivalentsOverlap" "") ; (gtk_accel_path "/options/SendMMC" "") -; (gtk_accel_path "/Editor/toggle-auto-xfades" "") -; (gtk_accel_path "/Main/AudioFileFormatHeader" "") -; (gtk_accel_path "/options/MeterHoldShort" "") -; (gtk_accel_path "/options/MeterHoldMedium" "") -(gtk_accel_path "/Editor/select-all-before-edit-cursor" "<%PRIMARY%>e") -; (gtk_accel_path "/Editor/Subframes80" "") -; (gtk_accel_path "/options/FileHeaderFormatCAF" "") -(gtk_accel_path "/Common/ToggleLocations" "<%PRIMARY%>l") -; (gtk_accel_path "/Editor/ToggleGeneric MIDISurface" "") -(gtk_accel_path "/Editor/editor-delete" "BackSpace") -; (gtk_accel_path "/JACK/JACKLatency256" "") -(gtk_accel_path "/Editor/select-all-between-cursors" "F16") -; (gtk_accel_path "/Editor/LayerAddHigher" "") -; (gtk_accel_path "/Editor/Solo" "") -; (gtk_accel_path "/JACK/JACKLatency1024" "") -; (gtk_accel_path "/Main/ExportRangeMarkers" "") -(gtk_accel_path "/Editor/set-playhead" "p") -; (gtk_accel_path "/Editor/toggle-xfades-active" "") -; (gtk_accel_path "/Snap/snap-to-bar" "") -; (gtk_accel_path "/Editor/LayerLaterHigher" "") -; (gtk_accel_path "/redirectmenu/selectall" "") -(gtk_accel_path "/Editor/editor-copy" "<%PRIMARY%>c") -; (gtk_accel_path "/Snap/snap-to-quarters" "") -(gtk_accel_path "/Editor/temporal-zoom-out" "r") +; (gtk_accel_path "/options/SendMTC" "") +; (gtk_accel_path "/options/ShowSoloMutes" "") +; (gtk_accel_path "/options/SoloInPlace" "") +; (gtk_accel_path "/options/SoloViaBus" "") +; (gtk_accel_path "/options/StopPluginsWithTransport" "") +; (gtk_accel_path "/options/StopRecordingOnXrun" "") +; (gtk_accel_path "/options/StopTransportAtEndOfSession" "") +; (gtk_accel_path "/options/UseExternalMonitoring" "") +; (gtk_accel_path "/options/UseHardwareMonitoring" "") +; (gtk_accel_path "/options/UseMMC" "") ; (gtk_accel_path "/options/UseSoftwareMonitoring" "") -; (gtk_accel_path "/Editor/Subframes100" "") -(gtk_accel_path "/Editor/mute-unmute-region" "<%SECONDARY%>m") -(gtk_accel_path "/Editor/add-location-from-playhead" "m") -; (gtk_accel_path "/options/OutputAutoConnectManual" "") -; (gtk_accel_path "/Snap/snap-to-region-sync" "") -(gtk_accel_path "/Editor/edit-cursor-to-previous-region-sync" "apostrophe") +; (gtk_accel_path "/options/VerifyRemoveLastCapture" "") +; (gtk_accel_path "/redirectmenu/activate" "") +; (gtk_accel_path "/redirectmenu/activate_all" "") ; (gtk_accel_path "/redirectmenu/clear" "") -; (gtk_accel_path "/Editor/ToggleGeneric MIDISurfaceFeedback" "") -; (gtk_accel_path "/Editor/PullupPlus4Minus1" "") -; (gtk_accel_path "/JACK/JACKLatency512" "") -(gtk_accel_path "/Main/Recent" "<%PRIMARY%><%TERTIARY%>o") +; (gtk_accel_path "/redirectmenu/copy" "") +; (gtk_accel_path "/redirectmenu/cut" "") +; (gtk_accel_path "/redirectmenu/deactivate" "") +; (gtk_accel_path "/redirectmenu/deactivate_all" "") +; (gtk_accel_path "/redirectmenu/deselectall" "<%PRIMARY%><%TERTIARY%>a") +; (gtk_accel_path "/redirectmenu/edit" "") +; (gtk_accel_path "/redirectmenu/newinsert" "") ; (gtk_accel_path "/redirectmenu/newplugin" "") -; (gtk_accel_path "/options/InputAutoConnectManual" "") -; (gtk_accel_path "/options/MeterHoldLong" "") -; (gtk_accel_path "/Snap/snap-to-seconds" "") -(gtk_accel_path "/Editor/set-fade-in-length" "q") -(gtk_accel_path "/Editor/toggle-fade-in-active" "<%SECONDARY%>q") -(gtk_accel_path "/Editor/set-fade-out-length" "e") -(gtk_accel_path "/Editor/toggle-fade-out-active" "<%SECONDARY%>e") -(gtk_accel_path "/Editor/trim-from-start" "<%TERTIARY%>braceleft") -(gtk_accel_path "/Editor/trim-to-end" "<%TERTIARY%>braceright") -(gtk_accel_path "/Editor/trim-front" "a") -(gtk_accel_path "/Editor/trim-back" "s") -(gtk_accel_path "/Editor/goto-mark-1" "KP_1") -(gtk_accel_path "/Editor/goto-mark-2" "KP_2") -(gtk_accel_path "/Editor/goto-mark-3" "KP_3") -(gtk_accel_path "/Editor/goto-mark-4" "KP_4") -(gtk_accel_path "/Editor/goto-mark-5" "KP_5") -(gtk_accel_path "/Editor/goto-mark-6" "KP_6") -(gtk_accel_path "/Editor/goto-mark-7" "KP_7") -(gtk_accel_path "/Editor/goto-mark-8" "KP_8") -(gtk_accel_path "/Editor/goto-mark-9" "KP_9") -(gtk_accel_path "/Transport/ToggleClick" "5") -(gtk_accel_path "/Transport/ToggleAutoReturn" "4") -(gtk_accel_path "/Editor/set-tempo-from-region" "9") -(gtk_accel_path "/Editor/set-tempo-from-edit-range" "0") -(gtk_accel_path "/Transport/focus-on-clock" "KP_Divide") -(gtk_accel_path "/Editor/set-loop-from-edit-range" "bracketright") -(gtk_accel_path "/Editor/set-punch-from-edit-range" "bracketleft") -(gtk_accel_path "/Editor/set-loop-from-region" "<%PRIMARY%><%SECONDARY%>bracketright") -(gtk_accel_path "/Editor/loop-region" "<%PRIMARY%>bracketright") -(gtk_accel_path "/Editor/toggle-zoom" "<%TERTIARY%>z") -(gtk_accel_path "/Editor/zoom-to-region" "z") - - +; (gtk_accel_path "/redirectmenu/newsend" "") +; (gtk_accel_path "/redirectmenu/paste" "") +; (gtk_accel_path "/redirectmenu/rename" "") +; (gtk_accel_path "/redirectmenu/selectall" "") +;(gtk_accel_path "/MouseMode/set-mouse-mode-object" "o") diff --git a/gtk2_ardour/ardour.bindings.in b/gtk2_ardour/ardour.bindings.in index 3d21244ede..f8bf50c659 100644 --- a/gtk2_ardour/ardour.bindings.in +++ b/gtk2_ardour/ardour.bindings.in @@ -26,9 +26,7 @@ (gtk_accel_path "/Transport/record-roll" "<%TERTIARY%>space") (gtk_accel_path "/Editor/set-fade-in-length" "slash") -(gtk_accel_path "/Editor/set-fade-in-length" "<%SECONDARY%>slash") (gtk_accel_path "/Editor/set-fade-out-length" "backslash") -(gtk_accel_path "/Editor/set-fade-out-length" "<%SECONDARY%>backslash") (gtk_accel_path "/Editor/trim-from-start" "<%TERTIARY%>braceleft") (gtk_accel_path "/Editor/trim-to-end" "<%TERTIARY%>braceright") @@ -120,10 +118,12 @@ (gtk_accel_path "/Editor/playhead-to-previous-region-boundary" "leftarrow") (gtk_accel_path "/Editor/tab-to-transient-backwards" "<%PRIMARY%>leftarrow") (gtk_accel_path "/Editor/nudge-playhead-backward" "<%SECONDARY%>leftarrow") +(gtk_accel_path "/Editor/selected-marker-to-previous-region-boundary" "<%PRIMARY%><%TERTIARY%>leftarrow") (gtk_accel_path "/Editor/playhead-to-next-region-boundary" "rightarrow") (gtk_accel_path "/Editor/tab-to-transient-forwards" "<%PRIMARY%>rightarrow") (gtk_accel_path "/Editor/nudge-playhead-forward" "<%SECONDARY%>rightarrow") +(gtk_accel_path "/Editor/selected-marker-to-next-region-boundary" "<%PRIMARY%><%TERTIARY%>rightarrow") (gtk_accel_path "/Editor/scroll-tracks-down" "Page_Down") (gtk_accel_path "/Editor/scroll-tracks-up" "Page_Up") diff --git a/gtk2_ardour/ardour2_ui_dark.rc.in b/gtk2_ardour/ardour2_ui_dark.rc.in index 1be6f102b5..da1237cd1d 100644 --- a/gtk2_ardour/ardour2_ui_dark.rc.in +++ b/gtk2_ardour/ardour2_ui_dark.rc.in @@ -272,25 +272,24 @@ style "solo_button_active" = "small_button" style "mixer_solo_button" = "solo_button" { - font_name = "%FONT_SMALLERER%" + font_name = "%FONT_SMALLER%" xthickness = 0 ythickness = 0 } style "mixer_solo_button_alternate" = "solo_button_alternate" { - font_name = "%FONT_SMALLERER%" + font_name = "%FONT_SMALLER%" xthickness = 0 ythickness = 0 } style "mixer_solo_button_active" = "solo_button_active" { - font_name = "%FONT_SMALLERER%" + font_name = "%FONT_SMALLER%" xthickness = 0 ythickness = 0 } - style "mute_button" = "small_button" { } @@ -321,23 +320,16 @@ style "mute_button_active" = "small_button" fg[PRELIGHT] = { 0, 0, 0 } } -style "mixer_mute_button" = "mute_button" -{ - font_name = "%FONT_SMALLERER%" - xthickness = 0 - ythickness = 0 -} - style "mixer_mute_button_alternate" = "mute_button_alternate" { - font_name = "%FONT_SMALLERER%" + font_name = "%FONT_SMALLER%" xthickness = 0 ythickness = 0 } style "mixer_mute_button_active" = "mute_button_active" { - font_name = "%FONT_SMALLERER%" + font_name = "%FONT_SMALLER%" xthickness = 0 ythickness = 0 } diff --git a/gtk2_ardour/ardour2_ui_light.rc.in b/gtk2_ardour/ardour2_ui_light.rc.in index e5cf578620..2743087e98 100644 --- a/gtk2_ardour/ardour2_ui_light.rc.in +++ b/gtk2_ardour/ardour2_ui_light.rc.in @@ -275,20 +275,20 @@ style "solo_button_active" = "small_button" style "mixer_solo_button" = "solo_button" { - font_name = "%FONT_SMALLERER%" + font_name = "%FONT_SMALLER%" xthickness = 0 ythickness = 0 } style "mixer_solo_button_alternate" = "solo_button_alternate" { - font_name = "%FONT_SMALLERER%" + font_name = "%FONT_SMALLER%" xthickness = 0 ythickness = 0 } style "mixer_solo_button_active" = "solo_button_active" { - font_name = "%FONT_SMALLERER%" + font_name = "%FONT_SMALLER%" xthickness = 0 ythickness = 0 } @@ -324,23 +324,16 @@ style "mute_button_active" = "small_button" fg[PRELIGHT] = { 0, 0, 0 } } -style "mixer_mute_button" = "mute_button" -{ - font_name = "%FONT_SMALLERER%" - xthickness = 0 - ythickness = 0 -} - style "mixer_mute_button_alternate" = "mute_button_alternate" { - font_name = "%FONT_SMALLERER%" + font_name = "%FONT_SMALLER%" xthickness = 0 ythickness = 0 } style "mixer_mute_button_active" = "mute_button_active" { - font_name = "%FONT_SMALLERER%" + font_name = "%FONT_SMALLER%" xthickness = 0 ythickness = 0 } @@ -354,7 +347,7 @@ style "multiline_combo" = "small_button" style "mixer_mute_button" = "mute_button" { - font_name = "%FONT_SMALLERER%" + font_name = "%FONT_SMALLER%" xthickness = 0 ythickness = 0 } diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 5492c3b386..ee110c435a 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -2191,7 +2191,6 @@ ARDOUR_UI::end_loading_messages () void ARDOUR_UI::loading_message (const std::string& msg) { - cerr << "say: " << msg << endl; show_splash (); splash->message (msg); flush_pending (); diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc index 33f522f234..b42a55ad52 100644 --- a/gtk2_ardour/audio_clock.cc +++ b/gtk2_ardour/audio_clock.cc @@ -855,11 +855,12 @@ AudioClock::field_key_release_event (GdkEventKey *ev, Field field) case Bars: case Beats: case Ticks: - // Bars or beats should never be 0 - if (atoi(bars_label.get_text()) == 0) { + // Bars should never be, unless this clock is for a duration + if (atoi(bars_label.get_text()) == 0 && !is_duration) { bars_label.set_text("001"); } - if (atoi(beats_label.get_text()) == 0) { + // beats should never be 0, unless this clock is for a duration + if (atoi(beats_label.get_text()) == 0 && !is_duration) { beats_label.set_text("01"); } break; diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 93564e3313..f332effad8 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -1757,7 +1757,7 @@ Editor::add_region_context_items (AudioStreamView* sv, boost::shared_ptr bbt_glue_item->set_active (true); break; default: - bbt_glue_item->set_active (true); + bbt_glue_item->set_active (false); break; } diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index a7dd976266..c29693a4ac 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -1917,6 +1917,7 @@ Editor::fade_in_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* even XMLNode &before = alist.get_state(); tmp->audio_region()->set_fade_in_length (fade_length); + tmp->audio_region()->set_fade_in_active (true); XMLNode &after = alist.get_state(); session->add_command(new MementoCommand(alist, &before, &after)); @@ -2033,6 +2034,7 @@ Editor::fade_out_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* eve XMLNode &before = alist.get_state(); tmp->audio_region()->set_fade_out_length (fade_length); + tmp->audio_region()->set_fade_out_active (true); XMLNode &after = alist.get_state(); session->add_command(new MementoCommand(alist, &before, &after)); diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index aaa505bc81..df36c4032f 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -4425,8 +4425,10 @@ Editor::set_fade_length (bool in) if (in) { tmp->audio_region()->set_fade_in_length (len); + tmp->audio_region()->set_fade_in_active (true); } else { tmp->audio_region()->set_fade_out_length (len); + tmp->audio_region()->set_fade_out_active (true); } XMLNode &after = alist->get_state(); diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index 0181561393..44638cdb89 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -194,8 +194,8 @@ Mixer_UI::Mixer_UI () global_hpacker.pack_start (scroller, true, true); global_hpacker.pack_start (out_packer, false, false, 12); - list_hpane.add1(list_vpacker); - list_hpane.add2(global_hpacker); + list_hpane.add1(global_hpacker); + list_hpane.add2(list_vpacker); rhs_pane1.signal_size_allocate().connect (bind (mem_fun(*this, &Mixer_UI::pane_allocation_handler), static_cast (&rhs_pane1))); -- 2.30.2