From 3e6bab00d8afef06d6cfa1f956f29e90fe6dabb3 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Sun, 21 Jun 2020 17:39:51 +0200
Subject: [PATCH] - move oled data to one single place in data/oled

Signed-off-by: Thilo Graf <dbt@novatux.de>
---
 configure.ac                                  |  10 +--
 data/Makefile.am                              |   2 +-
 data/fonts/Makefile.am                        |   6 --
 data/icons/Makefile.am                        |   5 --
 data/locale/deutsch.locale                    |   2 +-
 data/oled/Makefile.am                         |   4 ++
 data/oled/fonts/Makefile.am                   |   6 ++
 data/{ => oled}/fonts/lcd.ttf                 | Bin
 data/{ => oled}/fonts/led.ttf                 | Bin
 data/oled/fonts/terminator.ttf                | Bin 0 -> 27044 bytes
 data/{icons/oled => oled/icons}/Makefile.am   |   0
 data/{icons/oled => oled/icons}/advanced.png  | Bin
 data/{icons/oled => oled/icons}/blank.png     | Bin
 .../oled => oled/icons}/clock/Makefile.am     |   0
 .../icons}/clock/analog_clock.png             | Bin
 .../oled => oled/icons}/clock/analog_hour.png | Bin
 .../oled => oled/icons}/clock/analog_min.png  | Bin
 .../oled => oled/icons}/clock/time_dots.png   | Bin
 .../oled => oled/icons}/clock/time_eight.png  | Bin
 .../oled => oled/icons}/clock/time_five.png   | Bin
 .../oled => oled/icons}/clock/time_four.png   | Bin
 .../oled => oled/icons}/clock/time_nine.png   | Bin
 .../oled => oled/icons}/clock/time_one.png    | Bin
 .../oled => oled/icons}/clock/time_seven.png  | Bin
 .../oled => oled/icons}/clock/time_six.png    | Bin
 .../oled => oled/icons}/clock/time_three.png  | Bin
 .../oled => oled/icons}/clock/time_two.png    | Bin
 .../oled => oled/icons}/clock/time_zero.png   | Bin
 data/{icons/oled => oled/icons}/easy.png      | Bin
 data/{icons/oled => oled/icons}/medium.png    | Bin
 data/{icons/oled => oled/icons}/simple.png    | Bin
 data/{icons/oled => oled/icons}/standby.png   | Bin
 data/{icons/oled => oled/icons}/weather.png   | Bin
 .../oled => oled/icons}/weather/Makefile.am   |   0
 .../oled => oled/icons}/weather/clear-day.png | Bin
 .../icons}/weather/clear-night.png            | Bin
 .../oled => oled/icons}/weather/cloudy.png    | Bin
 .../oled => oled/icons}/weather/fog.png       | Bin
 .../oled => oled/icons}/weather/hail.png      | Bin
 .../icons}/weather/partly-cloudy-day.png      | Bin
 .../icons}/weather/partly-cloudy-night.png    | Bin
 .../oled => oled/icons}/weather/rain.png      | Bin
 .../oled => oled/icons}/weather/sleet.png     | Bin
 .../oled => oled/icons}/weather/snow.png      | Bin
 .../icons}/weather/thunderstorm.png           | Bin
 .../oled => oled/icons}/weather/wind.png      | Bin
 data/{othemes => oled/themes}/Makefile.am     |   2 +-
 data/{othemes => oled/themes}/advanced.otheme |   2 +-
 data/{othemes => oled/themes}/default.otheme  |   2 +-
 data/{othemes => oled/themes}/easy.otheme     |   2 +-
 data/{othemes => oled/themes}/medium.otheme   |   2 +-
 data/{othemes => oled/themes}/simple.otheme   |   2 +-
 data/{othemes => oled/themes}/weather.otheme  |   2 +-
 src/driver/glcd.cpp                           |   6 +-
 src/driver/lcdclock.cpp                       |  16 ++---
 src/driver/ledclock.cpp                       |  16 ++---
 src/gui/glcdthemes.cpp                        |  57 +++---------------
 src/gui/glcdthemes.h                          |   1 -
 58 files changed, 53 insertions(+), 92 deletions(-)
 create mode 100644 data/oled/Makefile.am
 create mode 100644 data/oled/fonts/Makefile.am
 rename data/{ => oled}/fonts/lcd.ttf (100%)
 rename data/{ => oled}/fonts/led.ttf (100%)
 create mode 100644 data/oled/fonts/terminator.ttf
 rename data/{icons/oled => oled/icons}/Makefile.am (100%)
 rename data/{icons/oled => oled/icons}/advanced.png (100%)
 rename data/{icons/oled => oled/icons}/blank.png (100%)
 rename data/{icons/oled => oled/icons}/clock/Makefile.am (100%)
 rename data/{icons/oled => oled/icons}/clock/analog_clock.png (100%)
 rename data/{icons/oled => oled/icons}/clock/analog_hour.png (100%)
 rename data/{icons/oled => oled/icons}/clock/analog_min.png (100%)
 rename data/{icons/oled => oled/icons}/clock/time_dots.png (100%)
 rename data/{icons/oled => oled/icons}/clock/time_eight.png (100%)
 rename data/{icons/oled => oled/icons}/clock/time_five.png (100%)
 rename data/{icons/oled => oled/icons}/clock/time_four.png (100%)
 rename data/{icons/oled => oled/icons}/clock/time_nine.png (100%)
 rename data/{icons/oled => oled/icons}/clock/time_one.png (100%)
 rename data/{icons/oled => oled/icons}/clock/time_seven.png (100%)
 rename data/{icons/oled => oled/icons}/clock/time_six.png (100%)
 rename data/{icons/oled => oled/icons}/clock/time_three.png (100%)
 rename data/{icons/oled => oled/icons}/clock/time_two.png (100%)
 rename data/{icons/oled => oled/icons}/clock/time_zero.png (100%)
 rename data/{icons/oled => oled/icons}/easy.png (100%)
 rename data/{icons/oled => oled/icons}/medium.png (100%)
 rename data/{icons/oled => oled/icons}/simple.png (100%)
 rename data/{icons/oled => oled/icons}/standby.png (100%)
 rename data/{icons/oled => oled/icons}/weather.png (100%)
 rename data/{icons/oled => oled/icons}/weather/Makefile.am (100%)
 rename data/{icons/oled => oled/icons}/weather/clear-day.png (100%)
 rename data/{icons/oled => oled/icons}/weather/clear-night.png (100%)
 rename data/{icons/oled => oled/icons}/weather/cloudy.png (100%)
 rename data/{icons/oled => oled/icons}/weather/fog.png (100%)
 rename data/{icons/oled => oled/icons}/weather/hail.png (100%)
 rename data/{icons/oled => oled/icons}/weather/partly-cloudy-day.png (100%)
 rename data/{icons/oled => oled/icons}/weather/partly-cloudy-night.png (100%)
 rename data/{icons/oled => oled/icons}/weather/rain.png (100%)
 rename data/{icons/oled => oled/icons}/weather/sleet.png (100%)
 rename data/{icons/oled => oled/icons}/weather/snow.png (100%)
 rename data/{icons/oled => oled/icons}/weather/thunderstorm.png (100%)
 rename data/{icons/oled => oled/icons}/weather/wind.png (100%)
 rename data/{othemes => oled/themes}/Makefile.am (79%)
 rename data/{othemes => oled/themes}/advanced.otheme (97%)
 rename data/{othemes => oled/themes}/default.otheme (97%)
 rename data/{othemes => oled/themes}/easy.otheme (97%)
 rename data/{othemes => oled/themes}/medium.otheme (98%)
 rename data/{othemes => oled/themes}/simple.otheme (97%)
 rename data/{othemes => oled/themes}/weather.otheme (98%)

