diff options
| -rw-r--r-- | gtk2_ardour/clearlooks.rc.in | 16 | ||||
| -rwxr-xr-x | gtk2_ardour/themes/blueberry-milk-ardour.colors | 2 | ||||
| -rwxr-xr-x | gtk2_ardour/themes/caineville-ardour.colors | 2 | ||||
| -rwxr-xr-x | gtk2_ardour/themes/cubasish-ardour.colors | 2 | ||||
| -rw-r--r-- | gtk2_ardour/themes/dark-ardour.colors | 2 | ||||
| -rw-r--r-- | gtk2_ardour/themes/unastudia-ardour.colors | 2 | ||||
| -rw-r--r-- | gtk2_ardour/vca_master_strip.cc | 1 | ||||
| -rw-r--r-- | gtk2_ardour/vca_time_axis.cc | 3 |
8 files changed, 24 insertions, 6 deletions
diff --git a/gtk2_ardour/clearlooks.rc.in b/gtk2_ardour/clearlooks.rc.in index 44ce956afd..a8eed74179 100644 --- a/gtk2_ardour/clearlooks.rc.in +++ b/gtk2_ardour/clearlooks.rc.in @@ -758,6 +758,21 @@ style "audio_track_base" = "default" bg[SELECTED] = @background } +style "control_master_base" = "default" +{ + font_name = " 8" + # NORMAL is used for single-data type labels, or Audio + # ACTIVE is used for MIDI in the presence of multiple data type + fg[NORMAL] = @foreground + fg[ACTIVE] = darker(@foreground) + + bg[NORMAL] = @control_master + bg[ACTIVE] = @background + bg[PRELIGHT] = @background + bg[INSENSITIVE] = @background + bg[SELECTED] = @background +} + style "midi_track_base" = "default" { font_name = " 8" @@ -1110,6 +1125,7 @@ widget "*AudioMidiTrackMetricsInactive" style:highest "midi_track_metrics_inacti widget "*TimeAxisViewControlsBaseUnselected" style:highest "audio_track_base" widget "*AudioTrackControlsBaseUnselected" style:highest "audio_track_base" widget "*MidiTrackControlsBaseUnselected" style:highest "midi_track_base" +widget "*ControlMasterBaseUnselected" style:highest "control_master_base" widget "*SendUIFader" style:highest "plugin_slider" widget "*ReturnUIFader" style:highest "plugin_slider" diff --git a/gtk2_ardour/themes/blueberry-milk-ardour.colors b/gtk2_ardour/themes/blueberry-milk-ardour.colors index 0498e543bc..af542ef9bf 100755 --- a/gtk2_ardour/themes/blueberry-milk-ardour.colors +++ b/gtk2_ardour/themes/blueberry-milk-ardour.colors @@ -182,7 +182,7 @@ <ColorAlias name="gtk_bright_color" alias="color 74"/> <ColorAlias name="gtk_bright_indicator" alias="color 9"/> <ColorAlias name="gtk_contrasting_indicator" alias="color 91"/> - <ColorAlias name="gtk_control_base" alias="color 61"/> + <ColorAlias name="gtk_control_master" alias="color 64"/> <ColorAlias name="gtk_control_text" alias="color 29"/> <ColorAlias name="gtk_control_text2" alias="color 83"/> <ColorAlias name="gtk_darkest" alias="color 81"/> diff --git a/gtk2_ardour/themes/caineville-ardour.colors b/gtk2_ardour/themes/caineville-ardour.colors index 6bc96eef12..b80b1dcc1e 100755 --- a/gtk2_ardour/themes/caineville-ardour.colors +++ b/gtk2_ardour/themes/caineville-ardour.colors @@ -182,7 +182,7 @@ <ColorAlias name="gtk_bright_color" alias="color 74"/> <ColorAlias name="gtk_bright_indicator" alias="color 9"/> <ColorAlias name="gtk_contrasting_indicator" alias="color 91"/> - <ColorAlias name="gtk_control_base" alias="color 104"/> + <ColorAlias name="gtk_control_master" alias="color 64"/> <ColorAlias name="gtk_control_text" alias="color 26"/> <ColorAlias name="gtk_control_text2" alias="color 83"/> <ColorAlias name="gtk_darkest" alias="color 67"/> diff --git a/gtk2_ardour/themes/cubasish-ardour.colors b/gtk2_ardour/themes/cubasish-ardour.colors index 49bbb0370f..2e33bbdcb1 100755 --- a/gtk2_ardour/themes/cubasish-ardour.colors +++ b/gtk2_ardour/themes/cubasish-ardour.colors @@ -182,7 +182,7 @@ <ColorAlias name="gtk_bright_color" alias="color 74"/> <ColorAlias name="gtk_bright_indicator" alias="color 9"/> <ColorAlias name="gtk_contrasting_indicator" alias="color 91"/> - <ColorAlias name="gtk_control_base" alias="color 104"/> + <ColorAlias name="gtk_control_master" alias="color 64"/> <ColorAlias name="gtk_control_text" alias="color 26"/> <ColorAlias name="gtk_control_text2" alias="color 83"/> <ColorAlias name="gtk_darkest" alias="color 67"/> diff --git a/gtk2_ardour/themes/dark-ardour.colors b/gtk2_ardour/themes/dark-ardour.colors index 814613b99b..ed37a8fb42 100644 --- a/gtk2_ardour/themes/dark-ardour.colors +++ b/gtk2_ardour/themes/dark-ardour.colors @@ -174,6 +174,7 @@ <ColorAlias name="gtk_arm" alias="color 9"/> <ColorAlias name="gtk_audio_bus" alias="color 61"/> <ColorAlias name="gtk_audio_track" alias="color 70"/> + <ColorAlias name="gtk_control_master" alias="color 64"/> <ColorAlias name="gtk_automation_track_header" alias="color 42"/> <ColorAlias name="gtk_background" alias="color 34"/> <ColorAlias name="gtk_bases" alias="color 27"/> @@ -183,7 +184,6 @@ <ColorAlias name="gtk_bright_color" alias="color 74"/> <ColorAlias name="gtk_bright_indicator" alias="color 9"/> <ColorAlias name="gtk_contrasting_indicator" alias="color 91"/> - <ColorAlias name="gtk_control_base" alias="color 61"/> <ColorAlias name="gtk_control_text" alias="color 26"/> <ColorAlias name="gtk_control_text2" alias="color 83"/> <ColorAlias name="gtk_darkest" alias="color 67"/> diff --git a/gtk2_ardour/themes/unastudia-ardour.colors b/gtk2_ardour/themes/unastudia-ardour.colors index ab222eed7a..fd0c1484eb 100644 --- a/gtk2_ardour/themes/unastudia-ardour.colors +++ b/gtk2_ardour/themes/unastudia-ardour.colors @@ -187,7 +187,7 @@ <ColorAlias name="gtk_bright_color" alias="color 74"/> <ColorAlias name="gtk_bright_indicator" alias="color 1"/> <ColorAlias name="gtk_contrasting_indicator" alias="color 91"/> - <ColorAlias name="gtk_control_base" alias="color 104"/> + <ColorAlias name="gtk_control_master" alias="color 64"/> <ColorAlias name="gtk_control_text" alias="color 26"/> <ColorAlias name="gtk_control_text2" alias="color 83"/> <ColorAlias name="gtk_darkest" alias="color 67"/> diff --git a/gtk2_ardour/vca_master_strip.cc b/gtk2_ardour/vca_master_strip.cc index ad4bd5c589..da3a3503f7 100644 --- a/gtk2_ardour/vca_master_strip.cc +++ b/gtk2_ardour/vca_master_strip.cc @@ -510,4 +510,3 @@ VCAMasterStrip::stripable () const { return _vca; } - diff --git a/gtk2_ardour/vca_time_axis.cc b/gtk2_ardour/vca_time_axis.cc index becc14dce9..fbc57c5eaa 100644 --- a/gtk2_ardour/vca_time_axis.cc +++ b/gtk2_ardour/vca_time_axis.cc @@ -83,6 +83,9 @@ VCATimeAxisView::VCATimeAxisView (PublicEditor& ed, Session* s, ArdourCanvas::Ca spill_button.show (); gain_meter.get_gain_slider().show (); + controls_ebox.set_name ("ControlMasterBaseUnselected"); + time_axis_frame.set_name ("ControlMasterBaseUnselected"); + s->config.ParameterChanged.connect (*this, invalidator (*this), boost::bind (&VCATimeAxisView::parameter_changed, this, _1), gui_context()); Config->ParameterChanged.connect (*this, invalidator (*this), boost::bind (&VCATimeAxisView::parameter_changed, this, _1), gui_context()); UIConfiguration::instance().ParameterChanged.connect (sigc::mem_fun (*this, &VCATimeAxisView::parameter_changed)); |