mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-26 00:17:49 +01:00
Update sae bindings and menus.
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@4145 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Nick Mainsbridge
parent
0276d02c0f
commit
d0ca995b4d
3 changed files with 67 additions and 47 deletions
|
|
@ -4,7 +4,7 @@
|
|||
;
|
||||
|
||||
;; punctuation
|
||||
|
||||
(gtk_accel_path "<Actions>/Editor/center-playhead" "Escape")
|
||||
(gtk_accel_path "<Actions>/Transport/ToggleRoll" "space")
|
||||
(gtk_accel_path "<Actions>/Transport/ToggleRollForgetCapture" "<%PRIMARY%>space")
|
||||
(gtk_accel_path "<Actions>/Transport/record-roll" "<%PRIMARY%>space")
|
||||
|
|
@ -16,23 +16,20 @@
|
|||
(gtk_accel_path "<Actions>/Editor/align-regions-sync" "<%SECONDARY%>less")
|
||||
(gtk_accel_path "<Actions>/Editor/align-regions-sync-relative" "less")
|
||||
|
||||
(gtk_accel_path "<Actions>/Editor/edit-cursor-to-next-region-sync" "semicolon")
|
||||
(gtk_accel_path "<Actions>/Editor/edit-cursor-to-previous-region-sync" "apostrophe")
|
||||
; (gtk_accel_path "<Actions>/Editor/edit-cursor-to-next-region-sync" "semicolon")
|
||||
; (gtk_accel_path "<Actions>/Editor/edit-cursor-to-previous-region-sync" "apostrophe")
|
||||
(gtk_accel_path "<Actions>/Editor/cycle-edit-point" "asciicircum")
|
||||
(gtk_accel_path "<Actions>/Editor/cycle-edit-point-with-marker" "<%SECONDARY%>asciicircum")
|
||||
|
||||
(gtk_accel_path "<Actions>/Editor/extend-range-to-end-of-region" "rightanglebracket")
|
||||
(gtk_accel_path "<Actions>/Editor/extend-range-to-start-of-region" "leftanglebracket")
|
||||
|
||||
(gtk_accel_path "<Actions>/Editor/set-loop-from-edit-range" "bracketright")
|
||||
(gtk_accel_path "<Actions>/Editor/set-loop-from-region" "<%PRIMARY%><%SECONDARY%>bracketright")
|
||||
(gtk_accel_path "<Actions>/Editor/loop-region" "<%PRIMARY%>bracketright")
|
||||
|
||||
(gtk_accel_path "<Actions>/Editor/set-punch-from-edit-range" "bracketleft")
|
||||
|
||||
(gtk_accel_path "<Actions>/Editor/trim-from-start" "<%TERTIARY%>braceleft")
|
||||
(gtk_accel_path "<Actions>/Editor/trim-to-end" "<%TERTIARY%>braceright")
|
||||
|
||||
(gtk_accel_path "<Actions>/Editor/play-from-edit-point-and-return" "<%LEVEL4%>space")
|
||||
(gtk_accel_path "<Actions>/Editor/play-edit-range" "<%SECONDARY%>space")
|
||||
|
||||
;; letters
|
||||
|
||||
;; OBERE ZEILE
|
||||
|
|
@ -40,20 +37,17 @@
|
|||
(gtk_accel_path "<Actions>/Editor/set-fade-in-length" "q")
|
||||
(gtk_accel_path "<Actions>/Common/Quit" "<%PRIMARY%>q")
|
||||
(gtk_accel_path "<Actions>/Editor/toggle-fade-in-active" "<%SECONDARY%>q")
|
||||
|
||||
(gtk_accel_path "<Actions>/Editor/set-playhead" "w")
|
||||
;; note that ctrl-w is special and consumed by the keyboard snooper
|
||||
|
||||
(gtk_accel_path "<Actions>/Editor/play-from-edit-point-and-return" "<%LEVEL4%>space")
|
||||
(gtk_accel_path "<Actions>/Editor/play-edit-range" "<%SECONDARY%>space")
|
||||
(gtk_accel_path "<Actions>/Editor/play-selected-regions" "s")
|
||||
|
||||
(gtk_accel_path "<Actions>/Main/Close" "<%PRIMARY%>w")
|
||||
(gtk_accel_path "<Actions>/Editor/set-fade-out-length" "e")
|
||||
(gtk_accel_path "<Actions>/Main/ExportSession" "<%PRIMARY%>e")
|
||||
(gtk_accel_path "<Actions>/Editor/select-all-before-edit-cursor" "<%PRIMARY%>e")
|
||||
|
||||
(gtk_accel_path "<Actions>/Editor/toggle-fade-out-active" "<%SECONDARY%>e")
|
||||
(gtk_accel_path "<Actions>/Editor/show-editor-mixer" "<%TERTIARY%>e")
|
||||
; (gtk_accel_path "<Actions>/Common/goto-editor" "<%SECONDARY%>e")
|
||||
(gtk_accel_path "<Actions>/Editor/select-all-after-edit-cursor" "<%TERTIARY%><%PRIMARY%>e")
|
||||
(gtk_accel_path "<Actions>/Editor/redo" "<%PRIMARY%><%TERTIARY%>z")
|
||||
(gtk_accel_path "<Actions>/Transport/Record" "<%TERTIARY%>r")
|
||||
(gtk_accel_path "<Actions>/Editor/temporal-zoom-out" "r")
|
||||
|
|
@ -66,16 +60,18 @@
|
|||
(gtk_accel_path "<Actions>/Common/ToggleOptionsEditor" "<%SECONDARY%>o")
|
||||
(gtk_accel_path "<Actions>/Main/Open" "<%PRIMARY%>o")
|
||||
(gtk_accel_path "<Actions>/Main/Recent" "<%PRIMARY%><%TERTIARY%>o")
|
||||
(gtk_accel_path "<Actions>/Editor/set-playhead" "w")
|
||||
(gtk_accel_path "<Actions>/Transport/TogglePunch" "p")
|
||||
(gtk_accel_path "<Actions>/Editor/select-all-in-punch-range" "<%TERTIARY%>p")
|
||||
|
||||
;; MITTELZEILE
|
||||
|
||||
(gtk_accel_path "<Actions>/Editor/trim-front" "a")
|
||||
(gtk_accel_path "<Actions>/Editor/select-all" "<%PRIMARY%>a")
|
||||
(gtk_accel_path "<Actions>/Editor/trim-back" "d")
|
||||
(gtk_accel_path "<Actions>/Editor/select-all-between-cursors" "<%TERTIARY%>a")
|
||||
(gtk_accel_path "<Actions>/Editor/play-selected-regions" "s")
|
||||
(gtk_accel_path "<Actions>/Common/Save" "<%PRIMARY%>s")
|
||||
(gtk_accel_path "<Actions>/Main/Snapshot" "<%PRIMARY%><%TERTIARY%>s")
|
||||
(gtk_accel_path "<Actions>/Editor/trim-back" "d")
|
||||
(gtk_accel_path "<Actions>/Editor/duplicate-region" "<%PRIMARY%>d")
|
||||
(gtk_accel_path "<Actions>/Editor/multi-duplicate-region" "<%PRIMARY%><%TERTIARY%>d")
|
||||
(gtk_accel_path "<Actions>/Editor/toggle-follow-playhead" "f")
|
||||
|
|
@ -119,23 +115,28 @@
|
|||
(gtk_accel_path "<Actions>/Transport/Rewind" "<%PRIMARY%>leftarrow")
|
||||
(gtk_accel_path "<Actions>/Editor/tab-to-transient-backwards" "<%SECONDARY%>leftarrow")
|
||||
(gtk_accel_path "<Actions>/Editor/nudge-playhead-backward" "<%TERTIARY%>leftarrow")
|
||||
(gtk_accel_path "<Actions>/Editor/jump-backward-to-mark" "<%PRIMARY%><%SECONDARY%>leftarrow")
|
||||
|
||||
(gtk_accel_path "<Actions>/Editor/selected-marker-to-previous-region-boundary" "<%PRIMARY%><%TERTIARY%>leftarrow")
|
||||
|
||||
(gtk_accel_path "<Actions>/Editor/playhead-to-next-region-boundary" "rightarrow")
|
||||
(gtk_accel_path "<Actions>/Transport/Forward" "<%PRIMARY%>rightarrow")
|
||||
(gtk_accel_path "<Actions>/Editor/tab-to-transient-forwards" "<%SECONDARY%>rightarrow")
|
||||
(gtk_accel_path "<Actions>/Editor/nudge-playhead-forward" "<%TERTIARY%>rightarrow")
|
||||
(gtk_accel_path "<Actions>/Editor/jump-forward-to-mark" "<%PRIMARY%><%SECONDARY%>rightarrow")
|
||||
|
||||
(gtk_accel_path "<Actions>/Editor/selected-marker-to-next-region-boundary" "<%PRIMARY%><%TERTIARY%>rightarrow")
|
||||
|
||||
|
||||
(gtk_accel_path "<Actions>/Editor/scroll-tracks-down" "Page_Down")
|
||||
(gtk_accel_path "<Actions>/Editor/scroll-tracks-up" "Page_Up")
|
||||
|
||||
(gtk_accel_path "<Actions>/Transport/GotoEnd" "End")
|
||||
(gtk_accel_path "<Actions>/Editor/select-all-after-edit-cursor" "<%TERTIARY%>End")
|
||||
(gtk_accel_path "<Actions>/Editor/select-all-after-playhead" "<%TERTIARY%><%PRIMARY%>End")
|
||||
(gtk_accel_path "<Actions>/Editor/select-all-after-edit-cursor" "<%PRIMARY%><%TERTIARY%>End")
|
||||
(gtk_accel_path "<Actions>/Editor/select-all-after-playhead" "<%TERTIARY%>End")
|
||||
|
||||
(gtk_accel_path "<Actions>/Transport/GotoStart" "Home")
|
||||
(gtk_accel_path "<Actions>/Editor/select-all-before-edit-cursor" "<%TERTIARY%>Home")
|
||||
(gtk_accel_path "<Actions>/Editor/select-all-before-edit-cursor" "<%PRIMARY%><%TERTIARY%>Home")
|
||||
(gtk_accel_path "<Actions>/Editor/select-all-before-playhead" "<%TERTIARY%>Home")
|
||||
|
||||
(gtk_accel_path "<Actions>/Editor/select-prev-route" "uparrow")
|
||||
|
|
@ -152,38 +153,50 @@
|
|||
(gtk_accel_path "<Actions>/Editor/goto-mark-2" "KP_2")
|
||||
(gtk_accel_path "<Actions>/Editor/goto-mark-3" "KP_3")
|
||||
(gtk_accel_path "<Actions>/Editor/goto-mark-4" "KP_4")
|
||||
(gtk_accel_path "<Actions>/Editor/jump-backward-to-mark" "<%PRIMARY%>KP_4")
|
||||
(gtk_accel_path "<Actions>/Editor/goto-mark-5" "KP_5")
|
||||
(gtk_accel_path "<Actions>/Editor/goto-mark-6" "KP_6")
|
||||
(gtk_accel_path "<Actions>/Editor/jump-forward-to-mark" "<%PRIMARY%>KP_6")
|
||||
(gtk_accel_path "<Actions>/Editor/goto-mark-7" "KP_7")
|
||||
(gtk_accel_path "<Actions>/Editor/goto-mark-8" "KP_8")
|
||||
(gtk_accel_path "<Actions>/Editor/goto-mark-9" "KP_9")
|
||||
(gtk_accel_path "<Actions>/Editor/nudge-next-backward" "<%PRIMARY%>KP_Subtract")
|
||||
(gtk_accel_path "<Actions>/Editor/cut-region-gain" "KP_Subtract")
|
||||
|
||||
(gtk_accel_path "<Actions>/Editor/nudge-next-forward" "<%PRIMARY%>KP_Add")
|
||||
(gtk_accel_path "<Actions>/Editor/boost-region-gain" "KP_Add")
|
||||
|
||||
(gtk_accel_path "<Actions>/Transport/GotoZero" "KP_Insert")
|
||||
|
||||
;; F-N keys
|
||||
|
||||
(gtk_accel_path "<Actions>/Editor/start-range" "F1")
|
||||
(gtk_accel_path "<Actions>/Editor/edit-cursor-to-range-start" "<%TERTIARY%>F1")
|
||||
(gtk_accel_path "<Actions>/Editor/finish-range" "F2")
|
||||
(gtk_accel_path "<Actions>/Editor/edit-cursor-to-range-end" "<%TERTIARY%>F2")
|
||||
(gtk_accel_path "<Actions>/Editor/brush-at-mouse" "F3")
|
||||
; (gtk_accel_path "<Actions>/Editor/start-range" "F1")
|
||||
; (gtk_accel_path "<Actions>/Editor/edit-cursor-to-range-start" "<%TERTIARY%>F1")
|
||||
; (gtk_accel_path "<Actions>/Editor/finish-range" "F2")
|
||||
; (gtk_accel_path "<Actions>/Editor/edit-cursor-to-range-end" "<%TERTIARY%>F2")
|
||||
; (gtk_accel_path "<Actions>/Editor/brush-at-mouse" "F3")
|
||||
(gtk_accel_path "<Actions>/Common/ToggleMaximalEditor" "F11")
|
||||
(gtk_accel_path "<Actions>/Editor/select-all" "F14")
|
||||
(gtk_accel_path "<Actions>/Editor/invert-selection" "F15")
|
||||
(gtk_accel_path "<Actions>/Editor/select-all-between-cursors" "F16")
|
||||
|
||||
|
||||
|
||||
|
||||
;; numbers
|
||||
|
||||
(gtk_accel_path "<Actions>/Editor/toggle-edit-mode" "1")
|
||||
(gtk_accel_path "<Actions>/Editor/cycle-snap-mode" "2")
|
||||
(gtk_accel_path "<Actions>/Editor/cycle-snap-choice" "3")
|
||||
(gtk_accel_path "<Actions>/Transport/ToggleAutoReturn" "4")
|
||||
(gtk_accel_path "<Actions>/Transport/ToggleClick" "5")
|
||||
(gtk_accel_path "<Actions>/Editor/set-tempo-from-region" "9")
|
||||
(gtk_accel_path "<Actions>/Editor/set-tempo-from-edit-range" "0")
|
||||
(gtk_accel_path "<Actions>/Transport/ToggleAutoPlay" "4")
|
||||
(gtk_accel_path "<Actions>/Transport/ToggleAutoReturn" "5")
|
||||
(gtk_accel_path "<Actions>/Transport/ToggleAutoInput" "6")
|
||||
(gtk_accel_path "<Actions>/Transport/ToggleClick" "7")
|
||||
|
||||
(gtk_accel_path "<Actions>/Editor/set-loop-from-edit-range" "<%LEVEL4%>8")
|
||||
(gtk_accel_path "<Actions>/Editor/set-loop-from-region" "8")
|
||||
; (gtk_accel_path "<Actions>/Editor/loop-region" "<%PRIMARY%>8")
|
||||
|
||||
(gtk_accel_path "<Actions>/Editor/set-punch-from-edit-range" "<%LEVEL4%>9")
|
||||
(gtk_accel_path "<Actions>/Editor/set-punch-from-region" "9")
|
||||
|
||||
(gtk_accel_path "<Actions>/Editor/set-tempo-from-region" "0")
|
||||
(gtk_accel_path "<Actions>/Editor/set-tempo-from-edit-range" "<%LEVEL4%>0")
|
||||
|
||||
;;
|
||||
;; unbound actions
|
||||
|
|
@ -246,7 +259,6 @@
|
|||
; (gtk_accel_path "<Actions>/Editor/View" "")
|
||||
; (gtk_accel_path "<Actions>/Editor/ZoomFocus" "")
|
||||
; (gtk_accel_path "<Actions>/Editor/center-edit-cursor" "")
|
||||
; (gtk_accel_path "<Actions>/Editor/center-playhead" "")
|
||||
; (gtk_accel_path "<Actions>/Editor/playhead-to-next-region-sync" "")
|
||||
; (gtk_accel_path "<Actions>/Editor/playhead-to-previous-region-sync" "")
|
||||
; (gtk_accel_path "<Actions>/Editor/playhead-to-range-end" "")
|
||||
|
|
@ -330,9 +342,9 @@
|
|||
; (gtk_accel_path "<Actions>/Snap/snap-to-smpte-seconds" "")
|
||||
; (gtk_accel_path "<Actions>/Snap/snap-to-thirds" "")
|
||||
; (gtk_accel_path "<Actions>/Snap/snap-to-thirtyseconds" "")
|
||||
; (gtk_accel_path "<Actions>/Transport/PlaySelection" "")
|
||||
; (gtk_accel_path "<Actions>/Transport/ToggleAutoInput" "")
|
||||
; (gtk_accel_path "<Actions>/Transport/ToggleAutoPlay" "")
|
||||
; (gtk_accel_path "<Actions>/Transport/Playwion" "")
|
||||
|
||||
|
||||
; (gtk_accel_path "<Actions>/Transport/ToggleAutoReturn" "")
|
||||
; (gtk_accel_path "<Actions>/Transport/TogglePunchIn" "")
|
||||
; (gtk_accel_path "<Actions>/Transport/TogglePunchOut" "")
|
||||
|
|
|
|||
|
|
@ -161,6 +161,9 @@
|
|||
<menuitem action='toggle-fade-in-active'/>
|
||||
<menuitem action='set-fade-out-length'/>
|
||||
<menuitem action='toggle-fade-out-active'/>
|
||||
<separator/>
|
||||
<menuitem action='toggle-selected-region-fades'/>
|
||||
<menuitem action='toggle-region-fades'/>
|
||||
</menu>
|
||||
<menu action="SelectMenu">
|
||||
<menuitem action='select-all'/>
|
||||
|
|
@ -172,6 +175,9 @@
|
|||
<menuitem action='select-all-within-cursors'/>
|
||||
<menuitem action='select-all-in-punch-range'/>
|
||||
<menuitem action='select-all-in-loop-range'/>
|
||||
<separator/>
|
||||
<menuitem action='select-next-route'/>
|
||||
<menuitem action='select-prev-route'/>
|
||||
</menu>
|
||||
</menu>
|
||||
|
||||
|
|
@ -214,9 +220,7 @@
|
|||
<menuitem action='boost-region-gain'/>
|
||||
<menuitem action='cut-region-gain'/>
|
||||
<menuitem action='pitch-shift-region'/>
|
||||
<separator/>
|
||||
<menuitem action='toggle-selected-region-fades'/>
|
||||
<menuitem action='toggle-region-fades'/>
|
||||
|
||||
</menu>
|
||||
|
||||
<menu name='View' action = 'View'>
|
||||
|
|
@ -266,8 +270,7 @@
|
|||
</menu>
|
||||
|
||||
<menu action="WindowMenu">
|
||||
<menuitem action='goto-editor'/>
|
||||
<menuitem action='goto-mixer'/>
|
||||
|
||||
<menuitem action='toggle-editor-mixer-on-top'/>
|
||||
<menuitem action='ToggleLocations'/>
|
||||
<menuitem action='ToggleKeyEditor'/>
|
||||
|
|
@ -307,17 +310,15 @@
|
|||
<menuitem action='edit-at-selected-marker'/>
|
||||
</menu>
|
||||
<menu action='KeyMouseActions'>
|
||||
<menuitem action='select-next-route'/>
|
||||
<menuitem action='select-prev-route'/>
|
||||
<menuitem action='focus-on-clock'/>
|
||||
<menuitem action='GotoZero'/>
|
||||
<menuitem action='GotoStart'/>
|
||||
<menuitem action='GotoEnd'/>
|
||||
<separator/>
|
||||
<menuitem action='set-mouse-mode-object'/>
|
||||
<menuitem action='set-mouse-mode-range'/>
|
||||
<menuitem action='set-mouse-mode-gain'/>
|
||||
<menuitem action='set-mouse-mode-zoom'/>
|
||||
<menuitem action='set-mouse-mode-timefx'/>
|
||||
<separator/>
|
||||
<menuitem action='cycle-edit-point'/>
|
||||
<menuitem action='cycle-edit-point-with-marker'/>
|
||||
<menuitem action='toggle-edit-mode'/>
|
||||
|
|
|
|||
|
|
@ -130,6 +130,13 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
|
|||
visual_button.set_name ("TrackVisualButton");
|
||||
hide_button.set_name ("TrackRemoveButton");
|
||||
|
||||
edit_group_button.unset_flags (Gtk::CAN_FOCUS);
|
||||
playlist_button.unset_flags (Gtk::CAN_FOCUS);
|
||||
automation_button.unset_flags (Gtk::CAN_FOCUS);
|
||||
size_button.unset_flags (Gtk::CAN_FOCUS);
|
||||
visual_button.unset_flags (Gtk::CAN_FOCUS);
|
||||
hide_button.unset_flags (Gtk::CAN_FOCUS);
|
||||
|
||||
hide_button.add (*(manage (new Image (::get_icon("hide")))));
|
||||
hide_button.show_all ();
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue