#include <fstream>
#include <errno.h>
+#include "fix_carbon.h"
+
#include <gtkmm/stock.h>
-#include <gtkmm2ext/gtk_ui.h>
#include <gtkmm/settings.h>
+#include "gtkmm2ext/gtk_ui.h"
+#include "gtkmm2ext/cell_renderer_color_selector.h"
+
#include "pbd/file_utils.h"
-#include "ardour/configuration.h"
#include "ardour/filesystem_paths.h"
-#include "ardour/profile.h"
+#include "ardour_button.h"
+#include "canvas-waveview.h"
#include "theme_manager.h"
#include "rgb_macros.h"
#include "ardour_ui.h"
using namespace PBD;
using namespace ARDOUR;
-
sigc::signal<void> ColorsChanged;
sigc::signal<void,uint32_t> ColorChanged;
ThemeManager::ThemeManager()
- : ArdourWindow (_("Theme Manager")),
- dark_button (_("Dark Theme")),
- light_button (_("Light Theme")),
- reset_button (_("Restore Defaults"))
+ : 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"))
{
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);
+
+ 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);
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);
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 ();
ccvar = (*iter)[columns.pVar];
ccvar->set(rgba);
+ /* mark dirty ... */
ARDOUR_UI::config()->set_dirty ();
+ /* but save it immediately */
+ ARDOUR_UI::config()->save_state ();
ColorsChanged(); //EMIT SIGNAL
break;
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)) {
+ 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, spath.to_string(), PROGRAM_NAME)
+ 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
#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
ThemeManager::on_dark_theme_button_toggled()
{
//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.color] = "";
row[columns.pVar] = var;
row[columns.rgba] = rgba;
row[columns.gdkcolor] = col;
if (rcfile == "ardour3_ui_dark.rc" || rcfile == "ardour3_ui_dark_sae.rc") {
dark_button.set_active();
- } else if (rcfile == "ardour3_ui_light.rc" || "ardour3_ui_light_sae.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);
}
{
ARDOUR_UI::config()->load_defaults();
setup_theme ();
+ /* mark dirty ... */
+ ARDOUR_UI::config()->set_dirty ();
+ /* but save it immediately */
+ ARDOUR_UI::config()->save_state ();
}
projects / ardour.git / blobdiff