X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftheme_manager.cc;h=1af708e524380a9f28c078e9af15dfb6b808c1d7;hb=1dfee4813923f36401af771ee8731ec1ba3f20af;hp=44389da71197405d5039daaa068e3ffe06cf818b;hpb=c7c8cc7dc7555c9e852ff4b667fbcd046517d21c;p=ardour.git

diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc
index 44389da711..1af708e524 100644
--- a/gtk2_ardour/theme_manager.cc
+++ b/gtk2_ardour/theme_manager.cc
@@ -74,6 +74,7 @@ ThemeManager::ThemeManager()
 	, 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"))
+	, transients_follow_front (_("Transient windows follow front window."))
 	, icon_set_label (_("Icon Set"))
 	, palette_viewport (*palette_scroller.get_hadjustment(), *palette_scroller.get_vadjustment())
 	, palette_group (0)
@@ -111,10 +112,13 @@ ThemeManager::ThemeManager()
 	theme_selection_hbox.pack_start (light_button);
 
 	set_homogeneous (false);
+#if 0 // disable light/dark theme choice. until the 'light theme gets some attention.
 	pack_start (theme_selection_hbox, PACK_SHRINK);
+#endif
 	pack_start (reset_button, PACK_SHRINK);
 #ifndef __APPLE__
 	pack_start (all_dialogs, PACK_SHRINK);
+	pack_start (transients_follow_front, PACK_SHRINK);
 #endif
 	pack_start (flat_buttons, PACK_SHRINK);
 	pack_start (blink_rec_button, PACK_SHRINK);
@@ -184,12 +188,16 @@ ThemeManager::ThemeManager()
 	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));
+	transients_follow_front.signal_toggled().connect (sigc::mem_fun (*this, &ThemeManager::on_transients_follow_front_toggled));
 	icon_set_dropdown.signal_changed().connect (sigc::mem_fun (*this, &ThemeManager::on_icon_set_changed));
 
 	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));
+	Gtkmm2ext::UI::instance()->set_tip (transients_follow_front, 
+					    string_compose (_("Make transient windows follow the front window when toggling between the editor and mixer.\n"
+							      "This requires a restart of %1 to take effect"), PROGRAM_NAME));
 
 	set_size_request (-1, 400);
 	/* no need to call setup_palette() here, it will be done when its size is allocated */
@@ -297,6 +305,12 @@ ThemeManager::on_all_dialogs_toggled ()
 	ARDOUR_UI::config()->set_all_floating_windows_are_dialogs (all_dialogs.get_active());
 }
 
+void
+ThemeManager::on_transients_follow_front_toggled ()
+{
+	ARDOUR_UI::config()->set_transients_follow_front (transients_follow_front.get_active());
+}
+
 void
 ThemeManager::on_waveform_gradient_depth_change ()
 {
@@ -358,6 +372,8 @@ ThemeManager::set_ui_to_state()
 	/* there is no need to block signal handlers, here,
 	 * all elements check if the value has changed and ignore NOOPs 
 	 */
+	all_dialogs.set_active (ARDOUR_UI::config()->get_all_floating_windows_are_dialogs());
+	transients_follow_front.set_active (ARDOUR_UI::config()->get_transients_follow_front());
 	flat_buttons.set_active (ARDOUR_UI::config()->get_flat_buttons());
 	blink_rec_button.set_active (ARDOUR_UI::config()->get_blink_rec_arm());
 	region_color_button.set_active (ARDOUR_UI::config()->get_color_regions_using_track_color());