From 8196734e3f73c0893ac878c53f29dac51ce80ca2 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 8 Nov 2024 17:14:33 -0700 Subject: [PATCH] change references to what was "very small text" to "smaller text"; This is more consistent with the naming of the font size for the canvas via wscript. Also, provide the new "very small" font size. Also, several styles defined in clearlooks.rc.in used spaces in font names or derived styles instead of underscores, this fixes that. --- gtk2_ardour/ardour2_ui_dark_sae.rc.in | 6 ++--- gtk2_ardour/ardour2_ui_light_sae.rc.in | 4 ++-- gtk2_ardour/canvas_vars.inc.h | 3 ++- gtk2_ardour/clearlooks.rc.in | 33 +++++++++++++++----------- gtk2_ardour/default_ui_config.in | 1 + gtk2_ardour/wscript | 2 ++ 6 files changed, 29 insertions(+), 20 deletions(-) diff --git a/gtk2_ardour/ardour2_ui_dark_sae.rc.in b/gtk2_ardour/ardour2_ui_dark_sae.rc.in index 64ec9120b6..cd5d080a90 100644 --- a/gtk2_ardour/ardour2_ui_dark_sae.rc.in +++ b/gtk2_ardour/ardour2_ui_dark_sae.rc.in @@ -2,7 +2,7 @@ # This is the GTK style file for Ardour # -style "very_small_text" +style "smaller_text" { font_name = "%FONT_SMALLER%" } @@ -431,7 +431,7 @@ style "transport_rec_button_alternate" bg[ACTIVE] = { 0.91, 0.68, 0.68 } } -style "shuttle_control" = "very_small_text" +style "shuttle_control" = "smaller_text" { fg[NORMAL] = { 0.85, 0.92, 0.98 } fg[ACTIVE] = { 0.85, 0.92, 0.98 } @@ -1060,7 +1060,7 @@ style "selected_strip_frame" bg[NORMAL] = { 0.79, 0.28, 0.18 } } -style "flashing_alert" = "very_small_text" +style "flashing_alert" = "smaller_text" { fg[NORMAL] = { 0.80, 0.80, 0.80 } bg[NORMAL] = { 0.26, 0.26, 0.31 } diff --git a/gtk2_ardour/ardour2_ui_light_sae.rc.in b/gtk2_ardour/ardour2_ui_light_sae.rc.in index 2cd6360fc4..91b4eeef6a 100644 --- a/gtk2_ardour/ardour2_ui_light_sae.rc.in +++ b/gtk2_ardour/ardour2_ui_light_sae.rc.in @@ -434,7 +434,7 @@ style "transport_rec_button_alternate" bg[ACTIVE] = { 0.91, 0.68, 0.68 } } -style "shuttle_control" = "very_small_text" +style "shuttle_control" = "smaller_text" { fg[NORMAL] = { 0.85, 0.92, 0.98 } fg[ACTIVE] = { 0.85, 0.92, 0.98 } @@ -1064,7 +1064,7 @@ style "selected_strip_frame" bg[NORMAL] = { 0.79, 0.28, 0.18 } } -style "flashing_alert" = "very_small_text" +style "flashing_alert" = "smaller_text" { fg[NORMAL] = { 0, 0, 0 } bg[NORMAL] = { 0.80, 0.80, 0.80 } diff --git a/gtk2_ardour/canvas_vars.inc.h b/gtk2_ardour/canvas_vars.inc.h index 51bb5ca4f4..98204e19cf 100644 --- a/gtk2_ardour/canvas_vars.inc.h +++ b/gtk2_ardour/canvas_vars.inc.h @@ -22,8 +22,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -CANVAS_FONT_VARIABLE(SmallFont, "small font") +CANVAS_FONT_VARIABLE(VerySmallFont, "very small font") CANVAS_FONT_VARIABLE(SmallerFont, "smaller font") +CANVAS_FONT_VARIABLE(SmallFont, "small font") CANVAS_FONT_VARIABLE(NormalFont, "normal font") CANVAS_FONT_VARIABLE(BigFont, "big font") CANVAS_FONT_VARIABLE(LargeFont, "large font") diff --git a/gtk2_ardour/clearlooks.rc.in b/gtk2_ardour/clearlooks.rc.in index c38f5b30a2..26637b0df4 100644 --- a/gtk2_ardour/clearlooks.rc.in +++ b/gtk2_ardour/clearlooks.rc.in @@ -290,7 +290,12 @@ style "status_bar_box" bg[NORMAL] = @background } -style "very_small_text" +style "smaller_text" +{ + font_name = "@FONTFAMILY@ @FONT_VERYSMALL@" +} + +style "smaller_text" { font_name = "@FONTFAMILY@ @FONT_SMALLER@" } @@ -386,7 +391,7 @@ style "verbose_canvas_cursor" = "big_bold_text" { } -style "marker_text" = "small text" +style "marker_text" = "small_text" { } @@ -400,7 +405,7 @@ style "midi_tracer_textview" = "medium_monospace_text" } -style "time_axis_view_item_name" = "very small text" +style "time_axis_view_item_name" = "smaller_text" { } @@ -409,7 +414,7 @@ style "midi_tracer_textview" = "medium_monospace_text" } -style "time_axis_view_item_name" = "very small text" +style "time_axis_view_item_name" = "smaller_text" { } style "contrasting_popup" = "medium_monospace_text" @@ -506,15 +511,15 @@ style "meterbridge_label" = "small_text" { } -style "midi_device" = "very_small_text" +style "midi_device" = "smaller_text" { } -style "solo_isolate" = "very_small_text" +style "solo_isolate" = "smaller_text" { } -style "solo_safe" = "very_small_text" +style "solo_safe" = "smaller_text" { } @@ -547,7 +552,7 @@ style "midi_channel_selector_button" fg[ACTIVE] = @light_text_on_dark } -style "shuttle_control" = "very_small_text" +style "shuttle_control" = "smaller_text" { fg[NORMAL] = @control_text2 fg[ACTIVE] = @control_text2 @@ -606,7 +611,7 @@ style "font_scale_slider" = "default" bg[NORMAL] = shade(1.4, @background) } -style "very_small_bright_when_active" = "very_small_text" +style "very_small_bright_when_active" = "smaller_text" { fg[NORMAL] = @foreground bg[NORMAL] = @background @@ -761,14 +766,14 @@ style "small_red_on_black_entry" = "small_bold_text" bg[ACTIVE] = @bases } -style "audio_bus_base" = "very_small_text" +style "audio_bus_base" = "smaller_text" { fg[NORMAL] = @foreground bg[NORMAL] = @audio_bus bg[ACTIVE] = @background } -style "foldback_bus_base" = "very_small_text" +style "foldback_bus_base" = "smaller_text" { fg[NORMAL] = @foreground bg[NORMAL] = @foldback_bg @@ -933,7 +938,7 @@ style "plugin_slider" text[PRELIGHT] = @texts } -style "processor_control_button" = "very_small_text" +style "processor_control_button" = "smaller_text" { } @@ -961,7 +966,7 @@ style "inspector_track_list_display" = "track_list_display" } -style "processor_list" = "very_small_text" +style "processor_list" = "smaller_text" { bg[NORMAL] = @bases bg[ACTIVE] = shade (1.8, @fg_selected) @@ -1002,7 +1007,7 @@ style "selected_strip_frame" bg[NORMAL] = darker(@bright_indicator) } -style "flashing_alert" = "very_small_text" +style "flashing_alert" = "smaller_text" { GtkButton::child-displacement-x = 0 GtkButton::child-displacement-y = 0 diff --git a/gtk2_ardour/default_ui_config.in b/gtk2_ardour/default_ui_config.in index 4fe9623b10..b296f86cfa 100644 --- a/gtk2_ardour/default_ui_config.in +++ b/gtk2_ardour/default_ui_config.in @@ -20,6 +20,7 @@