X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui_options.cc;h=98ede1dc3fbcd1742264fad39eee1aa3a8e3bd44;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=8aec13a574fabc0fa1ea9aceb5705065d7a9fb00;hpb=4dc63966f0872efe768dad61eb9b8785d06b92d1;p=ardour.git diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc index 8aec13a574..98ede1dc3f 100644 --- a/gtk2_ardour/ardour_ui_options.cc +++ b/gtk2_ardour/ardour_ui_options.cc @@ -38,21 +38,13 @@ #include "public_editor.h" #include "main_clock.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace Gtk; using namespace Gtkmm2ext; using namespace ARDOUR; using namespace PBD; -void -ARDOUR_UI::toggle_keep_tearoffs () -{ - ActionManager::toggle_config_state ("Common", "KeepTearoffs", &UIConfiguration::set_keep_tearoffs, &UIConfiguration::get_keep_tearoffs); - - ARDOUR_UI::update_tearoff_visibility(); -} - void ARDOUR_UI::toggle_external_sync() { @@ -91,31 +83,31 @@ ARDOUR_UI::toggle_time_master () void ARDOUR_UI::toggle_send_mtc () { - ActionManager::toggle_config_state ("options", "SendMTC", &RCConfiguration::set_send_mtc, &RCConfiguration::get_send_mtc); + ActionManager::toggle_config_state ("Options", "SendMTC", &RCConfiguration::set_send_mtc, &RCConfiguration::get_send_mtc); } void ARDOUR_UI::toggle_send_mmc () { - ActionManager::toggle_config_state ("options", "SendMMC", &RCConfiguration::set_send_mmc, &RCConfiguration::get_send_mmc); + ActionManager::toggle_config_state ("Options", "SendMMC", &RCConfiguration::set_send_mmc, &RCConfiguration::get_send_mmc); } void ARDOUR_UI::toggle_send_midi_clock () { - ActionManager::toggle_config_state ("options", "SendMidiClock", &RCConfiguration::set_send_midi_clock, &RCConfiguration::get_send_midi_clock); + ActionManager::toggle_config_state ("Options", "SendMidiClock", &RCConfiguration::set_send_midi_clock, &RCConfiguration::get_send_midi_clock); } void ARDOUR_UI::toggle_use_mmc () { - ActionManager::toggle_config_state ("options", "UseMMC", &RCConfiguration::set_mmc_control, &RCConfiguration::get_mmc_control); + ActionManager::toggle_config_state ("Options", "UseMMC", &RCConfiguration::set_mmc_control, &RCConfiguration::get_mmc_control); } void ARDOUR_UI::toggle_send_midi_feedback () { - ActionManager::toggle_config_state ("options", "SendMIDIfeedback", &RCConfiguration::set_midi_feedback, &RCConfiguration::get_midi_feedback); + ActionManager::toggle_config_state ("Options", "SendMIDIfeedback", &RCConfiguration::set_midi_feedback, &RCConfiguration::get_midi_feedback); } void @@ -315,12 +307,20 @@ ARDOUR_UI::parameter_changed (std::string p) if (!_session->config.get_external_sync()) { sync_button.set_text (_("Internal")); + auto_loop_button.set_sensitive (true); ActionManager::get_action ("Transport", "ToggleAutoPlay")->set_sensitive (true); ActionManager::get_action ("Transport", "ToggleAutoReturn")->set_sensitive (true); ActionManager::get_action ("Transport", "ToggleFollowEdits")->set_sensitive (true); } else { sync_button.set_text (sync_source_to_string (Config->get_sync_source(), true)); - /* XXX need to make auto-play is off as well as insensitive */ + if (_session && _session->locations()->auto_loop_location()) { + // disable looping with external sync. + // This is not necessary because session-transport ignores the loop-state, + // but makes it clear to the user that it's disabled. + _session->request_play_loop (false, false); + } + auto_loop_button.set_sensitive (false); + /* XXX we need to make sure that auto-play is off as well as insensitive */ ActionManager::get_action ("Transport", "ToggleAutoPlay")->set_sensitive (false); ActionManager::get_action ("Transport", "ToggleAutoReturn")->set_sensitive (false); ActionManager::get_action ("Transport", "ToggleFollowEdits")->set_sensitive (false); @@ -332,18 +332,16 @@ ARDOUR_UI::parameter_changed (std::string p) } else if (p == "send-mtc") { - ActionManager::map_some_state ("options", "SendMTC", &RCConfiguration::get_send_mtc); + ActionManager::map_some_state ("Options", "SendMTC", &RCConfiguration::get_send_mtc); } else if (p == "send-mmc") { - ActionManager::map_some_state ("options", "SendMMC", &RCConfiguration::get_send_mmc); + ActionManager::map_some_state ("Options", "SendMMC", &RCConfiguration::get_send_mmc); - } else if (p == "keep-tearoffs") { - ActionManager::map_some_state ("Common", "KeepTearoffs", &UIConfiguration::get_keep_tearoffs); } else if (p == "mmc-control") { - ActionManager::map_some_state ("options", "UseMMC", &RCConfiguration::get_mmc_control); + ActionManager::map_some_state ("Options", "UseMMC", &RCConfiguration::get_mmc_control); } else if (p == "midi-feedback") { - ActionManager::map_some_state ("options", "SendMIDIfeedback", &RCConfiguration::get_midi_feedback); + ActionManager::map_some_state ("Options", "SendMIDIfeedback", &RCConfiguration::get_midi_feedback); } else if (p == "auto-play") { ActionManager::map_some_state ("Transport", "ToggleAutoPlay", sigc::mem_fun (_session->config, &SessionConfiguration::get_auto_play)); } else if (p == "auto-return") { @@ -396,6 +394,13 @@ ARDOUR_UI::parameter_changed (std::string p) stop_clocking (); start_clocking (); } + } else if (p == "use-tooltips") { + /* this doesn't really belong here but it has to go somewhere */ + if (UIConfiguration::instance().get_use_tooltips()) { + Gtkmm2ext::enable_tooltips (); + } else { + Gtkmm2ext::disable_tooltips (); + } } else if (p == "waveform-gradient-depth") { ArdourCanvas::WaveView::set_global_gradient_depth (UIConfiguration::instance().get_waveform_gradient_depth()); } else if (p == "show-editor-meter") { @@ -403,13 +408,13 @@ ARDOUR_UI::parameter_changed (std::string p) if (editor_meter) { if (meter_box.get_parent()) { - transport_tearoff_hbox.remove (meter_box); - transport_tearoff_hbox.remove (editor_meter_peak_display); + transport_hbox.remove (meter_box); + transport_hbox.remove (editor_meter_peak_display); } if (show) { - transport_tearoff_hbox.pack_start (meter_box, false, false); - transport_tearoff_hbox.pack_start (editor_meter_peak_display, false, false); + 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(); } @@ -426,6 +431,18 @@ ARDOUR_UI::parameter_changed (std::string p) } else if (p == "waveform-cache-size") { /* GUI option has units of megabytes; image cache uses units of bytes */ ArdourCanvas::WaveView::set_image_cache_size (UIConfiguration::instance().get_waveform_cache_size() * 1048576); + } else if (p == "use-wm-visibility") { + VisibilityTracker::set_use_window_manager_visibility (UIConfiguration::instance().get_use_wm_visibility()); + } else if (p == "action-table-columns") { + const uint32_t cols = UIConfiguration::instance().get_action_table_columns (); + for (int i = 0; i < 9; ++i) { + const int col = i / 3; + if (cols & (1<