diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-02-06 01:46:53 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-02-06 01:46:53 +0000 |
| commit | 359e69ab882975da1b95f21e5ba876461aceea40 (patch) | |
| tree | 918b532519e0280189527da0c3c2d9635e7c7649 | |
| parent | c2ac101a10a2f87b1d01f3906ed7ef76214a7fa6 (diff) | |
get arrow keys to appear in the mac menu; add/change high level command to osx_build script; update ardour-sae.menus
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3014 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/ardour-sae.menus | 7 | ||||
| -rw-r--r-- | gtk2_ardour/sync-menu.c | 46 | ||||
| -rwxr-xr-x | tools/osx_packaging/osx_build | 14 |
3 files changed, 60 insertions, 7 deletions
diff --git a/gtk2_ardour/ardour-sae.menus b/gtk2_ardour/ardour-sae.menus index d9c4f1798f..1e8ba7cc71 100644 --- a/gtk2_ardour/ardour-sae.menus +++ b/gtk2_ardour/ardour-sae.menus @@ -43,6 +43,11 @@ <menuitem action='GotoStart'/> <menuitem action='GotoEnd'/> <separator/> + <menuitem action='tab-to-transient-forwards'/> + <menuitem action='tab-to-transient-backwards'/> + <menuitem action='nudge-playhead-forward'/> + <menuitem action='nudge-playhead-backward'/> + <separator/> <menuitem action='Record'/> <separator/> <menuitem action='TransitionToRoll'/> @@ -143,6 +148,7 @@ <menuitem action='duplicate-region'/> <menuitem action='insert-region'/> <menuitem action='normalize-region'/> + <menuitem action='split-region-at-transients'/> <separator/> <menuitem action="nudge-forward"/> <menuitem action="nudge-backward"/> @@ -235,6 +241,7 @@ <menuitem action='ToggleKeyEditor'/> <menuitem action='ToggleThemeManager'/> <menuitem action='ToggleBigClock'/> + <menuitem action='toggle-rhythm-ferret'/> </menu> <menu name='Options' action='Options'> <menu action='Monitoring'> diff --git a/gtk2_ardour/sync-menu.c b/gtk2_ardour/sync-menu.c index 22beca9b11..ec2b741d5a 100644 --- a/gtk2_ardour/sync-menu.c +++ b/gtk2_ardour/sync-menu.c @@ -312,16 +312,50 @@ carbon_menu_item_update_accelerator (CarbonMenuItem *carbon_item, GdkKeymapKey *keys; gint n_keys; gint use_command; + gboolean add_modifiers = FALSE; if (gdk_keymap_get_entries_for_keyval (keymap, key->accel_key, - &keys, &n_keys)) - { - UInt8 modifiers = 0; /* implies Command key */ + &keys, &n_keys) == 0) + { + gint realkey = -1; + + switch (key->accel_key) { + case GDK_rightarrow: + case GDK_Right: + realkey = kRightArrowCharCode; + break; + case GDK_leftarrow: + case GDK_Left: + realkey = kLeftArrowCharCode; + break; + case GDK_uparrow: + case GDK_Up: + realkey = kUpArrowCharCode; + break; + case GDK_downarrow: + case GDK_Down: + realkey = kDownArrowCharCode; + break; + default: + break; + } + + if (realkey != -1) { + SetMenuItemCommandKey (carbon_item->menu, carbon_item->index, + false, realkey); + add_modifiers = TRUE; + } - SetMenuItemCommandKey (carbon_item->menu, carbon_item->index, - true, keys[0].keycode); + } else { + SetMenuItemCommandKey (carbon_item->menu, carbon_item->index, + true, keys[0].keycode); + g_free (keys); + add_modifiers = TRUE; + } - g_free (keys); + if (add_modifiers) + { + UInt8 modifiers = 0; /* implies Command key */ use_command = 0; diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build index f08e02bb42..d860e486ae 100755 --- a/tools/osx_packaging/osx_build +++ b/tools/osx_packaging/osx_build @@ -13,7 +13,19 @@ PRINT_SYSDEPS= while [ $# -gt 0 ] ; do echo "arg = $1" case $1 in - --sae) SAE=1 ; shift ;; + + # + # top level build targets + # + + --sae) SAE=1 ; WITH_JACK=1; WITH_LADSPA=1; STRIP= ; shift ;; + --public) SAE= ; WITH_JACK=; WITH_LADSPA=1; STRIP= ; shift ;; + --allinone) SAE= ; WITH_JACK=1; WITH_LADSPA=1; STRIP= ; shift ;; + + # + # specific build flags + # + --nojack) WITH_JACK= ; shift ;; --noladspa) WITH_LADSPA= ; shift ;; --nostrip) STRIP= ; shift ;; |