Move selection/punch clocks to editor Sidebar

diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index 0da611a153d2f6c0a47325baacf2ffb6e2f9248f..14a359c7a16fe9f9efb0004be6a42591ef204751 100644 (file)
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -254,8 +254,6 @@ public:
        void focus_on_clock ();
        AudioClock*   big_clock;
 
-       TimeInfoBox* time_info_box;
-
        VideoTimeLine *video_timeline;
 
        void store_clock_modes ();

diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index ffbfd2ffd94de1f02a3a1344a98a1947ce1bf842..03dc0e4a49f55a69c451b624d76b725471d4c230 100644 (file)
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -58,7 +58,6 @@
 #include "global_port_matrix.h"
 #include "location_ui.h"
 #include "rc_option_editor.h"
-#include "time_info_box.h"
 
 #include "pbd/i18n.h"
 
@@ -393,8 +392,6 @@ ARDOUR_UI::setup_transport ()
        punch_button_size_group->add_widget (punch_in_button);
        punch_button_size_group->add_widget (punch_out_button);
 
-       // external widgets
-       time_info_box = manage (new TimeInfoBox);
        shuttle_box = manage (new ShuttleControl);
 
        /* and now the layout... */
@@ -489,8 +486,6 @@ ARDOUR_UI::setup_transport ()
        transport_table.attach (editor_visibility_button, 14, 15, 0, 1 , FILL, SHRINK, 1, 0);
        transport_table.attach (mixer_visibility_button, 14, 15, 1, 2 , FILL, SHRINK, 1, 0);
 
-       transport_table.attach (*time_info_box, 15, 16, 0, 2, SHRINK, EXPAND|FILL, 1, 0); // XXX
-
        /* desensitize */
 
        feedback_alert_button.set_sensitive (false);

diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc
index 13bf3e00878f6b8ad4dd0cd543e0bb461a4d9c7b..90cc8907430246b81c76802770d476b08bf1d4c8 100644 (file)
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -67,7 +67,6 @@
 #include "splash.h"
 #include "sfdb_ui.h"
 #include "theme_manager.h"
-#include "time_info_box.h"
 #include "timers.h"
 
 #include "pbd/i18n.h"
@@ -115,7 +114,6 @@ ARDOUR_UI::set_session (Session *s)
        primary_clock->set_session (s);
        secondary_clock->set_session (s);
        big_clock->set_session (s);
-       time_info_box->set_session (s);
        video_timeline->set_session (s);
 
        /* sensitize menu bar options that are now valid */

diff --git a/gtk2_ardour/clearlooks.rc.in b/gtk2_ardour/clearlooks.rc.in
index a1687b041888754edd1ace5f5cac5156f08b2ac0..f135b1ba4cebd7b59f12efbfb4baa89ef70e5ccd 100644 (file)
--- a/gtk2_ardour/clearlooks.rc.in
+++ b/gtk2_ardour/clearlooks.rc.in
@@ -272,7 +272,7 @@ style "inspector_processor_list" = "processor_list"
 
 style "time_info_box"
 {
-        bg[NORMAL] = { 0.05, 0.05, 0.05 }
+        bg[NORMAL] = { 0.00, 0.00, 0.00 }
 }
 
 style "status_bar_box"

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 875d249207c4156b5f5cecbe0173d318bac16489..598a46ad4ee9aea48021c90cfa6227bad322c8bd 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -132,6 +132,7 @@
 #include "sfdb_ui.h"
 #include "tempo_lines.h"
 #include "time_axis_view.h"
+#include "time_info_box.h"
 #include "timers.h"
 #include "tooltips.h"
 #include "ui_config.h"
@@ -242,6 +243,7 @@ Editor::Editor ()
        , editor_mixer_strip_width (Wide)
        , constructed (false)
        , _playlist_selector (0)
+       , _time_info_box (0)
        , no_save_visual (false)
        , leftmost_frame (0)
        , samples_per_pixel (2048)
@@ -643,6 +645,7 @@ Editor::Editor ()
        _regions = new EditorRegions (this);
        _snapshots = new EditorSnapshots (this);
        _locations = new EditorLocations (this);
+       _time_info_box = new TimeInfoBox ();
 
        /* these are static location signals */
 
@@ -722,11 +725,14 @@ Editor::Editor ()
        edit_pane.set_check_divider_position (true);
        edit_pane.add (editor_summary_pane);
        if (!ARDOUR::Profile->get_trx()) {
-               edit_pane.add (_the_notebook);
+               VBox* editor_list_vbox = manage (new VBox);
+               editor_list_vbox->pack_start (*_time_info_box, false, false, 0);
+               editor_list_vbox->pack_start (_the_notebook);
+               edit_pane.add (*editor_list_vbox);
+               edit_pane.set_child_minsize (*editor_list_vbox, 30); /* rough guess at width of notebook tabs */
        }
 
        edit_pane.set_drag_cursor (*_cursors->expand_left_right);
-       edit_pane.set_child_minsize (_the_notebook, 30); /* rough guess at width of notebook tabs */
        editor_summary_pane.set_drag_cursor (*_cursors->expand_up_down);
 
        float fract;
@@ -875,6 +881,7 @@ Editor::~Editor()
        delete _snapshots;
        delete _locations;
        delete _playlist_selector;
+       delete _time_info_box;
 
        for (list<XMLNode *>::iterator i = selection_op_history.begin(); i != selection_op_history.end(); ++i) {
                delete *i;
@@ -1312,6 +1319,7 @@ Editor::set_session (Session *t)
        _snapshots->set_session (_session);
        _routes->set_session (_session);
        _locations->set_session (_session);
+       _time_info_box->set_session (_session);
 
        if (rhythm_ferret) {
                rhythm_ferret->set_session (_session);

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 27d077c6ec43bd9d0a9d1325eb87040fcaa3d97e..0321f45e4c8a5bf7695bfcc25b5c3f5a03a46f07 100644 (file)
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -134,6 +134,7 @@ class SoundFileOmega;
 class StreamView;
 class TempoLines;
 class TimeAxisView;
+class TimeInfoBox;
 class TimeFXDialog;
 class TimeSelection;
 class RegionLayeringOrderEditor;
@@ -571,6 +572,8 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 
        PlaylistSelector* _playlist_selector;
 
+       TimeInfoBox*      _time_info_box;
+
        typedef std::pair<TimeAxisView*,XMLNode*> TAVState;
 
        struct VisualState {