From 4965e8a8459d69b8954aafcb2d410b81359d3e70 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 23 May 2017 17:58:53 +0200 Subject: [PATCH] osd_setup: move channellist_show_channellogo to new logo menu; ... align locales Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/fe50c85a3b32a6fa9e0d5034fcbb25dc49741d08 Author: vanhofen Date: 2017-05-23 (Tue, 23 May 2017) Origin message was: ------------------ - osd_setup: move channellist_show_channellogo to new logo menu; ... align locales --- data/locale/deutsch.locale | 2 +- data/locale/english.locale | 2 +- src/gui/osd_setup.cpp | 11 +++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 1465cd678..80b77ca28 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1130,7 +1130,7 @@ menu.hint_channellist_foot Definiert, welche Informationen im unteren Sendungsfe menu.hint_channellist_mode Wählen Sie die Start-Kanalliste im TV-Modus menu.hint_channellist_mode_radio Wählen Sie die Start-Kanalliste im Radio-Modus menu.hint_channellist_setup Wählen Sie die Anzeigeoptionen für die Kanalliste -menu.hint_channellist_show_channellogo Zeigt Senderlogos in der Kanalliste. +menu.hint_channellist_show_channellogo Zeigt Senderlogos in Kanalliste, Eventliste, EPG-Plus, EPG-Ansicht und Moviebrowser. 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_infobox Zeigt oder versteckt das untere Sendungsfenster diff --git a/data/locale/english.locale b/data/locale/english.locale index 85add3379..abd504807 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1130,7 +1130,7 @@ menu.hint_channellist_foot Show additional information\nin bottom box menu.hint_channellist_mode Use the selected channel list mode on startup if last mode is TV menu.hint_channellist_mode_radio Use the selected channel list mode on startup if last mode is Radio menu.hint_channellist_setup Configure channel list GUI options -menu.hint_channellist_show_channellogo Show channel logos in channel list +menu.hint_channellist_show_channellogo Show channel logos in channellist, eventlist, EPG Plus, EPG-viewer and moviebrowser 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_infobox Show or hide bottom infobox of channellist diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index 13013ee20..32e7c31e7 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -1205,12 +1205,20 @@ void COsdSetup::showOsdChannellogosSetup(CMenuWidget *menu_channellogos) { menu_channellogos->addIntroItems(LOCALE_MISCSETTINGS_CHANNELLOGOS); + CMenuOptionChooser * mc; CMenuForwarder * mf; // logo directory mf = new CMenuForwarder(LOCALE_MISCSETTINGS_INFOBAR_LOGO_HDD_DIR, true, g_settings.logo_hdd_dir, this, "logo_dir"); mf->setHint("", LOCALE_MENU_HINT_INFOBAR_LOGO_DIR); menu_channellogos->addItem(mf); + + 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->setHint("", LOCALE_MENU_HINT_CHANNELLIST_SHOW_CHANNELLOGO); + menu_channellogos->addItem(mc); } //infobar @@ -1381,10 +1389,13 @@ void COsdSetup::showOsdChanlistSetup(CMenuWidget *menu_chanlist) menu_chanlist->addItem(mc); channellistNotifier->addItem(mc); +//NI +#if 0 //show channel logo mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_SHOW_CHANNELLOGO, &g_settings.channellist_show_channellogo, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_SHOW_CHANNELLOGO); menu_chanlist->addItem(mc); +#endif //show numbers mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_SHOW_CHANNELNUMBER, &g_settings.channellist_show_numbers, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);