diff --git a/gtk2_ardour/ardour3_ui_dark.rc.in b/gtk2_ardour/ardour3_ui_dark.rc.in index 5fd7696bc8..7840ac7007 100644 --- a/gtk2_ardour/ardour3_ui_dark.rc.in +++ b/gtk2_ardour/ardour3_ui_dark.rc.in @@ -372,9 +372,27 @@ style "mixer_solo_button_active" = "solo_button_active" ythickness = 0 } -style "monitor_section_button" = "small_button" +style "monitor_mono_button" = "small_button" { - bg[ACTIVE] = { 1.0, 0, 0 } + bg[ACTIVE] = { 0.725, 0.925, 0.949 } + fg[ACTIVE] = { 0, 0, 0 } +} + +style "monitor_invert_button" = "small_button" +{ + bg[ACTIVE] = { 1.0, 0.749, 0.247 } + fg[ACTIVE] = { 0, 0, 0 } +} + +style "monitor_mute_button" = "small_button" +{ + bg[ACTIVE] = { 1.0, 0.98, 0.53 } + fg[ACTIVE] = { 0, 0, 0 } +} + +style "monitor_dim_button" = "small_button" +{ + bg[ACTIVE] = { 0.90, 0.89, 0.73 } fg[ACTIVE] = { 0, 0, 0 } } @@ -1597,8 +1615,16 @@ widget "*MixerStripSelectedFrame" style:highest "selected_strip_frame" widget "*MixerStripFrame" style:highest "base_frame" widget "*HWMonitorButton" style:highest "red_when_active" widget "*HWMonitorButton*" style:highest "red_when_active" -widget "*MonitorSectionButton" style:highest "monitor_section_button" -widget "*MonitorSectionButton*" style:highest "monitor_section_button" +widget "*MonitorInvertButton" style:highest "monitor_invert_button" +widget "*MonitorInvertButton*" style:highest "monitor_invert_button" +widget "*MonitorMuteButton" style:highest "monitor_mute_button" +widget "*MonitorMuteButton*" style:highest "monitor_mute_button" +widget "*MonitorDimButton" style:highest "monitor_dim_button" +widget "*MonitorDimButton*" style:highest "monitor_dim_button" +widget "*MonitorMonoButton" style:highest "monitor_mono_button" +widget "*MonitorMonoButton*" style:highest "monitor_mono_button" +widget "*MonitorInvertButton" style:highest "monitor_invert_button" +widget "*MonitorInvertButton*" style:highest "monitor_invert_button" widget "*BypassButton" style:highest "red_when_active" widget "*BypassButton*" style:highest "red_when_active" widget "*TransportSoloAlert" style:highest "flashing_alert" diff --git a/gtk2_ardour/monitor_section.cc b/gtk2_ardour/monitor_section.cc index 9dff4b101b..b555df4109 100644 --- a/gtk2_ardour/monitor_section.cc +++ b/gtk2_ardour/monitor_section.cc @@ -174,7 +174,7 @@ MonitorSection::MonitorSection (Session* s) act->connect_proxy (mono_button); } - cut_all_button.set_name (X_("MixerMuteButton")); + cut_all_button.set_name (X_("MonitorMuteButton")); cut_all_button.unset_flags (Gtk::CAN_FOCUS); cut_all_button.set_size_request (50,50); cut_all_button.show (); @@ -185,9 +185,9 @@ MonitorSection::MonitorSection (Session* s) bbox->pack_start (mono_button, true, true); bbox->pack_start (dim_all_button, true, true); - dim_all_button.set_name (X_("MonitorSectionButton")); + dim_all_button.set_name (X_("MonitorDimButton")); dim_all_button.unset_flags (Gtk::CAN_FOCUS); - mono_button.set_name (X_("MonitorSectionButton")); + mono_button.set_name (X_("MonitorMonoButton")); mono_button.unset_flags (Gtk::CAN_FOCUS); lower_packer.set_spacing (12); @@ -291,10 +291,10 @@ MonitorSection::ChannelButtonSet::ChannelButtonSet () , solo (X_("")) , invert (X_("")) { - cut.set_name (X_("MixerMuteButton")); - dim.set_name (X_("MixerMuteButton")); + cut.set_name (X_("MonitorMuteButton")); + dim.set_name (X_("MonitorDimButton")); solo.set_name (X_("MixerSoloButton")); - invert.set_name (X_("MonitorSectionButton")); + invert.set_name (X_("MonitorInvertButton")); gtk_activatable_set_use_action_appearance (GTK_ACTIVATABLE (cut.gobj()), false); gtk_activatable_set_use_action_appearance (GTK_ACTIVATABLE (dim.gobj()), false);