Add keyboard shortcut to tooltip text where possible.

[ardour.git] / gtk2_ardour / ardour_ui_dependents.cc

diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index 6472bc5ef45f7f5340506ca037e088f5d1976007..6f48bee04ba4952655f80e0be935f14d094e5743 100644 (file)
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000 Paul Davis 
+    Copyright (C) 2000 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -23,18 +23,19 @@
 
 #include <cstdio>
 
-#include <gtkmm/accelmap.h>
+#include "pbd/error.h"
 
-#include <pbd/error.h>
+#include "ardour/session.h"
 
 #include "ardour_ui.h"
 #include "public_editor.h"
 #include "mixer_ui.h"
 #include "keyboard.h"
+#include "splash.h"
 #include "route_params_ui.h"
+#include "opts.h"
 #include "i18n.h"
 
-using namespace sigc;
 using namespace Gtk;
 using namespace PBD;
 
@@ -43,74 +44,56 @@ namespace ARDOUR {
        class Route;
 }
 
+using namespace ARDOUR;
+
 void
 ARDOUR_UI::shutdown ()
 {
-       if (session) {
-               /* we're exiting cleanly, so remove any auto-save data */
-               session->remove_pending_capture_state ();
-               session = 0;
-       }
        ui_config->save_state();
 }
 
 void
 ARDOUR_UI::we_have_dependents ()
-{
-       setup_keybindings ();
-       editor->UpdateAllTransportClocks.connect (mem_fun (*this, &ARDOUR_UI::update_transport_clocks));
-}
-
-static void 
-accel_map_changed (GtkAccelMap* map,
-                  gchar* path,
-                  guint  key,
-                  GdkModifierType mod,
-                  gpointer arg)
-{
-       static_cast<ARDOUR_UI*>(arg)->save_keybindings ();
-}
-
-void
-ARDOUR_UI::setup_keybindings ()
 {
        install_actions ();
        ProcessorBox::register_actions ();
-       
-       cerr << "loading bindings from " << keybindings_path << endl;
-
-       try {
-               AccelMap::load (keybindings_path);
-       } catch (...) {
-               error << string_compose (_("Ardour key bindings file not found at \"%1\" or contains errors."), keybindings_path)
-                     << endmsg;
-       }
-
-       /* catch changes */
-
-       GtkAccelMap* accelmap = gtk_accel_map_get();
-       g_signal_connect (accelmap, "changed", (GCallback) accel_map_changed, this);
-
-       
-
+       keyboard->setup_keybindings ();
+       editor->setup_tooltips ();
+       editor->UpdateAllTransportClocks.connect (sigc::mem_fun (*this, &ARDOUR_UI::update_transport_clocks));
 }
 
 void
 ARDOUR_UI::connect_dependents_to_session (ARDOUR::Session *s)
 {
-       editor->connect_to_session (s);
-       mixer->connect_to_session (s);
+       BootMessage (_("Setup Editor"));
+       editor->set_session (s);
+       BootMessage (_("Setup Mixer"));
+       mixer->set_session (s);
 
        /* its safe to do this now */
-       
+
+       BootMessage (_("Reload Session History"));
        s->restore_history ("");
 }
 
+static bool
+_hide_splash (gpointer arg)
+{
+       ((ARDOUR_UI*)arg)->hide_splash();
+       return false;
+}
+
 void
 ARDOUR_UI::goto_editor_window ()
 {
+       if (splash && splash->is_visible()) {
+               // in 2 seconds, hide the splash screen
+               Glib::signal_timeout().connect (sigc::bind (sigc::ptr_fun (_hide_splash), this), 2000);
+       }
+
        editor->show_window ();
        editor->present ();
+       _mixer_on_top = false;
        flush_pending ();
 }
 
@@ -119,12 +102,31 @@ ARDOUR_UI::goto_mixer_window ()
 {
        mixer->show_window ();
        mixer->present ();
+       _mixer_on_top = true;
        flush_pending ();
 }
 
+void
+ARDOUR_UI::toggle_editor_mixer_on_top ()
+{
+       if (_mixer_on_top) {
+               goto_editor_window ();
+       } else {
+               goto_mixer_window ();
+       }
+}
+
+/** The main editor window has been closed */
 gint
-ARDOUR_UI::exit_on_main_window_close (GdkEventAny *ev)
+ARDOUR_UI::exit_on_main_window_close (GdkEventAny * /*ev*/)
 {
+#ifdef TOP_MENUBAR
+       /* just hide the window, and return - the top menu stays up */
+       editor->hide ();
+       return TRUE;
+#else
+       /* time to get out of here */
        finish();
        return TRUE;
+#endif
 }