correctly set up ruler preferences for get_trx() == true case

diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index 48d56193a62226d7df4468ff197f7a95777c5a24..d8889a9c81527e2fe0811200aed5fe29adae7fee 100644 (file)
--- 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;