From 4688227461e168a44284e62fe6b2e77d8c7457e5 Mon Sep 17 00:00:00 2001 From: Frankenstone Date: Tue, 27 Apr 2021 22:17:42 +0200 Subject: [PATCH] osd_setup: cleanup unused - channellist.extended_colored - channellist.extended_simple Conflicts: data/locale/english.locale Signed-off-by: Thilo Graf --- data/locale/deutsch.locale | 2 -- data/locale/english.locale | 8 +++----- src/gui/osd_setup.cpp | 21 +++------------------ src/system/locals.h | 2 -- src/system/locals_intern.h | 2 -- 5 files changed, 6 insertions(+), 29 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 4bcf33236..b4eb4b1f5 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -272,8 +272,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 9fb898784..aba8a636c 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -269,11 +269,9 @@ channellist.additional_on on channellist.additional_on_minitv on (with MiniTV) channellist.current_tp Current transponder 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.epgtext_align_left left +channellist.epgtext_align_right right +channellist.extended Show event progress 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 e5d7c4973..77223eb8c 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -431,16 +431,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] = { @@ -510,15 +503,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 a2adddc88..ac65f77b3 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -299,8 +299,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 4dcdf1f20..c32ecf6ab 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -299,8 +299,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",