X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftheme_manager.cc;h=8c2f92768b9a4f5076f332d0628ea2de0e58bbc7;hb=678bb05bd6c68282448e1920fd7511a4289a1fc4;hp=9968fa9ea0ac629ba6aa039ca6155245072f8673;hpb=9f63ab9931e6478472853bdda58da47ea29ac125;p=ardour.git diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc index 9968fa9ea0..8c2f92768b 100644 --- a/gtk2_ardour/theme_manager.cc +++ b/gtk2_ardour/theme_manager.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 Paul Davis + Copyright (C) 2000-2007 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -24,17 +24,18 @@ #include #include -#include #include -#include +#include "pbd/file_utils.h" -#include -#include +#include "ardour/configuration.h" +#include "ardour/filesystem_paths.h" +#include "ardour/profile.h" #include "theme_manager.h" #include "rgb_macros.h" #include "ardour_ui.h" +#include "global_signals.h" #include "i18n.h" @@ -48,21 +49,19 @@ sigc::signal ColorsChanged; sigc::signal ColorChanged; ThemeManager::ThemeManager() - : ArdourDialog ("ThemeManager"), - dark_button ("Dark Theme"), - light_button ("Light Theme"), - reset_button ("Restore Defaults") + : ArdourDialog (_("Theme Manager")), + 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 ()); - + set_title (_("Theme Manager")); + color_list = ListStore::create (columns); color_display.set_model (color_list); color_display.append_column (_("Object"), columns.name); color_display.append_column (_("Color"), columns.color); - color_display.get_column (0)->set_data (X_("colnum"), GUINT_TO_POINTER(0)); - color_display.get_column (1)->set_data (X_("colnum"), GUINT_TO_POINTER(1)); + color_display.get_column (0)->set_data (X_("colnum"), GUINT_TO_POINTER(0)); + color_display.get_column (1)->set_data (X_("colnum"), GUINT_TO_POINTER(1)); color_display.set_reorderable (false); color_display.get_selection()->set_mode (SELECTION_NONE); color_display.set_headers_visible (true); @@ -70,10 +69,10 @@ ThemeManager::ThemeManager() CellRenderer* color_cell = color_display.get_column_cell_renderer (1); TreeViewColumn* color_column = color_display.get_column (1); color_column->add_attribute (color_cell->property_cell_background_gdk(), columns.gdkcolor); - + scroller.add (color_display); scroller.set_policy (POLICY_NEVER, POLICY_AUTOMATIC); - + RadioButton::Group group = dark_button.get_group(); light_button.set_group(group); theme_selection_hbox.set_homogeneous(false); @@ -85,16 +84,16 @@ ThemeManager::ThemeManager() 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); + color_display.signal_button_press_event().connect (sigc::mem_fun (*this, &ThemeManager::button_press_event), false); color_dialog.get_colorsel()->set_has_opacity_control (true); color_dialog.get_colorsel()->set_has_palette (true); - 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_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)); + color_dialog.get_ok_button()->signal_clicked().connect (sigc::bind (sigc::mem_fun (color_dialog, &Gtk::Dialog::response), RESPONSE_ACCEPT)); + color_dialog.get_cancel_button()->signal_clicked().connect (sigc::bind (sigc::mem_fun (color_dialog, &Gtk::Dialog::response), RESPONSE_CANCEL)); + dark_button.signal_toggled().connect (sigc::mem_fun (*this, &ThemeManager::on_dark_theme_button_toggled)); + light_button.signal_toggled().connect (sigc::mem_fun (*this, &ThemeManager::on_light_theme_button_toggled)); + reset_button.signal_clicked().connect (sigc::mem_fun (*this, &ThemeManager::reset_canvas_colors)); set_size_request (-1, 400); setup_theme (); @@ -105,7 +104,7 @@ ThemeManager::~ThemeManager() } int -ThemeManager::save (string path) +ThemeManager::save (string /*path*/) { return 0; } @@ -120,7 +119,7 @@ ThemeManager::button_press_event (GdkEventButton* ev) int celly; UIConfigVariable *ccvar; - + if (!color_display.get_path_at_pos ((int)ev->x, (int)ev->y, path, column, cellx, celly)) { return false; } @@ -150,7 +149,7 @@ ThemeManager::button_press_event (GdkEventButton* ev) case RESPONSE_CANCEL: break; case RESPONSE_ACCEPT: - color = color_dialog.get_colorsel()->get_current_color(); + color = color_dialog.get_colorsel()->get_current_color(); a = color_dialog.get_colorsel()->get_current_alpha(); r = (int) floor (color.get_red_p() * 255.0); g = (int) floor (color.get_green_p() * 255.0); @@ -194,25 +193,41 @@ load_rc_file (const string& filename, bool themechange) 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; + 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. %3 will look strange"), + filename, spath.to_string(), PROGRAM_NAME) + << endmsg; return; } - cerr << "Loading ui configuration file " << rc_file_path.to_string() << endmsg; + info << "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::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 +236,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); } @@ -232,7 +252,7 @@ ThemeManager::setup_theme () 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()); Gdk::Color col; @@ -252,15 +272,15 @@ ThemeManager::setup_theme () ColorsChanged.emit(); bool env_defined = false; - string rcfile = Glib::getenv("ARDOUR2_UI_RC", env_defined); + string rcfile = Glib::getenv("ARDOUR3_UI_RC", env_defined); if(!env_defined) { 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(); }