diff --git a/gtk2_ardour/ardour3_fonts.rc.in b/gtk2_ardour/fonts.rc.in similarity index 100% rename from gtk2_ardour/ardour3_fonts.rc.in rename to gtk2_ardour/fonts.rc.in diff --git a/gtk2_ardour/ardour3_styles.rc.in b/gtk2_ardour/styles.rc.in similarity index 100% rename from gtk2_ardour/ardour3_styles.rc.in rename to gtk2_ardour/styles.rc.in diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc index 484a5a8752..f44fc99f19 100644 --- a/gtk2_ardour/theme_manager.cc +++ b/gtk2_ardour/theme_manager.cc @@ -364,11 +364,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); @@ -379,12 +375,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); } @@ -461,9 +452,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(); } diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc index c357c72c59..bc3109ea55 100644 --- a/gtk2_ardour/ui_config.cc +++ b/gtk2_ardour/ui_config.cc @@ -40,6 +40,9 @@ using namespace std; using namespace PBD; using namespace ARDOUR; +static const char* ui_config_file_name = "ui_config"; +static const char* default_ui_config_file_name = "default_ui_config"; + UIConfiguration::UIConfiguration () : #undef UI_CONFIG_VARIABLE @@ -76,25 +79,15 @@ int UIConfiguration::load_defaults () { int found = 0; + std::string rcfile; - std::string default_ui_rc_file; - std::string rcfile; - - if (getenv ("ARDOUR_SAE")) { - rcfile = "ardour3_ui_sae.conf"; - } else { - rcfile = "ardour3_ui_default.conf"; - } - - if (find_file (ardour_config_search_path(), rcfile, default_ui_rc_file) ) { + if (find_file (ardour_config_search_path(), default_ui_config_file_name, rcfile) ) { XMLTree tree; found = 1; - string rcfile = default_ui_rc_file; - // info << string_compose (_("Loading default ui configuration file %1"), rcfile) << endl; - if (!tree.read (rcfile.c_str())) { + if (!tree.read (default_ui_config_file_name)) { error << string_compose(_("cannot read default ui configuration file \"%1\""), rcfile) << endmsg; return -1; } @@ -115,14 +108,12 @@ UIConfiguration::load_state () { bool found = false; - std::string default_ui_rc_file; + std::string rcfile; - if ( find_file (ardour_config_search_path(), "ardour3_ui_default.conf", default_ui_rc_file)) { + if ( find_file (ardour_config_search_path(), default_ui_config_file_name, rcfile)) { XMLTree tree; found = true; - string rcfile = default_ui_rc_file; - // info << string_compose (_("Loading default ui configuration file %1"), rcfile) << endl; if (!tree.read (rcfile.c_str())) { @@ -136,14 +127,10 @@ UIConfiguration::load_state () } } - std::string user_ui_rc_file; - - if (find_file (ardour_config_search_path(), "ardour3_ui.conf", user_ui_rc_file)) { + if (find_file (ardour_config_search_path(), ui_config_file_name, rcfile)) { XMLTree tree; found = true; - string rcfile = user_ui_rc_file; - // info << string_compose (_("Loading user ui configuration file %1"), rcfile) << endmsg; if (!tree.read (rcfile)) { @@ -173,7 +160,7 @@ UIConfiguration::save_state() XMLTree tree; std::string rcfile(user_config_directory()); - rcfile = Glib::build_filename (rcfile, "ardour3_ui.conf"); + rcfile = Glib::build_filename (rcfile, ui_config_file_name); // this test seems bogus? if (rcfile.length()) { diff --git a/gtk2_ardour/ui_config_vars.h b/gtk2_ardour/ui_config_vars.h index 5c43d72f46..d9dcfff0fd 100644 --- a/gtk2_ardour/ui_config_vars.h +++ b/gtk2_ardour/ui_config_vars.h @@ -18,7 +18,7 @@ */ UI_CONFIG_VARIABLE(std::string, icon_set, "icon-set", "default") -UI_CONFIG_VARIABLE(std::string, ui_rc_file, "ui-rc-file", "ardour3_ui_dark.rc") +UI_CONFIG_VARIABLE(std::string, ui_rc_file, "ui-rc-file", "ui_dark.rc") UI_CONFIG_VARIABLE(bool, flat_buttons, "flat-buttons", false) UI_CONFIG_VARIABLE(float, waveform_gradient_depth, "waveform-gradient-depth", 0) UI_CONFIG_VARIABLE(float, timeline_item_gradient_depth, "timeline-item-gradient-depth", 0.5) diff --git a/gtk2_ardour/ardour3_ui_dark.rc.in b/gtk2_ardour/ui_dark.rc.in similarity index 99% rename from gtk2_ardour/ardour3_ui_dark.rc.in rename to gtk2_ardour/ui_dark.rc.in index 5b438971d8..87b7662298 100644 --- a/gtk2_ardour/ardour3_ui_dark.rc.in +++ b/gtk2_ardour/ui_dark.rc.in @@ -351,6 +351,6 @@ style "status_bar_box" bg[NORMAL] = { 0.149, 0.149, 0.149 } } -##include ardour3_dark_fonts.rc -##include ardour3_dark_styles.rc -##include ardour3_widgets.rc +##include dark_fonts.rc +##include dark_styles.rc +##include widgets.rc diff --git a/gtk2_ardour/ardour3_ui_default.conf.in b/gtk2_ardour/ui_default.conf.in similarity index 99% rename from gtk2_ardour/ardour3_ui_default.conf.in rename to gtk2_ardour/ui_default.conf.in index 46d6062652..bf37630796 100644 --- a/gtk2_ardour/ardour3_ui_default.conf.in +++ b/gtk2_ardour/ui_default.conf.in @@ -1,7 +1,7 @@ -