diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index c064bf5c4..d39c48d5c 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -317,6 +317,7 @@ channellist.sats Satelliten channellist.show_channellogo Senderlogos zeigen channellist.show_channelnumber Kanalnummern zeigen channellist.show_empty_favs Zeige leere Favoriten-Bouquets +channellist.show_eventlogo Eventlogos zeigen channellist.show_infobox Sendungsfenster anzeigen channellist.show_res_icon Auflösung signalisieren channellist.since seit @@ -1200,6 +1201,7 @@ menu.hint_channellist_setup Wählen Sie die Anzeigeoptionen für die Kanalliste menu.hint_channellist_show_channellogo Senderlogos aktivieren/deaktivieren. menu.hint_channellist_show_channelnumber Zeigt Kanalnummer in der Kanalliste. menu.hint_channellist_show_empty_favs Zeigt oder versteckt leere Bouquets in den Favoriten +menu.hint_channellist_show_eventlogo Eventlogos aktivieren/deaktivieren. menu.hint_channellist_show_infobox Zeigt oder versteckt das untere Sendungsfenster menu.hint_channellist_show_res_icon Zeigt oder versteckt das Icon zur Signalisierung der Auflösung menu.hint_channellogos_setup Wählen Sie die globalen Optionen für die Senderlogos aus diff --git a/data/locale/english.locale b/data/locale/english.locale index 0f8e8c321..1b84018ff 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -317,6 +317,7 @@ channellist.sats Satellites channellist.show_channellogo Show channel logos channellist.show_channelnumber Show channel numbers channellist.show_empty_favs Show empty favorites bouquets +channellist.show_eventlogo Show event logos channellist.show_infobox Show bottom infobox channellist.show_res_icon Signalize resolution channellist.since since @@ -1200,6 +1201,7 @@ menu.hint_channellist_setup Configure channel list GUI options menu.hint_channellist_show_channellogo Enable/disable channel logos. menu.hint_channellist_show_channelnumber Show channel number in channel list menu.hint_channellist_show_empty_favs Show or hide empty bouquets in favorites +menu.hint_channellist_show_eventlogo Enable/disable event logos. menu.hint_channellist_show_infobox Show or hide bottom infobox of channellist menu.hint_channellist_show_res_icon Show or hide the icon to signalize resolution menu.hint_channellogos_setup Configure global channelogos options diff --git a/src/driver/pictureviewer/pictureviewer.cpp b/src/driver/pictureviewer/pictureviewer.cpp index 26fb984e9..9d399f1e3 100644 --- a/src/driver/pictureviewer/pictureviewer.cpp +++ b/src/driver/pictureviewer/pictureviewer.cpp @@ -538,6 +538,8 @@ bool CPictureViewer::GetLogoName(const uint64_t &ChannelID, const std::string &C // create eventname for eventlogos; Note: We don't process channellogos if any eventlogo was found. std::string EventName = ""; int mode = CNeutrinoApp::getInstance()->getMode(); + if (!g_settings.channellist_show_eventlogo) + enable_event_logo = false; if (enable_event_logo && (ChannelID || mode == NeutrinoModes::mode_ts)) { // TODO: fix eventlogo in moviebrowser diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index 6e00bb067..5fdd1d6b4 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -69,6 +69,10 @@ #include +// lcd4l-support +#include "driver/lcd4l.h" +extern CLCD4l *LCD4l; + extern CRemoteControl * g_RemoteControl; extern const char * locale_real_names[]; @@ -83,6 +87,7 @@ COsdSetup::COsdSetup(int wizard_mode) colorInfoclockNotifier = NULL; screensaverNotifier = NULL; channellistNotifier = NULL; + channellogoNotifier = NULL; infobarHddNotifier = NULL; osd_menu = NULL; submenu_menus = NULL; @@ -771,6 +776,7 @@ int COsdSetup::showOsdSetup() delete colorInfoclockNotifier; delete screensaverNotifier; delete channellistNotifier; + delete channellogoNotifier; delete infobarHddNotifier; delete osd_menu; return res; @@ -1218,6 +1224,7 @@ void COsdSetup::showOsdChannellogosSetup(CMenuWidget *menu_channellogos) { menu_channellogos->addIntroItems(LOCALE_MISCSETTINGS_CHANNELLOGOS); + channellogoNotifier = new COnOffNotifier(); CMenuOptionChooser * mc; CMenuForwarder * mf; @@ -1229,9 +1236,15 @@ void COsdSetup::showOsdChannellogosSetup(CMenuWidget *menu_channellogos) menu_channellogos->addItem(GenericMenuSeparatorLine); // show channellogos - mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_SHOW_CHANNELLOGO, &g_settings.channellist_show_channellogo, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); + mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_SHOW_CHANNELLOGO, &g_settings.channellist_show_channellogo, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, channellogoNotifier); mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_SHOW_CHANNELLOGO); menu_channellogos->addItem(mc); + + // show eventlogos + mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_SHOW_EVENTLOGO, &g_settings.channellist_show_eventlogo, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this); + mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_SHOW_EVENTLOGO); + menu_channellogos->addItem(mc); + channellogoNotifier->addItem(mc); } //infobar @@ -1628,6 +1641,10 @@ bool COsdSetup::changeNotify(const neutrino_locale_t OptionName, void * data) g_settings.show_ecm = 1; } + else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_CHANNELLIST_SHOW_EVENTLOGO)) + { + LCD4l->ResetParseID(); + } else if ((ARE_LOCALES_EQUAL(OptionName, LOCALE_MISCSETTINGS_INFOCLOCK)) || (ARE_LOCALES_EQUAL(OptionName, LOCALE_CLOCK_SIZE_HEIGHT)) || (ARE_LOCALES_EQUAL(OptionName, LOCALE_CLOCK_SECONDS))) { diff --git a/src/gui/osd_setup.h b/src/gui/osd_setup.h index d61080345..698f02e94 100644 --- a/src/gui/osd_setup.h +++ b/src/gui/osd_setup.h @@ -55,6 +55,7 @@ class COsdSetup : public CMenuTarget, public CChangeObserver COnOffNotifier* colorInfoclockNotifier; COnOffNotifier* screensaverNotifier; COnOffNotifier* channellistNotifier; + COnOffNotifier* channellogoNotifier; COnOffNotifier* infobarHddNotifier; CGenericMenuActivate casystemActivate; CGenericMenuActivate screensaverActivate; diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 127076c23..8bafc152f 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -864,6 +864,7 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.channellist_sort_mode = configfile.getInt32("channellist_sort_mode", 0);//sort mode: alpha, freq, sat g_settings.channellist_numeric_adjust = configfile.getInt32("channellist_numeric_adjust", 0); g_settings.channellist_show_channellogo = configfile.getInt32("channellist_show_channellogo", 1); + g_settings.channellist_show_eventlogo = configfile.getInt32("channellist_show_eventlogo", 1); g_settings.channellist_show_infobox = configfile.getInt32("channellist_show_infobox", 1); g_settings.channellist_show_numbers = configfile.getInt32("channellist_show_numbers", 1); g_settings.channellist_show_res_icon = configfile.getInt32("channellist_show_res_icon", 0); @@ -1683,6 +1684,7 @@ void CNeutrinoApp::saveSetup(const char * fname) configfile.setInt32("channellist_sort_mode", g_settings.channellist_sort_mode); configfile.setInt32("channellist_numeric_adjust", g_settings.channellist_numeric_adjust); configfile.setInt32("channellist_show_channellogo", g_settings.channellist_show_channellogo); + configfile.setInt32("channellist_show_eventlogo", g_settings.channellist_show_eventlogo); configfile.setInt32("channellist_show_infobox", g_settings.channellist_show_infobox); configfile.setInt32("channellist_show_numbers", g_settings.channellist_show_numbers); configfile.setInt32("channellist_show_res_icon", g_settings.channellist_show_res_icon); diff --git a/src/system/locals.h b/src/system/locals.h index 5a8a51b8f..e510dfb71 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -344,6 +344,7 @@ typedef enum LOCALE_CHANNELLIST_SHOW_CHANNELLOGO, LOCALE_CHANNELLIST_SHOW_CHANNELNUMBER, LOCALE_CHANNELLIST_SHOW_EMPTY_FAVS, + LOCALE_CHANNELLIST_SHOW_EVENTLOGO, LOCALE_CHANNELLIST_SHOW_INFOBOX, LOCALE_CHANNELLIST_SHOW_RES_ICON, LOCALE_CHANNELLIST_SINCE, @@ -1227,6 +1228,7 @@ typedef enum LOCALE_MENU_HINT_CHANNELLIST_SHOW_CHANNELLOGO, LOCALE_MENU_HINT_CHANNELLIST_SHOW_CHANNELNUMBER, LOCALE_MENU_HINT_CHANNELLIST_SHOW_EMPTY_FAVS, + LOCALE_MENU_HINT_CHANNELLIST_SHOW_EVENTLOGO, LOCALE_MENU_HINT_CHANNELLIST_SHOW_INFOBOX, LOCALE_MENU_HINT_CHANNELLIST_SHOW_RES_ICON, LOCALE_MENU_HINT_CHANNELLOGOS_SETUP, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 4f1d3a957..a3773634c 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -344,6 +344,7 @@ const char * locale_real_names[] = "channellist.show_channellogo", "channellist.show_channelnumber", "channellist.show_empty_favs", + "channellist.show_eventlogo", "channellist.show_infobox", "channellist.show_res_icon", "channellist.since", @@ -1227,6 +1228,7 @@ const char * locale_real_names[] = "menu.hint_channellist_show_channellogo", "menu.hint_channellist_show_channelnumber", "menu.hint_channellist_show_empty_favs", + "menu.hint_channellist_show_eventlogo", "menu.hint_channellist_show_infobox", "menu.hint_channellist_show_res_icon", "menu.hint_channellogos_setup", diff --git a/src/system/settings.h b/src/system/settings.h index 31b087cc0..87fce174d 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -655,6 +655,7 @@ struct SNeutrinoSettings int channellist_sort_mode; int channellist_numeric_adjust; int channellist_show_channellogo; + int channellist_show_eventlogo; int channellist_show_infobox; int channellist_show_numbers; int channellist_show_res_icon;