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
This commit is contained in:
Paul Davis 2008-02-06 01:46:53 +00:00
parent c2ac101a10
commit 359e69ab88
3 changed files with 60 additions and 7 deletions

View file

@ -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'>

View file

@ -312,17 +312,51 @@ 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))
&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;
}
} else {
SetMenuItemCommandKey (carbon_item->menu, carbon_item->index,
true, keys[0].keycode);
g_free (keys);
add_modifiers = TRUE;
}
if (add_modifiers)
{
UInt8 modifiers = 0; /* implies Command key */
SetMenuItemCommandKey (carbon_item->menu, carbon_item->index,
true, keys[0].keycode);
g_free (keys);
use_command = 0;
if (key->accel_mods)

View file

@ -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 ;;