X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour3_ui_light.rc.in;h=035fbb2dd454eee3504d170de30d8ad4759983d0;hb=33e58df92c0b6731bdabe96f67bebad665c5d8da;hp=5a5ab6cc3ffff4e564cd9cf55692aac285894dd9;hpb=8aa9508c82f32efcf9c7c00e2c9e76268d4dddce;p=ardour.git

diff --git a/gtk2_ardour/ardour3_ui_light.rc.in b/gtk2_ardour/ardour3_ui_light.rc.in
index 5a5ab6cc3f..035fbb2dd4 100644
--- a/gtk2_ardour/ardour3_ui_light.rc.in
+++ b/gtk2_ardour/ardour3_ui_light.rc.in
@@ -4,27 +4,27 @@
 
 style "very_small_text"
 {
- 	font_name = "%FONT_SMALLER%"
+ 	font_name = "@FONT_SMALLER@"
 }
 
 style "small_text"
 {
- 	font_name = "%FONT_SMALL%"
+ 	font_name = "@FONT_SMALL@"
 }
 
 style "small_bold_text"
 {
- 	font_name = "%FONT_BOLD_SMALL%"
+ 	font_name = "@FONT_BOLD_SMALL@"
 }
 
 style "medium_bold_text"
 {
- 	font_name = "%FONT_BOLD_NORMAL%"
+ 	font_name = "@FONT_BOLD_NORMAL@"
 }
 
 style "medium_text"
 {
- 	font_name = "%FONT_NORMAL%"
+ 	font_name = "@FONT_NORMAL@"
 }
 
 style "red_medium_text" = "medium_text"
@@ -37,49 +37,49 @@ style "red_medium_text" = "medium_text"
 
 style "large_text"
 {
- 	font_name = "%FONT_LARGE%"
+ 	font_name = "@FONT_LARGE@"
 }
 
 style "larger_bold_text"
 {
- 	font_name = "%FONT_BOLD_BIGGER%"
+ 	font_name = "@FONT_BOLD_BIGGER@"
 }
 
 style "plugin_name_text"
 {
-	font_name = "%FONT_BOLD_LARGER%"
+	font_name = "@FONT_BOLD_LARGER@"
 	fg[NORMAL] = { 0.80, 0.80, 0.80 }
 }
 
 style "plugin_maker_text"
 {
-	font_name = "%FONT_BOLD_BIGGER%"
+	font_name = "@FONT_BOLD_BIGGER@"
 	fg[NORMAL] = { 0.80, 0.80, 0.80 }
 }
 
 style "automation_track_name"
 {
-	font_name = "%FONT_ITALIC_NORMAL%"
+	font_name = "@FONT_ITALIC_NORMAL@"
 }
 
 style "first_action_message" 
 {
-	font_name = "%FONT_HUGER%"
+	font_name = "@FONT_HUGER@"
 }
 
 style "verbose_canvas_cursor"
 {
-	font_name = "%FONT_BOLD_LARGER%"
+	font_name = "@FONT_BOLD_LARGER@"
 }
 
 style "marker_text" 
 {
-	font_name = "%FONT_NORMAL%"
+	font_name = "@FONT_NORMAL@"
 }
 
 style "time_axis_view_item_name"
 {
-	font_name = "%FONT_SMALLER%"
+	font_name = "@FONT_SMALLER@"
 }
 
 style "default_base" = "medium_text"
