From 402970d3d9ceb883f592411ddd64db621ca66396 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Sat, 11 Jul 2020 00:02:00 +0200
Subject: [PATCH] - oled: add resolution dependent themes

Signed-off-by: Thilo Graf <dbt@novatux.de>
---
 configure.ac                                  |   3 +
 data/oled/icons/Makefile.am                   |  11 ---
 data/oled/icons/blank.png                     | Bin 461965 -> 0 bytes
 data/oled/icons/standby.png                   | Bin 615836 -> 0 bytes
 data/oled/themes/400x240/Default.otheme       |  72 ++++++++++++++++++
 data/oled/themes/400x240/Makefile.am          |   4 +
 .../Advanced.otheme}                          |   0
 .../Default.otheme}                           |   0
 .../{easy.otheme => 480x320/Easy.otheme}      |   0
 data/oled/themes/480x320/Makefile.am          |  18 +++++
 .../{medium.otheme => 480x320/Medium.otheme}  |   0
 .../{simple.otheme => 480x320/Simple.otheme}  |   0
 .../Weather.otheme}                           |   0
 .../{icons => themes/480x320}/advanced.png    | Bin
 data/oled/{icons => themes/480x320}/easy.png  | Bin
 .../oled/{icons => themes/480x320}/medium.png | Bin
 .../oled/{icons => themes/480x320}/simple.png | Bin
 .../{icons => themes/480x320}/weather.png     | Bin
 data/oled/themes/800x480/Default.otheme       |  72 ++++++++++++++++++
 data/oled/themes/800x480/Makefile.am          |   4 +
 data/oled/themes/Makefile.am                  |  22 +++---
 src/gui/glcdthemes.cpp                        |   4 +-
 22 files changed, 188 insertions(+), 22 deletions(-)
 delete mode 100644 data/oled/icons/blank.png
 delete mode 100644 data/oled/icons/standby.png
 create mode 100644 data/oled/themes/400x240/Default.otheme
 create mode 100644 data/oled/themes/400x240/Makefile.am
 rename data/oled/themes/{advanced.otheme => 480x320/Advanced.otheme} (100%)
 rename data/oled/themes/{default.otheme => 480x320/Default.otheme} (100%)
 rename data/oled/themes/{easy.otheme => 480x320/Easy.otheme} (100%)
 create mode 100644 data/oled/themes/480x320/Makefile.am
 rename data/oled/themes/{medium.otheme => 480x320/Medium.otheme} (100%)
 rename data/oled/themes/{simple.otheme => 480x320/Simple.otheme} (100%)
 rename data/oled/themes/{weather.otheme => 480x320/Weather.otheme} (100%)
 rename data/oled/{icons => themes/480x320}/advanced.png (100%)
 rename data/oled/{icons => themes/480x320}/easy.png (100%)
 rename data/oled/{icons => themes/480x320}/medium.png (100%)
 rename data/oled/{icons => themes/480x320}/simple.png (100%)
 rename data/oled/{icons => themes/480x320}/weather.png (100%)
 create mode 100644 data/oled/themes/800x480/Default.otheme
 create mode 100644 data/oled/themes/800x480/Makefile.am

diff --git a/configure.ac b/configure.ac
index c1fed8562..5863fe82f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -394,6 +394,9 @@ data/oled/icons/Makefile
 data/oled/icons/clock/Makefile
 data/oled/icons/weather/Makefile
 data/oled/themes/Makefile
+data/oled/themes/400x240/Makefile
+data/oled/themes/480x320/Makefile
+data/oled/themes/800x480/Makefile
 data/pictures/Makefile
 data/pictures/backgrounds/Makefile
 data/pictures/screensaver/Makefile
diff --git a/data/oled/icons/Makefile.am b/data/oled/icons/Makefile.am
index e123a3ab2..b8c60be35 100644
--- a/data/oled/icons/Makefile.am
+++ b/data/oled/icons/Makefile.am
@@ -1,14 +1,3 @@
 SUBDIRS = \
 	clock \
 	weather
