mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-03 02:41:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

- osd_setup: move channellist_show_channellogo to new logo menu; ...

Browse Source 
align locales

 Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2017-05-23 17:58:53 +02:00
committed by Thilo Graf
parent 63f507b38b
commit 26c6861d12
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/locale/deutsch.locale
View File

@@ -1085,6 +1085,7 @@ 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_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_setup Wählen Sie die Anzeigeoptionen für die Kanalliste
menu.hint_channellist_show_channellogo Senderlogos aktivieren/deaktivieren. menu.hint_channellist_show_channellogo Senderlogos aktivieren/deaktivieren.
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_channelnumber Zeigt Kanalnummer in der Kanalliste.
menu.hint_channellist_show_empty_favs Zeigt oder versteckt leere Bouquets in den Favoriten 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 menu.hint_channellist_show_infobox Zeigt oder versteckt das untere Sendungsfenster

1
data/locale/english.locale
View File

@@ -1084,6 +1084,7 @@ menu.hint_channellist_mode Use the selected channel list mode on startup if last
menu.hint_channellist_mode_radio Use the selected channel list mode on startup if last mode is Radio 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_setup Configure channel list GUI options
menu.hint_channellist_show_channellogo Enable/disable channel logos. menu.hint_channellist_show_channellogo Enable/disable channel logos.
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_channelnumber Show channel number in channel list
menu.hint_channellist_show_empty_favs Show or hide empty bouquets in favorites 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 menu.hint_channellist_show_infobox Show or hide bottom infobox of channellist

11
src/gui/osd_setup.cpp
View File

@@ -1182,12 +1182,20 @@ void COsdSetup::showOsdChannellogosSetup(CMenuWidget *menu_channellogos)
{ {
menu_channellogos->addIntroItems(LOCALE_MISCSETTINGS_CHANNELLOGOS); menu_channellogos->addIntroItems(LOCALE_MISCSETTINGS_CHANNELLOGOS);
CMenuOptionChooser * mc;
CMenuForwarder * mf; CMenuForwarder * mf;
// logo directory // logo directory
mf = new CMenuForwarder(LOCALE_MISCSETTINGS_INFOBAR_LOGO_HDD_DIR, true, g_settings.logo_hdd_dir, this, "logo_dir"); 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); mf->setHint("", LOCALE_MENU_HINT_INFOBAR_LOGO_DIR);
menu_channellogos->addItem(mf); 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 // infobar
@@ -1342,10 +1350,13 @@ void COsdSetup::showOsdChanlistSetup(CMenuWidget *menu_chanlist)
menu_chanlist->addItem(mc); menu_chanlist->addItem(mc);
channellistNotifier->addItem(mc); channellistNotifier->addItem(mc);
//NI
#if 0
//show channel logo //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 = 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); mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_SHOW_CHANNELLOGO);
menu_chanlist->addItem(mc); menu_chanlist->addItem(mc);
#endif
//show numbers //show numbers
mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_SHOW_CHANNELNUMBER, &g_settings.channellist_show_numbers, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_SHOW_CHANNELNUMBER, &g_settings.channellist_show_numbers, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);