X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour3_ui_dark.rc.in;h=0abf0181d3483fcb0b372596f0fc92ccd69ef61c;hb=525da3281674a92ff00150098ef1be7a403555dd;hp=860f7f4a019abf7662108e5eb8d9abb7e8e0e4e6;hpb=837bfc9af44c5b6c1eeb14e7af8d9ec62c59aac6;p=ardour.git

diff --git a/gtk2_ardour/ardour3_ui_dark.rc.in b/gtk2_ardour/ardour3_ui_dark.rc.in
index 860f7f4a01..0abf0181d3 100644
--- a/gtk2_ardour/ardour3_ui_dark.rc.in
+++ b/gtk2_ardour/ardour3_ui_dark.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"
@@ -36,49 +36,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_SMALL%"
+	font_name = "@FONT_SMALL@"
 }
 
 style "time_axis_view_item_name"
 {
-	font_name = "%FONT_SMALLER%"
+	font_name = "@FONT_SMALLER@"
 }
 
 style "white_tree_view" 
@@ -109,18 +109,15 @@ style "white_tree_view"
   text[INSENSITIVE] = { 0.30, 0.30, 0.40 }
   text[SELECTED] = { 0, 0, 0 }
   
-  base[ACTIVE]     = { 0.80, 0.80, 0.80 }
-  base[NORMAL]      =  { 0.80, 0.80, 0.80 }
+  base[ACTIVE]       = { 0.80, 0.80, 0.80 }
+  base[NORMAL]       = { 0.80, 0.80, 0.80 }
   base[PRELIGHT]     = { 0.90, 0.90, 0.90 }
   base[INSENSITIVE]  = "#4c5159"
   base[SELECTED]     = { 0.60, 0.60, 0.80 }
 
   engine "clearlooks" 
   {
-    menubarstyle      = 0       # 0 = flat, 1 = sunken, 2 = flat gradient
-    menuitemstyle     = 0       # 0 = flat, 1 = 3d-ish (gradient), 2 = 3d-ish (button)
-    listviewitemstyle = 0       # 0 = flat, 1 = 3d-ish (gradient)
-    progressbarstyle  = 1       # 0 = candy bar, 1 = fancy candy bar, 2 = flat
+    menubarstyle = 0 # 0 = flat, 1 = sunken, 2 = flat gradient
   }
 }
 
@@ -185,7 +182,7 @@ 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 }
 }
@@ -193,7 +190,7 @@ style "black_mackie_menu_bar"
 
 style "default_button" 
 {
-  font_name = "%FONT_SMALL%"
+  font_name = "@FONT_SMALL@"
   fg[ACTIVE] = { 1.0, 1.0, 1.0 }
   
   bg[NORMAL] = { 0.33, 0.37, 0.42 }
@@ -206,7 +203,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.26, 0.30, 0.35 }
@@ -218,7 +215,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.26, 0.30, 0.35 }
@@ -230,7 +227,7 @@ style "default_generic"
 
 style "very_small_button" = "default_button"
 {
-	font_name = "%FONT_SMALLER%"
+	font_name = "@FONT_SMALLER@"
 	ythickness = 0
 	xthickness = 0
 }
@@ -291,21 +288,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
 }
@@ -343,20 +340,20 @@ 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
 }
@@ -393,28 +390,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
 }
@@ -437,7 +434,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"
@@ -519,7 +516,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 }
 }
 
@@ -546,7 +543,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 }
@@ -688,7 +685,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 }
@@ -709,7 +706,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 }
@@ -730,7 +727,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 }
@@ -759,7 +756,7 @@ style "editor_time_ruler" = "small_text"
 
 style "audio_bus_base"
 {
-  font_name = "%FONT_SMALLER%"
+  font_name = "@FONT_SMALLER@"
   fg[NORMAL] = { 0.77, 0.77, 0.72 }	
   fg[NORMAL] = { 0.7, 0.8, 0.2 }	
   bg[NORMAL] = "#363c45"
@@ -767,7 +764,7 @@ style "audio_bus_base"
 
 style "audio_track_base" = "default_base"
 {
-  font_name = "%FONT_SMALLER%"
+  font_name = "@FONT_SMALLER@"
   fg[NORMAL] = { 0.77, 0.77, 0.72 }	
   bg[NORMAL] = "#43546e"
   bg[ACTIVE] = { 0.20, 0.20, 0.20 }	
@@ -778,7 +775,7 @@ style "audio_track_base" = "default_base"
 
 style "midi_track_base" = "default_base"
 {
-  font_name = "%FONT_SMALLER%"
+  font_name = "@FONT_SMALLER@"
   fg[NORMAL] = { 0.77, 0.77, 0.72 }	
   bg[NORMAL] = "#546e43"
   bg[ACTIVE] = { 0.20, 0.20, 0.20 }	
@@ -801,27 +798,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 }
 
@@ -833,7 +830,7 @@ style "track_name_display"
 
 style "active_track_name_display"
 {
-	font_name = "%FONT_NORMAL%"
+	font_name = "@FONT_NORMAL@"
 	GtkWidget::cursor_color =  {0, 0, 0 }
 	text[NORMAL] = { 0.26, 0.26, 0.26 }
 	base[NORMAL] = { 0.89, 0.89, 0.89 }
@@ -946,7 +943,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 }	
 }
 
@@ -971,7 +968,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.
@@ -1027,7 +1024,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 }
@@ -1189,7 +1186,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"
@@ -1202,17 +1199,17 @@ style "tearoff_arrow" = "medium_bold_entry"
 
 style "location_row_button" = "default_button"
 {
-	font_name = "%FONT_BIG%"
+	font_name = "@FONT_BIG@"
 }
 
 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 }
@@ -1360,6 +1357,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"
@@ -1378,7 +1376,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"
@@ -1479,9 +1477,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"
@@ -1636,5 +1633,4 @@ 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"
-widget "*MidiListView" style:highest "white_tree_view"
-Widget "*MidiListView*" style:highest "white_tree_view"
+widget "*MidiListView*" style:highest "white_tree_view"