From 302fd7efeb193eef8806029d53e6d7961b1ec2f8 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 1 May 2014 07:53:28 -0400 Subject: [PATCH] correctly set up ruler preferences for get_trx() == true case --- gtk2_ardour/editor_actions.cc | 41 ++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index 48d56193a6..d8889a9c81 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -563,12 +563,30 @@ Editor::register_actions () /* set defaults here */ no_ruler_shown_update = true; - ruler_meter_action->set_active (true); - ruler_tempo_action->set_active (true); - ruler_marker_action->set_active (true); - ruler_range_action->set_active (true); - ruler_loop_punch_action->set_active (true); - ruler_loop_punch_action->set_active (true); + + if (Profile->get_trx()) { + ruler_marker_action->set_active (true); + ruler_meter_action->set_active (false); + ruler_tempo_action->set_active (false); + ruler_range_action->set_active (false); + ruler_loop_punch_action->set_active (false); + ruler_loop_punch_action->set_active (false); + ruler_bbt_action->set_active (true); + ruler_cd_marker_action->set_active (false); + ruler_timecode_action->set_active (false); + ruler_minsec_action->set_active (true); + } else { + ruler_marker_action->set_active (true); + ruler_meter_action->set_active (true); + ruler_tempo_action->set_active (true); + ruler_range_action->set_active (true); + ruler_loop_punch_action->set_active (true); + ruler_loop_punch_action->set_active (true); + ruler_bbt_action->set_active (false); + ruler_cd_marker_action->set_active (true); + ruler_timecode_action->set_active (true); + ruler_minsec_action->set_active (false); + } ruler_video_action->set_active (false); xjadeo_proc_action->set_active (false); @@ -587,17 +605,6 @@ Editor::register_actions () xjadeo_letterbox_action->set_sensitive (false); xjadeo_zoom_100->set_sensitive (false); - if (Profile->get_sae()) { - ruler_bbt_action->set_active (true); - ruler_cd_marker_action->set_active (false); - ruler_timecode_action->set_active (false); - ruler_minsec_action->set_active (true); - } else { - ruler_bbt_action->set_active (false); - ruler_cd_marker_action->set_active (true); - ruler_timecode_action->set_active (true); - ruler_minsec_action->set_active (false); - } ruler_samples_action->set_active (false); no_ruler_shown_update = false; -- 2.30.2