diff --git a/configure.ac b/configure.ac
index 60700a361..bed886f51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -371,9 +371,6 @@ data/icons/headers/Makefile
 data/icons/hints/Makefile
 data/icons/locale/Makefile
 data/icons/movieplayer/Makefile
-data/icons/oled/Makefile
-data/icons/oled/clock/Makefile
-data/icons/oled/weather/Makefile
 data/icons/radar/Makefile
 data/icons/slider/Makefile
 data/icons/status/Makefile
@@ -391,7 +388,12 @@ data/lcd/clock/Makefile
 data/lcd/icons/Makefile
 data/license/Makefile
 data/locale/Makefile
-data/othemes/Makefile
+data/oled/Makefile
+data/oled/fonts/Makefile
+data/oled/icons/Makefile
+data/oled/icons/clock/Makefile
+data/oled/icons/weather/Makefile
+data/oled/themes/Makefile
 data/pictures/Makefile
 data/pictures/backgrounds/Makefile
 data/pictures/screensaver/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 36fe57242..01135696d 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -19,7 +19,7 @@ SUBDIRS = \
 
 if ENABLE_GRAPHLCD
 SUBDIRS += \
-	othemes
+	oled
 endif
 
 if BOXTYPE_TRIPLE
diff --git a/data/fonts/Makefile.am b/data/fonts/Makefile.am
index 35117c7bf..0c183df60 100644
--- a/data/fonts/Makefile.am
+++ b/data/fonts/Makefile.am
@@ -21,12 +21,6 @@ if BOXMODEL_CS_HD2
 install_DATA += UnDotum.ttf
 endif
 
