don't run meter in import-dialog if the dialog is not visible

[ardour.git] / gtk2_ardour / theme_manager.cc

diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc
index a3ee38e629eb8c9818f771a88311c96051ece5a2..5f707e3212cb6bef9b03222a8c7c344e84bca014 100644 (file)
--- a/gtk2_ardour/theme_manager.cc
+++ b/gtk2_ardour/theme_manager.cc
@@ -31,11 +31,12 @@
 #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 "ardour_button.h"
+#include "canvas-waveview.h"
 #include "theme_manager.h"
 #include "rgb_macros.h"
 #include "ardour_ui.h"
@@ -52,10 +53,13 @@ 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"))
+       , all_dialogs (_("All floating windows are dialogs"))
+       , gradient_waveforms (_("Draw waveforms with color gradient"))
 {
        set_title (_("Theme Manager"));
 
@@ -90,7 +94,15 @@ 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 (gradient_waveforms, PACK_SHRINK);
        vbox->pack_start (scroller);
+
+       vbox->show_all ();
+
        add (*vbox);
 
        color_display.signal_button_press_event().connect (sigc::mem_fun (*this, &ThemeManager::button_press_event), false);
@@ -103,6 +115,14 @@ ThemeManager::ThemeManager()
        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));
+       all_dialogs.signal_toggled().connect (sigc::mem_fun (*this, &ThemeManager::on_all_dialogs_toggled));
+       gradient_waveforms.signal_toggled().connect (sigc::mem_fun (*this, &ThemeManager::on_gradient_waveforms_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 ();
@@ -176,7 +196,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;
@@ -200,7 +223,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"),
@@ -209,9 +232,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
@@ -226,6 +249,35 @@ load_rc_file (const string& filename, bool themechange)
 
 #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_all_dialogs_toggled ()
+{
+       ARDOUR_UI::config()->all_floating_windows_are_dialogs.set (all_dialogs.get_active());
+       ARDOUR_UI::config()->set_dirty ();
+}
+
+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()
 {
@@ -333,7 +385,11 @@ ThemeManager::setup_theme ()
        } 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());
+       all_dialogs.set_active (ARDOUR_UI::config()->all_floating_windows_are_dialogs.get());
+       gradient_waveforms.set_active (ARDOUR_UI::config()->gradient_waveforms.get());
+       
        load_rc_file(rcfile, false);
 }
 
@@ -342,5 +398,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 ();
 }