Use consistent font size for marker text, unset CAN_FOCUS on some more buttons, initial edit point clock is BBT. back to clearlooks for sae light theme.

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@4146 d708f5d6-7413-0410-9779-e7cbd77b26cf

6 files changed, 17 insertions, 3 deletions

diff --git a/gtk2_ardour/ardour2_ui_dark.rc.in b/gtk2_ardour/ardour2_ui_dark.rc.in
index 29b76beea6..3e8bb2cbf5 100644
--- a/gtk2_ardour/ardour2_ui_dark.rc.in
+++ b/gtk2_ardour/ardour2_ui_dark.rc.in
@@ -73,7 +73,7 @@ style "verbose_canvas_cursor"
 
 style "marker_text" 
 {
-	font_name = "%FONT_SMALL%"
+	font_name = "%FONT_SMALLER%"
 }
 
 style "time_axis_view_item_name"
diff --git a/gtk2_ardour/ardour2_ui_dark_sae.rc.in b/gtk2_ardour/ardour2_ui_dark_sae.rc.in
index c9ff511e31..1b0635a1b9 100644
--- a/gtk2_ardour/ardour2_ui_dark_sae.rc.in
+++ b/gtk2_ardour/ardour2_ui_dark_sae.rc.in
@@ -73,7 +73,7 @@ style "verbose_canvas_cursor"
 
 style "marker_text" 
 {
-	font_name = "%FONT_SMALL%"
+	font_name = "%FONT_SMALLER%"
 }
 
 style "time_axis_view_item_name"
diff --git a/gtk2_ardour/ardour2_ui_light_sae.rc.in b/gtk2_ardour/ardour2_ui_light_sae.rc.in
index 3a2907278a..8a4c8992d3 100644
--- a/gtk2_ardour/ardour2_ui_light_sae.rc.in
+++ b/gtk2_ardour/ardour2_ui_light_sae.rc.in
@@ -117,7 +117,7 @@ style "default_base" = "medium_text"
   base[INSENSITIVE]  = "#4c5159"
   base[SELECTED]     = { 0.60, 0.60, 0.80 }
 
-  engine "default" 
+  engine "clearlooks" 
   {
     menubarstyle      = 0       # 0 = flat, 1 = sunken, 2 = flat gradient
     menuitemstyle     = 0       # 0 = flat, 1 = 3d-ish (gradient), 2 = 3d-ish (button)
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 29ea031c4d..7dd94304c2 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -201,6 +201,14 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 	ignore_dual_punch = false;
 	_mixer_on_top = false;
 
+	roll_button.unset_flags (Gtk::CAN_FOCUS);
+	stop_button.unset_flags (Gtk::CAN_FOCUS);
+	goto_start_button.unset_flags (Gtk::CAN_FOCUS);
+	goto_end_button.unset_flags (Gtk::CAN_FOCUS);
+	auto_loop_button.unset_flags (Gtk::CAN_FOCUS);
+	play_selection_button.unset_flags (Gtk::CAN_FOCUS);
+	rec_button.unset_flags (Gtk::CAN_FOCUS);
+
 	last_configure_time= 0;
 
 	shuttle_grabbed = false;
diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc
index 9bde6da4c2..595eb2207f 100644
--- a/gtk2_ardour/automation_time_axis.cc
+++ b/gtk2_ardour/automation_time_axis.cc
@@ -92,6 +92,11 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro
 	clear_button.set_name ("TrackVisualButton");
 	hide_button.set_name ("TrackRemoveButton");
 
+	height_button.unset_flags (Gtk::CAN_FOCUS);
+	auto_button.unset_flags (Gtk::CAN_FOCUS);
+	clear_button.unset_flags (Gtk::CAN_FOCUS);
+	hide_button.unset_flags (Gtk::CAN_FOCUS);
+
 	controls_table.set_no_show_all();
 
 	ARDOUR_UI::instance()->tooltips().set_tip(height_button, _("track height"));
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 7adbafdccb..1af7d86b53 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -1223,6 +1223,7 @@ Editor::connect_to_session (Session *t)
 
 	edit_groups_changed ();
 
+	edit_point_clock.set_mode(AudioClock::BBT);
 	edit_point_clock.set_session (session);
 	zoom_range_clock.set_session (session);
 	_playlist_selector->set_session (session);