get arrow keys to appear in the mac menu; add/change high level command to osx_build...

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3014 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/ardour-sae.menus b/gtk2_ardour/ardour-sae.menus
index d9c4f1798fd91489035f264a821270148074a587..1e8ba7cc7143e737de6a39f684ecfd20979291d2 100644 (file)
--- 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 22beca9b115d82de3eb6fdc8db7375799f442932..ec2b741d5ac6a78aa8d868deb29367212453c57c 100644 (file)
--- 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 f08e02bb42bb28a325eaee7862f1b787662761c1..d860e486ae0d8ad09cf6344cfdc66d0bcd761528 100755 (executable)
--- 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 ;;