simplify time-axis packing: consistent table layout

[ardour.git] / gtk2_ardour / automation_time_axis.cc

diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc
index 86f8034be3045b7a988554350da5adf0110c9022..f474acd007b6ea335aef342c0b53ae87c1ea5e89 100644 (file)
--- a/gtk2_ardour/automation_time_axis.cc
+++ b/gtk2_ardour/automation_time_axis.cc
@@ -51,6 +51,7 @@
 
 using namespace std;
 using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
 using namespace PBD;
 using namespace Gtk;
 using namespace Gtkmm2ext;
@@ -126,10 +127,10 @@ AutomationTimeAxisView::AutomationTimeAxisView (
                _base_rect->lower_to_bottom();
        }
 
-       hide_button.add (*(manage (new Gtk::Image (::get_icon("hide")))));
+       hide_button.set_image ( ::get_icon(X_("hide")));
 
-       auto_button.set_name ("TrackVisualButton");
-       hide_button.set_name ("TrackRemoveButton");
+       auto_button.set_name ("mixer strip button");
+       hide_button.set_name ("mixer strip button");
 
        auto_button.unset_flags (Gtk::CAN_FOCUS);
        hide_button.unset_flags (Gtk::CAN_FOCUS);
@@ -146,6 +147,9 @@ AutomationTimeAxisView::AutomationTimeAxisView (
                set_height (preset_height (HeightNormal));
        }
 
+       //name label isn't editable on an automation track; remove the tooltip
+       ARDOUR_UI::instance()->set_tip (name_label, X_(""));
+
        /* repack the name label */
 
        if (name_label.get_parent()) {
@@ -153,8 +157,8 @@ AutomationTimeAxisView::AutomationTimeAxisView (
        }
        
        name_label.set_text (_name);
-       name_label.set_alignment (Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER);
-        name_label.set_name (X_("TrackParameterName"));
+       name_label.set_alignment (Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
+       name_label.set_name (X_("TrackParameterName"));
        name_label.set_ellipsize (Pango::ELLIPSIZE_END);
 
        string tipname = nomparent;
@@ -165,28 +169,31 @@ AutomationTimeAxisView::AutomationTimeAxisView (
        ARDOUR_UI::instance()->set_tip(controls_ebox, tipname);
 
        /* add the buttons */
-       controls_table.attach (hide_button, 0, 1, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-       controls_table.attach (name_label, 0, 6, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-       controls_table.attach (auto_button, 6, 8, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+       controls_table.remove (name_hbox);
+       controls_table.attach (hide_button, 0, 1, 0, 1, Gtk::SHRINK, Gtk::SHRINK);
+       controls_table.attach (name_label,  1, 3, 1, 3, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 2, 0);
+       controls_table.attach (auto_button, 3, 4, 2, 3, Gtk::SHRINK, Gtk::SHRINK);
+       controls_table.set_border_width (0);
 
        name_label.show ();
+       hide_button.show ();
 
        if (_controller) {
                _controller.get()->set_size_request(-1, 24);
                /* add bar controller */
-               controls_table.attach (*_controller.get(), 1, 8, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+               controls_table.attach (*_controller.get(), 1, 4, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
                /* note that this handler connects *before* the default handler */
                _controller->event_widget().signal_scroll_event().connect (mem_fun (*this, &AutomationTimeAxisView::controls_ebox_scroll), false);
        }
 
        controls_table.show_all ();
 
-       hide_button.signal_clicked().connect (sigc::mem_fun(*this, &AutomationTimeAxisView::hide_clicked));
-       auto_button.signal_clicked().connect (sigc::mem_fun(*this, &AutomationTimeAxisView::auto_clicked));
+       hide_button.signal_clicked.connect (sigc::mem_fun(*this, &AutomationTimeAxisView::hide_clicked));
+       auto_button.signal_clicked.connect (sigc::mem_fun(*this, &AutomationTimeAxisView::auto_clicked));
 
        controls_base_selected_name = X_("AutomationTrackControlsBaseSelected");
        controls_base_unselected_name = X_("AutomationTrackControlsBase");
-       controls_ebox.set_name (controls_base_unselected_name);
+       time_axis_frame.set_name (controls_base_unselected_name);
 
        /* ask for notifications of any new RegionViews */
        if (show_regions) {
@@ -297,7 +304,7 @@ AutomationTimeAxisView::automation_state_changed ()
 
        switch (state & (ARDOUR::Off|Play|Touch|Write)) {
        case ARDOUR::Off:
-               auto_button.set_label (S_("Automation|Manual"));
+               auto_button.set_text (S_("Automation|Manual"));
                if (auto_off_item) {
                        ignore_state_request = true;
                        auto_off_item->set_active (true);
@@ -308,7 +315,7 @@ AutomationTimeAxisView::automation_state_changed ()
                }
                break;
        case Play:
-               auto_button.set_label (_("Play"));
+               auto_button.set_text (_("Play"));
                if (auto_play_item) {
                        ignore_state_request = true;
                        auto_play_item->set_active (true);
@@ -319,7 +326,7 @@ AutomationTimeAxisView::automation_state_changed ()
                }
                break;
        case Write:
-               auto_button.set_label (_("Write"));
+               auto_button.set_text (_("Write"));
                if (auto_write_item) {
                        ignore_state_request = true;
                        auto_write_item->set_active (true);
@@ -330,7 +337,7 @@ AutomationTimeAxisView::automation_state_changed ()
                }
                break;
        case Touch:
-               auto_button.set_label (_("Touch"));
+               auto_button.set_text (_("Touch"));
                if (auto_touch_item) {
                        ignore_state_request = true;
                        auto_touch_item->set_active (true);
@@ -341,7 +348,7 @@ AutomationTimeAxisView::automation_state_changed ()
                }
                break;
        default:
-               auto_button.set_label (_("???"));
+               auto_button.set_text (_("???"));
                break;
        }
 }
@@ -420,11 +427,13 @@ AutomationTimeAxisView::set_height (uint32_t h)
 
                if (h >= preset_height (HeightNormal)) {
                        auto_button.show();
-                       hide_button.show_all();
+                       name_label.show();
+                       hide_button.show();
 
                } else if (h >= preset_height (HeightSmall)) {
                        controls_table.hide_all ();
                        auto_button.hide();
+                       name_label.hide();
                }
        }
 
@@ -543,7 +552,7 @@ AutomationTimeAxisView::build_display_menu ()
 }
 
 void
-AutomationTimeAxisView::add_automation_event (GdkEvent* event, framepos_t when, double y)
+AutomationTimeAxisView::add_automation_event (GdkEvent* event, framepos_t when, double y, bool with_guard_points)
 {
        if (!_line) {
                return;
@@ -576,7 +585,7 @@ AutomationTimeAxisView::add_automation_event (GdkEvent* event, framepos_t when,
        _session->begin_reversible_command (_("add automation event"));
        XMLNode& before = list->get_state();
 
-       list->add (when, y);
+       list->add (when, y, with_guard_points);
 
        XMLNode& after = list->get_state();
        _session->commit_reversible_command (new MementoCommand<ARDOUR::AutomationList> (*list, &before, &after));