X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftheme_manager.cc;h=4d7599bb78ed5dd538bdc210b00af42ddef7896d;hb=63b02a265a6d5e821198b5e3fcc1f6ba6d83a129;hp=c1e662d0169fb6419240e55b51bbd7cded59a4e7;hpb=3b937a7c44a1acd633c22970d67ed3b6af2f701e;p=ardour.git diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc index c1e662d016..4d7599bb78 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 @@ -22,18 +22,24 @@ #include #include +#include "fix_carbon.h" + #include -#include #include -#include +#include "gtkmm2ext/gtk_ui.h" +#include "gtkmm2ext/cell_renderer_color_selector.h" + +#include "pbd/file_utils.h" -#include -#include +#include "ardour/filesystem_paths.h" +#include "ardour_button.h" +#include "canvas-waveview.h" #include "theme_manager.h" #include "rgb_macros.h" #include "ardour_ui.h" +#include "global_signals.h" #include "i18n.h" @@ -42,51 +48,67 @@ using namespace Gtk; using namespace PBD; using namespace ARDOUR; - sigc::signal ColorsChanged; sigc::signal ColorChanged; ThemeManager::ThemeManager() - : ArdourDialog ("ThemeManager"), - dark_button ("Dark Theme"), - light_button ("Light Theme") + : ArdourWindow (_("Theme Manager")) + , dark_button (_("Dark Theme")) + , light_button (_("Light Theme")) + , reset_button (_("Restore Defaults")) + , flat_buttons (_("Draw \"flat\" buttons")) + , gradient_waveforms (_("Draw waveforms with color gradient")) { - color_list = ListStore::create (columns); + set_title (_("Theme Manager")); + + color_list = TreeStore::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)); + + Gtkmm2ext::CellRendererColorSelector* color_renderer = manage (new Gtkmm2ext::CellRendererColorSelector); + TreeViewColumn* color_column = manage (new TreeViewColumn (_("Color"), *color_renderer)); + color_column->add_attribute (color_renderer->property_color(), columns.gdkcolor); + + color_display.append_column (*color_column); + + color_display.get_column (0)->set_data (X_("colnum"), GUINT_TO_POINTER(0)); + color_display.get_column (0)->set_expand (true); + color_display.get_column (1)->set_data (X_("colnum"), GUINT_TO_POINTER(1)); + color_display.get_column (1)->set_expand (false); color_display.set_reorderable (false); color_display.get_selection()->set_mode (SELECTION_NONE); color_display.set_headers_visible (true); - 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); theme_selection_hbox.pack_start (dark_button); theme_selection_hbox.pack_start (light_button); - get_vbox()->set_homogeneous(false); - get_vbox()->pack_start (theme_selection_hbox, PACK_SHRINK); - get_vbox()->pack_start (scroller); + Gtk::VBox* vbox = Gtk::manage (new Gtk::VBox ()); + vbox->set_homogeneous (false); + vbox->pack_start (theme_selection_hbox, PACK_SHRINK); + vbox->pack_start (reset_button, PACK_SHRINK); + vbox->pack_start (flat_buttons, PACK_SHRINK); + vbox->pack_start (gradient_waveforms, PACK_SHRINK); + vbox->pack_start (scroller); + add (*vbox); - 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)); + 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)); + flat_buttons.signal_toggled().connect (sigc::mem_fun (*this, &ThemeManager::on_flat_buttons_toggled)); + gradient_waveforms.signal_toggled().connect (sigc::mem_fun (*this, &ThemeManager::on_gradient_waveforms_toggled)); set_size_request (-1, 400); setup_theme (); @@ -97,7 +119,7 @@ ThemeManager::~ThemeManager() } int -ThemeManager::save (string path) +ThemeManager::save (string /*path*/) { return 0; } @@ -112,7 +134,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; } @@ -125,6 +147,12 @@ ThemeManager::button_press_event (GdkEventButton* ev) case 1: /* color */ if ((iter = color_list->get_iter (path))) { + UIConfigVariable* var = (*iter)[columns.pVar]; + if (!var) { + /* parent row, do nothing */ + return false; + } + int r,g, b, a; uint32_t rgba = (*iter)[columns.rgba]; Gdk::Color color; @@ -142,23 +170,24 @@ 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); b = (int) floor (color.get_blue_p() * 255.0); 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; ccvar = (*iter)[columns.pVar]; ccvar->set(rgba); + /* mark dirty ... */ + ARDOUR_UI::config()->set_dirty (); + /* but save it immediately */ + ARDOUR_UI::config()->save_state (); - //ColorChanged (rgba); - ColorsChanged();//EMIT SIGNAL + ColorsChanged(); //EMIT SIGNAL break; default: @@ -180,23 +209,52 @@ ThemeManager::button_press_event (GdkEventButton* ev) 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(); + std::string rc_file_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 (ardour_config_search_path(), filename, rc_file_path)) { + warning << string_compose (_("Unable to find UI style file %1 in search path %2. %3 will look strange"), + filename, ardour_config_search_path().to_string(), PROGRAM_NAME) + << endmsg; return; } - info << "Loading ui configuration file " << rc_file_path.to_string() << endmsg; + info << "Loading ui configuration file " << rc_file_path << endmsg; - Gtkmm2ext::UI::instance()->load_rcfile (rc_file_path.to_string(), themechange); + Gtkmm2ext::UI::instance()->load_rcfile (rc_file_path, 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_flat_buttons_toggled () +{ + ARDOUR_UI::config()->flat_buttons.set (flat_buttons.get_active()); + ARDOUR_UI::config()->set_dirty (); + ArdourButton::set_flat_buttons (flat_buttons.get_active()); + /* force a redraw */ + gtk_rc_reset_styles (gtk_settings_get_default()); +} + +void +ThemeManager::on_gradient_waveforms_toggled () +{ + ARDOUR_UI::config()->gradient_waveforms.set (gradient_waveforms.get_active()); + ARDOUR_UI::config()->set_dirty (); + + gnome_canvas_waveview_set_gradient_waveforms (gradient_waveforms.get_active()); + + /* force a redraw */ + gtk_rc_reset_styles (gtk_settings_get_default()); } void @@ -204,7 +262,13 @@ ThemeManager::on_dark_theme_button_toggled() { if (!dark_button.get_active()) return; - ARDOUR_UI::config()->ui_rc_file.set("ardour2_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"); + } + ARDOUR_UI::config()->set_dirty (); + load_rc_file (ARDOUR_UI::config()->ui_rc_file.get(), true); } @@ -213,7 +277,12 @@ ThemeManager::on_light_theme_button_toggled() { if (!light_button.get_active()) return; - ARDOUR_UI::config()->ui_rc_file.set("ardour2_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); } @@ -221,39 +290,95 @@ void ThemeManager::setup_theme () { int r, g, b, a; - 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()); + + color_list->clear(); + + for (std::map *>::iterator i = ARDOUR_UI::config()->canvas_colors.begin(); i != ARDOUR_UI::config()->canvas_colors.end(); i++) { + + + UIConfigVariable* var = i->second; + + TreeModel::Children rows = color_list->children(); + TreeModel::Row row; + string::size_type colon; + + if ((colon = var->name().find (':')) != string::npos) { + + /* this is supposed to be a child node, so find the + * parent + */ + + string parent = var->name().substr (0, colon); + TreeModel::iterator ri; + + for (ri = rows.begin(); ri != rows.end(); ++ri) { + string s = (*ri)[columns.name]; + if (s == parent) { + break; + } + } + + if (ri == rows.end()) { + /* not found, add the parent as new top level row */ + row = *(color_list->append()); + row[columns.name] = parent; + row[columns.pVar] = 0; + + /* now add the child as a child of this one */ + + row = *(color_list->insert (row->children().end())); + row[columns.name] = var->name().substr (colon+1); + } else { + row = *(color_list->insert ((*ri)->children().end())); + row[columns.name] = var->name().substr (colon+1); + } + + } else { + /* add as a child */ + row = *(color_list->append()); + row[columns.name] = var->name(); + } Gdk::Color col; - uint32_t rgba = (*i)->get(); + uint32_t rgba = var->get(); UINT_TO_RGBA (rgba, &r, &g, &b, &a); //cerr << (*i)->name() << " == " << hex << rgba << ": " << hex << r << " " << hex << g << " " << hex << b << endl; col.set_rgb_p (r / 255.0, g / 255.0, b / 255.0); - row[columns.name] = (*i)->name(); - row[columns.color] = ""; - row[columns.pVar] = *i; + row[columns.pVar] = var; row[columns.rgba] = rgba; row[columns.gdkcolor] = col; - } 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 == "ardour2_ui_dark.rc") { + if (rcfile == "ardour3_ui_dark.rc" || rcfile == "ardour3_ui_dark_sae.rc") { dark_button.set_active(); - } else if (rcfile == "ardour2_ui_light.rc") { + } else if (rcfile == "ardour3_ui_light.rc" || rcfile == "ardour3_ui_light_sae.rc") { light_button.set_active(); } - + + flat_buttons.set_active (ARDOUR_UI::config()->flat_buttons.get()); + gradient_waveforms.set_active (ARDOUR_UI::config()->gradient_waveforms.get()); + load_rc_file(rcfile, false); } +void +ThemeManager::reset_canvas_colors() +{ + ARDOUR_UI::config()->load_defaults(); + setup_theme (); + /* mark dirty ... */ + ARDOUR_UI::config()->set_dirty (); + /* but save it immediately */ + ARDOUR_UI::config()->save_state (); +} +