diff options
| -rw-r--r-- | gtk2_ardour/ardour3_ui_light.rc.in | 17 | ||||
| -rw-r--r-- | gtk2_ardour/route_time_axis.cc | 5 |
2 files changed, 21 insertions, 1 deletions
diff --git a/gtk2_ardour/ardour3_ui_light.rc.in b/gtk2_ardour/ardour3_ui_light.rc.in index 0059e5d04d..580d7ab845 100644 --- a/gtk2_ardour/ardour3_ui_light.rc.in +++ b/gtk2_ardour/ardour3_ui_light.rc.in @@ -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" diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index bb4737622f..cee28fc5c1 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -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); |