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 e1d00548914b21754a08a1dae1d6f9e73cde052e..031ebd58a88e0592fe2fb81cbf17dcef4d65e974 100644 (file)
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -17,6 +17,10 @@
 
 */
 
+#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.
 */
@@ -27,8 +31,10 @@
 
 #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"
@@ -46,28 +52,36 @@ namespace ARDOUR {
 
 using namespace ARDOUR;
 
-void
-ARDOUR_UI::shutdown ()
-{
-       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));
+
+       editor->add_to_notebook (_tabs, _("Editor"), 1);
+       mixer->add_to_notebook (_tabs, _("Mixer"), 1);
+       
+       /* all actions are defined */
+
+       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->set_session (s);
        BootMessage (_("Setup Mixer"));
        mixer->set_session (s);
+       meterbridge->set_session (s);
 
        /* its safe to do this now */
 
@@ -75,46 +89,6 @@ ARDOUR_UI::connect_dependents_to_session (ARDOUR::Session *s)
        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 ();
-}
-
-void
-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*/)
@@ -129,3 +103,43 @@ ARDOUR_UI::exit_on_main_window_close (GdkEventAny * /*ev*/)
        return TRUE;
 #endif
 }
+
+GtkNotebook*
+ARDOUR_UI::tab_window_root_drop (GtkNotebook* src,
+                                GtkWidget* w,
+                                gint x,
+                                gint y,
+                                gpointer)
+{
+       using namespace std;
+       Gtk::Notebook* nb = 0;
+       Gtk::Window* win = 0;
+       
+       if (w == GTK_WIDGET(mixer->contents().gobj())) {
+               /* Mixer */
+
+               cerr << "Call use own window, mixer\n";
+               
+               nb = mixer->tab_root_drop ();
+               win = mixer->own_window ();
+
+       } else if (w == GTK_WIDGET(editor->contents().gobj())) {
+
+               /* 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? */
+}