summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gtk2_ardour/SConscript8
-rw-r--r--gtk2_ardour/ardour2_ui_dark.rc23
-rw-r--r--gtk2_ardour/ardour2_ui_light.rc24
3 files changed, 20 insertions, 35 deletions
diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript
index f2f6d498a3..061bfef56b 100644
--- a/gtk2_ardour/SConscript
+++ b/gtk2_ardour/SConscript
@@ -348,7 +348,7 @@ else:
my_font_dict['%FONT_ITALIC_MASSIVE%'] = 'sans italic 60'
ardour_dark_theme = env.SubstInFile ('ardour2_ui_dark.rc', 'ardour2_ui_dark.rc.in', SUBST_DICT = my_font_dict)
-ardour_light = env.SubstInFile ('ardour2_ui_light.rc', 'ardour2_ui_light.rc.in', SUBST_DICT = my_font_dict)
+ardour_light_theme = env.SubstInFile ('ardour2_ui_light.rc', 'ardour2_ui_light.rc.in', SUBST_DICT = my_font_dict)
my_subst_dict = { }
@@ -371,6 +371,8 @@ env.AddPostAction (ardourdev, Chmod ('$TARGET', 0755))
Default(ardourbindings)
Default(ardourdev)
Default(ardoursh)
+Default(ardour_dark_theme)
+Default(ardour_light_theme)
if env['VST']:
Default(ardourlib)
@@ -394,8 +396,8 @@ if env['NLS']:
i18n (gtkardour, gtkardour_files+skipped_files+fft_analysis_files, env)
# configuration files
-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour2_ui_dark.rc'))
-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour2_ui_light.rc'))
+env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), ardour_dark_theme))
+env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), ardour_light_theme))
env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour2_ui_default.conf'))
env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour.menus'))
env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour.bindings'))
diff --git a/gtk2_ardour/ardour2_ui_dark.rc b/gtk2_ardour/ardour2_ui_dark.rc
index c84ec1d231..eb920d7180 100644
--- a/gtk2_ardour/ardour2_ui_dark.rc
+++ b/gtk2_ardour/ardour2_ui_dark.rc
@@ -1,7 +1,6 @@
#
# This is the GTK style file for Ardour
#
-#
style "very_small_text"
{
@@ -35,7 +34,6 @@ style "red_medium_text" = "medium_text"
fg[SELECTED] = { 1.0, 0, 0 }
}
-
style "large_text"
{
font_name = "sans 18"
@@ -48,7 +46,7 @@ style "larger_bold_text"
style "plugin_name_text"
{
- font_name = "sans bold 25"
+ font_name = "sans bold 24"
fg[NORMAL] = { 0.80, 0.80, 0.80 }
}
@@ -65,7 +63,7 @@ style "automation_track_name"
style "first_action_message"
{
- font_name = "sans medium 34"
+ font_name = "sans 34"
}
style "verbose_canvas_cursor"
@@ -667,11 +665,6 @@ style "transport_clock_display_delta" = "transport_clock_display"
fg[NORMAL] = { 0.30, 0.30, 1.0 }
}
-style "transport_clock_display_delta" = "transport_clock_display"
-{
- fg[NORMAL] = { 0.30, 0.30, 1.0 }
-}
-
style "tempo_meter_clock_display"
{
font_name = "sans 7"
@@ -742,7 +735,7 @@ style "midi_track_base" = "default_base"
style "track_name_display"
{
- font_name = "sans medium 8"
+ font_name = "sans 8"
fg[NORMAL] = { 0.80, 0.80, 0.80 }
fg[ACTIVE] = { 0.80, 0.80, 0.80 }
@@ -754,7 +747,7 @@ style "track_name_display"
style "active_track_name_display"
{
- font_name = "sans medium 8"
+ font_name = "sans 8"
text[NORMAL] = { 0.26, 0.26, 0.26 }
base[NORMAL] = { 0.89, 0.89, 0.89 }
}
@@ -861,7 +854,7 @@ style "track_controls_inactive"
bg[SELECTED] = { 0.60, 0.60, 0.66 }
bg[PRELIGHT] = { 0.60, 0.60, 0.66 }
- font_name = "sans medium 10"
+ font_name = "sans 18"
fg[NORMAL] = { 0.7, 0.8, 0.2 }
}
@@ -886,7 +879,7 @@ style "automation_track_controls_base"
# Plugin Editors
style "plugin_slider"
{
- font_name ="sans bold 10"
+ font_name ="sans bold 12"
# the slider itself. the inactive part is INSENSITIVE,
# the active part is something else.
@@ -1113,7 +1106,7 @@ style "meter_metrics_strip" = "default_base"
style "location_row_button" = "default_buttons_menus"
{
- font_name = "sans 10"
+ font_name = "sans 12"
}
style "location_rows_clock" = "default_clock_display"
@@ -1528,6 +1521,4 @@ widget "*ChannelCountSelector" style:highest "medium_bold_entry"
widget "*ChannelCountSelector.GtkArrow" style:highest "default_buttons_menus"
widget "*RegionListWholeFile" style:highest "treeview_parent_node"
widget "*EditorHScrollbar" style:highest "editor_hscrollbar"
-widget "*TransportClockDisplayDelta" style:highest "transport_clock_display_delta"
-widget "*SecondaryClockDisplayDelta" style:highest "transport_clock_display_delta"
diff --git a/gtk2_ardour/ardour2_ui_light.rc b/gtk2_ardour/ardour2_ui_light.rc
index 7a9ee5d855..176dd3cf7f 100644
--- a/gtk2_ardour/ardour2_ui_light.rc
+++ b/gtk2_ardour/ardour2_ui_light.rc
@@ -1,7 +1,6 @@
#
# This is the GTK style file for Ardour
#
-#
style "very_small_text"
{
@@ -48,7 +47,7 @@ style "larger_bold_text"
style "plugin_name_text"
{
- font_name = "sans bold 25"
+ font_name = "sans bold 24"
fg[NORMAL] = { 0.80, 0.80, 0.80 }
}
@@ -65,7 +64,7 @@ style "automation_track_name"
style "first_action_message"
{
- font_name = "sans medium 34"
+ font_name = "sans 34"
}
style "verbose_canvas_cursor"
@@ -80,7 +79,7 @@ style "marker_text"
style "time_axis_view_item_name"
{
- font_name = "sans 9"
+ font_name = "sans 6"
}
style "default_base" = "medium_text"
@@ -671,11 +670,6 @@ style "transport_clock_display_delta" = "transport_clock_display"
fg[NORMAL] = { 0.30, 0.30, 1.0 }
}
-style "transport_clock_display_delta" = "transport_clock_display"
-{
- fg[NORMAL] = { 0.30, 0.30, 1.0 }
-}
-
style "tempo_meter_clock_display"
{
font_name = "sans 7"
@@ -745,7 +739,7 @@ style "midi_track_base" = "default_base"
style "track_name_display"
{
- font_name = "sans medium 8"
+ font_name = "sans 8"
fg[NORMAL] = { 0.80, 0.80, 0.80 }
fg[ACTIVE] = { 0.80, 0.80, 0.80 }
@@ -757,7 +751,7 @@ style "track_name_display"
style "active_track_name_display"
{
- font_name = "sans medium 8"
+ font_name = "sans 8"
text[NORMAL] = { 0.26, 0.26, 0.26 }
base[NORMAL] = { 0.89, 0.89, 0.89 }
}
@@ -864,7 +858,7 @@ style "track_controls_inactive"
bg[SELECTED] = { 0.60, 0.60, 0.66 }
bg[PRELIGHT] = { 0.60, 0.60, 0.66 }
- font_name = "sans medium 10"
+ font_name = "sans 18"
fg[NORMAL] = { 0.7, 0.8, 0.2 }
}
@@ -889,7 +883,7 @@ style "automation_track_controls_base"
# Plugin Editors
style "plugin_slider"
{
- font_name ="sans bold 10"
+ font_name ="sans bold 12"
# the slider itself. the inactive part is INSENSITIVE,
# the active part is something else.
@@ -1116,7 +1110,7 @@ style "meter_metrics_strip" = "default_base"
style "location_row_button" = "default_buttons_menus"
{
- font_name = "sans 10"
+ font_name = "sans 12"
}
style "location_rows_clock" = "default_clock_display"
@@ -1527,6 +1521,4 @@ widget "*ChannelCountSelector" style:highest "medium_bold_entry"
widget "*ChannelCountSelector.GtkArrow" style:highest "default_buttons_menus"
widget "*RegionListWholeFile" style:highest "treeview_parent_node"
widget "*EditorHScrollbar" style:highest "editor_hscrollbar"
-widget "*TransportClockDisplayDelta" style:highest "transport_clock_display_delta"
-widget "*SecondaryClockDisplayDelta" style:highest "transport_clock_display_delta"
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-28 20:57:01 +0000