hopefully get dynamic tabbable menu state right this time

5 files changed, 31 insertions, 15 deletions

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index 7c507c30f6..24bd1793d6 100644
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -275,7 +275,7 @@
         <menuitem action='set-tempo-from-edit-range'/>
       </menu>
       <menuitem action='set-mouse-mode-object-range'/>
-      <menuitem action='show-application-preferences'/>
+      <menuitem action='show-preferences'/>
     </menu>         
 
     <menu name='RegionMenu' action='RegionMenu'>
@@ -524,10 +524,10 @@
           <menuitem action='detach-mixer'/>
       </menu>
       <menu action='PrefsMenu'>
-          <menuitem action='show-application-preferences'/>
-          <menuitem action='hide-application-preferences'/>
-          <menuitem action='attach-application-preferences'/>
-          <menuitem action='detach-application-preferences'/>
+          <menuitem action='show-preferences'/>
+          <menuitem action='hide-preferences'/>
+          <menuitem action='attach-preferences'/>
+          <menuitem action='detach-preferences'/>
       </menu>
       <menuitem action='toggle-meterbridge'/>
       <separator/>
diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index db0f28a566..059bcb88c8 100644
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -98,9 +98,8 @@ ARDOUR_UI::setup_windows ()
 	}
 
 	rc_option_editor = new RCOptionEditor;
-	rc_option_editor->add_to_notebook (_tabs, _("Preferences"));
-	rc_option_editor->contents().show_all ();
 	rc_option_editor->StateChange.connect (sigc::mem_fun (*this, &ARDOUR_UI::tabbable_state_change));
+	rc_option_editor->add_to_notebook (_tabs, _("Preferences"));
 	
 	/* all other dialogs are created conditionally */
 
@@ -858,4 +857,5 @@ ARDOUR_UI::update_title ()
 		WindowTitle title (Glib::get_application_name());
 		_main_window.set_title (title.get_string());
 	}
+
 }
diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index 4d50787852..97c81f187a 100644
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -40,6 +40,8 @@
 #include "splash.h"
 #include "route_params_ui.h"
 #include "opts.h"
+#include "utils.h"
+
 #include "i18n.h"
 
 using namespace Gtk;
@@ -61,8 +63,15 @@ ARDOUR_UI::we_have_dependents ()
 	editor->setup_tooltips ();
 	editor->UpdateAllTransportClocks.connect (sigc::mem_fun (*this, &ARDOUR_UI::update_transport_clocks));
 
-	editor->add_to_notebook (_tabs, _("Editor"));
-	mixer->add_to_notebook (_tabs, _("Mixer"));
+	/* catch up on tabbable state */
+
+	std::cerr << "Tab catch up\n";
+	
+	tabbable_state_change (*editor);
+	tabbable_state_change (*mixer);
+	tabbable_state_change (*rc_option_editor);
+	
+	std::cerr << "Tab catch done\n";
 	
 	/* all actions are defined */
 
@@ -71,6 +80,13 @@ ARDOUR_UI::we_have_dependents ()
 
 	editor->track_mixer_selection ();
 	mixer->track_editor_selection ();
+
+	/* catch up on parameters */
+	
+	boost::function<void (std::string)> pc (boost::bind (&ARDOUR_UI::parameter_changed, this, _1));
+	Config->map_parameters (pc);
+
+	ARDOUR_UI_UTILS::reset_dpi ();
 }
 
 void
diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index 442ea1d97d..299a5d7d69 100644
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -80,14 +80,13 @@ ARDOUR_UI::create_editor ()
 	try {
 		editor = new Editor ();
 		editor->StateChange.connect (sigc::mem_fun (*this, &ARDOUR_UI::tabbable_state_change));
+		editor->add_to_notebook (_tabs, _("Editor"));
 	}
 
 	catch (failed_constructor& err) {
 		return -1;
 	}
 
-	
-	editor->Realized.connect (sigc::mem_fun (*this, &ARDOUR_UI::editor_realized));
         editor->signal_event().connect (sigc::bind (sigc::ptr_fun (&Keyboard::catch_user_event_for_pre_dialog_focus), editor));
 
 	return 0;
@@ -224,19 +223,19 @@ ARDOUR_UI::install_actions ()
 
 	ActionManager::register_action (common_actions, X_("show-editor"), _("Show"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::show_tabbable), editor));
 	ActionManager::register_action (common_actions, X_("show-mixer"), _("Show"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::show_tabbable), mixer));
-	ActionManager::register_action (common_actions, X_("show-application-preferences"), _("Show"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::show_tabbable), rc_option_editor));
+	ActionManager::register_action (common_actions, X_("show-preferences"), _("Show"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::show_tabbable), rc_option_editor));
 
 	ActionManager::register_action (common_actions, X_("hide-editor"), _("Hide"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::hide_tabbable), editor));
 	ActionManager::register_action (common_actions, X_("hide-mixer"), _("Hide"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::hide_tabbable), mixer));
-	ActionManager::register_action (common_actions, X_("hide-application-preferences"), _("Hide"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::hide_tabbable), rc_option_editor));
+	ActionManager::register_action (common_actions, X_("hide-preferences"), _("Hide"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::hide_tabbable), rc_option_editor));
 	
 	ActionManager::register_action (common_actions, X_("attach-editor"), _("Attach"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::attach_tabbable), editor));
 	ActionManager::register_action (common_actions, X_("attach-mixer"), _("Attach"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::attach_tabbable), mixer));
-	ActionManager::register_action (common_actions, X_("attach-application-preferences"), _("Attach"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::attach_tabbable), rc_option_editor));
+	ActionManager::register_action (common_actions, X_("attach-preferences"), _("Attach"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::attach_tabbable), rc_option_editor));
 	
 	ActionManager::register_action (common_actions, X_("detach-editor"), _("Detach"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::detach_tabbable), editor));
 	ActionManager::register_action (common_actions, X_("detach-mixer"), _("Detach"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::detach_tabbable), mixer));
-	ActionManager::register_action (common_actions, X_("detach-application-preferences"), _("Detach"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::detach_tabbable), rc_option_editor));
+	ActionManager::register_action (common_actions, X_("detach-preferences"), _("Detach"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::detach_tabbable), rc_option_editor));
 
 	/* windows visibility actions */
 
diff --git a/gtk2_ardour/ardour_ui_mixer.cc b/gtk2_ardour/ardour_ui_mixer.cc
index 6279f4c789..a0b0519a26 100644
--- a/gtk2_ardour/ardour_ui_mixer.cc
+++ b/gtk2_ardour/ardour_ui_mixer.cc
@@ -42,6 +42,7 @@ ARDOUR_UI::create_mixer ()
 	try {
 		mixer = Mixer_UI::instance ();
 		mixer->StateChange.connect (sigc::mem_fun (*this, &ARDOUR_UI::tabbable_state_change));
+		mixer->add_to_notebook (_tabs, _("Mixer"));
 	}
 
 	catch (failed_constructor& err) {