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

diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc
index b1e549f29e..3514d918bd 100644
--- a/gtk2_ardour/theme_manager.cc
+++ b/gtk2_ardour/theme_manager.cc
@@ -31,6 +31,7 @@
 #include "gtkmm2ext/cell_renderer_color_selector.h"
 
 #include "pbd/file_utils.h"
+#include "pbd/compose.h"
 
 #include "ardour/filesystem_paths.h"
 
@@ -58,11 +59,13 @@ ThemeManager::ThemeManager()
 	, light_button (_("Light Theme"))
 	, reset_button (_("Restore Defaults"))
 	, flat_buttons (_("Draw \"flat\" buttons"))
-	, waveform_gradient_depth (0, 1.0, 0.1)
+	, 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, 2.0, 0.1)
+	, 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"));
 
@@ -97,7 +100,12 @@ 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);
@@ -112,6 +120,9 @@ ThemeManager::ThemeManager()
 
 	vbox->pack_start (*hbox, PACK_SHRINK);
 	vbox->pack_start (scroller);
+
+	vbox->show_all ();
+
 	add (*vbox);
 
 	waveform_gradient_depth.set_update_policy (Gtk::UPDATE_DELAYED);
@@ -122,14 +133,26 @@ ThemeManager::ThemeManager()
 	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 ();
@@ -266,6 +289,27 @@ ThemeManager::on_flat_buttons_toggled ()
 	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 ()
 {
@@ -276,7 +320,6 @@ ThemeManager::on_waveform_gradient_depth_change ()
 	ArdourCanvas::WaveView::set_global_gradient_depth (v);
 }
 
-
 void
 ThemeManager::on_timeline_item_gradient_depth_change ()
 {
@@ -397,6 +440,7 @@ ThemeManager::setup_theme ()
 	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);
 }