Do not try to restore Route solo state after clearing all solo state

[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 e7f46db83de531974c8bbb8c5c25392fda4f35cd..8490643487ccf6753c35b6909b7baf8f6c26a895 100644 (file)
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -37,6 +37,7 @@
 #include "ardour_ui.h"
 #include "public_editor.h"
 #include "meterbridge.h"
+#include "luawindow.h"
 #include "mixer_ui.h"
 #include "keyboard.h"
 #include "splash.h"
@@ -45,7 +46,7 @@
 #include "opts.h"
 #include "utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace Gtk;
 using namespace PBD;
@@ -87,11 +88,13 @@ ARDOUR_UI::we_have_dependents ()
        editor->setup_tooltips ();
        editor->UpdateAllTransportClocks.connect (sigc::mem_fun (*this, &ARDOUR_UI::update_transport_clocks));
 
-       /* catch up on tabbable state */
+       /* catch up on tabbable state, in the right order to leave the editor
+        * selected by default
+        */
 
-       tabbable_state_change (*editor);
-       tabbable_state_change (*mixer);
        tabbable_state_change (*rc_option_editor);
+       tabbable_state_change (*mixer);
+       tabbable_state_change (*editor);
 
        /* all actions are defined */
 
@@ -117,6 +120,7 @@ ARDOUR_UI::connect_dependents_to_session (ARDOUR::Session *s)
        BootMessage (_("Setup Mixer"));
        mixer->set_session (s);
        meterbridge->set_session (s);
+       luawindow->set_session (s);
 
        /* its safe to do this now */
 
@@ -233,15 +237,9 @@ ARDOUR_UI::setup_windows ()
 
        keyboard->setup_keybindings ();
 
-       /* 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);
+       _tabs.signal_switch_page().connect (sigc::mem_fun (*this, &ARDOUR_UI::tabs_switch));
+       _tabs.signal_page_added().connect (sigc::mem_fun (*this, &ARDOUR_UI::tabs_page_added));
+       _tabs.signal_page_removed().connect (sigc::mem_fun (*this, &ARDOUR_UI::tabs_page_removed));
 
        rc_option_editor = new RCOptionEditor;
        rc_option_editor->StateChange.connect (sigc::mem_fun (*this, &ARDOUR_UI::tabbable_state_change));
@@ -261,6 +259,11 @@ ARDOUR_UI::setup_windows ()
                return -1;
        }
 
+       if (create_luawindow ()) {
+               error << _("UI: cannot setup luawindow") << endmsg;
+               return -1;
+       }
+
        /* order of addition affects order seen in initial window display */
 
        rc_option_editor->add_to_notebook (_tabs, _("Preferences"));
@@ -300,6 +303,24 @@ ARDOUR_UI::setup_windows ()
        main_vpacker.pack_start (status_bar_hpacker, false, false);
 #endif
 
+       for (int i = 0; i < 9; ++i) {
+               std::string const a = string_compose (X_("script-action-%1"), i + 1);
+               Glib::RefPtr<Action> act = ActionManager::get_action(X_("Editor"), a.c_str());
+               assert (act);
+               action_script_call_btn[i].set_text (string_compose ("%1", i+1));
+               action_script_call_btn[i].set_related_action (act);
+               if (act->get_sensitive ()) {
+                       action_script_call_btn[i].set_visual_state (Gtkmm2ext::VisualState (action_script_call_btn[i].visual_state() & ~Gtkmm2ext::Insensitive));
+               } else {
+                       action_script_call_btn[i].set_visual_state (Gtkmm2ext::VisualState (action_script_call_btn[i].visual_state() | Gtkmm2ext::Insensitive));
+               }
+               const int row = i % 3;
+               const int col = i / 3;
+               action_script_table.attach (action_script_call_btn[i], col, col + 1, row, row + 1, EXPAND, EXPAND, 1, 1);
+               action_script_call_btn[i].set_no_show_all ();
+       }
+       action_script_table.show ();
+
        setup_transport();
        build_menu_bar ();
        setup_tooltips ();
@@ -315,7 +336,7 @@ ARDOUR_UI::setup_windows ()
        const XMLNode* mnode = main_window_settings ();
 
        if (mnode) {
-               const XMLProperty* prop;
+               XMLProperty const * prop;
                gint x = -1;
                gint y = -1;
                gint w = -1;
@@ -365,12 +386,10 @@ ARDOUR_UI::setup_windows ()
                }
        }
 
-       _main_window.show_all ();
        setup_toplevel_window (_main_window, "", this);
+       _main_window.show_all ();
 
-       _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));
+       _tabs.set_show_tabs (false);
 
        /* It would be nice if Gtkmm had wrapped this rather than just
         * deprecating the old set_window_creation_hook() method, but oh well...