mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-09 14:48:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

add on/off menu for infobar var & hdd

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@561 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 13ab786661
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2010-05-03 (Mon, 03 May 2010)

Origin message was:
------------------
-add on/off menu for infobar var & hdd

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@561 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
Jacek Jendrzej
2010-05-03 11:32:03 +00:00
parent 1b8655c11e
commit a190f449dd
8 changed files with 38 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
data/locale/deutsch.locale
View File

@@ -714,7 +714,8 @@ miscsettings.infobar_disp_1 Logo in der Nummernbox
miscsettings.infobar_disp_2 Logo Infobar / Kanalnummer miscsettings.infobar_disp_2 Logo Infobar / Kanalnummer
miscsettings.infobar_disp_3 Logo Infobar / Signalbalken miscsettings.infobar_disp_3 Logo Infobar / Signalbalken
miscsettings.infobar_disp_log Infobar Dis. miscsettings.infobar_disp_log Infobar Dis.
miscsettings.infobar_sat_display Infobar Kabel-/Satellitenanbieter miscsettings.infobar_sat_display Kabel-/Satellitenanbieter
miscsettings.infobar_show_var_hdd Füllstandanzeige (var & hdd )
miscsettings.noaviawatchdog AVIA-Watchdog aktivieren miscsettings.noaviawatchdog AVIA-Watchdog aktivieren
miscsettings.noenxwatchdog eNX-Watchdog aktivieren miscsettings.noenxwatchdog eNX-Watchdog aktivieren
miscsettings.pmtupdate PMT Aktualisierung verwenden miscsettings.pmtupdate PMT Aktualisierung verwenden

1
data/locale/english.locale
View File

@@ -516,6 +516,7 @@ miscsettings.infobar_disp_2 Logo 2
miscsettings.infobar_disp_3 Logo 3 miscsettings.infobar_disp_3 Logo 3
miscsettings.infobar_disp_log Infoview Dis. miscsettings.infobar_disp_log Infoview Dis.
miscsettings.infobar_sat_display Satellite display on infobar miscsettings.infobar_sat_display Satellite display on infobar
miscsettings.infobar_show_var_hdd Fill level (var & hdd )
miscsettings.noaviawatchdog enable AVIA watchdog miscsettings.noaviawatchdog enable AVIA watchdog
miscsettings.noenxwatchdog enable eNX watchdog miscsettings.noenxwatchdog enable eNX watchdog
miscsettings.pmtupdate enable pmt update miscsettings.pmtupdate enable pmt update

55
src/gui/infoviewer.cpp
View File

