Don't include program-name with <Option name="color-file" />

[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 e2a36964176829f0a74d1d886ff81330dfac8031..98ede1dc3fbcd1742264fad39eee1aa3a8e3bd44 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;
@@ -83,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
@@ -332,16 +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 == "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") {
@@ -394,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") {
@@ -424,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<<col)) {
+                               action_script_call_btn[i].show();
+                       } else {
+                               action_script_call_btn[i].hide();
+                       }
+               }
        }
 }