Fix region/track naming on MIDI import (remove ugly/unnecessary %a %b etc suffix).

[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 89ab470d9b9aba9e33657d38364af504f0f53d4f..32b9f5adc75fd1597559b13af9a8ac730604b4d1 100644 (file)
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -35,6 +35,7 @@
 #include "route_params_ui.h"
 #include "sfdb_ui.h"
 #include "theme_manager.h"
+#include "bundle_manager.h"
 #include "keyeditor.h"
 
 #include "i18n.h"
@@ -50,7 +51,7 @@ ARDOUR_UI::connect_to_session (Session *s)
 {
        session = s;
 
-       session->HaltOnXrun.connect (mem_fun(*this, &ARDOUR_UI::halt_on_xrun_message));
+       session->Xrun.connect (mem_fun(*this, &ARDOUR_UI::xrun_handler));
        session->RecordStateChanged.connect (mem_fun (*this, &ARDOUR_UI::record_state_changed));
 
        /* sensitize menu bar options that are now valid */
@@ -79,7 +80,6 @@ ARDOUR_UI::connect_to_session (Session *s)
 
        /* there are never any selections on startup */
 
-       ActionManager::set_sensitive (ActionManager::region_selection_sensitive_actions, false);
        ActionManager::set_sensitive (ActionManager::time_selection_sensitive_actions, false);
        ActionManager::set_sensitive (ActionManager::track_selection_sensitive_actions, false);
        ActionManager::set_sensitive (ActionManager::line_selection_sensitive_actions, false);
@@ -181,6 +181,7 @@ ARDOUR_UI::unload_session (bool hide_stuff)
        if (hide_stuff) {
                editor->hide ();
                mixer->hide ();
+               theme_manager->hide ();
        }
 
        second_connection.disconnect ();
@@ -363,6 +364,33 @@ ARDOUR_UI::toggle_theme_manager ()
        }
 }
 
+void
+ARDOUR_UI::create_bundle_manager ()
+{
+       if (bundle_manager == 0) {
+               bundle_manager = new BundleManager (*session);
+               bundle_manager->signal_unmap().connect (sigc::bind (sigc::ptr_fun (&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleBundleManager")));
+       }
+}
+
+void
+ARDOUR_UI::toggle_bundle_manager ()
+{
+       create_bundle_manager ();
+       
+       RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("ToggleBundleManager"));
+       if (act) {
+               RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic (act);
+       
+               if (tact->get_active()) {
+                       bundle_manager->show_all ();
+                       bundle_manager->present ();
+               } else {
+                       bundle_manager->hide ();
+               } 
+       }
+}
+
 int
 ARDOUR_UI::create_route_params ()
 {