diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-11-25 11:34:54 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-11-25 11:34:54 +0000 |
| commit | 6626e842bc0c0fd08599e62c12db1e1e379a06a8 (patch) | |
| tree | fe9e8aed8966edeb1353290d2b8daddc667acece /gtk2_ardour | |
| parent | 4fa5006ae72eaf59914819abfc8892baa7430435 (diff) | |
meta-ize menu generation to cope with differences in OS X and X11 GUI conventions
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@4250 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/SConscript | 18 | ||||
| -rw-r--r-- | gtk2_ardour/ardour.menus.in (renamed from gtk2_ardour/ardour.menus) | 9 |
2 files changed, 24 insertions, 3 deletions
diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript index 9e3614efa3..dd460e4b63 100644 --- a/gtk2_ardour/SConscript +++ b/gtk2_ardour/SConscript @@ -400,6 +400,15 @@ for style in ['', 'BOLD', 'ITALIC']: key = '%' + key + '%' my_font_dict[key] = fontstyle +# +# create menus based on build platform +# + +if env['GTKOSX']: + ardour_menus = env.Command ('ardour.menus', 'ardour.menus.in', "cpp -E -P -DGTKOSX -DTOP_MENUBAR ardour.menus.in ardour_osx.menus", chdir=1) +else: + ardour_menus = env.Command ('ardour.menus', 'ardour.menus.in', "cpp -E -P ardour.menus.in ardour.menus", chdir=1) + 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) ardour_dark_sae_theme = env.SubstInFile ('ardour2_ui_dark_sae.rc', 'ardour2_ui_dark_sae.rc.in', SUBST_DICT = my_font_dict) @@ -545,8 +554,13 @@ env.Alias ('tarball', env.Distribute (env['DISTTREE'], 'ardour.sh.in', 'ardev_common.sh.in', 'ardev', 'ardbg', - 'ardour2_ui_dark.rc.in', 'ardour2_ui_light.rc.in', 'ardour2_ui_dark_sae.rc.in', 'ardour2_ui_light_sae.rc.in', 'splash.png', - 'ardour.menus', 'ardour-sae.menus', + 'ardour2_ui_dark.rc.in', + 'ardour2_ui_light.rc.in', + 'ardour2_ui_dark_sae.rc.in', + 'ardour2_ui_light_sae.rc.in', + 'splash.png', + 'ardour.menus.in', + 'ardour-sae.menus', 'mnemonic-us.bindings.in', 'ergonomic-us.bindings.in', 'SAE-us-keypad.bindings.in', diff --git a/gtk2_ardour/ardour.menus b/gtk2_ardour/ardour.menus.in index d46a40b07e..6b8b7fba0f 100644 --- a/gtk2_ardour/ardour.menus +++ b/gtk2_ardour/ardour.menus.in @@ -26,6 +26,10 @@ <menuitem action='FlushWastebasket'/> </menu> <separator/> +#ifdef GTKOSX + <menuitem action='ToggleOptionsEditor'/> + <menuitem action='About'/> +#endif <menuitem action='Quit'/> </menu> @@ -207,6 +211,10 @@ <separator/> <menuitem action='break-drag'/> </menu> +#ifndef GTKOSX + <separator/> + <menuitem action='ToggleOptionsEditor'/> +#endif </menu> <menu action='RegionMenu'> @@ -404,7 +412,6 @@ <menuitem action='goto-editor'/> <menuitem action='goto-mixer'/> <menuitem action='toggle-editor-mixer-on-top'/> - <menuitem action='ToggleOptionsEditor'/> <menuitem action='ToggleInspector'/> <menuitem action='ToggleLocations'/> <menuitem action='ToggleKeyEditor'/> |