@@ -1162,40 +1162,41 @@ void CInfoViewer::showSNR ()
g_SignalFont->RenderString (posx, posy + height, sw, percent, COL_INFOBAR); g_SignalFont->RenderString (posx, posy + height, sw, percent, COL_INFOBAR);
} }
} }
if(g_settings.infobar_show_var_hdd){
struct statfs s; struct statfs s;
int per = 0; int per = 0;
if (::statfs("/var", &s) == 0) { if (::statfs("/var", &s) == 0) {
per = (s.f_blocks - s.f_bfree) / (s.f_blocks/100); per = (s.f_blocks - s.f_bfree) / (s.f_blocks/100);
} }
/* center the scales in the button bar. BBarY + InfoHeightY_Info / 2 is middle, /* center the scales in the button bar. BBarY + InfoHeightY_Info / 2 is middle,
scales are 6 pixels high, icons are 16 pixels, so keep 4 pixels free between scales are 6 pixels high, icons are 16 pixels, so keep 4 pixels free between
the scales */ the scales */
varscale->paintProgressBar(BoxEndX - (2*ICON_LARGE_WIDTH + 2*ICON_SMALL_WIDTH + 4*2) - 102, varscale->paintProgressBar(BoxEndX - (2*ICON_LARGE_WIDTH + 2*ICON_SMALL_WIDTH + 4*2) - 102,
BBarY + InfoHeightY_Info / 2 - 2 - 6, 100, 6, per, 100); BBarY + InfoHeightY_Info / 2 - 2 - 6, 100, 6, per, 100);
per = 0; per = 0;
//HD info //HD info
if (::statfs(g_settings.network_nfs_recordingdir, &s) == 0) { if (::statfs(g_settings.network_nfs_recordingdir, &s) == 0) {
switch (s.f_type) switch (s.f_type)
{ {
case (int) 0xEF53: /*EXT2 & EXT3*/ case (int) 0xEF53: /*EXT2 & EXT3*/
case (int) 0x6969: /*NFS*/ case (int) 0x6969: /*NFS*/
case (int) 0xFF534D42: /*CIFS*/ case (int) 0xFF534D42: /*CIFS*/
case (int) 0x517B: /*SMB*/ case (int) 0x517B: /*SMB*/
case (int) 0x52654973: /*REISERFS*/ case (int) 0x52654973: /*REISERFS*/
case (int) 0x65735546: /*fuse for ntfs*/ case (int) 0x65735546: /*fuse for ntfs*/
case (int) 0x58465342: /*xfs*/ case (int) 0x58465342: /*xfs*/
case (int) 0x4d44: /*msdos*/ case (int) 0x4d44: /*msdos*/
per = (s.f_blocks - s.f_bfree) / (s.f_blocks/100); per = (s.f_blocks - s.f_bfree) / (s.f_blocks/100);
break; break;
default: default:
fprintf( stderr,"%s Unknow File system type: %i\n",g_settings.network_nfs_recordingdir ,s.f_type); fprintf( stderr,"%s Unknow File system type: %i\n",g_settings.network_nfs_recordingdir ,s.f_type);
break; break;
}
} }
}
hddscale->paintProgressBar(BoxEndX - (2*ICON_LARGE_WIDTH + 2*ICON_SMALL_WIDTH + 4*2) - 102, hddscale->paintProgressBar(BoxEndX - (2*ICON_LARGE_WIDTH + 2*ICON_SMALL_WIDTH + 4*2) - 102,
BBarY + InfoHeightY_Info / 2 + 2, 100, 6, per, 100); BBarY + InfoHeightY_Info / 2 + 2, 100, 6, per, 100);
}
} }
void CInfoViewer::display_Info(const char *current, const char *next, void CInfoViewer::display_Info(const char *current, const char *next,

4
src/neutrino.cpp
View File

@@ -812,7 +812,8 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.casystem_display = configfile.getBool("casystem_display", false ); g_settings.casystem_display = configfile.getBool("casystem_display", false );
g_settings.scrambled_message = configfile.getBool("scrambled_message", true ); g_settings.scrambled_message = configfile.getBool("scrambled_message", true );
g_settings.volume_pos = configfile.getInt32("volume_pos", 0 ); g_settings.volume_pos = configfile.getInt32("volume_pos", 0 );
g_settings.menu_pos = configfile.getInt32("menu_pos", 0 ); g_settings.menu_pos = configfile.getInt32("menu_pos", 0 );
g_settings.infobar_show_var_hdd = configfile.getBool("infobar_show_var_hdd" , true );
//audio //audio
g_settings.audio_AnalogMode = configfile.getInt32( "audio_AnalogMode", 0 ); g_settings.audio_AnalogMode = configfile.getInt32( "audio_AnalogMode", 0 );
g_settings.audio_DolbyDigital = configfile.getBool("audio_DolbyDigital" , false); g_settings.audio_DolbyDigital = configfile.getBool("audio_DolbyDigital" , false);
@@ -1342,6 +1343,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
configfile.setBool("scrambled_message" , g_settings.scrambled_message ); configfile.setBool("scrambled_message" , g_settings.scrambled_message );
configfile.setInt32("volume_pos" , g_settings.volume_pos ); configfile.setInt32("volume_pos" , g_settings.volume_pos );
configfile.setInt32("menu_pos" , g_settings.menu_pos); configfile.setInt32("menu_pos" , g_settings.menu_pos);
configfile.setInt32("infobar_show_var_hdd" , g_settings.infobar_show_var_hdd );
//audio //audio
configfile.setInt32( "audio_AnalogMode", g_settings.audio_AnalogMode ); configfile.setInt32( "audio_AnalogMode", g_settings.audio_AnalogMode );

1
src/neutrino_menue.cpp
View File

@@ -2394,6 +2394,7 @@ void CNeutrinoApp::InitColorSettings(CMenuWidget &colorSettings, CMenuWidget &fo
miscSettingsInfobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_DISP_LOG, &g_settings.infobar_show_channellogo, LOCALE_MISCSETTINGS_INFOBAR_DISP_OPTIONS, LOCALE_MISCSETTINGS_INFOBAR_DISP_OPTIONS_COUNT, true)); miscSettingsInfobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_DISP_LOG, &g_settings.infobar_show_channellogo, LOCALE_MISCSETTINGS_INFOBAR_DISP_OPTIONS, LOCALE_MISCSETTINGS_INFOBAR_DISP_OPTIONS_COUNT, true));
miscSettingsInfobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_VIRTUAL_ZAP_MODE, &g_settings.virtual_zap_mode, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); miscSettingsInfobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_VIRTUAL_ZAP_MODE, &g_settings.virtual_zap_mode, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
miscSettingsInfobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SAT_DISPLAY, &g_settings.infobar_sat_display, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); miscSettingsInfobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SAT_DISPLAY, &g_settings.infobar_sat_display, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
miscSettingsInfobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW_VAR_HDD, &g_settings.infobar_show_var_hdd, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
colorSettings.addItem(new CMenuForwarder(LOCALE_MISCSETTINGS_INFOBAR, true, NULL, miscSettingsInfobar, NULL, CRCInput::RC_2)); colorSettings.addItem(new CMenuForwarder(LOCALE_MISCSETTINGS_INFOBAR, true, NULL, miscSettingsInfobar, NULL, CRCInput::RC_2));

