neutrino: -add save epg on stadbyOn/Off option

Origin commit data
------------------
Branch: ni/coolstream
Commit: a47c6593dc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-08 (Thu, 08 Nov 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit

data/locale/deutsch.locale

@@ -749,6 +749,7 @@ menu.hint_epg_fonts Ändern Sie für die EPG-Details die Schriftgrößen
 menu.hint_epg_max_events Maximum an Events im Zwischenspeicher. Nach Erreichen der\nGrenze werden EPG-Daten für zukünftige gelöscht
 menu.hint_epg_old_events EPG im Speicher behalten in Stunden,\nauch wenn es veraltet ist
 menu.hint_epg_save Speichert die EPG-Daten auf einer Harddisk oder USB-Stick\nund läd es nach einen Neustart
+menu.hint_epg_save_standby Speichert die EPG-Daten in Bereitschaft Modus
 menu.hint_event_textcolor Ändern Sie die Event-Farbe für farbige Event-Optionen in Kanalliste und Infobar
 menu.hint_eventlist_fonts Ändern Sie in der Event-Liste die Schriftgrößen
 menu.hint_extended Energiespar-, EPG-Speicher- / Lade-Optionen,\nHDMI-CEC, Startkanal, Zap-Optionen
@@ -1100,6 +1101,7 @@ miscsettings.epg_old_events EPG verwerfen nach (Std.)
 miscsettings.epg_old_events_hint1 Wie lange abgelaufene EPG-Daten aufheben?
 miscsettings.epg_old_events_hint2 Angabe in Stunden
 miscsettings.epg_save EPG zwischenspeichern
+miscsettings.epg_save_standby EPG speichern in Standby-Modus
 miscsettings.general Allgemein
 miscsettings.head Erweitert
 miscsettings.infobar Infobar

data/locale/english.locale

@@ -749,6 +749,7 @@ menu.hint_epg_fonts Change EPG details window font sizes
 menu.hint_epg_max_events Maximum events to cache. After reaching limit\nEPG cache will remove future events
 menu.hint_epg_old_events Hours after event end time to consider\nevent old and remove it from cache
 menu.hint_epg_save Save cached EPG to harddisk or usb flash\nand load it after boot
+menu.hint_epg_save_standby Save EPG on soft standby mode
 menu.hint_event_textcolor Change event color for colored-event options\nin channel list and infobar
 menu.hint_eventlist_fonts Change event list font sizes
 menu.hint_extended Power saving, EPG save/load options\nHDMI-CEC, Start channel, zap options
@@ -1100,6 +1101,7 @@ miscsettings.epg_old_events EPG remove after (std.)
 miscsettings.epg_old_events_hint1 How long will EPG-Data be stored after they timed out?
 miscsettings.epg_old_events_hint2 Set in hours
 miscsettings.epg_save Save/Restore epg on reboot
+miscsettings.epg_save_standby Save epg on soft standby
 miscsettings.general General
 miscsettings.head Extended settings
 miscsettings.infobar Infobar

src/gui/miscsettings_menu.cpp

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

src/neutrino.cpp

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

src/system/locals.h

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

src/system/locals_intern.h

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

src/system/settings.h

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