Merge branch 'master' into cairocanvas

[ardour.git] / gtk2_ardour / ardour3_widget_list.rc

diff --git a/gtk2_ardour/ardour3_widget_list.rc b/gtk2_ardour/ardour3_widget_list.rc
index 2abe10affe5bf3c625ecfd71a154a4f5bb352f17..0e7075cef4410de6894483816e0d4771d18e2cb8 100644 (file)
--- a/gtk2_ardour/ardour3_widget_list.rc
+++ b/gtk2_ardour/ardour3_widget_list.rc
@@ -74,7 +74,7 @@ widget "*MixerSoloButton-alternate2" style:highest "mixer_solo_button_alternate2
 widget "*MixerSoloButton-active" style:highest "mixer_solo_button_active"
 widget "*TrackLoopButton*" style:highest "track_loop_button"
 widget "*PanAutomationLineSelector*" style:highest "multiline_combo"
-widget "*EditorTimeButton*" style:highest "time_button"
+widget "*EditorRulerLabel*" style:highest "ruler_label"
 widget "*MixerInvertButton*" style:highest "mixer_invert_button"
 widget "*MixerInvertButton.*" style:highest "mixer_invert_button"
 widget "*MixerAutomationRecordingButton*" style:highest "very_small_button"
@@ -120,12 +120,12 @@ widget "*InfoMessage" style:highest "info_message"
 widget "*WarningMessage" style:highest "warning_message"
 
 widget "*big clock" style:highest "monospace massive_text"
-widget "*selection clock" style:highest "small_text"
+widget "*selection clock" style:highest "small_mono_text"
 widget "*punch clock" style:highest "small_mono_text"
-widget "*transport clock" style:highest "large_bold_mono_text"
-widget "*secondary clock" style:highest "large_bold_mono_text"
-widget "*transport delta clock" style:highest "large_bold_mono_text"
-widget "*secondary delta clock" style:highest "large_bold_mono_text"
+widget "*transport clock" style:highest "bigger_mono_text"
+widget "*secondary clock" style:highest "bigger_mono_text"
+widget "*transport delta clock" style:highest "bigger_mono_text"
+widget "*secondary delta clock" style:highest "bigger_mono_text"
 widget "*silence duration clock" style:highest "medium_text"
 widget "*edit point clock" style:highest "medium_text"
 widget "*nudge clock" style:highest "small_mono_text"
@@ -169,9 +169,19 @@ widget "*FaderMetricsStrip" style:highest "audio_track_metrics"
 widget "*AudioTrackMetrics" style:highest "audio_track_metrics"
 widget "*MidiTrackMetrics" style:highest "midi_track_metrics"
 widget "*AudioBusMetrics" style:highest "audio_bus_metrics"
+widget "*AudioMidiTrackMetrics" style:highest "midi_track_metrics"
+widget "*AudioTrackMetricsLeft" style:highest "audio_track_metrics"
+widget "*MidiTrackMetricsLeft" style:highest "midi_track_metrics"
+widget "*AudioBusMetricsLeft" style:highest "audio_bus_metrics"
+widget "*AudioMidiTrackMetricsLeft" style:highest "midi_track_metrics"
+widget "*AudioTrackMetricsRight" style:highest "audio_track_metrics"
+widget "*MidiTrackMetricsRight" style:highest "midi_track_metrics"
+widget "*AudioBusMetricsRight" style:highest "audio_bus_metrics"
+widget "*AudioMidiTrackMetricsRight" style:highest "midi_track_metrics"
 widget "*AudioTrackMetricsInactive" style:highest "audio_track_metrics_inactive"
 widget "*MidiTrackMetricsInactive" style:highest "midi_track_metrics_inactive"
 widget "*AudioBusMetricsInactive" style:highest "audio_bus_metrics_inactive"
+widget "*AudioMidiTrackMetricsInactive" style:highest "midi_track_metrics_inactive"
 
 widget "*TimeAxisViewControlsBaseUnselected" style:highest "audio_track_base"
 widget "*AudioTrackControlsBaseUnselected" style:highest "audio_track_base"
@@ -280,6 +290,11 @@ widget "*PluginLoadButton" style:highest "small_button"
 widget "*PluginLoadButton*" style:highest "small_button"
 widget "*PluginEditorButton" style:highest "default_toggle_button"
 
+widget "*meterstripPPM" style:highest "meter_strip_ppm"
+widget "*meterstripDPM" style:highest "meter_strip_dpm"
+widget "*meterstripVU" style:highest "meter_strip_vu"
+widget "*BlackSeparator" style:highest "meter_strip_sep"
+
 widget "*MetricDialogFrame" style:highest "base_frame"
 widget "*MetricEntry" style:highest "medium_bold_entry"
 widget "*MetricButton" style:highest "default_button"
@@ -342,6 +357,7 @@ widget "*ProcessorList*" style:highest "processor_list"
 widget "*PortMatrixLabel*" style:highest "small_text"
 widget "*MidiTracerTextView" style:highest "midi_tracer_textview"
 widget "*solo isolate" style:highest "solo_isolate"
+widget "*meterbridge label" style:highest "meterbridge_label"
 widget "*solo safe" style:highest "solo_safe"
 widget "*ContrastingPopup" style:highest "contrasting_popup"
 widget "*ContrastingPopup*" style:highest "contrasting_popup"