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

-add mini mode to ca display

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@717 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
satbaby
2010-08-10 14:27:37 +00:00
parent acb8750f5b
commit 5da483cb25
7 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/locale/deutsch.locale
View File

@@ -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

1
data/locale/english.locale
View File

@@ -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

2
data/locale/polski.locale
View File

@@ -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

4
src/gui/infoviewer.cpp
View File

@@ -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;

5
src/neutrino_menue.cpp
View File

@@ -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 )

1
src/system/locals.h
View File

@@ -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,

1
src/system/locals_intern.h
View File

@@ -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",