Make summary display optional.

git-svn-id: svn://localhost/ardour2/branches/3.0@5191 d708f5d6-7413-0410-9779-e7cbd77b26cf

4 files changed, 37 insertions, 2 deletions

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index b3dcd86780..e965f0dee6 100644
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -392,6 +392,7 @@
 	       <menuitem action='show-editor-list'/>
                <menuitem action='ToggleMeasureVisibility'/>
                <menuitem action='ToggleWaveformsWhileRecording'/>
+               <menuitem action='ToggleSummary'/>
         </menu>
         <menu name='JACK' action='JACK'>
                <menuitem action='JACKDisconnect'/>
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index cb7dcd0a46..bb27a4a7ec 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -933,8 +933,11 @@ Editor::show_window ()
 	if (! is_visible ()) {
 		show_all ();
 
-		 /* re-hide editor list if necessary */
-		 editor_list_button_toggled ();
+		/* re-hide editor list if necessary */
+		editor_list_button_toggled ();
+
+		/* re-hide summary widget if necessary */
+		parameter_changed ("show-summary");
 
 		/* now reset all audio_time_axis heights, because widgets might need
 		   to be re-hidden
@@ -1317,6 +1320,7 @@ Editor::connect_to_session (Session *t)
 	}
 
 	Config->map_parameters (mem_fun (*this, &Editor::parameter_changed));
+	session->config.map_parameters (mem_fun (*this, &Editor::parameter_changed));
 	
 	session->StateSaved.connect (mem_fun(*this, &Editor::session_state_saved));
 	
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 24d43c1b44..fcfcd4bdb9 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -341,6 +341,7 @@ class Editor : public PublicEditor
 
 	void toggle_zero_line_visibility ();
 	void toggle_waveforms_while_recording ();
+	void set_summary ();
 	void toggle_measure_visibility ();
 	void toggle_logo_visibility ();
 
diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index 585eff23e7..f3a3fac2e3 100644
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -806,6 +806,9 @@ Editor::register_actions ()
 	ActionManager::register_action (editor_actions, X_("importFromSession"), _("Import From Session"), mem_fun(*this, &Editor::session_import_dialog));
 
 	ActionManager::register_toggle_action (editor_actions, X_("ToggleWaveformsWhileRecording"), _("Show Waveforms While Recording"), mem_fun (*this, &Editor::toggle_waveforms_while_recording));
+
+	ActionManager::register_toggle_action (editor_actions, X_("ToggleSummary"), _("Show Summary"), mem_fun (*this, &Editor::set_summary));
+	
 	ActionManager::register_toggle_action (editor_actions, X_("ToggleMeasureVisibility"), _("Show Measures"), mem_fun (*this, &Editor::toggle_measure_visibility));
 	
 	/* if there is a logo in the editor canvas, its always visible at startup */
@@ -883,6 +886,16 @@ Editor::toggle_waveforms_while_recording ()
 }
 
 void
+Editor::set_summary ()
+{
+	Glib::RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("ToggleSummary"));
+	if (act) {
+		Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
+		session->config.set_show_summary (tact->get_active ());
+	}
+}
+
+void
 Editor::toggle_measure_visibility ()
 {
 	Glib::RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("ToggleMeasureVisibility"));
@@ -1260,6 +1273,22 @@ Editor::parameter_changed (std::string p)
 		update_just_smpte ();
 	} else if (p == "show-track-meters") {
 		toggle_meter_updating();
+	} else if (p == "show-summary") {
+		
+		bool const s = session->config.get_show_summary ();
+ 		if (s) {
+ 			_summary->show ();
+ 		} else {
+ 			_summary->hide ();
+ 		}
+
+		Glib::RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("ToggleSummary"));
+		if (act) {
+			Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
+			if (tact->get_active () != s) {
+				tact->set_active (s);
+			}
+		}
 	}
 }