smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 07:45:00 +01:00
Code Issues Projects Releases Wiki Activity

amend cb7bcb6d - locked-solo button style

Browse source
This commit is contained in:
Robin Gareus 2013-07-11 02:31:30 +02:00
parent cb7bcb6d9f
commit 2b53ac2e31
4 changed files with 26 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/ardour_button.cc
View file

@ -384,7 +384,7 @@ ArdourButton::render (cairo_t* cr)
if ((visual_state() & Gtkmm2ext::Insensitive)) { if ((visual_state() & Gtkmm2ext::Insensitive)) {
rounded_function (cr, 0, 0, get_width(), get_height(), _corner_radius); rounded_function (cr, 0, 0, get_width(), get_height(), _corner_radius);
cairo_set_source_rgba (cr, 0.505, 0.517, 0.525, 0.5); cairo_set_source_rgba (cr, 0.505, 0.517, 0.525, 0.6);
cairo_fill (cr); cairo_fill (cr);
} }

4
gtk2_ardour/meter_strip.cc
View file

@ -274,9 +274,9 @@ MeterStrip::set_button_names()
rec_enable_button->set_image (::get_icon (X_("record_normal_red"))); rec_enable_button->set_image (::get_icon (X_("record_normal_red")));
if (_route && _route->solo_safe()) { if (_route && _route->solo_safe()) {
solo_button->set_sensitive(false); solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() | Gtkmm2ext::Insensitive));
} else { } else {
solo_button->set_sensitive(true); solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() & ~Gtkmm2ext::Insensitive));
} }
if (!Config->get_solo_control_is_listen_control()) { if (!Config->get_solo_control_is_listen_control()) {
solo_button->set_text (_("S")); solo_button->set_text (_("S"));

10
gtk2_ardour/mixer_strip.cc
View file

@ -414,7 +414,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
gpm.set_type (rt->meter_type()); gpm.set_type (rt->meter_type());
middle_button_table.attach (gpm.gain_display,0,1,1,2); middle_button_table.attach (gpm.gain_display,0,1,1,2, EXPAND|FILL, EXPAND);
middle_button_table.attach (gpm.peak_display,1,2,1,2); middle_button_table.attach (gpm.peak_display,1,2,1,2);
if (solo_button->get_parent()) { if (solo_button->get_parent()) {
@ -1905,9 +1905,9 @@ MixerStrip::set_button_names ()
monitor_disk_button->set_text (_("Disk")); monitor_disk_button->set_text (_("Disk"));
if (_route && _route->solo_safe()) { if (_route && _route->solo_safe()) {
solo_button->set_sensitive(false); solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() | Gtkmm2ext::Insensitive));
} else { } else {
solo_button->set_sensitive(true); solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() & ~Gtkmm2ext::Insensitive));
} }
if (!Config->get_solo_control_is_listen_control()) { if (!Config->get_solo_control_is_listen_control()) {
solo_button->set_text (_("Solo")); solo_button->set_text (_("Solo"));
@ -1932,9 +1932,9 @@ MixerStrip::set_button_names ()
monitor_disk_button->set_text (_("D")); monitor_disk_button->set_text (_("D"));
if (_route && _route->solo_safe()) { if (_route && _route->solo_safe()) {
solo_button->set_sensitive(false); solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() | Gtkmm2ext::Insensitive));
} else { } else {
solo_button->set_sensitive(true); solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() & ~Gtkmm2ext::Insensitive));
} }
if (!Config->get_solo_control_is_listen_control()) { if (!Config->get_solo_control_is_listen_control()) {
solo_button->set_text (_("S")); solo_button->set_text (_("S"));

41
gtk2_ardour/route_time_axis.cc
View file

@ -2396,31 +2396,26 @@ RouteTimeAxisView::remove_underlay (StreamView* v)
void void
RouteTimeAxisView::set_button_names () RouteTimeAxisView::set_button_names ()
{ {
if (_route && _route->solo_safe()) { if (_route && _route->solo_safe()) {
solo_button->remove (); solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() | Gtkmm2ext::Insensitive));
if (solo_safe_pixbuf == 0) { } else {
solo_safe_pixbuf = ::get_icon("solo-safe-icon"); solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() & ~Gtkmm2ext::Insensitive));
} }
solo_button->set_image (solo_safe_pixbuf); if (Config->get_solo_control_is_listen_control()) {
solo_button->set_text (string()); switch (Config->get_listen_position()) {
} else { case AfterFaderListen:
solo_button->set_image (Glib::RefPtr<Gdk::Pixbuf>()); solo_button->set_text (_("A"));
if (Config->get_solo_control_is_listen_control()) {
switch (Config->get_listen_position()) {
case AfterFaderListen:
solo_button->set_text (_("A"));
ARDOUR_UI::instance()->set_tip (*solo_button, _("After-fade listen (AFL)")); ARDOUR_UI::instance()->set_tip (*solo_button, _("After-fade listen (AFL)"));
break; break;
case PreFaderListen: case PreFaderListen:
solo_button->set_text (_("P")); solo_button->set_text (_("P"));
ARDOUR_UI::instance()->set_tip (*solo_button, _("Pre-fade listen (PFL)")); ARDOUR_UI::instance()->set_tip (*solo_button, _("Pre-fade listen (PFL)"));
break; break;
} }
} else { } else {
solo_button->set_text (_("s")); solo_button->set_text (_("s"));
ARDOUR_UI::instance()->set_tip (*solo_button, _("Solo")); ARDOUR_UI::instance()->set_tip (*solo_button, _("Solo"));
} }
}
mute_button->set_text (_("m")); mute_button->set_text (_("m"));
} }