-if ENABLE_GRAPHLCD
-install_DATA += \
-	led.ttf \
-	lcd.ttf
-endif
-
 install-data-hook:
 	cd $(DESTDIR)$(FONTDIR); \
 		mv $(neutrino_ttf) neutrino.ttf; \
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 0ebc9d3f7..b73f283c1 100644
--- 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
diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index c1e435ed3..e07f309cb 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -839,7 +839,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
diff --git a/data/oled/Makefile.am b/data/oled/Makefile.am
new file mode 100644
index 000000000..a61aed689
--- /dev/null
+++ b/data/oled/Makefile.am
@@ -0,0 +1,4 @@
+SUBDIRS = \
+	fonts \
+	icons \
+	themes
diff --git a/data/oled/fonts/Makefile.am b/data/oled/fonts/Makefile.am
new file mode 100644
index 000000000..2a7ce62ad
--- /dev/null
+++ b/data/oled/fonts/Makefile.am
@@ -0,0 +1,6 @@
+installdir = $(FONTDIR)/oled
+
+install_DATA = \
+	led.ttf \
+	lcd.ttf \
+	terminator.ttf
diff --git a/data/fonts/lcd.ttf b/data/oled/fonts/lcd.ttf
similarity index 100%
rename from data/fonts/lcd.ttf
rename to data/oled/fonts/lcd.ttf
diff --git a/data/fonts/led.ttf b/data/oled/fonts/led.ttf
similarity index 100%
rename from data/fonts/led.ttf
rename to data/oled/fonts/led.ttf
diff --git a/data/oled/fonts/terminator.ttf b/data/oled/fonts/terminator.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..7f75c9173b053c41fd1faa004ff99037ce0ec905
GIT binary patch
literal 27044
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

literal 0
HcmV?d00001

