diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2008-12-12 14:43:24 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-12-12 14:43:24 +0000 |
commit | bc89fe0147c04b67141936d109c00dfd4d69cc4b (patch) | |
tree | 544ff450c40fe1f43853a8420228a26f27f1eafb /gtk2_ardour/theme_manager.cc | |
parent | 30daaebaa2d90d6b0e8673143ccc3cacd7bd1753 (diff) |
most of the 2.X->3.0 commit (up to rev 4299) except for gtk2_ardour/editor_canvas.cc; builds and runs and does a few specific things but expect it to be buggy for a while yet
git-svn-id: svn://localhost/ardour2/branches/3.0@4313 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/theme_manager.cc')
-rw-r--r-- | gtk2_ardour/theme_manager.cc | 31 |
1 files changed, 27 insertions, 4 deletions
diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc index 9968fa9ea0..3735791eb8 100644 --- a/gtk2_ardour/theme_manager.cc +++ b/gtk2_ardour/theme_manager.cc @@ -31,6 +31,7 @@ #include <ardour/configuration.h> #include <ardour/filesystem_paths.h> +#include <ardour/profile.h> #include "theme_manager.h" #include "rgb_macros.h" @@ -207,12 +208,29 @@ load_rc_file (const string& filename, bool themechange) Gtkmm2ext::UI::instance()->load_rcfile (rc_file_path.to_string(), themechange); } +/* hmm, this is a problem. the profile doesn't + exist when the theme manager is constructed + and toggles buttons during "normal" GTK setup. + + a better solution will be to make all Profile + methods static or something. + + XXX FIX ME +*/ + +#define HACK_PROFILE_IS_SAE() (getenv("ARDOUR_SAE")!=0) + void ThemeManager::on_dark_theme_button_toggled() { if (!dark_button.get_active()) return; - ARDOUR_UI::config()->ui_rc_file.set("ardour3_ui_dark.rc"); + if (HACK_PROFILE_IS_SAE()){ + ARDOUR_UI::config()->ui_rc_file.set("ardour3_ui_dark_sae.rc"); + } else { + ARDOUR_UI::config()->ui_rc_file.set("ardour3_ui_dark.rc"); + } + load_rc_file (ARDOUR_UI::config()->ui_rc_file.get(), true); } @@ -221,7 +239,12 @@ ThemeManager::on_light_theme_button_toggled() { if (!light_button.get_active()) return; - ARDOUR_UI::config()->ui_rc_file.set("ardour3_ui_light.rc"); + if (HACK_PROFILE_IS_SAE()){ + ARDOUR_UI::config()->ui_rc_file.set("ardour3_ui_light_sae.rc"); + } else { + ARDOUR_UI::config()->ui_rc_file.set("ardour3_ui_light.rc"); + } + load_rc_file (ARDOUR_UI::config()->ui_rc_file.get(), true); } @@ -258,9 +281,9 @@ ThemeManager::setup_theme () rcfile = ARDOUR_UI::config()->ui_rc_file.get(); } - if (rcfile == "ardour3_ui_dark.rc") { + if (rcfile == "ardour3_ui_dark.rc" || rcfile == "ardour3_ui_dark_sae.rc") { dark_button.set_active(); - } else if (rcfile == "ardour3_ui_light.rc") { + } else if (rcfile == "ardour3_ui_light.rc" || "ardour3_ui_light_sae.rc") { light_button.set_active(); } |