make config-window suitable for small[er] screens

[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 ea299b2f04c82fc017c277d6bda72ffba26caa66..8cb1376522c722e7f3790d6fbe73f57c21dce6e1 100644 (file)
--- a/gtk2_ardour/ardour_ui_options.cc
+++ b/gtk2_ardour/ardour_ui_options.cc
@@ -52,7 +52,7 @@ ARDOUR_UI::toggle_keep_tearoffs ()
 {
        ActionManager::toggle_config_state ("Common", "KeepTearoffs", &RCConfiguration::set_keep_tearoffs, &RCConfiguration::get_keep_tearoffs);
 
-       ARDOUR_UI::toggle_editing_space_force (true);
+       ARDOUR_UI::update_tearoff_visibility();
 }
 
 void
@@ -60,7 +60,7 @@ ARDOUR_UI::toggle_external_sync()
 {
        if (_session) {
                if (_session->config.get_video_pullup() != 0.0f) {
-                       if (_session->config.get_sync_source() == JACK) {
+                       if (Config->get_sync_source() == JACK) {
                                MessageDialog msg (
                                        _("It is not possible to use JACK as the the sync source\n\
 when the pull up/down setting is non-zero."));
@@ -70,6 +70,17 @@ when the pull up/down setting is non-zero."));
                }
 
                ActionManager::toggle_config_state_foo ("Transport", "ToggleExternalSync", sigc::mem_fun (_session->config, &SessionConfiguration::set_external_sync), sigc::mem_fun (_session->config, &SessionConfiguration::get_external_sync));
+
+               /* activating a slave is a session-property.
+                * The slave type is a RC property.
+                * When the slave is active is must not be reconfigured.
+                * This is a UI limitation, imposed by audio-clock and
+                * status displays which combine RC-config & session-properties.
+                *
+                * Notficy RCOptionEditor by emitting a signal if the active
+                * status changed:
+                */
+               Config->ParameterChanged("sync-source");
        }
 }
 
@@ -276,21 +287,15 @@ ARDOUR_UI::toggle_video_sync()
 
 void
 ARDOUR_UI::toggle_editing_space()
-{
-       toggle_editing_space_force(false);
-}
-
-void
-ARDOUR_UI::toggle_editing_space_force(bool force)
 {
        Glib::RefPtr<Action> act = ActionManager::get_action ("Common", "ToggleMaximalEditor");
 
        if (act) {
                Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
                if (tact->get_active()) {
-                       maximise_editing_space (force);
+                       maximise_editing_space ();
                } else {
-                       restore_editing_space (force);
+                       restore_editing_space ();
                }
        }
 }
@@ -316,16 +321,18 @@ ARDOUR_UI::parameter_changed (std::string p)
                        sync_button.set_text (_("Internal"));
                        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 (_session->config.get_sync_source(), true));
+                       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 */
                        ActionManager::get_action ("Transport", "ToggleAutoPlay")->set_sensitive (false);
                        ActionManager::get_action ("Transport", "ToggleAutoReturn")->set_sensitive (false);
+                       ActionManager::get_action ("Transport", "ToggleFollowEdits")->set_sensitive (false);
                }
 
        } else if (p == "always-play-range") {
 
-               ActionManager::map_some_state ("Transport", "AlwaysPlayRange", &RCConfiguration::get_always_play_range);
+               ActionManager::map_some_state ("Transport", "ToggleFollowEdits", &RCConfiguration::get_always_play_range);
 
        } else if (p == "send-mtc") {
 
@@ -375,6 +382,7 @@ ARDOUR_UI::parameter_changed (std::string p)
 
                synchronize_sync_source_and_video_pullup ();
                reset_main_clocks ();
+               editor->queue_visual_videotimeline_update();
 
        } else if (p == "sync-source") {
 
@@ -402,6 +410,9 @@ ARDOUR_UI::parameter_changed (std::string p)
                        secondary_clock->set_editable (true);
                        secondary_clock->set_widget_name ("secondary");
                }
+       } else if (p == "super-rapid-clock-update") {
+               stop_clocking ();
+               start_clocking ();
        }
 }
 
@@ -445,7 +456,7 @@ ARDOUR_UI::synchronize_sync_source_and_video_pullup ()
                act->set_sensitive (true);
        } else {
                /* can't sync to JACK if video pullup != 0.0 */
-               if (_session->config.get_sync_source() == JACK) {
+               if (Config->get_sync_source() == JACK) {
                        act->set_sensitive (false);
                } else {
                        act->set_sensitive (true);