get current tab on startup correct.

Note that Gtk::Notebook will not switch to a page with an invisible widget. This took me TOO LONG to discover.
Also move code around between files

1 files changed, 160 insertions, 0 deletions

diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index 0d7b5a1353..42816dd482 100644
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -193,3 +193,163 @@ ARDOUR_UI::main_window_delete_event (GdkEventAny* ev)
 	
 	return true;
 }
+
+static GtkNotebook*
+tab_window_root_drop (GtkNotebook* src,
+		      GtkWidget* w,
+		      gint x,
+		      gint y,
+		      gpointer user_data)
+{
+	return ARDOUR_UI::instance()->tab_window_root_drop (src, w, x, y, user_data);
+}
+
+int
+ARDOUR_UI::setup_windows ()
+{
+	/* we don't use a widget with its own window for the tab close button,
+	   which makes it impossible to rely on GTK+ to generate signals for
+	   events occuring "in" this widget. Instead, we pre-connect a
+	   handler to the relevant events on the notebook and then check
+	   to see if the event coordinates tell us that it occured "in"
+	   the close button.
+	*/
+	_tabs.signal_button_press_event().connect (sigc::mem_fun (*this, &ARDOUR_UI::tabs_button_event), false);
+	_tabs.signal_button_release_event().connect (sigc::mem_fun (*this, &ARDOUR_UI::tabs_button_event), false);
+
+	rc_option_editor = new RCOptionEditor;
+	rc_option_editor->StateChange.connect (sigc::mem_fun (*this, &ARDOUR_UI::tabbable_state_change));
+
+	if (create_editor ()) {
+		error << _("UI: cannot setup editor") << endmsg;
+		return -1;
+	}
+
+	if (create_mixer ()) {
+		error << _("UI: cannot setup mixer") << endmsg;
+		return -1;
+	}
+
+	if (create_meterbridge ()) {
+		error << _("UI: cannot setup meterbridge") << endmsg;
+		return -1;
+	}
+
+	/* order of addition affects order seen in initial window display */
+	
+	rc_option_editor->add_to_notebook (_tabs, _("Preferences"));
+	mixer->add_to_notebook (_tabs, _("Mixer"));
+	editor->add_to_notebook (_tabs, _("Editor"));
+
+	/* all other dialogs are created conditionally */
+
+	we_have_dependents ();
+
+#ifdef TOP_MENUBAR
+	EventBox* status_bar_event_box = manage (new EventBox);
+
+	status_bar_event_box->add (status_bar_label);
+	status_bar_event_box->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
+	status_bar_label.set_size_request (300, -1);
+
+	status_bar_label.show ();
+	status_bar_event_box->show ();
+
+	status_bar_event_box->signal_button_press_event().connect (mem_fun (*this, &ARDOUR_UI::status_bar_button_press));
+
+	status_bar_hpacker.pack_start (*status_bar_event_box, true, true, 6);
+	status_bar_hpacker.pack_start (menu_bar_base, false, false, 2);
+#else
+	top_packer.pack_start (menu_bar_base, false, false);
+#endif
+
+	main_vpacker.pack_start (top_packer, false, false);
+
+	/* now add the transport frame to the top of main window */
+	
+	main_vpacker.pack_start (transport_frame, false, false);
+	main_vpacker.pack_start (_tabs, true, true);
+
+#ifdef TOP_MENUBAR
+	main_vpacker.pack_start (status_bar_hpacker, false, false);
+#endif
+
+	setup_transport();
+	build_menu_bar ();
+	setup_tooltips ();
+
+	_main_window.signal_delete_event().connect (sigc::mem_fun (*this, &ARDOUR_UI::main_window_delete_event));
+	
+	/* pack the main vpacker into the main window and show everything
+	 */
+
+	_main_window.add (main_vpacker);
+	transport_frame.show_all ();
+
+	const XMLNode* mnode = main_window_settings ();
+
+	if (mnode) {
+		const XMLProperty* prop;
+		gint x = -1;
+		gint y = -1;
+		gint w = -1;
+		gint h = -1;
+
+		if ((prop = mnode->property (X_("x"))) != 0) {
+			x = atoi (prop->value());
+		}
+
+		if ((prop = mnode->property (X_("y"))) != 0) {
+			y = atoi (prop->value());
+		} 
+
+		if ((prop = mnode->property (X_("w"))) != 0) {
+			w = atoi (prop->value());
+		} 
+		
+		if ((prop = mnode->property (X_("h"))) != 0) {
+			h = atoi (prop->value());
+		}
+
+		if (x >= 0 && y >= 0 && w >= 0 && h >= 0) {
+			_main_window.set_position (Gtk::WIN_POS_NONE);
+		}
+		
+		if (x >= 0 && y >= 0) {
+			_main_window.move (x, y);
+		}
+		
+		if (w > 0 && h > 0) {
+			_main_window.set_default_size (w, h);
+		}
+
+		std::string current_tab;
+		
+		if ((prop = mnode->property (X_("current-tab"))) != 0) {
+			current_tab = prop->value();
+		} else {
+			current_tab = "editor";
+		}
+		if (mixer && current_tab == "mixer") {
+			_tabs.set_current_page (_tabs.page_num (mixer->contents()));
+		} else if (rc_option_editor && current_tab == "preferences") {
+			_tabs.set_current_page (_tabs.page_num (rc_option_editor->contents()));
+		} else if (editor) {
+			_tabs.set_current_page (_tabs.page_num (editor->contents()));
+		}
+	}
+	
+	_main_window.show_all ();
+	setup_toplevel_window (_main_window, "", this);
+	
+	_tabs.signal_switch_page().connect (sigc::mem_fun (*this, &ARDOUR_UI::tabs_switch));
+	_tabs.signal_page_removed().connect (sigc::mem_fun (*this, &ARDOUR_UI::tabs_page_removed));
+	_tabs.signal_page_added().connect (sigc::mem_fun (*this, &ARDOUR_UI::tabs_page_added));
+
+	/* It would be nice if Gtkmm had wrapped this rather than just
+	 * deprecating the old set_window_creation_hook() method, but oh well...
+	 */
+	g_signal_connect (_tabs.gobj(), "create-window", (GCallback) ::tab_window_root_drop, this);
+
+	return 0;
+}