diff --git a/data/icons/oled/Makefile.am b/data/oled/icons/Makefile.am
similarity index 100%
rename from data/icons/oled/Makefile.am
rename to data/oled/icons/Makefile.am
diff --git a/data/icons/oled/advanced.png b/data/oled/icons/advanced.png
similarity index 100%
rename from data/icons/oled/advanced.png
rename to data/oled/icons/advanced.png
diff --git a/data/icons/oled/blank.png b/data/oled/icons/blank.png
similarity index 100%
rename from data/icons/oled/blank.png
rename to data/oled/icons/blank.png
diff --git a/data/icons/oled/clock/Makefile.am b/data/oled/icons/clock/Makefile.am
similarity index 100%
rename from data/icons/oled/clock/Makefile.am
rename to data/oled/icons/clock/Makefile.am
diff --git a/data/icons/oled/clock/analog_clock.png b/data/oled/icons/clock/analog_clock.png
similarity index 100%
rename from data/icons/oled/clock/analog_clock.png
rename to data/oled/icons/clock/analog_clock.png
diff --git a/data/icons/oled/clock/analog_hour.png b/data/oled/icons/clock/analog_hour.png
similarity index 100%
rename from data/icons/oled/clock/analog_hour.png
rename to data/oled/icons/clock/analog_hour.png
diff --git a/data/icons/oled/clock/analog_min.png b/data/oled/icons/clock/analog_min.png
similarity index 100%
rename from data/icons/oled/clock/analog_min.png
rename to data/oled/icons/clock/analog_min.png
diff --git a/data/icons/oled/clock/time_dots.png b/data/oled/icons/clock/time_dots.png
similarity index 100%
rename from data/icons/oled/clock/time_dots.png
rename to data/oled/icons/clock/time_dots.png
diff --git a/data/icons/oled/clock/time_eight.png b/data/oled/icons/clock/time_eight.png
similarity index 100%
rename from data/icons/oled/clock/time_eight.png
rename to data/oled/icons/clock/time_eight.png
diff --git a/data/icons/oled/clock/time_five.png b/data/oled/icons/clock/time_five.png
similarity index 100%
rename from data/icons/oled/clock/time_five.png
rename to data/oled/icons/clock/time_five.png
diff --git a/data/icons/oled/clock/time_four.png b/data/oled/icons/clock/time_four.png
similarity index 100%
rename from data/icons/oled/clock/time_four.png
rename to data/oled/icons/clock/time_four.png
diff --git a/data/icons/oled/clock/time_nine.png b/data/oled/icons/clock/time_nine.png
similarity index 100%
rename from data/icons/oled/clock/time_nine.png
rename to data/oled/icons/clock/time_nine.png
diff --git a/data/icons/oled/clock/time_one.png b/data/oled/icons/clock/time_one.png
similarity index 100%
rename from data/icons/oled/clock/time_one.png
rename to data/oled/icons/clock/time_one.png
diff --git a/data/icons/oled/clock/time_seven.png b/data/oled/icons/clock/time_seven.png
similarity index 100%
rename from data/icons/oled/clock/time_seven.png
rename to data/oled/icons/clock/time_seven.png
diff --git a/data/icons/oled/clock/time_six.png b/data/oled/icons/clock/time_six.png
similarity index 100%
rename from data/icons/oled/clock/time_six.png
rename to data/oled/icons/clock/time_six.png
diff --git a/data/icons/oled/clock/time_three.png b/data/oled/icons/clock/time_three.png
similarity index 100%
rename from data/icons/oled/clock/time_three.png
rename to data/oled/icons/clock/time_three.png
diff --git a/data/icons/oled/clock/time_two.png b/data/oled/icons/clock/time_two.png
similarity index 100%
rename from data/icons/oled/clock/time_two.png
rename to data/oled/icons/clock/time_two.png
diff --git a/data/icons/oled/clock/time_zero.png b/data/oled/icons/clock/time_zero.png
similarity index 100%
rename from data/icons/oled/clock/time_zero.png
rename to data/oled/icons/clock/time_zero.png
diff --git a/data/icons/oled/easy.png b/data/oled/icons/easy.png
similarity index 100%
rename from data/icons/oled/easy.png
rename to data/oled/icons/easy.png
diff --git a/data/icons/oled/medium.png b/data/oled/icons/medium.png
similarity index 100%
rename from data/icons/oled/medium.png
rename to data/oled/icons/medium.png
diff --git a/data/icons/oled/simple.png b/data/oled/icons/simple.png
similarity index 100%
rename from data/icons/oled/simple.png
rename to data/oled/icons/simple.png
diff --git a/data/icons/oled/standby.png b/data/oled/icons/standby.png
similarity index 100%
rename from data/icons/oled/standby.png
rename to data/oled/icons/standby.png
diff --git a/data/icons/oled/weather.png b/data/oled/icons/weather.png
similarity index 100%
rename from data/icons/oled/weather.png
rename to data/oled/icons/weather.png
diff --git a/data/icons/oled/weather/Makefile.am b/data/oled/icons/weather/Makefile.am
similarity index 100%
rename from data/icons/oled/weather/Makefile.am
rename to data/oled/icons/weather/Makefile.am
diff --git a/data/icons/oled/weather/clear-day.png b/data/oled/icons/weather/clear-day.png
similarity index 100%
rename from data/icons/oled/weather/clear-day.png
rename to data/oled/icons/weather/clear-day.png
diff --git a/data/icons/oled/weather/clear-night.png b/data/oled/icons/weather/clear-night.png
similarity index 100%
rename from data/icons/oled/weather/clear-night.png
rename to data/oled/icons/weather/clear-night.png
diff --git a/data/icons/oled/weather/cloudy.png b/data/oled/icons/weather/cloudy.png
similarity index 100%
rename from data/icons/oled/weather/cloudy.png
rename to data/oled/icons/weather/cloudy.png
diff --git a/data/icons/oled/weather/fog.png b/data/oled/icons/weather/fog.png
similarity index 100%
rename from data/icons/oled/weather/fog.png
rename to data/oled/icons/weather/fog.png
diff --git a/data/icons/oled/weather/hail.png b/data/oled/icons/weather/hail.png
similarity index 100%
rename from data/icons/oled/weather/hail.png
rename to data/oled/icons/weather/hail.png
diff --git a/data/icons/oled/weather/partly-cloudy-day.png b/data/oled/icons/weather/partly-cloudy-day.png
similarity index 100%
rename from data/icons/oled/weather/partly-cloudy-day.png
rename to data/oled/icons/weather/partly-cloudy-day.png
diff --git a/data/icons/oled/weather/partly-cloudy-night.png b/data/oled/icons/weather/partly-cloudy-night.png
similarity index 100%
rename from data/icons/oled/weather/partly-cloudy-night.png
rename to data/oled/icons/weather/partly-cloudy-night.png
diff --git a/data/icons/oled/weather/rain.png b/data/oled/icons/weather/rain.png
similarity index 100%
rename from data/icons/oled/weather/rain.png
rename to data/oled/icons/weather/rain.png
diff --git a/data/icons/oled/weather/sleet.png b/data/oled/icons/weather/sleet.png
similarity index 100%
rename from data/icons/oled/weather/sleet.png
rename to data/oled/icons/weather/sleet.png
diff --git a/data/icons/oled/weather/snow.png b/data/oled/icons/weather/snow.png
similarity index 100%
rename from data/icons/oled/weather/snow.png
rename to data/oled/icons/weather/snow.png
diff --git a/data/icons/oled/weather/thunderstorm.png b/data/oled/icons/weather/thunderstorm.png
similarity index 100%
rename from data/icons/oled/weather/thunderstorm.png
rename to data/oled/icons/weather/thunderstorm.png
diff --git a/data/icons/oled/weather/wind.png b/data/oled/icons/weather/wind.png
similarity index 100%
rename from data/icons/oled/weather/wind.png
rename to data/oled/icons/weather/wind.png
diff --git a/data/othemes/Makefile.am b/data/oled/themes/Makefile.am
similarity index 79%
rename from data/othemes/Makefile.am
rename to data/oled/themes/Makefile.am
index 655c7d8c9..f39a3ccb9 100644
--- a/data/othemes/Makefile.am
+++ b/data/oled/themes/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(THEMESDIR)
+installdir = $(THEMESDIR)/oled
 
 install_DATA = \
 	advanced.otheme \
