X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftheme_manager.cc;h=3514d918bd051e360a07743eefe69de04ff9a754;hb=4aaae2eb3ba65f97e173b1751e1ee3bec8925ed5;hp=8c9d5594410c81cc559721dd9da2e400bc72c1f5;hpb=930f9a34c1bd1015a6937ca975023155f788bc50;p=ardour.git

diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc
index 8c9d559441..3514d918bd 100644
--- a/gtk2_ardour/theme_manager.cc
+++ b/gtk2_ardour/theme_manager.cc
@@ -31,10 +31,11 @@
 #include "gtkmm2ext/cell_renderer_color_selector.h"
 
 #include "pbd/file_utils.h"
+#include "pbd/compose.h"
 
-#include "ardour/configuration.h"
 #include "ardour/filesystem_paths.h"
-#include "ardour/profile.h"
+
+#include "canvas/wave_view.h"
 
 #include "ardour_button.h"
 #include "theme_manager.h"
@@ -58,6 +59,13 @@ ThemeManager::ThemeManager()
 	, light_button (_("Light Theme"))
 	, reset_button (_("Restore Defaults"))
 	, flat_buttons (_("Draw \"flat\" buttons"))
+	, region_color_button (_("Color regions using their track's color"))
+	, show_clipping_button (_("Show waveform clipping"))
+	, waveform_gradient_depth (0, 1.0, 0.05)
+	, waveform_gradient_depth_label (_("Waveforms color gradient depth"))
+	, timeline_item_gradient_depth (0, 1.0, 0.05)
+	, timeline_item_gradient_depth_label (_("Timeline item gradient depth"))
+	, all_dialogs (_("All floating windows are dialogs"))
 {
 	set_title (_("Theme Manager"));
 
@@ -92,21 +100,59 @@ ThemeManager::ThemeManager()
 	vbox->set_homogeneous (false);
 	vbox->pack_start (theme_selection_hbox, PACK_SHRINK);
 	vbox->pack_start (reset_button, PACK_SHRINK);
+#ifndef __APPLE__
+	vbox->pack_start (all_dialogs, PACK_SHRINK);
+#endif
 	vbox->pack_start (flat_buttons, PACK_SHRINK);
+	vbox->pack_start (region_color_button, PACK_SHRINK);
+	vbox->pack_start (show_clipping_button, PACK_SHRINK);
+
+	Gtk::HBox* hbox = Gtk::manage (new Gtk::HBox());
+	hbox->set_spacing (6);
+	hbox->pack_start (waveform_gradient_depth, true, true);
+	hbox->pack_start (waveform_gradient_depth_label, false, false);
+	vbox->pack_start (*hbox, PACK_SHRINK);
+
+	hbox = Gtk::manage (new Gtk::HBox());
+	hbox->set_spacing (6);
+	hbox->pack_start (timeline_item_gradient_depth, true, true);
+	hbox->pack_start (timeline_item_gradient_depth_label, false, false);
+
+	vbox->pack_start (*hbox, PACK_SHRINK);
 	vbox->pack_start (scroller);
+
+	vbox->show_all ();
+
 	add (*vbox);
 
+	waveform_gradient_depth.set_update_policy (Gtk::UPDATE_DELAYED);
+	timeline_item_gradient_depth.set_update_policy (Gtk::UPDATE_DELAYED);
+	
 	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);
 
+	flat_buttons.set_active (ARDOUR_UI::config()->get_flat_buttons());
+	region_color_button.set_active (ARDOUR_UI::config()->get_color_regions_using_track_color());
+	show_clipping_button.set_active (ARDOUR_UI::config()->get_show_waveform_clipping());
+
 	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));
+	region_color_button.signal_toggled().connect (sigc::mem_fun (*this, &ThemeManager::on_region_color_toggled));
+	show_clipping_button.signal_toggled().connect (sigc::mem_fun (*this, &ThemeManager::on_show_clip_toggled));
+	waveform_gradient_depth.signal_value_changed().connect (sigc::mem_fun (*this, &ThemeManager::on_waveform_gradient_depth_change));
+	timeline_item_gradient_depth.signal_value_changed().connect (sigc::mem_fun (*this, &ThemeManager::on_timeline_item_gradient_depth_change));
+	all_dialogs.signal_toggled().connect (sigc::mem_fun (*this, &ThemeManager::on_all_dialogs_toggled));
+
+	Gtkmm2ext::UI::instance()->set_tip (all_dialogs, 
+					    string_compose (_("Mark all floating windows to be type \"Dialog\" rather than using \"Utility\" for some.\n"
+							      "This may help with some window managers. This requires a restart of %1 to take effect"),
+							    PROGRAM_NAME));
 
 	set_size_request (-1, 400);
 	setup_theme ();
