X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftheme_manager.cc;h=6b574588b63655f31eea056b0f3b90331880a46c;hb=9649a94053eda177086ac2930c7d172db3a2af11;hp=261ebdb9b8b79c51eeb83c1d713cf98b5dc8a17a;hpb=6e872325569977321afec019677f363143bcd62a;p=ardour.git diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc index 261ebdb9b8..6b574588b6 100644 --- a/gtk2_ardour/theme_manager.cc +++ b/gtk2_ardour/theme_manager.cc @@ -24,9 +24,14 @@ #include #include +#include #include -#include +#include "pbd/file_utils.h" + +#include "ardour/configuration.h" +#include "ardour/filesystem_paths.h" +#include "ardour/profile.h" #include "theme_manager.h" #include "rgb_macros.h" @@ -45,9 +50,14 @@ sigc::signal ColorChanged; ThemeManager::ThemeManager() : ArdourDialog ("ThemeManager"), - dark_button ("Dark Theme"), - light_button ("Light Theme") + dark_button ("Dark theme"), + light_button ("Light theme"), + reset_button ("Restore Defaults") { + Gtkmm2ext::WindowTitle title (Glib::get_application_name ()); + title += _("Theme Manager"); + set_title (title.get_string ()); + color_list = ListStore::create (columns); color_display.set_model (color_list); color_display.append_column (_("Object"), columns.name); @@ -73,6 +83,7 @@ ThemeManager::ThemeManager() get_vbox()->set_homogeneous(false); get_vbox()->pack_start (theme_selection_hbox, PACK_SHRINK); + get_vbox()->pack_start (reset_button, PACK_SHRINK); get_vbox()->pack_start (scroller); color_display.signal_button_press_event().connect (mem_fun (*this, &ThemeManager::button_press_event), false); @@ -82,10 +93,12 @@ ThemeManager::ThemeManager() color_dialog.get_ok_button()->signal_clicked().connect (bind (mem_fun (color_dialog, &Gtk::Dialog::response), RESPONSE_ACCEPT)); color_dialog.get_cancel_button()->signal_clicked().connect (bind (mem_fun (color_dialog, &Gtk::Dialog::response), RESPONSE_CANCEL)); - dark_button.signal_clicked().connect (bind (mem_fun (*this, &ThemeManager::load_rc), 1)); - light_button.signal_clicked().connect (bind (mem_fun (*this, &ThemeManager::load_rc), 2)); + dark_button.signal_toggled().connect (mem_fun (*this, &ThemeManager::on_dark_theme_button_toggled)); + light_button.signal_toggled().connect (mem_fun (*this, &ThemeManager::on_light_theme_button_toggled)); + reset_button.signal_clicked().connect (mem_fun (*this, &ThemeManager::reset_canvas_colors)); set_size_request (-1, 400); + setup_theme (); } ThemeManager::~ThemeManager() @@ -93,7 +106,7 @@ ThemeManager::~ThemeManager() } int -ThemeManager::save (string path) +ThemeManager::save (string /*path*/) { return 0; } @@ -107,7 +120,7 @@ ThemeManager::button_press_event (GdkEventButton* ev) int cellx; int celly; - ARDOUR::ConfigVariable *ccvar; + UIConfigVariable *ccvar; if (!color_display.get_path_at_pos ((int)ev->x, (int)ev->y, path, column, cellx, celly)) { return false; @@ -127,10 +140,11 @@ ThemeManager::button_press_event (GdkEventButton* ev) UINT_TO_RGBA (rgba, &r, &g, &b, &a); color.set_rgb_p (r / 255.0, g / 255.0, b / 255.0); - color_dialog.get_colorsel()->set_current_color (color); color_dialog.get_colorsel()->set_previous_color (color); - color_dialog.get_colorsel()->set_current_alpha (a * 256); + color_dialog.get_colorsel()->set_current_color (color); color_dialog.get_colorsel()->set_previous_alpha (a * 256); + color_dialog.get_colorsel()->set_current_alpha (a * 256); + ResponseType result = (ResponseType) color_dialog.run(); switch (result) { @@ -143,8 +157,9 @@ ThemeManager::button_press_event (GdkEventButton* ev) g = (int) floor (color.get_green_p() * 255.0); b = (int) floor (color.get_blue_p() * 255.0); - rgba = RGBA_TO_UINT(r,g,b,a); + rgba = RGBA_TO_UINT(r,g,b,a>>8); //cerr << (*iter)[columns.name] << " == " << hex << rgba << endl; + //cerr << "a = " << a << endl; (*iter)[columns.rgba] = rgba; (*iter)[columns.gdkcolor] = color; @@ -171,31 +186,75 @@ ThemeManager::button_press_event (GdkEventButton* ev) return false; } +void +load_rc_file (const string& filename, bool themechange) +{ + sys::path rc_file_path; + + SearchPath spath (ardour_search_path()); + spath += user_config_directory(); + spath += system_config_search_path(); + + if (!find_file_in_search_path (spath, filename, rc_file_path)) { + warning << string_compose( + _("Unable to find UI style file %1 in search path %2. Ardour will look strange"), + filename, spath.to_string()) + << endmsg; + return; + } + + cerr << "Loading ui configuration file " << rc_file_path.to_string() << endmsg; + + 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::load_rc(int which) +ThemeManager::on_dark_theme_button_toggled() { - - if (which == 1) { - Config->set_ui_rc_file("ardour2_ui_dark.rc"); - cerr << "dark theme selected" << endl; - + if (!dark_button.get_active()) return; + + if (HACK_PROFILE_IS_SAE()){ + ARDOUR_UI::config()->ui_rc_file.set("ardour3_ui_dark_sae.rc"); } else { - Config->set_ui_rc_file("ardour2_ui_light.rc"); - cerr << "light theme selected" << endl; + ARDOUR_UI::config()->ui_rc_file.set("ardour3_ui_dark.rc"); } - ThemeChanged(find_config_file(Config->get_ui_rc_file())); //EMIT SIGNAL - - cerr << "load_rc() called " << find_config_file(Config->get_ui_rc_file()) << endl; + load_rc_file (ARDOUR_UI::config()->ui_rc_file.get(), true); +} + +void +ThemeManager::on_light_theme_button_toggled() +{ + if (!light_button.get_active()) return; + 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); } void ThemeManager::setup_theme () { int r, g, b, a; - for (std::vector *>::iterator i = Config->canvas_colors.begin(); i != Config->canvas_colors.end(); i++) { + color_list->clear(); + + for (std::vector *>::iterator i = ARDOUR_UI::config()->canvas_colors.begin(); i != ARDOUR_UI::config()->canvas_colors.end(); i++) { TreeModel::Row row = *(color_list->append()); @@ -211,20 +270,30 @@ ThemeManager::setup_theme () row[columns.rgba] = rgba; row[columns.gdkcolor] = col; - //cerr << (*i)->name() << " == " << rgba << endl; } - cerr << "ThemeManager::setup_theme () called" << endl; - ColorsChanged(); //EMIT SIGNAL - - if (getenv ("ARDOUR2_UI_RC")) { - return; + + ColorsChanged.emit(); + + bool env_defined = false; + string rcfile = Glib::getenv("ARDOUR3_UI_RC", env_defined); + + if(!env_defined) { + rcfile = ARDOUR_UI::config()->ui_rc_file.get(); } - if (Config->get_ui_rc_file() == "ardour2_ui_dark.rc") { + if (rcfile == "ardour3_ui_dark.rc" || rcfile == "ardour3_ui_dark_sae.rc") { dark_button.set_active(); - } else if (Config->get_ui_rc_file() == "ardour2_ui_light.rc") { + } else if (rcfile == "ardour3_ui_light.rc" || "ardour3_ui_light_sae.rc") { light_button.set_active(); } - + + load_rc_file(rcfile, false); +} + +void +ThemeManager::reset_canvas_colors() +{ + ARDOUR_UI::config()->load_defaults(); + setup_theme (); }