/*
- 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
#include <gtkmm/stock.h>
#include <gtkmm2ext/gtk_ui.h>
-#include <gtkmm2ext/window_title.h>
#include <gtkmm/settings.h>
-#include <pbd/file_utils.h>
+#include "pbd/file_utils.h"
-#include <ardour/configuration.h>
-#include <ardour/filesystem_paths.h>
-#include <ardour/profile.h>
+#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"
sigc::signal<void,uint32_t> 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 ());
-
- 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));
+ 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);
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);
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 ();
}
int
-ThemeManager::save (string path)
+ThemeManager::save (string /*path*/)
{
return 0;
}
int celly;
UIConfigVariable<uint32_t> *ccvar;
-
+
if (!color_display.get_path_at_pos ((int)ev->x, (int)ev->y, path, column, cellx, celly)) {
return false;
}
case 1: /* color */
if ((iter = color_list->get_iter (path))) {
+ UIConfigVariable<uint32_t>* 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;
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);
+ ARDOUR_UI::config()->set_dirty ();
- //ColorChanged (rgba);
- ColorsChanged();//EMIT SIGNAL
+ ColorsChanged(); //EMIT SIGNAL
break;
default:
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.
} 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);
}
ThemeManager::setup_theme ()
{
int r, g, b, a;
+
color_list->clear();
- for (std::vector<UIConfigVariable<uint32_t> *>::iterator i = ARDOUR_UI::config()->canvas_colors.begin(); i != ARDOUR_UI::config()->canvas_colors.end(); i++) {
-
- TreeModel::Row row = *(color_list->append());
+ for (std::map<std::string,UIConfigVariable<uint32_t> *>::iterator i = ARDOUR_UI::config()->canvas_colors.begin(); i != ARDOUR_UI::config()->canvas_colors.end(); i++) {
+
+
+ UIConfigVariable<uint32_t>* 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();
projects / ardour.git / blobdiff