Merge branch 'master' into cairocanvas

[ardour.git] / gtk2_ardour / theme_manager.cc

diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc
index 1fabfacb7eba7219a1ca3593def7b9b4bc36dfb8..3514d918bd051e360a07743eefe69de04ff9a754 100644 (file)
--- a/gtk2_ardour/theme_manager.cc
+++ b/gtk2_ardour/theme_manager.cc
@@ -59,9 +59,11 @@ 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"))
 {
@@ -102,6 +104,8 @@ ThemeManager::ThemeManager()
        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);
@@ -129,12 +133,18 @@ 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));
@@ -279,6 +289,20 @@ 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 ()
 {