diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 622d74881..eeb3f38c7 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1205,7 +1205,6 @@ menu.hint_channellist_fonts Ändern Sie die Schriftgrößen in der Kanalliste menu.hint_channellist_foot Definiert, welche Informationen im unteren Sendungsfenster angezeigt werden sollen 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_primetime Was läuft zur Hauptzeit 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. diff --git a/data/locale/english.locale b/data/locale/english.locale index 2a162a747..ac8bddd6b 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1205,7 +1205,6 @@ menu.hint_channellist_fonts Change channel list font sizes 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_primetime Show what's on primetime 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 diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index dff791820..9a579cefc 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -2333,12 +2333,6 @@ void CChannelList::paintBody() frameBuffer->paintBoxRel(x, y+theight, width, height-footerHeight-theight, COL_MENUCONTENT_PLUS_0); if (g_settings.channellist_additional) { -//NI -#if 0 - // disable displayNext - if (!g_settings.channellist_primetime) - displayNext = false; -#endif // paint background for right box frameBuffer->paintBoxRel(x+width,y+theight+pig_height,infozone_width,infozone_height,COL_MENUCONTENT_PLUS_0); } diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index 68067492b..caf0de1b8 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -1387,11 +1387,6 @@ void COsdSetup::showOsdChanlistSetup(CMenuWidget *menu_chanlist) mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_ADDITIONAL); menu_chanlist->addItem(mc); - // channellist primetime - mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_PRIMETIME, &g_settings.channellist_primetime, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); - mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_PRIMETIME); - menu_chanlist->addItem(mc); - // epg align mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_CHANNELLIST_EPGTEXT_ALIGN, &g_settings.channellist_epgtext_align_right, CHANNELLIST_EPGTEXT_ALIGN_RIGHT_OPTIONS, CHANNELLIST_EPGTEXT_ALIGN_RIGHT_OPTIONS_COUNT, true); mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_EPG_ALIGN); diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 9ced1b00e..b5397caff 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -869,7 +869,6 @@ int CNeutrinoApp::loadSetup(const char * fname) 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); - g_settings.channellist_primetime = configfile.getInt32("channellist_primetime", 1); //screen configuration g_settings.osd_resolution = (osd_resolution_tmp == -1) ? configfile.getInt32("osd_resolution", 0) : osd_resolution_tmp; @@ -1713,7 +1712,6 @@ void CNeutrinoApp::saveSetup(const char * fname) 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); - configfile.setInt32("channellist_primetime", g_settings.channellist_primetime); //screen configuration configfile.setInt32("osd_resolution" , COsdHelpers::getInstance()->g_settings_osd_resolution_save); diff --git a/src/system/locals.h b/src/system/locals.h index 33341ee93..fd3aa6457 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -1232,7 +1232,6 @@ typedef enum LOCALE_MENU_HINT_CHANNELLIST_FOOT, LOCALE_MENU_HINT_CHANNELLIST_MODE, LOCALE_MENU_HINT_CHANNELLIST_MODE_RADIO, - LOCALE_MENU_HINT_CHANNELLIST_PRIMETIME, LOCALE_MENU_HINT_CHANNELLIST_SETUP, LOCALE_MENU_HINT_CHANNELLIST_SHOW_CHANNELLOGO, LOCALE_MENU_HINT_CHANNELLIST_SHOW_CHANNELNUMBER, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 7b4fb201b..17f0eee9b 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -1232,7 +1232,6 @@ const char * locale_real_names[] = "menu.hint_channellist_foot", "menu.hint_channellist_mode", "menu.hint_channellist_mode_radio", - "menu.hint_channellist_primetime", "menu.hint_channellist_setup", "menu.hint_channellist_show_channellogo", "menu.hint_channellist_show_channelnumber", diff --git a/src/system/settings.h b/src/system/settings.h index bece6ac44..cedd0e5fb 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -666,7 +666,6 @@ struct SNeutrinoSettings int channellist_show_infobox; int channellist_show_numbers; int channellist_show_res_icon; - int channellist_primetime; int repeat_blocker; int repeat_genericblocker; #define LONGKEYPRESS_OFF 499