X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui_dialogs.cc;h=f87ce85476438c0612de095b21e066c372ffa87c;hb=bed58e9f372a6c2671e9f072c19a4c77d06c4292;hp=8a50697e85b9b76efad70c2a9b365a23e89cebc4;hpb=87726495c30f90554b5204b5385d17274a8fe93e;p=ardour.git

diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc
index 8a50697e85..f87ce85476 100644
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -34,7 +34,9 @@
 #include "public_editor.h"
 #include "route_params_ui.h"
 #include "sfdb_ui.h"
-#include "color_manager.h"
+#include "theme_manager.h"
+#include "bundle_manager.h"
+#include "keyeditor.h"
 
 #include "i18n.h"
 
@@ -49,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 */
@@ -78,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);
@@ -163,11 +164,12 @@ ARDOUR_UI::connect_to_session (Session *s)
 }
 
 int
-ARDOUR_UI::unload_session ()
+ARDOUR_UI::unload_session (bool hide_stuff)
 {
 	if (session && session->dirty()) {
 		switch (ask_about_saving_session (_("close"))) {
 		case -1:
+			// cancel
 			return 1;
 			
 		case 1:
@@ -175,7 +177,13 @@ ARDOUR_UI::unload_session ()
 			break;
 		}
 	}
-	editor->hide ();
+
+	if (hide_stuff) {
+		editor->hide ();
+		mixer->hide ();
+		theme_manager->hide ();
+	}
+
 	second_connection.disconnect ();
 	point_one_second_connection.disconnect ();
 	point_oh_five_second_connection.disconnect ();
@@ -203,10 +211,6 @@ ARDOUR_UI::unload_session ()
 		option_editor->set_session (0);
 	}
 
-	if (mixer) {
-		mixer->hide_all ();
-	}
-
 	delete session;
 	session = 0;
 
@@ -324,17 +328,65 @@ ARDOUR_UI::toggle_location_window ()
 }
 
 void
-ARDOUR_UI::toggle_color_manager ()
+ARDOUR_UI::toggle_key_editor ()
 {
-	RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("ToggleColorManager"));
+	if (key_editor == 0) {
+		key_editor = new KeyEditor;
+		key_editor->signal_unmap().connect (sigc::bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleKeyEditor")));	
+	}
+
+	RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("ToggleKeyEditor"));
 	if (act) {
 		RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic(act);
 	
 		if (tact->get_active()) {
-			color_manager->show_all ();
-			color_manager->present ();
+			key_editor->show_all ();
+			key_editor->present ();
 		} else {
-			color_manager->hide ();
+			key_editor->hide ();
+		} 
+	}
+}
+
+void
+ARDOUR_UI::toggle_theme_manager ()
+{
+	RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("ToggleThemeManager"));
+	if (act) {
+		RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic(act);
+	
+		if (tact->get_active()) {
+			theme_manager->show_all ();
+			theme_manager->present ();
+		} else {
+			theme_manager->hide ();
+		} 
+	}
+}
+
+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 ();
 		} 
 	}
 }
@@ -381,3 +433,24 @@ ARDOUR_UI::handle_locations_change (Location* ignored)
 		}
 	}
 }
+
+bool
+ARDOUR_UI::main_window_state_event_handler (GdkEventWindowState* ev, bool window_was_editor)
+{
+	if (window_was_editor) {
+
+		if ((ev->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) && 
+		    (ev->new_window_state & GDK_WINDOW_STATE_FULLSCREEN)) {
+			float_big_clock (editor);
+		}
+
+	} else {
+
+		if ((ev->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) && 
+		    (ev->new_window_state & GDK_WINDOW_STATE_FULLSCREEN)) {
+			float_big_clock (mixer);
+		}
+	}
+
+	return false;
+}