From 8aa9508c82f32efcf9c7c00e2c9e76268d4dddce Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 16 Feb 2008 22:43:18 +0000 Subject: Merge with 2.0-ongoing R3071. git-svn-id: svn://localhost/ardour2/branches/3.0@3073 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/SConscript | 150 ++++++++++++++++++++++++------------------------- 1 file changed, 72 insertions(+), 78 deletions(-) (limited to 'gtk2_ardour/SConscript') diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript index 7a07fdd859..d6d7f987dd 100644 --- a/gtk2_ardour/SConscript +++ b/gtk2_ardour/SConscript @@ -94,7 +94,6 @@ au_pluginui.mm """) gtkosx_files=Split(""" -sync-menu.c cocoacarbon.mm """) @@ -323,74 +322,66 @@ if gtkardour['IS_OSX']: # # OS X font rendering is different even with X11 # - my_font_dict['%FONT_TINY%'] = 'Lucida Grande 7' - my_font_dict['%FONT_SMALLERER%'] = 'Lucida Grande 8' - my_font_dict['%FONT_SMALLER%'] = 'Lucida Grande 9' - my_font_dict['%FONT_SMALL%'] = 'Lucida Grande 10' - my_font_dict['%FONT_NORMAL%'] = 'Lucida Grande 11' - my_font_dict['%FONT_BIG%'] = 'Lucida Grande 12' - my_font_dict['%FONT_BIGGER%'] = 'Lucida Grande 14' - my_font_dict['%FONT_LARGE%'] = 'Lucida Grande 18' - my_font_dict['%FONT_LARGER%'] = 'Lucida Grande 28' - my_font_dict['%FONT_HUGER%'] = 'Lucida Grande 36' - my_font_dict['%FONT_MASSIVE%'] = 'Lucida Grande 60' - my_font_dict['%FONT_BOLD_TINY%'] = 'Lucida Grande bold 7' - my_font_dict['%FONT_BOLD_SMALLER%'] = 'Lucida Grande bold 9' - my_font_dict['%FONT_BOLD_SMALL%'] = 'Lucida Grande bold 10' - my_font_dict['%FONT_BOLD_NORMAL%'] = 'Lucida Grande bold 11' - my_font_dict['%FONT_BOLD_BIG%'] = 'Lucida Grande bold 13' - my_font_dict['%FONT_BOLD_BIGGER%'] = 'Lucida Grande bold 14' - my_font_dict['%FONT_BOLD_LARGE%'] = 'Lucida Grande bold 20' - my_font_dict['%FONT_BOLD_LARGER%'] = 'Lucida Grande bold 25' - my_font_dict['%FONT_BOLD_HUGER%'] = 'Lucida Grande bold 36' - my_font_dict['%FONT_BOLD_MASSIVE%'] = 'Lucida Grande bold 60' - my_font_dict['%FONT_ITALIC_TINY%'] = 'Lucida Grande italic 7' - my_font_dict['%FONT_ITALIC_SMALLER%'] = 'Lucida Grande italic 9' - my_font_dict['%FONT_ITALIC_SMALL%'] = 'Lucida Grande italic 10' - my_font_dict['%FONT_ITALIC_NORMAL%'] = 'Lucida Grande italic 11' - my_font_dict['%FONT_ITALIC_BIG%'] = 'Lucida Grande italic 15' - my_font_dict['%FONT_ITALIC_BIGGER%'] = 'Lucida Grande italic 16' - my_font_dict['%FONT_ITALIC_LARGE%'] = 'Lucida Grande italic 20' - my_font_dict['%FONT_ITALIC_LARGER%'] = 'Lucida Grande italic 28' - my_font_dict['%FONT_ITALIC_HUGER%'] = 'Lucida Grande italic 36' - my_font_dict['%FONT_ITALIC_MASSIVE%'] = 'Lucida Grande italic 60' + + font_sizes = { + 'TINY' : '7', + 'SMALLER' : '9', + 'SMALL' : '10', + 'NORMAL' : '11', + 'BIG' : '12', + 'BIGGER' : '14', + 'LARGE' : '18', + 'LARGER' : '28', + 'HUGER' : '36', + 'MASSIVE' : '60' + } + basefont = "Lucida Grande" + else: # # Linux/X11 font rendering # - my_font_dict['%FONT_TINY%'] = 'sans 4' - my_font_dict['%FONT_SMALLERER%'] = 'sans 6' - my_font_dict['%FONT_SMALLER%'] = 'sans 6' - my_font_dict['%FONT_SMALL%'] = 'sans 7' - my_font_dict['%FONT_NORMAL%'] = 'sans 8' - my_font_dict['%FONT_BIG%'] = 'sans 12' - my_font_dict['%FONT_BIGGER%'] = 'sans 14' - my_font_dict['%FONT_LARGE%'] = 'sans 18' - my_font_dict['%FONT_LARGER%'] = 'sans 24' - my_font_dict['%FONT_HUGER%'] = 'sans 34' - my_font_dict['%FONT_MASSIVE%'] = 'sans 60' - my_font_dict['%FONT_BOLD_TINY%'] = 'sans bold 4' - my_font_dict['%FONT_BOLD_SMALLER%'] = 'sans bold 6' - my_font_dict['%FONT_BOLD_SMALL%'] = 'sans bold 7' - my_font_dict['%FONT_BOLD_NORMAL%'] = 'sans bold 8' - my_font_dict['%FONT_BOLD_BIG%'] = 'sans bold 12' - my_font_dict['%FONT_BOLD_BIGGER%'] = 'sans bold 14' - my_font_dict['%FONT_BOLD_LARGE%'] = 'sans bold 18' - my_font_dict['%FONT_BOLD_LARGER%'] = 'sans bold 24' - my_font_dict['%FONT_BOLD_HUGE%'] = 'sans bold 25' - my_font_dict['%FONT_BOLD_HUGER%'] = 'sans bold 34' - my_font_dict['%FONT_BOLD_MASSIVE%'] = 'sans bold 60' - my_font_dict['%FONT_ITALIC_TINY%'] = 'sans italic 4' - my_font_dict['%FONT_ITALIC_SMALLER%'] = 'sans italic 6' - my_font_dict['%FONT_ITALIC_SMALL%'] = 'sans italic 7' - my_font_dict['%FONT_ITALIC_NORMAL%'] = 'sans italic 8' - my_font_dict['%FONT_ITALIC_BIG%'] = 'sans italic 12' - my_font_dict['%FONT_ITALIC_BIGGER%'] = 'sans italic 14' - my_font_dict['%FONT_ITALIC_LARGE%'] = 'sans italic 18' - my_font_dict['%FONT_ITALIC_LARGER%'] = 'sans italic 24' - my_font_dict['%FONT_ITALIC_HUGE%'] = 'sans italic 25' - my_font_dict['%FONT_ITALIC_HUGER%'] = 'sans italic 34' - my_font_dict['%FONT_ITALIC_MASSIVE%'] = 'sans italic 60' + + if gtkardour['OLDFONTS']: + font_sizes = { + 'TINY' : '4', + 'SMALLER' : '6', + 'SMALL' : '7', + 'NORMAL' : '8', + 'BIG' : '12', + 'BIGGER' : '14', + 'LARGE' : '18', + 'LARGER' : '24', + 'HUGER' : '34', + 'MASSIVE' : '60' + } + else: + font_sizes = { + 'TINY' : '6', + 'SMALLER' : '8', + 'SMALL' : '9', + 'NORMAL' : '10', + 'BIG' : '14', + 'BIGGER' : '16', + 'LARGE' : '18', + 'LARGER' : '24', + 'HUGER' : '34', + 'MASSIVE' : '60' + } + + basefont = "sans" + +for style in ['', 'BOLD', 'ITALIC']: + for sizename,points in font_sizes.iteritems(): + if (len (style)): + key = "_".join (['FONT',style,sizename]) + fontstyle = " ".join ([basefont,style.lower(),points]) + else: + key = "_".join (['FONT',sizename]) + fontstyle = " ".join ([basefont,points]) + + key = '%' + key + '%' + my_font_dict[key] = fontstyle ardour_dark_theme = env.SubstInFile ('ardour3_ui_dark.rc', 'ardour3_ui_dark.rc.in', SUBST_DICT = my_font_dict) ardour_light_theme = env.SubstInFile ('ardour3_ui_light.rc', 'ardour3_ui_light.rc.in', SUBST_DICT = my_font_dict) @@ -405,13 +396,17 @@ keybindings_dict = { } if gtkardour['GTKOSX'] and gtkardour['NATIVE_OSX_KEYS']: # - # Command(Mod1), Alt(Mod5), Ctrl, Shift + # Command(Meta), Alt(Mod1), Ctrl, Shift + # **** as of february 4th 2008, OUR VERSION OF ***** + # Gtk/Quartz maps: + # NSCommand (aka "Command" aka "Apple" aka "Cauliflower") -> Meta + # NSAlternate (aka "Option") -> Mod1 # - keybindings_dict['%PRIMARY%'] = 'Mod5' - keybindings_dict['%SECONDARY%'] = 'Alt' + keybindings_dict['%PRIMARY%'] = 'Meta' + keybindings_dict['%SECONDARY%'] = 'Mod1' keybindings_dict['%TERTIARY%'] = 'Shift' keybindings_dict['%LEVEL4%'] = 'Ctrl' - keybindings_dict['%WINDOW%'] = 'Mod5' + keybindings_dict['%WINDOW%'] = 'Mod1' else: # # Ctrl, Alt, Shift, Mod3(Meta) @@ -422,9 +417,10 @@ else: keybindings_dict['%LEVEL4%'] = 'Mod2' keybindings_dict['%WINDOW%'] = 'Alt' -ardourbindings = env.SubstInFile ('ardour.bindings', 'ardour.bindings.in', SUBST_DICT = keybindings_dict); -ardoursaeDEbindings = env.SubstInFile ('ardour-sae-de.bindings', 'ardour-sae-de.bindings.in', SUBST_DICT = keybindings_dict); -ardoursaeANSIbindings = env.SubstInFile ('ardour-sae-ansi.bindings', 'ardour-sae-ansi.bindings.in', SUBST_DICT = keybindings_dict); +for b in [ 'SAE-de', 'mnemonic-us', 'ergonomic-us' ]: + target_file = b + '.bindings' + src_file = target_file + '.in' + Default (env.SubstInFile (target_file, src_file, SUBST_DICT = keybindings_dict)) my_subst_dict['%INSTALL_PREFIX%'] = final_prefix my_subst_dict['%LIBDIR%'] = env['LIBDIR'] @@ -436,9 +432,6 @@ env.AddPostAction (ardoursh, Chmod ('$TARGET', 0755)) ardourdev = env.SubstInFile ('ardev_common.sh','ardev_common.sh.in', SUBST_DICT = my_subst_dict); env.AddPostAction (ardourdev, Chmod ('$TARGET', 0755)) -Default(ardourbindings) -Default(ardoursaeDEbindings) -Default(ardoursaeANSIbindings) Default(ardourdev) Default(ardoursh) Default(ardour_dark_theme) @@ -468,11 +461,12 @@ if env['NLS']: # configuration files env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), ardour_dark_theme)) env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), ardour_light_theme)) +env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour3_ui_default.conf')) env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'ardour.menus')) env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'ardour-sae.menus')) -env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'ardour.bindings')) -env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'ardour-sae-ansi.bindings')) -env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'ardour-sae-de.bindings')) +env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ergonomic-us.bindings')) +env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'mnemonic-us.bindings')) +env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'SAE-de.bindings')) # data files env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour3'), 'splash.png')) env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour3', 'pixmaps'), pixmap_files)) -- cgit v1.2.3