move oled data to one single place in data/oled

Origin commit data ------------------ Commit: 0139bbc745 Author: vanhofen <vanhofen@gmx.de> Date: 2020-06-21 (Sun, 21 Jun 2020) Origin message was: ------------------ - move oled data to one single place in data/oled
2025-08-31 17:31:11 +02:00 · 2020-06-21 17:39:51 +02:00
parent 8005e69b0f
commit c6f860957d
58 changed files with 53 additions and 92 deletions
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -19,7 +19,7 @@ SUBDIRS = \

 if ENABLE_GRAPHLCD
 SUBDIRS += \
-	othemes
+	oled
 endif

 if BOXTYPE_TRIPLE
--- a/data/fonts/Makefile.am
+++ b/data/fonts/Makefile.am
@@ -18,12 +18,6 @@ install_DATA += \
 	ubuntumono-b-webfont.ttf \
 	ubuntumono-r-webfont.ttf

-if ENABLE_GRAPHLCD
-install_DATA += \
-	led.ttf \
-	lcd.ttf
-endif
-
 install-data-hook:
 	cd $(DESTDIR)$(FONTDIR); \
 		mv $(neutrino_ttf) neutrino.ttf; \
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -11,10 +11,5 @@ SUBDIRS = \
 	various \
 	weather

-if ENABLE_GRAPHLCD
-SUBDIRS += \
-	oled
-endif
-
 install-data-hook:
 	$(INSTALL) -d $(DESTDIR)/$(ICONSDIR)/logo
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -895,7 +895,7 @@ glcd.align_left links
 glcd.align_none keine
 glcd.align_right rechts
 glcd.align_start Sendungsstart ausrichten
-glcd.align_time Zeit ausrichten
+glcd.align_time Uhrzeit ausrichten
 glcd.bar_width Fortschrittsbalken-Weite
 glcd.bar_x_position Fortschrittsbalken x-Position
 glcd.bar_y_position Fortschrittsbalken y-Position
--- a/data/oled/Makefile.am
+++ b/data/oled/Makefile.am
@@ -0,0 +1,4 @@
+SUBDIRS = \
+	fonts \
+	icons \
+	themes
--- a/data/oled/fonts/Makefile.am
+++ b/data/oled/fonts/Makefile.am
@@ -0,0 +1,6 @@
+installdir = $(FONTDIR)/oled
+
+install_DATA = \
+	led.ttf \
+	lcd.ttf \
+	terminator.ttf
--- a/data/oled/fonts/lcd.ttf
+++ b/data/oled/fonts/lcd.ttf
--- a/data/oled/fonts/led.ttf
+++ b/data/oled/fonts/led.ttf
--- a/data/oled/fonts/terminator.ttf
+++ b/data/oled/fonts/terminator.ttf
--- a/data/oled/icons/Makefile.am
+++ b/data/oled/icons/Makefile.am
--- a/data/oled/icons/advanced.png
+++ b/data/oled/icons/advanced.png
--- a/data/oled/icons/blank.png
+++ b/data/oled/icons/blank.png
--- a/data/oled/icons/clock/Makefile.am
+++ b/data/oled/icons/clock/Makefile.am
--- a/data/oled/icons/clock/analog_clock.png
+++ b/data/oled/icons/clock/analog_clock.png
--- a/data/oled/icons/clock/analog_hour.png
+++ b/data/oled/icons/clock/analog_hour.png
--- a/data/oled/icons/clock/analog_min.png
+++ b/data/oled/icons/clock/analog_min.png
--- a/data/oled/icons/clock/time_dots.png
+++ b/data/oled/icons/clock/time_dots.png
--- a/data/oled/icons/clock/time_eight.png
+++ b/data/oled/icons/clock/time_eight.png
--- a/data/oled/icons/clock/time_five.png
+++ b/data/oled/icons/clock/time_five.png
--- a/data/oled/icons/clock/time_four.png
+++ b/data/oled/icons/clock/time_four.png
--- a/data/oled/icons/clock/time_nine.png
+++ b/data/oled/icons/clock/time_nine.png
--- a/data/oled/icons/clock/time_one.png
+++ b/data/oled/icons/clock/time_one.png
--- a/data/oled/icons/clock/time_seven.png
+++ b/data/oled/icons/clock/time_seven.png
--- a/data/oled/icons/clock/time_six.png
+++ b/data/oled/icons/clock/time_six.png
--- a/data/oled/icons/clock/time_three.png
+++ b/data/oled/icons/clock/time_three.png
--- a/data/oled/icons/clock/time_two.png
+++ b/data/oled/icons/clock/time_two.png
--- a/data/oled/icons/clock/time_zero.png
+++ b/data/oled/icons/clock/time_zero.png
--- a/data/oled/icons/easy.png
+++ b/data/oled/icons/easy.png
--- a/data/oled/icons/medium.png
+++ b/data/oled/icons/medium.png
--- a/data/oled/icons/simple.png
+++ b/data/oled/icons/simple.png
--- a/data/oled/icons/standby.png
+++ b/data/oled/icons/standby.png
--- a/data/oled/icons/weather.png
+++ b/data/oled/icons/weather.png
--- a/data/oled/icons/weather/Makefile.am
+++ b/data/oled/icons/weather/Makefile.am
--- a/data/oled/icons/weather/clear-day.png
+++ b/data/oled/icons/weather/clear-day.png
--- a/data/oled/icons/weather/clear-night.png
+++ b/data/oled/icons/weather/clear-night.png
--- a/data/oled/icons/weather/cloudy.png
+++ b/data/oled/icons/weather/cloudy.png
--- a/data/oled/icons/weather/fog.png
+++ b/data/oled/icons/weather/fog.png
--- a/data/oled/icons/weather/hail.png
+++ b/data/oled/icons/weather/hail.png
--- a/data/oled/icons/weather/partly-cloudy-day.png
+++ b/data/oled/icons/weather/partly-cloudy-day.png
--- a/data/oled/icons/weather/partly-cloudy-night.png
+++ b/data/oled/icons/weather/partly-cloudy-night.png
--- a/data/oled/icons/weather/rain.png
+++ b/data/oled/icons/weather/rain.png
--- a/data/oled/icons/weather/sleet.png
+++ b/data/oled/icons/weather/sleet.png
--- a/data/oled/icons/weather/snow.png
+++ b/data/oled/icons/weather/snow.png
--- a/data/oled/icons/weather/thunderstorm.png
+++ b/data/oled/icons/weather/thunderstorm.png
--- a/data/oled/icons/weather/wind.png
+++ b/data/oled/icons/weather/wind.png
--- a/data/oled/themes/Makefile.am
+++ b/data/oled/themes/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(THEMESDIR)
+installdir = $(THEMESDIR)/oled

 install_DATA = \
 	advanced.otheme \
