first compilable version of tabbable design.

[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 f81dc8d311bf90302ad5d5827edc22682202f499..031ebd58a88e0592fe2fb81cbf17dcef4d65e974 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
@@ -17,16 +17,24 @@
 
 */
 
+#ifdef WAF_BUILD
+#include "gtk2ardour-config.h"
+#endif
+
 /* this file exists solely to break compilation dependencies that
    would connect changes to the mixer or editor objects.
 */
 
 #include <cstdio>
 
-#include <pbd/error.h>
+#include "pbd/error.h"
+
+#include "ardour/session.h"
 
+#include "actions.h"
 #include "ardour_ui.h"
 #include "public_editor.h"
+#include "meterbridge.h"
 #include "mixer_ui.h"
 #include "keyboard.h"
 #include "splash.h"
@@ -34,7 +42,6 @@
 #include "opts.h"
 #include "i18n.h"
 
-using namespace sigc;
 using namespace Gtk;
 using namespace PBD;
 
@@ -45,74 +52,94 @@ namespace ARDOUR {
 
 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 ()
 {
        install_actions ();
        ProcessorBox::register_actions ();
+       keyboard->setup_keybindings ();
+       editor->setup_tooltips ();
+       editor->UpdateAllTransportClocks.connect (sigc::mem_fun (*this, &ARDOUR_UI::update_transport_clocks));
 
-       Keyboard::setup_keybindings ();
+       editor->add_to_notebook (_tabs, _("Editor"), 1);
+       mixer->add_to_notebook (_tabs, _("Mixer"), 1);
+       
+       /* all actions are defined */
 
-       editor->UpdateAllTransportClocks.connect (mem_fun (*this, &ARDOUR_UI::update_transport_clocks));
+       ActionManager::enable_accelerators ();
+       ActionManager::load_menus (ARDOUR_COMMAND_LINE::menus_file);
+
+       editor->track_mixer_selection ();
+       mixer->track_editor_selection ();
 }
 
 void
 ARDOUR_UI::connect_dependents_to_session (ARDOUR::Session *s)
 {
+       DisplaySuspender ds;
        BootMessage (_("Setup Editor"));
-       editor->connect_to_session (s);
+       editor->set_session (s);
        BootMessage (_("Setup Mixer"));
-       mixer->connect_to_session (s);
+       mixer->set_session (s);
+       meterbridge->set_session (s);
 
        /* its safe to do this now */
-       
+
        BootMessage (_("Reload Session History"));
        s->restore_history ("");
 }
 
-static bool
-_hide_splash (gpointer arg)
+/** The main editor window has been closed */
+gint
+ARDOUR_UI::exit_on_main_window_close (GdkEventAny * /*ev*/)
 {
-       ((ARDOUR_UI*)arg)->hide_splash();
-       return false;
+#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
 }
 
-void
-ARDOUR_UI::goto_editor_window ()
+GtkNotebook*
+ARDOUR_UI::tab_window_root_drop (GtkNotebook* src,
+                                GtkWidget* w,
+                                gint x,
+                                gint y,
+                                gpointer)
 {
-       if (splash && splash->is_visible()) {
-               // in 2 seconds, hide the splash screen 
-               Glib::signal_timeout().connect (bind (sigc::ptr_fun (_hide_splash), this), 2000);
-       }
+       using namespace std;
+       Gtk::Notebook* nb = 0;
+       Gtk::Window* win = 0;
+       
+       if (w == GTK_WIDGET(mixer->contents().gobj())) {
+               /* Mixer */
 
-       editor->show_window ();
-       editor->present ();
-       flush_pending ();
-}
+               cerr << "Call use own window, mixer\n";
+               
+               nb = mixer->tab_root_drop ();
+               win = mixer->own_window ();
 
-void
-ARDOUR_UI::goto_mixer_window ()
-{
-       mixer->show_window ();
-       mixer->present ();
-       flush_pending ();
-}
+       } else if (w == GTK_WIDGET(editor->contents().gobj())) {
 
-gint
-ARDOUR_UI::exit_on_main_window_close (GdkEventAny *ev)
-{
-       finish();
-       return TRUE;
+               /* Editor */
+
+               cerr << "Call use own window, editor\n";
+               
+               nb = editor->tab_root_drop ();
+               win = editor->own_window ();
+
+       }
+
+       if (nb) {
+               win->move (x, y);
+               win->show_all ();
+               win->present ();
+               return nb->gobj();
+       }
+       
+       return 0; /* what was that? */
 }