diff --git a/data/othemes/advanced.otheme b/data/oled/themes/advanced.otheme
similarity index 97%
rename from data/othemes/advanced.otheme
rename to data/oled/themes/advanced.otheme
index a0033ad4e..bb37f365b 100644
--- a/data/othemes/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
diff --git a/data/othemes/default.otheme b/data/oled/themes/default.otheme
similarity index 97%
rename from data/othemes/default.otheme
rename to data/oled/themes/default.otheme
index c859a3be4..8628c2d03 100644
--- a/data/othemes/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
diff --git a/data/othemes/easy.otheme b/data/oled/themes/easy.otheme
similarity index 97%
rename from data/othemes/easy.otheme
rename to data/oled/themes/easy.otheme
index f92e4aeae..186820de8 100644
--- a/data/othemes/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
diff --git a/data/othemes/medium.otheme b/data/oled/themes/medium.otheme
similarity index 98%
rename from data/othemes/medium.otheme
rename to data/oled/themes/medium.otheme
index a803ac883..29303ba84 100644
--- a/data/othemes/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
diff --git a/data/othemes/simple.otheme b/data/oled/themes/simple.otheme
similarity index 97%
rename from data/othemes/simple.otheme
rename to data/oled/themes/simple.otheme
index 2836d53b9..dbfcc55ae 100644
--- a/data/othemes/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
diff --git a/data/othemes/weather.otheme b/data/oled/themes/weather.otheme
similarity index 98%
rename from data/othemes/weather.otheme
rename to data/oled/themes/weather.otheme
index 216f12207..2786fec70 100644
--- a/data/othemes/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
diff --git a/src/driver/glcd.cpp b/src/driver/glcd.cpp
index 8e7ef9dbc..a4b731311 100644
--- a/src/driver/glcd.cpp
+++ b/src/driver/glcd.cpp
@@ -320,7 +320,7 @@ void cGLCD::Exec()
 	g_PicViewer->getSize(Logo.c_str(), &icon_start_width, &icon_start_height);
 
 	if (g_settings.glcd_show_logo && percent_logo &&
-		showImage(channel_id, Channel, 0, t.glcd_channel_x_position, t.glcd_channel_y_position, percent_logo * bitmap->Height()/100, true, false)) {
+		showImage(channel_id, Channel, t.glcd_channel_x_position, t.glcd_channel_y_position, bitmap->Width() - 4, percent_logo * bitmap->Height()/100, true, false)) {
 		doScrollChannel = false;
 		scrollChannelSkip = 0;
 	} else if (percent_logo && icon_start_width && icon_start_height &&
@@ -634,8 +634,8 @@ void cGLCD::updateFonts()
 
 	if (!fonts_initialized || (fontsize_smalltext_new != fontsize_smalltext)) {
 		fontsize_smalltext = fontsize_smalltext_new;
-		if (!font_smalltext.LoadFT2(/*t.glcd_font*/FONTDIR "/lcd.ttf", "UTF-8", fontsize_smalltext)) {
-			t.glcd_font = FONTDIR "/lcd.ttf";
+		if (!font_smalltext.LoadFT2(FONTDIR "/oled/terminator.ttf", "UTF-8", fontsize_smalltext)) {
+			t.glcd_font = FONTDIR "/neutrino.ttf";
 			font_smalltext.LoadFT2(t.glcd_font, "UTF-8", fontsize_smalltext);
 		}
 	}
diff --git a/src/driver/lcdclock.cpp b/src/driver/lcdclock.cpp
index d75380680..3e2106834 100644
--- a/src/driver/lcdclock.cpp
+++ b/src/driver/lcdclock.cpp
@@ -1,5 +1,5 @@
 /*
-        simple clock  -   DBoxII-Project
+        lcd clock  -   DBoxII-Project
 
         Copyright (C) 2018 redblue
 
@@ -31,7 +31,7 @@
 
 static bool fonts_initialized = false;
 
-GLCD::cFont font_time_standby_second;
+GLCD::cFont lcd_font_time_standby;
 
 void InitLcdClock(void)
 {
@@ -47,9 +47,8 @@ void LcdClockUpdateFonts(void)
 	int fontsize_time_standby_new = percent_time_standby * cglcd->lcd->Height() / 100;
 	if (!fonts_initialized || (fontsize_time_standby_new != fontsize_time_standby)) {
 		fontsize_time_standby = fontsize_time_standby_new;
-		if (!font_time_standby_second.LoadFT2(/*t.glcd_font*/FONTDIR "/lcd.ttf", "UTF-8", fontsize_time_standby)) {
-			t.glcd_font = FONTDIR "/lcd.ttf";
-			font_time_standby_second.LoadFT2(t.glcd_font, "UTF-8", fontsize_time_standby);
+                if (!lcd_font_time_standby.LoadFT2(FONTDIR "/oled/lcd.ttf", "UTF-8", fontsize_time_standby)) {
+			lcd_font_time_standby.LoadFT2(FONTDIR "/neutrino.ttf", "UTF-8", fontsize_time_standby);
 		}
 	}
 	fonts_initialized = true;
