diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index d69547541..5f66b0eb5 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -292,8 +292,6 @@ channellist.edit Bearbeiten channellist.epgtext_align_left links channellist.epgtext_align_right rechts channellist.extended Sendungsfortschritt anzeigen -channellist.extended_colored mit farbigem Fortschrittsbalken -channellist.extended_simple mit einfachem Fortschrittsbalken channellist.favs Favoriten channellist.foot Kanalinformationen channellist.foot_freq Tuning-Parameter diff --git a/data/locale/english.locale b/data/locale/english.locale index 1b707d7fa..e0aee804e 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -292,8 +292,6 @@ channellist.edit Edit channellist.epgtext_align_left left channellist.epgtext_align_right right channellist.extended Show event progress -channellist.extended_colored with colored progressbar -channellist.extended_simple with simple progressbar channellist.favs Favorites channellist.foot Channel information channellist.foot_freq Sat/Freq info diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index c07c6a7cc..7482ea8a1 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -434,16 +434,9 @@ const CMenuOptionChooser::keyval INFOBAR_CASYSTEM_MODE_OPTIONS[INFOBAR_CASYSTEM_ { 0, LOCALE_OPTIONS_ON }, { 1, LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_MODE }, { 2, LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_MINI }, - { 3, LOCALE_OPTIONS_OFF }, + { 3, LOCALE_OPTIONS_OFF } }; -#if 0 //not used -#define SHOW_INFOMENU_MODE_OPTION_COUNT 2 -const CMenuOptionChooser::keyval SHOW_INFOMENU_MODE_OPTIONS[SHOW_INFOMENU_MODE_OPTION_COUNT] = -{ - { 0, LOCALE_MAINMENU_HEAD }, - { 1, LOCALE_MAINMENU_SERVICE }, -}; -#endif + #define MENU_CORNERSETTINGS_TYPE_OPTION_COUNT 2 const CMenuOptionChooser::keyval MENU_CORNERSETTINGS_TYPE_OPTIONS[MENU_CORNERSETTINGS_TYPE_OPTION_COUNT] = { @@ -513,15 +506,7 @@ const CMenuOptionChooser::keyval CHANNELLIST_EPGTEXT_ALIGN_RIGHT_OPTIONS[CHANNE { 0 , LOCALE_CHANNELLIST_EPGTEXT_ALIGN_LEFT }, { 1 , LOCALE_CHANNELLIST_EPGTEXT_ALIGN_RIGHT } }; -#if 0 //not used -#define CHANNELLIST_EXTENDED_OPTIONS_COUNT 3 -const CMenuOptionChooser::keyval CHANNELLIST_EXTENDED_OPTIONS[CHANNELLIST_EXTENDED_OPTIONS_COUNT]= -{ - { 0, LOCALE_OPTIONS_OFF }, //none - { 1, LOCALE_CHANNELLIST_EXTENDED_SIMPLE }, //unicolor - { 2, LOCALE_CHANNELLIST_EXTENDED_COLORED } //colored -}; -#endif + #define OPTIONS_COLORED_EVENTS_OPTION_COUNT 3 const CMenuOptionChooser::keyval OPTIONS_COLORED_EVENTS_OPTIONS[OPTIONS_COLORED_EVENTS_OPTION_COUNT] = { diff --git a/src/system/locals.h b/src/system/locals.h index ba28d90f2..fbb0f880d 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -319,8 +319,6 @@ typedef enum LOCALE_CHANNELLIST_EPGTEXT_ALIGN_LEFT, LOCALE_CHANNELLIST_EPGTEXT_ALIGN_RIGHT, LOCALE_CHANNELLIST_EXTENDED, - LOCALE_CHANNELLIST_EXTENDED_COLORED, - LOCALE_CHANNELLIST_EXTENDED_SIMPLE, LOCALE_CHANNELLIST_FAVS, LOCALE_CHANNELLIST_FOOT, LOCALE_CHANNELLIST_FOOT_FREQ, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 1a86f025a..24dd56181 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -319,8 +319,6 @@ const char * locale_real_names[] = "channellist.epgtext_align_left", "channellist.epgtext_align_right", "channellist.extended", - "channellist.extended_colored", - "channellist.extended_simple", "channellist.favs", "channellist.foot", "channellist.foot_freq",