New theme manager, with option to select between dark and light theme. Cleanups...

[ardour.git] / gtk2_ardour / ardour_ui_dialogs.cc

diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc
index 25f3068a813d39c04d0b38157e98f79dee0e6c7c..532b7ce76b3d6cb7db0d621f3c26f9d3a6a6bb01 100644 (file)
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -34,7 +34,7 @@
 #include "public_editor.h"
 #include "route_params_ui.h"
 #include "sfdb_ui.h"
-#include "color_manager.h"
+#include "theme_manager.h"
 
 #include "i18n.h"
 
@@ -50,6 +50,7 @@ ARDOUR_UI::connect_to_session (Session *s)
        session = s;
 
        session->HaltOnXrun.connect (mem_fun(*this, &ARDOUR_UI::halt_on_xrun_message));
+       session->RecordStateChanged.connect (mem_fun (*this, &ARDOUR_UI::record_state_changed));
 
        /* sensitize menu bar options that are now valid */
 
@@ -61,6 +62,20 @@ ARDOUR_UI::connect_to_session (Session *s)
                ActionManager::set_sensitive (ActionManager::range_sensitive_actions, false);
        }
 
+       if (!session->control_out()) {
+               Glib::RefPtr<Action> act = ActionManager::get_action (X_("options"), X_("SoloViaBus"));
+               if (act) {
+                       act->set_sensitive (false);
+               }
+       }
+
+       /* allow wastebasket flush again */
+
+       Glib::RefPtr<Action> act = ActionManager::get_action (X_("Main"), X_("FlushWastebasket"));
+       if (act) {
+               act->set_sensitive (true);
+       }
+
        /* there are never any selections on startup */
 
        ActionManager::set_sensitive (ActionManager::region_selection_sensitive_actions, false);
@@ -76,10 +91,6 @@ ARDOUR_UI::connect_to_session (Session *s)
        rec_button.set_sensitive (true);
        shuttle_box.set_sensitive (true);
        
-       if (session->n_diskstreams() == 0) {
-               session->DiskstreamAdded.connect (mem_fun(*this, &ARDOUR_UI::diskstream_added));
-       }
-
        if (connection_editor) {
                connection_editor->set_session (s);
        }
@@ -96,10 +107,6 @@ ARDOUR_UI::connect_to_session (Session *s)
                option_editor->set_session (s);
        }
 
-       if (sfdb) {
-               sfdb->set_session (s);
-       }
-
        setup_session_options ();
 
        Blink.connect (mem_fun(*this, &ARDOUR_UI::transport_rec_enable_blink));
@@ -119,6 +126,10 @@ ARDOUR_UI::connect_to_session (Session *s)
 
        solo_alert_button.set_active (session->soloing());
 
+       /* update autochange callback on dirty state changing */
+
+       session->DirtyChanged.connect (mem_fun(*this, &ARDOUR_UI::update_autosave));
+
        /* can't be auditioning here */
 
        primary_clock.set_session (s);
@@ -132,13 +143,18 @@ ARDOUR_UI::connect_to_session (Session *s)
        
        connect_dependents_to_session (s);
 
+       /* listen to clock mode changes. don't do this earlier because otherwise as the clocks
+          restore their modes or are explicitly set, we will cause the "new" mode to be saved
+          back to the session XML ("extra") state.
+        */
+
+       AudioClock::ModeChanged.connect (mem_fun (*this, &ARDOUR_UI::store_clock_modes));
+
+       Glib::signal_idle().connect (mem_fun (*this, &ARDOUR_UI::first_idle));
+
        start_clocking ();
        start_blinking ();
 
-       if (editor) {
-               editor->present();
-       }
-
        transport_stopped ();
 
        second_connection = Glib::signal_timeout().connect (mem_fun(*this, &ARDOUR_UI::every_second), 1000);
@@ -146,13 +162,14 @@ ARDOUR_UI::connect_to_session (Session *s)
        point_zero_one_second_connection = Glib::signal_timeout().connect (mem_fun(*this, &ARDOUR_UI::every_point_zero_one_seconds), 40);
 }
 
-int
+bool
 ARDOUR_UI::unload_session ()
 {
        if (session && session->dirty()) {
                switch (ask_about_saving_session (_("close"))) {
                case -1:
-                       return 1;
+                       // cancel
+                       return false;
                        
                case 1:
                        session->save_state ("");
@@ -162,6 +179,7 @@ ARDOUR_UI::unload_session ()
        editor->hide ();
        second_connection.disconnect ();
        point_one_second_connection.disconnect ();
+       point_oh_five_second_connection.disconnect ();
        point_zero_one_second_connection.disconnect();
 
        ActionManager::set_sensitive (ActionManager::session_sensitive_actions, false);
@@ -195,7 +213,7 @@ ARDOUR_UI::unload_session ()
 
        update_buffer_load ();
 
-       return 0;
+       return true;
 }
 
 int
@@ -307,17 +325,17 @@ ARDOUR_UI::toggle_location_window ()
 }
 
 void
-ARDOUR_UI::toggle_color_manager ()
+ARDOUR_UI::toggle_theme_manager ()
 {
-       RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("ToggleColorManager"));
+       RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("ToggleThemeManager"));
        if (act) {
                RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic(act);
        
                if (tact->get_active()) {
-                       color_manager->show_all ();
-                       color_manager->present ();
+                       theme_manager->show_all ();
+                       theme_manager->present ();
                } else {
-                       color_manager->hide ();
+                       theme_manager->hide ();
                } 
        }
 }
@@ -326,7 +344,7 @@ int
 ARDOUR_UI::create_route_params ()
 {
        if (route_params == 0) {
-               route_params = new RouteParams_UI (*engine);
+               route_params = new RouteParams_UI ();
                route_params->set_session (session);
                route_params->signal_unmap().connect (sigc::bind(sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleInspector")));
        }
@@ -353,36 +371,6 @@ ARDOUR_UI::toggle_route_params_window ()
        }
 }
 
-int
-ARDOUR_UI::create_sound_file_browser ()
-{
-       if (sfdb == 0) {
-               sfdb = new SoundFileBrowser (_("Sound File Browser"), session);
-               sfdb->signal_unmap().connect (sigc::bind(sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleSoundFileBrowser")));
-       }
-       return 0;
-}
-       
-void
-ARDOUR_UI::toggle_sound_file_browser ()
-{
-       if (create_sound_file_browser()) {
-               return;
-       }
-
-       RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("ToggleSoundFileBrowser"));
-       if (act) {
-               RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic(act);
-       
-               if (tact->get_active()) {
-                       sfdb->show_all();
-                       sfdb->present();
-               } else {
-                       sfdb->hide ();
-               }
-       }
-}
-
 void
 ARDOUR_UI::handle_locations_change (Location* ignored)
 {