@@ -57,18 +56,19 @@ void LcdClockUpdateFonts(void)
 
 void RenderLcdClock(std::string Time, int x, int y)
 {
+	(void) x;
 	cGLCD *cglcd = cGLCD::getInstance();
 	SNeutrinoGlcdTheme &t = g_settings.glcd_theme;
 	LcdClockUpdateFonts();
-	cglcd->bitmap->DrawText(std::max(2,(cglcd->bitmap->Width() - 4 - font_time_standby_second.Width(Time))/2),
+	cglcd->bitmap->DrawText(std::max(2,(cglcd->bitmap->Width() - 4 - lcd_font_time_standby.Width(Time))/2),
 		y, cglcd->bitmap->Width() - 1, Time,
-		&font_time_standby_second, cglcd->ColorConvert3to1(t.glcd_color_fg_red, t.glcd_color_fg_green, t.glcd_color_fg_blue), GLCD::cColor::Transparent);
+		&lcd_font_time_standby, cglcd->ColorConvert3to1(t.glcd_color_fg_red, t.glcd_color_fg_green, t.glcd_color_fg_blue), GLCD::cColor::Transparent);
 }
 
 void ShowLcdClock(std::string Time)
 {
 	cGLCD *cglcd = cGLCD::getInstance();
 	SNeutrinoGlcdTheme &t = g_settings.glcd_theme;
-	int y = g_settings.glcd_standby_weather ? t.glcd_simple_clock_y_position : (cglcd->bitmap->Height() - font_time_standby_second.Height(Time)) / 2;
+	int y = g_settings.glcd_standby_weather ? t.glcd_simple_clock_y_position : (cglcd->bitmap->Height() - lcd_font_time_standby.Height(Time)) / 2;
 	RenderLcdClock(Time, 255, y);
 }
diff --git a/src/driver/ledclock.cpp b/src/driver/ledclock.cpp
index 908194929..b18489c65 100644
--- a/src/driver/ledclock.cpp
+++ b/src/driver/ledclock.cpp
@@ -1,5 +1,5 @@
 /*
-        simple clock  -   DBoxII-Project
+        led clock  -   DBoxII-Project
 
         Copyright (C) 2018 redblue
 
@@ -31,7 +31,7 @@
 
 static bool fonts_initialized = false;
 
-GLCD::cFont second_font_time_standby;
+GLCD::cFont led_font_time_standby;
 
 void InitLedClock(void)
 {
@@ -47,9 +47,8 @@ void LedClockUpdateFonts(void)
 	int fontsize_time_standby_new = percent_time_standby * cglcd->lcd->Height() / 100;
 	if (!fonts_initialized || (fontsize_time_standby_new != fontsize_time_standby)) {
 		fontsize_time_standby = fontsize_time_standby_new;
-		if (!second_font_time_standby.LoadFT2(/*t.glcd_font*/FONTDIR "/led.ttf", "UTF-8", fontsize_time_standby)) {
-			t.glcd_font = FONTDIR "/led.ttf";
-			second_font_time_standby.LoadFT2(t.glcd_font, "UTF-8", fontsize_time_standby);
+                if (!led_font_time_standby.LoadFT2(FONTDIR "/oled/led.ttf", "UTF-8", fontsize_time_standby)) {
+			led_font_time_standby.LoadFT2(FONTDIR "/neutrino.ttf", "UTF-8", fontsize_time_standby);
 		}
 	}
 	fonts_initialized = true;
