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

osd_setup: cleanup unused

Browse Source 
- channellist.extended_colored
- channellist.extended_simple

 Conflicts:
	data/locale/english.locale

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
Frankenstone
2021-04-27 22:17:42 +02:00
committed by Thilo Graf
parent cf675f4cc2
commit 4688227461
5 changed files with 6 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/locale/deutsch.locale
View File

@@ -272,8 +272,6 @@ channellist.edit Bearbeiten
channellist.epgtext_align_left links channellist.epgtext_align_left links
channellist.epgtext_align_right rechts channellist.epgtext_align_right rechts
channellist.extended Sendungsfortschritt anzeigen channellist.extended Sendungsfortschritt anzeigen
channellist.extended_colored mit farbigem Fortschrittsbalken
channellist.extended_simple mit einfachem Fortschrittsbalken
channellist.favs Favoriten channellist.favs Favoriten
channellist.foot Kanalinformationen channellist.foot Kanalinformationen
channellist.foot_freq Tuning-Parameter channellist.foot_freq Tuning-Parameter

8
data/locale/english.locale
View File

@@ -269,11 +269,9 @@ channellist.additional_on on
channellist.additional_on_minitv on (with MiniTV) channellist.additional_on_minitv on (with MiniTV)
channellist.current_tp Current transponder channellist.current_tp Current transponder
channellist.edit Edit channellist.edit Edit
channellist.epgtext_align_left Left channellist.epgtext_align_left left
channellist.epgtext_align_right Right channellist.epgtext_align_right right
channellist.extended Show Event Progress channellist.extended Show event progress
channellist.extended_colored with colored progressbar
channellist.extended_simple with simple progressbar
channellist.favs Favorites channellist.favs Favorites
channellist.foot Channel Information channellist.foot Channel Information
channellist.foot_freq Sat/Freq Info channellist.foot_freq Sat/Freq Info

21
src/gui/osd_setup.cpp
View File

@@ -431,16 +431,9 @@ const CMenuOptionChooser::keyval INFOBAR_CASYSTEM_MODE_OPTIONS[INFOBAR_CASYSTEM_
{ 0, LOCALE_OPTIONS_ON }, { 0, LOCALE_OPTIONS_ON },
{ 1, LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_MODE }, { 1, LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_MODE },
{ 2, LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_MINI }, { 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 #define MENU_CORNERSETTINGS_TYPE_OPTION_COUNT 2
const CMenuOptionChooser::keyval MENU_CORNERSETTINGS_TYPE_OPTIONS[MENU_CORNERSETTINGS_TYPE_OPTION_COUNT] = 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 }, { 0 , LOCALE_CHANNELLIST_EPGTEXT_ALIGN_LEFT },
{ 1 , LOCALE_CHANNELLIST_EPGTEXT_ALIGN_RIGHT } { 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 #define OPTIONS_COLORED_EVENTS_OPTION_COUNT 3
const CMenuOptionChooser::keyval OPTIONS_COLORED_EVENTS_OPTIONS[OPTIONS_COLORED_EVENTS_OPTION_COUNT] = const CMenuOptionChooser::keyval OPTIONS_COLORED_EVENTS_OPTIONS[OPTIONS_COLORED_EVENTS_OPTION_COUNT] =
{ {

2
src/system/locals.h
View File

@@ -299,8 +299,6 @@ typedef enum
LOCALE_CHANNELLIST_EPGTEXT_ALIGN_LEFT, LOCALE_CHANNELLIST_EPGTEXT_ALIGN_LEFT,
LOCALE_CHANNELLIST_EPGTEXT_ALIGN_RIGHT, LOCALE_CHANNELLIST_EPGTEXT_ALIGN_RIGHT,
LOCALE_CHANNELLIST_EXTENDED, LOCALE_CHANNELLIST_EXTENDED,
LOCALE_CHANNELLIST_EXTENDED_COLORED,
LOCALE_CHANNELLIST_EXTENDED_SIMPLE,
LOCALE_CHANNELLIST_FAVS, LOCALE_CHANNELLIST_FAVS,
LOCALE_CHANNELLIST_FOOT, LOCALE_CHANNELLIST_FOOT,
LOCALE_CHANNELLIST_FOOT_FREQ, LOCALE_CHANNELLIST_FOOT_FREQ,

2
src/system/locals_intern.h
View File

@@ -299,8 +299,6 @@ const char * locale_real_names[] =
"channellist.epgtext_align_left", "channellist.epgtext_align_left",
"channellist.epgtext_align_right", "channellist.epgtext_align_right",
"channellist.extended", "channellist.extended",
"channellist.extended_colored",
"channellist.extended_simple",
"channellist.favs", "channellist.favs",
"channellist.foot", "channellist.foot",
"channellist.foot_freq", "channellist.foot_freq",