From a25ae982277daac702cf692fe87565b08cf020f8 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Thu, 26 Nov 2020 00:46:21 +0100 Subject: [PATCH] - data/oled/themes: remove some hardcoded paths Signed-off-by: Thilo Graf --- configure.ac | 12 ++++++++++++ .../400x240/{Default.otheme => Default.otheme.in} | 2 +- data/oled/themes/400x240/Makefile.am | 3 +++ .../480x320/{Advanced.otheme => Advanced.otheme.in} | 4 ++-- .../480x320/{Default.otheme => Default.otheme.in} | 2 +- .../themes/480x320/{Easy.otheme => Easy.otheme.in} | 4 ++-- data/oled/themes/480x320/Makefile.am | 8 ++++++++ .../480x320/{Medium.otheme => Medium.otheme.in} | 4 ++-- .../480x320/{Simple.otheme => Simple.otheme.in} | 4 ++-- .../480x320/{Weather.otheme => Weather.otheme.in} | 4 ++-- .../800x480/{Default.otheme => Default.otheme.in} | 2 +- data/oled/themes/800x480/Makefile.am | 3 +++ 12 files changed, 39 insertions(+), 13 deletions(-) rename data/oled/themes/400x240/{Default.otheme => Default.otheme.in} (98%) rename data/oled/themes/480x320/{Advanced.otheme => Advanced.otheme.in} (94%) rename data/oled/themes/480x320/{Default.otheme => Default.otheme.in} (98%) rename data/oled/themes/480x320/{Easy.otheme => Easy.otheme.in} (95%) rename data/oled/themes/480x320/{Medium.otheme => Medium.otheme.in} (95%) rename data/oled/themes/480x320/{Simple.otheme => Simple.otheme.in} (95%) rename data/oled/themes/480x320/{Weather.otheme => Weather.otheme.in} (94%) rename data/oled/themes/800x480/{Default.otheme => Default.otheme.in} (98%) diff --git a/configure.ac b/configure.ac index 5937a704a..3fae8371f 100644 --- a/configure.ac +++ b/configure.ac @@ -496,4 +496,16 @@ data/config/tobackup.conf #data/themes/Material_Blue-Grey.theme #]) +# Oled themes +AC_CONFIG_FILES([ +data/oled/themes/400x240/Default.otheme +data/oled/themes/480x320/Default.otheme +data/oled/themes/480x320/Advanced.otheme +data/oled/themes/480x320/Easy.otheme +data/oled/themes/480x320/Medium.otheme +data/oled/themes/480x320/Simple.otheme +data/oled/themes/480x320/Weather.otheme +data/oled/themes/800x480/Default.otheme +]) + AC_OUTPUT diff --git a/data/oled/themes/400x240/Default.otheme b/data/oled/themes/400x240/Default.otheme.in similarity index 98% rename from data/oled/themes/400x240/Default.otheme rename to data/oled/themes/400x240/Default.otheme.in index 5cade626c..5ff93f1e0 100644 --- a/data/oled/themes/400x240/Default.otheme +++ 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 diff --git a/data/oled/themes/400x240/Makefile.am b/data/oled/themes/400x240/Makefile.am index 6723dca9c..22037bf10 100644 --- 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 = \ diff --git a/data/oled/themes/480x320/Advanced.otheme b/data/oled/themes/480x320/Advanced.otheme.in similarity index 94% rename from data/oled/themes/480x320/Advanced.otheme rename to data/oled/themes/480x320/Advanced.otheme.in index 41bb604e7..c3cd44940 100644 --- a/data/oled/themes/480x320/Advanced.otheme +++ 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 diff --git a/data/oled/themes/480x320/Default.otheme b/data/oled/themes/480x320/Default.otheme.in similarity index 98% rename from data/oled/themes/480x320/Default.otheme rename to data/oled/themes/480x320/Default.otheme.in index 27ae4f841..7fedad324 100644 --- a/data/oled/themes/480x320/Default.otheme +++ 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 diff --git a/data/oled/themes/480x320/Easy.otheme b/data/oled/themes/480x320/Easy.otheme.in similarity index 95% rename from data/oled/themes/480x320/Easy.otheme rename to data/oled/themes/480x320/Easy.otheme.in index dcc4f6d3d..1d0ca7ae9 100644 --- a/data/oled/themes/480x320/Easy.otheme +++ 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 diff --git a/data/oled/themes/480x320/Makefile.am b/data/oled/themes/480x320/Makefile.am index 05499bde7..361545705 100644 --- 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 = \ diff --git a/data/oled/themes/480x320/Medium.otheme b/data/oled/themes/480x320/Medium.otheme.in similarity index 95% rename from data/oled/themes/480x320/Medium.otheme rename to data/oled/themes/480x320/Medium.otheme.in index 673eea110..ea3c147cc 100644 --- a/data/oled/themes/480x320/Medium.otheme +++ 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 diff --git a/data/oled/themes/480x320/Simple.otheme b/data/oled/themes/480x320/Simple.otheme.in similarity index 95% rename from data/oled/themes/480x320/Simple.otheme rename to data/oled/themes/480x320/Simple.otheme.in index 1fb2faa24..61200e9d0 100644 --- a/data/oled/themes/480x320/Simple.otheme +++ 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 diff --git a/data/oled/themes/480x320/Weather.otheme b/data/oled/themes/480x320/Weather.otheme.in similarity index 94% rename from data/oled/themes/480x320/Weather.otheme rename to data/oled/themes/480x320/Weather.otheme.in index c30fddce1..213172637 100644 --- a/data/oled/themes/480x320/Weather.otheme +++ 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 diff --git a/data/oled/themes/800x480/Default.otheme b/data/oled/themes/800x480/Default.otheme.in similarity index 98% rename from data/oled/themes/800x480/Default.otheme rename to data/oled/themes/800x480/Default.otheme.in index ac53e2716..869445811 100644 --- a/data/oled/themes/800x480/Default.otheme +++ 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 diff --git a/data/oled/themes/800x480/Makefile.am b/data/oled/themes/800x480/Makefile.am index 6723dca9c..22037bf10 100644 --- 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 = \