@@ -180,7 +226,10 @@ ThemeManager::button_press_event (GdkEventButton* ev)
 
 				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;
@@ -204,7 +253,7 @@ ThemeManager::button_press_event (GdkEventButton* ev)
 void
 load_rc_file (const string& filename, bool themechange)
 {
-	sys::path rc_file_path;
+	std::string 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"),
@@ -213,9 +262,9 @@ load_rc_file (const string& filename, bool themechange)
 		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
@@ -233,26 +282,66 @@ load_rc_file (const string& filename, bool themechange)
 void
 ThemeManager::on_flat_buttons_toggled ()
 {
-	ARDOUR_UI::config()->flat_buttons.set (flat_buttons.get_active());
+	ARDOUR_UI::config()->set_flat_buttons (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_region_color_toggled ()
+{
+	ARDOUR_UI::config()->set_color_regions_using_track_color (region_color_button.get_active());
+	ARDOUR_UI::config()->set_dirty ();
+}
+
+void
+ThemeManager::on_show_clip_toggled ()
+{
+	ARDOUR_UI::config()->set_show_waveform_clipping (show_clipping_button.get_active());
+	ARDOUR_UI::config()->set_dirty ();
+}
+
+void
+ThemeManager::on_all_dialogs_toggled ()
+{
+	ARDOUR_UI::config()->set_all_floating_windows_are_dialogs (all_dialogs.get_active());
+	ARDOUR_UI::config()->set_dirty ();
+}
+
+void
+ThemeManager::on_waveform_gradient_depth_change ()
+{
+	double v = waveform_gradient_depth.get_value();
+
+	ARDOUR_UI::config()->set_waveform_gradient_depth (v);
+	ARDOUR_UI::config()->set_dirty ();
+	ArdourCanvas::WaveView::set_global_gradient_depth (v);
+}
+
+void
+ThemeManager::on_timeline_item_gradient_depth_change ()
+{
+	double v = timeline_item_gradient_depth.get_value();
+
+	ARDOUR_UI::config()->set_timeline_item_gradient_depth (v);
+	ARDOUR_UI::config()->set_dirty ();
+}
+
 void
 ThemeManager::on_dark_theme_button_toggled()
 {
 	if (!dark_button.get_active()) return;
 
 	if (HACK_PROFILE_IS_SAE()){
-		ARDOUR_UI::config()->ui_rc_file.set("ardour3_ui_dark_sae.rc");
+		ARDOUR_UI::config()->set_ui_rc_file("ardour3_ui_dark_sae.rc");
 	} else {
-		ARDOUR_UI::config()->ui_rc_file.set("ardour3_ui_dark.rc");
+		ARDOUR_UI::config()->set_ui_rc_file("ardour3_ui_dark.rc");
 	}
 	ARDOUR_UI::config()->set_dirty ();
 
-	load_rc_file (ARDOUR_UI::config()->ui_rc_file.get(), true);
+	load_rc_file (ARDOUR_UI::config()->get_ui_rc_file(), true);
 }
 
 void
@@ -261,12 +350,12 @@ 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");
+		ARDOUR_UI::config()->set_ui_rc_file("ardour3_ui_light_sae.rc");
 	} else {
-		ARDOUR_UI::config()->ui_rc_file.set("ardour3_ui_light.rc");
+		ARDOUR_UI::config()->set_ui_rc_file("ardour3_ui_light.rc");
 	}
 
-	load_rc_file (ARDOUR_UI::config()->ui_rc_file.get(), true);
+	load_rc_file (ARDOUR_UI::config()->get_ui_rc_file(), true);
 }
 
 void
@@ -339,7 +428,7 @@ ThemeManager::setup_theme ()
 	string rcfile = Glib::getenv("ARDOUR3_UI_RC", env_defined);
 
 	if(!env_defined) {
-		rcfile = ARDOUR_UI::config()->ui_rc_file.get();
+		rcfile = ARDOUR_UI::config()->get_ui_rc_file();
 	}
 
 	if (rcfile == "ardour3_ui_dark.rc" || rcfile == "ardour3_ui_dark_sae.rc") {
@@ -348,7 +437,10 @@ ThemeManager::setup_theme ()
 		light_button.set_active();
 	}
 	
-	flat_buttons.set_active (ARDOUR_UI::config()->flat_buttons.get());
+	flat_buttons.set_active (ARDOUR_UI::config()->get_flat_buttons());
+	waveform_gradient_depth.set_value (ARDOUR_UI::config()->get_waveform_gradient_depth());
+	timeline_item_gradient_depth.set_value (ARDOUR_UI::config()->get_timeline_item_gradient_depth());
+	all_dialogs.set_active (ARDOUR_UI::config()->get_all_floating_windows_are_dialogs());
 	
 	load_rc_file(rcfile, false);
 }
@@ -358,5 +450,9 @@ 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 ();
 }