check audio-locked meter ordering by frame.

[ardour.git] / gtk2_ardour / ardour_ui_options.cc

diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc
index 7e098cab3859bc542ccce9d9c6b71bdac9954815..e49cc01eaab07ee7d91e44ef8d200be92df8b980 100644 (file)
--- a/gtk2_ardour/ardour_ui_options.cc
+++ b/gtk2_ardour/ardour_ui_options.cc
@@ -38,7 +38,7 @@
 #include "public_editor.h"
 #include "main_clock.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace Gtk;
 using namespace Gtkmm2ext;
@@ -306,7 +306,7 @@ ARDOUR_UI::parameter_changed (std::string p)
                ActionManager::map_some_state ("Transport", "ToggleExternalSync", sigc::mem_fun (_session->config, &SessionConfiguration::get_external_sync));
 
                if (!_session->config.get_external_sync()) {
-                       sync_button.set_text (_("Internal"));
+                       sync_button.set_text (S_("SyncSource|Int."));
                        auto_loop_button.set_sensitive (true);
                        ActionManager::get_action ("Transport", "ToggleAutoPlay")->set_sensitive (true);
                        ActionManager::get_action ("Transport", "ToggleAutoReturn")->set_sensitive (true);
@@ -394,24 +394,21 @@ 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-mini-timeline") {
+               repack_transport_hbox ();
+       } else if (p == "show-toolbar-selclock") {
+               repack_transport_hbox ();
        } else if (p == "show-editor-meter") {
-               bool show = UIConfiguration::instance().get_show_editor_meter();
-
-               if (editor_meter) {
-                       if (meter_box.get_parent()) {
-                               transport_hbox.remove (meter_box);
-                               transport_hbox.remove (editor_meter_peak_display);
-                       }
-
-                       if (show) {
-                               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 ();
        } else if (p == "waveform-scale") {
                ArdourCanvas::WaveView::set_global_logscaled (UIConfiguration::instance().get_waveform_scale() == Logarithmic);
        } else if (p == "widget-prelight") {
@@ -424,6 +421,20 @@ 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 / 2;
+                       if (cols & (1<<col)) {
+                               action_script_call_btn[i].show();
+                       } else {
+                               action_script_call_btn[i].hide();
+                       }
+               }
+       } else if (p == "layered-record-mode") {
+               layered_button.set_active (_session->config.get_layered_record_mode ());
        }
 }