@@ -57,18 +56,19 @@ void LedClockUpdateFonts(void)
 
 void RenderLedClock(std::string Time, int x, int y)
 {
+	(void) x;
 	cGLCD *cglcd = cGLCD::getInstance();
 	SNeutrinoGlcdTheme &t = g_settings.glcd_theme;
 	LedClockUpdateFonts();
-	cglcd->bitmap->DrawText(std::max(2,(cglcd->bitmap->Width() - 4 - second_font_time_standby.Width(Time))/2),
+	cglcd->bitmap->DrawText(std::max(2,(cglcd->bitmap->Width() - 4 - led_font_time_standby.Width(Time))/2),
 		y, cglcd->bitmap->Width() - 1, Time,
-		&second_font_time_standby, cglcd->ColorConvert3to1(t.glcd_color_fg_red, t.glcd_color_fg_green, t.glcd_color_fg_blue), GLCD::cColor::Transparent);
+		&led_font_time_standby, cglcd->ColorConvert3to1(t.glcd_color_fg_red, t.glcd_color_fg_green, t.glcd_color_fg_blue), GLCD::cColor::Transparent);
 }
 
 void ShowLedClock(std::string Time)
 {
 	cGLCD *cglcd = cGLCD::getInstance();
 	SNeutrinoGlcdTheme &t = g_settings.glcd_theme;
-	int y = g_settings.glcd_standby_weather ? t.glcd_simple_clock_y_position : (cglcd->bitmap->Height() - second_font_time_standby.Height(Time)) / 2;
+	int y = g_settings.glcd_standby_weather ? t.glcd_simple_clock_y_position : (cglcd->bitmap->Height() - led_font_time_standby.Height(Time)) / 2;
 	RenderLedClock(Time, 255, y);
 }
diff --git a/src/gui/glcdthemes.cpp b/src/gui/glcdthemes.cpp
index ffa30a2b7..0a2e4fdc4 100644
--- a/src/gui/glcdthemes.cpp
+++ b/src/gui/glcdthemes.cpp
@@ -51,7 +51,6 @@
 
 #include "glcdthemes.h"
 
-#define USERDIR "/var" THEMESDIR
 #define FILE_SUFFIX ".otheme"
 
 static 	SNeutrinoGlcdTheme &t = g_settings.glcd_theme;
@@ -93,10 +92,10 @@ int CGLCDThemes::exec(CMenuTarget* parent, const std::string & actionKey)
 			if ( strstr(themeFile.c_str(), "{U}") != 0 ) 
 			{
 				themeFile.erase(0, 3);
-				readFile(((std::string)THEMESDIR_VAR + "/" + themeFile + FILE_SUFFIX).c_str());
+				readFile(((std::string)THEMESDIR_VAR + "/oled/" + themeFile + FILE_SUFFIX).c_str());
 			} 
 			else
-				readFile(((std::string)THEMESDIR + "/" + themeFile + FILE_SUFFIX).c_str());
+				readFile(((std::string)THEMESDIR + "/oled" + themeFile + FILE_SUFFIX).c_str());
 			g_settings.glcd_theme_name = themeFile;
 		}
 		OnAfterSelectTheme();
