smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-30 08:53:08 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8839 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Doug McLain 2011-02-14 01:46:57 +00:00
parent 7e7dd8e85a
commit d4dd6fbe63
3 changed files with 889 additions and 697 deletions
Download patch file Download diff file Expand all files Collapse all files

1561
gtk2_ardour/ardour3_ui_light.rc.in
View file

File diff suppressed because it is too large Load diff

18
gtk2_ardour/wscript
View file

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

7
libs/gtkmm2ext/gtk_ui.cc
View file

@ -153,9 +153,10 @@ UI::load_rcfile (string path, bool themechange)
return -1;
}
RC rc (path.c_str());
//RC::reset_styles (Gtk::Settings::get_default());
gtk_rc_reset_styles (gtk_settings_get_default());
vector<string> files;
files.push_back(path.c_str());
RC::set_default_files(files);
RC::reparse_all (Gtk::Settings::get_default(), true);
theme_changed.emit();
if (themechange) {