- data/oled/themes: remove some hardcoded paths

Signed-off-by: Thilo Graf <dbt@novatux.de>
2025-08-26 15:02:56 +02:00 · 2020-11-26 00:46:21 +01:00
parent 37fb4e4e4f
commit a25ae98227
12 changed files with 39 additions and 13 deletions
--- a/data/oled/themes/400x240/Default.otheme.in
+++ b/data/oled/themes/400x240/Default.otheme.in
@@ -9,7 +9,7 @@ glcd_background_color_red=0
 glcd_background_color_green=0
 glcd_background_color_blue=0
 glcd_background_image=
-glcd_font=/share/fonts/neutrino.ttf
+glcd_font=@FONTDIR@/neutrino.ttf
 glcd_channel_percent=25
 glcd_channel_align=2
 glcd_channel_x_position=0
--- a/data/oled/themes/400x240/Makefile.am
+++ b/data/oled/themes/400x240/Makefile.am
@@ -1,3 +1,6 @@
+EXTRA_DIST = \
+	Default.otheme Default.otheme.in
+
 oledthemesdir = $(THEMESDIR)/oled

 oledthemes_DATA = \
--- a/data/oled/themes/480x320/Advanced.otheme.in
+++ b/data/oled/themes/480x320/Advanced.otheme.in
@@ -8,8 +8,8 @@ glcd_foreground_color_blue=100
 glcd_background_color_red=0
 glcd_background_color_green=0
 glcd_background_color_blue=0
-glcd_background_image=/share/tuxbox/neutrino/icons/oled/advanced.png
-glcd_font=/share/fonts/neutrino.ttf
+glcd_background_image=@ICONSDIR@/oled/advanced.png
+glcd_font=@FONTDIR@/neutrino.ttf
 glcd_channel_percent=22
 glcd_channel_align=2
 glcd_channel_x_position=0
--- a/data/oled/themes/480x320/Default.otheme.in
+++ b/data/oled/themes/480x320/Default.otheme.in
@@ -9,7 +9,7 @@ glcd_background_color_red=0
 glcd_background_color_green=0
 glcd_background_color_blue=0
 glcd_background_image=
-glcd_font=/share/fonts/neutrino.ttf
+glcd_font=@FONTDIR@/neutrino.ttf
 glcd_channel_percent=25
 glcd_channel_align=2
 glcd_channel_x_position=0
--- a/data/oled/themes/480x320/Easy.otheme.in
+++ b/data/oled/themes/480x320/Easy.otheme.in
@@ -8,8 +8,8 @@ glcd_foreground_color_blue=100
 glcd_background_color_red=0
 glcd_background_color_green=0
 glcd_background_color_blue=0
-glcd_background_image=/share/tuxbox/neutrino/icons/oled/easy.png
-glcd_font=/share/fonts/neutrino.ttf
+glcd_background_image=@ICONSDIR@/oled/easy.png
+glcd_font=@FONTDIR@/neutrino.ttf
 glcd_channel_percent=22
 glcd_channel_align=2
 glcd_channel_x_position=0
--- a/data/oled/themes/480x320/Makefile.am
+++ b/data/oled/themes/480x320/Makefile.am
@@ -1,3 +1,11 @@
+EXTRA_DIST = \
+	Default.otheme Default.otheme.in \
+	Advanced.otheme Advanced.otheme.in \
+	Easy.otheme Easy.otheme.in \
+	Medium.otheme Medium.otheme.in \
+	Simple.otheme Simple.otheme.in \
+	Weather.otheme Weather.otheme.in
+
 oledthemesdir = $(THEMESDIR)/oled

 oledthemes_DATA = \
--- a/data/oled/themes/480x320/Medium.otheme.in
+++ b/data/oled/themes/480x320/Medium.otheme.in
@@ -8,8 +8,8 @@ glcd_foreground_color_blue=100
 glcd_background_color_red=0
 glcd_background_color_green=0
 glcd_background_color_blue=0
-glcd_background_image=/share/tuxbox/neutrino/icons/oled/medium.png
-glcd_font=/share/fonts/neutrino.ttf
+glcd_background_image=@ICONSDIR@/oled/medium.png
+glcd_font=@FONTDIR@/neutrino.ttf
 glcd_channel_percent=22
 glcd_channel_align=2
 glcd_channel_x_position=0
--- a/data/oled/themes/480x320/Simple.otheme.in
+++ b/data/oled/themes/480x320/Simple.otheme.in
@@ -8,8 +8,8 @@ glcd_foreground_color_blue=100
 glcd_background_color_red=0
 glcd_background_color_green=0
 glcd_background_color_blue=0
-glcd_background_image=/share/tuxbox/neutrino/icons/oled/simple.png
-glcd_font=/share/fonts/neutrino.ttf
+glcd_background_image=@ICONSDIR@/oled/simple.png
+glcd_font=@FONTDIR@/neutrino.ttf
 glcd_channel_percent=20
 glcd_channel_align=2
 glcd_channel_x_position=0
--- a/data/oled/themes/480x320/Weather.otheme.in
+++ b/data/oled/themes/480x320/Weather.otheme.in
@@ -8,8 +8,8 @@ glcd_foreground_color_blue=100
 glcd_background_color_red=0
 glcd_background_color_green=0
 glcd_background_color_blue=0
-glcd_background_image=/share/tuxbox/neutrino/icons/oled/weather.png
-glcd_font=/share/fonts/neutrino.ttf
+glcd_background_image=@ICONSDIR@/oled/weather.png
+glcd_font=@FONTDIR@/neutrino.ttf
 glcd_channel_percent=22
 glcd_channel_align=2
 glcd_channel_x_position=0
--- a/data/oled/themes/800x480/Default.otheme.in
+++ b/data/oled/themes/800x480/Default.otheme.in
@@ -9,7 +9,7 @@ glcd_background_color_red=0
 glcd_background_color_green=0
 glcd_background_color_blue=0
 glcd_background_image=
-glcd_font=/share/fonts/neutrino.ttf
+glcd_font=@FONTDIR@/neutrino.ttf
 glcd_channel_percent=25
 glcd_channel_align=2
 glcd_channel_x_position=0
--- a/data/oled/themes/800x480/Makefile.am
+++ b/data/oled/themes/800x480/Makefile.am
@@ -1,3 +1,6 @@
+EXTRA_DIST = \
+	Default.otheme Default.otheme.in
+
 oledthemesdir = $(THEMESDIR)/oled

 oledthemes_DATA = \