projects / ardour.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
right side track-header control buttons (for non mixbus profile)
[ardour.git] / gtk2_ardour / route_time_axis.cc
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index d54d1949eb1443015b49383eb4cfe310a78fe5c2..9eb700d658dc4db1b1f41192baa84ab935aa38e8 100644 (file)
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -105,11 +105,13 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, ArdourCan
        , playlist_action_menu (0)
        , mode_menu (0)
        , color_mode_menu (0)
-       , gm (sess, true, 125, 18)
+       , gm (sess, true, 75, 20)
        , _ignore_set_layer_display (false)
 {
-       number_label.set_name("tracknumber label");
+       number_label.set_name("route button");
+       number_label.set_elements((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::Text|ArdourButton::Inactive));
        number_label.set_alignment(.5, .5);
+       number_label.set_fallthrough_to_parent (true);
 
        sess->config.ParameterChanged.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::parameter_changed, this, _1), gui_context());
 }
@@ -149,7 +151,6 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
 
        mute_changed (0);
        update_solo_display ();
-       route_color_changed();
 
        timestretch_rect = 0;
        no_redraw = false;
@@ -171,14 +172,21 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
                switch (track()->mode()) {
                case ARDOUR::Normal:
                case ARDOUR::NonLayered:
-                       rec_enable_button->set_image (::get_icon (X_("record_normal_red")));
+                       rec_enable_button->set_image (Glib::RefPtr<Gdk::Pixbuf>());
+                       rec_enable_button->set_markup ("<span color=\"#f46f6f\">\u25CF</span>");
                        break;
                case ARDOUR::Destructive:
+                       rec_enable_button->set_text (string());
                        rec_enable_button->set_image (::get_icon (X_("record_tape_red")));
                        break;
                }
 
-               controls_table.attach (*rec_enable_button, 5, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
+               if (ARDOUR::Profile->get_mixbus()) {
+                       controls_table.attach (*rec_enable_button, 0, 1, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
+               } else {
+                       controls_table.attach (*rec_enable_button, 2, 3, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
+               }
+               controls_button_size_group->add_widget(*rec_enable_button);
 
                 if (is_midi_track()) {
                         ARDOUR_UI::instance()->set_tip(*rec_enable_button, _("Record (Right-click for Step Edit)"));
@@ -196,29 +204,63 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
 
        } else {
                gm.set_fader_name ("AudioBusFader");
+               Gtk::Fixed *blank = manage(new Gtk::Fixed());
+               controls_button_size_group->add_widget(*blank);
+               if (ARDOUR::Profile->get_mixbus() ) {
+                       controls_table.attach (*blank, 0, 1, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
+               } else {
+                       controls_table.attach (*blank, 2, 3, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
+               }
+               blank->show();
        }
 
-       Gtk::VBox *mtrbox = manage(new Gtk::VBox());
-       mtrbox->pack_start(gm.get_level_meter(), false, false, 2);
-       controls_hbox.pack_start(*mtrbox, false, false, 4);
-       mtrbox->show();
+       top_hbox.pack_end(gm.get_level_meter(), false, false, 4);
+
+       if (!ARDOUR::Profile->get_mixbus()) {
+               controls_meters_size_group->add_widget (gm.get_level_meter());
+       }
 
        _route->meter_change.connect (*this, invalidator (*this), bind (&RouteTimeAxisView::meter_changed, this), gui_context());
        _route->input()->changed.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::io_changed, this, _1, _2), gui_context());
        _route->output()->changed.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::io_changed, this, _1, _2), gui_context());
        _route->track_number_changed.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::label_view, this), gui_context());
 
