next iteration of clock work. still far from complete, and probably waiting on a rethink of text rendering+layout. but it has the info block now, and it semi-works

git-svn-id: svn://localhost/ardour2/branches/3.0@9676 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 10 insertions, 0 deletions

diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index 80ef975b91..70962befd6 100644
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -32,6 +32,7 @@
 #include "pbd/error.h"
 #include "pbd/basename.h"
 #include "pbd/fastlog.h"
+#include <gtkmm2ext/cairocell.h>
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/click_box.h>
 #include <gtkmm2ext/tearoff.h>
@@ -54,6 +55,7 @@
 #include "global_port_matrix.h"
 #include "location_ui.h"
 #include "rc_option_editor.h"
+#include "time_info_box.h"
 
 #include "i18n.h"
 
@@ -385,8 +387,13 @@ ARDOUR_UI::setup_transport ()
 	transport_hbox->pack_start (rec_button, false, false, 6);
 
 	HBox* clock_box = manage (new HBox);
+	clock_box->set_border_width (2);
+	primary_clock->main_display().set_ypad (2);
+	primary_clock->set_border_width (2);
 	clock_box->pack_start (*primary_clock, false, false);
 	if (!ARDOUR::Profile->get_small_screen()) {
+		secondary_clock->set_border_width (2);
+		secondary_clock->main_display().set_ypad (2);
 		clock_box->pack_start (*secondary_clock, false, false);
 	}
 
@@ -410,6 +417,9 @@ ARDOUR_UI::setup_transport ()
 	transport_tearoff_hbox.pack_start (*transport_vbox, false, false, 0);
 	transport_tearoff_hbox.pack_start (*clock_box, false, false, 0);
 
+	time_info_box = manage (new TimeInfoBox);
+	transport_tearoff_hbox.pack_start (*time_info_box, false, false);
+
 	HBox* toggle_box = manage(new HBox);
 
 	VBox* punch_box = manage (new VBox);