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 e85c206c8..000000000 Binary files a/data/oled/icons/blank.png and /dev/null differ diff --git a/data/oled/icons/standby.png b/data/oled/icons/standby.png deleted file mode 100644 index 12becb1ec..000000000 Binary files a/data/oled/icons/standby.png and /dev/null differ 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);