diff options
author | Doug McLain <doug@nostar.net> | 2011-02-14 01:46:57 +0000 |
---|---|---|
committer | Doug McLain <doug@nostar.net> | 2011-02-14 01:46:57 +0000 |
commit | d4dd6fbe63b258443a5f3bcd3e0281c91d0dea48 (patch) | |
tree | 34e50e04718914ed5ab77fea1f850f2f84ab4ce7 /gtk2_ardour/wscript | |
parent | 7e7dd8e85a34efe884f3e8d061a7c8e2f0b9b927 (diff) |
Make light theme functional, add waf processing, and small change to UI::load_rcfile() that fixes a hang when switching between two rc files that are identical in style defs
git-svn-id: svn://localhost/ardour2/branches/3.0@8839 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/wscript')
-rw-r--r-- | gtk2_ardour/wscript | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index b50521ec76..7ae17c76d5 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -380,7 +380,8 @@ def build(bld): # Font configuration - font_subst_dict = {} + dark_rc_subst_dict = {} + light_rc_subst_dict = {} font_sizes = {} base_font = "" @@ -424,18 +425,25 @@ def build(bld): key = "_".join (['FONT',sizename]) fontstyle = " ".join ([basefont,points]) - font_subst_dict[key] = fontstyle - - dark_rc_subst_dict = font_subst_dict - dark_rc_subst_dict['COLOR_SCHEME'] = build_color_scheme ('gtk2_ardour/ardour3_ui_dark.rc.in') + dark_rc_subst_dict[key] = fontstyle + light_rc_subst_dict[key] = fontstyle # RC files + dark_rc_subst_dict['COLOR_SCHEME'] = build_color_scheme ('gtk2_ardour/ardour3_ui_dark.rc.in') + light_rc_subst_dict['COLOR_SCHEME'] = build_color_scheme ('gtk2_ardour/ardour3_ui_light.rc.in') + obj = bld.new_task_gen('subst') obj.source = 'ardour3_ui_dark.rc.in' obj.target = 'ardour3_ui_dark.rc' obj.dict = dark_rc_subst_dict obj.install_path = os.path.join(bld.env['CONFIGDIR'], 'ardour3') + obj = bld.new_task_gen('subst') + obj.source = 'ardour3_ui_light.rc.in' + obj.target = 'ardour3_ui_light.rc' + obj.dict = light_rc_subst_dict + obj.install_path = os.path.join(bld.env['CONFIGDIR'], 'ardour3') + # Menus menus_argv = [] if bld.env['GTKOSX']: |