-
-installdir = $(ICONSDIR)/oled
-
-install_DATA = \
-        advanced.png \
-        blank.png \
-        easy.png \
-        medium.png \
-        simple.png \
-	standby.png \
-        weather.png
diff --git a/data/oled/icons/blank.png b/data/oled/icons/blank.png
deleted file mode 100644
index e85c206c820d006ec5cce7f1c93ac4500bc4d80e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 461965
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

diff --git a/data/oled/icons/standby.png b/data/oled/icons/standby.png
deleted file mode 100644
index 12becb1ec6e532f11e3798f9394c70e112cef701..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 615836
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
ABLDyZ

diff --git a/data/oled/themes/400x240/Default.otheme b/data/oled/themes/400x240/Default.otheme
new file mode 100644
index 000000000..98a12dd24
--- /dev/null
+++ b/data/oled/themes/400x240/Default.otheme
@@ -0,0 +1,72 @@
+# align none 0, align left 1, align center 2, align right 3
+# if align > 0 x position will be ignore
+# if glcd_background != "" background color will be ignore
+# if glcd_position_settings != false this allow to edit position settings over gui
+glcd_color_fg_red=100
+glcd_color_fg_green=100
+glcd_color_fg_blue=100
+glcd_color_bg_red=0    
+glcd_color_bg_green=0
+glcd_color_bg_blue=0   
+glcd_color_bar_red=62
+glcd_color_bar_green=62
+glcd_color_bar_blue=62
+glcd_font=/share/fonts/neutrino.ttf
+glcd_background=
+glcd_align_channel=2
+glcd_align_epg=2
+glcd_align_duration=0
+glcd_align_start=0
+glcd_align_end=0
+glcd_align_time=2
+glcd_show_progressbar=true
+glcd_show_duration=false
+glcd_show_start=false
+glcd_show_end=false
+glcd_show_time=true
+glcd_show_weather=false
+glcd_percent_channel=25
+glcd_channel_x_position=0
+glcd_channel_y_position=19
+glcd_percent_epg=15
+glcd_epg_x_position=0
+glcd_epg_y_position=97
+glcd_percent_duration=0
+glcd_duration_x_position=0
+glcd_duration_y_position=0
+glcd_percent_start=0
+glcd_start_x_position=0
+glcd_start_y_position=0
+glcd_percent_end=0
+glcd_end_x_position=0
+glcd_end_y_position=0
+glcd_percent_time=25
+glcd_time_x_position=0
+glcd_time_y_position=172
+glcd_percent_bar=20
+glcd_bar_x_position=0
+glcd_bar_y_position=157
+glcd_bar_width=400
+glcd_percent_logo=25
+glcd_logo_x_position=0
+glcd_logo_y_position=19
+glcd_percent_smalltext=4
+glcd_smalltext_y_position=4
+glcd_rec_icon_x_position=332
+glcd_mute_icon_x_position=228
+glcd_ts_icon_x_position=369
+glcd_timer_icon_x_position=278
+glcd_ecm_icon_x_position=83
+glcd_dd_icon_x_position=198
+glcd_txt_icon_x_position=161
+glcd_cam_icon_x_position=123
+glcd_digital_clock_y_position=15
+glcd_size_simple_clock=40
+glcd_simple_clock_y_position=15
+glcd_weather_x_position_current=0
+glcd_weather_x_position_next=0
+glcd_weather_y_position=0
+glcd_weather_x_position_current_standby=8
+glcd_weather_x_position_next_standby=283
+glcd_weather_y_position_standby=131
+glcd_position_settings=true
diff --git a/data/oled/themes/400x240/Makefile.am b/data/oled/themes/400x240/Makefile.am
new file mode 100644
index 000000000..6723dca9c
--- /dev/null
+++ b/data/oled/themes/400x240/Makefile.am
@@ -0,0 +1,4 @@
+oledthemesdir = $(THEMESDIR)/oled
+
+oledthemes_DATA = \
+	Default.otheme
diff --git a/data/oled/themes/advanced.otheme b/data/oled/themes/480x320/Advanced.otheme
similarity index 100%
rename from data/oled/themes/advanced.otheme
rename to data/oled/themes/480x320/Advanced.otheme
diff --git a/data/oled/themes/default.otheme b/data/oled/themes/480x320/Default.otheme
similarity index 100%
rename from data/oled/themes/default.otheme
rename to data/oled/themes/480x320/Default.otheme
diff --git a/data/oled/themes/easy.otheme b/data/oled/themes/480x320/Easy.otheme
similarity index 100%
rename from data/oled/themes/easy.otheme
rename to data/oled/themes/480x320/Easy.otheme
diff --git a/data/oled/themes/480x320/Makefile.am b/data/oled/themes/480x320/Makefile.am
new file mode 100644
index 000000000..05499bde7
--- /dev/null
+++ b/data/oled/themes/480x320/Makefile.am
@@ -0,0 +1,18 @@
+oledthemesdir = $(THEMESDIR)/oled
+
+oledthemes_DATA = \
+	Default.otheme \
+	Advanced.otheme \
+	Easy.otheme \
+	Medium.otheme \
+	Simple.otheme \
+	Weather.otheme
+
+olediconsdir = $(ICONSDIR)/oled
+
+oledicons_DATA = \
+        advanced.png \
+        easy.png \
+        medium.png \
+        simple.png \
+        weather.png
diff --git a/data/oled/themes/medium.otheme b/data/oled/themes/480x320/Medium.otheme
similarity index 100%
rename from data/oled/themes/medium.otheme
rename to data/oled/themes/480x320/Medium.otheme
diff --git a/data/oled/themes/simple.otheme b/data/oled/themes/480x320/Simple.otheme
similarity index 100%
rename from data/oled/themes/simple.otheme
rename to data/oled/themes/480x320/Simple.otheme
diff --git a/data/oled/themes/weather.otheme b/data/oled/themes/480x320/Weather.otheme
similarity index 100%
rename from data/oled/themes/weather.otheme
rename to data/oled/themes/480x320/Weather.otheme
diff --git a/data/oled/icons/advanced.png b/data/oled/themes/480x320/advanced.png
similarity index 100%
rename from data/oled/icons/advanced.png
rename to data/oled/themes/480x320/advanced.png
diff --git a/data/oled/icons/easy.png b/data/oled/themes/480x320/easy.png
similarity index 100%
rename from data/oled/icons/easy.png
rename to data/oled/themes/480x320/easy.png
diff --git a/data/oled/icons/medium.png b/data/oled/themes/480x320/medium.png
similarity index 100%
rename from data/oled/icons/medium.png
rename to data/oled/themes/480x320/medium.png
diff --git a/data/oled/icons/simple.png b/data/oled/themes/480x320/simple.png
similarity index 100%
rename from data/oled/icons/simple.png
rename to data/oled/themes/480x320/simple.png
diff --git a/data/oled/icons/weather.png b/data/oled/themes/480x320/weather.png
similarity index 100%
rename from data/oled/icons/weather.png
rename to data/oled/themes/480x320/weather.png
diff --git a/data/oled/themes/800x480/Default.otheme b/data/oled/themes/800x480/Default.otheme
new file mode 100644
index 000000000..012936286
--- /dev/null
+++ b/data/oled/themes/800x480/Default.otheme
@@ -0,0 +1,72 @@
+# align none 0, align left 1, align center 2, align right 3
+# if align > 0 x position will be ignore
+# if glcd_background != "" background color will be ignore
+# if glcd_position_settings != false this allow to edit position settings over gui
+glcd_color_fg_red=100
+glcd_color_fg_green=100
+glcd_color_fg_blue=100
+glcd_color_bg_red=0    
+glcd_color_bg_green=0
+glcd_color_bg_blue=0   
+glcd_color_bar_red=62
+glcd_color_bar_green=62
+glcd_color_bar_blue=62
+glcd_font=/share/fonts/neutrino.ttf
+glcd_background=
+glcd_align_channel=2
+glcd_align_epg=2
+glcd_align_duration=0
+glcd_align_start=0
+glcd_align_end=0
+glcd_align_time=2
+glcd_show_progressbar=true
+glcd_show_duration=false
+glcd_show_start=false
+glcd_show_end=false
+glcd_show_time=true
+glcd_show_weather=false
+glcd_percent_channel=25
+glcd_channel_x_position=0
+glcd_channel_y_position=38
+glcd_percent_epg=15
+glcd_epg_x_position=0
+glcd_epg_y_position=195
+glcd_percent_duration=0
+glcd_duration_x_position=0
+glcd_duration_y_position=0
+glcd_percent_start=0
+glcd_start_x_position=0
+glcd_start_y_position=0
+glcd_percent_end=0
+glcd_end_x_position=0
+glcd_end_y_position=0
+glcd_percent_time=25
+glcd_time_x_position=0
+glcd_time_y_position=345
+glcd_percent_bar=20
+glcd_bar_x_position=0
+glcd_bar_y_position=315
+glcd_bar_width=800
+glcd_percent_logo=25
+glcd_logo_x_position=0
+glcd_logo_y_position=38
+glcd_percent_smalltext=4
+glcd_smalltext_y_position=9
+glcd_rec_icon_x_position=663
+glcd_mute_icon_x_position=455
+glcd_ts_icon_x_position=738
+glcd_timer_icon_x_position=555
+glcd_ecm_icon_x_position=166
+glcd_dd_icon_x_position=397
+glcd_txt_icon_x_position=322
+glcd_cam_icon_x_position=247
+glcd_digital_clock_y_position=30
+glcd_size_simple_clock=40
+glcd_simple_clock_y_position=30
+glcd_weather_x_position_current=0
+glcd_weather_x_position_next=0
+glcd_weather_y_position=0
+glcd_weather_x_position_current_standby=10
+glcd_weather_x_position_next_standby=567
+glcd_weather_y_position_standby=263
+glcd_position_settings=true
diff --git a/data/oled/themes/800x480/Makefile.am b/data/oled/themes/800x480/Makefile.am
new file mode 100644
index 000000000..6723dca9c
--- /dev/null
+++ b/data/oled/themes/800x480/Makefile.am
@@ -0,0 +1,4 @@
+oledthemesdir = $(THEMESDIR)/oled
+
+oledthemes_DATA = \
+	Default.otheme
diff --git a/data/oled/themes/Makefile.am b/data/oled/themes/Makefile.am
index f39a3ccb9..fd92a7b7c 100644
--- a/data/oled/themes/Makefile.am
+++ b/data/oled/themes/Makefile.am
@@ -1,9 +1,13 @@
-installdir = $(THEMESDIR)/oled
-
-install_DATA = \
-	advanced.otheme \
-	default.otheme \
-	easy.otheme \
-	medium.otheme \
-	simple.otheme \
-	weather.otheme
+SUBDIRS =
+if BOXMODEL_VUUNO4KSE
+SUBDIRS += 400x240
+endif
+if BOXMODEL_VUSOLO4K
+SUBDIRS += 480x320
+endif
+if BOXMODEL_VUDUO4K
+SUBDIRS += 480x320
+endif
+if BOXMODEL_VUULTIMO4K
+SUBDIRS += 800x480
+endif
diff --git a/src/gui/glcdthemes.cpp b/src/gui/glcdthemes.cpp
index 81747ffb8..0f597d45e 100644
--- a/src/gui/glcdthemes.cpp
+++ b/src/gui/glcdthemes.cpp
@@ -186,7 +186,7 @@ int CGLCDThemes::Show()
 	//set default theme
 	std::string default_theme = DEFAULT_OLED_THEME;
 	if (default_theme.empty())
-		default_theme = "default";
+		default_theme = "Default";
 	CMenuForwarder* fw = new CMenuForwarder(LOCALE_COLORTHEMEMENU_NEUTRINO_THEME, true, default_theme.c_str(), this, "default_theme", CRCInput::RC_red);
 	themes.addItem(fw);
 	fw->setHint("", LOCALE_COLORTHEMEMENU_NEUTRINO_THEME_HINT);
@@ -265,7 +265,7 @@ bool CGLCDThemes::applyDefaultTheme()
 {
 	g_settings.glcd_theme_name = DEFAULT_OLED_THEME;
 	if (g_settings.glcd_theme_name.empty())
-		g_settings.glcd_theme_name = "default";
+		g_settings.glcd_theme_name = "Default";
 	std::string default_theme = THEMESDIR "/oled/" + g_settings.glcd_theme_name + ".otheme";
 	if(themefile.loadConfig(default_theme)){
 		getTheme(themefile);