Fix thinkos in cubasish theme

[ardour.git] / gtk2_ardour / ardour_ui_ed.cc

diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index 6dc5316c1d6852b8bce98d401ed4b2edcc0e2015..e6a6dc09c727b6b7523506d3fd23502920a6dec3 100644 (file)
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -63,12 +63,12 @@
 #include "meterbridge.h"
 #include "luawindow.h"
 #include "mixer_ui.h"
-#include "startup.h"
 #include "window_manager.h"
 #include "global_port_matrix.h"
 #include "location_ui.h"
 #include "main_clock.h"
 #include "rc_option_editor.h"
+#include "virtual_keyboard_window.h"
 
 #include <gtkmm2ext/application.h>
 
@@ -171,7 +171,7 @@ ARDOUR_UI::install_actions ()
 
        /* the real actions */
 
-       act = ActionManager::register_action (main_actions, X_("New"), _("New..."),  hide_return (sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::get_session_parameters), false, true, "")));
+       act = ActionManager::register_action (main_actions, X_("New"), _("New..."),  hide_return (sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::start_session_load), true)));
 
        ActionManager::register_action (main_actions, X_("Open"), _("Open..."),  sigc::mem_fun(*this, &ARDOUR_UI::open_session));
        ActionManager::register_action (main_actions, X_("Recent"), _("Recent..."),  sigc::mem_fun(*this, &ARDOUR_UI::open_recent_session));
@@ -484,6 +484,7 @@ ARDOUR_UI::install_actions ()
        ActionManager::transport_sensitive_actions.push_back (act);
 
        act = ActionManager::register_toggle_action (main_actions, X_("ToggleLatencyCompensation"), _("Disable Latency Compensation"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_latency_switch));
+       ActionManager::session_sensitive_actions.push_back (act);
 
        act = ActionManager::register_action (main_actions, X_("MonitorMenu"), _("Monitor Section")); /* just the submenu item */
        ActionManager::session_sensitive_actions.push_back (act);
@@ -872,6 +873,11 @@ ARDOUR_UI::save_ardour_state ()
                if (location_ui) {
                        _session->add_instant_xml (location_ui->ui().get_state ());
                }
+               if (virtual_keyboard_window) {
+                       XMLNode& vkstate (virtual_keyboard_window->get_state());
+                       vkstate.add_child_nocopy (virtual_keyboard_window.get_state ());
+                       _session->add_instant_xml (vkstate);
+               }
        } else {
                Config->add_instant_xml (main_window_node);
                Config->add_instant_xml (enode);
@@ -881,6 +887,11 @@ ARDOUR_UI::save_ardour_state ()
                if (location_ui) {
                        Config->add_instant_xml (location_ui->ui().get_state ());
                }
+               if (virtual_keyboard_window) {
+                       XMLNode& vkstate (virtual_keyboard_window->get_state());
+                       vkstate.add_child_nocopy (virtual_keyboard_window.get_state ());
+                       _session->add_instant_xml (vkstate);
+               }
        }
 
        delete &enode;