@@ -143,14 +143,14 @@ style "transport_base" = "medium_bold_text"
 /*
 style "black_mackie_menu_bar"
 {
-  font_name = "%FONT_BOLD_NORMAL%"
+  font_name = "@FONT_BOLD_NORMAL@"
   fg[NORMAL] = { 1.0, 1.0, 1.0 }
   bg[NORMAL] = { 0, 0, 0 }
 }
 */
 style "default_button" 
 {
-  font_name = "%FONT_SMALL%"
+  font_name = "@FONT_SMALL@"
   fg[ACTIVE] = { 1.0, 1.0, 1.0 }
   
   bg[NORMAL] = { 0.80, 0.80, 0.80 }
@@ -162,7 +162,7 @@ style "default_button"
 
 style "default_menu" 
 {
-  font_name = "%FONT_NORMAL%"
+  font_name = "@FONT_NORMAL@"
   fg[ACTIVE] = { 1.0, 1.0, 1.0 }
   
   bg[NORMAL] = { 0.80, 0.80, 0.80 }
@@ -174,7 +174,7 @@ style "default_menu"
 
 style "default_generic" 
 {
-  font_name = "%FONT_NORMAL%"
+  font_name = "@FONT_NORMAL@"
   fg[ACTIVE] = { 1.0, 1.0, 1.0 }
   
   bg[NORMAL] = { 0.80, 0.80, 0.80 }
@@ -186,7 +186,7 @@ style "default_generic"
 
 style "very_small_button" = "default_button"
 {
-	font_name = "%FONT_SMALLER%"
+	font_name = "@FONT_SMALLER@"
 	ythickness = 0
 	xthickness = 0
 }
@@ -247,21 +247,21 @@ style "track_rec_enable_button_alternate" = "small_button"
 
 style "mixer_track_rec_enable_button" = "track_rec_enable_button"
 {
-	font_name = "%FONT_SMALLER%"
+	font_name = "@FONT_SMALLER@"
 	xthickness = 0
 	ythickness = 0
 }
 
 style "mixer_track_rec_enable_button_alternate" = "track_rec_enable_button_alternate"
 {
-	font_name = "%FONT_SMALLER%"
+	font_name = "@FONT_SMALLER@"
 	xthickness = 0
 	ythickness = 0
 }
 
 style "mixer_track_rec_enable_button_active" = "track_rec_enable_button_active"
 {
-	font_name = "%FONT_SMALLER%"
+	font_name = "@FONT_SMALLER@"
 	xthickness = 0
 	ythickness = 0
 }
@@ -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"
 {
@@ -299,25 +315,56 @@ style "solo_button_active" = "small_button"
 
 style "mixer_solo_button" = "solo_button"
 {
-	font_name = "%FONT_SMALLER%"
+	font_name = "@FONT_SMALLER@"
 	xthickness = 0
 	ythickness = 0
 }
 
 style "mixer_solo_button_alternate" = "solo_button_alternate"
 {
-	font_name = "%FONT_SMALLER%"
+	font_name = "@FONT_SMALLER@"
 	xthickness = 0
 	ythickness = 0
 }
 style "mixer_solo_button_active" = "solo_button_active"
 {
-	font_name = "%FONT_SMALLER%"
+	font_name = "@FONT_SMALLER@"
 	xthickness = 0
 	ythickness = 0
 }
 
 
+style "monitor_opt_button" = "small_button"
+{
+	font_name = "@FONT_SMALLER@"
+	bg[ACTIVE] = { 1.0, 0.749, 0.247 }
+	fg[ACTIVE] = { 0, 0, 0 }
+}
+
+style "monitor_mono_button" = "small_button"
+{
+	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 }
+}
+
 style "mute_button" = "small_button"
 {
 }
@@ -350,28 +397,28 @@ style "mute_button_active" = "small_button"
 
 style "mixer_mute_button_alternate" = "mute_button_alternate"
 {
-	font_name = "%FONT_SMALLER%"
+	font_name = "@FONT_SMALLER@"
 	xthickness = 0
 	ythickness = 0
 }
 
 style "mixer_mute_button_active" = "mute_button_active"
 {
-	font_name = "%FONT_SMALLER%"
+	font_name = "@FONT_SMALLER@"
 	xthickness = 0
 	ythickness = 0
 }
 
 style "multiline_combo" = "small_button"
 {
-	font_name = "%FONT_NORMAL%"
+	font_name = "@FONT_NORMAL@"
 	xthickness = 0
 	ythickness = 0
 }
 
 style "mixer_mute_button" = "mute_button"
 {
-	font_name = "%FONT_SMALLER%"
+	font_name = "@FONT_SMALLER@"
 	xthickness = 0
 	ythickness = 0
 }
@@ -394,7 +441,7 @@ style "mixer_red_active_button" = "very_small_button"
 
 style "time_button" = "default_button"
 {
-	font_name = "%FONT_SMALL%"
+	font_name = "@FONT_SMALL@"
 }
 
 style "transport_button"
@@ -476,7 +523,7 @@ style "ardour_progressbars" = "default_generic"
 
 style "preferences"  = "default_base"
 {
-	font_name = "%FONT_NORMAL%"
+	font_name = "@FONT_NORMAL@"
 	fg[PRELIGHT] = { 0.80, 0.80, 0.80 }
 }
 
@@ -503,7 +550,7 @@ style "red_when_active" = "medium_text"
 
 style "xrun_warn"  
 {
-	font_name = "%FONT_BOLD_LARGE%"
+	font_name = "@FONT_BOLD_LARGE@"
 
 	fg[NORMAL] = { 1.0, 1.0, 1.0 }
 	fg[ACTIVE] = { 1.0, 1.0, 1.0 }
@@ -647,7 +694,7 @@ style "small_red_on_black_entry"  = "small_bold_text"
 
 style "non_recording_big_clock_display" = "medium_entry"
 {
-	font_name = "%FONT_MASSIVE%"
+	font_name = "@FONT_MASSIVE@"
 
 	fg[NORMAL] = { 0.50, 1.0, 0.50 }
 	fg[ACTIVE] = { 1.0, 0, 0.0 }
@@ -668,7 +715,7 @@ style "recording_big_clock_display" = "non_recording_big_clock_display"
 
 style "transport_clock_display"
 {
-	font_name = "%FONT_BOLD_BIGGER%"
+	font_name = "@FONT_BOLD_BIGGER@"
 	
 	fg[NORMAL] = { 0.50, 1.0, 0.50 }
 	fg[ACTIVE] = { 1.0, 0, 0.0 }
@@ -689,7 +736,7 @@ style "transport_clock_display_delta" = "transport_clock_display"
 
 style "tempo_meter_clock_display"
 {
-	font_name = "%FONT_SMALLER%"
+	font_name = "@FONT_SMALLER@"
 	fg[NORMAL] = { 1.0, 1.0, 1.0 }
 	fg[ACTIVE] = { 1.0, 1.0, 0.0 }
 	fg[SELECTED] = { 1.0, 0, 0 }
@@ -718,14 +765,14 @@ style "editor_time_ruler" = "small_text"
 
 style "audio_bus_base"
 {
-  font_name = "%FONT_SMALLER%"
+  font_name = "@FONT_SMALLER@"
   fg[NORMAL] = { 0, 0, 0 }	
   bg[NORMAL] = { 0.65, 0.65, 0.65 }	
 }
 
 style "audio_track_base" = "default_base"
 {
-  font_name = "%FONT_SMALLER%"
+  font_name = "@FONT_SMALLER@"
   fg[NORMAL] = { 0.30, 0.30, 0.35 }	
   bg[NORMAL] = { 0.70, 0.70, 0.70 }
   bg[ACTIVE] = { 0.80, 0.80, 0.80 }	
@@ -734,18 +781,9 @@ style "audio_track_base" = "default_base"
   bg[SELECTED] = { 0.80, 0.80, 0.80 }
 }
 
-style "midi_bus_base"
-{
-  font_name = "%FONT_SMALLER%"
-  fg[NORMAL] = { 0.77, 0.77, 0.72 }	
-  fg[NORMAL] = { 0.7, 0.8, 0.2 }	
-  #bg[NORMAL] = {0, 0.36, 0.40 }
-  bg[NORMAL] = "#444466"	
-}
-
 style "midi_track_base" = "default_base"
 {
-  font_name = "%FONT_SMALLER%"
+  font_name = "@FONT_SMALLER@"
   fg[NORMAL] = { 0.77, 0.77, 0.72 }	
   bg[NORMAL] = { 0.48, 0.30, 0.32 }
   bg[ACTIVE] = { 0.70, 0.70, 0.80 }	
@@ -768,27 +806,27 @@ style "track_controls_inactive"
 
 style "audio_track_metrics" = "audio_track_base"
 {
-	font_name = "%FONT_TINY%"
+	font_name = "@FONT_TINY@"
 }
 
 style "audio_bus_metrics" = "audio_bus_base"
 {
-	font_name = "%FONT_TINY%"
+	font_name = "@FONT_TINY@"
 }
 
 style "audio_track_metrics_inactive" = "track_controls_inactive"
 {
-	font_name = "%FONT_TINY%"
+	font_name = "@FONT_TINY@"
 }
 
 style "audio_bus_metrics_inactive" = "track_controls_inactive"
 {
-	font_name = "%FONT_TINY%"
+	font_name = "@FONT_TINY@"
 }
 
 style "track_name_display"
 {
-	font_name = "%FONT_NORMAL%"
+	font_name = "@FONT_NORMAL@"
 	fg[NORMAL] = { 0.80, 0.80, 0.80 }
 	fg[ACTIVE] = { 0.80, 0.80, 0.80 }
 
@@ -800,7 +838,7 @@ style "track_name_display"
 
 style "active_track_name_display"
 {
-	font_name = "%FONT_NORMAL%"
+	font_name = "@FONT_NORMAL@"
 	text[NORMAL] = { 0.26, 0.26, 0.26 }
 	base[NORMAL] = { 0.89, 0.89, 0.89 }
 }
@@ -907,7 +945,7 @@ style "track_controls_inactive"
 	bg[SELECTED] =    { 0.60, 0.60, 0.66 }
 	bg[PRELIGHT] =    { 0.60, 0.60, 0.66 }
 
-	font_name = "%FONT_LARGE%"
+	font_name = "@FONT_LARGE@"
 	fg[NORMAL] = { 0.7, 0.8, 0.2 }	
 }
 
@@ -932,7 +970,7 @@ style "automation_track_controls_base"
 # Plugin Editors
 style "plugin_slider" 
 {
-	font_name ="%FONT_BOLD_BIG%"
+	font_name ="@FONT_BOLD_BIG@"
 
 	# the slider itself. the inactive part is INSENSITIVE,
 	# the active part is something else.
@@ -988,7 +1026,7 @@ style "redirect_list_display"
 	GtkTreeView::horizontal-separator = 0
 	GtkTreeView::vertical-separator = 0
 
-	font_name = "%FONT_SMALL%"
+	font_name = "@FONT_SMALL@"
 	text[NORMAL] = { 0.80, 0.80, 0.80 }
  	text[ACTIVE] = { 0.70, 0.70, 0.70 }
  	text[INSENSITIVE] = { 0, 0, 0 }
@@ -1140,7 +1178,7 @@ style "io_selector_port_list" = "medium_text"
 style "io_selector_notebook" = "default_base"
 {
 	fg[NORMAL] = { 1.0, 1.0, 1.0 }
-        font_name ="%FONT_BOLD_NORMAL%"
+        font_name ="@FONT_BOLD_NORMAL@"
 }
 
 style "tearoff_arrow" = "medium_bold_entry"
@@ -1153,17 +1191,17 @@ style "tearoff_arrow" = "medium_bold_entry"
 
 style "location_row_button" = "default_button"
 {
-	font_name = "%FONT_SMALL%"
+	font_name = "@FONT_SMALL@"
 }
 
 style "location_rows_clock" = "default_clock_display"
 {
-	font_name = "%FONT_BIG%"
+	font_name = "@FONT_BIG@"
 }
 
 style "pan_slider" 
 {
- 	font_name = "%FONT_NORMAL%"
+ 	font_name = "@FONT_NORMAL@"
 
 	fg[NORMAL] = { 0.22, 0.73, 0.22 }
 	fg[ACTIVE] = { 0.22, 0.73, 0.22 }
@@ -1199,6 +1237,21 @@ style "ardour_button" ="default_button"
 	ythickness = 1
 }
 
+style "padded_button" = "default_button"
+{
+	xthickness = 8
+}
+
+style "odd_port_groups"
+{
+	fg[NORMAL] = { 0.6, 0.6, 0.6 }
+}
+
+style "even_port_groups"
+{
+	fg[NORMAL] = { 0.3, 0.3, 0.3 }
+}
+
 #---------------------------------------------------------------
 
 class "GtkWidget" style:highest "default_base"
@@ -1208,6 +1261,7 @@ class "GtkButton" style:highest "ardour_button"
 class "GtkArrow" style:highest "tearoff_arrow"
 class "GtkProgressBar" style:highest "ardour_progressbars"
 
+widget "*PaddedButton" style:highest "padded_button"
 widget "*FirstActionMessage" style:highest "first_action_message"
 widget "*VerboseCanvasCursor" style:highest "verbose_canvas_cursor"
 widget "*MarkerText" style:highest "marker_text"
@@ -1282,6 +1336,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"
@@ -1303,6 +1358,7 @@ widget "*MixerGroupButton" style:highest "very_small_button"
 widget "*MixerGroupButtonLabel" style:highest "very_small_button"
 widget "*MixerCommentButton" style:highest "very_small_button"
 widget "*MixerCommentButton*" style:highest "very_small_button"
+widget "*MixerMonoButton*" style:highest "very_small_button"
 widget "*EditGroupButton" style:highest "very_small_button"
 widget "*EditGroupButtonLabel" style:highest "very_small_button"
 widget "*TransportButton" style:highest "transport_rec_button"
@@ -1321,7 +1377,7 @@ widget "*TransportRecButton-alternate*" style:highest "transport_rec_button_alte
 widget "*TransportRecButton*" style:highest "transport_rec_button"
 widget "*RecordingXrunWarningWindow" style:highest "xrun_warn"
 widget "*RecordingXrunWarningWindow*" style:highest "xrun_warn"
-/*widget "*MainMenuBar" style:highest "menu_bar_base"*/
+#widget "*MainMenuBar" style:highest "menu_bar_base"
 widget "*ErrorMessage" style:highest "error_message"
 widget "*FatalMessage" style:highest "fatal_message"
 widget "*InfoMessage" style:highest "info_message"
@@ -1422,9 +1478,8 @@ widget "*MidiTrackControlsBaseSelected" style:highest "edit_controls_base_select
 widget "*BusControlsBaseSelected" style:highest "edit_controls_base_selected"
 widget "*AutomationTrackControlsBase" style:highest "automation_track_controls_base"
 widget "*AutomationTrackControlsBaseSelected" style:highest "edit_controls_base_selected"
-/*widget "*EditorMenuBar*" style:highest "black_mackie_menu_bar"
-widget "*MainMenuBar*" style:highest "black_mackie_menu_bar"
-*/
+#widget "*EditorMenuBar*" style:highest "black_mackie_menu_bar"
+#widget "*MainMenuBar*" style:highest "black_mackie_menu_bar"
 widget "*ZoomClickBox" style:highest "medium_bold_entry"
 widget "*PluginParameterLabel" style:highest "medium_text"
 widget "*PluginNameInfo" style:highest "plugin_name_text"
@@ -1470,6 +1525,18 @@ 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 "*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 "*MonitorOptButton" style:highest "monitor_opt_button"
+widget "*MonitorOptButton*" style:highest "monitor_opt_button"
 widget "*BypassButton" style:highest "red_when_active"
 widget "*BypassButton*" style:highest "red_when_active"
 widget "*TransportSoloAlert" style:highest "flashing_alert"
@@ -1575,4 +1642,5 @@ widget "*ChannelCountSelector" style:highest "medium_bold_entry"
 widget "*ChannelCountSelector.GtkArrow" style:highest "default_generic"
 widget "*RegionListWholeFile" style:highest "treeview_parent_node"
 widget "*EditorHScrollbar" style:highest "editor_hscrollbar"
-
+widget "*OddPortGroups" style:highest "odd_port_groups"
+widget "*EvenPortGroups" style:highest "even_port_groups"