From dcf4d7b38a5d9e0db31924912180edd6c922ca34 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sun, 7 Sep 2014 10:25:46 -0400 Subject: change all GUI config files (GTK RC and our own XML config files) to use product-neutral names Conflicts: gtk2_ardour/ui_config.cc gtk2_ardour/ui_default.conf.in gtk2_ardour/wscript --- gtk2_ardour/theme_manager.cc | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'gtk2_ardour/theme_manager.cc') diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc index b6bad9f23d..1a5aa0e7ce 100644 --- a/gtk2_ardour/theme_manager.cc +++ b/gtk2_ardour/theme_manager.cc @@ -376,11 +376,7 @@ ThemeManager::on_dark_theme_button_toggled() { if (!dark_button.get_active()) return; - if (HACK_PROFILE_IS_SAE()){ - ARDOUR_UI::config()->set_ui_rc_file("ardour3_ui_dark_sae.rc"); - } else { - ARDOUR_UI::config()->set_ui_rc_file("ardour3_ui_dark.rc"); - } + ARDOUR_UI::config()->set_ui_rc_file("ui_dark.rc"); ARDOUR_UI::config()->set_dirty (); load_rc_file (ARDOUR_UI::config()->get_ui_rc_file(), true); @@ -391,12 +387,7 @@ ThemeManager::on_light_theme_button_toggled() { if (!light_button.get_active()) return; - if (HACK_PROFILE_IS_SAE()){ - ARDOUR_UI::config()->set_ui_rc_file("ardour3_ui_light_sae.rc"); - } else { - ARDOUR_UI::config()->set_ui_rc_file("ardour3_ui_light.rc"); - } - + ARDOUR_UI::config()->set_ui_rc_file("ui_light.rc"); load_rc_file (ARDOUR_UI::config()->get_ui_rc_file(), true); } @@ -473,9 +464,9 @@ ThemeManager::setup_theme () rcfile = ARDOUR_UI::config()->get_ui_rc_file(); } - if (rcfile == "ardour3_ui_dark.rc" || rcfile == "ardour3_ui_dark_sae.rc") { + if (rcfile == "ui_dark.rc") { dark_button.set_active(); - } else if (rcfile == "ardour3_ui_light.rc" || rcfile == "ardour3_ui_light_sae.rc") { + } else if (rcfile == "ui_light.rc") { light_button.set_active(); } -- cgit v1.2.3