-       controls_table.attach (*mute_button, 6, 7, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
-
-        if (!_route->is_master()) {
-                controls_table.attach (*solo_button, 7, 8, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
-        }
+       if (ARDOUR::Profile->get_mixbus()) {
+               controls_table.attach (*mute_button, 1, 2, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
+       } else {
+               controls_table.attach (*mute_button, 3, 4, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
+       }
+       controls_button_size_group->add_widget(*mute_button);
 
-       if (!ARDOUR::Profile->get_trx()) {
-               controls_table.attach (route_group_button, 7, 8, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
-               controls_table.attach (gm.get_gain_slider(), 0, 5, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::AttachOptions (0), 3, 0);
+       if (!_route->is_master()) {
+               if (ARDOUR::Profile->get_mixbus()) {
+                       controls_table.attach (*solo_button, 2, 3, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
+               } else {
+                       controls_table.attach (*solo_button, 4, 5, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
+               }
+               controls_button_size_group->add_widget(*solo_button);
+       } else {
+               Gtk::Fixed *blank = manage(new Gtk::Fixed());
+               controls_button_size_group->add_widget(*blank);
+               if (ARDOUR::Profile->get_mixbus()) {
+                       controls_table.attach (*blank, 2, 3, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
+               } else {
+                       controls_table.attach (*blank, 4, 5, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
+               }
+               blank->show();
        }
 
+       if (ARDOUR::Profile->get_mixbus()) {
+               controls_button_size_group->add_widget(route_group_button);
+               controls_table.attach (route_group_button, 2, 3, 3, 4, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
+               controls_table.attach (gm.get_gain_slider(), 3, 5, 2, 4, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
+       }
+       else if (!ARDOUR::Profile->get_trx()) {
+               controls_button_size_group->add_widget(route_group_button);
+               controls_table.attach (route_group_button, 4, 5, 3, 4, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
+               controls_table.attach (gm.get_gain_slider(), 0, 2, 2, 4, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
+       }
+       
        ARDOUR_UI::instance()->set_tip(*solo_button,_("Solo"));
        ARDOUR_UI::instance()->set_tip(*mute_button,_("Mute"));
        ARDOUR_UI::instance()->set_tip(route_group_button, _("Route Group"));
@@ -232,12 +274,24 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
        update_track_number_visibility();
        label_view ();
 
-       if (!ARDOUR::Profile->get_trx()) {
-               controls_table.attach (automation_button, 6, 7, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+       if (ARDOUR::Profile->get_mixbus()) {
+               controls_table.attach (automation_button, 1, 2, 3, 4, Gtk::SHRINK, Gtk::SHRINK);
+               controls_button_size_group->add_widget(automation_button);
+       }
+       else if (!ARDOUR::Profile->get_trx()) {
+               controls_table.attach (automation_button, 3, 4, 3, 4, Gtk::SHRINK, Gtk::SHRINK);
+               controls_button_size_group->add_widget(automation_button);
        }
 
-       if (!ARDOUR::Profile->get_trx() && is_track() && track()->mode() == ARDOUR::Normal) {
-               controls_table.attach (playlist_button, 5, 6, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+       if (is_track() && track()->mode() == ARDOUR::Normal) {
+               if (ARDOUR::Profile->get_mixbus()) {
+                       controls_table.attach (playlist_button, 0, 1, 3, 4, Gtk::SHRINK, Gtk::SHRINK);
+                       controls_button_size_group->add_widget(playlist_button);
+               }
+               else if (!ARDOUR::Profile->get_trx()) {
+                       controls_table.attach (playlist_button, 2, 3, 3, 4, Gtk::SHRINK, Gtk::SHRINK);
+                       controls_button_size_group->add_widget(playlist_button);
+               }
        }
 
        _y_position = -1;
@@ -359,6 +413,7 @@ RouteTimeAxisView::label_view ()
 void
 RouteTimeAxisView::update_track_number_visibility ()
 {
+       DisplaySuspender ds;
        bool show_label = _session->config.get_track_name_number();
 
        if (_route && _route->is_master()) {
@@ -368,18 +423,16 @@ RouteTimeAxisView::update_track_number_visibility ()
        if (number_label.get_parent()) {
                controls_table.remove (number_label);
        }
-       if (name_hbox.get_parent()) {
-               controls_table.remove (name_hbox);
-       }
        if (show_label) {
-               controls_table.attach (number_label, 0, 1, 0, 1,  Gtk::SHRINK, Gtk::FILL|Gtk::EXPAND, 3, 0);
-               controls_table.attach (name_hbox, 1, 5, 0, 1,  Gtk::FILL|Gtk::EXPAND,  Gtk::FILL|Gtk::EXPAND, 3, 0);
-               number_label.set_size_request(3 + _session->track_number_decimals() * 8, -1);
-               name_hbox.show ();
+               if (ARDOUR::Profile->get_mixbus()) {
+                       controls_table.attach (number_label, 3, 4, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
+               } else {
+                       controls_table.attach (number_label, 0, 1, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
+               }
+               const int tnw = std::max(2u, _session->track_number_decimals()) * 8; // TODO 8 = max_width_of_digit_0_to_9()
+               number_label.set_size_request(3 + tnw, -1);
                number_label.show ();
        } else {
-               controls_table.attach (name_hbox, 0, 5, 0, 1,  Gtk::FILL|Gtk::EXPAND,  Gtk::FILL|Gtk::EXPAND, 3, 0);
-               name_hbox.show ();
                number_label.hide ();
        }
 }
@@ -806,12 +859,12 @@ RouteTimeAxisView::set_track_mode (TrackMode mode, bool apply_to_selection)
                switch (mode) {
                case ARDOUR::NonLayered:
                case ARDOUR::Normal:
-                       rec_enable_button->set_image (::get_icon (X_("record_normal_red")));
-                       rec_enable_button->set_text (string());
+                       rec_enable_button->set_image (Glib::RefPtr<Gdk::Pixbuf>());
+                       rec_enable_button->set_markup ("<span color=\"#f46f6f\">\u25CF</span>");
                        break;
                case ARDOUR::Destructive:
-                       rec_enable_button->set_image (::get_icon (X_("record_tape_red")));
                        rec_enable_button->set_text (string());
+                       rec_enable_button->set_image (::get_icon (X_("record_tape_red")));
                        break;
                }
 
@@ -2280,9 +2333,9 @@ RouteTimeAxisView::can_edit_name () const
 }
 
 void
-RouteTimeAxisView::update_rec_display ()
+RouteTimeAxisView::blink_rec_display (bool onoff)
 {
-       RouteUI::update_rec_display ();
+       RouteUI::blink_rec_display (onoff);
 }
 
 void
Unnamed repository; edit this file 'description' to name the repository.