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

neutrino: -add save epg on stadbyOn/Off option

Browse Source
This commit is contained in:
satbaby
2012-11-08 13:35:00 +01:00
parent 299e20387d
commit a47c6593dc
7 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/miscsettings_menu.cpp
View File

@@ -307,6 +307,10 @@ void CMiscMenue::showMiscSettingsMenuEpg(CMenuWidget *ms_epg)
mc->setHint("", LOCALE_MENU_HINT_EPG_SAVE);
ms_epg->addItem(mc);
CMenuOptionChooser * mc1 = new CMenuOptionChooser(LOCALE_MISCSETTINGS_EPG_SAVE_STANDBY, &g_settings.epg_save_standby, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
mc1->setHint("", LOCALE_MENU_HINT_EPG_SAVE_STANDBY);
ms_epg->addItem(mc1);
CStringInput * miscSettings_epg_cache = new CStringInput(LOCALE_MISCSETTINGS_EPG_CACHE, &g_settings.epg_cache, 2,LOCALE_MISCSETTINGS_EPG_CACHE_HINT1, LOCALE_MISCSETTINGS_EPG_CACHE_HINT2 , "0123456789 ", sectionsdConfigNotifier);
CMenuForwarder * mf = new CMenuDForwarder(LOCALE_MISCSETTINGS_EPG_CACHE, true, g_settings.epg_cache, miscSettings_epg_cache);
mf->setHint("", LOCALE_MENU_HINT_EPG_CACHE);

5
src/neutrino.cpp
View File

@@ -424,7 +424,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
snprintf(g_settings.ifname, sizeof(g_settings.ifname), "%s", configfile.getString("ifname", "eth0").c_str());;
g_settings.epg_save = configfile.getBool("epg_save", false);
g_settings.epg_save_standby = configfile.getBool("epg_save_standby", true);
//widget settings
g_settings.widget_fade = false;
g_settings.widget_fade = configfile.getBool("widget_fade" , false );
@@ -864,6 +864,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
configfile.setString("timezone", g_settings.timezone);
// epg
configfile.setBool("epg_save", g_settings.epg_save);
configfile.setBool("epg_save_standby", g_settings.epg_save_standby);
configfile.setString("epg_cache_time" ,g_settings.epg_cache );
configfile.setString("epg_extendedcache_time" ,g_settings.epg_extendedcache);
configfile.setString("epg_old_events" ,g_settings.epg_old_events );
@@ -3120,7 +3121,7 @@ void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby )
if(!CRecordManager::getInstance()->RecordingStatus() ) {
//only save epg when not recording
if(g_settings.epg_save && !fromDeepStandby) {
if(g_settings.epg_save && !fromDeepStandby && g_settings.epg_save_standby) {
saveEpg(false);//false CVFD::MODE_STANDBY
}
}

2
src/system/locals.h
View File

@@ -776,6 +776,7 @@ typedef enum
LOCALE_MENU_HINT_EPG_MAX_EVENTS,
LOCALE_MENU_HINT_EPG_OLD_EVENTS,
LOCALE_MENU_HINT_EPG_SAVE,
LOCALE_MENU_HINT_EPG_SAVE_STANDBY,
LOCALE_MENU_HINT_EVENT_TEXTCOLOR,
LOCALE_MENU_HINT_EVENTLIST_FONTS,
LOCALE_MENU_HINT_EXTENDED,
@@ -1127,6 +1128,7 @@ typedef enum
LOCALE_MISCSETTINGS_EPG_OLD_EVENTS_HINT1,
LOCALE_MISCSETTINGS_EPG_OLD_EVENTS_HINT2,
LOCALE_MISCSETTINGS_EPG_SAVE,
LOCALE_MISCSETTINGS_EPG_SAVE_STANDBY,
LOCALE_MISCSETTINGS_GENERAL,
LOCALE_MISCSETTINGS_HEAD,
LOCALE_MISCSETTINGS_INFOBAR,

2
src/system/locals_intern.h
View File

@@ -776,6 +776,7 @@ const char * locale_real_names[] =
"menu.hint_epg_max_events",
"menu.hint_epg_old_events",
"menu.hint_epg_save",
"menu.hint_epg_save_standby",
"menu.hint_event_textcolor",
"menu.hint_eventlist_fonts",
"menu.hint_extended",
@@ -1127,6 +1128,7 @@ const char * locale_real_names[] =
"miscsettings.epg_old_events_hint1",
"miscsettings.epg_old_events_hint2",
"miscsettings.epg_save",
"miscsettings.epg_save_standby",
"miscsettings.general",
"miscsettings.head",
"miscsettings.infobar",

1
src/system/settings.h
View File

@@ -123,6 +123,7 @@ struct SNeutrinoSettings
// EPG
int epg_save;
int epg_save_standby;
std::string epg_cache;
std::string epg_old_events;
std::string epg_max_events;