X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui_dialogs.cc;h=8f1d080009a0195ae947d5cb5d3d7983192c90eb;hb=8eb3b9d34b862822fbc670458a247bc74c975289;hp=8349683d5d09ba1cd4dd7628ffa8759de5bea38f;hpb=05baa2d1c11116679172c6faadc21d01e5f5565b;p=ardour.git diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc index 8349683d5d..8f1d080009 100644 --- a/gtk2_ardour/ardour_ui_dialogs.cc +++ b/gtk2_ardour/ardour_ui_dialogs.cc @@ -25,6 +25,8 @@ #include +#include + #include "pbd/convert.h" #include "ardour/audioengine.h" @@ -56,6 +58,7 @@ #include "meter_patterns.h" #include "monitor_section.h" #include "midi_tracer.h" +#include "mini_timeline.h" #include "mixer_ui.h" #include "public_editor.h" #include "processor_box.h" @@ -66,17 +69,17 @@ #include "speaker_dialog.h" #include "splash.h" #include "sfdb_ui.h" -#include "theme_manager.h" #include "time_info_box.h" #include "timers.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace PBD; using namespace Glib; using namespace Gtk; using namespace Gtkmm2ext; +using namespace ArdourWidgets; void ARDOUR_UI::set_session (Session *s) @@ -108,15 +111,15 @@ ARDOUR_UI::set_session (Session *s) AutomationWatch::instance().set_session (s); - if (shuttle_box) { - shuttle_box->set_session (s); - } + shuttle_box.set_session (s); + mini_timeline.set_session (s); + time_info_box->set_session (s); primary_clock->set_session (s); secondary_clock->set_session (s); big_clock->set_session (s); - time_info_box->set_session (s); video_timeline->set_session (s); + lua_script_window->set_session (s); /* sensitize menu bar options that are now valid */ @@ -147,6 +150,10 @@ ARDOUR_UI::set_session (Session *s) ActionManager::set_sensitive (ActionManager::time_selection_sensitive_actions, false); ActionManager::set_sensitive (ActionManager::track_selection_sensitive_actions, false); + ActionManager::set_sensitive (ActionManager::route_selection_sensitive_actions, false); + ActionManager::set_sensitive (ActionManager::bus_selection_sensitive_actions, false); + ActionManager::set_sensitive (ActionManager::vca_selection_sensitive_actions, false); + ActionManager::set_sensitive (ActionManager::stripable_selection_sensitive_actions, false); ActionManager::set_sensitive (ActionManager::line_selection_sensitive_actions, false); ActionManager::set_sensitive (ActionManager::point_selection_sensitive_actions, false); ActionManager::set_sensitive (ActionManager::playlist_selection_sensitive_actions, false); @@ -160,6 +167,7 @@ ARDOUR_UI::set_session (Session *s) blink_connection = Timers::blink_connect (sigc::mem_fun(*this, &ARDOUR_UI::blink_handler)); _session->SaveSessionRequested.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::save_session_at_its_request, this, _1), gui_context()); + _session->StateSaved.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::update_title, this), gui_context()); _session->RecordStateChanged.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::record_state_changed, this), gui_context()); _session->StepEditStatusChange.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::step_edit_status_change, this, _1), gui_context()); _session->TransportStateChange.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::map_transport_state, this), gui_context()); @@ -171,6 +179,7 @@ ARDOUR_UI::set_session (Session *s) _session->locations()->added.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::handle_locations_change, this, _1), gui_context()); _session->locations()->removed.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::handle_locations_change, this, _1), gui_context()); _session->config.ParameterChanged.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::session_parameter_changed, this, _1), gui_context ()); + _session->auto_loop_location_changed.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::set_loop_sensitivity, this), gui_context ()); /* Clocks are on by default after we are connected to a session, so show that here. */ @@ -222,10 +231,12 @@ ARDOUR_UI::set_session (Session *s) editor_meter = new LevelMeterHBox(_session); editor_meter->set_meter (_session->master_out()->shared_peak_meter().get()); editor_meter->clear_meters(); - editor_meter->set_type (_session->master_out()->meter_type()); - editor_meter->setup_meters (30, 12, 6); + editor_meter->set_meter_type (_session->master_out()->meter_type()); + editor_meter->setup_meters (30, 10, 6); editor_meter->show(); meter_box.pack_start(*editor_meter); + + editor_meter->ButtonPress.connect_same_thread (editor_meter_connection, boost::bind (&ARDOUR_UI::editor_meter_button_press, this, _1)); } ArdourMeter::ResetAllPeakDisplays.connect (sigc::mem_fun(*this, &ARDOUR_UI::reset_peak_display)); @@ -240,12 +251,7 @@ ARDOUR_UI::set_session (Session *s) editor_meter_max_peak = -INFINITY; editor_meter_peak_display.signal_button_release_event().connect (sigc::mem_fun(*this, &ARDOUR_UI::editor_meter_peak_button_release), false); - if (UIConfiguration::instance().get_show_editor_meter() && !ARDOUR::Profile->get_trx()) { - transport_hbox.pack_start (meter_box, false, false); - transport_hbox.pack_start (editor_meter_peak_display, false, false); - meter_box.show(); - editor_meter_peak_display.show(); - } + repack_transport_hbox (); } update_title (); @@ -285,6 +291,7 @@ ARDOUR_UI::unload_session (bool hide_stuff) } if (hide_stuff) { + close_all_dialogs (); editor->hide (); mixer->hide (); meterbridge->hide (); @@ -336,43 +343,66 @@ void ARDOUR_UI::toggle_editor_and_mixer () { if (editor->tabbed() && mixer->tabbed()) { + /* both in the same window */ if (_tabs.get_current_page() == _tabs.page_num (editor->contents())) { _tabs.set_current_page (_tabs.page_num (mixer->contents())); } else if (_tabs.get_current_page() == _tabs.page_num (mixer->contents())) { _tabs.set_current_page (_tabs.page_num (editor->contents())); } else { - /* do nothing */ + /* go to mixer */ + _tabs.set_current_page (_tabs.page_num (mixer->contents())); } return; } + if (editor->tabbed() && !mixer->tabbed()) { - if (!editor->fully_visible()) { - if (_tabs.get_current_page() == _tabs.page_num (editor->contents())) { + /* editor is tabbed, mixer is not */ + + Gtk::Window* mwin = mixer->current_toplevel (); + + if (!mwin) { + /* mixer's own window doesn't exist */ + mixer->make_visible (); + } else if (!mwin->is_mapped ()) { + /* mixer's own window exists but isn't mapped */ + mixer->make_visible (); + } else { + /* mixer window is mapped, editor is visible as tab */ + Gtk::Widget* f = mwin->get_focus(); + if (f && f->has_focus()) { + /* mixer has focus, switch to editor */ + editor->make_visible (); + } else { mixer->make_visible (); } - } else { - _main_window.present (); } return; } - if (mixer->tabbed () && !editor->tabbed()) { - if (!editor->fully_visible()) { - if (_tabs.get_current_page() == _tabs.page_num (mixer->contents())) { + if (!editor->tabbed() && mixer->tabbed()) { + /* mixer is tabbed, editor is not */ + + Gtk::Window* ewin = editor->current_toplevel (); + + if (!ewin) { + /* mixer's own window doesn't exist */ + editor->make_visible (); + } else if (!ewin->is_mapped ()) { + /* editor's own window exists but isn't mapped */ + editor->make_visible (); + } else { + /* editor window is mapped, mixer is visible as tab */ + Gtk::Widget* f = ewin->get_focus(); + if (f && f->has_focus()) { + /* editor has focus, switch to mixer */ + mixer->make_visible (); + } else { editor->make_visible (); } - } else { - _main_window.present (); } return; } - - if (editor->fully_visible()) { - mixer->make_visible (); - } else { - editor->make_visible (); - } } void @@ -581,28 +611,36 @@ ARDOUR_UI::tabs_switch (GtkNotebookPage*, guint page) { if (editor && (page == (guint) _tabs.page_num (editor->contents()))) { editor_visibility_button.set_active_state (Gtkmm2ext::ImplicitActive); + if (mixer && (mixer->tabbed() || mixer->tabbed_by_default())) { mixer_visibility_button.set_active_state (Gtkmm2ext::Off); } + if (rc_option_editor && (rc_option_editor->tabbed() || rc_option_editor->tabbed_by_default())) { prefs_visibility_button.set_active_state (Gtkmm2ext::Off); } } else if (mixer && (page == (guint) _tabs.page_num (mixer->contents()))) { + if (editor && (editor->tabbed() || editor->tabbed_by_default())) { editor_visibility_button.set_active_state (Gtkmm2ext::Off); } + mixer_visibility_button.set_active_state (Gtkmm2ext::ImplicitActive); if (rc_option_editor && (rc_option_editor->tabbed() || rc_option_editor->tabbed_by_default())) { prefs_visibility_button.set_active_state (Gtkmm2ext::Off); } - } else { + + } else if (page == (guint) _tabs.page_num (rc_option_editor->contents())) { + if (editor && (editor->tabbed() || editor->tabbed_by_default())) { editor_visibility_button.set_active_state (Gtkmm2ext::Off); } + if (mixer && (mixer->tabbed() || mixer->tabbed_by_default())) { mixer_visibility_button.set_active_state (Gtkmm2ext::Off); } + prefs_visibility_button.set_active_state (Gtkmm2ext::ImplicitActive); } @@ -696,7 +734,7 @@ ARDOUR_UI::tabbable_state_change (Tabbable& t) vis_button = &mixer_visibility_button; other_vis_buttons.push_back (&editor_visibility_button); other_vis_buttons.push_back (&prefs_visibility_button); - } else { + } else if (&t == rc_option_editor) { vis_button = &prefs_visibility_button; other_vis_buttons.push_back (&editor_visibility_button); other_vis_buttons.push_back (&mixer_visibility_button);