add logo visibility control action etc.

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2517 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/ardour-sae.menus b/gtk2_ardour/ardour-sae.menus
index c821cbf8a8698e97f4ce0fdbeb08b9f867bdd413..511ce3aa0d2763e7cd4985937b3fff4902c99e87 100644 (file)
--- a/gtk2_ardour/ardour-sae.menus
+++ b/gtk2_ardour/ardour-sae.menus
@@ -188,6 +188,7 @@
               <separator/>
               <menuitem action='show-editor-mixer'/>
               <menuitem action='SyncEditorAndMixerTrackOrder'/>
+              <menuitem action='ToggleLogoVisibility'/>
          </menu>
         <menu name='JACK' action='JACK'>
                <menuitem action='JACKDisconnect'/>

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index fe2f3a6bcfcd198bd9dacdd601179aa0968086ec..f2e0572268267b284b1a94dd3aa4ed0ccd909bd9 100644 (file)
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -295,6 +295,7 @@ class Editor : public PublicEditor
        void toggle_waveform_visibility ();
        void toggle_waveforms_while_recording ();
        void toggle_measure_visibility ();
+       void toggle_logo_visibility ();
 
        /* SMPTE timecode & video sync */
 

diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index 0e19a65bc392d3b74563804c98d6fb73760aa03f..3200ea781fa28f3702f4f7baf304fb3ded5329ed 100644 (file)
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -384,7 +384,13 @@ Editor::register_actions ()
 
        ActionManager::register_toggle_action (editor_actions, X_("ToggleWaveformVisibility"), _("Show Waveforms"), mem_fun (*this, &Editor::toggle_waveform_visibility));
        ActionManager::register_toggle_action (editor_actions, X_("ToggleWaveformsWhileRecording"), _("Show Waveforms While Recording"), mem_fun (*this, &Editor::toggle_waveforms_while_recording));
-       act = ActionManager::register_toggle_action (editor_actions, X_("ToggleMeasureVisibility"), _("Show Measures"), mem_fun (*this, &Editor::toggle_measure_visibility));
+       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 */
+
+       act = ActionManager::register_toggle_action (editor_actions, X_("ToggleLogoVisibility"), _("Show Logo"), mem_fun (*this, &Editor::toggle_logo_visibility));
+       Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
+       tact->set_active (true);
        
        RadioAction::Group layer_model_group;
 
@@ -461,6 +467,23 @@ Editor::toggle_measure_visibility ()
        }
 }
 
+void
+Editor::toggle_logo_visibility ()
+{
+       Glib::RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("ToggleLogoVisibility"));
+
+       if (act) {
+               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
+               if (logo_item) {
+                       if (tact->get_active()) {
+                               logo_item->show ();
+                       } else {
+                               logo_item->hide ();
+                       }
+               }
+       }
+}
+
 void
 Editor::set_crossfade_model (CrossfadeModel model)
 {