1
src/system/locals.h
View File

@@ -550,6 +550,7 @@ typedef enum {
LOCALE_MISCSETTINGS_INFOBAR_DISP_3, LOCALE_MISCSETTINGS_INFOBAR_DISP_3,
LOCALE_MISCSETTINGS_INFOBAR_DISP_LOG, LOCALE_MISCSETTINGS_INFOBAR_DISP_LOG,
LOCALE_MISCSETTINGS_INFOBAR_SAT_DISPLAY, LOCALE_MISCSETTINGS_INFOBAR_SAT_DISPLAY,
LOCALE_MISCSETTINGS_INFOBAR_SHOW_VAR_HDD,
LOCALE_MISCSETTINGS_SHUTDOWN_COUNT, LOCALE_MISCSETTINGS_SHUTDOWN_COUNT,
LOCALE_MISCSETTINGS_SHUTDOWN_COUNT_HINT1, LOCALE_MISCSETTINGS_SHUTDOWN_COUNT_HINT1,
LOCALE_MISCSETTINGS_SHUTDOWN_COUNT_HINT2, LOCALE_MISCSETTINGS_SHUTDOWN_COUNT_HINT2,

1
src/system/locals_intern.h
View File

@@ -550,6 +550,7 @@ const char *locale_real_names[] = {
"miscsettings.infobar_disp_3", "miscsettings.infobar_disp_3",
"miscsettings.infobar_disp_log", "miscsettings.infobar_disp_log",
"miscsettings.infobar_sat_display", "miscsettings.infobar_sat_display",
"miscsettings.infobar_show_var_hdd",
"miscsettings.shutdown_count", "miscsettings.shutdown_count",
"miscsettings.shutdown_count_hint1", "miscsettings.shutdown_count_hint1",
"miscsettings.shutdown_count_hint2", "miscsettings.shutdown_count_hint2",

2
src/system/settings.h
View File

@@ -69,7 +69,7 @@ struct SNeutrinoSettings
int scrambled_message; int scrambled_message;
int volume_pos; int volume_pos;
int menu_pos; int menu_pos;
int infobar_show_var_hdd;
//audio //audio
int audio_AnalogMode; int audio_AnalogMode;
int audio_DolbyDigital; int audio_DolbyDigital;