diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index a6b3bd550..66a09a32b 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -711,6 +711,7 @@ miscsettings.head Diverse Einstellungen miscsettings.hwsections EPG Daten per Hardware filtern miscsettings.infobar Infobar miscsettings.infobar_casystem_display CA-System Anzeige +miscsettings.infobar_casystem_mini Mini miscsettings.infobar_casystem_mode Diskret miscsettings.infobar_disp_0 Kein Logo miscsettings.infobar_disp_1 Logo in der Nummernbox diff --git a/data/locale/english.locale b/data/locale/english.locale index 8851b6e71..563028b14 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -514,6 +514,7 @@ miscsettings.head Misc settings miscsettings.hwsections use hardware sections miscsettings.infobar Infobar miscsettings.infobar_casystem_display CA-System Display +miscsettings.infobar_casystem_mini mini miscsettings.infobar_casystem_mode discreet miscsettings.infobar_disp_0 without Logo miscsettings.infobar_disp_1 Logo 1 diff --git a/data/locale/polski.locale b/data/locale/polski.locale index 809a5147a..623263dfc 100644 --- a/data/locale/polski.locale +++ b/data/locale/polski.locale @@ -518,6 +518,8 @@ miscsettings.head Ustawienia różne miscsettings.hwsections użyj sekcji hardware miscsettings.infobar Belka informacyjna miscsettings.infobar_casystem_display Ikony systemów kodowania +miscsettings.infobar_casystem_mini mini +miscsettings.infobar_casystem_mode dyskretne miscsettings.infobar_disp_0 brak miscsettings.infobar_disp_1 pozycja pierwsza miscsettings.infobar_disp_2 pozycja druga diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index 9725b0479..da74650d3 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -1974,6 +1974,10 @@ void CInfoViewer::showIcon_CA_Status (int notfirst) showOne_CAIcon(fta); return; } + else if(g_settings.casystem_display == 3){ + return; + } + char * white = (char *) "white"; char * yellow = (char *) "yellow"; static int icon_space_offset = 0; diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index 8390324cb..dd40ee3f8 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -2452,12 +2452,13 @@ const CMenuOptionChooser::keyval OSD_PRESET_OPTIONS[OSD_PRESET_OPTIONS_COUNT] = { 1, LOCALE_COLORMENU_HD_PRESET } }; -#define INFOBAR_CASYSTEM_MODE_OPTION_COUNT 3 +#define INFOBAR_CASYSTEM_MODE_OPTION_COUNT 4 const CMenuOptionChooser::keyval INFOBAR_CASYSTEM_MODE_OPTIONS[INFOBAR_CASYSTEM_MODE_OPTION_COUNT] = { { 0, LOCALE_OPTIONS_ON }, { 1, LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_MODE }, - { 2, LOCALE_OPTIONS_OFF }, + { 2, LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_MINI }, + { 3, LOCALE_OPTIONS_OFF }, }; void CNeutrinoApp::InitColorSettings(CMenuWidget &colorSettings, CMenuWidget &fontSettings ) diff --git a/src/system/locals.h b/src/system/locals.h index ecb7f924a..e7b2b0b39 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -548,6 +548,7 @@ typedef enum { LOCALE_MISCSETTINGS_HWSECTIONS, LOCALE_MISCSETTINGS_INFOBAR, LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_DISPLAY, + LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_MINI, LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_MODE, LOCALE_MISCSETTINGS_INFOBAR_DISP_0, LOCALE_MISCSETTINGS_INFOBAR_DISP_1, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 75b62448d..a85711ee9 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -548,6 +548,7 @@ const char *locale_real_names[] = { "miscsettings.hwsections", "miscsettings.infobar", "miscsettings.infobar_casystem_display", + "miscsettings.infobar_casystem_mini", "miscsettings.infobar_casystem_mode", "miscsettings.infobar_disp_0", "miscsettings.infobar_disp_1",