ardour/livetrax
13
0
Fork 0
Code

no solo button for master bus; add alternate solo button state to light theme too

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@6940 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-04-20 13:09:13 +00:00
parent f119387d76
commit cf77196698
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gtk2_ardour/ardour3_ui_light.rc.in
View File

@ -283,6 +283,22 @@ style "solo_button_alternate" = "small_button"
fg[PRELIGHT] = { 0, 0, 0 }
}
style "solo_button_alternate2" = "small_button"
{
#
# this is the "half-bright" solo theme
#
bg[NORMAL] = { 0.91, 0.97, 0.82 }
bg[ACTIVE] = { 0.91, 0.97, 0.82 }
bg[SELECTED] = { 0.91, 0.97, 0.82 }
bg[PRELIGHT] = { 0.91, 0.97, 0.82 }
fg[ACTIVE] = { 0, 0, 0 }
fg[SELECTED] = { 0, 0, 0 }
fg[NORMAL] = { 0, 0, 0 }
fg[PRELIGHT] = { 0, 0, 0 }
}
style "solo_button_active" = "small_button"
{
@ -1289,6 +1305,7 @@ widget "*MixerMuteButton-alternate" style:highest "mixer_mute_button_alternate"
widget "*MixerMuteButton-active" style:highest "mixer_mute_button_active"
widget "*SoloButton" style:highest "solo_button"
widget "*SoloButton-alternate" style:highest "solo_button_alternate"
widget "*SoloButton-alternate2" style:highest "solo_button_alternate2"
widget "*SoloButton-active" style:highest "solo_button_active"
widget "*MixerSoloButton" style:highest "mixer_solo_button"
widget "*MixerSoloButton-alternate" style:highest "mixer_solo_button_alternate"

5
gtk2_ardour/route_time_axis.cc
View File

@ -196,7 +196,10 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, boost::sh
_route->output()->changed.connect (*this, invalidator (*this), ui_bind (&RouteTimeAxisView::io_changed, this, _1, _2), gui_context());
controls_table.attach (*mute_button, 6, 7, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
controls_table.attach (*solo_button, 7, 8, 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);
}
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::SHRINK, Gtk::SHRINK, 0, 0);