@@ -118,7 +117,7 @@ void CGLCDThemes::initThemesMenu(CMenuWidget &themes)
 {
 	struct dirent **themelist;
 	int n;
-	const char *pfade[] = {THEMESDIR, THEMESDIR_VAR};
+	const char *pfade[] = {THEMESDIR "/oled", THEMESDIR_VAR "/oled"};
 	bool hasCVSThemes, hasUserThemes;
 	hasCVSThemes = hasUserThemes = false;
 	std::string userThemeFile = "";
@@ -176,8 +175,6 @@ void CGLCDThemes::initThemesMenu(CMenuWidget &themes)
 
 int CGLCDThemes::Show()
 {
-	move_userDir();
-
 	std::string file_name = "";
 
 	CMenuWidget themes (LOCALE_COLORMENU_MENUCOLORS, NEUTRINO_ICON_SETTINGS, width);
@@ -197,22 +194,22 @@ int CGLCDThemes::Show()
 	CKeyboardInput nameInput(LOCALE_COLORTHEMEMENU_NAME, &file_name);
 	CMenuForwarder *m1 = new CMenuForwarder(LOCALE_COLORTHEMEMENU_SAVE, true , NULL, &nameInput, NULL, CRCInput::RC_green);
 
-	if (!CFileHelpers::createDir(THEMESDIR_VAR)) {
-		printf("[neutrino glcd theme] error creating %s\n", THEMESDIR_VAR);
+	if (!CFileHelpers::createDir(THEMESDIR_VAR "/oled")) {
+		printf("[neutrino glcd theme] error creating %s\n", THEMESDIR_VAR "/oled");
 	}
 
-	if (access(THEMESDIR_VAR, F_OK) == 0 ) {
+	if (access(THEMESDIR_VAR "/oled", F_OK) == 0 ) {
 		themes.addItem(GenericMenuSeparatorLine);
 		themes.addItem(m1);
 	} else {
 		delete m1;
-		printf("[neutrino glcd theme] error accessing %s\n", THEMESDIR_VAR);
+		printf("[neutrino glcd theme] error accessing %s\n", THEMESDIR_VAR "/oled");
 	}
 
 	int res = themes.exec(NULL, "");
 
 	if (!file_name.empty()) {
-		saveFile(((std::string)THEMESDIR_VAR + "/" + file_name + FILE_SUFFIX).c_str());
+		saveFile(((std::string)THEMESDIR_VAR + "/oled/" + file_name + FILE_SUFFIX).c_str());
 	}
 
 	if (hasThemeChanged) {
@@ -265,7 +262,7 @@ void CGLCDThemes::saveFile(const char *themename)
 bool CGLCDThemes::applyDefaultTheme()
 {
 	g_settings.glcd_theme_name = DEFAULT_OLED_THEME;
-	std::string default_theme = THEMESDIR "/" + g_settings.glcd_theme_name + ".otheme";
+	std::string default_theme = THEMESDIR "/oled/" + g_settings.glcd_theme_name + ".otheme";
 	if(themefile.loadConfig(default_theme)){
 		getTheme(themefile);
 		return true;
@@ -428,42 +425,6 @@ void CGLCDThemes::getTheme(CConfigFile &configfile)
 		applyDefaultTheme();
 }
 
-void CGLCDThemes::move_userDir()
-{
-	if (access(USERDIR, F_OK) == 0)
-	{
-		if (!CFileHelpers::createDir(THEMESDIR_VAR))
-		{
-			printf("[neutrino glcd theme] error creating %s\n", THEMESDIR_VAR);
-			return;
-		}
-		struct dirent **themelist;
-		int n = scandir(USERDIR, &themelist, 0, alphasort);
-		if (n < 0)
-		{
-			perror("loading glcd themes: scandir");
-			return;
-		}
-		else
-		{
-			for (int count = 0; count < n; count++)
-			{
-				const char *file = themelist[count]->d_name;
-				if (strcmp(file, ".") == 0 || strcmp(file, "..") == 0)
-					continue;
-				const char *dest = ((std::string)USERDIR + "/" + file).c_str();
-				const char *target = ((std::string)THEMESDIR_VAR + "/" + file).c_str();
-				printf("[neutrino gcdl theme] moving %s to %s\n", dest, target);
-				rename(dest, target);
-				free(themelist[count]);
-			}
-			free(themelist);
-		}
-		printf("[neutrino gcld theme] removing %s\n", USERDIR);
-		remove(USERDIR);
-	}
-}
-
 void CGLCDThemes::markSelectedTheme(CMenuWidget *w)
 {
 	for (int i = 0; i < w->getItemsCount(); i++){
diff --git a/src/gui/glcdthemes.h b/src/gui/glcdthemes.h
index f1421b7ff..12049bfa8 100644
--- a/src/gui/glcdthemes.h
+++ b/src/gui/glcdthemes.h
@@ -48,7 +48,6 @@ class CGLCDThemes : public CMenuTarget, CColorSetupNotifier, public sigc::tracka
 		void saveFile(const char *themename);
 		void initThemesMenu(CMenuWidget &);
 		void rememberOldTheme(bool remember);
-		void move_userDir();
 		bool applyDefaultTheme();
 		///signal after select theme is completed
 		sigc::signal<void> OnAfterSelectTheme;