--- a/data/oled/themes/advanced.otheme
+++ b/data/oled/themes/advanced.otheme
@@ -11,7 +11,7 @@ glcd_color_bg_blue=0
 glcd_color_bar_red=0
 glcd_color_bar_green=0
 glcd_color_bar_blue=100
-glcd_font=/usr/share/fonts/neutrino.ttf
+glcd_font=/share/fonts/neutrino.ttf
 glcd_background=/share/tuxbox/neutrino/icons/oled/advanced.png
 glcd_align_channel=2
 glcd_align_epg=2
--- a/data/oled/themes/default.otheme
+++ b/data/oled/themes/default.otheme
@@ -11,7 +11,7 @@ glcd_color_bg_blue=0
 glcd_color_bar_red=0    
 glcd_color_bar_green=0
 glcd_color_bar_blue=100
-glcd_font=/usr/share/fonts/neutrino.ttf
+glcd_font=/share/fonts/neutrino.ttf
 glcd_background=
 glcd_align_channel=2
 glcd_align_epg=2
--- a/data/oled/themes/easy.otheme
+++ b/data/oled/themes/easy.otheme
@@ -11,7 +11,7 @@ glcd_color_bg_blue=0
 glcd_color_bar_red=0    
 glcd_color_bar_green=0
 glcd_color_bar_blue=100
-glcd_font=/usr/share/fonts/neutrino.ttf
+glcd_font=/share/fonts/neutrino.ttf
 glcd_background=/share/tuxbox/neutrino/icons/oled/easy.png
 glcd_align_channel=2
 glcd_align_epg=2
--- a/data/oled/themes/medium.otheme
+++ b/data/oled/themes/medium.otheme
@@ -11,7 +11,7 @@ glcd_color_bg_blue=0
 glcd_color_bar_red=0    
 glcd_color_bar_green=0
 glcd_color_bar_blue=100
-glcd_font=/usr/share/fonts/neutrino.ttf
+glcd_font=/share/fonts/neutrino.ttf
 glcd_background=/share/tuxbox/neutrino/icons/oled/medium.png
 glcd_align_channel=2
 glcd_align_epg=2
--- a/data/oled/themes/simple.otheme
+++ b/data/oled/themes/simple.otheme
@@ -11,7 +11,7 @@ glcd_color_bg_blue=0
 glcd_color_bar_red=0    
 glcd_color_bar_green=0
 glcd_color_bar_blue=100
-glcd_font=/usr/share/fonts/neutrino.ttf
+glcd_font=/share/fonts/neutrino.ttf
 glcd_background=/share/tuxbox/neutrino/icons/oled/simple.png
 glcd_align_channel=2
 glcd_align_epg=2
--- a/data/oled/themes/weather.otheme
+++ b/data/oled/themes/weather.otheme
@@ -11,7 +11,7 @@ glcd_color_bg_blue=0
 glcd_color_bar_red=0    
 glcd_color_bar_green=0
 glcd_color_bar_blue=100
-glcd_font=/usr/share/fonts/neutrino.ttf
+glcd_font=/share/fonts/neutrino.ttf
 glcd_background=/share/tuxbox/neutrino/icons/oled/weather.png
 glcd_align_channel=2
 glcd_align_epg=2