From f352e8eb50081cb9929d621add1ce329754f88d9 Mon Sep 17 00:00:00 2001
From: Janus <janus@debian>
Date: Mon, 20 Oct 2014 12:41:57 -0400
Subject: [PATCH 001/113] api4 : add bouquetID and make BQHeaderAttr optional

---
 src/zapit/include/zapit/bouquets.h |  9 ++++++++-
 src/zapit/include/zapit/types.h    |  3 +++
 src/zapit/src/bouquets.cpp         | 10 ++++++++--
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/zapit/include/zapit/bouquets.h b/src/zapit/include/zapit/bouquets.h
index f77181124..2017dc0dc 100644
--- a/src/zapit/include/zapit/bouquets.h
+++ b/src/zapit/include/zapit/bouquets.h
@@ -26,11 +26,18 @@ typedef tallchans::iterator tallchans_iterator;
 typedef vector<CZapitChannel*> ZapitChannelList;
 typedef ZapitChannelList::iterator zapit_list_it_t;
 
+#define DEFAULT_BQ_ID	0
+#define DEFAULT_BQ_HIDDEN    false
+#define DEFAULT_BQ_LOCKED    false
+#define DEFAULT_BQ_OTHER    false
+#define DEFAULT_BQ_SCANEPG    false
+
 class CZapitBouquet
 {
 	public:
 
 	std::string Name;
+	bq_id_t	 BqID;
 	bool        bHidden;
 	bool        bLocked;
 	bool        bUser;
@@ -42,7 +49,7 @@ class CZapitBouquet
 	ZapitChannelList radioChannels;
 	ZapitChannelList tvChannels;
 
-	inline CZapitBouquet(const std::string name) { Name = name; bHidden = false; bLocked = false; bUser = false; bOther = false; bScanEpg = false; }
+	inline CZapitBouquet(const std::string name) { Name = name; BqID=DEFAULT_BQ_ID; bHidden = DEFAULT_BQ_HIDDEN; bLocked = DEFAULT_BQ_LOCKED; bUser = false; bOther = DEFAULT_BQ_OTHER; bScanEpg = DEFAULT_BQ_SCANEPG; }
 
 	void addService(CZapitChannel* newChannel);
 
diff --git a/src/zapit/include/zapit/types.h b/src/zapit/include/zapit/types.h
index 77977ce04..860d748bb 100644
--- a/src/zapit/include/zapit/types.h
+++ b/src/zapit/include/zapit/types.h
@@ -26,6 +26,9 @@
 #include <stdint.h>
 #include <inttypes.h>
 
+typedef uint16_t bq_id_t;
+#define SCANF_BOUQUET_ID_TYPE "%hx"
+
 typedef uint16_t freq_id_t;
 typedef uint16_t t_service_id;
 #define SCANF_SERVICE_ID_TYPE "%hx"
diff --git a/src/zapit/src/bouquets.cpp b/src/zapit/src/bouquets.cpp
index c07eda586..eeecfdfec 100644
--- a/src/zapit/src/bouquets.cpp
+++ b/src/zapit/src/bouquets.cpp
@@ -225,8 +225,12 @@ CBouquetManager::~CBouquetManager()
 void CBouquetManager::writeBouquetHeader(FILE * bouq_fd, uint32_t i, const char * bouquetName)
 {
 //printf("[bouquets] writing bouquet header: %s\n", bouquetName);
-	fprintf(bouq_fd, "\t<Bouquet name=\"%s\" hidden=\"%d\" locked=\"%d\" epg=\"%d\">\n",
-			bouquetName, Bouquets[i]->bHidden ? 1 : 0, Bouquets[i]->bLocked ? 1 : 0, Bouquets[i]->bScanEpg ? 1 : 0);
+	fprintf(bouq_fd, "\t<Bouquet name=\"%s\"", bouquetName);
+	if (Bouquets[i]->BqID!=DEFAULT_BQ_ID) fprintf(bouq_fd, " bqID=\"%04x\"", Bouquets[i]->BqID); // optional_attribute > default=0
+	if (Bouquets[i]->bHidden!=DEFAULT_BQ_HIDDEN) fprintf(bouq_fd, " hidden=\"%d\"", Bouquets[i]->bHidden ? 1 : 0);
+	if (Bouquets[i]->bLocked!=DEFAULT_BQ_LOCKED) fprintf(bouq_fd, " locked=\"%d\"", Bouquets[i]->bLocked ? 1 : 0);
+	if (Bouquets[i]->bScanEpg!=DEFAULT_BQ_SCANEPG) fprintf(bouq_fd, " epg=\"%d\"", Bouquets[i]->bScanEpg ? 1 : 0);
+	fprintf(bouq_fd, ">\n");
 }
 
 void CBouquetManager::writeBouquetFooter(FILE * bouq_fd)
@@ -396,6 +400,8 @@ void CBouquetManager::parseBouquetsXml(const char *fname, bool bUser)
 				name = const_cast<char*>("Unknown");
 
 			CZapitBouquet* newBouquet = addBouquet(name, bUser);
+			// per default in contructor: newBouquet->BqID = 0; //set to default, override if bqID exists
+			GET_ATTR(search, "bqID", SCANF_BOUQUET_ID_TYPE, newBouquet->BqID);
 			char* hidden = xmlGetAttribute(search, "hidden");
 			char* locked = xmlGetAttribute(search, "locked");
 			char* scanepg = xmlGetAttribute(search, "epg");

From 2644b30b6a94a020350c70b26c11371342e87362 Mon Sep 17 00:00:00 2001
From: Janus <janus@debian>
Date: Thu, 23 Oct 2014 15:12:18 -0400
Subject: [PATCH 002/113] api4 : fix name/uname view with optional attributes

---
 src/zapit/include/zapit/bouquets.h |  4 +-
 src/zapit/include/zapit/channel.h  |  6 ++-
 src/zapit/src/bouquets.cpp         | 26 +++++++------
 src/zapit/src/channel.cpp          | 62 +++++++++++++++---------------
 4 files changed, 53 insertions(+), 45 deletions(-)

diff --git a/src/zapit/include/zapit/bouquets.h b/src/zapit/include/zapit/bouquets.h
index 2017dc0dc..92984247c 100644
--- a/src/zapit/include/zapit/bouquets.h
+++ b/src/zapit/include/zapit/bouquets.h
@@ -83,8 +83,8 @@ class CBouquetManager
 		void writeBouquetHeader          (FILE * bouq_fd, uint32_t i, const char * bouquetName);
 		void writeBouquetFooter          (FILE * bouq_fd);
 		void writeBouquetChannels        (FILE * bouq_fd, uint32_t i, bool bUser = false);
-		void writeChannels(FILE * bouq_fd, ZapitChannelList &list);
-		void writeBouquet(FILE * bouq_fd, uint32_t i);
+		void writeChannels(FILE * bouq_fd, ZapitChannelList &list, bool bUser);
+		void writeBouquet(FILE * bouq_fd, uint32_t i, bool bUser);
 
 	public:
 		CBouquetManager() { remainChannels = NULL; };
diff --git a/src/zapit/include/zapit/channel.h b/src/zapit/include/zapit/channel.h
index 3b15718de..f7278d4d4 100644
--- a/src/zapit/include/zapit/channel.h
+++ b/src/zapit/include/zapit/channel.h
@@ -35,6 +35,9 @@
 #include "types.h"
 //#include <zapit/audio.h>
 
+#define DEFAULT_CH_LOCKED   false
+#define DEFAULT_CH_UNAME    ""
+
 typedef struct audio_map_set {
         unsigned short apid;
         int mode;
@@ -117,6 +120,7 @@ class CZapitChannel
 	private:
 		/* channel name */
 		std::string name;
+		/* TODO : Enable different unames in different bouquets ( generated bouquetID ? ) */
 		std::string uname;
 
 		/* WebTV */
@@ -268,7 +272,7 @@ class CZapitChannel
 		void setChannelSub(int subIdx);
 
 		void dumpServiceXml(FILE * fd, const char * action = NULL);
-		void dumpBouquetXml(FILE * fd);
+		void dumpBouquetXml(FILE * fd, bool bUser);
 		void setRecordDemux(uint8_t num) { record_demux = num; };
 		void setPipDemux(uint8_t num) { pip_demux = num; };
 		int  getRecordDemux() { return record_demux; };
diff --git a/src/zapit/src/bouquets.cpp b/src/zapit/src/bouquets.cpp
index eeecfdfec..ee3016dec 100644
--- a/src/zapit/src/bouquets.cpp
+++ b/src/zapit/src/bouquets.cpp
@@ -238,22 +238,22 @@ void CBouquetManager::writeBouquetFooter(FILE * bouq_fd)
 	fprintf(bouq_fd, "\t</Bouquet>\n");
 }
 
-void CBouquetManager::writeChannels(FILE * bouq_fd, ZapitChannelList &list)
+void CBouquetManager::writeChannels(FILE * bouq_fd, ZapitChannelList &list, bool bUser)
 {
 	for(zapit_list_it_t it = list.begin(); it != list.end(); it++)
-		(*it)->dumpBouquetXml(bouq_fd);
+		(*it)->dumpBouquetXml(bouq_fd, bUser);
 }
 
-void CBouquetManager::writeBouquetChannels(FILE * bouq_fd, uint32_t i, bool /*bUser*/)
+void CBouquetManager::writeBouquetChannels(FILE * bouq_fd, uint32_t i, bool bUser)
 {
-	writeChannels(bouq_fd, Bouquets[i]->tvChannels);
-	writeChannels(bouq_fd, Bouquets[i]->radioChannels);
+	writeChannels(bouq_fd, Bouquets[i]->tvChannels, bUser);
+	writeChannels(bouq_fd, Bouquets[i]->radioChannels, bUser);
 }
 
-void CBouquetManager::writeBouquet(FILE * bouq_fd, uint32_t i)
+void CBouquetManager::writeBouquet(FILE * bouq_fd, uint32_t i,bool  bUser)
 {
 	writeBouquetHeader(bouq_fd, i, convert_UTF8_To_UTF8_XML(Bouquets[i]->Name.c_str()).c_str());
-	writeBouquetChannels(bouq_fd, i);
+	writeBouquetChannels(bouq_fd, i, Bouquets[i]->bUser);
 	writeBouquetFooter(bouq_fd);
 }
 
@@ -273,7 +273,7 @@ void CBouquetManager::saveBouquets(void)
 		if (Bouquets[i] != remainChannels) {
 			DBG("save Bouquets: name %s user: %d\n", Bouquets[i]->Name.c_str(), Bouquets[i]->bUser);
 			if(!Bouquets[i]->bUser) {
-				writeBouquet(bouq_fd, i);
+				writeBouquet(bouq_fd, i,false);
 			}
 		}
 	}
@@ -297,7 +297,7 @@ void CBouquetManager::saveUBouquets(void)
 	for (unsigned int i = 0; i < Bouquets.size(); i++) {
 		if (Bouquets[i] != remainChannels) {
 			if(Bouquets[i]->bUser) {
-				writeBouquet(ubouq_fd, i);
+				writeBouquet(ubouq_fd, i, true);
 			}
 		}
 	}
@@ -415,6 +415,10 @@ void CBouquetManager::parseBouquetsXml(const char *fname, bool bUser)
 				name = xmlGetAttribute(channel_node, "n");
 				if (name)
 					name2 = name;
+				std::string uname;
+				char *uName = xmlGetAttribute(channel_node, "un");
+				if (uName)
+					uname = uName;
 				char *url = xmlGetAttribute(channel_node, "u");
 				GET_ATTR(channel_node, "i", SCANF_SERVICE_ID_TYPE, service_id);
 				GET_ATTR(channel_node, "on", SCANF_ORIGINAL_NETWORK_ID_TYPE, original_network_id);
@@ -435,8 +439,8 @@ void CBouquetManager::parseBouquetsXml(const char *fname, bool bUser)
 					chan = CServiceManager::getInstance()->FindChannel(chid);
 				if (chan != NULL) {
 					DBG("%04x %04x %04x %s\n", transport_stream_id, original_network_id, service_id, xmlGetAttribute(channel_node, "n"));
-					if(bUser && (name2.length() > 1))
-						chan->setUserName(name2);
+					if(bUser && !(uname.empty()))
+						chan->setUserName(uname);
 					if(!bUser)
 						chan->pname = (char *) newBouquet->Name.c_str();
 					chan->bLocked = clock;
diff --git a/src/zapit/src/channel.cpp b/src/zapit/src/channel.cpp
index f041d1fd1..48a3c0138 100644
--- a/src/zapit/src/channel.cpp
+++ b/src/zapit/src/channel.cpp
@@ -71,6 +71,7 @@ CZapitChannel::CZapitChannel(const char *p_name, t_channel_id p_channel_id, cons
 
 void CZapitChannel::Init()
 {
+	uname = DEFAULT_CH_UNAME;
 	//caPmt = NULL;
 	rawPmt = NULL;
 	pmtLen = 0;
@@ -90,7 +91,7 @@ void CZapitChannel::Init()
 	flags = 0;
 	delsys = DVB_S;
 	bLockCount = 0;
-	bLocked = 0;
+	bLocked = DEFAULT_CH_LOCKED;
 }
 
 CZapitChannel::~CZapitChannel(void)
@@ -328,50 +329,49 @@ void CZapitChannel::dumpServiceXml(FILE * fd, const char * action)
 {
 	if(action) {
 		fprintf(fd, "\t\t\t<S action=\"%s\" i=\"%04x\" n=\"%s\" t=\"%x\" s=\"%d\" num=\"%d\" f=\"%d\"/>\n", action,
-				getServiceId(), convert_UTF8_To_UTF8_XML(getName().c_str()).c_str(),
+				getServiceId(), convert_UTF8_To_UTF8_XML(name.c_str()).c_str(),
 				getServiceType(), scrambled, number, flags);
 
 	} else if(getPidsFlag()) {
 		fprintf(fd, "\t\t\t<S i=\"%04x\" n=\"%s\" v=\"%x\" a=\"%x\" p=\"%x\" pmt=\"%x\" tx=\"%x\" t=\"%x\" vt=\"%d\" s=\"%d\" num=\"%d\" f=\"%d\"/>\n",
-				getServiceId(), convert_UTF8_To_UTF8_XML(getName().c_str()).c_str(),
+				getServiceId(), convert_UTF8_To_UTF8_XML(name.c_str()).c_str(),
 				getVideoPid(), getPreAudioPid(),
 				getPcrPid(), getPmtPid(), getTeletextPid(),
 				getServiceType(true), type, scrambled, number, flags);
 	} else {
 		fprintf(fd, "\t\t\t<S i=\"%04x\" n=\"%s\" t=\"%x\" s=\"%d\" num=\"%d\" f=\"%d\"/>\n",
-				getServiceId(), convert_UTF8_To_UTF8_XML(getName().c_str()).c_str(),
+				getServiceId(), convert_UTF8_To_UTF8_XML(name.c_str()).c_str(),
 				getServiceType(true), scrambled, number, flags);
 	}
 }
 
-void CZapitChannel::dumpBouquetXml(FILE * fd)
+void CZapitChannel::dumpBouquetXml(FILE * fd, bool bUser)
 {
-	//bool write_names = bUser ? true : config.getBool("writeChannelsNames", true);
-	bool write_names = 1;
+	fprintf(fd, "\t\t<S");
 
-	if(write_names) {
-		if (url.empty())
-			fprintf(fd, "\t\t<S i=\"%x\" n=\"%s\" t=\"%x\" on=\"%x\" s=\"%hd\" frq=\"%hd\" l=\"%d\"/>\n",
-					getServiceId(),
-					convert_UTF8_To_UTF8_XML(getName().c_str()).c_str(),
-					getTransportStreamId(),
-					getOriginalNetworkId(),
-					getSatellitePosition(),
-					getFreqId(), bLocked ? 1 : 0);
-		else
-			fprintf(fd, "\t\t<S n=\"%s\" u=\"%s\" l=\"%d\"/>\n",
-					convert_UTF8_To_UTF8_XML(getName().c_str()).c_str(),
-					convert_UTF8_To_UTF8_XML(url.c_str()).c_str(), bLocked ? 1 : 0);
-	} else {
-		if (url.empty())
-			fprintf(fd, "\t\t<S i=\"%x\" t=\"%x\" on=\"%x\" s=\"%hd\" frq=\"%hd\" l=\"%d\"/>\n",
-					getServiceId(),
-					getTransportStreamId(),
-					getOriginalNetworkId(),
-					getSatellitePosition(),
-					getFreqId(), bLocked ? 1 : 0);
-		else
-			fprintf(fd, "\t\t<S u=\"%s\" l=\"%d\"/>\n",
-					convert_UTF8_To_UTF8_XML(url.c_str()).c_str(), bLocked ? 1 : 0);
+	// references
+	if (url.empty())
+		fprintf(fd, " i=\"%x\" t=\"%x\" on=\"%x\" s=\"%hd\" frq=\"%hd\"",getServiceId(), getTransportStreamId(), getOriginalNetworkId(), getSatellitePosition(), getFreqId());
+	else
+		fprintf(fd, " u=\"%s\"",convert_UTF8_To_UTF8_XML(url.c_str()).c_str());
+
+	// service descriptors
+	// TODO : manage configuration: write names (if nessessary or wanted) f.e. =>0=never 1=ubouquets 2=bouquets 3=both
+	bool write_names =  false; //config.getBool("writeChannelsNames", true);
+	if (bUser || !url.empty()) {
+		if (write_names)
+			fprintf(fd, " n=\"%s\"", convert_UTF8_To_UTF8_XML(name.c_str()).c_str());
+		//fprintf(fd, " n=\"%s\"", convert_UTF8_To_UTF8_XML(name.c_str()).c_str());
 	}
+	else {
+		if (write_names)
+			fprintf(fd, " n=\"%s\"", convert_UTF8_To_UTF8_XML(name.c_str()).c_str());
+	}
+
+	// usecase optional attributes
+	if (bUser && !uname.empty()) fprintf(fd, " un=\"%s\"", convert_UTF8_To_UTF8_XML(uname.c_str()).c_str());
+	// TODO : be sure to save bouquets.xml after "l"L is changed only in ubouquets.xml (set dirty_bit ?)
+	if (bLocked!=DEFAULT_CH_LOCKED) fprintf(fd," l=\"%d\"", bLocked ? 1 : 0);
+
+	fprintf(fd, "/>\n");
 }

From e01f57395b8aa61e95a336feadfeac735603450e Mon Sep 17 00:00:00 2001
From: Janus <janus@debian>
Date: Sat, 25 Oct 2014 08:46:32 -0400
Subject: [PATCH 003/113] api4 : use zapit.conf writeChannelsNames [0..3] to
 decide writing DVB-names in bouquets

---
 src/zapit/src/channel.cpp | 14 ++++++++++----
 src/zapit/src/zapit.cpp   |  3 ++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/zapit/src/channel.cpp b/src/zapit/src/channel.cpp
index 48a3c0138..588588d69 100644
--- a/src/zapit/src/channel.cpp
+++ b/src/zapit/src/channel.cpp
@@ -21,8 +21,12 @@
  */
 
 #include <cstdio>
+#include <zapit/zapit.h>
 #include <zapit/channel.h>
 
+extern Zapit_config zapitCfg;
+
+
 CZapitChannel::CZapitChannel(const std::string & p_name, t_service_id p_sid, t_transport_stream_id p_tsid, t_original_network_id p_onid, unsigned char p_service_type, t_satellite_position p_satellite_position, freq_id_t p_freq)
 {
 	name = p_name;
@@ -347,6 +351,10 @@ void CZapitChannel::dumpServiceXml(FILE * fd, const char * action)
 
 void CZapitChannel::dumpBouquetXml(FILE * fd, bool bUser)
 {
+	// TODO : gui->manage configuration: write names (if nessessary or wanted) 
+	// menu > installation > Servicesscan > under 'Bouquet' => "Write DVB-names in bouquets:" f.e. =>0=never 1=ubouquets 2=bouquets 3=both
+	int write_names =  zapitCfg.writeChannelsNames;
+
 	fprintf(fd, "\t\t<S");
 
 	// references
@@ -356,15 +364,13 @@ void CZapitChannel::dumpBouquetXml(FILE * fd, bool bUser)
 		fprintf(fd, " u=\"%s\"",convert_UTF8_To_UTF8_XML(url.c_str()).c_str());
 
 	// service descriptors
-	// TODO : manage configuration: write names (if nessessary or wanted) f.e. =>0=never 1=ubouquets 2=bouquets 3=both
-	bool write_names =  false; //config.getBool("writeChannelsNames", true);
 	if (bUser || !url.empty()) {
-		if (write_names)
+		if ((write_names==0x01) || (write_names==0x03))
 			fprintf(fd, " n=\"%s\"", convert_UTF8_To_UTF8_XML(name.c_str()).c_str());
 		//fprintf(fd, " n=\"%s\"", convert_UTF8_To_UTF8_XML(name.c_str()).c_str());
 	}
 	else {
-		if (write_names)
+		if ((write_names==0x02) || (write_names==0x03))
 			fprintf(fd, " n=\"%s\"", convert_UTF8_To_UTF8_XML(name.c_str()).c_str());
 	}
 
diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp
index fcc647c79..0dd19637b 100644
--- a/src/zapit/src/zapit.cpp
+++ b/src/zapit/src/zapit.cpp
@@ -172,7 +172,7 @@ void CZapit::SaveSettings(bool write)
 			configfile.setInt64("lastOTAChannel", last_channel_id);
 		}
 
-		configfile.setBool("writeChannelsNames", config.writeChannelsNames);
+		configfile.setInt32("writeChannelsNames", config.writeChannelsNames);
 		configfile.setBool("makeRemainingChannelsBouquet", config.makeRemainingChannelsBouquet);
 		configfile.setInt32("feTimeout", config.feTimeout);
 
@@ -299,6 +299,7 @@ void CZapit::LoadSettings()
 	voltageOff				= configfile.getBool("voltageOff", 0);
 #endif
 	config.saveLastChannel			= configfile.getBool("saveLastChannel", true);
+	config.writeChannelsNames		= configfile.getInt32("writeChannelsNames", 1);
 	/* FIXME Channels renum should be done for all channels atm. TODO*/
 	//config.makeRemainingChannelsBouquet	= configfile.getBool("makeRemainingChannelsBouquet", 1);
 	config.makeRemainingChannelsBouquet	= 1;

From a6b585f880525e34fa956a65b95f67f994d59f1a Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Mon, 27 Oct 2014 12:16:59 +0300
Subject: [PATCH 004/113] zapit/src/zapit.cpp: keep old defaults, channel name
 present in both bouquets and ubouquets

---
 src/zapit/src/zapit.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp
index 0dd19637b..aa348f18d 100644
--- a/src/zapit/src/zapit.cpp
+++ b/src/zapit/src/zapit.cpp
@@ -299,7 +299,7 @@ void CZapit::LoadSettings()
 	voltageOff				= configfile.getBool("voltageOff", 0);
 #endif
 	config.saveLastChannel			= configfile.getBool("saveLastChannel", true);
-	config.writeChannelsNames		= configfile.getInt32("writeChannelsNames", 1);
+	config.writeChannelsNames		= configfile.getInt32("writeChannelsNames", 3);
 	/* FIXME Channels renum should be done for all channels atm. TODO*/
 	//config.makeRemainingChannelsBouquet	= configfile.getBool("makeRemainingChannelsBouquet", 1);
 	config.makeRemainingChannelsBouquet	= 1;

From 709942f72a46bb7002dba17b274910fd3d068746 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Mon, 27 Oct 2014 13:12:43 +0300
Subject: [PATCH 005/113] Revert "zapit/src/bouquets.cpp: do not add webtv
 channels to 'Other' bouquet"

This reverts commit 2de388cd80d2c889d252c0e2d08caedace38f04b.
---
 src/zapit/src/bouquets.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/zapit/src/bouquets.cpp b/src/zapit/src/bouquets.cpp
index ee3016dec..b9e30d23f 100644
--- a/src/zapit/src/bouquets.cpp
+++ b/src/zapit/src/bouquets.cpp
@@ -533,8 +533,7 @@ void CBouquetManager::makeRemainingChannelsBouquet(void)
 	remainChannels->bOther = true;
 
 	for (ZapitChannelList::const_iterator it = unusedChannels.begin(); it != unusedChannels.end(); ++it) {
-		if (!IS_WEBTV((*it)->getChannelID()))
-			remainChannels->addService(*it);
+		remainChannels->addService(*it);
 	}
 
 	renumChannels(remainChannels->tvChannels, i);

From d7be8258f8f0598430126d6cafb8cd8f36781a95 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Mon, 27 Oct 2014 13:49:52 +0300
Subject: [PATCH 006/113] zapit/src/bouquets.cpp: fix compile warning

---
 src/zapit/src/bouquets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zapit/src/bouquets.cpp b/src/zapit/src/bouquets.cpp
index b9e30d23f..a9e41076b 100644
--- a/src/zapit/src/bouquets.cpp
+++ b/src/zapit/src/bouquets.cpp
@@ -250,7 +250,7 @@ void CBouquetManager::writeBouquetChannels(FILE * bouq_fd, uint32_t i, bool bUse
 	writeChannels(bouq_fd, Bouquets[i]->radioChannels, bUser);
 }
 
-void CBouquetManager::writeBouquet(FILE * bouq_fd, uint32_t i,bool  bUser)
+void CBouquetManager::writeBouquet(FILE * bouq_fd, uint32_t i, bool /* bUser */)
 {
 	writeBouquetHeader(bouq_fd, i, convert_UTF8_To_UTF8_XML(Bouquets[i]->Name.c_str()).c_str());
 	writeBouquetChannels(bouq_fd, i, Bouquets[i]->bUser);

From 2d7b7466852b026eb2b9ab448a5123b52c66ccdc Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Mon, 27 Oct 2014 13:51:32 +0300
Subject: [PATCH 007/113] locals: add locales for show empty favorites option

---
 data/locale/english.locale | 2 ++
 src/system/locals.h        | 2 ++
 src/system/locals_intern.h | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/data/locale/english.locale b/data/locale/english.locale
index 15d51a031..b36d59c83 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -250,6 +250,7 @@ channellist.reset_flags Reset 'new' channel flag
 channellist.sats Satellites
 channellist.show_channellogo Show channel logos
 channellist.show_channelnumber Show channel numbers
+channellist.show_empty_favs Show empty favorites bouquets
 channellist.since since
 channellist.start starts
 ci.clock CI clock (Mhz)
@@ -920,6 +921,7 @@ menu.hint_channellist_mode_radio Use the selected channel list mode on startup i
 menu.hint_channellist_setup Configure channel list GUI options
 menu.hint_channellist_show_channellogo Show channel logos in channel list
 menu.hint_channellist_show_channelnumber Show channel number in channel list
+menu.hint_channellist_show_empty_favs Show / hide empty bouquets in favorites
 menu.hint_channels Open channel list
 menu.hint_ci Conditional access menu\nto setup your CI CAM or embeded Conax card
 menu.hint_clock_background Show clock with theme's background color
diff --git a/src/system/locals.h b/src/system/locals.h
index 6c765e752..05105b9a3 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -277,6 +277,7 @@ typedef enum
 	LOCALE_CHANNELLIST_SATS,
 	LOCALE_CHANNELLIST_SHOW_CHANNELLOGO,
 	LOCALE_CHANNELLIST_SHOW_CHANNELNUMBER,
+	LOCALE_CHANNELLIST_SHOW_EMPTY_FAVS,
 	LOCALE_CHANNELLIST_SINCE,
 	LOCALE_CHANNELLIST_START,
 	LOCALE_CI_CLOCK,
@@ -947,6 +948,7 @@ typedef enum
 	LOCALE_MENU_HINT_CHANNELLIST_SETUP,
 	LOCALE_MENU_HINT_CHANNELLIST_SHOW_CHANNELLOGO,
 	LOCALE_MENU_HINT_CHANNELLIST_SHOW_CHANNELNUMBER,
+	LOCALE_MENU_HINT_CHANNELLIST_SHOW_EMPTY_FAVS,
 	LOCALE_MENU_HINT_CHANNELS,
 	LOCALE_MENU_HINT_CI,
 	LOCALE_MENU_HINT_CLOCK_BACKGROUND,
diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h
index 92a3945db..764c74f54 100644
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -277,6 +277,7 @@ const char * locale_real_names[] =
 	"channellist.sats",
 	"channellist.show_channellogo",
 	"channellist.show_channelnumber",
+	"channellist.show_empty_favs",
 	"channellist.since",
 	"channellist.start",
 	"ci.clock",
@@ -947,6 +948,7 @@ const char * locale_real_names[] =
 	"menu.hint_channellist_setup",
 	"menu.hint_channellist_show_channellogo",
 	"menu.hint_channellist_show_channelnumber",
+	"menu.hint_channellist_show_empty_favs",
 	"menu.hint_channels",
 	"menu.hint_ci",
 	"menu.hint_clock_background",

From 8772d219f1e46edb8bb59acf808332a352611491 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Mon, 27 Oct 2014 13:52:23 +0300
Subject: [PATCH 008/113] gui/miscsettings_menu.cpp: add option to
 enable/disable empty favorites in bouquet list

---
 src/gui/channellist.cpp       |  2 +-
 src/gui/miscsettings_menu.cpp | 14 ++++++++++----
 src/system/settings.h         |  1 +
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index 75b008a92..6bae65438 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -2378,7 +2378,7 @@ void CChannelList::editMode(bool enable)
 			channelsChanged = false;
 			bouquet->zapitBouquet->getChannels(channels, tvmode);
 			saveChanges(bouquet->zapitBouquet->bUser);
-			if ((*chanlist).empty())
+			if (!g_settings.show_empty_favorites && (*chanlist).empty())
 				CNeutrinoApp::getInstance()->MarkChannelsInit();
 		}
 		if (selected >= chanlist->size())
diff --git a/src/gui/miscsettings_menu.cpp b/src/gui/miscsettings_menu.cpp
index e8dfa6485..03633f486 100644
--- a/src/gui/miscsettings_menu.cpp
+++ b/src/gui/miscsettings_menu.cpp
@@ -479,8 +479,9 @@ int CMiscMenue::showMiscSettingsMenuChanlist()
 	CMenuWidget * ms_chanlist = new CMenuWidget(LOCALE_MISCSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_MISCSETUP_CHANNELLIST);
 	ms_chanlist->addIntroItems(LOCALE_MISCSETTINGS_CHANNELLIST);
 
-	bool tmp1 = g_settings.make_hd_list;
-	bool tmp2 = g_settings.make_webtv_list;
+	bool make_hd_list = g_settings.make_hd_list;
+	bool make_webtv_list = g_settings.make_webtv_list;
+	bool show_empty_favorites = g_settings.show_empty_favorites;
 
 	CMenuOptionChooser * mc;
 	mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_MAKE_HDLIST ,     &g_settings.make_hd_list            , OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
@@ -514,10 +515,15 @@ int CMiscMenue::showMiscSettingsMenuChanlist()
 	mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_NUMERIC_ADJUST,   &g_settings.channellist_numeric_adjust, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
 	mc->setHint("", LOCALE_MENU_HINT_NUMERIC_ADJUST);
 	ms_chanlist->addItem(mc);
+
+	mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_SHOW_EMPTY_FAVS,   &g_settings.show_empty_favorites, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
+	mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_SHOW_EMPTY_FAVS);
+	ms_chanlist->addItem(mc);
+
 	int res = ms_chanlist->exec(NULL, "");
 	delete ms_chanlist;
-	if (tmp1 != g_settings.make_hd_list|| tmp2 != g_settings.make_webtv_list)
-		g_Zapit->reinitChannels();
+	if (make_hd_list != g_settings.make_hd_list || make_webtv_list != g_settings.make_webtv_list || show_empty_favorites != g_settings.show_empty_favorites)
+		g_RCInput->postMsg(NeutrinoMessages::EVT_SERVICESCHANGED, 0);
 	return res;
 }
 
diff --git a/src/system/settings.h b/src/system/settings.h
index 1911f7627..ab61c8e8c 100644
--- a/src/system/settings.h
+++ b/src/system/settings.h
@@ -192,6 +192,7 @@ struct SNeutrinoSettings
 	int make_new_list;
 	int make_removed_list;
 	int keep_channel_numbers;
+	int show_empty_favorites;
 	int avsync;
 	int clockrec;
 	int rounded_corners;

From 9a09a79de6708e668e2ac8be3520222d8a2869de Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Mon, 27 Oct 2014 13:54:02 +0300
Subject: [PATCH 009/113] neutrino.cpp: move webtv 'provider' to the end of
 list

---
 src/neutrino.cpp | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 66d97bd3d..82f6840d3 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -415,6 +415,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
 	g_settings.make_new_list = configfile.getInt32("make_new_list", 1);
 	g_settings.make_removed_list = configfile.getInt32("make_removed_list", 1);
 	g_settings.keep_channel_numbers = configfile.getInt32("keep_channel_numbers", 0);
+	g_settings.show_empty_favorites = configfile.getInt32("show_empty_favorites", 0);
 
 	//misc
 	g_settings.power_standby = configfile.getInt32( "power_standby", 0);
@@ -942,6 +943,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
 	configfile.setInt32( "make_new_list", g_settings.make_new_list);
 	configfile.setInt32( "make_removed_list", g_settings.make_removed_list);
 	configfile.setInt32( "keep_channel_numbers", g_settings.keep_channel_numbers);
+	configfile.setInt32( "show_empty_favorites", g_settings.show_empty_favorites);
 	//led
 	configfile.setInt32( "led_tv_mode", g_settings.led_tv_mode);
 	configfile.setInt32( "led_standby_mode", g_settings.led_standby_mode);
@@ -1334,7 +1336,7 @@ void CNeutrinoApp::channelsInit(bool bOnly)
 
 	int tvi = 0, ri = 0;
 
-	ZapitChannelList zapitList;
+	ZapitChannelList zapitList, webtvList;
 
 	/* all TV channels */
 	CServiceManager::getInstance()->GetAllTvChannels(zapitList);
@@ -1402,20 +1404,16 @@ void CNeutrinoApp::channelsInit(bool bOnly)
 		}
 		/* all WebTV channels */
 		if (g_settings.make_webtv_list) {
-			if (CServiceManager::getInstance()->GetAllWebTVChannels(zapitList)) {
+			if (CServiceManager::getInstance()->GetAllWebTVChannels(webtvList)) {
 				/* all channels */
 				CBouquet* webtvBouquet = new CBouquet(0, g_Locale->getText(LOCALE_BOUQUETNAME_WEBTV), false, true);
-				webtvBouquet->channelList->SetChannelList(&zapitList);
+				webtvBouquet->channelList->SetChannelList(&webtvList);
 				TVallList->Bouquets.push_back(webtvBouquet);
-				/* provider */
-				webtvBouquet = new CBouquet(0, g_Locale->getText(LOCALE_BOUQUETNAME_WEBTV), false, true);
-				webtvBouquet->channelList->SetChannelList(&zapitList);
-				TVbouquetList->Bouquets.push_back(webtvBouquet);
 				/* "satellite" */
 				webtvBouquet = new CBouquet(0, g_Locale->getText(LOCALE_BOUQUETNAME_WEBTV), false, true);
-				webtvBouquet->channelList->SetChannelList(&zapitList);
+				webtvBouquet->channelList->SetChannelList(&webtvList);
 				TVsatList->Bouquets.push_back(webtvBouquet);
-				printf("[neutrino] got %d WebTV channels\n", (int)zapitList.size()); fflush(stdout);
+				printf("[neutrino] got %d WebTV channels\n", (int)webtvList.size()); fflush(stdout);
 			}
 		}
 		/* all HD channels */
@@ -1467,7 +1465,7 @@ void CNeutrinoApp::channelsInit(bool bOnly)
 	for (i = 0; i < g_bouquetManager->Bouquets.size(); i++) {
 		CZapitBouquet *b = g_bouquetManager->Bouquets[i];
 		if (!b->bHidden) {
-			if (b->getTvChannels(zapitList) /*|| b->bFav */) {
+			if (b->getTvChannels(zapitList) || (g_settings.show_empty_favorites && b->bUser)) {
 				if(b->bUser)
 					tmp = TVfavList->addBouquet(b);
 				else
@@ -1476,7 +1474,7 @@ void CNeutrinoApp::channelsInit(bool bOnly)
 				tmp->channelList->SetChannelList(&zapitList);
 				tvi++;
 			}
-			if (b->getRadioChannels(zapitList) /* || b->bFav */) {
+			if (b->getRadioChannels(zapitList) || (g_settings.show_empty_favorites && b->bUser)) {
 				if(b->bUser)
 					tmp = RADIOfavList->addBouquet(b);
 				else
@@ -1489,6 +1487,12 @@ void CNeutrinoApp::channelsInit(bool bOnly)
 				AllFavBouquetList->addBouquet(b);
 		}
 	}
+	if (!webtvList.empty()) {
+		/* provider */
+		CBouquet* webtvBouquet = new CBouquet(0, g_Locale->getText(LOCALE_BOUQUETNAME_WEBTV), false, true);
+		webtvBouquet->channelList->SetChannelList(&webtvList);
+		TVbouquetList->Bouquets.push_back(webtvBouquet);
+	}
 	printf("[neutrino] got %d TV and %d RADIO bouquets\n", tvi, ri); fflush(stdout);
 	TIMER_STOP("[neutrino] took");
 

From e099cd44132571ab1348aec96e972c879a0c1a6c Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Mon, 27 Oct 2014 14:02:34 +0300
Subject: [PATCH 010/113] gui/channellist.cpp: disable 'other' bouquet edit

---
 src/gui/channellist.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index 6bae65438..4533a7a5b 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -306,7 +306,7 @@ int CChannelList::doChannelMenu(void)
 	CMenuSelectorTarget * selector = new CMenuSelectorTarget(&select);
 
 	bool empty = (*chanlist).empty();
-	bool allow_edit = (bouquet && bouquet->zapitBouquet /*&& bouquet->zapitBouquet->bUser*/);
+	bool allow_edit = (bouquet && bouquet->zapitBouquet && !bouquet->zapitBouquet->bOther);
 
 	int i = 0;
 	snprintf(cnt, sizeof(cnt), "%d", i);

From 1a30d7d921893e0676f8245f1566dea490917556 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Tue, 28 Oct 2014 15:11:28 +0300
Subject: [PATCH 011/113] locals: add locale for 'move to'

---
 data/locale/english.locale | 1 +
 src/system/locals.h        | 1 +
 src/system/locals_intern.h | 1 +
 3 files changed, 3 insertions(+)

diff --git a/data/locale/english.locale b/data/locale/english.locale
index b36d59c83..d2714ca26 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -188,6 +188,7 @@ bouqueteditor.discardingchanges Discarding changes. Please be patient.
 bouqueteditor.hide Hide
 bouqueteditor.lock Lock
 bouqueteditor.move Move
+bouqueteditor.move_to Move to
 bouqueteditor.name Bouquet editor
 bouqueteditor.newbouquetname New name of bouquets
 bouqueteditor.rename Rename
diff --git a/src/system/locals.h b/src/system/locals.h
index 05105b9a3..aa5dae893 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -215,6 +215,7 @@ typedef enum
 	LOCALE_BOUQUETEDITOR_HIDE,
 	LOCALE_BOUQUETEDITOR_LOCK,
 	LOCALE_BOUQUETEDITOR_MOVE,
+	LOCALE_BOUQUETEDITOR_MOVE_TO,
 	LOCALE_BOUQUETEDITOR_NAME,
 	LOCALE_BOUQUETEDITOR_NEWBOUQUETNAME,
 	LOCALE_BOUQUETEDITOR_RENAME,
diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h
index 764c74f54..3126ba9ca 100644
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -215,6 +215,7 @@ const char * locale_real_names[] =
 	"bouqueteditor.hide",
 	"bouqueteditor.lock",
 	"bouqueteditor.move",
+	"bouqueteditor.move_to",
 	"bouqueteditor.name",
 	"bouqueteditor.newbouquetname",
 	"bouqueteditor.rename",

From 121d2f6339a36fc423ca1595f6bec6ccc1c03f0a Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Tue, 28 Oct 2014 15:13:22 +0300
Subject: [PATCH 012/113] gui/channellist.cpp: add channel move to bouquet

---
 src/gui/channellist.cpp | 87 +++++++++++++++++++++++++++--------------
 src/gui/channellist.h   |  4 +-
 2 files changed, 61 insertions(+), 30 deletions(-)

diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index 4533a7a5b..fbe93cb39 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -332,7 +332,7 @@ int CChannelList::doChannelMenu(void)
 	delete selector;
 
 	if(select >= 0) {
-		signed int bouquet_id = 0;
+		//signed int bouquet_id = 0;
 		old_selected = select;
 		t_channel_id channel_id = empty ? 0 : (*chanlist)[selected]->channel_id;
 		bool tvmode = CZapit::getInstance()->getMode() & CZapitClient::MODE_TV;
@@ -364,31 +364,8 @@ int CChannelList::doChannelMenu(void)
 			ret = -1;
 			break;
 		case 1: // add to
-			bouquet_id = AllFavBouquetList->exec(false);
-			hide();
-			if(bouquet_id < 0)
+			if (!addChannelToBouquet())
 				return -1;
-
-			if (AllFavBouquetList->Bouquets[bouquet_id]->zapitBouquet) {
-				CZapitBouquet *zapitBouquet = AllFavBouquetList->Bouquets[bouquet_id]->zapitBouquet;
-				CZapitChannel *ch = zapitBouquet->getChannelByChannelID(channel_id);
-				if (ch == NULL) {
-					fav_found = false;
-					zapitBouquet->addService((*chanlist)[selected]);
-					for (unsigned n = 0; n < blist->Bouquets.size(); n++) {
-						if (blist->Bouquets[n]->zapitBouquet == zapitBouquet) {
-							zapitBouquet->getChannels(blist->Bouquets[n]->channelList->channels, tvmode);
-							saveChanges();
-							fav_found = true;
-							break;
-						}
-					}
-				}
-			}
-			if (!fav_found) {
-				CNeutrinoApp::getInstance()->MarkFavoritesChanged();
-				CNeutrinoApp::getInstance()->MarkChannelsInit();
-			}
 			ret = 1;
 			break;
 		case 2: // add to my favorites
@@ -897,6 +874,10 @@ int CChannelList::show()
 				}
 			}
 		}
+		else if (!empty && edit_state && move_state != beMoving && msg == CRCInput::RC_forward )
+		{
+			moveChannelToBouquet();
+		}
 #ifdef ENABLE_PIP
 		else if (!empty && ((msg == CRCInput::RC_play) || (msg == (neutrino_msg_t) g_settings.key_pip_close))) {
 			if(SameTP()) {
@@ -1692,13 +1673,14 @@ struct button_label SChannelListButtons_SMode[NUM_LIST_BUTTONS_SORT] =
 	{ NEUTRINO_ICON_BUTTON_MUTE_ZAP_ACTIVE, NONEXISTANT_LOCALE}
 };
 
-#define NUM_LIST_BUTTONS_EDIT 4
+#define NUM_LIST_BUTTONS_EDIT 5
 const struct button_label SChannelListButtons_Edit[NUM_LIST_BUTTONS_EDIT] =
 {
         { NEUTRINO_ICON_BUTTON_RED   , LOCALE_BOUQUETEDITOR_DELETE     },
         { NEUTRINO_ICON_BUTTON_GREEN , LOCALE_BOUQUETEDITOR_ADD        },
         { NEUTRINO_ICON_BUTTON_YELLOW, LOCALE_BOUQUETEDITOR_MOVE       },
-        { NEUTRINO_ICON_BUTTON_BLUE  , LOCALE_BOUQUETEDITOR_LOCK       }
+        { NEUTRINO_ICON_BUTTON_BLUE  , LOCALE_BOUQUETEDITOR_LOCK       },
+        { NEUTRINO_ICON_BUTTON_FORWARD  , LOCALE_BOUQUETEDITOR_MOVE_TO }
 };
 
 void CChannelList::paintButtonBar(bool is_current)
@@ -2425,14 +2407,14 @@ void CChannelList::internalMoveChannel( unsigned int fromPosition, unsigned int
 	paint();
 }
 
-void CChannelList::deleteChannel()
+void CChannelList::deleteChannel(bool ask)
 {
 	if (selected >= chanlist->size())
 		return;
 	if (!bouquet || !bouquet->zapitBouquet)
 		return;
 
-	if (ShowMsg(LOCALE_FILEBROWSER_DELETE, (*chanlist)[selected]->getName(), CMessageBox::mbrNo, CMessageBox::mbYes|CMessageBox::mbNo)!=CMessageBox::mbrYes)
+	if (ask && ShowMsg(LOCALE_FILEBROWSER_DELETE, (*chanlist)[selected]->getName(), CMessageBox::mbrNo, CMessageBox::mbYes|CMessageBox::mbNo)!=CMessageBox::mbrYes)
 		return;
 
 	bouquet->zapitBouquet->removeService((*chanlist)[selected]->channel_id);
@@ -2480,3 +2462,50 @@ void CChannelList::lockChannel()
 	else
 		paintItem(selected - liststart);
 }
+
+bool CChannelList::addChannelToBouquet()
+{
+	bool fav_found = true;
+	signed int bouquet_id = AllFavBouquetList->exec(false);
+	hide();
+	if(bouquet_id < 0)
+		return false;
+
+	t_channel_id channel_id = (*chanlist)[selected]->channel_id;
+	bool tvmode = CZapit::getInstance()->getMode() & CZapitClient::MODE_TV;
+	CBouquetList *blist = tvmode ? TVfavList : RADIOfavList;
+	if (AllFavBouquetList->Bouquets[bouquet_id]->zapitBouquet) {
+		CZapitBouquet *zapitBouquet = AllFavBouquetList->Bouquets[bouquet_id]->zapitBouquet;
+		CZapitChannel *ch = zapitBouquet->getChannelByChannelID(channel_id);
+		if (ch == NULL) {
+			fav_found = false;
+			zapitBouquet->addService((*chanlist)[selected]);
+			for (unsigned n = 0; n < blist->Bouquets.size(); n++) {
+				if (blist->Bouquets[n]->zapitBouquet == zapitBouquet) {
+					zapitBouquet->getChannels(blist->Bouquets[n]->channelList->channels, tvmode);
+					saveChanges();
+					fav_found = true;
+					break;
+				}
+			}
+		} else {
+			ShowMsg(LOCALE_EXTRA_ADD_TO_BOUQUET, LOCALE_EXTRA_CHALREADYINBQ, CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO);
+			return false;
+		}
+	}
+	if (!fav_found) {
+		CNeutrinoApp::getInstance()->MarkFavoritesChanged();
+		CNeutrinoApp::getInstance()->MarkChannelsInit();
+	}
+	return true;
+}
+
+void CChannelList::moveChannelToBouquet()
+{
+	if (addChannelToBouquet())
+		deleteChannel(false);
+	else
+		paint();
+
+	paintHead();
+}
diff --git a/src/gui/channellist.h b/src/gui/channellist.h
index 05abbefbd..559851f8f 100644
--- a/src/gui/channellist.h
+++ b/src/gui/channellist.h
@@ -159,10 +159,12 @@ private:
 	void finishMoveChannel();
 	void cancelMoveChannel();
 	void internalMoveChannel(unsigned int fromPosition, unsigned int toPosition);
-	void deleteChannel();
+	void deleteChannel(bool ask = true);
 	void addChannel();
 	void lockChannel();
 	void saveChanges(bool fav = true);
+	bool addChannelToBouquet();
+	void moveChannelToBouquet();
 
 	friend class CBouquet;
 public:

From 04be550075a53aa08e4e1b020f0144aad8fd911d Mon Sep 17 00:00:00 2001
From: Janus <janus@debian>
Date: Fri, 31 Oct 2014 12:58:54 +0100
Subject: [PATCH 013/113] api4 : fix value assignment to write_names

---
 src/neutrino.cpp          |  3 +++
 src/zapit/src/channel.cpp | 11 +++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 82f6840d3..bbe465449 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -1894,6 +1894,9 @@ TIMER_START();
 
 	/* create decoders, read channels */
 	bool zapit_init = CZapit::getInstance()->Start(&ZapStart_arg);
+	//get zapit config for writeChannelsNames
+	CZapit::getInstance()->GetConfig(zapitCfg);
+
 	// init audio settings
 	audioDecoder->SetSRS(g_settings.srs_enable, g_settings.srs_nmgr_enable, g_settings.srs_algo, g_settings.srs_ref_volume);
 	//audioDecoder->setVolume(g_settings.current_volume, g_settings.current_volume);
diff --git a/src/zapit/src/channel.cpp b/src/zapit/src/channel.cpp
index 588588d69..f1c23c461 100644
--- a/src/zapit/src/channel.cpp
+++ b/src/zapit/src/channel.cpp
@@ -351,26 +351,25 @@ void CZapitChannel::dumpServiceXml(FILE * fd, const char * action)
 
 void CZapitChannel::dumpBouquetXml(FILE * fd, bool bUser)
 {
-	// TODO : gui->manage configuration: write names (if nessessary or wanted) 
+	// TODO : gui->manage configuration: writeChannelsNames (if nessessary or wanted) in zapit.conf
 	// menu > installation > Servicesscan > under 'Bouquet' => "Write DVB-names in bouquets:" f.e. =>0=never 1=ubouquets 2=bouquets 3=both
 	int write_names =  zapitCfg.writeChannelsNames;
 
 	fprintf(fd, "\t\t<S");
 
-	// references
+	// references (mandatory)
 	if (url.empty())
 		fprintf(fd, " i=\"%x\" t=\"%x\" on=\"%x\" s=\"%hd\" frq=\"%hd\"",getServiceId(), getTransportStreamId(), getOriginalNetworkId(), getSatellitePosition(), getFreqId());
 	else
 		fprintf(fd, " u=\"%s\"",convert_UTF8_To_UTF8_XML(url.c_str()).c_str());
 
-	// service descriptors
+	// service names
 	if (bUser || !url.empty()) {
-		if ((write_names==0x01) || (write_names==0x03))
+		if ((write_names & 0x01) ==0x01)
 			fprintf(fd, " n=\"%s\"", convert_UTF8_To_UTF8_XML(name.c_str()).c_str());
-		//fprintf(fd, " n=\"%s\"", convert_UTF8_To_UTF8_XML(name.c_str()).c_str());
 	}
 	else {
-		if ((write_names==0x02) || (write_names==0x03))
+		if ((write_names & 0x02) == 0x02)
 			fprintf(fd, " n=\"%s\"", convert_UTF8_To_UTF8_XML(name.c_str()).c_str());
 	}
 

From 93d62fd11a4d27d7796af3a892deb83733f5ff1c Mon Sep 17 00:00:00 2001
From: Janus <janus@debian>
Date: Mon, 3 Nov 2014 14:16:53 +0100
Subject: [PATCH 014/113] -add CBouquetManager writenames menu

---
 data/locale/deutsch.locale         |  6 ++++++
 data/locale/english.locale         |  6 ++++++
 src/gui/scan_setup.cpp             | 20 ++++++++++++++++++++
 src/system/locals.h                |  6 ++++++
 src/system/locals_intern.h         |  6 ++++++
 src/zapit/include/zapit/bouquets.h |  7 +++++++
 src/zapit/src/bouquets.cpp         |  4 ++--
 src/zapit/src/channel.cpp          |  4 ++--
 src/zapit/src/zapit.cpp            |  2 +-
 9 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index 73c86ec60..2663d9f28 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -1200,6 +1200,7 @@ menu.hint_scan_auto Automatischer Suchlauf ausgewählter Anbieter
 menu.hint_scan_autoall Automatischer Suchlauf aller ausgewählten Anbieter
 menu.hint_scan_autoall_select Suchlauf nur in ausgewählten Satelliten
 menu.hint_scan_bouquet erneuern: hinzufügen zu den Bouquets, löschen: entfernt alte Bouquets, nicht ändern: neue werden in 'Andere' angefügt
+menu.hint_scan_bouquet_writenames Originale Programmnamen in Bouquets speichern \nNie > nur Favoriten > nur Anbieter > Beide
 menu.hint_scan_bw Wählen Sie die Bandbreite
 menu.hint_scan_cable Wählen Sie ihr Kabelnetz für den Suchlauf
 menu.hint_scan_cable_simple Kabel-Suchlauf mit optionaler Anbieter- und Kanal-Nummerierung
@@ -1992,6 +1993,11 @@ scants.bouquet_erase löschen
 scants.bouquet_leave nicht ändern
 scants.bouquet_satellite Satelliten-Bouquet
 scants.bouquet_update erneuern
+scants.bouquet_writenames Originalnamen in Bouquets schreiben
+scants.bouquet_writenames_bouquets nur Anbieter
+scants.bouquet_writenames_ever Beide
+scants.bouquet_writenames_never Nie
+scants.bouquet_writenames_ubouquets nur Favoriten
 scants.channel Kanal:
 scants.failed Kanalsuche fehlgeschlagen!
 scants.finished Kanalsuche erfolgreich beendet!
diff --git a/data/locale/english.locale b/data/locale/english.locale
index d2714ca26..a252ce33b 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -1203,6 +1203,7 @@ menu.hint_scan_auto Auto-scan selected provider
 menu.hint_scan_autoall Scan several selected providers at once
 menu.hint_scan_autoall_select Add selected satellites to scan
 menu.hint_scan_bouquet Update: add to current bouquets, erase:\nremove old bouquets, leave: dont add or change
+menu.hint_scan_bouquet_writenames Write services names to bouquets \n never > fovourites only > providers only > both
 menu.hint_scan_bw Select the channel bandwidth
 menu.hint_scan_cable Select cable network to scan
 menu.hint_scan_cable_simple Cable scan with optional\nprovider channel numbering
@@ -1995,6 +1996,11 @@ scants.bouquet_erase erase old
 scants.bouquet_leave leave current
 scants.bouquet_satellite Satellite-Bouquet
 scants.bouquet_update update
+scants.bouquet_writenames Write service names to bouquets
+scants.bouquet_writenames_bouquets providers
+scants.bouquet_writenames_ever both
+scants.bouquet_writenames_never never
+scants.bouquet_writenames_ubouquets favourites
 scants.channel Channel:
 scants.failed Transponderscan failed!
 scants.finished Transponderscan finished successfully!
diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp
index 1d57dcff5..5133310e0 100644
--- a/src/gui/scan_setup.cpp
+++ b/src/gui/scan_setup.cpp
@@ -655,7 +655,27 @@ int CScanSetup::showScanMenu()
 	mc->setHint("", LOCALE_MENU_HINT_SCAN_BOUQUET);
 	settings->addItem(mc);
 
+	//bouquet write_names selection
+	const short SCANTS_BOUQUET_WRITENAMES_COUNT = 4;
+	const CMenuOptionChooser::keyval SCANTS_BOUQUET_WRITENAMES[SCANTS_BOUQUET_WRITENAMES_COUNT] =
+	{
+		{ CBouquetManager::BWN_NEVER		, LOCALE_SCANTS_BOUQUET_WRITENAMES_NEVER     	},
+		{ CBouquetManager::BWN_UBOUQUETS    	, LOCALE_SCANTS_BOUQUET_WRITENAMES_UBOUQUETS   	},
+		{ CBouquetManager::BWN_BOUQUETS     	, LOCALE_SCANTS_BOUQUET_WRITENAMES_BOUQUETS    	},
+		{ CBouquetManager::BWN_EVER        	, LOCALE_SCANTS_BOUQUET_WRITENAMES_EVER    	}
+	};
+
+	int tmp_writeChannelsNames = zapitCfg.writeChannelsNames;
+	mc = new CMenuOptionChooser(LOCALE_SCANTS_BOUQUET_WRITENAMES, (int *)&zapitCfg.writeChannelsNames, SCANTS_BOUQUET_WRITENAMES, SCANTS_BOUQUET_WRITENAMES_COUNT, true, NULL, CRCInput::convertDigitToKey(shortcut++), "", true);
+	mc->setHint("", LOCALE_MENU_HINT_SCAN_BOUQUET_WRITENAMES);
+	settings->addItem(mc);
+
 	int res = settings->exec(NULL, "");
+	//set write_names if changed
+	if(zapitCfg.writeChannelsNames != tmp_writeChannelsNames){
+		CZapit::getInstance()->SetConfig(&zapitCfg);
+		g_Zapit->saveBouquets();
+	}
 
 	delete satOnOff;
 	delete settings;
diff --git a/src/system/locals.h b/src/system/locals.h
index aa5dae893..2ed66a79b 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -1230,6 +1230,7 @@ typedef enum
 	LOCALE_MENU_HINT_SCAN_AUTOALL,
 	LOCALE_MENU_HINT_SCAN_AUTOALL_SELECT,
 	LOCALE_MENU_HINT_SCAN_BOUQUET,
+	LOCALE_MENU_HINT_SCAN_BOUQUET_WRITENAMES,
 	LOCALE_MENU_HINT_SCAN_BW,
 	LOCALE_MENU_HINT_SCAN_CABLE,
 	LOCALE_MENU_HINT_SCAN_CABLE_SIMPLE,
@@ -2022,6 +2023,11 @@ typedef enum
 	LOCALE_SCANTS_BOUQUET_LEAVE,
 	LOCALE_SCANTS_BOUQUET_SATELLITE,
 	LOCALE_SCANTS_BOUQUET_UPDATE,
+	LOCALE_SCANTS_BOUQUET_WRITENAMES,
+	LOCALE_SCANTS_BOUQUET_WRITENAMES_BOUQUETS,
+	LOCALE_SCANTS_BOUQUET_WRITENAMES_EVER,
+	LOCALE_SCANTS_BOUQUET_WRITENAMES_NEVER,
+	LOCALE_SCANTS_BOUQUET_WRITENAMES_UBOUQUETS,
 	LOCALE_SCANTS_CHANNEL,
 	LOCALE_SCANTS_FAILED,
 	LOCALE_SCANTS_FINISHED,
diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h
index 3126ba9ca..fb39b23f6 100644
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -1230,6 +1230,7 @@ const char * locale_real_names[] =
 	"menu.hint_scan_autoall",
 	"menu.hint_scan_autoall_select",
 	"menu.hint_scan_bouquet",
+	"menu.hint_scan_bouquet_writenames",
 	"menu.hint_scan_bw",
 	"menu.hint_scan_cable",
 	"menu.hint_scan_cable_simple",
@@ -2022,6 +2023,11 @@ const char * locale_real_names[] =
 	"scants.bouquet_leave",
 	"scants.bouquet_satellite",
 	"scants.bouquet_update",
+	"scants.bouquet_writenames",
+	"scants.bouquet_writenames_bouquets",
+	"scants.bouquet_writenames_ever",
+	"scants.bouquet_writenames_never",
+	"scants.bouquet_writenames_ubouquets",
 	"scants.channel",
 	"scants.failed",
 	"scants.finished",
diff --git a/src/zapit/include/zapit/bouquets.h b/src/zapit/include/zapit/bouquets.h
index 92984247c..7d44d2931 100644
--- a/src/zapit/include/zapit/bouquets.h
+++ b/src/zapit/include/zapit/bouquets.h
@@ -132,6 +132,13 @@ class CBouquetManager
 		void sortBouquets(void);
 		void setBouquetLock(const unsigned int id, bool state);
 		void setBouquetLock(CZapitBouquet* bouquet, bool state);
+		//bouquet writeChannelsNames selection options
+		enum{
+			BWN_NEVER,
+			BWN_UBOUQUETS,
+			BWN_BOUQUETS,
+			BWN_EVER
+		};
 };
 
 /*
diff --git a/src/zapit/src/bouquets.cpp b/src/zapit/src/bouquets.cpp
index a9e41076b..6da5ebbf9 100644
--- a/src/zapit/src/bouquets.cpp
+++ b/src/zapit/src/bouquets.cpp
@@ -268,7 +268,7 @@ void CBouquetManager::saveBouquets(void)
 		perror(BOUQUETS_XML);
 		return;
 	}
-	fprintf(bouq_fd, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<zapit>\n");
+	fprintf(bouq_fd, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<zapit api=\"4\">\n");
 	for (unsigned int i = 0; i < Bouquets.size(); i++) {
 		if (Bouquets[i] != remainChannels) {
 			DBG("save Bouquets: name %s user: %d\n", Bouquets[i]->Name.c_str(), Bouquets[i]->bUser);
@@ -293,7 +293,7 @@ void CBouquetManager::saveUBouquets(void)
 		perror(BOUQUETS_XML);
 		return;
 	}
-	fprintf(ubouq_fd, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<zapit>\n");
+	fprintf(ubouq_fd, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<zapit api=\"4\">\n");
 	for (unsigned int i = 0; i < Bouquets.size(); i++) {
 		if (Bouquets[i] != remainChannels) {
 			if(Bouquets[i]->bUser) {
diff --git a/src/zapit/src/channel.cpp b/src/zapit/src/channel.cpp
index f1c23c461..320613c34 100644
--- a/src/zapit/src/channel.cpp
+++ b/src/zapit/src/channel.cpp
@@ -365,11 +365,11 @@ void CZapitChannel::dumpBouquetXml(FILE * fd, bool bUser)
 
 	// service names
 	if (bUser || !url.empty()) {
-		if ((write_names & 0x01) ==0x01)
+		if ((write_names & CBouquetManager::BWN_UBOUQUETS) == CBouquetManager::BWN_UBOUQUETS)
 			fprintf(fd, " n=\"%s\"", convert_UTF8_To_UTF8_XML(name.c_str()).c_str());
 	}
 	else {
-		if ((write_names & 0x02) == 0x02)
+		if ((write_names & CBouquetManager::BWN_BOUQUETS) == CBouquetManager::BWN_BOUQUETS)
 			fprintf(fd, " n=\"%s\"", convert_UTF8_To_UTF8_XML(name.c_str()).c_str());
 	}
 
diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp
index aa348f18d..03ac882e5 100644
--- a/src/zapit/src/zapit.cpp
+++ b/src/zapit/src/zapit.cpp
@@ -299,7 +299,7 @@ void CZapit::LoadSettings()
 	voltageOff				= configfile.getBool("voltageOff", 0);
 #endif
 	config.saveLastChannel			= configfile.getBool("saveLastChannel", true);
-	config.writeChannelsNames		= configfile.getInt32("writeChannelsNames", 3);
+	config.writeChannelsNames		= configfile.getInt32("writeChannelsNames", CBouquetManager::BWN_EVER );
 	/* FIXME Channels renum should be done for all channels atm. TODO*/
 	//config.makeRemainingChannelsBouquet	= configfile.getBool("makeRemainingChannelsBouquet", 1);
 	config.makeRemainingChannelsBouquet	= 1;

From 3c52e2b87f0eefcbcb3197bdd598a770711ae05b Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Tue, 4 Nov 2014 14:59:23 +0100
Subject: [PATCH 015/113] - re-enable front-panel settings for Trinity; re-sort
 vfd_setup

---
 data/locale/deutsch.locale    |  4 +--
 data/locale/english.locale    |  6 ++--
 data/locale/nederlands.locale |  6 ++--
 data/locale/slovak.locale     |  4 +--
 src/gui/vfd_setup.cpp         | 58 +++++++++++++++++++----------------
 src/neutrino_menue.cpp        |  8 ++---
 6 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index 2663d9f28..6fd27279b 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -807,7 +807,7 @@ lcdcontroler.brightnessdeepstandby Deep-Standby
 lcdcontroler.brightnessstandby Standby
 lcdmenu.dim_brightness nach Dimm-Timeout
 lcdmenu.dim_time Dimm-Timeout
-lcdmenu.head VFD Einstellungen
+lcdmenu.head VFD/LED Einstellungen
 lcdmenu.lcdcontroler Helligkeit
 lcdmenu.scroll Laufschrift
 lcdmenu.statusline Statuszeile
@@ -861,7 +861,7 @@ mainsettings.audio Audio
 mainsettings.head Einstellungen
 mainsettings.keybinding Tasten
 mainsettings.language Sprache
-mainsettings.lcd VFD-Display
+mainsettings.lcd Front-Panel
 mainsettings.manage Einstellungen verwalten
 mainsettings.misc Erweiterte Einstellungen
 mainsettings.multimedia Multimedia
diff --git a/data/locale/english.locale b/data/locale/english.locale
index a252ce33b..88089a430 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -809,7 +809,7 @@ lcdcontroler.brightnessdeepstandby DeepStandby Brightness
 lcdcontroler.brightnessstandby Standby Brightness
 lcdmenu.dim_brightness Brightness after dim timeout
 lcdmenu.dim_time Dim timeout
-lcdmenu.head VFD Settings
+lcdmenu.head VFD/LED Settings
 lcdmenu.lcdcontroler Brightness
 lcdmenu.scroll Enable text scroll
 lcdmenu.statusline status line
@@ -863,7 +863,7 @@ mainsettings.audio Audio
 mainsettings.head Settings
 mainsettings.keybinding Key Setup
 mainsettings.language Language / Timezone
-mainsettings.lcd VFD-Display
+mainsettings.lcd Front-Panel
 mainsettings.manage Manage settings
 mainsettings.misc Extended settings
 mainsettings.multimedia Multimedia
@@ -1314,7 +1314,7 @@ menu.hint_tools Run tools
 menu.hint_tvmode Switch box to TV mode
 menu.hint_tvradio_switch Switches between TV and Radio mode
 menu.hint_upnp Universal Plug and Play Browser
-menu.hint_vfd Frontpanel LEDS, VFD options
+menu.hint_vfd Frontpanel LEDs, VFD options
 menu.hint_vfd_brightness Working brightness 
 menu.hint_vfd_brightness_setup Configure frontpanel display brightness\nfor different modes
 menu.hint_vfd_brightnessdeepstandby Brightness in deep-standby mode
diff --git a/data/locale/nederlands.locale b/data/locale/nederlands.locale
index 3f229a66e..9d05d7e13 100644
--- a/data/locale/nederlands.locale
+++ b/data/locale/nederlands.locale
@@ -807,7 +807,7 @@ lcdcontroler.brightnessdeepstandby Deep Standby helderheid
 lcdcontroler.brightnessstandby Standby Helderheid
 lcdmenu.dim_brightness Helderheid na dim timeout
 lcdmenu.dim_time Dim timeout
-lcdmenu.head VFD Instellingen
+lcdmenu.head VFD/LED Instellingen
 lcdmenu.lcdcontroler Helderheid
 lcdmenu.scroll Enable tekst scroll
 lcdmenu.statusline statuslijn
@@ -861,7 +861,7 @@ mainsettings.audio Audio
 mainsettings.head Instellingen
 mainsettings.keybinding Sneltoetsen aanpassen
 mainsettings.language Taal / Tijdzone
-mainsettings.lcd Display instellingen
+mainsettings.lcd Voorpaneel instellingen
 mainsettings.manage Beheer instellingen
 mainsettings.misc Diverse instellingen
 mainsettings.multimedia Multimedia
@@ -1310,7 +1310,7 @@ menu.hint_tools Start tools
 menu.hint_tvmode Schakel ontvanger in TV modus
 menu.hint_tvradio_switch Schakelen tussen TV en Radio modus
 menu.hint_upnp Universal Plug and Play Browser
-menu.hint_vfd Voorpaneel LEDS, VFD opties
+menu.hint_vfd Voorpaneel LEDs, VFD opties
 menu.hint_vfd_brightness Helderheid in gebruik
 menu.hint_vfd_brightness_setup Configureer helderheid van het display
 menu.hint_vfd_brightnessdeepstandby Helderheid in deep-standby modus
diff --git a/data/locale/slovak.locale b/data/locale/slovak.locale
index 729dc7ede..63b7cc53f 100644
--- a/data/locale/slovak.locale
+++ b/data/locale/slovak.locale
@@ -719,7 +719,7 @@ lcdcontroler.brightnessdeepstandby Jas v hlbokom spánku
 lcdcontroler.brightnessstandby Jas v spánku
 lcdmenu.dim_brightness Jas po zhasnutí
 lcdmenu.dim_time Čas zhasnutia
-lcdmenu.head Nastavenie VFD
+lcdmenu.head Nastavenie VFD/LED
 lcdmenu.lcdcontroler Jas
 lcdmenu.scroll Povoliť pohyb textu
 lcdmenu.statusline Stavový riadok
@@ -767,7 +767,7 @@ mainsettings.audio Zvuk
 mainsettings.head Nastavenia
 mainsettings.keybinding Nastavenia kláves
 mainsettings.language Jazyk / Časové pásmo
-mainsettings.lcd Zobrazovač VFD
+mainsettings.lcd Zobrazovač VFD / LED
 mainsettings.manage Spravovanie nastavení
 mainsettings.misc Iné nastavenia
 mainsettings.network Sieť
diff --git a/src/gui/vfd_setup.cpp b/src/gui/vfd_setup.cpp
index 3b1413a64..326a0c2a6 100644
--- a/src/gui/vfd_setup.cpp
+++ b/src/gui/vfd_setup.cpp
@@ -113,43 +113,49 @@ int CVfdSetup::showSetup()
 	CMenuWidget *vfds = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_LCD, width, MN_WIDGET_ID_VFDSETUP);
 	vfds->addIntroItems(LOCALE_LCDMENU_HEAD);
 
-	//vfd brightness menu
-	CMenuForwarder * mf = new CMenuForwarder(LOCALE_LCDMENU_LCDCONTROLER, vfd_enabled, NULL, this, "brightness", CRCInput::RC_red);
-	mf->setHint("", LOCALE_MENU_HINT_VFD_BRIGHTNESS_SETUP);
-	vfds->addItem(mf);
+	CMenuForwarder * mf;
 
 	//led menu
-	if(cs_get_revision() > 7)
+	if (cs_get_revision() > 7) // not HD1 and BSE
 	{
  		CMenuWidget * ledMenu = new CMenuWidget(LOCALE_LCDMENU_HEAD, NEUTRINO_ICON_LCD, width, MN_WIDGET_ID_VFDSETUP_LED_SETUP);
 		showLedSetup(ledMenu);
-		mf = new CMenuDForwarder(LOCALE_LEDCONTROLER_MENU, true, NULL, ledMenu, NULL, CRCInput::RC_green);
+		mf = new CMenuDForwarder(LOCALE_LEDCONTROLER_MENU, true, NULL, ledMenu, NULL, CRCInput::RC_red);
 		mf->setHint("", LOCALE_MENU_HINT_POWER_LEDS);
 		vfds->addItem(mf);
 	}
-	if(cs_get_revision() == 9)
-	{
- 		CMenuWidget * blMenu = new CMenuWidget(LOCALE_LCDMENU_HEAD, NEUTRINO_ICON_LCD, width, MN_WIDGET_ID_VFDSETUP_BACKLIGHT);
-		showBacklightSetup(blMenu);
-		mf = new CMenuDForwarder(LOCALE_LEDCONTROLER_BACKLIGHT, true, NULL, blMenu, NULL, CRCInput::RC_yellow);
-		mf->setHint("", LOCALE_MENU_HINT_BACKLIGHT);
+
+	if (CVFD::getInstance()->has_lcd) {
+		//vfd brightness menu
+		mf = new CMenuForwarder(LOCALE_LCDMENU_LCDCONTROLER, vfd_enabled, NULL, this, "brightness", CRCInput::RC_green);
+		mf->setHint("", LOCALE_MENU_HINT_VFD_BRIGHTNESS_SETUP);
 		vfds->addItem(mf);
+
+		if (cs_get_revision() == 9) // Tank only
+		{
+			//backlight menu
+			CMenuWidget * blMenu = new CMenuWidget(LOCALE_LCDMENU_HEAD, NEUTRINO_ICON_LCD, width, MN_WIDGET_ID_VFDSETUP_BACKLIGHT);
+			showBacklightSetup(blMenu);
+			mf = new CMenuDForwarder(LOCALE_LEDCONTROLER_BACKLIGHT, true, NULL, blMenu, NULL, CRCInput::RC_yellow);
+			mf->setHint("", LOCALE_MENU_HINT_BACKLIGHT);
+			vfds->addItem(mf);
+		}
+
+		vfds->addItem(GenericMenuSeparatorLine);
+
+		//status and info line options
+		CMenuOptionChooser* oj = new CMenuOptionChooser(LOCALE_LCDMENU_STATUSLINE, &g_settings.lcd_setting[SNeutrinoSettings::LCD_SHOW_VOLUME], LCDMENU_STATUSLINE_OPTIONS, LCDMENU_STATUSLINE_OPTION_COUNT, vfd_enabled);
+		oj->setHint("", LOCALE_MENU_HINT_VFD_STATUSLINE);
+		CMenuOptionChooser* lcd_clock_channelname_menu = new CMenuOptionChooser(LOCALE_LCD_INFO_LINE, &g_settings.lcd_info_line, LCD_INFO_OPTIONS, LCD_INFO_OPTION_COUNT, vfd_enabled);
+		lcd_clock_channelname_menu->setHint("", LOCALE_MENU_HINT_VFD_INFOLINE);
+		vfds->addItem(oj);
+		vfds->addItem(lcd_clock_channelname_menu);
+
+		oj = new CMenuOptionChooser(LOCALE_LCDMENU_SCROLL, &g_settings.lcd_scroll, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, vfd_enabled);
+		oj->setHint("", LOCALE_MENU_HINT_VFD_SCROLL);
+		vfds->addItem(oj);
 	}
 
-	vfds->addItem(GenericMenuSeparatorLine);
-
-	//status and info line options
-	CMenuOptionChooser* oj = new CMenuOptionChooser(LOCALE_LCDMENU_STATUSLINE, &g_settings.lcd_setting[SNeutrinoSettings::LCD_SHOW_VOLUME], LCDMENU_STATUSLINE_OPTIONS, LCDMENU_STATUSLINE_OPTION_COUNT, vfd_enabled);
-	oj->setHint("", LOCALE_MENU_HINT_VFD_STATUSLINE);
-	CMenuOptionChooser* lcd_clock_channelname_menu = new CMenuOptionChooser(LOCALE_LCD_INFO_LINE, &g_settings.lcd_info_line, LCD_INFO_OPTIONS, LCD_INFO_OPTION_COUNT, vfd_enabled);
-	lcd_clock_channelname_menu->setHint("", LOCALE_MENU_HINT_VFD_INFOLINE);
-	vfds->addItem(oj);
-	vfds->addItem(lcd_clock_channelname_menu);
-
-	oj = new CMenuOptionChooser(LOCALE_LCDMENU_SCROLL, &g_settings.lcd_scroll, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, vfd_enabled);
-	oj->setHint("", LOCALE_MENU_HINT_VFD_SCROLL);
-	vfds->addItem(oj);
-
 	int res = vfds->exec(NULL, "");
 
 	delete vfds;
diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp
index 8982982fc..2225c1cc1 100644
--- a/src/neutrino_menue.cpp
+++ b/src/neutrino_menue.cpp
@@ -424,11 +424,9 @@ void CNeutrinoApp::InitMenuSettings()
 	}
 
 	// lcd
-	if (CVFD::getInstance()->has_lcd) {
-		mf = new CMenuForwarder(LOCALE_MAINSETTINGS_LCD, true, NULL, new CVfdSetup());
-		mf->setHint(NEUTRINO_ICON_HINT_VFD, LOCALE_MENU_HINT_VFD);
-		personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_VFD]);
-	}
+	mf = new CMenuForwarder(LOCALE_MAINSETTINGS_LCD, true, NULL, new CVfdSetup());
+	mf->setHint(NEUTRINO_ICON_HINT_VFD, LOCALE_MENU_HINT_VFD);
+	personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_VFD]);
 
 	// drive settings
 	if (g_settings.recording_type != CNeutrinoApp::RECORDING_OFF) {

From 847b08aedb9cd7b44e479760552e42566ca9cc28 Mon Sep 17 00:00:00 2001
From: Jacek Jendrzej <crashdvb@googlemail.com>
Date: Wed, 5 Nov 2014 08:59:12 +0100
Subject: [PATCH 016/113] nhttpd:controlapi.cpp fix getallsubchannels

---
 src/nhttpd/tuxboxapi/coolstream/controlapi.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
index 805176c64..99971d5ef 100644
--- a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
+++ b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
@@ -1655,11 +1655,13 @@ void CControlAPI::ZaptoCGI(CyhookHandler *hh)
 			CEitManager::getInstance()->getCurrentNextServiceKey(current_channel, currentNextInfo);
 			if (CEitManager::getInstance()->getLinkageDescriptorsUniqueKey(currentNextInfo.current_uniqueKey,desc))
 			{
+				CZapitChannel * channel = CServiceManager::getInstance()->FindChannel(current_channel);
+				t_satellite_position satellitePosition = channel->getSatellitePosition();
 				for(unsigned int i=0; i< desc.size(); i++)
 				{
 					t_channel_id sub_channel_id =
-						CREATE_CHANNEL_ID(
-							desc[i].serviceId, desc[i].originalNetworkId, desc[i].transportStreamId);
+						      ((uint64_t) ( satellitePosition >= 0 ? satellitePosition : (uint64_t)(0xF000+ abs(satellitePosition))) << 48) |
+						      (uint64_t) CREATE_CHANNEL_ID(desc[i].serviceId, desc[i].originalNetworkId, desc[i].transportStreamId);
 					hh->printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS
 						   " %s\n",
 						   sub_channel_id,

From 59ca850ecc4d67b5e2dc4176cdea44b210841256 Mon Sep 17 00:00:00 2001
From: Christian Schuett <Gaucho316@hotmail.com>
Date: Sun, 2 Nov 2014 20:53:20 +0100
Subject: [PATCH 017/113] nhttpd controlapi: allow zapping to subchannels

based on idea by Moritz Venn <moritz.venn@freaque.net>

Signed-off-by: Christian Schuett <Gaucho316@hotmail.com>
---
 src/nhttpd/doc/nhttpd_controlapi.html          | 14 ++++++++++++++
 src/nhttpd/tuxboxapi/coolstream/controlapi.cpp | 17 ++++++++++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/nhttpd/doc/nhttpd_controlapi.html b/src/nhttpd/doc/nhttpd_controlapi.html
index 7eae99bb2..89adf2763 100644
--- a/src/nhttpd/doc/nhttpd_controlapi.html
+++ b/src/nhttpd/doc/nhttpd_controlapi.html
@@ -797,6 +797,20 @@ ok<br>
 &gt;&gt;&gt;http://dbox/control/setmode?record=stop<br>
 ok<br>
 </div>
+<br>
+<b>Parameter:</b> subchannel=&lt;channel_id&gt; (64 bit, hexidecimal value)<br>
+<b>Rueckgabe:</b><br>
+<br>
+Zappt auf den angegebenen Unterkanal.<br>
+Als Rueckgabe ist im Erfolgsfall ok zu erwarten.<br>
+<br>
+<b>Rueckgabe-Format:</b> ok / error<br>
+<div class="example">
+Beispiel:<br>
+<br>
+&gt;&gt;&gt;http://dbox/control/zapto?subchannel=1008500d4<br>
+ok <br>
+</div>
 
 <!-- ----------------------------------------------------------- -->
 <div class="title1"><a name="getmode"></a>8. Radio/TV Mode Abfrage</div>
diff --git a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
index 99971d5ef..9b2dd8171 100644
--- a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
+++ b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
@@ -1653,7 +1653,9 @@ void CControlAPI::ZaptoCGI(CyhookHandler *hh)
 			CSectionsdClient::LinkageDescriptorList desc;
 			CSectionsdClient::responseGetCurrentNextInfoChannelID currentNextInfo;
 			CEitManager::getInstance()->getCurrentNextServiceKey(current_channel, currentNextInfo);
-			if (CEitManager::getInstance()->getLinkageDescriptorsUniqueKey(currentNextInfo.current_uniqueKey,desc))
+
+			if (currentNextInfo.flags & CSectionsdClient::epgflags::current_has_linkagedescriptors &&
+			    CEitManager::getInstance()->getLinkageDescriptorsUniqueKey(currentNextInfo.current_uniqueKey, desc))
 			{
 				CZapitChannel * channel = CServiceManager::getInstance()->FindChannel(current_channel);
 				t_satellite_position satellitePosition = channel->getSatellitePosition();
@@ -1669,6 +1671,19 @@ void CControlAPI::ZaptoCGI(CyhookHandler *hh)
 				}
 			}
 		}
+		else if (!hh->ParamList["subchannel"].empty())
+		{
+			t_channel_id current_channel = NeutrinoAPI->Zapit->getCurrentServiceID();
+			CSectionsdClient::responseGetCurrentNextInfoChannelID currentNextInfo;
+			CEitManager::getInstance()->getCurrentNextServiceKey(current_channel, currentNextInfo);
+			if (currentNextInfo.flags & CSectionsdClient::epgflags::current_has_linkagedescriptors)
+			{
+				NeutrinoAPI->ZapToSubService(hh->ParamList["subchannel"].c_str());
+				hh->SendOk();
+			}
+			else
+				hh->SendError();
+		}
 		else if (hh->ParamList["name"] != "")
 		{
 			t_channel_id channel_id;

From 592e0ed631a3e32c97a28a2c674005e18bdd2277 Mon Sep 17 00:00:00 2001
From: Jacek Jendrzej <crashdvb@googlemail.com>
Date: Tue, 4 Nov 2014 17:59:44 +0100
Subject: [PATCH 018/113] CMoviePlayerGui::selectAudioPid() add Analog Audio
 on/off option

---
 src/gui/movieplayer.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
index 22e99d725..18319035b 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -45,6 +45,8 @@
 #include <eitd/edvbstring.h>
 #include <system/helpers.h>
 
+#include <src/mymenu.h>
+
 #include <unistd.h>
 #include <stdlib.h>
 #include <sys/timeb.h>
@@ -1241,7 +1243,13 @@ void CMoviePlayerGui::selectAudioPid()
 						0, 999, CVolume::getInstance()));
 		}
 	}
-
+	if (!g_settings.easymenu) {
+		APIDSelector.addItem(new CMenuSeparator(CMenuSeparator::LINE));
+		extern CAudioSetupNotifier     * audioSetupNotifier;
+		APIDSelector.addItem( new CMenuOptionChooser(LOCALE_AUDIOMENU_ANALOG_OUT, &g_settings.analog_out,
+					OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT,
+					true, audioSetupNotifier, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN) );
+	}
 	APIDSelector.exec(NULL, "");
 	delete selector;
 	printf("CMoviePlayerGui::selectAudioPid: selected %d (%x) current %x\n", select, (select >= 0) ? apids[select] : -1, currentapid);

From 50a90906a0bb90eb1aa1763e1ac869e60a26477b Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Wed, 5 Nov 2014 11:48:56 +0300
Subject: [PATCH 019/113] gui/moviebrowser.cpp: allow to delete any file + xml

---
 src/gui/moviebrowser.cpp | 71 ++++++++++++++++++++--------------------
 1 file changed, 35 insertions(+), 36 deletions(-)

diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp
index 15b635897..26cf94722 100644
--- a/src/gui/moviebrowser.cpp
+++ b/src/gui/moviebrowser.cpp
@@ -2031,53 +2031,52 @@ bool CMovieBrowser::onButtonPressMovieInfoList(neutrino_msg_t msg)
 void CMovieBrowser::onDeleteFile(MI_MOVIE_INFO& movieSelectionHandler, bool skipAsk)
 {
 	//TRACE("[onDeleteFile] ");
+#if 0
 	int test= movieSelectionHandler.file.Name.find(".ts", movieSelectionHandler.file.Name.length()-3);
-	if (test == -1)
-	{
+	if (test == -1) {
 		// not a TS file, return!!!!!
 		TRACE("show_ts_info: not a TS file ");
+		return;
+	}
+#endif
+	std::string msg = g_Locale->getText(LOCALE_FILEBROWSER_DODELETE1);
+	msg += "\n ";
+	if (movieSelectionHandler.file.Name.length() > 40)
+	{
+		msg += movieSelectionHandler.file.Name.substr(0,40);
+		msg += "...";
 	}
 	else
+		msg += movieSelectionHandler.file.Name;
+
+	msg += "\n ";
+	msg += g_Locale->getText(LOCALE_FILEBROWSER_DODELETE2);
+	if ((skipAsk) || (ShowMsg(LOCALE_FILEBROWSER_DELETE, msg, CMessageBox::mbrYes, CMessageBox::mbYes|CMessageBox::mbNo)==CMessageBox::mbrYes))
 	{
-		std::string msg = g_Locale->getText(LOCALE_FILEBROWSER_DODELETE1);
-		msg += "\n ";
-		if (movieSelectionHandler.file.Name.length() > 40)
-		{
-			msg += movieSelectionHandler.file.Name.substr(0,40);
-			msg += "...";
-		}
-		else
-			msg += movieSelectionHandler.file.Name;
+		CHintBox * hintBox = new CHintBox(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_MOVIEBROWSER_DELETE_INFO));
+		hintBox->paint();
+		delFile(movieSelectionHandler.file);
 
-		msg += "\n ";
-		msg += g_Locale->getText(LOCALE_FILEBROWSER_DODELETE2);
-		if ((skipAsk) || (ShowMsg(LOCALE_FILEBROWSER_DELETE, msg, CMessageBox::mbrYes, CMessageBox::mbYes|CMessageBox::mbNo)==CMessageBox::mbrYes))
-		{
-			CHintBox * hintBox = new CHintBox(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_MOVIEBROWSER_DELETE_INFO));
-			hintBox->paint();
-			delFile(movieSelectionHandler.file);
+		std::string fname = getScreenshotName(movieSelectionHandler.file.Name, S_ISDIR(m_movieSelectionHandler->file.Mode));
+		if (!fname.empty())
+			unlink(fname.c_str());
 
-			std::string fname = getScreenshotName(movieSelectionHandler.file.Name, S_ISDIR(m_movieSelectionHandler->file.Mode));
-			if (!fname.empty())
-				unlink(fname.c_str());
+		CFile file_xml = movieSelectionHandler.file;
+		if (m_movieInfo.convertTs2XmlName(file_xml.Name))
+			unlink(file_xml.Name.c_str());
 
-			CFile file_xml = movieSelectionHandler.file;
-			if (m_movieInfo.convertTs2XmlName(file_xml.Name))
-				unlink(file_xml.Name.c_str());
+		delete hintBox;
+		g_RCInput->clearRCMsg();
 
-			delete hintBox;
-			g_RCInput->clearRCMsg();
+		m_vMovieInfo.erase((std::vector<MI_MOVIE_INFO>::iterator)&movieSelectionHandler);
+		TRACE("List size: %d\n", (int)m_vMovieInfo.size());
 
-			m_vMovieInfo.erase((std::vector<MI_MOVIE_INFO>::iterator)&movieSelectionHandler);
-			TRACE("List size: %d\n", (int)m_vMovieInfo.size());
-
-			updateSerienames();
-			refreshBrowserList();
-			refreshLastPlayList();
-			refreshLastRecordList();
-			refreshMovieInfo();
-			refresh();
-		}
+		updateSerienames();
+		refreshBrowserList();
+		refreshLastPlayList();
+		refreshLastRecordList();
+		refreshMovieInfo();
+		refresh();
 	}
 }
 

From 658658840994a6fc3bcc486e6507f384244b2830 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Wed, 5 Nov 2014 16:37:03 +0300
Subject: [PATCH 020/113] gui/movieplayer.cpp: fix file info display, bug from
 commit 95ac729ff6d15e681d56a9a3ca5e03f46ad7c480

---
 src/gui/movieplayer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
index 18319035b..15a1af378 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -383,8 +383,6 @@ void CMoviePlayerGui::Cleanup()
 	p_movie_info = NULL;
 	autoshot_done = false;
 	currentaudioname = "Unk";
-	info_1 = "";
-	info_2 = "";
 }
 
 void CMoviePlayerGui::ClearFlags()
@@ -469,6 +467,8 @@ bool CMoviePlayerGui::SelectFile()
 	menu_ret = menu_return::RETURN_REPAINT;
 
 	Cleanup();
+	info_1 = "";
+	info_2 = "";
 	pretty_name.clear();
 	file_name.clear();
 

From 3f9d17c8067e2a9bf01d9fbe2ff69f144ca2a3ff Mon Sep 17 00:00:00 2001
From: Janus <janus@debian>
Date: Thu, 6 Nov 2014 11:56:19 +0100
Subject: [PATCH 021/113] api4: fix name compare to realname compare

---
 src/zapit/include/zapit/channel.h | 1 +
 src/zapit/src/getservices.cpp     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/zapit/include/zapit/channel.h b/src/zapit/include/zapit/channel.h
index f7278d4d4..2b7130571 100644
--- a/src/zapit/include/zapit/channel.h
+++ b/src/zapit/include/zapit/channel.h
@@ -221,6 +221,7 @@ class CZapitChannel
 
 		/* get methods - read and write variables */
 		const std::string&	getName(void)			const { return (!uname.empty() ? uname : name); }
+		const std::string&	getRealname(void)		const { return name; }
 		const std::string&	getUrl(void)			const { return url; }
 		const std::string&	getDesc(void)			const { return desc; }
 		t_satellite_position	getSatellitePosition(void)	const { return satellitePosition; }
diff --git a/src/zapit/src/getservices.cpp b/src/zapit/src/getservices.cpp
index a0be6100b..3f27f0611 100644
--- a/src/zapit/src/getservices.cpp
+++ b/src/zapit/src/getservices.cpp
@@ -1242,7 +1242,7 @@ bool CServiceManager::SaveCurrentServices(transponder_id_t tpid)
 		if(ccI == allchans.end()) {
 			WriteCurrentService(fd, satfound, tpdone, updated, satstr, tI->second, cI->second, "add");
 		} else {
-			if(strcmp(cI->second.getName().c_str(), ccI->second.getName().c_str()) || cI->second.scrambled != ccI->second.scrambled) {
+			if(strcmp(cI->second.getRealname().c_str(), ccI->second.getRealname().c_str()) || cI->second.scrambled != ccI->second.scrambled) {
 				cI->second.number = ccI->second.number;
 				WriteCurrentService(fd, satfound, tpdone, updated, satstr, tI->second, cI->second, "replace");
 			}

From 9700fbcf23cdca31385167fd9a728fed4d90f995 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Thu, 6 Nov 2014 13:18:32 +0300
Subject: [PATCH 022/113] gui/videosettings.cpp: fix analog output options on
 zee2

---
 src/gui/videosettings.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp
index e36c19913..491577a72 100644
--- a/src/gui/videosettings.cpp
+++ b/src/gui/videosettings.cpp
@@ -247,7 +247,7 @@ int CVideoSettings::showVideoSetup()
 	else if (system_rev > 0x06)
 	{
 #ifdef ANALOG_MODE
-		if (system_rev == 9 || system_rev == 11) { // Tank, Trinity.
+		if (system_rev == 9 || system_rev == 11 || system_rev == 12) { // Tank, Trinity, Zee2
 			vs_analg_ch = new CMenuOptionChooser(LOCALE_VIDEOMENU_ANALOG_MODE, &g_settings.analog_mode1, VIDEOMENU_VIDEOSIGNAL_TANK_OPTIONS, VIDEOMENU_VIDEOSIGNAL_TANK_OPTION_COUNT, true, this);
 			vs_analg_ch->setHint("", LOCALE_MENU_HINT_VIDEO_ANALOG_MODE);
 		} else 

From b93cb83c7cf38ff87d231d8f9b64808a702e2a3e Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Thu, 6 Nov 2014 12:30:30 +0100
Subject: [PATCH 023/113] - user_menue: fix hint icons for 'singe-added'
 plugins

---
 src/gui/user_menue.cpp | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/gui/user_menue.cpp b/src/gui/user_menue.cpp
index 02ef4eaf2..8fd85a647 100644
--- a/src/gui/user_menue.cpp
+++ b/src/gui/user_menue.cpp
@@ -433,19 +433,7 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
 				if (pname && (std::string(pname) == *it)) {
 					keyhelper.get(&key,&icon);
 					menu_item = new CMenuForwarder(g_PluginList->getName(count), true, NULL, this, pname, key, icon);
-					const std::string hint = g_PluginList->getDescription(count);
-					if (hint != "") {
-						const char *hint_icon = NULL;
-						switch(g_PluginList->getType(count)) {
-							case CPlugins::P_TYPE_GAME:
-								hint_icon = NEUTRINO_ICON_HINT_GAMES;
-							break;
-							case CPlugins::P_TYPE_SCRIPT:
-								hint_icon = NEUTRINO_ICON_HINT_SCRIPTS;
-							break;
-						}
-						menu_item->setHint(hint_icon, hint);
-					}
+					menu_item->setHint(g_PluginList->getHintIcon(count), g_PluginList->getDescription(count));
 					break;
 				}
 			}

From c8522bae71078e71743fb68b9e78aecf9c589913 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Thu, 6 Nov 2014 12:33:13 +0100
Subject: [PATCH 024/113] - plugins: disable unused cfg-params

---
 src/gui/plugins.cpp | 4 ++++
 src/gui/plugins.h   | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/gui/plugins.cpp b/src/gui/plugins.cpp
index aa827c351..2588117b9 100644
--- a/src/gui/plugins.cpp
+++ b/src/gui/plugins.cpp
@@ -200,12 +200,14 @@ bool CPlugins::parseCfg(plugin *plugin_data)
 
 	plugin_data->index = sindex++;
 	plugin_data->key = 0; //CRCInput::RC_nokey
+#if 0
 	plugin_data->fb = false;
 	plugin_data->rc = false;
 	plugin_data->lcd = false;
 	plugin_data->vtxtpid = false;
 	plugin_data->showpig = false;
 	plugin_data->needoffset = false;
+#endif
 	plugin_data->shellwindow = false;
 	plugin_data->hide = false;
 	plugin_data->type = CPlugins::P_TYPE_DISABLED;
@@ -257,6 +259,7 @@ bool CPlugins::parseCfg(plugin *plugin_data)
 		{
 			plugin_data->integration = getPluginIntegration(atoi(parm));
 		}
+#if 0
 		else if (cmd == "needfb")
 		{
 			plugin_data->fb = atoi(parm);
@@ -281,6 +284,7 @@ bool CPlugins::parseCfg(plugin *plugin_data)
 		{
 			plugin_data->needoffset = atoi(parm);
 		}
+#endif
 		else if (cmd == "shellwindow")
 		{
 			plugin_data->shellwindow = atoi(parm);
diff --git a/src/gui/plugins.h b/src/gui/plugins.h
index 4172b7fb0..804b20422 100644
--- a/src/gui/plugins.h
+++ b/src/gui/plugins.h
@@ -88,7 +88,7 @@ class CPlugins
 			std::string depend;
 			CPlugins::p_type_t type;
 			CPlugins::i_type_t integration;
-			
+#if 0
 			bool fb;
 			bool rc;
 			bool lcd;
@@ -96,6 +96,7 @@ class CPlugins
 			int posx, posy, sizex, sizey;
 			bool showpig;
 			bool needoffset;
+#endif
 			bool shellwindow;
 			bool hide;
 			bool operator< (const plugin& a) const

From 95eab2a48d2b58e1fae67af60f6ec58e4dcd3c72 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Thu, 6 Nov 2014 12:34:39 +0100
Subject: [PATCH 025/113] - plugins: allow empty menu hints

---
 src/gui/plugins.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/gui/plugins.cpp b/src/gui/plugins.cpp
index 2588117b9..3611d377b 100644
--- a/src/gui/plugins.cpp
+++ b/src/gui/plugins.cpp
@@ -213,6 +213,7 @@ bool CPlugins::parseCfg(plugin *plugin_data)
 	plugin_data->type = CPlugins::P_TYPE_DISABLED;
 	plugin_data->integration = CPlugins::I_TYPE_DISABLED;
 	plugin_data->hinticon = NEUTRINO_ICON_HINT_PLUGIN;
+	plugin_data->description = " "; //FIXME: To show empty desc as a menu hint the string may not be empty
 
 	std::string _hintIcon = plugin_data->plugindir + "/" + plugin_data->filename + "_hint.png";
 	if (access(_hintIcon.c_str(), F_OK) == 0)

From c8f0c68cf66c57ccd0e2a1db026f8d772d172f35 Mon Sep 17 00:00:00 2001
From: Jacek Jendrzej <crashdvb@googlemail.com>
Date: Thu, 6 Nov 2014 14:38:30 +0100
Subject: [PATCH 026/113] nhttpd controlapi: change for subchannel to
 subchannel zap

---
 src/nhttpd/tuxboxapi/coolstream/controlapi.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
index 9b2dd8171..2064ed501 100644
--- a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
+++ b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
@@ -1673,10 +1673,8 @@ void CControlAPI::ZaptoCGI(CyhookHandler *hh)
 		}
 		else if (!hh->ParamList["subchannel"].empty())
 		{
-			t_channel_id current_channel = NeutrinoAPI->Zapit->getCurrentServiceID();
-			CSectionsdClient::responseGetCurrentNextInfoChannelID currentNextInfo;
-			CEitManager::getInstance()->getCurrentNextServiceKey(current_channel, currentNextInfo);
-			if (currentNextInfo.flags & CSectionsdClient::epgflags::current_has_linkagedescriptors)
+			extern CRemoteControl * g_RemoteControl;
+			if (!g_RemoteControl->subChannels.empty())
 			{
 				NeutrinoAPI->ZapToSubService(hh->ParamList["subchannel"].c_str());
 				hh->SendOk();

From d5d6c4de628b0f528b1d6d9a7768bfd0cbf39169 Mon Sep 17 00:00:00 2001
From: Jacek Jendrzej <crashdvb@googlemail.com>
Date: Thu, 6 Nov 2014 14:40:44 +0100
Subject: [PATCH 027/113] fix some possible errors

---
 src/driver/netfile.cpp  | 2 +-
 src/gui/dboxinfo.cpp    | 8 ++++----
 src/gui/luainstance.cpp | 1 +
 src/system/helpers.cpp  | 1 +
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/driver/netfile.cpp b/src/driver/netfile.cpp
index a9cb0e206..d1a4de50a 100644
--- a/src/driver/netfile.cpp
+++ b/src/driver/netfile.cpp
@@ -572,7 +572,7 @@ void readln(int fd, char *buf)
 
 int parse_response(URL *url, void * /*opt*/, CSTATE *state)
 {
-	char header[2049], /*str[255]*/ str[2048]; // combined with 2nd local str from id3 part
+	char header[2048], /*str[255]*/ str[2048]; // combined with 2nd local str from id3 part
 	char *ptr, chr=0, lastchr=0;
 	int hlen = 0, response;
 	int meta_interval = 0, rval;
diff --git a/src/gui/dboxinfo.cpp b/src/gui/dboxinfo.cpp
index 45588ae2c..31aad56fc 100644
--- a/src/gui/dboxinfo.cpp
+++ b/src/gui/dboxinfo.cpp
@@ -382,7 +382,7 @@ void CDBoxInfoWidget::paint()
 	now -= info.uptime;
 	std::string str_boot(strftime(g_Locale->getText(LOCALE_EXTRA_DBOXINFO_TIMEFORMAT), now));
 
-	char ubuf[80] = { 0 };
+	char ubuf[256] = { 0 };
 	char sbuf[256] = { 0 };
         int updays, uphours, upminutes;
 
@@ -392,14 +392,14 @@ void CDBoxInfoWidget::paint()
         upminutes %= 60;
 
         if (updays) {
-                snprintf(ubuf, sizeof(sbuf), "%d day%s, ", updays, (updays != 1) ? "s" : "");
+                snprintf(ubuf, sizeof(ubuf), "%d day%s, ", updays, (updays != 1) ? "s" : "");
                 strcat(sbuf, ubuf);
         }
         if (uphours) {
-                snprintf(ubuf, sizeof(sbuf), "%d hour%s, ", uphours, (uphours != 1) ? "s" : "");
+                snprintf(ubuf, sizeof(ubuf), "%d hour%s, ", uphours, (uphours != 1) ? "s" : "");
                 strcat(sbuf, ubuf);
         }
-        snprintf(ubuf,sizeof(sbuf), "%d minute%s", upminutes, (upminutes != 1) ? "s" : "");
+        snprintf(ubuf,sizeof(ubuf), "%d minute%s", upminutes, (upminutes != 1) ? "s" : "");
         strcat(sbuf, ubuf);
 
 	snprintf(ubuf, sizeof(ubuf), "%s: ", g_Locale->getText(LOCALE_EXTRA_DBOXINFO_LOAD));
diff --git a/src/gui/luainstance.cpp b/src/gui/luainstance.cpp
index 7ff3f88e2..eb829cb24 100644
--- a/src/gui/luainstance.cpp
+++ b/src/gui/luainstance.cpp
@@ -469,6 +469,7 @@ void CLuaInstance::runScript(const char *fileName, const char *arg0, ...)
 		if (i >= 64) {
 			fprintf(stderr, "CLuaInstance::runScript: too many arguments!\n");
 			args.clear();
+			va_end(list);
 			return;
 		}
 		args.push_back(temp);
diff --git a/src/system/helpers.cpp b/src/system/helpers.cpp
index 50b8deb52..ffa23ca55 100644
--- a/src/system/helpers.cpp
+++ b/src/system/helpers.cpp
@@ -124,6 +124,7 @@ int my_system(int argc, const char *arg, ...)
 		if (i == argv_max)
 		{
 			fprintf(stderr, "my_system: too many arguments!\n");
+			va_end(args);
 			return -1;
 		}
 		argv[i] = va_arg(args, const char *);

From 644dc460a2ab6a05494322eabdfdd8d26296e934 Mon Sep 17 00:00:00 2001
From: Jacek Jendrzej <crashdvb@googlemail.com>
Date: Thu, 6 Nov 2014 17:31:11 +0100
Subject: [PATCH 028/113] CFrameBuffer::paintBoxRel: check boxBuf if not NULL

---
 src/driver/framebuffer.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/driver/framebuffer.cpp b/src/driver/framebuffer.cpp
index 4331ce20c..b890a43f4 100644
--- a/src/driver/framebuffer.cpp
+++ b/src/driver/framebuffer.cpp
@@ -730,6 +730,9 @@ fb_pixel_t* CFrameBuffer::paintBoxRel(const int x, const int y, const int dx, co
 #define MASK 0xFFFFFFFF
 
 	fb_pixel_t* boxBuf    = paintBoxRel2Buf(dx, dy, MASK, NULL, radius, type);
+        if (!boxBuf)
+               return NULL;
+
 	fb_pixel_t *bp        = boxBuf;
 	fb_pixel_t *gra       = gradientData->gradientBuf;
 	gradientData->boxBuf  = boxBuf;

From ce87898d8f28077bbbee829c99df2296fb26e880 Mon Sep 17 00:00:00 2001
From: Jacek Jendrzej <crashdvb@googlemail.com>
Date: Thu, 6 Nov 2014 19:29:09 +0100
Subject: [PATCH 029/113] zapit: channel.h - change comparative criteria for
 freq sort

---
 src/zapit/include/zapit/channel.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/zapit/include/zapit/channel.h b/src/zapit/include/zapit/channel.h
index 2b7130571..b3c020d9e 100644
--- a/src/zapit/include/zapit/channel.h
+++ b/src/zapit/include/zapit/channel.h
@@ -312,10 +312,10 @@ struct CmpChannelByFreq: public std::binary_function <const CZapitChannel * cons
 
 	bool operator() (const CZapitChannel * const c1, const CZapitChannel * const c2)
 	{
-		if(c1->getFreqId() == c2->getFreqId())
+		if((c1->getTransponderId() == c2->getTransponderId()) && ((uint64_t)c1->getFreqId() <<32 | c1->polarization <<16 | c1->getSatellitePosition()) == ((uint64_t)c2->getFreqId()<<32 | c2->polarization <<16| c2->getSatellitePosition()))
 			return std::lexicographical_compare(c1->getName().begin(), c1->getName().end(), c2->getName().begin(), c2->getName().end(), comparetolower);
 		else
-			return c1->getFreqId() < c2->getFreqId();
+			return ((uint64_t)c1->getFreqId()<<32 | c1->polarization <<16 | c1->getSatellitePosition()) < ((uint64_t)c2->getFreqId()<<32 | c2->polarization <<16 | c2->getSatellitePosition());
 		;
 	};
 };

From 6f3c77734cfb8356c0a0812dae5929836d617296 Mon Sep 17 00:00:00 2001
From: Jacek Jendrzej <crashdvb@googlemail.com>
Date: Thu, 6 Nov 2014 21:18:59 +0100
Subject: [PATCH 030/113] nhttpd_controlapi.html move info to point 6.

---
 src/nhttpd/doc/nhttpd_controlapi.html | 28 +++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/nhttpd/doc/nhttpd_controlapi.html b/src/nhttpd/doc/nhttpd_controlapi.html
index 89adf2763..6b02df97d 100644
--- a/src/nhttpd/doc/nhttpd_controlapi.html
+++ b/src/nhttpd/doc/nhttpd_controlapi.html
@@ -735,6 +735,20 @@ Beispiel:<br>
 &gt;&gt;&gt;http://dbox/control/zapto?name=Das%20Erste<br>
 ok <br>
 </div>
+<br>
+<b>Parameter:</b> subchannel=&lt;channel_id&gt; (64 bit, hexidecimal value)<br>
+<b>Rueckgabe:</b><br>
+<br>
+Zappt auf den angegebenen Unterkanal.<br>
+Als Rueckgabe ist im Erfolgsfall ok zu erwarten.<br>
+<br>
+<b>Rueckgabe-Format:</b> ok / error<br>
+<div class="example">
+Beispiel:<br>
+<br>
+&gt;&gt;&gt;http://dbox/control/zapto?subchannel=1008500d4<br>
+ok <br>
+</div>
 
 
 <!-- ----------------------------------------------------------- -->
@@ -797,20 +811,6 @@ ok<br>
 &gt;&gt;&gt;http://dbox/control/setmode?record=stop<br>
 ok<br>
 </div>
-<br>
-<b>Parameter:</b> subchannel=&lt;channel_id&gt; (64 bit, hexidecimal value)<br>
-<b>Rueckgabe:</b><br>
-<br>
-Zappt auf den angegebenen Unterkanal.<br>
-Als Rueckgabe ist im Erfolgsfall ok zu erwarten.<br>
-<br>
-<b>Rueckgabe-Format:</b> ok / error<br>
-<div class="example">
-Beispiel:<br>
-<br>
-&gt;&gt;&gt;http://dbox/control/zapto?subchannel=1008500d4<br>
-ok <br>
-</div>
 
 <!-- ----------------------------------------------------------- -->
 <div class="title1"><a name="getmode"></a>8. Radio/TV Mode Abfrage</div>

From c0b130c4906eee3e0b851d9a6632647d1b9ae015 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Fri, 7 Nov 2014 09:34:37 +0100
Subject: [PATCH 031/113] - plugins: don't add hidden plugins to usermenu; ...

... use CPuginsExec::exec() to execute and drop CUserMenu::exec()
---
 src/gui/user_menue.cpp         | 14 ++++----------
 src/gui/user_menue.h           |  3 +--
 src/system/setting_helpers.cpp |  3 +++
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/gui/user_menue.cpp b/src/gui/user_menue.cpp
index 8fd85a647..c817bf5cf 100644
--- a/src/gui/user_menue.cpp
+++ b/src/gui/user_menue.cpp
@@ -427,12 +427,14 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
 			int number_of_plugins = g_PluginList->getNumberOfPlugins();
 			if (!number_of_plugins)
 				continue;
+			char id[5];
 			int count = 0;
 			for(; count < number_of_plugins; count++) {
 				const char *pname = g_PluginList->getFileName(count);
-				if (pname && (std::string(pname) == *it)) {
+				if (pname && (std::string(pname) == *it) && !g_PluginList->isHidden(count)) {
+					sprintf(id, "%d", count);
 					keyhelper.get(&key,&icon);
-					menu_item = new CMenuForwarder(g_PluginList->getName(count), true, NULL, this, pname, key, icon);
+					menu_item = new CMenuForwarder(g_PluginList->getName(count), true, NULL, &plugins, id, key, icon);
 					menu_item->setHint(g_PluginList->getHintIcon(count), g_PluginList->getDescription(count));
 					break;
 				}
@@ -580,11 +582,3 @@ bool CUserMenu::changeNotify(const neutrino_locale_t OptionName, void * Data)
 	
 	return false;
 }
-
-int CUserMenu::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
-{
-	if (actionKey == "")
-		return menu_return::RETURN_NONE;
-	g_PluginList->startPlugin(actionKey.c_str());
-	return menu_return::RETURN_EXIT;
-}
diff --git a/src/gui/user_menue.h b/src/gui/user_menue.h
index 878aa8a5f..44c2f96ab 100644
--- a/src/gui/user_menue.h
+++ b/src/gui/user_menue.h
@@ -66,12 +66,11 @@ static user_menu_data_t user_menu[COL_BUTTONMAX] =
 // const neutrino_msg_t col_key_helper_msg_def[COL_BUTTONMAX]={CRCInput::RC_red,CRCInput::RC_green,CRCInput::RC_yellow,CRCInput::RC_blue};
 // const char * col_key_helper_icon_def[COL_BUTTONMAX]={NEUTRINO_ICON_BUTTON_RED,NEUTRINO_ICON_BUTTON_GREEN,NEUTRINO_ICON_BUTTON_YELLOW,NEUTRINO_ICON_BUTTON_BLUE};
 
-class CUserMenu : public CChangeObserver, CMenuTarget
+class CUserMenu : public CChangeObserver
 {	
 	private:		
 		int width;
 		bool changeNotify(const neutrino_locale_t OptionName, void *);
-		int exec(CMenuTarget* parent, const std::string & actionKey);
 				
 	public:
 		CUserMenu();
diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp
index 1c296f264..6347baaea 100644
--- a/src/system/setting_helpers.cpp
+++ b/src/system/setting_helpers.cpp
@@ -369,6 +369,9 @@ int CNVODChangeExec::exec(CMenuTarget* parent, const std::string & actionKey)
 
 int CPluginsExec::exec(CMenuTarget* parent, const std::string & actionKey)
 {
+	if (actionKey.empty())
+		return menu_return::RETURN_NONE;
+
 	//printf("CPluginsExec exec: %s\n", actionKey.c_str());
 	int sel= atoi(actionKey.c_str());
 

From c0a0cdb221dbcc447e3f0f7be2b5826aa191d01b Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Fri, 7 Nov 2014 12:17:29 +0100
Subject: [PATCH 032/113] - plugins: Fix assignment of prefered keys

New keyword in plugin.cfg: key=<key>
* key=red
* key=green
* key=yellow
* key=blue
* key=auto

If entry is missing key is auto-assigned
---
 src/gui/plugins.cpp | 20 +++++++++++++++++---
 src/gui/plugins.h   |  5 +++--
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/gui/plugins.cpp b/src/gui/plugins.cpp
index 3611d377b..72f4a9763 100644
--- a/src/gui/plugins.cpp
+++ b/src/gui/plugins.cpp
@@ -199,7 +199,7 @@ bool CPlugins::parseCfg(plugin *plugin_data)
 	{};
 
 	plugin_data->index = sindex++;
-	plugin_data->key = 0; //CRCInput::RC_nokey
+	plugin_data->key = CRCInput::RC_nokey;
 #if 0
 	plugin_data->fb = false;
 	plugin_data->rc = false;
@@ -232,9 +232,9 @@ bool CPlugins::parseCfg(plugin *plugin_data)
 		{
 			plugin_data->index = atoi(parm);
 		}
-		else if (cmd == "pluginversion")
+		else if (cmd == "key")
 		{
-			plugin_data->key = atoi(parm);
+			plugin_data->key = getPluginKey(parm);
 		}
 		else if (cmd == "name")
 		{
@@ -571,3 +571,17 @@ CPlugins::i_type_t CPlugins::getPluginIntegration(int integration)
 		return I_TYPE_DISABLED;
 	}
 }
+
+neutrino_msg_t CPlugins::getPluginKey(std::string key)
+{
+	if (key == "red")
+		return CRCInput::RC_red;
+	else if (key == "green")
+		return CRCInput::RC_green;
+	else if (key == "yellow")
+		return CRCInput::RC_yellow;
+	else if (key == "blue")
+		return CRCInput::RC_blue;
+	else /* (key == "auto") */
+		return CRCInput::RC_nokey;
+}
diff --git a/src/gui/plugins.h b/src/gui/plugins.h
index 804b20422..da9ee59bd 100644
--- a/src/gui/plugins.h
+++ b/src/gui/plugins.h
@@ -77,7 +77,7 @@ class CPlugins
 		{
 			int index;
 			std::string filename;
-			int key;
+			neutrino_msg_t key;
 			std::string cfgfile;
 			std::string pluginfile;
 			std::string plugindir;
@@ -117,6 +117,7 @@ class CPlugins
 		int find_plugin(const std::string & filename);
 		CPlugins::p_type_t getPluginType(int type);
 		CPlugins::i_type_t getPluginIntegration(int integration);
+		neutrino_msg_t getPluginKey(std::string key="auto");
 	public:
 		CPlugins();
 		~CPlugins();
@@ -141,7 +142,7 @@ class CPlugins
 		inline       int           getIntegration      (const int number) const { return plugin_list[number].integration       ; }
 		inline       bool          isHidden            (const int number) const { return plugin_list[number].hide              ; }
 		inline       int           getIndex            (const int number) const { return plugin_list[number].index             ; }
-		inline     neutrino_msg_t  getKey              (const int number) const { return (neutrino_msg_t)plugin_list[number].key; }
+		inline      neutrino_msg_t getKey              (const int number) const { return plugin_list[number].key               ; }
 
 		void setType (const int number, int t) { plugin_list[number].type = (CPlugins::p_type_t) t ; }
 		bool overrideType(plugin *plugin_data, std::string &setting, p_type type);

From 19f7e04c77bf30f83324e98e23b74dc0611c3cef Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Fri, 7 Nov 2014 12:20:47 +0100
Subject: [PATCH 033/113] - user_menue: allow colored keys from plugin.cfg

---
 src/gui/user_menue.cpp | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/gui/user_menue.cpp b/src/gui/user_menue.cpp
index c817bf5cf..fc0009f2a 100644
--- a/src/gui/user_menue.cpp
+++ b/src/gui/user_menue.cpp
@@ -272,22 +272,28 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
 			menu_item->setHint(NEUTRINO_ICON_HINT_STREAMINFO, LOCALE_MENU_HINT_STREAMINFO);
 			break;
 		case SNeutrinoSettings::ITEM_GAMES:
-			keyhelper.get(&key,&icon);
+			neutrino_msg_t d_key = g_PluginList->getKey(count);
+			keyhelper.get(&key,&icon, d_key);
 			menu_item = new CMenuDForwarder(LOCALE_MAINMENU_GAMES, g_PluginList->hasPlugin(CPlugins::P_TYPE_GAME), NULL, new CPluginList(LOCALE_MAINMENU_GAMES,CPlugins::P_TYPE_GAME), "-1", key, icon );
 			menu_item->setHint(NEUTRINO_ICON_HINT_GAMES, LOCALE_MENU_HINT_GAMES);
 			break;
                 case SNeutrinoSettings::ITEM_TOOLS:
-                        keyhelper.get(&key,&icon);
+			neutrino_msg_t d_key = g_PluginList->getKey(count);
+			keyhelper.get(&key,&icon, d_key);
                         menu_item = new CMenuDForwarder(LOCALE_MAINMENU_TOOLS, g_PluginList->hasPlugin(CPlugins::P_TYPE_TOOL), NULL, new CPluginList(LOCALE_MAINMENU_TOOLS,CPlugins::P_TYPE_TOOL), "-1", key, icon );
+			// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
                         break;
 		case SNeutrinoSettings::ITEM_SCRIPTS:
-			keyhelper.get(&key,&icon);
+			neutrino_msg_t d_key = g_PluginList->getKey(count);
+			keyhelper.get(&key,&icon, d_key);
 			menu_item = new CMenuDForwarder(LOCALE_MAINMENU_SCRIPTS, g_PluginList->hasPlugin(CPlugins::P_TYPE_SCRIPT), NULL, new CPluginList(LOCALE_MAINMENU_SCRIPTS,CPlugins::P_TYPE_SCRIPT), "-1", key, icon );
 			menu_item->setHint(NEUTRINO_ICON_HINT_SCRIPTS, LOCALE_MENU_HINT_SCRIPTS);
 			break;
 		case SNeutrinoSettings::ITEM_LUA:
-			keyhelper.get(&key,&icon);
+			neutrino_msg_t d_key = g_PluginList->getKey(count);
+			keyhelper.get(&key,&icon, d_key);
 			menu_item = new CMenuDForwarder(LOCALE_MAINMENU_LUA, g_PluginList->hasPlugin(CPlugins::P_TYPE_LUA), NULL, new CPluginList(LOCALE_MAINMENU_LUA,CPlugins::P_TYPE_LUA), "-1", key, icon );
+			// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
 			break;
 		case SNeutrinoSettings::ITEM_PLUGIN_TYPES:
 		{
@@ -433,7 +439,8 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
 				const char *pname = g_PluginList->getFileName(count);
 				if (pname && (std::string(pname) == *it) && !g_PluginList->isHidden(count)) {
 					sprintf(id, "%d", count);
-					keyhelper.get(&key,&icon);
+					neutrino_msg_t d_key = g_PluginList->getKey(count);
+					keyhelper.get(&key,&icon, d_key);
 					menu_item = new CMenuForwarder(g_PluginList->getName(count), true, NULL, &plugins, id, key, icon);
 					menu_item->setHint(g_PluginList->getHintIcon(count), g_PluginList->getDescription(count));
 					break;

From 5ec409b2646ff974453ef01ee014eca115d2cce6 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Fri, 7 Nov 2014 13:55:05 +0100
Subject: [PATCH 034/113] - user_menue: fix wrong changes in
 19f7e04c77bf30f83324e98e23b74dc0611c3cef

---
 src/gui/user_menue.cpp | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/gui/user_menue.cpp b/src/gui/user_menue.cpp
index fc0009f2a..1d28a367e 100644
--- a/src/gui/user_menue.cpp
+++ b/src/gui/user_menue.cpp
@@ -272,26 +272,22 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
 			menu_item->setHint(NEUTRINO_ICON_HINT_STREAMINFO, LOCALE_MENU_HINT_STREAMINFO);
 			break;
 		case SNeutrinoSettings::ITEM_GAMES:
-			neutrino_msg_t d_key = g_PluginList->getKey(count);
-			keyhelper.get(&key,&icon, d_key);
+			keyhelper.get(&key,&icon);
 			menu_item = new CMenuDForwarder(LOCALE_MAINMENU_GAMES, g_PluginList->hasPlugin(CPlugins::P_TYPE_GAME), NULL, new CPluginList(LOCALE_MAINMENU_GAMES,CPlugins::P_TYPE_GAME), "-1", key, icon );
 			menu_item->setHint(NEUTRINO_ICON_HINT_GAMES, LOCALE_MENU_HINT_GAMES);
 			break;
                 case SNeutrinoSettings::ITEM_TOOLS:
-			neutrino_msg_t d_key = g_PluginList->getKey(count);
-			keyhelper.get(&key,&icon, d_key);
+			keyhelper.get(&key,&icon);
                         menu_item = new CMenuDForwarder(LOCALE_MAINMENU_TOOLS, g_PluginList->hasPlugin(CPlugins::P_TYPE_TOOL), NULL, new CPluginList(LOCALE_MAINMENU_TOOLS,CPlugins::P_TYPE_TOOL), "-1", key, icon );
 			// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
                         break;
 		case SNeutrinoSettings::ITEM_SCRIPTS:
-			neutrino_msg_t d_key = g_PluginList->getKey(count);
-			keyhelper.get(&key,&icon, d_key);
+			keyhelper.get(&key,&icon);
 			menu_item = new CMenuDForwarder(LOCALE_MAINMENU_SCRIPTS, g_PluginList->hasPlugin(CPlugins::P_TYPE_SCRIPT), NULL, new CPluginList(LOCALE_MAINMENU_SCRIPTS,CPlugins::P_TYPE_SCRIPT), "-1", key, icon );
 			menu_item->setHint(NEUTRINO_ICON_HINT_SCRIPTS, LOCALE_MENU_HINT_SCRIPTS);
 			break;
 		case SNeutrinoSettings::ITEM_LUA:
-			neutrino_msg_t d_key = g_PluginList->getKey(count);
-			keyhelper.get(&key,&icon, d_key);
+			keyhelper.get(&key,&icon);
 			menu_item = new CMenuDForwarder(LOCALE_MAINMENU_LUA, g_PluginList->hasPlugin(CPlugins::P_TYPE_LUA), NULL, new CPluginList(LOCALE_MAINMENU_LUA,CPlugins::P_TYPE_LUA), "-1", key, icon );
 			// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
 			break;

From 348add4acd1fe9f4873547618b8e0b5004c7e7f1 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Fri, 7 Nov 2014 15:39:53 +0100
Subject: [PATCH 035/113] - user_menue: minor optimizations

---
 src/gui/user_menue.cpp | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/gui/user_menue.cpp b/src/gui/user_menue.cpp
index 1d28a367e..d9263c1cb 100644
--- a/src/gui/user_menue.cpp
+++ b/src/gui/user_menue.cpp
@@ -296,8 +296,6 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
 			unsigned int number_of_plugins = (unsigned int) g_PluginList->getNumberOfPlugins();
 			if (!number_of_plugins)
 				continue;
-			char id[5];
-			int cnt = 0;
 			for (unsigned int count = 0; count < number_of_plugins; count++)
 			{
 #if 0
@@ -316,16 +314,14 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
 
 				if (show && !g_PluginList->isHidden(count) && (g_PluginList->getIntegration(count) == CPlugins::I_TYPE_DISABLED))
 				{
-					sprintf(id, "%d", count);
 					menu_items++;
 					neutrino_msg_t d_key = g_PluginList->getKey(count);
 					//printf("[neutrino usermenu] plugin %d, set key %d...\n", count, g_PluginList->getKey(count));
 					keyhelper.get(&key,&icon, d_key);
-					menu_item = new CMenuForwarder(g_PluginList->getName(count), true, NULL, &plugins, id, key, icon);
+					menu_item = new CMenuForwarder(g_PluginList->getName(count), true, NULL, &plugins, to_string(count).c_str(), key, icon);
 					menu_item->setHint(g_PluginList->getHintIcon(count), g_PluginList->getDescription(count));
 
 					menu->addItem(menu_item, false);
-					cnt++;
 				}
 			}
 			menu_item = NULL;
@@ -429,15 +425,13 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
 			int number_of_plugins = g_PluginList->getNumberOfPlugins();
 			if (!number_of_plugins)
 				continue;
-			char id[5];
 			int count = 0;
 			for(; count < number_of_plugins; count++) {
 				const char *pname = g_PluginList->getFileName(count);
 				if (pname && (std::string(pname) == *it) && !g_PluginList->isHidden(count)) {
-					sprintf(id, "%d", count);
 					neutrino_msg_t d_key = g_PluginList->getKey(count);
 					keyhelper.get(&key,&icon, d_key);
-					menu_item = new CMenuForwarder(g_PluginList->getName(count), true, NULL, &plugins, id, key, icon);
+					menu_item = new CMenuForwarder(g_PluginList->getName(count), true, NULL, &plugins, to_string(count).c_str(), key, icon);
 					menu_item->setHint(g_PluginList->getHintIcon(count), g_PluginList->getDescription(count));
 					break;
 				}

From 7f2c69aa829ba88c67b0290a02595035d1b592f1 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Fri, 7 Nov 2014 15:41:11 +0100
Subject: [PATCH 036/113] - CPluginsExec::exec(): show possible script output

---
 src/system/setting_helpers.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp
index 6347baaea..c25a1157e 100644
--- a/src/system/setting_helpers.cpp
+++ b/src/system/setting_helpers.cpp
@@ -387,6 +387,9 @@ int CPluginsExec::exec(CMenuTarget* parent, const std::string & actionKey)
 		g_PluginList->startPlugin(sel);
 	}
 
+	if (!g_PluginList->getScriptOutput().empty())
+		ShowMsg(LOCALE_PLUGINS_RESULT, g_PluginList->getScriptOutput(), CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_SHELL);
+
 	if (g_PluginList->getIntegration(sel) == CPlugins::I_TYPE_DISABLED)
 		return menu_return::RETURN_EXIT;
 

From 269cd4cef89dc1025045a8ad32a668ac760e9f90 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Fri, 7 Nov 2014 15:42:25 +0100
Subject: [PATCH 037/113] - pluginlist: use keyhelper to get hotkeys; allow
 colored keys from plugin.cfg

---
 src/gui/pluginlist.cpp | 10 +++++++---
 src/gui/user_menue.h   |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/gui/pluginlist.cpp b/src/gui/pluginlist.cpp
index 499ce2e51..4e757090c 100644
--- a/src/gui/pluginlist.cpp
+++ b/src/gui/pluginlist.cpp
@@ -87,6 +87,10 @@ int CPluginList::exec(CMenuTarget* parent, const std::string &actionKey)
 	if (parent)
 		parent->hide();
 
+	CColorKeyHelper keyhelper;
+	neutrino_msg_t key = CRCInput::RC_nokey;
+	const char * dummy = NULL;
+
 	number = -1;
 	if (actionKey != "")
 		number = atoi(actionKey.c_str());
@@ -106,11 +110,11 @@ int CPluginList::exec(CMenuTarget* parent, const std::string &actionKey)
 
 	int nop = g_PluginList->getNumberOfPlugins();
 
-	int shortcut = 1;
-
 	for(int count = 0; count < nop; count++) {
 		if ((g_PluginList->getType(count) & pluginlisttype) && !g_PluginList->isHidden(count) && (g_PluginList->getIntegration(count) == CPlugins::I_TYPE_DISABLED)) {
-			CMenuForwarder *f = new CMenuForwarder(std::string(g_PluginList->getName(count)), true, "", this, to_string(count).c_str(), CRCInput::convertDigitToKey(shortcut++));
+			neutrino_msg_t d_key = g_PluginList->getKey(count);
+			keyhelper.get(&key, &dummy, d_key);
+			CMenuForwarder *f = new CMenuForwarder(std::string(g_PluginList->getName(count)), true, NULL, this, to_string(count).c_str(), key);
 			f->setHint(g_PluginList->getHintIcon(count), g_PluginList->getDescription(count));
 			m.addItem(f);
 		}
diff --git a/src/gui/user_menue.h b/src/gui/user_menue.h
index 44c2f96ab..5d15efa5b 100644
--- a/src/gui/user_menue.h
+++ b/src/gui/user_menue.h
@@ -80,7 +80,7 @@ class CUserMenu : public CChangeObserver
 };
 
 
-// This is just a quick helper for the usermenu only.
+// This is just a quick helper for the usermenu and pluginlist.
 class CColorKeyHelper
 {
 	private:

From bdcb043521278bf15a2ecc53d79bb3e51c510903 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Fri, 7 Nov 2014 17:38:05 +0100
Subject: [PATCH 038/113] - deutsch.locale: update

---
 data/locale/deutsch.locale | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index 6fd27279b..35cea2caf 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -188,6 +188,7 @@ bouqueteditor.discardingchanges Änderungen werden verworfen. Bitte warten ...
 bouqueteditor.hide Verstecken
 bouqueteditor.lock Sperren
 bouqueteditor.move Bewegen
+bouqueteditor.move_to Bewegen zu
 bouqueteditor.name Bouquet-Verwaltung
 bouqueteditor.newbouquetname Neuer Name des Bouquets
 bouqueteditor.rename Umbenennen
@@ -250,6 +251,7 @@ channellist.reset_flags Entferne Kanal-Markierung "Neu"
 channellist.sats Satelliten
 channellist.show_channellogo Senderlogos zeigen
 channellist.show_channelnumber Kanalnummern zeigen
+channellist.show_empty_favs Zeige leere Favoriten-Bouquets
 channellist.since seit
 channellist.start Start
 ci.clock CI Takt (Mhz)
@@ -920,6 +922,7 @@ menu.hint_channellist_mode_radio Wählen Sie die Start-Kanalliste im Radio-Modus
 menu.hint_channellist_setup Wählen Sie die Anzeigeoptionen für die Kanalliste
 menu.hint_channellist_show_channellogo Zeigt Senderlogos in der Kanalliste.
 menu.hint_channellist_show_channelnumber Zeigt Kanalnummer in der Kanalliste.
+menu.hint_channellist_show_empty_favs Zeigt oder versteckt leere Bouquets in den Favoriten
 menu.hint_channels Kanalliste öffnen
 menu.hint_ci Conditional-Access-Menü zum Einrichten Ihres CI-Moduls oder der eingebetteten Conax-Karte
 menu.hint_clock_background Lassen Sie die Uhr mit Hintergrund anzeigen

From 8765b94037fabd8ed50c80669e6449e52d76d136 Mon Sep 17 00:00:00 2001
From: "M. Liebmann" <tuxcode.bbg@gmail.com>
Date: Mon, 10 Nov 2014 06:04:33 +0100
Subject: [PATCH 039/113] Enable gradient for header CColorChooser

- Supplement to commit b9400110b4fcc8d41917c51a4a9e05cae742e518
---
 src/gui/widget/colorchooser.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/gui/widget/colorchooser.cpp b/src/gui/widget/colorchooser.cpp
index f08644c97..7ba47384e 100644
--- a/src/gui/widget/colorchooser.cpp
+++ b/src/gui/widget/colorchooser.cpp
@@ -245,10 +245,9 @@ void CColorChooser::hide()
 
 void CColorChooser::paint()
 {
-	//frameBuffer->paintBoxRel(x,y, width,hheight, COL_MENUHEAD_PLUS_0);
-	frameBuffer->paintBoxRel(x,y, width,hheight, COL_MENUHEAD_PLUS_0, RADIUS_MID, CORNER_TOP); //round
-	g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->RenderString(x+10,y+hheight, width, g_Locale->getText(name), COL_MENUHEAD_TEXT);
-	//frameBuffer->paintBoxRel(x,y+hheight, width,height-hheight, COL_MENUCONTENT_PLUS_0);
+	CComponentsHeader header(x, y, width, hheight, g_Locale->getText(name));
+	header.paint(CC_SAVE_SCREEN_NO);
+
 	frameBuffer->paintBoxRel(x,y+hheight, width,height-hheight, COL_MENUCONTENT_PLUS_0, RADIUS_MID, CORNER_BOTTOM);//round
 
 	for (int i = 0; i < 4; i++)

From 02137ca987a5812b9c01889b24619b756a759929 Mon Sep 17 00:00:00 2001
From: "M. Liebmann" <tuxcode.bbg@gmail.com>
Date: Mon, 10 Nov 2014 06:04:45 +0100
Subject: [PATCH 040/113] CLuaMenuChangeObserver::changeNotify: Fix segfault in
 item type 'chooser'

---
 src/gui/luainstance.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/gui/luainstance.cpp b/src/gui/luainstance.cpp
index eb829cb24..a9f883b6f 100644
--- a/src/gui/luainstance.cpp
+++ b/src/gui/luainstance.cpp
@@ -1018,7 +1018,6 @@ bool CLuaMenuChangeObserver::changeNotify(lua_State *L, const std::string &luaAc
 	lua_pushstring(L, optionValue);
 	lua_pcall(L, 2 /* two args */, 1 /* one result */, 0);
 	double res = lua_isnumber(L, -1) ? lua_tonumber(L, -1) : 0;
-	lua_pop(L, 2);
 	return (((int)res == menu_return::RETURN_REPAINT) || ((int)res == menu_return::RETURN_EXIT_REPAINT));
 }
 

From 389c4c232fd8e8346d41c3942e5859937e8f1956 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Mon, 10 Nov 2014 22:41:08 +0100
Subject: [PATCH 041/113] - plugins: simplify integratePlugins(); ...

* CPluginsExec(): switch to singleton
* move CPluginsExec() to pluginlist.cpp|h
  because it's not really a settings_helper
---
 src/gui/info_menue.cpp         |  3 +--
 src/gui/mediaplayer.cpp        |  3 +--
 src/gui/pluginlist.cpp         | 37 ++++++++++++++++++++++++++++++++++
 src/gui/pluginlist.h           |  7 +++++++
 src/gui/user_menue.cpp         |  7 +++----
 src/gui/widget/menue.cpp       |  8 +++-----
 src/gui/widget/menue.h         |  2 +-
 src/neutrino.h                 |  1 -
 src/neutrino_menue.cpp         |  4 ++--
 src/system/setting_helpers.cpp | 29 --------------------------
 src/system/setting_helpers.h   |  6 ------
 11 files changed, 55 insertions(+), 52 deletions(-)

diff --git a/src/gui/info_menue.cpp b/src/gui/info_menue.cpp
index 75c7032f8..c3df84d17 100644
--- a/src/gui/info_menue.cpp
+++ b/src/gui/info_menue.cpp
@@ -105,8 +105,7 @@ int CInfoMenu::showMenu()
 	}
 
 	//add I_TYPE_INFORMATION plugins
-	CPluginsExec pluginsExec;
-	info->integratePlugins(&pluginsExec, CPlugins::I_TYPE_INFORMATION, 1);
+	info->integratePlugins(CPlugins::I_TYPE_INFORMATION, 1);
 
 	int res = info->exec(NULL, "");
 	delete info;
diff --git a/src/gui/mediaplayer.cpp b/src/gui/mediaplayer.cpp
index ad13d4975..f6c89c7ad 100644
--- a/src/gui/mediaplayer.cpp
+++ b/src/gui/mediaplayer.cpp
@@ -260,9 +260,8 @@ int CMediaPlayerMenu::initMenuMedia(CMenuWidget *m, CPersonalizeGui *p)
 		personalize->addPersonalizedItems();
 		
 		//add I_TYPE_MULTIMEDIA plugins
-		CPluginsExec pluginsExec;
 		unsigned int nextShortcut = (unsigned int)media->getNextShortcut();
-		media->integratePlugins(&pluginsExec, CPlugins::I_TYPE_MULTIMEDIA, nextShortcut);
+		media->integratePlugins(CPlugins::I_TYPE_MULTIMEDIA, nextShortcut);
 
 		res = media->exec(NULL, "");
 		delete media;
diff --git a/src/gui/pluginlist.cpp b/src/gui/pluginlist.cpp
index 4e757090c..1e5a09e34 100644
--- a/src/gui/pluginlist.cpp
+++ b/src/gui/pluginlist.cpp
@@ -137,3 +137,40 @@ int CPluginChooser::run()
 		*selectedFilePtr = g_PluginList->getFileName(number);
 	return menu_return::RETURN_EXIT;
 }
+
+CPluginsExec* CPluginsExec::getInstance()
+{
+	static CPluginsExec* pluginsExec = NULL;
+
+	if (!pluginsExec)
+		pluginsExec = new CPluginsExec();
+
+	return pluginsExec;
+}
+
+int CPluginsExec::exec(CMenuTarget* parent, const std::string & actionKey)
+{
+	if (actionKey.empty())
+		return menu_return::RETURN_NONE;
+
+	//printf("CPluginsExec exec: %s\n", actionKey.c_str());
+	int sel = atoi(actionKey.c_str());
+
+	if (parent != NULL)
+		parent->hide();
+
+	if (actionKey == "teletext") {
+		g_RCInput->postMsg(CRCInput::RC_timeout, 0);
+		g_RCInput->postMsg(CRCInput::RC_text, 0);
+	}
+	else if (sel >= 0)
+		g_PluginList->startPlugin(sel);
+
+	if (!g_PluginList->getScriptOutput().empty())
+		ShowMsg(LOCALE_PLUGINS_RESULT, g_PluginList->getScriptOutput(), CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_SHELL);
+
+	if (g_PluginList->getIntegration(sel) == CPlugins::I_TYPE_DISABLED)
+		return menu_return::RETURN_EXIT;
+
+	return menu_return::RETURN_REPAINT;
+}
diff --git a/src/gui/pluginlist.h b/src/gui/pluginlist.h
index 02a17f0c8..be528d278 100644
--- a/src/gui/pluginlist.h
+++ b/src/gui/pluginlist.h
@@ -67,4 +67,11 @@ class CPluginChooser : public CPluginList
 		int run ();
 };
 
+class CPluginsExec : public CMenuTarget
+{
+	public:
+		static CPluginsExec* getInstance();
+		int exec(CMenuTarget* parent, const std::string & actionKey);
+};
+
 #endif
diff --git a/src/gui/user_menue.cpp b/src/gui/user_menue.cpp
index d9263c1cb..44b2cd736 100644
--- a/src/gui/user_menue.cpp
+++ b/src/gui/user_menue.cpp
@@ -151,7 +151,6 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
 
 	// define classes
 	CSubChannelSelectMenu subchanselect;
-	CPluginsExec plugins;
 	CNeutrinoApp * neutrino	= CNeutrinoApp::getInstance();
 	
 	std::string txt = g_settings.usermenu[button]->title;
@@ -318,7 +317,7 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
 					neutrino_msg_t d_key = g_PluginList->getKey(count);
 					//printf("[neutrino usermenu] plugin %d, set key %d...\n", count, g_PluginList->getKey(count));
 					keyhelper.get(&key,&icon, d_key);
-					menu_item = new CMenuForwarder(g_PluginList->getName(count), true, NULL, &plugins, to_string(count).c_str(), key, icon);
+					menu_item = new CMenuForwarder(g_PluginList->getName(count), true, NULL, CPluginsExec::getInstance(), to_string(count).c_str(), key, icon);
 					menu_item->setHint(g_PluginList->getHintIcon(count), g_PluginList->getDescription(count));
 
 					menu->addItem(menu_item, false);
@@ -329,7 +328,7 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
 		}
 		case SNeutrinoSettings::ITEM_VTXT:
 			keyhelper.get(&key,&icon, feat_key[g_settings.personalize[SNeutrinoSettings::P_FEAT_KEY_VTXT]].key); //CRCInput::RC_blue
-			menu_item = new CMenuForwarder(LOCALE_USERMENU_ITEM_VTXT, true, NULL, &plugins, "teletext", key, icon);
+			menu_item = new CMenuForwarder(LOCALE_USERMENU_ITEM_VTXT, true, NULL, CPluginsExec::getInstance(), "teletext", key, icon);
 			// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
 			break;
 		case SNeutrinoSettings::ITEM_IMAGEINFO:
@@ -431,7 +430,7 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
 				if (pname && (std::string(pname) == *it) && !g_PluginList->isHidden(count)) {
 					neutrino_msg_t d_key = g_PluginList->getKey(count);
 					keyhelper.get(&key,&icon, d_key);
-					menu_item = new CMenuForwarder(g_PluginList->getName(count), true, NULL, &plugins, to_string(count).c_str(), key, icon);
+					menu_item = new CMenuForwarder(g_PluginList->getName(count), true, NULL, CPluginsExec::getInstance(), to_string(count).c_str(), key, icon);
 					menu_item->setHint(g_PluginList->getHintIcon(count), g_PluginList->getDescription(count));
 					break;
 				}
diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp
index 69efb9eeb..3a217b93b 100644
--- a/src/gui/widget/menue.cpp
+++ b/src/gui/widget/menue.cpp
@@ -35,6 +35,7 @@
 
 #include <driver/fontrenderer.h>
 #include <driver/screen_max.h>
+#include <gui/pluginlist.h>
 #include <gui/widget/stringinput.h>
 
 #include <neutrino_menue.h>
@@ -966,11 +967,9 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
 	return retval;
 }
 
-void CMenuWidget::integratePlugins(void *pluginsExec, CPlugins::i_type_t integration, const unsigned int shortcut)
+void CMenuWidget::integratePlugins(CPlugins::i_type_t integration, const unsigned int shortcut)
 {
-	CPluginsExec *_pluginsExec = static_cast<CPluginsExec*>(pluginsExec);
 	bool separatorline = false;
-	char id_plugin[5];
 	unsigned int number_of_plugins = (unsigned int) g_PluginList->getNumberOfPlugins();
 	unsigned int sc = shortcut;
 	for (unsigned int count = 0; count < number_of_plugins; count++)
@@ -983,9 +982,8 @@ void CMenuWidget::integratePlugins(void *pluginsExec, CPlugins::i_type_t integra
 				separatorline = true;
 			}
 			printf("[neutrino] integratePlugins: add %s\n", g_PluginList->getName(count));
-			sprintf(id_plugin, "%d", count);
 			neutrino_msg_t dk = (shortcut != CRCInput::RC_nokey) ? CRCInput::convertDigitToKey(sc++) : CRCInput::RC_nokey;
-			CMenuForwarder *fw_plugin = new CMenuForwarder(g_PluginList->getName(count), true, NULL, _pluginsExec, id_plugin, dk);
+			CMenuForwarder *fw_plugin = new CMenuForwarder(g_PluginList->getName(count), true, NULL, CPluginsExec::getInstance(), to_string(count).c_str(), dk);
 			fw_plugin->setHint(g_PluginList->getHintIcon(count), g_PluginList->getDescription(count));
 			addItem(fw_plugin);
 		}
diff --git a/src/gui/widget/menue.h b/src/gui/widget/menue.h
index 2dabedd5e..74fd2051e 100644
--- a/src/gui/widget/menue.h
+++ b/src/gui/widget/menue.h
@@ -568,7 +568,7 @@ class CMenuWidget : public CMenuTarget
 		virtual void hide();
 		virtual int exec(CMenuTarget* parent, const std::string & actionKey);
 		virtual const char *getName();
-		virtual void integratePlugins(void *pluginsExec, CPlugins::i_type_t integration, const unsigned int shortcut=CRCInput::RC_nokey);
+		virtual void integratePlugins(CPlugins::i_type_t integration, const unsigned int shortcut=CRCInput::RC_nokey);
 		void setSelected(const int &Preselected){ preselected = Preselected; };
 		int getSelected()const { return selected; };
 		void move(int xoff, int yoff);
diff --git a/src/neutrino.h b/src/neutrino.h
index 70c59772a..e34e22f6d 100644
--- a/src/neutrino.h
+++ b/src/neutrino.h
@@ -74,7 +74,6 @@ public:
 	
 
 private:
-	CPluginsExec pluginsExec;
 	CFrameBuffer * frameBuffer;
 
 	CConfigFile			configfile;
diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp
index 2225c1cc1..87e73620b 100644
--- a/src/neutrino_menue.cpp
+++ b/src/neutrino_menue.cpp
@@ -129,12 +129,12 @@ void CNeutrinoApp::InitMenu()
 	unsigned int nextShortcut;
 	CMenuWidget &menuSettings = personalize.getWidget(MENU_SETTINGS);
 	nextShortcut = (unsigned int)menuSettings.getNextShortcut();
-	menuSettings.integratePlugins(&pluginsExec, CPlugins::I_TYPE_SETTING, nextShortcut);
+	menuSettings.integratePlugins(CPlugins::I_TYPE_SETTING, nextShortcut);
 
 	//add I_TYPE_SERVICE plugins
 	CMenuWidget &menuService = personalize.getWidget(MENU_SERVICE);
 	nextShortcut = (unsigned int)menuService.getNextShortcut();
-	menuService.integratePlugins(&pluginsExec, CPlugins::I_TYPE_SERVICE, nextShortcut);
+	menuService.integratePlugins(CPlugins::I_TYPE_SERVICE, nextShortcut);
 }
 
 //init main menu
diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp
index c25a1157e..216724066 100644
--- a/src/system/setting_helpers.cpp
+++ b/src/system/setting_helpers.cpp
@@ -367,35 +367,6 @@ int CNVODChangeExec::exec(CMenuTarget* parent, const std::string & actionKey)
 	return menu_return::RETURN_EXIT;
 }
 
-int CPluginsExec::exec(CMenuTarget* parent, const std::string & actionKey)
-{
-	if (actionKey.empty())
-		return menu_return::RETURN_NONE;
-
-	//printf("CPluginsExec exec: %s\n", actionKey.c_str());
-	int sel= atoi(actionKey.c_str());
-
-	if(parent != NULL)
-		parent->hide();
-
-	if(actionKey == "teletext") {
-		g_RCInput->postMsg(CRCInput::RC_timeout, 0);
-		g_RCInput->postMsg(CRCInput::RC_text, 0);
-	}
-	else if (sel>=0)
-	{
-		g_PluginList->startPlugin(sel);
-	}
-
-	if (!g_PluginList->getScriptOutput().empty())
-		ShowMsg(LOCALE_PLUGINS_RESULT, g_PluginList->getScriptOutput(), CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_SHELL);
-
-	if (g_PluginList->getIntegration(sel) == CPlugins::I_TYPE_DISABLED)
-		return menu_return::RETURN_EXIT;
-
-	return menu_return::RETURN_REPAINT;
-}
-
 int CMoviePluginChangeExec::exec(CMenuTarget* parent, const std::string & actionKey)
 {
 	int sel= atoi(actionKey.c_str());
diff --git a/src/system/setting_helpers.h b/src/system/setting_helpers.h
index 678ad84a7..50ea5ef6c 100644
--- a/src/system/setting_helpers.h
+++ b/src/system/setting_helpers.h
@@ -115,12 +115,6 @@ class CNVODChangeExec : public CMenuTarget
 		int exec(CMenuTarget* parent, const std::string & actionKey);
 };
 
-class CPluginsExec : public CMenuTarget
-{
-	public:
-		int exec(CMenuTarget* parent, const std::string & actionKey);
-};
-
 class CMoviePluginChangeExec : public CMenuTarget
 {
 	public:

From 493098040d934dee79a3f80a86b00e9daf6b32fc Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Sun, 9 Nov 2014 14:42:04 +0300
Subject: [PATCH 042/113] gui/movieplayer.cpp: fix volume values in audio
 selection

---
 src/gui/movieplayer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
index 15a1af378..547cd5deb 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -1230,12 +1230,12 @@ void CMoviePlayerGui::selectAudioPid()
 		APIDSelector.addItem(item, defpid);
 	}
 
+	int percent[numpida];
 	if (p_movie_info && numpida <= p_movie_info->audioPids.size()) {
 		APIDSelector.addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_AUDIOMENU_VOLUME_ADJUST));
 
 		CVolume::getInstance()->SetCurrentChannel(p_movie_info->epgId);
 		CVolume::getInstance()->SetCurrentPid(currentapid);
-		int percent[numpida];
 		for (uint i=0; i < numpida; i++) {
 			percent[i] = CZapit::getInstance()->GetPidVolume(p_movie_info->epgId, apids[i], ac3flags[i]);
 			APIDSelector.addItem(new CMenuOptionNumberChooser(p_movie_info->audioPids[i].epgAudioPidName,

From a12f4c0274112ba8b0da116bd9178b66ed9fe6d1 Mon Sep 17 00:00:00 2001
From: martii <m4rtii@gmx.de>
Date: Sun, 23 Jun 2013 08:40:35 +0200
Subject: [PATCH 043/113] parental protection: make zaptime configurable

Conflicts:
	data/locale/english.locale
	src/gui/channellist.cpp
	src/gui/parentallock_setup.cpp
	src/neutrino.cpp
---
 data/locale/deutsch.locale     | 1 +
 data/locale/english.locale     | 1 +
 src/gui/channellist.cpp        | 4 ++--
 src/gui/parentallock_setup.cpp | 1 +
 src/neutrino.cpp               | 9 ++++-----
 src/system/locals.h            | 1 +
 src/system/locals_intern.h     | 1 +
 src/system/settings.h          | 1 +
 8 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index 35cea2caf..14d9bd9c4 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -1772,6 +1772,7 @@ parentallock.never Nie
 parentallock.onsignal Bei gesendeter Vorsperre
 parentallock.parentallock Jugendschutz
 parentallock.prompt PIN-Eingabe
+parentallock.zaptime Zap-Zeit für vorgesperrte Bouquets (Minuten)
 personalize.access Zugangsoptionen
 personalize.apply_settings Änderungen übernehmen?
 personalize.button_auto Auto
diff --git a/data/locale/english.locale b/data/locale/english.locale
index 88089a430..e60ac6f1b 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -1772,6 +1772,7 @@ parentallock.never never
 parentallock.onsignal on broadcasted lock
 parentallock.parentallock Parental lock
 parentallock.prompt prompt for PIN
+parentallock.zaptime Zap time for locked bouquets (minutes)
 personalize.access Access options
 personalize.apply_settings Apply changes?
 personalize.button_auto auto
diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index fbe93cb39..6014c0357 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -1010,8 +1010,8 @@ int CChannelList::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data)
 	if (g_settings.parentallock_prompt == PARENTALLOCK_PROMPT_CHANGETOLOCKED && data < 0x100)
 		goto out;
 
-	/* if a pre-locked channel is inside the zap time, open it. Hardcoded to one hour for now. */
-	if (data >= 0x100 && (*chanlist)[selected]->last_unlocked_time + 3600 > time_monotonic())
+	/* if a pre-locked channel is inside the zap time, open it. */
+	if (data >= 0x100 && (*chanlist)[selected]->last_unlocked_time + g_settings.parentallock_zaptime * 60 > time_monotonic())
 		goto out;
 
 	/* OK, let's ask for a PIN */
diff --git a/src/gui/parentallock_setup.cpp b/src/gui/parentallock_setup.cpp
index 0f5becfb2..ca4ab7359 100644
--- a/src/gui/parentallock_setup.cpp
+++ b/src/gui/parentallock_setup.cpp
@@ -136,6 +136,7 @@ int CParentalSetup::showParentalSetup()
 	else
 		mc = new CMenuOptionChooser(LOCALE_PARENTALLOCK_BOUQUETMODE, &g_settings.parentallock_defaultlocked, PARENTALLOCK_DEFAULTLOCKED_OPTIONS, PARENTALLOCK_DEFAULTLOCKED_OPTION_COUNT, !parentallocked);
 	plock->addItem(mc);
+	plock->addItem(new CMenuOptionNumberChooser(LOCALE_PARENTALLOCK_ZAPTIME, (int *)&g_settings.parentallock_zaptime, !parentallocked, 0, 10000));
 
 	CPINChangeWidget pinChangeWidget(LOCALE_PARENTALLOCK_CHANGEPIN, &g_settings.parentallock_pincode, 4, LOCALE_PARENTALLOCK_CHANGEPIN_HINT1);
 	mf = new CMenuForwarder(LOCALE_PARENTALLOCK_CHANGEPIN, true, g_settings.parentallock_pincode, &pinChangeWidget);
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index bbe465449..5cc497dee 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -333,11 +333,8 @@ int CNeutrinoApp::loadSetup(const char * fname)
 			configfile.clear();
 		}
 	}
-	std::ifstream checkParentallocked(NEUTRINO_PARENTALLOCKED_FILE);
-	if(checkParentallocked) {
-		parentallocked = true;
-		checkParentallocked.close();
-	}
+	parentallocked = !access(NEUTRINO_PARENTALLOCKED_FILE, R_OK);
+
 	g_settings.easymenu = configfile.getInt32("easymenu", 0);
 	g_settings.softupdate_autocheck = configfile.getBool("softupdate_autocheck" , false);
 	/* if file present and no config file found, force easy mode */
@@ -749,6 +746,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
 	}
 	g_settings.parentallock_defaultlocked = configfile.getInt32("parentallock_defaultlocked", 0);
 	g_settings.parentallock_pincode = configfile.getString( "parentallock_pincode", "0000" );
+	g_settings.parentallock_zaptime = configfile.getInt32( "parentallock_zaptime", 60 );
 
 	for (int i = 0; i < SNeutrinoSettings::TIMING_SETTING_COUNT; i++)
 		g_settings.timing[i] = configfile.getInt32(locale_real_names[timing_setting[i].name], timing_setting[i].default_timing);
@@ -1194,6 +1192,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
 	configfile.setInt32( "parentallock_prompt", g_settings.parentallock_prompt );
 	configfile.setInt32( "parentallock_lockage", g_settings.parentallock_lockage );
 	configfile.setString( "parentallock_pincode", g_settings.parentallock_pincode );
+	configfile.setInt32("parentallock_zaptime", g_settings.parentallock_zaptime);
 	configfile.setInt32("parentallock_defaultlocked", g_settings.parentallock_defaultlocked);
 
 	//timing
diff --git a/src/system/locals.h b/src/system/locals.h
index 2ed66a79b..18b7c4251 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -1799,6 +1799,7 @@ typedef enum
 	LOCALE_PARENTALLOCK_ONSIGNAL,
 	LOCALE_PARENTALLOCK_PARENTALLOCK,
 	LOCALE_PARENTALLOCK_PROMPT,
+	LOCALE_PARENTALLOCK_ZAPTIME,
 	LOCALE_PERSONALIZE_ACCESS,
 	LOCALE_PERSONALIZE_APPLY_SETTINGS,
 	LOCALE_PERSONALIZE_BUTTON_AUTO,
diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h
index fb39b23f6..bf540c233 100644
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -1799,6 +1799,7 @@ const char * locale_real_names[] =
 	"parentallock.onsignal",
 	"parentallock.parentallock",
 	"parentallock.prompt",
+	"parentallock.zaptime",
 	"personalize.access",
 	"personalize.apply_settings",
 	"personalize.button_auto",
diff --git a/src/system/settings.h b/src/system/settings.h
index ab61c8e8c..69da00d5b 100644
--- a/src/system/settings.h
+++ b/src/system/settings.h
@@ -568,6 +568,7 @@ struct SNeutrinoSettings
 	int parentallock_prompt;
 	int parentallock_lockage;
 	int parentallock_defaultlocked;
+	int parentallock_zaptime;
 	std::string parentallock_pincode;
 
 

From d20fc8f1bc1f5f0b90a5fadd9ac7bc9cbbd9c613 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Tue, 11 Nov 2014 14:35:34 +0300
Subject: [PATCH 044/113] gui/widget/stringinput.cpp: fix screen save/restore

---
 src/gui/widget/stringinput.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/widget/stringinput.cpp b/src/gui/widget/stringinput.cpp
index 63c49153c..584483e80 100644
--- a/src/gui/widget/stringinput.cpp
+++ b/src/gui/widget/stringinput.cpp
@@ -898,7 +898,7 @@ const char * CPLPINInput::getHint1(void)
 	}
 }
 
-#define borderwidth 4
+#define borderwidth SHADOW_OFFSET // FIXME: do we need border around ??
 
 int CPLPINInput::exec( CMenuTarget* parent, const std::string & )
 {

From 5bd14ea4b873f15b850bc7517177e62ca06a9f2d Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Tue, 11 Nov 2014 14:39:16 +0300
Subject: [PATCH 045/113] neutrino: try to fix parental bypass by quit from
 audio player / picture viewer / movie player and starting channel in PiP

---
 src/gui/channellist.cpp | 28 +++++++++++++++++++---------
 src/gui/channellist.h   |  2 +-
 src/gui/movieplayer.cpp | 13 ++++++++-----
 src/neutrino.cpp        |  2 ++
 4 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index 6014c0357..cf0533285 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -886,10 +886,7 @@ int CChannelList::show()
 					calcSize();
 					paint();
 				} else {
-					if(CNeutrinoApp::getInstance()->StartPip((*chanlist)[selected]->getChannelID())) {
-						calcSize();
-						paint();
-					}
+					handleMsg(NeutrinoMessages::EVT_PROGRAMLOCKSTATUS, 0x100, true);
 				}
 			}
 		}
@@ -973,7 +970,7 @@ bool CChannelList::showInfo(int number, int epgpos)
 	return true;
 }
 
-int CChannelList::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data)
+int CChannelList::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data, bool pip)
 {
 	bool startvideo = true;
 
@@ -1014,9 +1011,15 @@ int CChannelList::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data)
 	if (data >= 0x100 && (*chanlist)[selected]->last_unlocked_time + g_settings.parentallock_zaptime * 60 > time_monotonic())
 		goto out;
 
+	if (pip && (*chanlist)[selected]->Locked() == g_settings.parentallock_defaultlocked)
+		goto out;
+
 	/* OK, let's ask for a PIN */
-	g_RemoteControl->stopvideo();
-	//printf("stopped video\n");
+	if (!pip) {
+		g_RemoteControl->is_video_started = true;
+		g_RemoteControl->stopvideo();
+		//printf("stopped video\n");
+	}
 	zapProtection = new CZapProtection(g_settings.parentallock_pincode, data);
 
 	if (zapProtection->check())
@@ -1051,8 +1054,15 @@ int CChannelList::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data)
 	zapProtection = NULL;
 
 out:
-	if (startvideo)
-		g_RemoteControl->startvideo();
+	if (startvideo) {
+		if(pip) {
+			if (CNeutrinoApp::getInstance()->StartPip((*chanlist)[selected]->getChannelID())) {
+				calcSize();
+				paint();
+			}
+		} else
+			g_RemoteControl->startvideo();
+	}
 
 	return messages_return::handled;
 }
diff --git a/src/gui/channellist.h b/src/gui/channellist.h
index 559851f8f..964aa0a81 100644
--- a/src/gui/channellist.h
+++ b/src/gui/channellist.h
@@ -210,7 +210,7 @@ public:
 	int  hasChannelID(t_channel_id channel_id);
 	void setSelected( int nChannelNr); // for adjusting bouquet's channel list after numzap or quickzap
 
-	int handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data);
+	int handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data, bool pip = false);
 
 	int getSize() const;
 	bool isEmpty() const;
diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
index 547cd5deb..582563b07 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -179,8 +179,10 @@ void CMoviePlayerGui::cutNeutrino()
 	if (!isWebTV)
 		g_Sectionsd->setPauseScanning(true);
 
-	m_LastMode = (CNeutrinoApp::getInstance()->getMode() | NeutrinoMessages::norezap);
-printf("%s: save mode %d\n", __func__, m_LastMode & NeutrinoMessages::mode_mask);fflush(stdout);
+	m_LastMode = (CNeutrinoApp::getInstance()->getMode() /*| NeutrinoMessages::norezap*/);
+	if (isWebTV)
+		m_LastMode |= NeutrinoMessages::norezap;
+	printf("%s: save mode %x\n", __func__, m_LastMode);fflush(stdout);
 	int new_mode = NeutrinoMessages::norezap | (isWebTV ? NeutrinoMessages::mode_webtv : NeutrinoMessages::mode_ts);
 	CNeutrinoApp::getInstance()->handleMsg(NeutrinoMessages::CHANGEMODE, new_mode);
 }
@@ -199,10 +201,11 @@ void CMoviePlayerGui::restoreNeutrino()
 	g_Zapit->unlockPlayBack();
 	g_Sectionsd->setPauseScanning(false);
 
-printf("%s: restore mode %d\n", __func__, m_LastMode & NeutrinoMessages::mode_mask);fflush(stdout);
+	printf("%s: restore mode %x\n", __func__, m_LastMode);fflush(stdout);
+#if 0
 	if (m_LastMode == NeutrinoMessages::mode_tv)
 		g_RCInput->postMsg(NeutrinoMessages::EVT_PROGRAMLOCKSTATUS, 0x200, false);
-
+#endif
 	if (m_LastMode != NeutrinoMessages::mode_unknown)
 		CNeutrinoApp::getInstance()->handleMsg(NeutrinoMessages::CHANGEMODE, m_LastMode);
 
@@ -213,7 +216,7 @@ printf("%s: restore mode %d\n", __func__, m_LastMode & NeutrinoMessages::mode_ma
 			CZapit::getInstance()->Rezap();
 	}
 #endif
-printf("%s: restoring done.\n", __func__);fflush(stdout);
+	printf("%s: restoring done.\n", __func__);fflush(stdout);
 }
 
 int CMoviePlayerGui::exec(CMenuTarget * parent, const std::string & actionKey)
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 5cc497dee..9cfc60565 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -3745,8 +3745,10 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey)
 		CMoviePlayerGui::getInstance().exec(NULL, actionKey);
 		if(_mode == NeutrinoMessages::mode_radio )
 			videoDecoder->ShowPicture(DATADIR "/neutrino/icons/radiomode.jpg");
+#if 0
 		else if (_mode == mode_webtv)
 			tvMode(true);
+#endif
 		return menu_return::RETURN_EXIT_ALL;
 	}
 	else if(actionKey=="audioplayer" || actionKey == "inetplayer") {

From 5b58992de21cc3c6f23359e60e8d8987f350f991 Mon Sep 17 00:00:00 2001
From: Jacek Jendrzej <crashdvb@googlemail.com>
Date: Tue, 11 Nov 2014 21:28:03 +0100
Subject: [PATCH 046/113] CPersonalizeGui::addPersonalizedItems() fix digikey
 shortcut after use Personalize-Menu

---
 src/gui/personalize.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/personalize.cpp b/src/gui/personalize.cpp
index 084afd6d3..bcbfe7bb3 100644
--- a/src/gui/personalize.cpp
+++ b/src/gui/personalize.cpp
@@ -940,7 +940,7 @@ void CPersonalizeGui::addPersonalizedItems()
 				bool add_shortcut 	= false;
 
 				//get shortcut
-				if (d_key == CRCInput::RC_nokey && fw->active ) //if no icon is defined and item is active, allow to generate a shortcut,
+				if (fw->active && (d_key == CRCInput::RC_nokey || CRCInput::isNumeric(d_key))) //if RC_nokey  or RC_key is digi and item is active, allow to generate a shortcut,
 				{
 					add_shortcut = true;
 					d_key = getShortcut(short_cut);

From 52397f7df6512c61164845b1d9ea39c880c68c58 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Wed, 12 Nov 2014 12:21:08 +0300
Subject: [PATCH 047/113] gui/streaminfo2.cpp: fix stream info on nvod channels

---
 src/gui/streaminfo2.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gui/streaminfo2.cpp b/src/gui/streaminfo2.cpp
index fe2be30e1..9a252ef53 100644
--- a/src/gui/streaminfo2.cpp
+++ b/src/gui/streaminfo2.cpp
@@ -454,7 +454,8 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
 		return;
 
 	transponder t;
-	CServiceManager::getInstance()->GetTransponder(channel->getTransponderId(), t);
+	//CServiceManager::getInstance()->GetTransponder(channel->getTransponderId(), t);
+	t = *frontend->getParameters();
 
 	int array[6]={g_Font[font_info]->getRenderWidth(g_Locale->getText (LOCALE_STREAMINFO_RESOLUTION)),
 		      g_Font[font_info]->getRenderWidth(g_Locale->getText (LOCALE_STREAMINFO_ARATIO)),

From 86c126c93724c8f15bb60dd6e5b5013397cc53c3 Mon Sep 17 00:00:00 2001
From: striper <striper@gmx.de>
Date: Wed, 12 Nov 2014 20:22:03 +0100
Subject: [PATCH 048/113] - try to fix segfault on neutrino shutdown

---
 src/neutrino.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 9cfc60565..6621d0b0a 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -3909,6 +3909,7 @@ void stop_daemons(bool stopall, bool for_flash)
 	}
 
 	if (for_flash) {
+		delete cHddStat::getInstance();
 		delete CRecordManager::getInstance();
 		delete videoDemux;
 		int ret = my_system(4, "mount", "-no", "remount,ro", "/");
@@ -3930,6 +3931,7 @@ void sighandler (int signum)
 	switch (signum) {
 	case SIGTERM:
 	case SIGINT:
+		delete cHddStat::getInstance();
 		delete CRecordManager::getInstance();
 		//CNeutrinoApp::getInstance()->saveSetup(NEUTRINO_SETTINGS_FILE);
 		stop_daemons();

From c30b3ece65c96079862cad163b0906f9b0748393 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Thu, 13 Nov 2014 10:48:05 +0100
Subject: [PATCH 049/113] - hddstat.cpp: move init of cHddStat inside
 geInstance()

---
 src/system/hddstat.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/system/hddstat.cpp b/src/system/hddstat.cpp
index 37318e795..979dedf24 100644
--- a/src/system/hddstat.cpp
+++ b/src/system/hddstat.cpp
@@ -41,10 +41,10 @@
 #include <driver/record.h>
 #include <driver/display.h>
 
-static cHddStat *instance = NULL;
-
 cHddStat *cHddStat::getInstance(void)
 {
+	static cHddStat *instance = NULL;
+
 	if (!instance)
 		instance = new cHddStat;
 	return instance;

From 6e08417d402350808f7d8f600077fe0524df3195 Mon Sep 17 00:00:00 2001
From: Jacek Jendrzej <crashdvb@googlemail.com>
Date: Thu, 13 Nov 2014 10:51:27 +0100
Subject: [PATCH 050/113] CChannelList::updateEvents fix history list event
 update

---
 src/gui/channellist.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index cf0533285..e1bd25d51 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -157,13 +157,12 @@ void CChannelList::updateEvents(unsigned int from, unsigned int to)
 	if ((*chanlist).empty())
 		return;
 
-	if (from > (*chanlist).size() || from >= to)
-		return;
-
-
 	if (to == 0 || to > (*chanlist).size())
 		to = (*chanlist).size();
 
+	if (from > (*chanlist).size() || from >= to)
+		return;
+
 	size_t chanlist_size = to - from;
 
 	CChannelEventList events;

From b22625aa36d2373ea4cdfbea67048c2ea4ad94ed Mon Sep 17 00:00:00 2001
From: Jacek Jendrzej <crashdvb@googlemail.com>
Date: Thu, 13 Nov 2014 15:38:30 +0100
Subject: [PATCH 051/113] -try to fix segfault on webtv channel - neutrino
 shutdown

---
 src/driver/record.cpp | 3 +++
 src/neutrino.cpp      | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/driver/record.cpp b/src/driver/record.cpp
index 61fe5c9c4..cf751e374 100644
--- a/src/driver/record.cpp
+++ b/src/driver/record.cpp
@@ -809,6 +809,9 @@ CRecordManager::~CRecordManager()
 	}
 	nextmap.clear();
 	durations.clear();
+	sm.lock();
+	manager = NULL;
+	sm.unlock();
 }
 
 CRecordManager * CRecordManager::getInstance()
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 6621d0b0a..8011608fc 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -3199,9 +3199,6 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode)
 		}
 
 
-		delete cHddStat::getInstance();
-		delete CRecordManager::getInstance();
-
 		dprintf(DEBUG_INFO, "exit\n");
 		StopSubtitles();
 		stopPlayBack();
@@ -3209,6 +3206,9 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode)
 		frameBuffer->paintBackground();
 		videoDecoder->ShowPicture(DATADIR "/neutrino/icons/shutdown.jpg");
 
+		delete cHddStat::getInstance();
+		delete CRecordManager::getInstance();
+
 		CEpgScan::getInstance()->Stop();
 		if(g_settings.epg_save /* && timeset && g_Sectionsd->getIsTimeSet ()*/) {
 			g_Sectionsd->setPauseScanning(true);

From f2d08d72aca16bf23a4f61e5002892dccb925427 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Thu, 13 Nov 2014 16:17:39 +0100
Subject: [PATCH 052/113] - flashtool: localize "Copy Image" string

---
 data/locale/deutsch.locale | 1 +
 data/locale/english.locale | 1 +
 src/system/flashtool.cpp   | 2 +-
 src/system/locals.h        | 1 +
 src/system/locals_intern.h | 1 +
 5 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index 14d9bd9c4..42a79f8fb 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -556,6 +556,7 @@ flashupdate.cantopenfile kann Datei nicht öffnen
 flashupdate.cantopenmtd kann MTD nicht öffnen
 flashupdate.checkupdate_internet Online nach Updates suchen
 flashupdate.checkupdate_local Lokales Update
+flashupdate.copy_image Kopiere Image in den Arbeitsspeicher
 flashupdate.createimage Image speichern
 flashupdate.createimage_add_env 'env' hinzufügen
 flashupdate.createimage_add_kernel 'kernel' hinzufügen
diff --git a/data/locale/english.locale b/data/locale/english.locale
index e60ac6f1b..f67551aa4 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -556,6 +556,7 @@ flashupdate.cantopenfile can't open file
 flashupdate.cantopenmtd can't open MTD
 flashupdate.checkupdate_internet Check for online updates
 flashupdate.checkupdate_local Local update
+flashupdate.copy_image Copy Image to main memory
 flashupdate.createimage Save image
 flashupdate.createimage_add_env Add 'env' to image
 flashupdate.createimage_add_kernel Add 'kernel' to image
diff --git a/src/system/flashtool.cpp b/src/system/flashtool.cpp
index 6c0b76b40..04ddd4d43 100644
--- a/src/system/flashtool.cpp
+++ b/src/system/flashtool.cpp
@@ -200,7 +200,7 @@ bool CFlashTool::program( const std::string & filename, int globalProgressEndEra
 		CFileHelpers fh;
 		printf("##### [CFlashTool::program] copy flashfile to %s\n", flashfile.c_str());
 		if(statusViewer)
-			statusViewer->showStatusMessageUTF("Copy Image");
+			statusViewer->showStatusMessageUTF(g_Locale->getText(LOCALE_FLASHUPDATE_COPY_IMAGE));
 		fh.copyFile(filename.c_str(), flashfile.c_str(), 0644);
 		sync();
 		if(statusViewer)
diff --git a/src/system/locals.h b/src/system/locals.h
index 18b7c4251..0337282aa 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -583,6 +583,7 @@ typedef enum
 	LOCALE_FLASHUPDATE_CANTOPENMTD,
 	LOCALE_FLASHUPDATE_CHECKUPDATE_INTERNET,
 	LOCALE_FLASHUPDATE_CHECKUPDATE_LOCAL,
+	LOCALE_FLASHUPDATE_COPY_IMAGE,
 	LOCALE_FLASHUPDATE_CREATEIMAGE,
 	LOCALE_FLASHUPDATE_CREATEIMAGE_ADD_ENV,
 	LOCALE_FLASHUPDATE_CREATEIMAGE_ADD_KERNEL,
diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h
index bf540c233..1a2a5cbe8 100644
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -583,6 +583,7 @@ const char * locale_real_names[] =
 	"flashupdate.cantopenmtd",
 	"flashupdate.checkupdate_internet",
 	"flashupdate.checkupdate_local",
+	"flashupdate.copy_image",
 	"flashupdate.createimage",
 	"flashupdate.createimage_add_env",
 	"flashupdate.createimage_add_kernel",

From 87ba343484beb7875f33614ec37d221ad2008078 Mon Sep 17 00:00:00 2001
From: Janus <janus@debian>
Date: Mon, 17 Nov 2014 15:40:16 +0100
Subject: [PATCH 053/113] locale numzap ger

---
 data/locale/deutsch.locale | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index 42a79f8fb..db4093318 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -242,7 +242,7 @@ channellist.new_zap_mode_active aktiv
 channellist.new_zap_mode_allow erlauben
 channellist.new_zap_mode_off aus
 channellist.nonefound Es wurden keine Kanäle gefunden!\nFühren Sie bitte eine Kanalsuche durch\n(MENU-Taste -> Service)
-channellist.numeric_adjust Numeric zap adjust
+channellist.numeric_adjust Bei numerischem Zap Kanalliste nachführen
 channellist.provs Anbieter
 channellist.recording_not_possible Aufnahme nicht möglich!
 channellist.remember Zuletzt verwendete
@@ -1126,7 +1126,7 @@ menu.hint_net_ushare Freigabe verbundener Datenträger über UPnP
 menu.hint_net_xupnpd Freigabe von Live Channels über UPNP
 menu.hint_network IP-Adresse, Gateway, DNS, Zeit-Sync, Netzwerk-Freigaben, Dienste und mehr
 menu.hint_new_zap_mode Aktiviert Quickzap in der Kanalliste. Nach Betätigen der Mute-Taste wird mit den Hoch/Runter-Tasten direkt umgeschalten
-menu.hint_numeric_adjust Adjust channel list mode on numeric zap
+menu.hint_numeric_adjust Bei numerischer Programmwahl die Kanalliste am neu gewählten Programm ausrichten
 menu.hint_opkg Hier können Sie neue Software-Pakete installieren oder vorhandene aktualisieren
 menu.hint_opkg_upgrade Aktualisiert alle installierten Pakete auf die neueste verfügbare Version
 menu.hint_osd Farben, Schriftarten, Anzeigegröße, Ansichtsoptionen der Menüs und mehr

From f4ccaa975b198da7ec921976447cc085cfecd7da Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Mon, 17 Nov 2014 15:53:08 +0100
Subject: [PATCH 054/113] - progresswindow: fix position of progressbars

---
 src/gui/widget/progresswindow.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/widget/progresswindow.cpp b/src/gui/widget/progresswindow.cpp
index 0d76de113..7ae089877 100644
--- a/src/gui/widget/progresswindow.cpp
+++ b/src/gui/widget/progresswindow.cpp
@@ -58,7 +58,7 @@ void CProgressWindow::Init()
 	status_txt->setDimensionsAll(x_item, y_item, w_item, h_txt);
 	status_txt->setColorBody(col_body);
 	addWindowItem(status_txt);
-	y_item += h_txt;
+	y_item += h_txt + 10;
 
 	//create local_bar object
 	local_bar = new CProgressBar();
@@ -80,7 +80,7 @@ void CProgressWindow::Init()
 	addWindowItem(global_bar);
 	y_item += 2*h_pbar;
 
-	height = y_item + ccw_head->getHeight() + 10;
+	height = y_item + ccw_head->getHeight();
 
 	setCenterPos();
 }

From 37b20a84f6a60dc74ca8cfb1f82558025874a298 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Tue, 18 Nov 2014 13:24:00 +0300
Subject: [PATCH 055/113] gui/widget/menue.cpp: fix progressbar values in
 progressbar setup

---
 src/gui/widget/menue.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp
index 3a217b93b..8d0303fbc 100644
--- a/src/gui/widget/menue.cpp
+++ b/src/gui/widget/menue.cpp
@@ -2286,7 +2286,7 @@ void CMenuProgressbar::init(const neutrino_locale_t Loc, const std::string &Text
 	name = Loc;
 	nameString = Text;
 	scale.setDimensionsAll(0, 0, 100, g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight()/2);
-	scale.setValue(100);
+	scale.setValues(100, 100);
 }
 
 int CMenuProgressbar::paint(bool selected)

From cb804f37cdf41d9aa048e04954ba125d5fbe2a94 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Tue, 18 Nov 2014 17:46:13 +0300
Subject: [PATCH 056/113] gui/movieplayer.cpp: try to remove extra live start
 on movie stop

---
 src/gui/movieplayer.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
index 582563b07..5a7518d5c 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -198,7 +198,8 @@ void CMoviePlayerGui::restoreNeutrino()
 	if (isUPNP)
 		return;
 
-	g_Zapit->unlockPlayBack();
+	//g_Zapit->unlockPlayBack();
+	CZapit::getInstance()->EnablePlayback(true);
 	g_Sectionsd->setPauseScanning(false);
 
 	printf("%s: restore mode %x\n", __func__, m_LastMode);fflush(stdout);

From 003acea160a0dc2f8eed1590e9efea566f0304d0 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Wed, 19 Nov 2014 18:16:01 +0300
Subject: [PATCH 057/113] gui/widget/keyboard_input.cpp: add string input with
 keyboard-style layout

---
 data/locale/english.locale        |   3 +
 src/gui/widget/Makefile.am        |   1 +
 src/gui/widget/keyboard_input.cpp | 728 ++++++++++++++++++++++++++++++
 src/gui/widget/keyboard_input.h   | 136 ++++++
 src/system/locals.h               |   4 +
 src/system/locals_intern.h        |   4 +
 6 files changed, 876 insertions(+)
 create mode 100644 src/gui/widget/keyboard_input.cpp
 create mode 100644 src/gui/widget/keyboard_input.h

diff --git a/data/locale/english.locale b/data/locale/english.locale
index f67551aa4..ee6af3bb7 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -2087,8 +2087,11 @@ streaming.dir_not_writable The recording directory is not writable.\nRecording w
 streaming.overflow Record buffer overflow, consider to stop some records
 streaming.slow System/hdd too slow, consider to stop some records
 streaming.write_error The recording was aborted,\nsince an error occured during the writing process.
+stringinput.backspace Backspace
 stringinput.caps caps / no caps
 stringinput.clear clear all
+stringinput.insert Insert
+stringinput.save Save
 subtitles.charset Charset
 subtitles.head Subtitles
 subtitles.stop Stop subtitles
diff --git a/src/gui/widget/Makefile.am b/src/gui/widget/Makefile.am
index 3040302e1..0b9dc86e9 100644
--- a/src/gui/widget/Makefile.am
+++ b/src/gui/widget/Makefile.am
@@ -32,6 +32,7 @@ libneutrino_gui_widget_a_SOURCES = \
 	hintbox.cpp \
 	hintboxext.cpp \
 	keychooser.cpp \
+	keyboard_input.cpp \
 	listbox.cpp \
 	listframe.cpp \
 	menue.cpp \
diff --git a/src/gui/widget/keyboard_input.cpp b/src/gui/widget/keyboard_input.cpp
new file mode 100644
index 000000000..d58759126
--- /dev/null
+++ b/src/gui/widget/keyboard_input.cpp
@@ -0,0 +1,728 @@
+/*
+	Neutrino-GUI  -   DBoxII-Project
+
+	Copyright (C) 2001 Steffen Hehn 'McClean'
+	Copyright (C) 2014 CoolStream International Ltd
+
+	License: GPLv2
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, version 2 of the License.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <global.h>
+#include <neutrino.h>
+
+#include <driver/fontrenderer.h>
+#include <driver/rcinput.h>
+#include <driver/screen_max.h>
+#include <driver/display.h>
+
+#include <gui/color.h>
+
+#include <gui/widget/buttons.h>
+#include <gui/widget/icons.h>
+#include <gui/widget/messagebox.h>
+
+#include <system/helpers.h>
+#include <gui/widget/keyboard_input.h>
+
+static std::string keys_english[2][KEY_ROWS][KEY_COLUMNS] =
+{
+	{
+		{ "`", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "-",  "=",  "§"  },
+		{ "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "[",  "]",  "{", "}"  },
+		{ "a", "s", "d", "f", "g", "h", "j", "k", "l", ";", "\'", "\\", ":", "\"" },
+		{ "z", "x", "c", "v", "b", "n", "m", ",", ".", "/", "<",  ">",  "?", " "  }
+	},
+	{
+		{ "~", "!", "@", "#", "$", "%", "^", "&", "*", "(", ")", "_",  "+",  "§", },
+		{ "Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", "{",  "}",  "{", "}"  },
+		{ "A", "S", "D", "F", "G", "H", "J", "K", "L", ";", "\'", "\\", ":", "\"" },
+		{ "Z", "X", "C", "V", "B", "N", "M", ",", ".", "/", "<",  ">",  "?", " "  }
+	}
+};
+
+static std::string keys_deutsch[2][KEY_ROWS][KEY_COLUMNS] =
+{
+	{
+		{ "`", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0",  "ß",  "=", "§"  },
+		{ "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "ü",  "\'", "[", "]"  },
+		{ "a", "s", "d", "f", "g", "h", "j", "k", "l", "ö", "ä",  "\\", ";", "\"" },
+		{ "z", "x", "c", "v", "b", "n", "m", ",", ".", "/", "<",  ">",  "?", " "  }
+	},
+	{
+		{ "~", "!", "@", "#", "$", "%", "^", "&", "*", "(", ")", "_",  "+",  "§", },
+		{ "Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", "Ü",  "-",  "{", "}"  },
+		{ "A", "S", "D", "F", "G", "H", "J", "K", "L", "Ö", "Ä'", "\\", ":", "\"" },
+		{ "Z", "X", "C", "V", "B", "N", "M", ",", ".", "/", "<",  ">",  "?", " "  }
+	}
+};
+
+static std::string keys_russian[2][KEY_ROWS][KEY_COLUMNS] =
+{
+	{
+		{ "ё", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "-",  "=", "§"  },
+		{ "й", "ц", "у", "к", "е", "н", "г", "ш", "щ", "з", "х", "ъ",  "[", "]"  },
+		{ "ф", "ы", "в", "а", "п", "р", "о", "л", "д", "ж", "э", "\\", ":", "\"" },
+		{ "я", "ч", "с", "м", "и", "т", "ь", "б", "ю", "/", ".",  ",", "?", " "  }
+	},
+	{
+		{ "Ё", "!", "@", "#", "$", "%", "^", "&", "*", "(", ")", "_", "+", "§" },
+		{ "Й", "Ц", "У", "К", "Е", "Н", "Г", "Ш", "Щ", "З", "Х", "Х", "{", "}" },
+		{ "Ф", "Ы", "В", "А", "П", "Р", "О", "Л", "Д", "Ж", "Э", "|", ";", "~" },
+		{ "Я", "Ч", "С", "М", "И", "Т", "Ь", "Б", "Ю", "?", "<", ">", "?", " " }
+	}
+};
+
+struct keyboard_layout keyboards[] =
+{
+	{ "English", "english", keys_english },
+	{ "Deutsch", "deutsch", keys_deutsch },
+	{ "Русский", "russkij", keys_russian },
+};
+#define LAYOUT_COUNT (sizeof(keyboards)/sizeof(struct keyboard_layout))
+
+std::string UTF8ToString(const char * &text)
+{
+	std::string res;
+
+	res = *text;
+	if ((((unsigned char)(*text)) & 0x80) != 0)
+	{
+		int remaining_unicode_length = 0;
+		if ((((unsigned char)(*text)) & 0xf8) == 0xf0)
+			remaining_unicode_length = 3;
+		else if ((((unsigned char)(*text)) & 0xf0) == 0xe0)
+			remaining_unicode_length = 2;
+		else if ((((unsigned char)(*text)) & 0xe0) == 0xc0)
+			remaining_unicode_length = 1;
+
+		for (int i = 0; i < remaining_unicode_length; i++)
+		{
+			text++;
+			if (((*text) & 0xc0) != 0x80)
+				break;
+			res += *text;
+		}
+	}
+	return res;
+}
+
+CInputString::CInputString(int Size)
+{
+	len = Size;
+	std::string tmp;
+	for (unsigned i = 0; i < len; i++)
+		inputString.push_back(tmp);
+}
+
+void CInputString::clear()
+{
+	for (unsigned i = 0; i < len; i++)
+		inputString[i].clear();
+}
+
+size_t CInputString::length()
+{
+	return inputString.size();
+}
+
+CInputString & CInputString::operator=(const std::string &str)
+{
+	clear();
+	const char * text = str.c_str();
+	for (unsigned i = 0; i < inputString.size() && *text; i++, text++)
+		inputString[i] = UTF8ToString(text);
+	return *this;
+}
+
+void CInputString::assign(size_t n, char c)
+{
+	clear();
+	for (unsigned i = 0; i < n && i < inputString.size(); i++)
+		inputString[i] = c;
+}
+
+std::string &CInputString::at(size_t pos)
+{
+	return inputString[pos];
+}
+
+std::string &CInputString::getValue()
+{
+	valueString.clear();
+	for (unsigned i = 0; i < inputString.size(); i++) {
+		if (!inputString[i].empty())
+			valueString += inputString[i];
+	}
+	valueString = valueString.erase(valueString.find_last_not_of(" ") + 1);
+	return valueString;
+}
+
+const char* CInputString::c_str()
+{
+	return getValue().c_str();
+}
+
+CKeyboardInput::CKeyboardInput(const neutrino_locale_t Name, std::string* Value, int Size, CChangeObserver* Observ, const char * const Icon, const neutrino_locale_t Hint_1, const neutrino_locale_t Hint_2)
+{
+	name =  Name;
+	head = g_Locale->getText(Name);
+	valueString = Value;
+	inputSize = Size;
+
+	iconfile = Icon ? Icon : "";
+
+	observ = Observ;
+	hint_1 = Hint_1;
+	hint_2 = Hint_2;
+	inputString = new CInputString(inputSize);
+	layout = NULL;
+	selected = 0;
+	caps = 0;
+	srow = scol = 0;
+	focus = FOCUS_STRING;
+}
+
+CKeyboardInput::CKeyboardInput(const std::string &Name, std::string *Value, int Size, CChangeObserver* Observ, const char * const Icon, const neutrino_locale_t Hint_1, const neutrino_locale_t Hint_2)
+{
+	name = NONEXISTANT_LOCALE;
+	head = Name;
+	valueString = Value;
+	inputSize =  Size;
+
+	iconfile = Icon ? Icon : "";
+
+	observ = Observ;
+	hint_1 = Hint_1;
+	hint_2 = Hint_2;
+	inputString = new CInputString(inputSize);
+	layout = NULL;
+	selected = 0;
+	caps = 0;
+	srow = scol = 0;
+	focus = FOCUS_STRING;
+}
+
+CKeyboardInput::~CKeyboardInput()
+{
+	delete inputString;
+}
+
+#define BORDER_OFFSET 20
+#define INPUT_BORDER 2
+#define KEY_FRAME_WIDTH 2 // keys frame width
+#define KEY_BORDER 4 // spacing between keys
+
+void CKeyboardInput::init()
+{
+	frameBuffer = CFrameBuffer::getInstance();
+	setLayout();
+
+	hheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
+	iheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_INFO]->getHeight();
+	input_h = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight() + 2;		// font height + border
+	input_w = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth("M") + INPUT_BORDER;	// hack font width + border
+	offset  = BORDER_OFFSET;
+	fheight = paintFooter(false);
+	iwidth = inputSize*input_w + 2*offset;
+
+	key_w = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getRenderWidth("M") + 20;
+	key_h = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight() + 10;
+	kwidth = key_w*KEY_COLUMNS + (KEY_COLUMNS-1)*KEY_BORDER + 2*offset;
+
+	width = std::max(iwidth, kwidth);
+	width = std::min(width, (int) frameBuffer->getScreenWidth());
+
+	int tmp_w = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getRenderWidth(head);
+	if (!(iconfile.empty()))
+	{
+		int icol_w, icol_h;
+		frameBuffer->getIconSize(iconfile.c_str(), &icol_w, &icol_h);
+		hheight = std::max(hheight, icol_h + (offset/4));
+		tmp_w += icol_w + (offset/2);
+	}
+	width = std::max(width, tmp_w + offset);
+
+	bheight = input_h + (key_h+KEY_BORDER)*KEY_ROWS + 3*offset;
+	if ((hint_1 != NONEXISTANT_LOCALE) || (hint_2 != NONEXISTANT_LOCALE))
+	{
+		if (hint_1 != NONEXISTANT_LOCALE)
+		{
+			tmp_w = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_INFO]->getRenderWidth(g_Locale->getText(hint_1));
+			width = std::max(width, tmp_w + 2*offset);
+			bheight += iheight;
+		}
+		if (hint_2 != NONEXISTANT_LOCALE)
+		{
+			tmp_w = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_INFO]->getRenderWidth(g_Locale->getText(hint_2));
+			width = std::max(width, tmp_w + 2*offset);
+			bheight += iheight;
+		}
+		bheight += offset;
+	}
+
+	height = hheight+ bheight + fheight;
+
+	x = getScreenStartX(width);
+	y = getScreenStartY(height);
+	*inputString = *valueString;
+	changed = false;
+}
+
+void CKeyboardInput::setLayout()
+{
+	if (layout != NULL)
+		return;
+
+	layout = &keyboards[0];
+	keyboard = layout->keys[caps];
+	for(unsigned i = 0; i < LAYOUT_COUNT; i++) {
+		if (keyboards[i].locale == g_settings.language) {
+			layout = &keyboards[i];
+			keyboard = layout->keys[caps];
+			return;
+		}
+	}
+}
+
+void CKeyboardInput::switchLayout()
+{
+	unsigned i;
+	for (i = 0; i < LAYOUT_COUNT; i++) {
+		if (layout == &keyboards[i])
+			break;
+	}
+	i++;
+	if (i >= LAYOUT_COUNT)
+		i = 0;
+	layout = &keyboards[i];
+	keyboard = layout->keys[caps];
+	paintFooter();
+	paintKeyboard();
+}
+
+void CKeyboardInput::NormalKeyPressed()
+{
+	if (keyboard[srow][scol].empty())
+		return;
+
+	inputString->at(selected) = keyboard[srow][scol];
+	if (selected < (inputSize - 1))
+	{
+		selected++;
+		paintChar(selected - 1);
+	}
+	paintChar(selected);
+	changed = true;
+}
+
+void CKeyboardInput::clearString()
+{
+	selected = 0;
+	inputString->assign(inputString->length(), ' ');
+	for (int i = 0 ; i < inputSize; i++)
+		paintChar(i);
+	changed = true;
+}
+
+void CKeyboardInput::switchCaps()
+{
+	caps = caps ? 0 : 1;
+	keyboard = layout->keys[caps];
+	paintKeyboard();
+}
+
+void CKeyboardInput::keyUpPressed()
+{
+	if (focus == FOCUS_KEY) {
+		int old_row = srow;
+		srow--;
+		paintKey(old_row, scol);
+		if (srow < 0) {
+			focus = FOCUS_STRING;
+			paintChar(selected);
+		} else {
+			paintKey(srow, scol);
+		}
+	} else {
+		srow = KEY_ROWS - 1;
+		focus = FOCUS_KEY;
+		paintChar(selected);
+		paintKey(srow, scol);
+	}
+}
+
+void CKeyboardInput::keyDownPressed()
+{
+	if (focus == FOCUS_KEY) {
+		int old_row = srow;
+		srow++;
+		paintKey(old_row, scol);
+		if (srow >= KEY_ROWS) {
+			focus = FOCUS_STRING;
+			paintChar(selected);
+		} else {
+			paintKey(srow, scol);
+		}
+	} else {
+		srow = 0;
+		focus = FOCUS_KEY;
+		paintChar(selected);
+		paintKey(srow, scol);
+	}
+}
+
+void CKeyboardInput::keyLeftPressed()
+{
+	if (focus == FOCUS_KEY) {
+		int old_col = scol;;
+		scol--;
+		if (scol < 0)
+			scol = KEY_COLUMNS -1;
+		paintKey(srow, old_col);
+		paintKey(srow, scol);
+	} else {
+		int old = selected;
+		if (selected > 0)
+			selected--;
+		else
+			selected = inputSize - 1;
+
+		paintChar(old);
+		paintChar(selected);
+	}
+}
+
+void CKeyboardInput::keyRightPressed()
+{
+	if (focus == FOCUS_KEY) {
+		int old_col = scol;;
+		scol++;
+		if (scol >= KEY_COLUMNS)
+			scol = 0;
+		paintKey(srow, old_col);
+		paintKey(srow, scol);
+	} else {
+		int old = selected;
+		if (selected < (inputSize - 1)) {
+			selected++;
+		} else
+			selected = 0;
+
+		paintChar(old);
+		paintChar(selected);
+	}
+}
+
+void CKeyboardInput::deleteChar()
+{
+	int item = selected;
+	while (item < (inputSize -1))
+	{
+		inputString->at(item) = inputString->at(item+1);
+		paintChar(item);
+		item++;
+	}
+	inputString->at(item) = ' ';
+	paintChar(item);
+	changed = true;
+}
+
+void CKeyboardInput::keyBackspacePressed(void)
+{
+	if (selected > 0)
+	{
+		selected--;
+		for (int i = selected; i < inputSize - 1; i++)
+		{
+			inputString->at(i) = inputString->at(i + 1);
+			paintChar(i);
+		}
+		inputString->at(inputSize - 1) = ' ';
+		paintChar(inputSize - 1);
+		changed = true;
+	}
+}
+
+void CKeyboardInput::insertChar()
+{
+	int item = inputSize -1;
+	while (item > selected)
+	{
+		inputString->at(item) = inputString->at(item-1);
+		paintChar(item);
+		item--;
+	}
+	inputString->at(item) = ' ';
+	paintChar(item);
+	changed = true;
+}
+
+std::string &CKeyboardInput::getValue(void)
+{
+	return *valueString;
+}
+
+int CKeyboardInput::exec(CMenuTarget* parent, const std::string &)
+{
+	neutrino_msg_t      msg;
+	neutrino_msg_data_t data;
+	int res = menu_return::RETURN_REPAINT;
+
+	if (parent)
+		parent->hide();
+
+	init();
+
+	std::string oldval = *valueString;
+
+	fb_pixel_t * pixbuf = NULL;
+	if (!parent) {
+		pixbuf = new fb_pixel_t[(width + SHADOW_OFFSET) * (height + SHADOW_OFFSET)];
+		if (pixbuf)
+			frameBuffer->SaveScreen(x, y, width + SHADOW_OFFSET, height + SHADOW_OFFSET, pixbuf);
+	}
+
+	paint();
+	paintKeyboard();
+
+	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
+
+	bool loop=true;
+	while (loop)
+	{
+		if (changed)
+		{
+			changed = false;
+			CVFD::getInstance()->showMenuText(1, inputString->c_str() , selected+1);
+		}
+		g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd, true);
+
+		if (msg <= CRCInput::RC_MaxRC)
+			timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
+
+		if (msg==CRCInput::RC_left)
+		{
+			keyLeftPressed();
+		}
+		else if (msg==CRCInput::RC_right)
+		{
+			keyRightPressed();
+		}
+		else if (msg == CRCInput::RC_up)
+		{
+			keyUpPressed();
+		}
+		else if (msg == CRCInput::RC_down)
+		{
+			keyDownPressed();
+		}
+		else if (msg==CRCInput::RC_red)
+		{
+			loop = false;
+		}
+		else if (msg == CRCInput::RC_green)
+		{
+			insertChar();
+		}
+		else if (msg==CRCInput::RC_yellow)
+		{
+			clearString();
+		}
+		else if (msg == CRCInput::RC_blue)
+		{
+			switchCaps();
+		}
+		else if (msg == CRCInput::RC_rewind)
+		{
+			keyBackspacePressed();
+		}
+		else if (msg == CRCInput::RC_ok)
+		{
+			if (focus == FOCUS_KEY)
+				NormalKeyPressed();
+		}
+		else if (msg == CRCInput::RC_setup)
+		{
+			switchLayout();
+		}
+		else if ((msg == CRCInput::RC_home) || (msg == CRCInput::RC_timeout))
+		{
+			if ((inputString->getValue() != oldval) &&
+					(ShowMsg(name, LOCALE_MESSAGEBOX_DISCARD, CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbCancel) == CMessageBox::mbrCancel))
+				continue;
+
+			*inputString = oldval;
+			loop = false;
+			res = menu_return::RETURN_EXIT_REPAINT;
+		}
+		else if ((msg ==CRCInput::RC_sat) || (msg == CRCInput::RC_favorites))
+		{
+		}
+		else
+		{
+			if (CNeutrinoApp::getInstance()->handleMsg(msg, data) & messages_return::cancel_all)
+			{
+				loop = false;
+				res = menu_return::RETURN_EXIT_ALL;
+			}
+		}
+	}
+
+	if (pixbuf)
+	{
+		frameBuffer->RestoreScreen(x, y, width + SHADOW_OFFSET, height + SHADOW_OFFSET, pixbuf);
+		delete[] pixbuf;
+	} else
+		hide();
+
+	*valueString = inputString->getValue();
+
+	if ((observ) && (msg == CRCInput::RC_red))
+		observ->changeNotify(name, (void *) valueString->c_str());
+
+	return res;
+}
+
+void CKeyboardInput::hide()
+{
+	frameBuffer->paintBackgroundBoxRel(x, y, width + SHADOW_OFFSET, height + SHADOW_OFFSET);
+}
+
+int CKeyboardInput::paintFooter(bool show)
+{
+	button_label_ext footerButtons[] = {
+		{ NEUTRINO_ICON_BUTTON_RED     , LOCALE_STRINGINPUT_SAVE     , NULL,                  0, false },
+		{ NEUTRINO_ICON_BUTTON_GREEN   , LOCALE_STRINGINPUT_INSERT   , NULL,                  0, false },
+		{ NEUTRINO_ICON_BUTTON_YELLOW  , LOCALE_STRINGINPUT_CLEAR    , NULL,                  0, false },
+		{ NEUTRINO_ICON_BUTTON_BLUE    , LOCALE_STRINGINPUT_CAPS     , NULL,                  0, false },
+		{ NEUTRINO_ICON_BUTTON_BACKWARD, LOCALE_STRINGINPUT_BACKSPACE, NULL,                  0, false },
+		{ NEUTRINO_ICON_BUTTON_MENU    , NONEXISTANT_LOCALE          , NULL,                  0, false },
+		{ layout->locale.c_str()       , NONEXISTANT_LOCALE          , layout->name.c_str() , 0, false }
+	};
+
+	int cnt = (sizeof(footerButtons)/sizeof(struct button_label_ext));
+	if (show)
+		return ::paintButtons(footerButtons, cnt, x, y+ hheight+ bheight, width, fheight, width, true);
+	else
+		return ::paintButtons(footerButtons, cnt, 0, 0, 0, 0, 0, false, NULL, NULL);
+}
+
+void CKeyboardInput::paint()
+{
+	frameBuffer->paintBoxRel(x + SHADOW_OFFSET, y + SHADOW_OFFSET, width, height, COL_MENUCONTENTDARK_PLUS_0, RADIUS_LARGE, CORNER_ALL); //round
+	frameBuffer->paintBoxRel(x, y + hheight, width, bheight, COL_MENUCONTENT_PLUS_0);
+
+	CComponentsHeader header(x, y, width, hheight, head, iconfile);
+	header.paint(CC_SAVE_SCREEN_NO);
+
+	key_y = y+ hheight+ offset+ input_h+ offset;
+	if ((hint_1 != NONEXISTANT_LOCALE) || (hint_2 != NONEXISTANT_LOCALE))
+	{
+		if (hint_1 != NONEXISTANT_LOCALE)
+		{
+			key_y += iheight;
+			g_Font[SNeutrinoSettings::FONT_TYPE_MENU_INFO]->RenderString(x+ offset, key_y, width- 2*offset, g_Locale->getText(hint_1), COL_MENUCONTENT_TEXT);
+		}
+		if (hint_2 != NONEXISTANT_LOCALE)
+		{
+			key_y += iheight;
+			g_Font[SNeutrinoSettings::FONT_TYPE_MENU_INFO]->RenderString(x+ offset, key_y, width- 2*offset, g_Locale->getText(hint_2), COL_MENUCONTENT_TEXT);
+		}
+		key_y += offset;
+	}
+
+	for (int count = 0; count < inputSize; count++)
+		paintChar(count);
+
+	paintFooter();
+}
+
+void CKeyboardInput::paintChar(int pos)
+{
+	if (pos < (int) inputString->length())
+		paintChar(pos, inputString->at(pos));
+}
+
+void CKeyboardInput::paintChar(int pos, std::string &c)
+{
+	int xpos = x + offset + (width-iwidth)/2 + pos* input_w;
+	int ypos = y+ hheight+ offset;
+
+	fb_pixel_t color;
+	fb_pixel_t bgcolor;
+
+	if (pos == selected)
+	{
+		color   = COL_MENUCONTENTSELECTED_TEXT;
+		bgcolor = COL_MENUCONTENTSELECTED_PLUS_0;
+	}
+	else
+	{
+		color   = COL_MENUCONTENT_TEXT;
+		bgcolor = COL_MENUCONTENT_PLUS_0;
+	}
+
+	frameBuffer->paintBoxRel(xpos, ypos, input_w, input_h, COL_MENUCONTENT_PLUS_2);
+	frameBuffer->paintBoxRel(xpos+ 1, ypos+ 1, input_w- 2, input_h- 2, bgcolor);
+
+	int ch_w = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth(c);
+	int ch_x = xpos + std::max(input_w/2 - ch_w/2, 0);
+	g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(ch_x, ypos+ input_h, ch_w, c, color);
+}
+
+void CKeyboardInput::paintKeyboard()
+{
+	for (int i = 0; i < KEY_ROWS; i++) {
+		for (int j = 0; j < KEY_COLUMNS; j++)
+			paintKey(i, j);
+	}
+}
+
+void CKeyboardInput::paintKey(int row, int column)
+{
+	int xpos = x + offset + (width-kwidth)/2 + (key_w + KEY_BORDER)*column;
+	//int ypos = y + offset*2 + hheight + input_h + (key_h + KEY_BORDER)*row;
+	//key_y = y+ hheight+ offset+ input_h+ offset;
+	int ypos = key_y + (key_h + KEY_BORDER)*row;
+
+	fb_pixel_t color;
+	fb_pixel_t bgcolor;
+	if (focus == FOCUS_KEY && row == srow && column == scol) {
+		color   = COL_MENUCONTENTSELECTED_TEXT;
+		bgcolor = COL_MENUCONTENTSELECTED_PLUS_0;
+	} else {
+		color   = COL_MENUCONTENT_TEXT;
+		bgcolor = COL_MENUCONTENT_PLUS_0;
+	}
+
+	int radius = CORNER_RADIUS_SMALL;
+	frameBuffer->paintBoxRel(xpos, ypos, key_w, key_h, bgcolor, radius);
+	frameBuffer->paintBoxFrame(xpos, ypos, key_w, key_h, KEY_FRAME_WIDTH, COL_MENUCONTENT_PLUS_6, radius);
+
+	if (keyboard[row][column].empty())
+		return;
+
+	std::string &s = keyboard[row][column];
+	int ch_w = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getRenderWidth(s);
+	int ch_h = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
+	int ch_x = xpos + key_w/2 - ch_w/2;
+	int ch_y = ypos + key_h/2 + ch_h/2;
+	g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(ch_x, ch_y, ch_w, s, color);
+}
diff --git a/src/gui/widget/keyboard_input.h b/src/gui/widget/keyboard_input.h
new file mode 100644
index 000000000..45657d5dd
--- /dev/null
+++ b/src/gui/widget/keyboard_input.h
@@ -0,0 +1,136 @@
+/*
+	Neutrino-GUI  -   DBoxII-Project
+
+	Copyright (C) 2001 Steffen Hehn 'McClean'
+	Copyright (C) 2014 CoolStream International Ltd
+
+	License: GPLv2
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, version 2 of the License.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+
+#ifndef __keyboard_input__
+#define __keyboard_input__
+
+#include "menue.h"
+
+#include <driver/framebuffer.h>
+#include <system/localize.h>
+
+#include <string>
+
+#define KEY_ROWS 4
+#define KEY_COLUMNS 14
+
+struct keyboard_layout
+{
+        std::string name;
+        std::string locale;
+        std::string (*keys)[KEY_ROWS][KEY_COLUMNS];
+};
+
+class CInputString
+{
+	private:
+		size_t len;
+		std::vector<std::string> inputString;
+		std::string valueString;
+
+	public:
+		CInputString(int Size);
+		size_t length();
+		void clear();
+		std::string &at(size_t pos);
+		void assign(size_t n, char c);
+		const char* c_str();
+		CInputString & operator=(const std::string &str);
+		std::string &getValue();
+};
+
+class CKeyboardInput : public CMenuTarget
+{
+	protected:
+		CFrameBuffer	*frameBuffer;
+		int x;
+		int y;
+		int width;
+		int height;
+		int hheight; // head font height
+		int iheight; // input string height
+		int bheight; // body height
+		int fheight; // footer height
+		int input_h; // input field height
+		int input_w; // input field width
+		int iwidth;  // input width
+		int offset;
+		int key_y;
+
+		// keyboard
+		int key_w;   // keyboard key width
+		int key_h;   // keyboard key height
+		int kwidth;  // keyboard width
+		int srow, scol;
+		enum {
+			FOCUS_KEY,
+			FOCUS_STRING
+		};
+		int focus;
+		int caps;
+		struct keyboard_layout *layout;
+		std::string (*keyboard)[KEY_COLUMNS];
+		CInputString * inputString;
+
+		std::string  head;
+		neutrino_locale_t name;
+		neutrino_locale_t hint_1, hint_2;
+		std::string iconfile;
+		int          inputSize;
+		int          selected;
+		bool	     changed;
+		CChangeObserver * observ;
+
+		virtual void init();
+
+		virtual void paint();
+		virtual int  paintFooter(bool show = true);
+		virtual void paintChar(int pos, std::string &c);
+		virtual void paintChar(int pos);
+		virtual void paintKeyboard();
+		virtual void paintKey(int row, int column);
+
+		virtual void NormalKeyPressed();
+		virtual void clearString();
+		virtual void switchCaps();
+		virtual void keyUpPressed();
+		virtual void keyDownPressed();
+		virtual void keyLeftPressed();
+		virtual void keyRightPressed();
+		virtual void insertChar();
+		virtual void deleteChar();
+		virtual void keyBackspacePressed();
+		virtual void switchLayout();
+		virtual void setLayout();
+
+	public:
+		CKeyboardInput(const neutrino_locale_t Name, std::string* Value, int Size, CChangeObserver* Observ = NULL, const char * const Icon = NULL, const neutrino_locale_t Hint_1 = NONEXISTANT_LOCALE, const neutrino_locale_t Hint_2 = NONEXISTANT_LOCALE);
+		CKeyboardInput(const std::string      &Name, std::string* Value, int Size, CChangeObserver* Observ = NULL, const char * const Icon = NULL, const neutrino_locale_t Hint_1 = NONEXISTANT_LOCALE, const neutrino_locale_t Hint_2 = NONEXISTANT_LOCALE);
+		~CKeyboardInput();
+
+		void hide();
+		int exec( CMenuTarget* parent, const std::string & actionKey );
+		virtual std::string &getValue(void);
+};
+
+#endif
diff --git a/src/system/locals.h b/src/system/locals.h
index 0337282aa..4ba59ef14 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -2114,8 +2114,12 @@ typedef enum
 	LOCALE_STREAMING_OVERFLOW,
 	LOCALE_STREAMING_SLOW,
 	LOCALE_STREAMING_WRITE_ERROR,
+	LOCALE_STRINGINPUT_BACKSPACE,
 	LOCALE_STRINGINPUT_CAPS,
 	LOCALE_STRINGINPUT_CLEAR,
+	LOCALE_STRINGINPUT_INSERT,
+	LOCALE_STRINGINPUT_LAYOUT,
+	LOCALE_STRINGINPUT_SAVE,
 	LOCALE_SUBTITLES_CHARSET,
 	LOCALE_SUBTITLES_HEAD,
 	LOCALE_SUBTITLES_STOP,
diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h
index 1a2a5cbe8..76bf3d59b 100644
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -2114,8 +2114,12 @@ const char * locale_real_names[] =
 	"streaming.overflow",
 	"streaming.slow",
 	"streaming.write_error",
+	"stringinput.backspace",
 	"stringinput.caps",
 	"stringinput.clear",
+	"stringinput.insert",
+	"stringinput.layout",
+	"stringinput.save",
 	"subtitles.charset",
 	"subtitles.head",
 	"subtitles.stop",

From 549e110e145e32c2b8fad685ad4fd7c667bde196 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Wed, 19 Nov 2014 18:21:38 +0300
Subject: [PATCH 058/113] change most code to use CKeyboardInput in place of
 CStringInputSMS

---
 src/gui/audioplayer.cpp                  | 10 +++-------
 src/gui/bedit/bouqueteditor_bouquets.cpp |  3 ++-
 src/gui/eventlist.cpp                    |  3 ++-
 src/gui/keybind_setup.cpp                |  3 ++-
 src/gui/moviebrowser.cpp                 | 16 +++++++++-------
 src/gui/network_setup.cpp                |  9 +++++----
 src/gui/nfs.cpp                          | 13 ++++++-------
 src/gui/proxyserver_setup.cpp            |  7 ++++---
 src/gui/record_setup.cpp                 |  3 ++-
 src/gui/settings_manager.cpp             |  3 ++-
 src/gui/themes.cpp                       |  3 ++-
 src/gui/timerlist.cpp                    |  3 ++-
 src/gui/user_menue_setup.cpp             |  3 ++-
 13 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp
index e7058415b..caf99d898 100644
--- a/src/gui/audioplayer.cpp
+++ b/src/gui/audioplayer.cpp
@@ -64,6 +64,7 @@
 #include <gui/widget/hintbox.h>
 #include <gui/widget/stringinput.h>
 #include <gui/widget/stringinput_ext.h>
+#include <gui/widget/keyboard_input.h>
 
 #include "gui/pictureviewer.h"
 extern CPictureViewer * g_PicViewer;
@@ -2606,7 +2607,7 @@ void CAudioPlayerGui::savePlaylist()
 		absPlaylistDir += file->getFileName();
 
 		const int filenamesize = 30;
-		std::string filename;
+		std::string filename = "playlist";
 
 		if (file->getType() == CFile::FILE_PLAYLIST)
 		{
@@ -2623,12 +2624,7 @@ void CAudioPlayerGui::savePlaylist()
 		{
 			// query for filename
 			this->hide();
-			CStringInputSMS filenameInput(LOCALE_AUDIOPLAYER_PLAYLIST_NAME,
-						      &filename,
-						      filenamesize - 1,
-						      LOCALE_AUDIOPLAYER_PLAYLIST_NAME_HINT1,
-						      LOCALE_AUDIOPLAYER_PLAYLIST_NAME_HINT2,
-						      "abcdefghijklmnopqrstuvwxyz0123456789-.,:!?/ ");
+			CKeyboardInput filenameInput(LOCALE_AUDIOPLAYER_PLAYLIST_NAME, &filename, filenamesize - 1, NULL, NULL, LOCALE_AUDIOPLAYER_PLAYLIST_NAME_HINT1, LOCALE_AUDIOPLAYER_PLAYLIST_NAME_HINT2);
 			filenameInput.exec(NULL, "");
 			// refresh view
 			this->paint();
diff --git a/src/gui/bedit/bouqueteditor_bouquets.cpp b/src/gui/bedit/bouqueteditor_bouquets.cpp
index 728f1b688..f5f6111b5 100644
--- a/src/gui/bedit/bouqueteditor_bouquets.cpp
+++ b/src/gui/bedit/bouqueteditor_bouquets.cpp
@@ -45,6 +45,7 @@
 #include <gui/widget/hintbox.h>
 #include <gui/widget/messagebox.h>
 #include <gui/widget/stringinput.h>
+#include <gui/widget/keyboard_input.h>
 #include <zapit/client/zapittools.h>
 
 extern CBouquetManager *g_bouquetManager;
@@ -526,7 +527,7 @@ std::string CBEBouquetWidget::inputName(const char * const defaultName, const ne
 {
 	std::string Name = defaultName;
 
-	CStringInputSMS * nameInput = new CStringInputSMS(caption, &Name, 29, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789-.,:|!?/ ");
+	CKeyboardInput * nameInput = new CKeyboardInput(caption, &Name, 29);
 	nameInput->exec(this, "");
 	delete nameInput;
 
diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp
index e61d9632e..0f6a0e9a2 100644
--- a/src/gui/eventlist.cpp
+++ b/src/gui/eventlist.cpp
@@ -45,6 +45,7 @@
 #include "widget/buttons.h"
 #include "bouquetlist.h"
 #include <gui/widget/stringinput.h>
+#include <gui/widget/keyboard_input.h>
 
 #include <driver/screen_max.h>
 #include <driver/fade.h>
@@ -1356,7 +1357,7 @@ int CEventFinderMenu::showMenu(void)
 
 	int shortcut = 1;
 
-	CStringInputSMS stringInput(LOCALE_EVENTFINDER_KEYWORD,m_search_keyword, 20, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789 -_/()<>=+.,:!?\\'");
+	CKeyboardInput stringInput(LOCALE_EVENTFINDER_KEYWORD,m_search_keyword, 20);
 
 	CMenuForwarder* mf0	= new CMenuForwarder(LOCALE_EVENTFINDER_KEYWORD, true, *m_search_keyword, &stringInput, NULL, CRCInput::RC_red);
 	CMenuOptionChooser* mo0	= new CMenuOptionChooser(LOCALE_EVENTFINDER_SEARCH_WITHIN_LIST, m_search_list, SEARCH_LIST_OPTIONS, SEARCH_LIST_OPTION_COUNT, true, this, CRCInput::convertDigitToKey(shortcut++));
diff --git a/src/gui/keybind_setup.cpp b/src/gui/keybind_setup.cpp
index 90a6312b0..3806456c9 100644
--- a/src/gui/keybind_setup.cpp
+++ b/src/gui/keybind_setup.cpp
@@ -45,6 +45,7 @@
 #include <gui/widget/icons.h>
 #include <gui/widget/messagebox.h>
 #include <gui/widget/stringinput.h>
+#include <gui/widget/keyboard_input.h>
 
 #include <gui/filebrowser.h>
 
@@ -107,7 +108,7 @@ int CKeybindSetup::exec(CMenuTarget* parent, const std::string &actionKey)
 		fileBrowser.Dir_Mode = true;
 		if (fileBrowser.exec("/var/tuxbox") == true) {
 			std::string fname = "keys.conf";
-			CStringInputSMS * sms = new CStringInputSMS(LOCALE_EXTRA_SAVEKEYS, &fname, 30, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789. ");
+			CKeyboardInput * sms = new CKeyboardInput(LOCALE_EXTRA_SAVEKEYS, &fname, 30);
 			sms->exec(NULL, "");
 			std::string sname = fileBrowser.getSelectedFile()->Name + "/" + fname;
 			printf("[neutrino keybind_setup] save keys: %s\n", sname.c_str());
diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp
index 26cf94722..727bd42ee 100644
--- a/src/gui/moviebrowser.cpp
+++ b/src/gui/moviebrowser.cpp
@@ -52,6 +52,7 @@
 #include <gui/widget/messagebox.h>
 #include <gui/widget/stringinput.h>
 #include <gui/widget/stringinput_ext.h>
+#include <gui/widget/keyboard_input.h>
 #include <dirent.h>
 #include <sys/stat.h>
 #include <gui/nfs.h>
@@ -2675,7 +2676,7 @@ int CMovieBrowser::showMovieInfoMenu(MI_MOVIE_INFO* movie_info)
 
 	for (int li =0 ; li < MI_MOVIE_BOOK_USER_MAX && li < MAX_NUMBER_OF_BOOKMARK_ITEMS; li++)
 	{
-		CStringInputSMS *pBookNameInput =    new CStringInputSMS(LOCALE_MOVIEBROWSER_EDIT_BOOK, &movie_info->bookmarks.user[li].name, 20, LOCALE_MOVIEBROWSER_EDIT_BOOK_NAME_INFO1, LOCALE_MOVIEBROWSER_EDIT_BOOK_NAME_INFO2, "abcdefghijklmnopqrstuvwxyz0123456789-.: ");
+		CKeyboardInput * pBookNameInput = new CKeyboardInput(LOCALE_MOVIEBROWSER_EDIT_BOOK_NAME_INFO1, &movie_info->bookmarks.user[li].name, 20);
 		CIntInput *pBookPosIntInput =  new CIntInput(LOCALE_MOVIEBROWSER_EDIT_BOOK, (int *)&movie_info->bookmarks.user[li].pos, 20, LOCALE_MOVIEBROWSER_EDIT_BOOK_POS_INFO1, LOCALE_MOVIEBROWSER_EDIT_BOOK_POS_INFO2);
 		CIntInput *pBookTypeIntInput = new CIntInput(LOCALE_MOVIEBROWSER_EDIT_BOOK, (int *)&movie_info->bookmarks.user[li].length, 20, LOCALE_MOVIEBROWSER_EDIT_BOOK_TYPE_INFO1, LOCALE_MOVIEBROWSER_EDIT_BOOK_TYPE_INFO2);
 
@@ -2690,7 +2691,7 @@ int CMovieBrowser::showMovieInfoMenu(MI_MOVIE_INFO* movie_info)
 
 	/********************************************************************/
 	/**  serie******************************************************/
-	CStringInputSMS serieUserInput(LOCALE_MOVIEBROWSER_EDIT_SERIE, &movie_info->serieName, 20, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789-.: ");
+	CKeyboardInput serieUserInput(LOCALE_MOVIEBROWSER_EDIT_SERIE, &movie_info->serieName, 20);
 
 	CMenuWidget serieMenu(LOCALE_MOVIEBROWSER_HEAD, NEUTRINO_ICON_MOVIEPLAYER);
 	serieMenu.addIntroItems(LOCALE_MOVIEBROWSER_SERIE_HEAD);
@@ -2730,13 +2731,14 @@ int CMovieBrowser::showMovieInfoMenu(MI_MOVIE_INFO* movie_info)
 	strncpy(dirItNr, m_dirNames[movie_info->dirItNr].c_str(),BUFFER_SIZE-1);
 	snprintf(size,BUFFER_SIZE,"%5" PRIu64 "",movie_info->file.Size>>20);
 
-	CStringInputSMS titelUserInput(LOCALE_MOVIEBROWSER_INFO_TITLE,            &movie_info->epgTitle, (movie_info->epgTitle.empty() || (movie_info->epgTitle.size() < MAX_STRING)) ? MAX_STRING:movie_info->epgTitle.size(), NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789-.: ");
-	CStringInputSMS channelUserInput(LOCALE_MOVIEBROWSER_INFO_CHANNEL,        &movie_info->epgChannel, MAX_STRING, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789-.: ");
-	CStringInputSMS epgUserInput(LOCALE_MOVIEBROWSER_INFO_INFO1,              &movie_info->epgInfo1, 20, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789-.: ");
+	CKeyboardInput titelUserInput(LOCALE_MOVIEBROWSER_INFO_TITLE,            &movie_info->epgTitle, (movie_info->epgTitle.empty() || (movie_info->epgTitle.size() < MAX_STRING)) ? MAX_STRING:movie_info->epgTitle.size());
+	CKeyboardInput channelUserInput(LOCALE_MOVIEBROWSER_INFO_CHANNEL,      &movie_info->epgChannel, MAX_STRING);
+	CKeyboardInput epgUserInput(LOCALE_MOVIEBROWSER_INFO_INFO1,            &movie_info->epgInfo1, 20);
+	CKeyboardInput countryUserInput(LOCALE_MOVIEBROWSER_INFO_PRODCOUNTRY,  &movie_info->productionCountry, 11);
+
 	CDateInput   dateUserDateInput(LOCALE_MOVIEBROWSER_INFO_LENGTH,        &movie_info->dateOfLastPlay, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE);
 	CDateInput   recUserDateInput(LOCALE_MOVIEBROWSER_INFO_LENGTH,         &movie_info->file.Time, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE);
 	CIntInput    lengthUserIntInput(LOCALE_MOVIEBROWSER_INFO_LENGTH,       (int *)&movie_info->length, 3, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE);
-	CStringInputSMS countryUserInput(LOCALE_MOVIEBROWSER_INFO_PRODCOUNTRY,    &movie_info->productionCountry, 11, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "ABCDEFGHIJKLMNOPQRSTUVWXYZ ");
 	CIntInput    yearUserIntInput(LOCALE_MOVIEBROWSER_INFO_PRODYEAR,       (int *)&movie_info->productionDate, 4, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE);
 
 	CMenuWidget movieInfoMenu(LOCALE_MOVIEBROWSER_HEAD, NEUTRINO_ICON_MOVIEPLAYER);
@@ -3469,7 +3471,7 @@ bool CMovieBrowser::showYTMenu()
 	mainMenu.addItem(GenericMenuSeparatorLine);
 
 	std::string search = m_settings.ytsearch;
-	CStringInputSMS stringInput(LOCALE_MOVIEBROWSER_YT_SEARCH, &search, 20, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789 -_/()<>=+.,:!?\\'");
+	CKeyboardInput stringInput(LOCALE_MOVIEBROWSER_YT_SEARCH, &search, 20);
 	mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_YT_SEARCH, true, search, &stringInput, NULL, CRCInput::RC_green));
 	mainMenu.addItem(new CMenuOptionChooser(LOCALE_MOVIEBROWSER_YT_ORDERBY, &m_settings.ytorderby, YT_ORDERBY_OPTIONS, YT_ORDERBY_OPTION_COUNT, true, NULL, CRCInput::RC_nokey, "", true));
 	sprintf(cnt, "%d", cYTFeedParser::SEARCH);
diff --git a/src/gui/network_setup.cpp b/src/gui/network_setup.cpp
index f6c6718f3..fc77ad5a6 100644
--- a/src/gui/network_setup.cpp
+++ b/src/gui/network_setup.cpp
@@ -41,6 +41,7 @@
 #include <gui/widget/icons.h>
 #include <gui/widget/stringinput.h>
 #include <gui/widget/stringinput_ext.h>
+#include <gui/widget/keyboard_input.h>
 #include <gui/widget/hintbox.h>
 #include <gui/widget/messagebox.h>
 
@@ -243,7 +244,7 @@ int CNetworkSetup::showNetworkSetup()
 	CIPInput networkSettings_NameServer(LOCALE_NETWORKMENU_NAMESERVER, &network_nameserver, LOCALE_IPSETUP_HINT_1, LOCALE_IPSETUP_HINT_2);
 
 	//hostname
-	CStringInputSMS networkSettings_Hostname(LOCALE_NETWORKMENU_HOSTNAME, &network_hostname, 30, LOCALE_NETWORKMENU_HOSTNAME_HINT1, LOCALE_NETWORKMENU_HOSTNAME_HINT2, "abcdefghijklmnopqrstuvwxyz0123456789-. ");
+	CKeyboardInput networkSettings_Hostname(LOCALE_NETWORKMENU_HOSTNAME, &network_hostname, 30, NULL, NULL, LOCALE_NETWORKMENU_HOSTNAME_HINT1, LOCALE_NETWORKMENU_HOSTNAME_HINT2);
 
 	//auto start
 	CMenuOptionChooser* o1 = new CMenuOptionChooser(LOCALE_NETWORKMENU_SETUPONSTARTUP, &network_automatic_start, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
@@ -300,9 +301,9 @@ int CNetworkSetup::showNetworkSetup()
 	if(ifcount > 1) // if there is only one, its probably wired
 	{
 		//ssid
-		CStringInputSMS * networkSettings_ssid = new CStringInputSMS(LOCALE_NETWORKMENU_SSID, &network_ssid, 30, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789 -_/()<>=+.,:!?\\'");
+		CKeyboardInput * networkSettings_ssid = new CKeyboardInput(LOCALE_NETWORKMENU_SSID, &network_ssid, 30);
 		//key
-		CStringInputSMS * networkSettings_key = new CStringInputSMS(LOCALE_NETWORKMENU_PASSWORD, &network_key, 30, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789-.! ");
+		CKeyboardInput * networkSettings_key = new CKeyboardInput(LOCALE_NETWORKMENU_PASSWORD, &network_key, 30);
 		CMenuForwarder *m9 = new CMenuDForwarder(LOCALE_NETWORKMENU_SSID      , networkConfig->wireless, network_ssid , networkSettings_ssid );
 		CMenuForwarder *m10 = new CMenuDForwarder(LOCALE_NETWORKMENU_PASSWORD , networkConfig->wireless, network_key , networkSettings_key );
 		CMenuForwarder *m11 = new CMenuForwarder(LOCALE_NETWORKMENU_SSID_SCAN , networkConfig->wireless, NULL, this, "scanssid");
@@ -391,7 +392,7 @@ int CNetworkSetup::showNetworkSetup()
 void CNetworkSetup::showNetworkNTPSetup(CMenuWidget *menu_ntp)
 {
 	//prepare ntp input
-	CStringInputSMS * networkSettings_NtpServer = new CStringInputSMS(LOCALE_NETWORKMENU_NTPSERVER, &g_settings.network_ntpserver, 30, LOCALE_NETWORKMENU_NTPSERVER_HINT1, LOCALE_NETWORKMENU_NTPSERVER_HINT2, "abcdefghijklmnopqrstuvwxyz0123456789-. ", sectionsdConfigNotifier);
+	CKeyboardInput * networkSettings_NtpServer = new CKeyboardInput(LOCALE_NETWORKMENU_NTPSERVER, &g_settings.network_ntpserver, 30, sectionsdConfigNotifier, NULL, LOCALE_NETWORKMENU_NTPSERVER_HINT1, LOCALE_NETWORKMENU_NTPSERVER_HINT2);
 
 	CStringInput * networkSettings_NtpRefresh = new CStringInput(LOCALE_NETWORKMENU_NTPREFRESH, &g_settings.network_ntprefresh, 3,LOCALE_NETWORKMENU_NTPREFRESH_HINT1, LOCALE_NETWORKMENU_NTPREFRESH_HINT2 , "0123456789 ", sectionsdConfigNotifier);
 
diff --git a/src/gui/nfs.cpp b/src/gui/nfs.cpp
index 986d3fc41..20daf6fb8 100644
--- a/src/gui/nfs.cpp
+++ b/src/gui/nfs.cpp
@@ -41,6 +41,7 @@
 #include <gui/widget/hintbox.h>
 #include <gui/widget/stringinput.h>
 #include <gui/widget/stringinput_ext.h>
+#include <gui/widget/keyboard_input.h>
 #include <driver/screen_max.h>
 
 #include <fstream>
@@ -249,23 +250,21 @@ int CNFSMountGui::menuEntry(int nr)
 	CMenuWidget mountMenuEntryW(LOCALE_NFS_MOUNT, NEUTRINO_ICON_NETWORK, width);
 	mountMenuEntryW.addIntroItems();
 
-	const char * const validkeys = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_.,:|!?/ ";
-
 	CIPInput ipInput(LOCALE_NFS_IP, &g_settings.network_nfs[nr].ip, LOCALE_IPSETUP_HINT_1, LOCALE_IPSETUP_HINT_2);
-	CStringInputSMS dirInput(LOCALE_NFS_DIR, &g_settings.network_nfs[nr].dir, 30, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, validkeys);
+	CKeyboardInput dirInput(LOCALE_NFS_DIR, &g_settings.network_nfs[nr].dir, 30);
 
 	CMenuOptionChooser *automountInput= new CMenuOptionChooser(LOCALE_NFS_AUTOMOUNT, &g_settings.network_nfs[nr].automount, MESSAGEBOX_NO_YES_OPTIONS, MESSAGEBOX_NO_YES_OPTION_COUNT, true);
 
-	CStringInputSMS options1Input(LOCALE_NFS_MOUNT_OPTIONS, &g_settings.network_nfs[nr].mount_options1, 30, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, validkeys);
+	CKeyboardInput options1Input(LOCALE_NFS_MOUNT_OPTIONS, &g_settings.network_nfs[nr].mount_options1, 30);
 	CMenuForwarder *options1_fwd = new CMenuForwarder(LOCALE_NFS_MOUNT_OPTIONS, true, NULL, &options1Input);
 
-	CStringInputSMS options2Input(LOCALE_NFS_MOUNT_OPTIONS, &g_settings.network_nfs[nr].mount_options2, 30, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, validkeys);
+	CKeyboardInput options2Input(LOCALE_NFS_MOUNT_OPTIONS, &g_settings.network_nfs[nr].mount_options2, 30);
 	CMenuForwarder *options2_fwd = new CMenuForwarder(LOCALE_NFS_MOUNT_OPTIONS, true, NULL, &options2Input);
 
-	CStringInputSMS userInput(LOCALE_NFS_USERNAME, &g_settings.network_nfs[nr].username, 30, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, validkeys);
+	CKeyboardInput userInput(LOCALE_NFS_USERNAME, &g_settings.network_nfs[nr].username, 30);
 	CMenuForwarder *username_fwd = new CMenuForwarder(LOCALE_NFS_USERNAME, (g_settings.network_nfs[nr].type != (int)CFSMounter::NFS), NULL, &userInput);
 
-	CStringInputSMS passInput(LOCALE_NFS_PASSWORD, &g_settings.network_nfs[nr].password, 30, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, validkeys);
+	CKeyboardInput passInput(LOCALE_NFS_PASSWORD, &g_settings.network_nfs[nr].password, 30);
 	CMenuForwarder *password_fwd = new CMenuForwarder(LOCALE_NFS_PASSWORD, (g_settings.network_nfs[nr].type != (int)CFSMounter::NFS), NULL, &passInput);
 
 	CMACInput macInput(LOCALE_RECORDINGMENU_SERVER_MAC, &g_settings.network_nfs[nr].mac, LOCALE_IPSETUP_HINT_1, LOCALE_IPSETUP_HINT_2);
diff --git a/src/gui/proxyserver_setup.cpp b/src/gui/proxyserver_setup.cpp
index c4755d86b..846bd9bc0 100644
--- a/src/gui/proxyserver_setup.cpp
+++ b/src/gui/proxyserver_setup.cpp
@@ -39,6 +39,7 @@
 #include <neutrino_menue.h>
 
 #include <gui/widget/stringinput.h>
+#include <gui/widget/keyboard_input.h>
 
 #include <driver/screen_max.h>
 #include <system/debug.h>
@@ -80,17 +81,17 @@ int CProxySetup::showProxySetup()
 	neutrino_locale_t subtitle = (menue_title == LOCALE_FLASHUPDATE_PROXYSERVER_SEP ? NONEXISTANT_LOCALE : LOCALE_FLASHUPDATE_PROXYSERVER_SEP);
 	mn->addIntroItems(subtitle);
 
-	CStringInputSMS softUpdate_proxy(LOCALE_FLASHUPDATE_PROXYSERVER, &g_settings.softupdate_proxyserver, 23, LOCALE_FLASHUPDATE_PROXYSERVER_HINT1, LOCALE_FLASHUPDATE_PROXYSERVER_HINT2, "abcdefghijklmnopqrstuvwxyz0123456789-.: ");
+	CKeyboardInput softUpdate_proxy(LOCALE_FLASHUPDATE_PROXYSERVER, &g_settings.softupdate_proxyserver, 23, NULL, NULL, LOCALE_FLASHUPDATE_PROXYSERVER_HINT1, LOCALE_FLASHUPDATE_PROXYSERVER_HINT2);
 	CMenuForwarder * mf = new CMenuForwarder(LOCALE_FLASHUPDATE_PROXYSERVER, true, g_settings.softupdate_proxyserver, &softUpdate_proxy, NULL, CRCInput::RC_red);
 	mf->setHint("", LOCALE_MENU_HINT_NET_PROXYSERVER);
 	mn->addItem(mf);
 
-	CStringInputSMS softUpdate_proxyuser(LOCALE_FLASHUPDATE_PROXYUSERNAME, &g_settings.softupdate_proxyusername, 23, LOCALE_FLASHUPDATE_PROXYUSERNAME_HINT1, LOCALE_FLASHUPDATE_PROXYUSERNAME_HINT2, "abcdefghijklmnopqrstuvwxyz0123456789!""§$%&/()=?-. ");
+	CKeyboardInput softUpdate_proxyuser(LOCALE_FLASHUPDATE_PROXYUSERNAME, &g_settings.softupdate_proxyusername, 23, NULL, NULL, LOCALE_FLASHUPDATE_PROXYUSERNAME_HINT1, LOCALE_FLASHUPDATE_PROXYUSERNAME_HINT2);
 	mf = new CMenuForwarder(LOCALE_FLASHUPDATE_PROXYUSERNAME, true, g_settings.softupdate_proxyusername, &softUpdate_proxyuser, NULL, CRCInput::RC_green);
 	mf->setHint("", LOCALE_MENU_HINT_NET_PROXYUSER);
 	mn->addItem(mf);
 
-	CStringInputSMS softUpdate_proxypass(LOCALE_FLASHUPDATE_PROXYPASSWORD, &g_settings.softupdate_proxypassword, 20, LOCALE_FLASHUPDATE_PROXYPASSWORD_HINT1, LOCALE_FLASHUPDATE_PROXYPASSWORD_HINT2, "abcdefghijklmnopqrstuvwxyz0123456789!""§$%&/()=?-. ");
+	CKeyboardInput softUpdate_proxypass(LOCALE_FLASHUPDATE_PROXYPASSWORD, &g_settings.softupdate_proxypassword, 20, NULL, NULL, LOCALE_FLASHUPDATE_PROXYPASSWORD_HINT1, LOCALE_FLASHUPDATE_PROXYPASSWORD_HINT2);
 	mf = new CMenuForwarder(LOCALE_FLASHUPDATE_PROXYPASSWORD, true, g_settings.softupdate_proxypassword, &softUpdate_proxypass, NULL, CRCInput::RC_yellow);
 	mf->setHint("", LOCALE_MENU_HINT_NET_PROXYPASS);
 	mn->addItem(mf);
diff --git a/src/gui/record_setup.cpp b/src/gui/record_setup.cpp
index bd9dfe196..81e092a8e 100644
--- a/src/gui/record_setup.cpp
+++ b/src/gui/record_setup.cpp
@@ -46,6 +46,7 @@
 #include <gui/widget/messagebox.h>
 #include <gui/widget/stringinput.h>
 #include <gui/widget/stringinput_ext.h>
+#include <gui/widget/keyboard_input.h>
 
 #include <timerdclient/timerdclient.h>
 
@@ -243,7 +244,7 @@ int CRecordSetup::showRecordSetup()
 	}
 
 	//filename template
-	CStringInputSMS* filename_template = new CStringInputSMS(LOCALE_RECORDINGMENU_FILENAME_TEMPLATE, &g_settings.recording_filename_template, 21, LOCALE_RECORDINGMENU_FILENAME_TEMPLATE_HINT, LOCALE_RECORDINGMENU_FILENAME_TEMPLATE_HINT2, "%/-_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 ");
+	CKeyboardInput* filename_template = new CKeyboardInput(LOCALE_RECORDINGMENU_FILENAME_TEMPLATE, &g_settings.recording_filename_template, 21, NULL, NULL, LOCALE_RECORDINGMENU_FILENAME_TEMPLATE_HINT, LOCALE_RECORDINGMENU_FILENAME_TEMPLATE_HINT2);
 	CMenuForwarder* ft = new CMenuDForwarder(LOCALE_RECORDINGMENU_FILENAME_TEMPLATE, true, g_settings.recording_filename_template, filename_template, NULL, CRCInput::RC_1);
 	ft->setHint("", LOCALE_MENU_HINT_RECORD_FILENAME_TEMPLATE);
 	recordingSettings->addItem(ft);
diff --git a/src/gui/settings_manager.cpp b/src/gui/settings_manager.cpp
index 04febad42..aa2c5d845 100644
--- a/src/gui/settings_manager.cpp
+++ b/src/gui/settings_manager.cpp
@@ -38,6 +38,7 @@
 #include <gui/filebrowser.h>
 #include <gui/widget/messagebox.h>
 #include <gui/widget/stringinput.h>
+#include <gui/widget/keyboard_input.h>
 
 #include <driver/screen_max.h>
 #include <system/helpers.h>
@@ -89,7 +90,7 @@ int CSettingsManager::exec(CMenuTarget* parent, const std::string &actionKey)
 		if (fileBrowser.exec("/var/tuxbox") == true)
 		{
 			std::string fname = "neutrino.conf";
-			CStringInputSMS * sms = new CStringInputSMS(LOCALE_EXTRA_SAVECONFIG, &fname, 30, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789. ");
+			CKeyboardInput * sms = new CKeyboardInput(LOCALE_EXTRA_SAVECONFIG, &fname, 30);
 			sms->exec(NULL, "");
 
 			std::string sname = fileBrowser.getSelectedFile()->Name + "/" + fname;
diff --git a/src/gui/themes.cpp b/src/gui/themes.cpp
index 2d6cb3351..a8e96d31e 100644
--- a/src/gui/themes.cpp
+++ b/src/gui/themes.cpp
@@ -41,6 +41,7 @@
 #include <system/setting_helpers.h>
 #include <gui/widget/stringinput.h>
 #include <gui/widget/stringinput_ext.h>
+#include <gui/widget/keyboard_input.h>
 #include <gui/widget/messagebox.h>
 #include <driver/screen_max.h>
 
@@ -156,7 +157,7 @@ int CThemes::Show()
 	
 	readThemes(themes);
 
-	CStringInputSMS nameInput(LOCALE_COLORTHEMEMENU_NAME, &file_name, 30, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789- ");
+	CKeyboardInput nameInput(LOCALE_COLORTHEMEMENU_NAME, &file_name, 30);
 	CMenuForwarder *m1 = new CMenuForwarder(LOCALE_COLORTHEMEMENU_SAVE, true , NULL, &nameInput, NULL, CRCInput::RC_green);
 
 	if (mkdirhier(USERDIR) && errno != EEXIST) {
diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp
index 51cd30bcb..e9b5af7b3 100644
--- a/src/gui/timerlist.cpp
+++ b/src/gui/timerlist.cpp
@@ -62,6 +62,7 @@
 #include <gui/widget/messagebox.h>
 #include <gui/widget/stringinput.h>
 #include <gui/widget/stringinput_ext.h>
+#include <gui/widget/keyboard_input.h>
 
 #include <system/settings.h>
 #include <system/fsmounter.h>
@@ -1223,7 +1224,7 @@ int CTimerList::newTimer()
 	CMenuOptionChooser* m8 = new CMenuOptionChooser(LOCALE_TIMERLIST_STANDBY, &timerNew_standby_on, TIMERLIST_STANDBY_OPTIONS, TIMERLIST_STANDBY_OPTION_COUNT, false);
 
 	timerNew_message = std::string(timerNew.message);
-	CStringInputSMS timerSettings_msg(LOCALE_TIMERLIST_MESSAGE, &timerNew_message, 30, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789-.,:!?/ ");
+	CKeyboardInput timerSettings_msg(LOCALE_TIMERLIST_MESSAGE, &timerNew_message, 30);
 	CMenuForwarder *m9 = new CMenuForwarder(LOCALE_TIMERLIST_MESSAGE, false, timerNew_message, &timerSettings_msg );
 
 	timerNew_pluginName = "---";
diff --git a/src/gui/user_menue_setup.cpp b/src/gui/user_menue_setup.cpp
index 09f2b6833..5f7a5e2be 100644
--- a/src/gui/user_menue_setup.cpp
+++ b/src/gui/user_menue_setup.cpp
@@ -42,6 +42,7 @@
 #include <gui/plugins.h>
 #include <gui/widget/icons.h>
 #include <gui/widget/stringinput.h>
+#include <gui/widget/keyboard_input.h>
 #include <gui/widget/keychooser.h>
 #include <gui/widget/messagebox.h>
 
@@ -207,7 +208,7 @@ int CUserMenuSetup::showSetup()
 	ums->addIntroItems();
 
 	int old_key = g_settings.usermenu[button]->key;
-	CStringInputSMS name(LOCALE_USERMENU_NAME, &g_settings.usermenu[button]->title, 20, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzäöüß/- "/*, notify*/);
+	CKeyboardInput name(LOCALE_USERMENU_NAME, &g_settings.usermenu[button]->title, 20);
 	CMenuForwarder * mf = new CMenuForwarder(LOCALE_USERMENU_NAME, true, NULL, &name);
 
 	ums->addItem(mf);

From 30c5e7b900b4e862dc9736fc1197098cdaa81012 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Thu, 20 Nov 2014 11:05:38 +0100
Subject: [PATCH 059/113] - keyboard_input: align keys_deutsch table to german
 keyboards

---
 src/gui/widget/keyboard_input.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/gui/widget/keyboard_input.cpp b/src/gui/widget/keyboard_input.cpp
index d58759126..640a4615e 100644
--- a/src/gui/widget/keyboard_input.cpp
+++ b/src/gui/widget/keyboard_input.cpp
@@ -60,16 +60,16 @@ static std::string keys_english[2][KEY_ROWS][KEY_COLUMNS] =
 static std::string keys_deutsch[2][KEY_ROWS][KEY_COLUMNS] =
 {
 	{
-		{ "`", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0",  "ß",  "=", "§"  },
-		{ "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "ü",  "\'", "[", "]"  },
-		{ "a", "s", "d", "f", "g", "h", "j", "k", "l", "ö", "ä",  "\\", ";", "\"" },
-		{ "z", "x", "c", "v", "b", "n", "m", ",", ".", "/", "<",  ">",  "?", " "  }
+		{ "°", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "ß", "´", "@" },
+		{ "q", "w", "e", "r", "t", "z", "u", "i", "o", "p", "ü", "+", "~", "/" },
+		{ "a", "s", "d", "f", "g", "h", "j", "k", "l", "ö", "ä", "#", "[", "]" },
+		{ "y", "x", "c", "v", "b", "n", "m", ",", ".", "-", "|", "<", ">", " " }
 	},
 	{
-		{ "~", "!", "@", "#", "$", "%", "^", "&", "*", "(", ")", "_",  "+",  "§", },
-		{ "Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", "Ü",  "-",  "{", "}"  },
-		{ "A", "S", "D", "F", "G", "H", "J", "K", "L", "Ö", "Ä'", "\\", ":", "\"" },
-		{ "Z", "X", "C", "V", "B", "N", "M", ",", ".", "/", "<",  ">",  "?", " "  }
+		{ "^", "!", "\"","§", "$", "%", "&", "/", "(", ")", "=", "?", "`", "€" },
+		{ "Q", "W", "E", "R", "T", "Z", "U", "I", "O", "P", "Ü", "*", "\\","/" },
+		{ "A", "S", "D", "F", "G", "H", "J", "K", "L", "Ö", "Ä", "\'","{", "}" },
+		{ "Y", "X", "C", "V", "B", "N", "M", ";", ":", "_", "²", "³", "µ", " " }
 	}
 };
 

From 156b515155bb8288f7f25b6aa6d40c5f77071e95 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Thu, 20 Nov 2014 14:25:48 +0300
Subject: [PATCH 060/113] gui/network_setup.cpp: fix crash on settings restore,
 if no wlan present

---
 src/gui/network_setup.cpp | 27 ++++++++++++---------------
 src/gui/network_setup.h   |  4 ++--
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/gui/network_setup.cpp b/src/gui/network_setup.cpp
index fc77ad5a6..53c23b23a 100644
--- a/src/gui/network_setup.cpp
+++ b/src/gui/network_setup.cpp
@@ -267,11 +267,11 @@ int CNetworkSetup::showNetworkSetup()
 	m5->setHint("", LOCALE_MENU_HINT_NET_NAMESERVER);
 	m8->setHint("", LOCALE_MENU_HINT_NET_HOSTNAME);
 
-	dhcpDisable[0] = m1;
-	dhcpDisable[1] = m2;
-	dhcpDisable[2] = m3;
-	dhcpDisable[3] = m4;
-	dhcpDisable[4] = m5;
+	dhcpDisable.Add(m1);
+	dhcpDisable.Add(m2);
+	dhcpDisable.Add(m3);
+	dhcpDisable.Add(m4);
+	dhcpDisable.Add(m5);
 
 	CMenuOptionChooser* o2 = new CMenuOptionChooser(LOCALE_NETWORKMENU_DHCP, &network_dhcp, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this);
 	o2->setHint("", LOCALE_MENU_HINT_NET_DHCP);
@@ -312,9 +312,9 @@ int CNetworkSetup::showNetworkSetup()
 		m10->setHint("", LOCALE_MENU_HINT_NET_PASS);
 		m11->setHint("", LOCALE_MENU_HINT_NET_SSID_SCAN);
 
-		wlanEnable[0] = m9;
-		wlanEnable[1] = m10;
-		wlanEnable[2] = m11;
+		wlanEnable.Add(m9);
+		wlanEnable.Add(m10);
+		wlanEnable.Add(m11);
 
 		networkSettings->addItem( m11);	//ssid scan
 		networkSettings->addItem( m9);	//ssid
@@ -384,6 +384,8 @@ int CNetworkSetup::showNetworkSetup()
 			break;
 	}
 
+	dhcpDisable.Clear();
+	wlanEnable.Clear();
 	delete networkSettings;
 	delete sectionsdConfigNotifier;
 	return ret;
@@ -655,15 +657,10 @@ bool CNetworkSetup::changeNotify(const neutrino_locale_t locale, void * Data)
 
 		changeNotify(LOCALE_NETWORKMENU_DHCP, &CNetworkConfig::getInstance()->inet_static);
 
-		int ecnt = sizeof(wlanEnable) / sizeof(CMenuForwarder*);
-		for(int i = 0; i < ecnt; i++)
-			wlanEnable[i]->setActive(CNetworkConfig::getInstance()->wireless);
+		wlanEnable.Activate(CNetworkConfig::getInstance()->wireless);
 	} else if(locale == LOCALE_NETWORKMENU_DHCP) {
 		CNetworkConfig::getInstance()->inet_static = (network_dhcp == NETWORK_DHCP_OFF);
-		int ecnt = sizeof(dhcpDisable) / sizeof(CMenuForwarder*);
-
-		for(int i = 0; i < ecnt; i++)
-			dhcpDisable[i]->setActive(CNetworkConfig::getInstance()->inet_static);
+		dhcpDisable.Activate(CNetworkConfig::getInstance()->inet_static);
 	}
 	return false;
 }
diff --git a/src/gui/network_setup.h b/src/gui/network_setup.h
index 993c7c86e..9a662ec28 100644
--- a/src/gui/network_setup.h
+++ b/src/gui/network_setup.h
@@ -74,8 +74,8 @@ class CNetworkSetup : public CMenuTarget, CChangeObserver
 		std::string old_mac_addr;
 
 
-		CMenuForwarder* dhcpDisable[5];
-		CMenuForwarder* wlanEnable[3];
+		CGenericMenuActivate dhcpDisable;
+		CGenericMenuActivate wlanEnable;
 
 		CSectionsdConfigNotifier* sectionsdConfigNotifier;
 			

From 3958428dd769b94c2573a2111dd076eb1f6fbf60 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Thu, 20 Nov 2014 14:36:14 +0300
Subject: [PATCH 061/113] gui/widget/keyboard_input.cpp: fix cycle on dialog
 after timeout

---
 src/gui/widget/keyboard_input.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gui/widget/keyboard_input.cpp b/src/gui/widget/keyboard_input.cpp
index 640a4615e..af2280334 100644
--- a/src/gui/widget/keyboard_input.cpp
+++ b/src/gui/widget/keyboard_input.cpp
@@ -565,8 +565,10 @@ int CKeyboardInput::exec(CMenuTarget* parent, const std::string &)
 		else if ((msg == CRCInput::RC_home) || (msg == CRCInput::RC_timeout))
 		{
 			if ((inputString->getValue() != oldval) &&
-					(ShowMsg(name, LOCALE_MESSAGEBOX_DISCARD, CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbCancel) == CMessageBox::mbrCancel))
+					(ShowMsg(name, LOCALE_MESSAGEBOX_DISCARD, CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbCancel) == CMessageBox::mbrCancel)) {
+				timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
 				continue;
+			}
 
 			*inputString = oldval;
 			loop = false;

From 055fc0a187eb4fe696eadfc116baabbfec8388ae Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Thu, 20 Nov 2014 14:36:47 +0300
Subject: [PATCH 062/113] gui/widget/stringinput.cpp: fix cycle on dialog after
 timeout

---
 src/gui/widget/stringinput.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gui/widget/stringinput.cpp b/src/gui/widget/stringinput.cpp
index 584483e80..4020f6fea 100644
--- a/src/gui/widget/stringinput.cpp
+++ b/src/gui/widget/stringinput.cpp
@@ -485,8 +485,10 @@ int CStringInput::exec( CMenuTarget* parent, const std::string & )
 		else if ( (msg==CRCInput::RC_home) || (msg==CRCInput::RC_timeout) )
 		{
 			if ((*valueString != oldval) &&
-			     (ShowMsg(name, LOCALE_MESSAGEBOX_DISCARD, CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbCancel) == CMessageBox::mbrCancel))
+			     (ShowMsg(name, LOCALE_MESSAGEBOX_DISCARD, CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbCancel) == CMessageBox::mbrCancel)) {
+				timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
 				continue;
+			}
 
 			*valueString = oldval;
 			loop=false;

From a63acf6306896332eb6aca00da5608eae4eb822c Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Thu, 20 Nov 2014 14:37:17 +0300
Subject: [PATCH 063/113] gui/widget/stringinput_ext.cpp: fix cycle on dialog
 after timeout

---
 src/gui/widget/stringinput_ext.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/gui/widget/stringinput_ext.cpp b/src/gui/widget/stringinput_ext.cpp
index 296a265eb..803cc4843 100644
--- a/src/gui/widget/stringinput_ext.cpp
+++ b/src/gui/widget/stringinput_ext.cpp
@@ -248,6 +248,7 @@ int CExtendedInput::exec( CMenuTarget* parent, const std::string & )
 						 *cancel = false;
 				 }
 				 else if(erg==CMessageBox::mbrCancel){
+					 timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
 				 }
 			} else {
 				//keine �nderungen - beenden ok

From 238ea8ccbdc738cd6e20d2079b74866a762ab453 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Thu, 20 Nov 2014 14:40:19 +0300
Subject: [PATCH 064/113] neutrino.cpp: fix webtv_usr.xml check for adding by
 default

---
 src/neutrino.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 8011608fc..0fcf9c9bb 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -641,7 +641,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
 		}
 	} else {
 		std::string webtv_xml = configfile.getString("webtv_xml", WEBTV_XML);
-		if (!file_size(webtv_xml.c_str()))
+		if (file_size(webtv_xml.c_str()))
 			g_settings.webtv_xml.push_back(webtv_xml);
 	}
 

From 0de74c514ec22b741a186b84afcdc1a6d10b763b Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Thu, 20 Nov 2014 14:46:21 +0100
Subject: [PATCH 065/113] - deutsch.locale: upgrade; shorten stringinput.caps

---
 data/locale/deutsch.locale | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index db4093318..6a3cb1897 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -2087,8 +2087,11 @@ streaming.dir_not_writable Das Aufnahmeverzeichnis ist nicht beschreibbar.\nAufn
 streaming.overflow Aufnahme-Puffer Überlauf! Bitte ggf. einige Aufnahmen beenden.
 streaming.slow System oder Datenträger zu langsam! Bitte ggf. einige Aufnahmen beenden.
 streaming.write_error Die Aufnahme wurde leider abgebrochen,\nda ein Fehler beim Schreiben der Daten auftrat.
-stringinput.caps Groß-/Kleinbuchstaben
+stringinput.backspace Rücklöschen
+stringinput.caps Groß / Klein
 stringinput.clear Alles löschen
+stringinput.insert Einfügen
+stringinput.save Speichern
 subtitles.charset Zeichensatz
 subtitles.head Untertitel
 subtitles.stop Untertitel aus

From 2a16b738858e01d3395fa6f40c666e24e7479b28 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Thu, 20 Nov 2014 16:17:20 +0100
Subject: [PATCH 066/113] - eventlist: add back button to search menu;

  move "start search" near top
---
 src/gui/eventlist.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp
index 0f6a0e9a2..292557a22 100644
--- a/src/gui/eventlist.cpp
+++ b/src/gui/eventlist.cpp
@@ -1369,17 +1369,17 @@ int CEventFinderMenu::showMenu(void)
 
 	CMenuForwarder* mf2	= new CMenuForwarder(LOCALE_EVENTFINDER_HISTORY, true, NULL, this, "#history", CRCInput::RC_yellow);
 	CMenuOptionNumberChooser* moc1 = new CMenuOptionNumberChooser(LOCALE_EVENTFINDER_MAX_HISTORY, &g_settings.epg_search_history_max, true, 0, 50, NULL);
-	searchMenu.addItem(GenericMenuSeparatorLine);
 
 	searchMenu.addItem(GenericMenuSeparator);
+	searchMenu.addItem(GenericMenuBack);
+	searchMenu.addItem(GenericMenuSeparatorLine);
 	searchMenu.addItem(mf0);
+	searchMenu.addItem(mf1);
 	searchMenu.addItem(GenericMenuSeparatorLine);
 	searchMenu.addItem(mo0);
 	searchMenu.addItem(m_search_channelname_mf);
 	searchMenu.addItem(mo1);
 	searchMenu.addItem(GenericMenuSeparatorLine);
-	searchMenu.addItem(mf1);
-	searchMenu.addItem(GenericMenuSeparatorLine);
 	searchMenu.addItem(mf2);
 	searchMenu.addItem(moc1);
 

From 9945d0348039b2ec5e7927b7e91ce8ac251c97ed Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Sat, 22 Nov 2014 15:42:48 +0100
Subject: [PATCH 067/113] - menue: allow icon-only menu hints

---
 src/gui/widget/menue.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp
index 8d0303fbc..ac08137cc 100644
--- a/src/gui/widget/menue.cpp
+++ b/src/gui/widget/menue.cpp
@@ -1326,7 +1326,7 @@ void CMenuWidget::paintHint(int pos)
 	}
 	
 	if (item->hint == NONEXISTANT_LOCALE && item->hintText.empty())
-		return;
+		item->hintText = " ";
 	
 	int iheight = item->getHeight();
 	int rad = RADIUS_LARGE;

From b727ea4be82bc30cd6f0961ef2dc8f9a94c4f880 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Sat, 22 Nov 2014 15:53:47 +0100
Subject: [PATCH 068/113] - keyboard_input: auto calculate size of input-field
 ...

  ... if size is 0 or not given.
---
 src/gui/widget/keyboard_input.cpp | 16 ++++++++++++----
 src/gui/widget/keyboard_input.h   |  4 ++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/gui/widget/keyboard_input.cpp b/src/gui/widget/keyboard_input.cpp
index af2280334..2310ef6c4 100644
--- a/src/gui/widget/keyboard_input.cpp
+++ b/src/gui/widget/keyboard_input.cpp
@@ -191,7 +191,7 @@ CKeyboardInput::CKeyboardInput(const neutrino_locale_t Name, std::string* Value,
 	observ = Observ;
 	hint_1 = Hint_1;
 	hint_2 = Hint_2;
-	inputString = new CInputString(inputSize);
+	inputString = NULL;
 	layout = NULL;
 	selected = 0;
 	caps = 0;
@@ -204,14 +204,14 @@ CKeyboardInput::CKeyboardInput(const std::string &Name, std::string *Value, int
 	name = NONEXISTANT_LOCALE;
 	head = Name;
 	valueString = Value;
-	inputSize =  Size;
+	inputSize = Size;
 
 	iconfile = Icon ? Icon : "";
 
 	observ = Observ;
 	hint_1 = Hint_1;
 	hint_2 = Hint_2;
-	inputString = new CInputString(inputSize);
+	inputString = NULL;
 	layout = NULL;
 	selected = 0;
 	caps = 0;
@@ -221,7 +221,6 @@ CKeyboardInput::CKeyboardInput(const std::string &Name, std::string *Value, int
 
 CKeyboardInput::~CKeyboardInput()
 {
-	delete inputString;
 }
 
 #define BORDER_OFFSET 20
@@ -249,6 +248,12 @@ void CKeyboardInput::init()
 	width = std::max(iwidth, kwidth);
 	width = std::min(width, (int) frameBuffer->getScreenWidth());
 
+	if (!inputSize || (iwidth > width)) { /* auto calc inputSize */
+		inputSize = (width - 2*offset) / input_w;
+		iwidth = inputSize*input_w + 2*offset;
+	}
+	inputString = new CInputString(inputSize);
+
 	int tmp_w = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getRenderWidth(head);
 	if (!(iconfile.empty()))
 	{
@@ -596,6 +601,9 @@ int CKeyboardInput::exec(CMenuTarget* parent, const std::string &)
 
 	*valueString = inputString->getValue();
 
+	delete inputString;
+	inputString = NULL;
+
 	if ((observ) && (msg == CRCInput::RC_red))
 		observ->changeNotify(name, (void *) valueString->c_str());
 
diff --git a/src/gui/widget/keyboard_input.h b/src/gui/widget/keyboard_input.h
index 45657d5dd..10e74aac3 100644
--- a/src/gui/widget/keyboard_input.h
+++ b/src/gui/widget/keyboard_input.h
@@ -124,8 +124,8 @@ class CKeyboardInput : public CMenuTarget
 		virtual void setLayout();
 
 	public:
-		CKeyboardInput(const neutrino_locale_t Name, std::string* Value, int Size, CChangeObserver* Observ = NULL, const char * const Icon = NULL, const neutrino_locale_t Hint_1 = NONEXISTANT_LOCALE, const neutrino_locale_t Hint_2 = NONEXISTANT_LOCALE);
-		CKeyboardInput(const std::string      &Name, std::string* Value, int Size, CChangeObserver* Observ = NULL, const char * const Icon = NULL, const neutrino_locale_t Hint_1 = NONEXISTANT_LOCALE, const neutrino_locale_t Hint_2 = NONEXISTANT_LOCALE);
+		CKeyboardInput(const neutrino_locale_t Name, std::string* Value, int Size = 0, CChangeObserver* Observ = NULL, const char * const Icon = NULL, const neutrino_locale_t Hint_1 = NONEXISTANT_LOCALE, const neutrino_locale_t Hint_2 = NONEXISTANT_LOCALE);
+		CKeyboardInput(const std::string      &Name, std::string* Value, int Size = 0, CChangeObserver* Observ = NULL, const char * const Icon = NULL, const neutrino_locale_t Hint_1 = NONEXISTANT_LOCALE, const neutrino_locale_t Hint_2 = NONEXISTANT_LOCALE);
 		~CKeyboardInput();
 
 		void hide();

From ee91014c48de4512af59dcec1513ef6fe70e6b54 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Sat, 22 Nov 2014 15:54:41 +0100
Subject: [PATCH 069/113] - align most CKeyboardInput calls to the changes in
 88c6640

---
 src/gui/bedit/bouqueteditor_bouquets.cpp |  2 +-
 src/gui/eventlist.cpp                    |  2 +-
 src/gui/keybind_setup.cpp                |  2 +-
 src/gui/moviebrowser.cpp                 |  2 +-
 src/gui/network_setup.cpp                |  8 ++++----
 src/gui/nfs.cpp                          | 10 +++++-----
 src/gui/proxyserver_setup.cpp            |  6 +++---
 src/gui/record_setup.cpp                 |  2 +-
 src/gui/settings_manager.cpp             |  2 +-
 src/gui/themes.cpp                       |  2 +-
 src/gui/timerlist.cpp                    |  2 +-
 src/gui/user_menue_setup.cpp             |  2 +-
 12 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/gui/bedit/bouqueteditor_bouquets.cpp b/src/gui/bedit/bouqueteditor_bouquets.cpp
index f5f6111b5..9501c9cb7 100644
--- a/src/gui/bedit/bouqueteditor_bouquets.cpp
+++ b/src/gui/bedit/bouqueteditor_bouquets.cpp
@@ -527,7 +527,7 @@ std::string CBEBouquetWidget::inputName(const char * const defaultName, const ne
 {
 	std::string Name = defaultName;
 
-	CKeyboardInput * nameInput = new CKeyboardInput(caption, &Name, 29);
+	CKeyboardInput * nameInput = new CKeyboardInput(caption, &Name);
 	nameInput->exec(this, "");
 	delete nameInput;
 
diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp
index 292557a22..8187a5fc2 100644
--- a/src/gui/eventlist.cpp
+++ b/src/gui/eventlist.cpp
@@ -1357,7 +1357,7 @@ int CEventFinderMenu::showMenu(void)
 
 	int shortcut = 1;
 
-	CKeyboardInput stringInput(LOCALE_EVENTFINDER_KEYWORD,m_search_keyword, 20);
+	CKeyboardInput stringInput(LOCALE_EVENTFINDER_KEYWORD,m_search_keyword);
 
 	CMenuForwarder* mf0	= new CMenuForwarder(LOCALE_EVENTFINDER_KEYWORD, true, *m_search_keyword, &stringInput, NULL, CRCInput::RC_red);
 	CMenuOptionChooser* mo0	= new CMenuOptionChooser(LOCALE_EVENTFINDER_SEARCH_WITHIN_LIST, m_search_list, SEARCH_LIST_OPTIONS, SEARCH_LIST_OPTION_COUNT, true, this, CRCInput::convertDigitToKey(shortcut++));
diff --git a/src/gui/keybind_setup.cpp b/src/gui/keybind_setup.cpp
index 3806456c9..6bc6da1b8 100644
--- a/src/gui/keybind_setup.cpp
+++ b/src/gui/keybind_setup.cpp
@@ -108,7 +108,7 @@ int CKeybindSetup::exec(CMenuTarget* parent, const std::string &actionKey)
 		fileBrowser.Dir_Mode = true;
 		if (fileBrowser.exec("/var/tuxbox") == true) {
 			std::string fname = "keys.conf";
-			CKeyboardInput * sms = new CKeyboardInput(LOCALE_EXTRA_SAVEKEYS, &fname, 30);
+			CKeyboardInput * sms = new CKeyboardInput(LOCALE_EXTRA_SAVEKEYS, &fname);
 			sms->exec(NULL, "");
 			std::string sname = fileBrowser.getSelectedFile()->Name + "/" + fname;
 			printf("[neutrino keybind_setup] save keys: %s\n", sname.c_str());
diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp
index 727bd42ee..5476c67ad 100644
--- a/src/gui/moviebrowser.cpp
+++ b/src/gui/moviebrowser.cpp
@@ -3471,7 +3471,7 @@ bool CMovieBrowser::showYTMenu()
 	mainMenu.addItem(GenericMenuSeparatorLine);
 
 	std::string search = m_settings.ytsearch;
-	CKeyboardInput stringInput(LOCALE_MOVIEBROWSER_YT_SEARCH, &search, 20);
+	CKeyboardInput stringInput(LOCALE_MOVIEBROWSER_YT_SEARCH, &search);
 	mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_YT_SEARCH, true, search, &stringInput, NULL, CRCInput::RC_green));
 	mainMenu.addItem(new CMenuOptionChooser(LOCALE_MOVIEBROWSER_YT_ORDERBY, &m_settings.ytorderby, YT_ORDERBY_OPTIONS, YT_ORDERBY_OPTION_COUNT, true, NULL, CRCInput::RC_nokey, "", true));
 	sprintf(cnt, "%d", cYTFeedParser::SEARCH);
diff --git a/src/gui/network_setup.cpp b/src/gui/network_setup.cpp
index 53c23b23a..17a5c5ac7 100644
--- a/src/gui/network_setup.cpp
+++ b/src/gui/network_setup.cpp
@@ -244,7 +244,7 @@ int CNetworkSetup::showNetworkSetup()
 	CIPInput networkSettings_NameServer(LOCALE_NETWORKMENU_NAMESERVER, &network_nameserver, LOCALE_IPSETUP_HINT_1, LOCALE_IPSETUP_HINT_2);
 
 	//hostname
-	CKeyboardInput networkSettings_Hostname(LOCALE_NETWORKMENU_HOSTNAME, &network_hostname, 30, NULL, NULL, LOCALE_NETWORKMENU_HOSTNAME_HINT1, LOCALE_NETWORKMENU_HOSTNAME_HINT2);
+	CKeyboardInput networkSettings_Hostname(LOCALE_NETWORKMENU_HOSTNAME, &network_hostname, 0, NULL, NULL, LOCALE_NETWORKMENU_HOSTNAME_HINT1, LOCALE_NETWORKMENU_HOSTNAME_HINT2);
 
 	//auto start
 	CMenuOptionChooser* o1 = new CMenuOptionChooser(LOCALE_NETWORKMENU_SETUPONSTARTUP, &network_automatic_start, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
@@ -301,9 +301,9 @@ int CNetworkSetup::showNetworkSetup()
 	if(ifcount > 1) // if there is only one, its probably wired
 	{
 		//ssid
-		CKeyboardInput * networkSettings_ssid = new CKeyboardInput(LOCALE_NETWORKMENU_SSID, &network_ssid, 30);
+		CKeyboardInput * networkSettings_ssid = new CKeyboardInput(LOCALE_NETWORKMENU_SSID, &network_ssid);
 		//key
-		CKeyboardInput * networkSettings_key = new CKeyboardInput(LOCALE_NETWORKMENU_PASSWORD, &network_key, 30);
+		CKeyboardInput * networkSettings_key = new CKeyboardInput(LOCALE_NETWORKMENU_PASSWORD, &network_key);
 		CMenuForwarder *m9 = new CMenuDForwarder(LOCALE_NETWORKMENU_SSID      , networkConfig->wireless, network_ssid , networkSettings_ssid );
 		CMenuForwarder *m10 = new CMenuDForwarder(LOCALE_NETWORKMENU_PASSWORD , networkConfig->wireless, network_key , networkSettings_key );
 		CMenuForwarder *m11 = new CMenuForwarder(LOCALE_NETWORKMENU_SSID_SCAN , networkConfig->wireless, NULL, this, "scanssid");
@@ -394,7 +394,7 @@ int CNetworkSetup::showNetworkSetup()
 void CNetworkSetup::showNetworkNTPSetup(CMenuWidget *menu_ntp)
 {
 	//prepare ntp input
-	CKeyboardInput * networkSettings_NtpServer = new CKeyboardInput(LOCALE_NETWORKMENU_NTPSERVER, &g_settings.network_ntpserver, 30, sectionsdConfigNotifier, NULL, LOCALE_NETWORKMENU_NTPSERVER_HINT1, LOCALE_NETWORKMENU_NTPSERVER_HINT2);
+	CKeyboardInput * networkSettings_NtpServer = new CKeyboardInput(LOCALE_NETWORKMENU_NTPSERVER, &g_settings.network_ntpserver, 0, sectionsdConfigNotifier, NULL, LOCALE_NETWORKMENU_NTPSERVER_HINT1, LOCALE_NETWORKMENU_NTPSERVER_HINT2);
 
 	CStringInput * networkSettings_NtpRefresh = new CStringInput(LOCALE_NETWORKMENU_NTPREFRESH, &g_settings.network_ntprefresh, 3,LOCALE_NETWORKMENU_NTPREFRESH_HINT1, LOCALE_NETWORKMENU_NTPREFRESH_HINT2 , "0123456789 ", sectionsdConfigNotifier);
 
diff --git a/src/gui/nfs.cpp b/src/gui/nfs.cpp
index 20daf6fb8..ba1348e74 100644
--- a/src/gui/nfs.cpp
+++ b/src/gui/nfs.cpp
@@ -251,20 +251,20 @@ int CNFSMountGui::menuEntry(int nr)
 	mountMenuEntryW.addIntroItems();
 
 	CIPInput ipInput(LOCALE_NFS_IP, &g_settings.network_nfs[nr].ip, LOCALE_IPSETUP_HINT_1, LOCALE_IPSETUP_HINT_2);
-	CKeyboardInput dirInput(LOCALE_NFS_DIR, &g_settings.network_nfs[nr].dir, 30);
+	CKeyboardInput dirInput(LOCALE_NFS_DIR, &g_settings.network_nfs[nr].dir);
 
 	CMenuOptionChooser *automountInput= new CMenuOptionChooser(LOCALE_NFS_AUTOMOUNT, &g_settings.network_nfs[nr].automount, MESSAGEBOX_NO_YES_OPTIONS, MESSAGEBOX_NO_YES_OPTION_COUNT, true);
 
-	CKeyboardInput options1Input(LOCALE_NFS_MOUNT_OPTIONS, &g_settings.network_nfs[nr].mount_options1, 30);
+	CKeyboardInput options1Input(LOCALE_NFS_MOUNT_OPTIONS, &g_settings.network_nfs[nr].mount_options1);
 	CMenuForwarder *options1_fwd = new CMenuForwarder(LOCALE_NFS_MOUNT_OPTIONS, true, NULL, &options1Input);
 
-	CKeyboardInput options2Input(LOCALE_NFS_MOUNT_OPTIONS, &g_settings.network_nfs[nr].mount_options2, 30);
+	CKeyboardInput options2Input(LOCALE_NFS_MOUNT_OPTIONS, &g_settings.network_nfs[nr].mount_options2);
 	CMenuForwarder *options2_fwd = new CMenuForwarder(LOCALE_NFS_MOUNT_OPTIONS, true, NULL, &options2Input);
 
-	CKeyboardInput userInput(LOCALE_NFS_USERNAME, &g_settings.network_nfs[nr].username, 30);
+	CKeyboardInput userInput(LOCALE_NFS_USERNAME, &g_settings.network_nfs[nr].username);
 	CMenuForwarder *username_fwd = new CMenuForwarder(LOCALE_NFS_USERNAME, (g_settings.network_nfs[nr].type != (int)CFSMounter::NFS), NULL, &userInput);
 
-	CKeyboardInput passInput(LOCALE_NFS_PASSWORD, &g_settings.network_nfs[nr].password, 30);
+	CKeyboardInput passInput(LOCALE_NFS_PASSWORD, &g_settings.network_nfs[nr].password);
 	CMenuForwarder *password_fwd = new CMenuForwarder(LOCALE_NFS_PASSWORD, (g_settings.network_nfs[nr].type != (int)CFSMounter::NFS), NULL, &passInput);
 
 	CMACInput macInput(LOCALE_RECORDINGMENU_SERVER_MAC, &g_settings.network_nfs[nr].mac, LOCALE_IPSETUP_HINT_1, LOCALE_IPSETUP_HINT_2);
diff --git a/src/gui/proxyserver_setup.cpp b/src/gui/proxyserver_setup.cpp
index 846bd9bc0..25db5d61d 100644
--- a/src/gui/proxyserver_setup.cpp
+++ b/src/gui/proxyserver_setup.cpp
@@ -81,17 +81,17 @@ int CProxySetup::showProxySetup()
 	neutrino_locale_t subtitle = (menue_title == LOCALE_FLASHUPDATE_PROXYSERVER_SEP ? NONEXISTANT_LOCALE : LOCALE_FLASHUPDATE_PROXYSERVER_SEP);
 	mn->addIntroItems(subtitle);
 
-	CKeyboardInput softUpdate_proxy(LOCALE_FLASHUPDATE_PROXYSERVER, &g_settings.softupdate_proxyserver, 23, NULL, NULL, LOCALE_FLASHUPDATE_PROXYSERVER_HINT1, LOCALE_FLASHUPDATE_PROXYSERVER_HINT2);
+	CKeyboardInput softUpdate_proxy(LOCALE_FLASHUPDATE_PROXYSERVER, &g_settings.softupdate_proxyserver, 0, NULL, NULL, LOCALE_FLASHUPDATE_PROXYSERVER_HINT1, LOCALE_FLASHUPDATE_PROXYSERVER_HINT2);
 	CMenuForwarder * mf = new CMenuForwarder(LOCALE_FLASHUPDATE_PROXYSERVER, true, g_settings.softupdate_proxyserver, &softUpdate_proxy, NULL, CRCInput::RC_red);
 	mf->setHint("", LOCALE_MENU_HINT_NET_PROXYSERVER);
 	mn->addItem(mf);
 
-	CKeyboardInput softUpdate_proxyuser(LOCALE_FLASHUPDATE_PROXYUSERNAME, &g_settings.softupdate_proxyusername, 23, NULL, NULL, LOCALE_FLASHUPDATE_PROXYUSERNAME_HINT1, LOCALE_FLASHUPDATE_PROXYUSERNAME_HINT2);
+	CKeyboardInput softUpdate_proxyuser(LOCALE_FLASHUPDATE_PROXYUSERNAME, &g_settings.softupdate_proxyusername, 0, NULL, NULL, LOCALE_FLASHUPDATE_PROXYUSERNAME_HINT1, LOCALE_FLASHUPDATE_PROXYUSERNAME_HINT2);
 	mf = new CMenuForwarder(LOCALE_FLASHUPDATE_PROXYUSERNAME, true, g_settings.softupdate_proxyusername, &softUpdate_proxyuser, NULL, CRCInput::RC_green);
 	mf->setHint("", LOCALE_MENU_HINT_NET_PROXYUSER);
 	mn->addItem(mf);
 
-	CKeyboardInput softUpdate_proxypass(LOCALE_FLASHUPDATE_PROXYPASSWORD, &g_settings.softupdate_proxypassword, 20, NULL, NULL, LOCALE_FLASHUPDATE_PROXYPASSWORD_HINT1, LOCALE_FLASHUPDATE_PROXYPASSWORD_HINT2);
+	CKeyboardInput softUpdate_proxypass(LOCALE_FLASHUPDATE_PROXYPASSWORD, &g_settings.softupdate_proxypassword, 0, NULL, NULL, LOCALE_FLASHUPDATE_PROXYPASSWORD_HINT1, LOCALE_FLASHUPDATE_PROXYPASSWORD_HINT2);
 	mf = new CMenuForwarder(LOCALE_FLASHUPDATE_PROXYPASSWORD, true, g_settings.softupdate_proxypassword, &softUpdate_proxypass, NULL, CRCInput::RC_yellow);
 	mf->setHint("", LOCALE_MENU_HINT_NET_PROXYPASS);
 	mn->addItem(mf);
diff --git a/src/gui/record_setup.cpp b/src/gui/record_setup.cpp
index 81e092a8e..b385c2d3f 100644
--- a/src/gui/record_setup.cpp
+++ b/src/gui/record_setup.cpp
@@ -244,7 +244,7 @@ int CRecordSetup::showRecordSetup()
 	}
 
 	//filename template
-	CKeyboardInput* filename_template = new CKeyboardInput(LOCALE_RECORDINGMENU_FILENAME_TEMPLATE, &g_settings.recording_filename_template, 21, NULL, NULL, LOCALE_RECORDINGMENU_FILENAME_TEMPLATE_HINT, LOCALE_RECORDINGMENU_FILENAME_TEMPLATE_HINT2);
+	CKeyboardInput* filename_template = new CKeyboardInput(LOCALE_RECORDINGMENU_FILENAME_TEMPLATE, &g_settings.recording_filename_template, 0, NULL, NULL, LOCALE_RECORDINGMENU_FILENAME_TEMPLATE_HINT, LOCALE_RECORDINGMENU_FILENAME_TEMPLATE_HINT2);
 	CMenuForwarder* ft = new CMenuDForwarder(LOCALE_RECORDINGMENU_FILENAME_TEMPLATE, true, g_settings.recording_filename_template, filename_template, NULL, CRCInput::RC_1);
 	ft->setHint("", LOCALE_MENU_HINT_RECORD_FILENAME_TEMPLATE);
 	recordingSettings->addItem(ft);
diff --git a/src/gui/settings_manager.cpp b/src/gui/settings_manager.cpp
index aa2c5d845..948593dd0 100644
--- a/src/gui/settings_manager.cpp
+++ b/src/gui/settings_manager.cpp
@@ -90,7 +90,7 @@ int CSettingsManager::exec(CMenuTarget* parent, const std::string &actionKey)
 		if (fileBrowser.exec("/var/tuxbox") == true)
 		{
 			std::string fname = "neutrino.conf";
-			CKeyboardInput * sms = new CKeyboardInput(LOCALE_EXTRA_SAVECONFIG, &fname, 30);
+			CKeyboardInput * sms = new CKeyboardInput(LOCALE_EXTRA_SAVECONFIG, &fname);
 			sms->exec(NULL, "");
 
 			std::string sname = fileBrowser.getSelectedFile()->Name + "/" + fname;
diff --git a/src/gui/themes.cpp b/src/gui/themes.cpp
index a8e96d31e..3729042cd 100644
--- a/src/gui/themes.cpp
+++ b/src/gui/themes.cpp
@@ -157,7 +157,7 @@ int CThemes::Show()
 	
 	readThemes(themes);
 
-	CKeyboardInput nameInput(LOCALE_COLORTHEMEMENU_NAME, &file_name, 30);
+	CKeyboardInput nameInput(LOCALE_COLORTHEMEMENU_NAME, &file_name);
 	CMenuForwarder *m1 = new CMenuForwarder(LOCALE_COLORTHEMEMENU_SAVE, true , NULL, &nameInput, NULL, CRCInput::RC_green);
 
 	if (mkdirhier(USERDIR) && errno != EEXIST) {
diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp
index e9b5af7b3..1733a89f1 100644
--- a/src/gui/timerlist.cpp
+++ b/src/gui/timerlist.cpp
@@ -1224,7 +1224,7 @@ int CTimerList::newTimer()
 	CMenuOptionChooser* m8 = new CMenuOptionChooser(LOCALE_TIMERLIST_STANDBY, &timerNew_standby_on, TIMERLIST_STANDBY_OPTIONS, TIMERLIST_STANDBY_OPTION_COUNT, false);
 
 	timerNew_message = std::string(timerNew.message);
-	CKeyboardInput timerSettings_msg(LOCALE_TIMERLIST_MESSAGE, &timerNew_message, 30);
+	CKeyboardInput timerSettings_msg(LOCALE_TIMERLIST_MESSAGE, &timerNew_message);
 	CMenuForwarder *m9 = new CMenuForwarder(LOCALE_TIMERLIST_MESSAGE, false, timerNew_message, &timerSettings_msg );
 
 	timerNew_pluginName = "---";
diff --git a/src/gui/user_menue_setup.cpp b/src/gui/user_menue_setup.cpp
index 5f7a5e2be..f0922ee2e 100644
--- a/src/gui/user_menue_setup.cpp
+++ b/src/gui/user_menue_setup.cpp
@@ -208,7 +208,7 @@ int CUserMenuSetup::showSetup()
 	ums->addIntroItems();
 
 	int old_key = g_settings.usermenu[button]->key;
-	CKeyboardInput name(LOCALE_USERMENU_NAME, &g_settings.usermenu[button]->title, 20);
+	CKeyboardInput name(LOCALE_USERMENU_NAME, &g_settings.usermenu[button]->title);
 	CMenuForwarder * mf = new CMenuForwarder(LOCALE_USERMENU_NAME, true, NULL, &name);
 
 	ums->addItem(mf);

From 3a401a46b320af71f55fa0a168c053d2c9a7608e Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Sat, 22 Nov 2014 16:17:30 +0100
Subject: [PATCH 070/113] Revert "- plugins: allow empty menu hints"

This reverts commit 95eab2a48d2b58e1fae67af60f6ec58e4dcd3c72
because 9945d0348039b2ec5e7927b7e91ce8ac251c97ed do the same.
---
 src/gui/plugins.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/gui/plugins.cpp b/src/gui/plugins.cpp
index 72f4a9763..1d43cbf75 100644
--- a/src/gui/plugins.cpp
+++ b/src/gui/plugins.cpp
@@ -213,7 +213,6 @@ bool CPlugins::parseCfg(plugin *plugin_data)
 	plugin_data->type = CPlugins::P_TYPE_DISABLED;
 	plugin_data->integration = CPlugins::I_TYPE_DISABLED;
 	plugin_data->hinticon = NEUTRINO_ICON_HINT_PLUGIN;
-	plugin_data->description = " "; //FIXME: To show empty desc as a menu hint the string may not be empty
 
 	std::string _hintIcon = plugin_data->plugindir + "/" + plugin_data->filename + "_hint.png";
 	if (access(_hintIcon.c_str(), F_OK) == 0)

From da9ce1bb3895b7001344d593e5d1b870fb74de29 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Mon, 24 Nov 2014 10:01:20 +0100
Subject: [PATCH 071/113] - keyboard_input: allow string hints ...

... in preparation for implementation in Lua instance
---
 src/gui/widget/keyboard_input.cpp | 56 +++++++++++++++++++++++++------
 src/gui/widget/keyboard_input.h   |  2 ++
 2 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/src/gui/widget/keyboard_input.cpp b/src/gui/widget/keyboard_input.cpp
index 2310ef6c4..cc4eaf6f3 100644
--- a/src/gui/widget/keyboard_input.cpp
+++ b/src/gui/widget/keyboard_input.cpp
@@ -191,6 +191,8 @@ CKeyboardInput::CKeyboardInput(const neutrino_locale_t Name, std::string* Value,
 	observ = Observ;
 	hint_1 = Hint_1;
 	hint_2 = Hint_2;
+	hintText_1 = "";
+	hintText_2 = "";
 	inputString = NULL;
 	layout = NULL;
 	selected = 0;
@@ -211,6 +213,30 @@ CKeyboardInput::CKeyboardInput(const std::string &Name, std::string *Value, int
 	observ = Observ;
 	hint_1 = Hint_1;
 	hint_2 = Hint_2;
+	hintText_1 = "";
+	hintText_2 = "";
+	inputString = NULL;
+	layout = NULL;
+	selected = 0;
+	caps = 0;
+	srow = scol = 0;
+	focus = FOCUS_STRING;
+}
+
+CKeyboardInput::CKeyboardInput(const std::string &Name, std::string *Value, int Size, CChangeObserver* Observ, const char * const Icon, std::string HintText_1, std::string HintText_2)
+{
+	name = NONEXISTANT_LOCALE;
+	head = Name;
+	valueString = Value;
+	inputSize = Size;
+
+	iconfile = Icon ? Icon : "";
+
+	observ = Observ;
+	hint_1 = NONEXISTANT_LOCALE;
+	hint_2 = NONEXISTANT_LOCALE;
+	hintText_1 = HintText_1;
+	hintText_2 = HintText_2;
 	inputString = NULL;
 	layout = NULL;
 	selected = 0;
@@ -265,17 +291,22 @@ void CKeyboardInput::init()
 	width = std::max(width, tmp_w + offset);
 
 	bheight = input_h + (key_h+KEY_BORDER)*KEY_ROWS + 3*offset;
-	if ((hint_1 != NONEXISTANT_LOCALE) || (hint_2 != NONEXISTANT_LOCALE))
+
+	bool has_hint_1 = ((hint_1 != NONEXISTANT_LOCALE) || !hintText_1.empty());
+	bool has_hint_2 = ((hint_2 != NONEXISTANT_LOCALE) || !hintText_2.empty());
+	if ((has_hint_1) || (has_hint_2))
 	{
-		if (hint_1 != NONEXISTANT_LOCALE)
+		if (has_hint_1)
 		{
-			tmp_w = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_INFO]->getRenderWidth(g_Locale->getText(hint_1));
+			const char *_hint_1 = (hint_1 != NONEXISTANT_LOCALE ? g_Locale->getText(hint_1) : hintText_1.c_str());
+			tmp_w = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_INFO]->getRenderWidth(_hint_1);
 			width = std::max(width, tmp_w + 2*offset);
 			bheight += iheight;
 		}
-		if (hint_2 != NONEXISTANT_LOCALE)
+		if (has_hint_2)
 		{
-			tmp_w = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_INFO]->getRenderWidth(g_Locale->getText(hint_2));
+			const char *_hint_2 = (hint_2 != NONEXISTANT_LOCALE ? g_Locale->getText(hint_2) : hintText_2.c_str());
+			tmp_w = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_INFO]->getRenderWidth(_hint_2);
 			width = std::max(width, tmp_w + 2*offset);
 			bheight += iheight;
 		}
@@ -643,17 +674,22 @@ void CKeyboardInput::paint()
 	header.paint(CC_SAVE_SCREEN_NO);
 
 	key_y = y+ hheight+ offset+ input_h+ offset;
-	if ((hint_1 != NONEXISTANT_LOCALE) || (hint_2 != NONEXISTANT_LOCALE))
+
+	bool has_hint_1 = ((hint_1 != NONEXISTANT_LOCALE) || !hintText_1.empty());
+	bool has_hint_2 = ((hint_2 != NONEXISTANT_LOCALE) || !hintText_2.empty());
+	if ((has_hint_1) || (has_hint_2))
 	{
-		if (hint_1 != NONEXISTANT_LOCALE)
+		if (has_hint_1)
 		{
 			key_y += iheight;
-			g_Font[SNeutrinoSettings::FONT_TYPE_MENU_INFO]->RenderString(x+ offset, key_y, width- 2*offset, g_Locale->getText(hint_1), COL_MENUCONTENT_TEXT);
+			const char *_hint_1 = (hint_1 != NONEXISTANT_LOCALE ? g_Locale->getText(hint_1) : hintText_1.c_str());
+			g_Font[SNeutrinoSettings::FONT_TYPE_MENU_INFO]->RenderString(x+ offset, key_y, width- 2*offset, _hint_1, COL_MENUCONTENT_TEXT);
 		}
-		if (hint_2 != NONEXISTANT_LOCALE)
+		if (has_hint_2)
 		{
 			key_y += iheight;
-			g_Font[SNeutrinoSettings::FONT_TYPE_MENU_INFO]->RenderString(x+ offset, key_y, width- 2*offset, g_Locale->getText(hint_2), COL_MENUCONTENT_TEXT);
+			const char *_hint_2 = (hint_2 != NONEXISTANT_LOCALE ? g_Locale->getText(hint_2) : hintText_2.c_str());
+			g_Font[SNeutrinoSettings::FONT_TYPE_MENU_INFO]->RenderString(x+ offset, key_y, width- 2*offset, _hint_2, COL_MENUCONTENT_TEXT);
 		}
 		key_y += offset;
 	}
diff --git a/src/gui/widget/keyboard_input.h b/src/gui/widget/keyboard_input.h
index 10e74aac3..009934b4a 100644
--- a/src/gui/widget/keyboard_input.h
+++ b/src/gui/widget/keyboard_input.h
@@ -95,6 +95,7 @@ class CKeyboardInput : public CMenuTarget
 		std::string  head;
 		neutrino_locale_t name;
 		neutrino_locale_t hint_1, hint_2;
+		std::string hintText_1, hintText_2;
 		std::string iconfile;
 		int          inputSize;
 		int          selected;
@@ -126,6 +127,7 @@ class CKeyboardInput : public CMenuTarget
 	public:
 		CKeyboardInput(const neutrino_locale_t Name, std::string* Value, int Size = 0, CChangeObserver* Observ = NULL, const char * const Icon = NULL, const neutrino_locale_t Hint_1 = NONEXISTANT_LOCALE, const neutrino_locale_t Hint_2 = NONEXISTANT_LOCALE);
 		CKeyboardInput(const std::string      &Name, std::string* Value, int Size = 0, CChangeObserver* Observ = NULL, const char * const Icon = NULL, const neutrino_locale_t Hint_1 = NONEXISTANT_LOCALE, const neutrino_locale_t Hint_2 = NONEXISTANT_LOCALE);
+		CKeyboardInput(const std::string      &Name, std::string* Value, int Size = 0, CChangeObserver* Observ = NULL, const char * const Icon = NULL, std::string HintText_1 = "", std::string HintText_2 = "");
 		~CKeyboardInput();
 
 		void hide();

From d7b496062c378fea22c68aaadfa190a10ae0260c Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Mon, 24 Nov 2014 10:04:02 +0100
Subject: [PATCH 072/113] - luainstance: add CKeybordInput

Syntax:
m:addItem { \
	type="keyboardinput", \
	action="_action", \
	id="_id", \
	value="_value", \
	name="_name", \
	help="help (first line)",
	help2="help (second line)"
}
---
 src/gui/luainstance.cpp | 38 ++++++++++++++++++++++++++++++++++++++
 src/gui/luainstance.h   | 14 ++++++++++++++
 2 files changed, 52 insertions(+)

diff --git a/src/gui/luainstance.cpp b/src/gui/luainstance.cpp
index a9f883b6f..7a2aebb64 100644
--- a/src/gui/luainstance.cpp
+++ b/src/gui/luainstance.cpp
@@ -30,6 +30,7 @@
 #include <system/set_threadname.h>
 #include <gui/widget/msgbox.h>
 #include <gui/widget/messagebox.h>
+#include <gui/widget/keyboard_input.h>
 #include <gui/filebrowser.h>
 #include <gui/movieplayer.h>
 #include <driver/pictureviewer/pictureviewer.h>
@@ -1160,6 +1161,35 @@ int CLuaMenuStringinput::exec(CMenuTarget* /*parent*/, const std::string & /*act
 	return menu_return::RETURN_REPAINT;
 }
 
+CLuaMenuKeyboardinput::CLuaMenuKeyboardinput(lua_State *_L, std::string _luaAction, std::string _luaId, const char *_name, std::string *_value, int _size, CChangeObserver *_observ, const char *_icon, std::string _help, std::string _help2) : CLuaMenuForwarder(_L, _luaAction, _luaId)
+{
+	name = _name;
+	value = _value;
+	size = _size;
+	icon = _icon;
+	observ = _observ;
+	help = _help;
+	help2 = _help2;
+}
+
+int CLuaMenuKeyboardinput::exec(CMenuTarget* /*parent*/, const std::string & /*actionKey*/)
+{
+	CKeyboardInput *i;
+	i = new CKeyboardInput((char *)name, value, size, observ, icon, help, help2);
+	i->exec(NULL, "");
+	delete i;
+	if (!luaAction.empty()){
+		lua_pushglobaltable(L);
+		lua_getfield(L, -1, luaAction.c_str());
+		lua_remove(L, -2);
+		lua_pushstring(L, luaId.c_str());
+		lua_pushstring(L, value->c_str());
+		lua_pcall(L, 2 /* two args */, 1 /* one result */, 0);
+		lua_pop(L, 2);
+	}
+	return menu_return::RETURN_REPAINT;
+}
+
 int CLuaInstance::MenuNew(lua_State *L)
 {
 	CMenuWidget *m;
@@ -1350,6 +1380,14 @@ int CLuaInstance::MenuAddItem(lua_State *L)
 			CLuaMenuStringinput *stringinput = new CLuaMenuStringinput(L, action, id, b->name.c_str(), &b->str_val, size, valid_chars, m->observ, icon, sms);
 			mi = new CMenuForwarder(b->name, enabled, b->str_val, stringinput, NULL/*ActionKey*/, directkey, icon, right_icon);
 			m->targets.push_back(stringinput);
+		} else if (type == "keyboardinput") {
+			b->str_val = value;
+			int size = 0;		tableLookup(L, "size", size);
+			std::string help = "";	tableLookup(L, "help", help);
+			std::string help2 = "";	tableLookup(L, "help2", help2);
+			CLuaMenuKeyboardinput *keyboardinput = new CLuaMenuKeyboardinput(L, action, id, b->name.c_str(), &b->str_val, size, m->observ, icon, help, help2);
+			mi = new CMenuForwarder(b->name, enabled, b->str_val, keyboardinput, NULL/*ActionKey*/, directkey, icon, right_icon);
+			m->targets.push_back(keyboardinput);
 		} else if (type == "filebrowser") {
 			b->str_val = value;
 			int dirMode = 0; tableLookup(L, "dir_mode", dirMode);
diff --git a/src/gui/luainstance.h b/src/gui/luainstance.h
index 8b2153074..83712c872 100644
--- a/src/gui/luainstance.h
+++ b/src/gui/luainstance.h
@@ -103,6 +103,20 @@ class CLuaMenuStringinput : public CLuaMenuForwarder
 		int exec(CMenuTarget* parent, const std::string & actionKey);
 };
 
+class CLuaMenuKeyboardinput : public CLuaMenuForwarder
+{
+	private:
+		std::string *value;
+		const char *name;
+		const char *icon;
+		int size;
+		CChangeObserver *observ;
+		std::string help, help2;
+	public:
+		CLuaMenuKeyboardinput(lua_State *_L, std::string _luaAction, std::string _luaId, const char *_name, std::string *_value, int _size, CChangeObserver *_observ, const char *_icon, std::string _help, std::string _help2);
+		int exec(CMenuTarget* parent, const std::string & actionKey);
+};
+
 class CLuaHintbox
 {
 	public:

From 421da2c0cf1844b2efc5935e868db92141f17489 Mon Sep 17 00:00:00 2001
From: martii <m4rtii@gmx.de>
Date: Fri, 21 Jun 2013 10:39:46 +0200
Subject: [PATCH 073/113] zapit/audio_setup: add gui option for handling volume
 adjustment defaults

---
 data/locale/deutsch.locale      |  7 +++++++
 data/locale/english.locale      |  7 +++++++
 src/gui/audio_select.cpp        |  2 +-
 src/gui/audio_setup.cpp         | 35 ++++++++++++++++++++++++++++++++-
 src/neutrino.cpp                |  6 ++++++
 src/system/locals.h             |  7 +++++++
 src/system/locals_intern.h      |  7 +++++++
 src/system/settings.h           |  2 ++
 src/zapit/include/zapit/zapit.h |  8 +++++---
 src/zapit/src/zapit.cpp         | 34 ++++++++++++++++++++++++++++----
 10 files changed, 106 insertions(+), 9 deletions(-)

diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index 6a3cb1897..6c58d4911 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -128,6 +128,10 @@ audiomenu.pref_subs_head Untertitelwahl
 audiomenu.spdif_dd Dolby Digital über S/PDIF
 audiomenu.stereo stereo
 audiomenu.volume_adjust Lautstärke ändern, in %
+audiomenu.volume_adjustment Lautstärkeanpassung pro Kanal
+audiomenu.volume_adjustment_ac3 AC3-Tonspuren
+audiomenu.volume_adjustment_clear Gespeicherte Werte löschen
+audiomenu.volume_adjustment_pcm PCM-Tonspuren
 audiomenu.volume_start Einschaltlautstärke
 audiomenu.volume_step Lautstärke Schrittweite
 audioplayer.add Hinzufügen
@@ -880,6 +884,9 @@ menu.cancel Abbrechen
 menu.hint_a_pic Konfigurieren Sie den Audioplayer und den Bildbetrachter
 menu.hint_aplay Audioplayer
 menu.hint_audio Audio-Ausgang, Dolby Digital und SRS TruVolume Optionen und mehr
+menu.hint_audio_adjust_vol_ac3 Lautstärkeanpassung für AC3-Tonspuren
+menu.hint_audio_adjust_vol_clear Alle gespeicherten Werte für AC3- und PCM-Tonspuren löschen
+menu.hint_audio_adjust_vol_pcm Lautstärkeanpassung für PCM-Tonspuren
 menu.hint_audio_analog_mode Wählen Sie den Modus des Ausgangssignals für den CINCH-Anschluss
 menu.hint_audio_avsync Diese Funktion synchronisiert Bild und Ton
 menu.hint_audio_dd Ist diese Option aktiviert, wird automatisch auf Dolby Digital Ton geschalten, sobald dieser verfügbar ist
diff --git a/data/locale/english.locale b/data/locale/english.locale
index ee6af3bb7..dae69ce6b 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -128,6 +128,10 @@ audiomenu.pref_subs_head Subtitle language preferences
 audiomenu.spdif_dd Encoded DD on SPDIF
 audiomenu.stereo stereo
 audiomenu.volume_adjust Volume adjustment, in %
+audiomenu.volume_adjustment Channel specific volume adjustment
+audiomenu.volume_adjustment_ac3 AC3 streams
+audiomenu.volume_adjustment_clear Clear saved values
+audiomenu.volume_adjustment_pcm PCM streams
 audiomenu.volume_start Start volume
 audiomenu.volume_step Volume step
 audioplayer.add Add
@@ -880,6 +884,9 @@ menu.cancel Cancel
 menu.hint_a_pic Configure audio player and picture viewer
 menu.hint_aplay Audio player
 menu.hint_audio Audio output, DD\nSRS True volume options
+menu.hint_audio_adjust_vol_ac3 Channel specific volume adjustment for AC3 streams
+menu.hint_audio_adjust_vol_clear Clear all saved values for PCM and AC3 streams
+menu.hint_audio_adjust_vol_pcm Channel specific volume adjustment for PCM streams
 menu.hint_audio_analog_mode Select audio channel to use\nstereo, mono-left, mono-right
 menu.hint_audio_avsync A/V sync
 menu.hint_audio_dd Auto-switch to DolbyDigital audio pid,\nif available
diff --git a/src/gui/audio_select.cpp b/src/gui/audio_select.cpp
index 1a428540d..c95ff6b82 100644
--- a/src/gui/audio_select.cpp
+++ b/src/gui/audio_select.cpp
@@ -200,7 +200,7 @@ int CAudioSelectMenuHandler::doMenu ()
 	CVolume::getInstance()->SetCurrentPid(0);
 	int percent[p_count];
 	for (uint i=0; i < p_count; i++) {
-		percent[i] = CZapit::getInstance()->GetPidVolume(0, g_RemoteControl->current_PIDs.APIDs[i].pid);
+		percent[i] = CZapit::getInstance()->GetPidVolume(0, g_RemoteControl->current_PIDs.APIDs[i].pid, g_RemoteControl->current_PIDs.APIDs[i].is_ac3);
 		AudioSelector.addItem(new CMenuOptionNumberChooser(g_RemoteControl->current_PIDs.APIDs[i].desc,
 					&percent[i], i == g_RemoteControl->current_PIDs.PIDs.selected_apid,
 					0, 999, CVolume::getInstance()));
diff --git a/src/gui/audio_setup.cpp b/src/gui/audio_setup.cpp
index 22290473a..031b9f0e3 100644
--- a/src/gui/audio_setup.cpp
+++ b/src/gui/audio_setup.cpp
@@ -45,6 +45,7 @@
 #include <driver/screen_max.h>
 
 #include <audio.h>
+#include <zapit/zapit.h>
 
 #include <system/debug.h>
 
@@ -64,8 +65,14 @@ CAudioSetup::~CAudioSetup()
 
 }
 
-int CAudioSetup::exec(CMenuTarget* parent, const std::string &/*actionKey*/)
+int CAudioSetup::exec(CMenuTarget* parent, const std::string &actionKey)
 {
+	if (actionKey == "clear_vol_map") {
+		CZapit::getInstance()->ClearVolumeMap();
+		CZapit::getInstance()->SetVolumePercent(g_settings.audio_volume_percent_ac3, g_settings.audio_volume_percent_pcm);
+		return menu_return::RETURN_NONE;
+	}
+
 	dprintf(DEBUG_DEBUG, "init audio setup\n");
 	int   res = menu_return::RETURN_REPAINT;
 
@@ -184,6 +191,23 @@ int CAudioSetup::showAudioSetup()
 	CMenuOptionChooser * as_oj_srsonoff 	= new CMenuOptionChooser(LOCALE_AUDIO_SRS_IQ, &g_settings.srs_enable, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, &truevolSetupNotifier);
 	as_oj_srsonoff->setHint("", LOCALE_MENU_HINT_AUDIO_SRS);
 
+	// ac3,pcm and clear volume adjustment
+	CMenuOptionNumberChooser *adj_ac3 = NULL, *adj_pcm = NULL;
+	CMenuForwarder *adj_clear = NULL;
+	if (!g_settings.easymenu) {
+		adj_ac3 = new CMenuOptionNumberChooser(LOCALE_AUDIOMENU_VOLUME_ADJUSTMENT_AC3,
+		(int *)&g_settings.audio_volume_percent_ac3, true, 0, 100, audioSetupNotifier);
+		adj_ac3->setNumberFormat("%d%%");
+		adj_ac3->setHint("", LOCALE_MENU_HINT_AUDIO_ADJUST_VOL_AC3);
+
+		adj_pcm  = new CMenuOptionNumberChooser(LOCALE_AUDIOMENU_VOLUME_ADJUSTMENT_PCM,
+		(int *)&g_settings.audio_volume_percent_pcm, true, 0, 100, audioSetupNotifier);
+		adj_pcm->setNumberFormat("%d%%");
+		adj_pcm->setHint("", LOCALE_MENU_HINT_AUDIO_ADJUST_VOL_PCM);
+
+		adj_clear = new CMenuForwarder(LOCALE_AUDIOMENU_VOLUME_ADJUSTMENT_CLEAR, true, NULL, this, "clear_vol_map");
+		adj_clear->setHint("", LOCALE_MENU_HINT_AUDIO_ADJUST_VOL_CLEAR);
+	}
 	//paint items
 	audioSettings->addIntroItems(LOCALE_MAINSETTINGS_AUDIO);
 	//---------------------------------------------------------
@@ -212,6 +236,12 @@ int CAudioSetup::showAudioSetup()
 #if 0
 	audioSettings->addItem(mf);
 #endif
+	if (!g_settings.easymenu) {
+		audioSettings->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_AUDIOMENU_VOLUME_ADJUSTMENT));
+		audioSettings->addItem(adj_ac3);
+		audioSettings->addItem(adj_pcm);
+		audioSettings->addItem(adj_clear);
+	}
 
 	int res = audioSettings->exec(NULL, "");
 	selected = audioSettings->getSelected();
@@ -219,6 +249,9 @@ int CAudioSetup::showAudioSetup()
 #ifdef BOXMODEL_APOLLO
 	delete as_oj_noise;
 #endif
+	if (!g_settings.easymenu)
+		CZapit::getInstance()->SetVolumePercent(g_settings.audio_volume_percent_ac3, g_settings.audio_volume_percent_pcm);
+
 	return res;
 }
 
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 0fcf9c9bb..afff882d1 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -365,6 +365,9 @@ int CNeutrinoApp::loadSetup(const char * fname)
 	if (g_settings.start_volume >= 0)
 		g_settings.current_volume = g_settings.start_volume;
 
+	g_settings.audio_volume_percent_ac3 = configfile.getInt32("audio_volume_percent_ac3", 100);
+	g_settings.audio_volume_percent_pcm = configfile.getInt32("audio_volume_percent_pcm", 100);
+
 	g_settings.channel_mode = configfile.getInt32("channel_mode", LIST_MODE_PROV);
 	g_settings.channel_mode_radio = configfile.getInt32("channel_mode_radio", LIST_MODE_PROV);
 	g_settings.channel_mode_initial = configfile.getInt32("channel_mode_initial", -1);
@@ -908,6 +911,8 @@ void CNeutrinoApp::saveSetup(const char * fname)
 	configfile.setInt32( "current_volume", g_settings.current_volume );
 	configfile.setInt32( "current_volume_step", g_settings.current_volume_step );
 	configfile.setInt32( "start_volume", g_settings.start_volume );
+	configfile.setInt32("audio_volume_percent_ac3", g_settings.audio_volume_percent_ac3);
+	configfile.setInt32("audio_volume_percent_pcm", g_settings.audio_volume_percent_pcm);
 	configfile.setInt32( "channel_mode", g_settings.channel_mode );
 	configfile.setInt32( "channel_mode_radio", g_settings.channel_mode_radio );
 	configfile.setInt32( "channel_mode_initial", g_settings.channel_mode_initial );
@@ -2011,6 +2016,7 @@ TIMER_START();
 	g_audioMute = CAudioMute::getInstance();
 
 	g_audioMute->AudioMute(current_muted, true);
+	CZapit::getInstance()->SetVolumePercent(g_settings.audio_volume_percent_ac3, g_settings.audio_volume_percent_pcm);
 	CVFD::getInstance()->showVolume(g_settings.current_volume);
 	CVFD::getInstance()->setMuted(current_muted);
 
diff --git a/src/system/locals.h b/src/system/locals.h
index 4ba59ef14..6d9e28afd 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -155,6 +155,10 @@ typedef enum
 	LOCALE_AUDIOMENU_SPDIF_DD,
 	LOCALE_AUDIOMENU_STEREO,
 	LOCALE_AUDIOMENU_VOLUME_ADJUST,
+	LOCALE_AUDIOMENU_VOLUME_ADJUSTMENT,
+	LOCALE_AUDIOMENU_VOLUME_ADJUSTMENT_AC3,
+	LOCALE_AUDIOMENU_VOLUME_ADJUSTMENT_CLEAR,
+	LOCALE_AUDIOMENU_VOLUME_ADJUSTMENT_PCM,
 	LOCALE_AUDIOMENU_VOLUME_START,
 	LOCALE_AUDIOMENU_VOLUME_STEP,
 	LOCALE_AUDIOPLAYER_ADD,
@@ -907,6 +911,9 @@ typedef enum
 	LOCALE_MENU_HINT_A_PIC,
 	LOCALE_MENU_HINT_APLAY,
 	LOCALE_MENU_HINT_AUDIO,
+	LOCALE_MENU_HINT_AUDIO_ADJUST_VOL_AC3,
+	LOCALE_MENU_HINT_AUDIO_ADJUST_VOL_CLEAR,
+	LOCALE_MENU_HINT_AUDIO_ADJUST_VOL_PCM,
 	LOCALE_MENU_HINT_AUDIO_ANALOG_MODE,
 	LOCALE_MENU_HINT_AUDIO_AVSYNC,
 	LOCALE_MENU_HINT_AUDIO_DD,
diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h
index 76bf3d59b..18e8301a7 100644
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -155,6 +155,10 @@ const char * locale_real_names[] =
 	"audiomenu.spdif_dd",
 	"audiomenu.stereo",
 	"audiomenu.volume_adjust",
+	"audiomenu.volume_adjustment",
+	"audiomenu.volume_adjustment_ac3",
+	"audiomenu.volume_adjustment_clear",
+	"audiomenu.volume_adjustment_pcm",
 	"audiomenu.volume_start",
 	"audiomenu.volume_step",
 	"audioplayer.add",
@@ -907,6 +911,9 @@ const char * locale_real_names[] =
 	"menu.hint_a_pic",
 	"menu.hint_aplay",
 	"menu.hint_audio",
+	"menu.hint_audio_adjust_vol_ac3",
+	"menu.hint_audio_adjust_vol_clear",
+	"menu.hint_audio_adjust_vol_pcm",
 	"menu.hint_audio_analog_mode",
 	"menu.hint_audio_avsync",
 	"menu.hint_audio_dd",
diff --git a/src/system/settings.h b/src/system/settings.h
index 69da00d5b..9100c29d0 100644
--- a/src/system/settings.h
+++ b/src/system/settings.h
@@ -120,6 +120,8 @@ struct SNeutrinoSettings
 	int video_43mode;
 #ifdef BOXMODEL_APOLLO
 	int brightness;
+	int audio_volume_percent_ac3;
+	int audio_volume_percent_pcm;
 	int contrast;
 	int saturation;
 	int enable_sd_osd;
diff --git a/src/zapit/include/zapit/zapit.h b/src/zapit/include/zapit/zapit.h
index e2c45e421..a60c79fb5 100644
--- a/src/zapit/include/zapit/zapit.h
+++ b/src/zapit/include/zapit/zapit.h
@@ -35,9 +35,6 @@ typedef std::multimap<t_channel_id, pid_pair_t> volume_map_t;
 typedef volume_map_t::iterator volume_map_iterator_t;
 typedef std::pair<volume_map_iterator_t,volume_map_iterator_t> volume_map_range_t;
 
-#define VOLUME_PERCENT_AC3 100
-#define VOLUME_PERCENT_PCM 100
-
 /* complete zapit start thread-parameters in a struct */
 typedef struct ZAPIT_start_arg
 {
@@ -148,6 +145,9 @@ class CZapit : public OpenThreads::Thread
 
 		audio_map_t audio_map;
 		volume_map_t vol_map;
+		OpenThreads::Mutex vol_map_mutex;
+		int volume_percent_ac3;
+		int volume_percent_pcm;
 		//bool current_is_nvod;
 		//bool standby;
 		t_channel_id  lastChannelRadio;
@@ -210,6 +210,7 @@ class CZapit : public OpenThreads::Thread
 	public:
 		~CZapit();
 		static CZapit * getInstance();
+		void ClearVolumeMap();
 
 		virtual void LoadSettings();
 		virtual bool Start(Z_start_arg* ZapStart_arg);
@@ -262,6 +263,7 @@ class CZapit : public OpenThreads::Thread
 		void SetVolume(int vol);
 		int GetVolume() { return current_volume; };
 		int SetVolumePercent(int percent);
+		void SetVolumePercent(int default_ac3, int default_pcm);
 		bool StartPip(const t_channel_id channel_id);
 		bool StopPip();
 		void Lock() { mutex.lock(); }
diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp
index 03ac882e5..7effd06d5 100644
--- a/src/zapit/src/zapit.cpp
+++ b/src/zapit/src/zapit.cpp
@@ -71,6 +71,7 @@
 
 #include <driver/abstime.h>
 #include <libdvbsub/dvbsub.h>
+#include <OpenThreads/ScopedLock>
 #include <libtuxtxt/teletext.h>
 #include <OpenThreads/ScopedLock>
 
@@ -252,6 +253,7 @@ void CZapit::SaveAudioMap()
 
 void CZapit::LoadVolumeMap()
 {
+	OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(vol_map_mutex);
 	vol_map.clear();
 	FILE *volume_config_file = fopen(VOLUME_CONFIG_FILE, "r");
 	if (!volume_config_file) {
@@ -271,6 +273,7 @@ void CZapit::LoadVolumeMap()
 
 void CZapit::SaveVolumeMap()
 {
+	OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(vol_map_mutex);
 	FILE *volume_config_file = fopen(VOLUME_CONFIG_FILE, "w");
 	if (!volume_config_file) {
 		perror(VOLUME_CONFIG_FILE);
@@ -283,6 +286,21 @@ void CZapit::SaveVolumeMap()
 	fclose(volume_config_file);
 }
 
+void CZapit::ClearVolumeMap()
+{
+	OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(vol_map_mutex);
+	vol_map.clear();
+	unlink(VOLUME_CONFIG_FILE);
+	if (current_channel) {
+		CZapitAudioChannel *currentAudioChannel = current_channel->getAudioChannel();
+		if (currentAudioChannel && currentAudioChannel->audioChannelType == CZapitAudioChannel::AC3) {
+			SetVolumePercent(volume_percent_ac3);
+			return;
+		}
+	}
+	SetVolumePercent(volume_percent_pcm);
+}
+
 void CZapit::LoadSettings()
 {
 	if (!configfile.loadConfig(CONFIGFILE))
@@ -781,7 +799,7 @@ void CZapit::SetPidVolume(t_channel_id channel_id, int pid, int percent)
 
 	if (!pid && (channel_id == live_channel_id) && current_channel)
 		pid = current_channel->getAudioPid();
-
+	OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(vol_map_mutex);
 INFO("############################### channel %" PRIx64 " pid %x map size %d percent %d", channel_id, pid, (int)vol_map.size(), percent);
 	volume_map_range_t pids = vol_map.equal_range(channel_id);
 	for (volume_map_iterator_t it = pids.first; it != pids.second; ++it) {
@@ -804,6 +822,7 @@ int CZapit::GetPidVolume(t_channel_id channel_id, int pid, bool ac3)
 	if (!pid && (channel_id == live_channel_id) && current_channel)
 		pid = current_channel->getAudioPid();
 
+	OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(vol_map_mutex);
 	volume_map_range_t pids = vol_map.equal_range(channel_id);
 	for (volume_map_iterator_t it = pids.first; it != pids.second; ++it) {
 		if (it->second.first == pid) {
@@ -812,12 +831,12 @@ int CZapit::GetPidVolume(t_channel_id channel_id, int pid, bool ac3)
 		}
 	}
 	if (percent < 0) {
-		percent = ac3 ? VOLUME_PERCENT_AC3 : VOLUME_PERCENT_PCM;
+		percent = ac3 ? volume_percent_ac3 : volume_percent_pcm;
 		if ((channel_id == live_channel_id) && current_channel) {
 			for (int  i = 0; i < current_channel->getAudioChannelCount(); i++) {
 				if (pid == current_channel->getAudioPid(i)) {
 					percent = current_channel->getAudioChannel(i)->audioChannelType == CZapitAudioChannel::AC3 ?
-						VOLUME_PERCENT_AC3 : VOLUME_PERCENT_PCM;
+						volume_percent_ac3 : volume_percent_pcm;
 					break;
 				}
 			}
@@ -852,6 +871,12 @@ int CZapit::SetVolumePercent(int percent)
 	return ret;
 }
 
+void CZapit::SetVolumePercent(int default_ac3, int default_pcm)
+{
+	volume_percent_ac3 = default_ac3;
+	volume_percent_pcm = default_pcm;
+}
+
 void CZapit::SetAudioStreamType(CZapitAudioChannel::ZapitAudioChannelType audioChannelType)
 {
 	const char *audioStr = "UNKNOWN";
@@ -2351,7 +2376,8 @@ bool CZapit::Start(Z_start_arg *ZapStart_arg)
 
 	videoDecoder->SetAudioHandle(audioDecoder->GetHandle());
 
-	/* set initial volume with 100% */
+	volume_percent_ac3 = 100;
+	volume_percent_pcm = 100;
 	SetVolumePercent(100);
 #ifdef USE_VBI
 	videoDecoder->OpenVBI(1);

From e964a137634eb55777f5e16c7dd2ec1db204cef4 Mon Sep 17 00:00:00 2001
From: "M. Liebmann" <tuxcode.bbg@gmail.com>
Date: Mon, 24 Nov 2014 17:38:21 +0100
Subject: [PATCH 074/113] Fix commit 421da2c0cf1844b2efc5935e868db92141f17489
 for build on nevis

---
 src/system/settings.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/system/settings.h b/src/system/settings.h
index 9100c29d0..a1e325bd7 100644
--- a/src/system/settings.h
+++ b/src/system/settings.h
@@ -120,8 +120,6 @@ struct SNeutrinoSettings
 	int video_43mode;
 #ifdef BOXMODEL_APOLLO
 	int brightness;
-	int audio_volume_percent_ac3;
-	int audio_volume_percent_pcm;
 	int contrast;
 	int saturation;
 	int enable_sd_osd;
@@ -181,6 +179,9 @@ struct SNeutrinoSettings
 	int hdmi_dd;
 	int spdif_dd;
 	int analog_out;
+	int audio_volume_percent_ac3;
+	int audio_volume_percent_pcm;
+
 	//video
 	int video_dbdr;
 	int hdmi_cec_mode;

From 36b14e31ef0bcf2571e882609f2a5eefc011d775 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Wed, 26 Nov 2014 10:45:29 +0300
Subject: [PATCH 075/113] gui/channellist.cpp: bug fix, default copy
 constructor is danger, if class have pointers

---
 src/gui/channellist.cpp | 1 -
 src/gui/channellist.h   | 1 +
 src/neutrino.cpp        | 6 ++----
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index e1bd25d51..8e2d84f7e 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -119,7 +119,6 @@ CChannelList::CChannelList(const char * const pName, bool phistoryMode, bool _vl
 
 CChannelList::~CChannelList()
 {
-	chanlist->clear();
 	if(dline){
 		delete dline;
 		dline = NULL;
diff --git a/src/gui/channellist.h b/src/gui/channellist.h
index 964aa0a81..6f9102ec5 100644
--- a/src/gui/channellist.h
+++ b/src/gui/channellist.h
@@ -236,6 +236,7 @@ public:
 		SORT_MAX
 	};
 	unsigned Size() { return (*chanlist).size(); }
+	ZapitChannelList &getChannels() { return channels; };
 
 };
 #endif
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index afff882d1..cc3efef22 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -1363,13 +1363,11 @@ void CNeutrinoApp::channelsInit(bool bOnly)
 
 		TVallList = new CBouquetList(g_Locale->getText(LOCALE_CHANNELLIST_HEAD));
 		tmp = TVallList->addBouquet(g_Locale->getText(LOCALE_CHANNELLIST_HEAD));
-		delete tmp->channelList;
-		tmp->channelList = new CChannelList(*TVchannelList);
+		tmp->channelList->SetChannelList(&TVchannelList->getChannels());
 
 		RADIOallList = new CBouquetList(g_Locale->getText(LOCALE_CHANNELLIST_HEAD));
 		tmp = RADIOallList->addBouquet(g_Locale->getText(LOCALE_CHANNELLIST_HEAD));
-		delete tmp->channelList;
-		tmp->channelList = new CChannelList(*RADIOchannelList);
+		tmp->channelList->SetChannelList(&RADIOchannelList->getChannels());
 
 		if(TVsatList) delete TVsatList;
 		TVsatList = new CBouquetList(g_Locale->getText(LOCALE_CHANNELLIST_SATS));

From 8c3b26fc762a1a5dc11bab47725eb0e46c050408 Mon Sep 17 00:00:00 2001
From: "M. Liebmann" <tuxcode.bbg@gmail.com>
Date: Wed, 26 Nov 2014 09:27:59 +0100
Subject: [PATCH 076/113] CColorChooser: Preview color gradient for header
 color

---
 src/gui/osd_setup.cpp           |  2 ++
 src/gui/widget/colorchooser.cpp | 27 +++++++++++++++++++++++----
 src/gui/widget/colorchooser.h   |  9 ++++++++-
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp
index 5f83b0826..b4a97f363 100644
--- a/src/gui/osd_setup.cpp
+++ b/src/gui/osd_setup.cpp
@@ -642,8 +642,10 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors)
 
 	CColorChooser* chHeadcolor = new CColorChooser(LOCALE_COLORMENU_BACKGROUND, &t.menu_Head_red, &t.menu_Head_green, &t.menu_Head_blue,
 			&t.menu_Head_alpha, colorSetupNotifier);
+	chHeadcolor->setGradient(CColorChooser::gradient_head_body);
 	CColorChooser* chHeadTextcolor = new CColorChooser(LOCALE_COLORMENU_TEXTCOLOR, &t.menu_Head_Text_red, &t.menu_Head_Text_green, &t.menu_Head_Text_blue,
 			NULL, colorSetupNotifier);
+	chHeadTextcolor->setGradient(CColorChooser::gradient_head_text);
 	CColorChooser* chContentcolor = new CColorChooser(LOCALE_COLORMENU_BACKGROUND, &t.menu_Content_red, &t.menu_Content_green, &t.menu_Content_blue,
 			&t.menu_Content_alpha, colorSetupNotifier);
 	CColorChooser* chContentTextcolor = new CColorChooser(LOCALE_COLORMENU_TEXTCOLOR, &t.menu_Content_Text_red, &t.menu_Content_Text_green, &t.menu_Content_Text_blue,
diff --git a/src/gui/widget/colorchooser.cpp b/src/gui/widget/colorchooser.cpp
index 7ba47384e..8f758dc45 100644
--- a/src/gui/widget/colorchooser.cpp
+++ b/src/gui/widget/colorchooser.cpp
@@ -95,11 +95,28 @@ CColorChooser::CColorChooser(const neutrino_locale_t Name, unsigned char *R, uns
 	value[VALUE_G]     = G;
 	value[VALUE_B]     = B;
 	value[VALUE_ALPHA] = Alpha;
+
+	chooser_gradient = gradient_none;
 }
 
 void CColorChooser::setColor()
 {
-	frameBuffer->paintBoxRel(x+offset+162,y+hheight+2+5,  mheight*4-4 ,mheight*4-4-10, getColor());
+	fb_pixel_t col = getColor();
+	int x_col = x+offset+160;
+	int y_col = y+hheight+5;
+	int w_col = mheight*4;
+	int h_col = mheight*4-10;
+
+	if ((g_settings.gradiant) && ((chooser_gradient == gradient_head_body) || (chooser_gradient == gradient_head_text))) {
+		CComponentsHeader header(x_col, y_col+((h_col-hheight)/2), w_col, hheight, "Head");
+		if (chooser_gradient == gradient_head_body)
+			header.setColorBody(col);
+		else if (chooser_gradient == gradient_head_text)
+			header.setCaptionColor(col);
+		header.paint(CC_SAVE_SCREEN_NO);
+	}
+	else
+		frameBuffer->paintBoxRel(x_col+2, y_col+2, w_col-4 , h_col-4, col);
 }
 
 fb_pixel_t CColorChooser::getColor()
@@ -253,9 +270,11 @@ void CColorChooser::paint()
 	for (int i = 0; i < 4; i++)
 		paintSlider(x + 10, y + hheight + mheight * i, value[i], colorchooser_names[i], iconnames[i], (i == 0));
 
-	//color preview
-	frameBuffer->paintBoxRel(x+offset+160,y+hheight+5,    mheight*4,   mheight*4-10, COL_MENUHEAD_PLUS_0);
-	frameBuffer->paintBoxRel(x+offset+162,y+hheight+2+5,  mheight*4-4 ,mheight*4-4-10, 254);
+	if ((!g_settings.gradiant) || ((chooser_gradient != gradient_head_body) && (chooser_gradient != gradient_head_text))) {
+		//color preview
+		frameBuffer->paintBoxRel(x+offset+160,y+hheight+5,    mheight*4,   mheight*4-10, COL_MENUHEAD_PLUS_0);
+		frameBuffer->paintBoxRel(x+offset+162,y+hheight+2+5,  mheight*4-4 ,mheight*4-4-10, 254);
+	}
 }
 
 void CColorChooser::paintSlider(int px, int py, unsigned char *spos, const neutrino_locale_t text, const char * const iconname, const bool selected)
diff --git a/src/gui/widget/colorchooser.h b/src/gui/widget/colorchooser.h
index f2ff70c90..5ecc64ec6 100644
--- a/src/gui/widget/colorchooser.h
+++ b/src/gui/widget/colorchooser.h
@@ -50,6 +50,7 @@ class CColorChooser : public CMenuTarget
 		int hheight,mheight; // head/menu font height
 		int offset;
 		int font_info;
+		int chooser_gradient;
 
 		unsigned char * value[4]; // r, g, b, alpha
 
@@ -68,7 +69,13 @@ class CColorChooser : public CMenuTarget
 		void hide();
 		int exec(CMenuTarget* parent, const std::string & actionKey);
 		fb_pixel_t getColor(void);
-
+		enum
+		{
+			gradient_none,
+			gradient_head_body,
+			gradient_head_text
+		};
+		void setGradient(int gradient = gradient_none) { chooser_gradient = gradient; };
 };
 
 

From d3e52fa9f67e17207a1e819a93c2dcea8d8ad789 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Wed, 26 Nov 2014 08:58:59 +0100
Subject: [PATCH 077/113] - luainstance: switch to lua_Integer/lua_Unsigned

---
 src/gui/luainstance.cpp | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/gui/luainstance.cpp b/src/gui/luainstance.cpp
index 7a2aebb64..dbe71aac1 100644
--- a/src/gui/luainstance.cpp
+++ b/src/gui/luainstance.cpp
@@ -1198,7 +1198,7 @@ int CLuaInstance::MenuNew(lua_State *L)
 		std::string name, icon;
 		tableLookup(L, "name", name) || tableLookup(L, "title", name);
 		tableLookup(L, "icon", icon);
-		int mwidth;
+		lua_Integer mwidth;
 		if(tableLookup(L, "mwidth", mwidth))
 			m = new CMenuWidget(name.c_str(), icon.c_str(), mwidth);
 		else
@@ -1242,8 +1242,8 @@ int CLuaInstance::MenuAddKey(lua_State *L)
 
 	std::string action;	tableLookup(L, "action", action);
 	std::string id;		tableLookup(L, "id", id);
-	int directkey = CRCInput::RC_nokey; tableLookup(L, "directkey", directkey);
-	if (action != "" && directkey != (int) CRCInput::RC_nokey) {
+	lua_Unsigned directkey = CRCInput::RC_nokey; tableLookup(L, "directkey", directkey);
+	if ((action != "") && (directkey != CRCInput::RC_nokey)) {
 		CLuaMenuForwarder *forwarder = new CLuaMenuForwarder(L, action, id);
 		m->m->addKey(directkey, forwarder, action);
 		m->targets.push_back(forwarder);
@@ -1303,8 +1303,8 @@ int CLuaInstance::MenuAddItem(lua_State *L)
                         m->tofree.push_back(icon);
                 }
 
-		int directkey = CRCInput::RC_nokey; tableLookup(L, "directkey", directkey);
-		int pulldown = false; 	tableLookup(L, "pulldown", pulldown);
+		lua_Unsigned directkey = CRCInput::RC_nokey; tableLookup(L, "directkey", directkey);
+		lua_Integer pulldown = false; 	tableLookup(L, "pulldown", pulldown);
 
 		bool enabled = true;
 		if (!(tableLookup(L, "enabled", enabled) || tableLookup(L, "active", enabled)))
@@ -1375,14 +1375,14 @@ int CLuaInstance::MenuAddItem(lua_State *L)
 			b->str_val = value;
 			std::string valid_chars = "abcdefghijklmnopqrstuvwxyz0123456789!\"§$%&/()=?-. ";
 			tableLookup(L, "valid_chars", valid_chars);
-			int sms = 0;	tableLookup(L, "sms", sms);
-			int size = 30;	tableLookup(L, "size", size);
+			lua_Integer sms = 0;	tableLookup(L, "sms", sms);
+			lua_Integer size = 30;	tableLookup(L, "size", size);
 			CLuaMenuStringinput *stringinput = new CLuaMenuStringinput(L, action, id, b->name.c_str(), &b->str_val, size, valid_chars, m->observ, icon, sms);
 			mi = new CMenuForwarder(b->name, enabled, b->str_val, stringinput, NULL/*ActionKey*/, directkey, icon, right_icon);
 			m->targets.push_back(stringinput);
 		} else if (type == "keyboardinput") {
 			b->str_val = value;
-			int size = 0;		tableLookup(L, "size", size);
+			lua_Integer size = 0;	tableLookup(L, "size", size);
 			std::string help = "";	tableLookup(L, "help", help);
 			std::string help2 = "";	tableLookup(L, "help2", help2);
 			CLuaMenuKeyboardinput *keyboardinput = new CLuaMenuKeyboardinput(L, action, id, b->name.c_str(), &b->str_val, size, m->observ, icon, help, help2);
@@ -1390,7 +1390,7 @@ int CLuaInstance::MenuAddItem(lua_State *L)
 			m->targets.push_back(keyboardinput);
 		} else if (type == "filebrowser") {
 			b->str_val = value;
-			int dirMode = 0; tableLookup(L, "dir_mode", dirMode);
+			lua_Integer dirMode = 0; tableLookup(L, "dir_mode", dirMode);
 			CLuaMenuFilebrowser *filebrowser = new CLuaMenuFilebrowser(L, action, id, &b->str_val, dirMode);
 			lua_pushstring(L, "filter");
 			lua_gettable(L, -2);
@@ -1478,7 +1478,7 @@ int CLuaInstance::HintboxNew(lua_State *L)
 	tableLookup(L, "name", name) || tableLookup(L, "title", name) || tableLookup(L, "caption", name);
 	tableLookup(L, "text", text);
 	tableLookup(L, "icon", icon);
-	int width = 450;
+	lua_Integer width = 450;
 	tableLookup(L, "width", width);
 
 	CLuaHintbox **udata = (CLuaHintbox **) lua_newuserdata(L, sizeof(CLuaHintbox *));
@@ -1600,7 +1600,7 @@ int CLuaInstance::MessageboxExec(lua_State *L)
 	tableLookup(L, "name", name) || tableLookup(L, "title", name) || tableLookup(L, "caption", name);
 	tableLookup(L, "text", text);
 	tableLookup(L, "icon", icon);
-	int timeout = -1, width = 450, return_default_on_timeout = 0, show_buttons = 0, default_button = 0;
+	lua_Integer timeout = -1, width = 450, return_default_on_timeout = 0, show_buttons = 0, default_button = 0;
 	tableLookup(L, "timeout", timeout);
 	tableLookup(L, "width", width);
 	tableLookup(L, "return_default_on_timeout", return_default_on_timeout);
@@ -1714,7 +1714,7 @@ int CLuaInstance::CWindowNew(lua_State *L)
 	std::string btnGreen     = "";
 	std::string btnYellow    = "";
 	std::string btnBlue      = "";
-	int x = 100, y = 100, dx = 450, dy = 250;
+	lua_Integer x = 100, y = 100, dx = 450, dy = 250;
 	tableLookup(L, "x", x);
 	tableLookup(L, "y", y);
 	tableLookup(L, "dx", dx);
@@ -1969,8 +1969,8 @@ int CLuaInstance::SignalBoxNew(lua_State *L)
 	lua_assert(lua_istable(L,1));
 
 	std::string name, icon = std::string(NEUTRINO_ICON_INFO);
-	int x = 110, y = 150, dx = 430, dy = 150;
-	int vertical = true;
+	lua_Integer x = 110, y = 150, dx = 430, dy = 150;
+	lua_Integer vertical = true;
 	CLuaCWindow* parent = NULL;
 	tableLookup(L, "x", x);
 	tableLookup(L, "y", y);
@@ -2048,11 +2048,11 @@ int CLuaInstance::ComponentsTextNew(lua_State *L)
 	lua_assert(lua_istable(L,1));
 
 	CLuaCWindow* parent = NULL;
-	int x=10, y=10, dx=100, dy=100;
+	lua_Integer x=10, y=10, dx=100, dy=100;
 	std::string text         = "";
 	std::string tmpMode      = "";
-	int         mode         = CTextBox::AUTO_WIDTH;
-	int         font_text    = SNeutrinoSettings::FONT_TYPE_MENU;
+	lua_Integer mode         = CTextBox::AUTO_WIDTH;
+	lua_Integer font_text    = SNeutrinoSettings::FONT_TYPE_MENU;
 	lua_Unsigned color_text   = (lua_Unsigned)COL_MENUCONTENT_TEXT;
 	lua_Unsigned color_frame  = (lua_Unsigned)COL_MENUCONTENT_PLUS_6;
 	lua_Unsigned color_body   = (lua_Unsigned)COL_MENUCONTENT_PLUS_0;

From dfc7a1d3045ea61e9f1e761d40ab9d1ea7f7eb6a Mon Sep 17 00:00:00 2001
From: TangoCash <DaHooD@web.de>
Date: Wed, 26 Nov 2014 09:57:17 +0100
Subject: [PATCH 078/113] - movieplayer: add playlist_manager

NOTE: This is a merge of several patches by TangoCash
      for neutrino-mp aligned to neutrino-hd.
      We use 'play' key to open playlist_manager.
---
 data/locale/deutsch.locale |   2 +
 data/locale/english.locale |   2 +
 src/gui/filebrowser.cpp    | 214 ++++++++++++++++++++++++++++++++++++-
 src/gui/filebrowser.h      |   2 +
 src/gui/movieplayer.cpp    |  16 +++
 src/system/locals.h        |   2 +
 src/system/locals_intern.h |   2 +
 7 files changed, 235 insertions(+), 5 deletions(-)

diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index 6c58d4911..2db967ba5 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -532,6 +532,7 @@ favorites.copy Kopiere Bouquet zu Favoriten
 favorites.finalhint \nVersehentlich hinzugefügte Kanäle können mit\nder Bouquetverwaltung korrigiert werden.\n
 favorites.menueadd Kanal Favoriten hinzufügen
 favorites.nobouquets Favoriten sind nur mit aktivierten Bouquets möglich.
+filebrowser.add Hinzufügen
 filebrowser.delete Löschen
 filebrowser.denydirectoryleave Startverzeichnis absolut
 filebrowser.dodelete1 Soll
@@ -541,6 +542,7 @@ filebrowser.filter.inactive Filter aus
 filebrowser.head Dateibrowser
 filebrowser.mark Markieren
 filebrowser.nextpage Seite vor
+filebrowser.pm Playlist Manager
 filebrowser.prevpage Seite zurück
 filebrowser.scan Durchsuche Verzeichnisse
 filebrowser.select Auswählen
diff --git a/data/locale/english.locale b/data/locale/english.locale
index dae69ce6b..bee72c1cd 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -532,6 +532,7 @@ favorites.copy Copy bouquet to Favorites
 favorites.finalhint \nUse the bouqueteditor to modify your favorites.\n
 favorites.menueadd add channel to favorites
 favorites.nobouquets Favorites are available with activated Bouquets only.
+filebrowser.add Add
 filebrowser.delete Delete
 filebrowser.denydirectoryleave Absolute start directory
 filebrowser.dodelete1 Delete
@@ -541,6 +542,7 @@ filebrowser.filter.inactive Filter off
 filebrowser.head Filebrowser
 filebrowser.mark Mark
 filebrowser.nextpage Next Page
+filebrowser.pm Playlist Manager
 filebrowser.prevpage Prev. Page
 filebrowser.scan Scaning folder
 filebrowser.select Select
diff --git a/src/gui/filebrowser.cpp b/src/gui/filebrowser.cpp
index bce3e01eb..8b258c500 100644
--- a/src/gui/filebrowser.cpp
+++ b/src/gui/filebrowser.cpp
@@ -597,6 +597,7 @@ bool CFileBrowser::exec(const char * const dirname)
 	bool res = false;
 	menu_ret = menu_return::RETURN_REPAINT;
 
+	playlistmode = false;
 #ifdef ENABLE_INTERNETRADIO
 	if (m_Mode == ModeSC) {
 		m_baseurl = base;
@@ -905,6 +906,187 @@ bool CFileBrowser::exec(const char * const dirname)
 	return res;
 }
 
+bool CFileBrowser::playlist_manager(CFileList &playlist, unsigned int playing)
+{
+	neutrino_msg_t      msg;
+	neutrino_msg_data_t data;
+
+	bool res = false;
+	menu_ret = menu_return::RETURN_REPAINT;
+
+	filelist = playlist;
+	playlistmode = true;
+
+	fontInit();
+	paintHead();
+	selected = playing;
+
+	unsigned int oldselected = selected;
+
+	paint();
+	paintFoot();
+
+	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_FILEBROWSER]);
+
+	bool loop=true;
+	while (loop)
+	{
+		frameBuffer->blit();
+		g_RCInput->getMsgAbsoluteTimeout( &msg, &data, &timeoutEnd );
+		neutrino_msg_t msg_repeatok = msg & ~CRCInput::RC_Repeat;
+
+		if (msg <= CRCInput::RC_MaxRC)
+			timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_FILEBROWSER]);
+
+		if(!CRCInput::isNumeric(msg))
+		{
+			m_SMSKeyInput.resetOldKey();
+			paintSMSKey();
+		}
+		if (msg == CRCInput::RC_home)
+		{
+			loop = false;
+		}
+		else if (msg == NeutrinoMessages::STANDBY_ON ||
+				msg == NeutrinoMessages::SHUTDOWN ||
+				msg == NeutrinoMessages::SLEEPTIMER)
+		{
+			menu_ret = menu_return::RETURN_EXIT_ALL;
+			loop = false;
+			g_RCInput->postMsg(msg, data);
+		}
+		else if (msg == CRCInput::RC_timeout)
+		{
+			selected = oldselected;
+			loop = false;
+		}
+		else if (msg > CRCInput::RC_MaxRC)
+		{
+			if (CNeutrinoApp::getInstance()->handleMsg( msg, data ) & messages_return::cancel_all) {
+				menu_ret = menu_return::RETURN_EXIT_ALL;
+				loop = false;
+			}
+		}
+		if ((filelist.empty()))
+			continue;
+
+		if (msg_repeatok == CRCInput::RC_up)
+		{
+			unsigned int prevselected=selected;
+			unsigned int prevliststart = liststart;
+			if (selected)
+				selected --;
+			else
+				selected = filelist.size() - 1;
+			liststart = (selected/listmaxshow)*listmaxshow;
+			if(prevliststart != liststart)
+			{
+				paint();
+			}
+			else
+			{
+				paintItem(prevselected - prevliststart);
+				paintItem(selected - liststart);
+			}
+		}
+		else if (msg_repeatok == CRCInput::RC_down)
+		{
+			unsigned int prevselected=selected;
+			unsigned int prevliststart = liststart;
+			selected = (selected + 1) % filelist.size();
+			liststart = (selected/listmaxshow)*listmaxshow;
+			if(prevliststart != liststart)
+			{
+				paint();
+			}
+			else
+			{
+				paintItem(prevselected - prevliststart);
+				paintItem(selected - liststart);
+			}
+		}
+		else if (msg == (neutrino_msg_t) g_settings.key_pagedown)
+		{
+			unsigned int last = filelist.size() - 1;
+			if (selected != last && selected + listmaxshow >= filelist.size()) {
+				selected = last;
+			} else {
+				selected = (selected == last) ? 0 : selected + listmaxshow;
+				liststart = (selected / listmaxshow) * listmaxshow;
+			}
+			paint();
+		}
+		else if (msg == (neutrino_msg_t) g_settings.key_pageup)
+		{
+			if (selected && selected < listmaxshow) {
+				selected = 0;
+			} else {
+				selected = selected ? selected - listmaxshow : filelist.size() - 1;
+				liststart = (selected/listmaxshow)*listmaxshow;
+			}
+			paint();
+		}
+		else if (msg == CRCInput::RC_red)
+		{
+			if (filelist.size() > 1)
+			{
+				filelist.erase(filelist.begin()+selected);
+				if (selected) selected --;
+			}
+			paint();
+		}
+		else if (msg == CRCInput::RC_green)
+		{
+			CFileBrowser *addfiles = new CFileBrowser;
+			addfiles->Hide_records = true;
+			addfiles->Multi_Select = true;
+			addfiles->Dirs_Selectable = true;
+			addfiles->exec(g_settings.network_nfs_moviedir.c_str());
+			CFileList tmplist = addfiles->getSelectedFiles();
+			filelist.insert( filelist.end(), tmplist.begin(), tmplist.end() );
+			tmplist.clear();
+			delete addfiles;
+			paintHead();
+			paint();
+			paintFoot();
+		}
+		else if (msg == CRCInput::RC_yellow )
+		{
+			if (++g_settings.filebrowser_sortmethod >= FILEBROWSER_NUMBER_OF_SORT_VARIANTS)
+				g_settings.filebrowser_sortmethod = 0;
+
+			sort(filelist.begin(), filelist.end(), sortBy[g_settings.filebrowser_sortmethod]);
+
+			paint();
+			paintFoot();
+		}
+		else if (msg == CRCInput::RC_blue )
+		{
+			std::random_shuffle ( filelist.begin(), filelist.end() );
+			selected = 0;
+			paint();
+			paintFoot();
+		}
+		else if (msg == CRCInput::RC_ok)
+		{
+			filelist[selected].Marked = true;
+			loop = false;
+			res = true;
+		}
+		else if (CRCInput::isNumeric(msg_repeatok))
+		{
+			SMSInput(msg_repeatok);
+		}
+	}
+
+	hide();
+	frameBuffer->blit();
+
+	playlist = filelist;
+
+	return res;
+}
+
 void CFileBrowser::addRecursiveDir(CFileList * re_filelist, std::string rpath, bool bRootCall, CProgressWindow * progress)
 {
 	neutrino_msg_t      msg;
@@ -1115,7 +1297,7 @@ void CFileBrowser::paintHead()
 		l = asprintf(&l_name, "%s %s", g_Locale->getText(LOCALE_AUDIOPLAYER_ADD_SC), FILESYSTEM_ENCODING_TO_UTF8_STRING(name).c_str());
 	else
 #endif
-		l = asprintf(&l_name, "%s %s", g_Locale->getText(LOCALE_FILEBROWSER_HEAD), FILESYSTEM_ENCODING_TO_UTF8_STRING(name).c_str());
+		l = asprintf(&l_name, "%s %s", g_Locale->getText(playlistmode ? LOCALE_FILEBROWSER_PM : LOCALE_FILEBROWSER_HEAD), FILESYSTEM_ENCODING_TO_UTF8_STRING(name).c_str());
 
 	if (l < 1) /* at least 1 for the " " space */
 	{
@@ -1176,6 +1358,8 @@ const struct button_label FileBrowserFilterButton[2] =
 
 int CFileBrowser::paintFoot(bool show)
 {
+	int cnt,res;
+
 	std::string sort_text = g_Locale->getText(LOCALE_MOVIEBROWSER_FOOT_SORT);
 	sort_text += g_Locale->getText(sortByNames[g_settings.filebrowser_sortmethod]);
 
@@ -1190,6 +1374,15 @@ int CFileBrowser::paintFoot(bool show)
 	if (Filter != NULL && use_filter)
 		f_loc = LOCALE_FILEBROWSER_FILTER_ACTIVE;
 
+	button_label_ext footerButtons_pm[] = {
+		{ NEUTRINO_ICON_BUTTON_RED,		LOCALE_FILEBROWSER_DELETE,	NULL,			0,		false },
+		{ NEUTRINO_ICON_BUTTON_GREEN,		LOCALE_FILEBROWSER_ADD,	NULL,			0,		false },
+		{ NEUTRINO_ICON_BUTTON_YELLOW,		NONEXISTANT_LOCALE,		sort_text.c_str(),	sort_text_len,	false },
+		{ NEUTRINO_ICON_BUTTON_BLUE,		LOCALE_AUDIOPLAYER_SHUFFLE,				NULL,			0,		false },
+		{ NEUTRINO_ICON_BUTTON_OKAY,		LOCALE_FILEBROWSER_SELECT,	NULL,			0,		false },
+		{ NEUTRINO_ICON_BUTTON_PLAY,		LOCALE_FILEBROWSER_MARK,	NULL,			0,		false },
+	};
+
 	button_label_ext footerButtons[] = {
 		{ NEUTRINO_ICON_BUTTON_RED,		NONEXISTANT_LOCALE,		sort_text.c_str(),	sort_text_len,	false },
 		{ NEUTRINO_ICON_BUTTON_OKAY,		LOCALE_FILEBROWSER_SELECT,	NULL,			0,		false },
@@ -1197,17 +1390,28 @@ int CFileBrowser::paintFoot(bool show)
 		{ NEUTRINO_ICON_BUTTON_PLAY,		LOCALE_FILEBROWSER_MARK,	NULL,			0,		false },
 		{ NEUTRINO_ICON_BUTTON_BLUE,		f_loc,				NULL,			0,		false },
 	};
-	int cnt = sizeof(footerButtons) / sizeof(button_label_ext);
+
+	if (playlistmode) {
+		cnt = sizeof(footerButtons_pm) / sizeof(button_label_ext);
+		if (!show)
+			return paintButtons(footerButtons_pm, cnt, 0, 0, 0, 0, 0, false, NULL, NULL);
+	} else {
+		cnt = sizeof(footerButtons) / sizeof(button_label_ext);
+		if (!show)
+			return paintButtons(footerButtons, cnt, 0, 0, 0, 0, 0, false, NULL, NULL);
+	}
+
 	int fowidth = width - skwidth;
 
-	if (!show)
-		return paintButtons(footerButtons, cnt, 0, 0, 0, 0, 0, false, NULL, NULL);
 
 	if (filelist.empty()) {
 		frameBuffer->paintBoxRel(x, y + height - foheight, width, foheight, COL_INFOBAR_SHADOW_PLUS_1, RADIUS_MID, CORNER_BOTTOM);
 		return foheight;
 	}
-	int res = paintButtons(footerButtons, Filter ? cnt : cnt - 1, x, y + height - foheight, width, foheight, fowidth);
+	if (playlistmode)
+		res = paintButtons(footerButtons_pm, Filter ? cnt : cnt - 1, x, y + height - foheight, width, foheight, fowidth);
+	else
+		res = paintButtons(footerButtons, Filter ? cnt : cnt - 1, x, y + height - foheight, width, foheight, fowidth);
 	paintSMSKey();
 	return res;
 }
diff --git a/src/gui/filebrowser.h b/src/gui/filebrowser.h
index aa30e5015..b0f640821 100644
--- a/src/gui/filebrowser.h
+++ b/src/gui/filebrowser.h
@@ -187,6 +187,7 @@ class CFileBrowser
 		int  paintFoot(bool show = true);
 		void paintSMSKey();
 		void recursiveDelete(const char* file);
+		bool playlistmode;
 
 	protected:
 		void commonInit();
@@ -220,6 +221,7 @@ class CFileBrowser
 		~CFileBrowser();
 
 		bool		exec(const char * const dirname);
+		bool		playlist_manager(CFileList &playlist,unsigned int playing);
 		CFile		*getSelectedFile();
 		
 		inline const CFileList & getSelectedFiles(void) const
diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
index 5a7518d5c..9c6171b8c 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -885,6 +885,22 @@ void CMoviePlayerGui::PlayFileLoop(void)
 				updateLcd();
 				if (timeshift == TSHIFT_MODE_OFF)
 					callInfoViewer();
+			} else if (filelist.size() > 0) {
+				CFileBrowser playlist;
+				CFile *pfile = NULL;
+				pfile = &(*filelist_it);
+				if (playlist.playlist_manager(filelist, std::distance( filelist.begin(), filelist_it )))
+				{
+					playstate = CMoviePlayerGui::STOPPED;
+					CFile *sfile = NULL;
+					for (filelist_it = filelist.begin(); filelist_it != filelist.end(); ++filelist_it)
+					{
+						pfile = &(*filelist_it);
+						sfile = playlist.getSelectedFile();
+						if ( (sfile->getFileName() == pfile->getFileName()) && (sfile->getPath() == pfile->getPath()))
+							break;
+					}
+				}
 			}
 		} else if (msg == (neutrino_msg_t) g_settings.mpkey_pause) {
 			if (playstate == CMoviePlayerGui::PAUSE) {
diff --git a/src/system/locals.h b/src/system/locals.h
index 6d9e28afd..25932f0e7 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -559,6 +559,7 @@ typedef enum
 	LOCALE_FAVORITES_FINALHINT,
 	LOCALE_FAVORITES_MENUEADD,
 	LOCALE_FAVORITES_NOBOUQUETS,
+	LOCALE_FILEBROWSER_ADD,
 	LOCALE_FILEBROWSER_DELETE,
 	LOCALE_FILEBROWSER_DENYDIRECTORYLEAVE,
 	LOCALE_FILEBROWSER_DODELETE1,
@@ -568,6 +569,7 @@ typedef enum
 	LOCALE_FILEBROWSER_HEAD,
 	LOCALE_FILEBROWSER_MARK,
 	LOCALE_FILEBROWSER_NEXTPAGE,
+	LOCALE_FILEBROWSER_PM,
 	LOCALE_FILEBROWSER_PREVPAGE,
 	LOCALE_FILEBROWSER_SCAN,
 	LOCALE_FILEBROWSER_SELECT,
diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h
index 18e8301a7..0d50f7579 100644
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -559,6 +559,7 @@ const char * locale_real_names[] =
 	"favorites.finalhint",
 	"favorites.menueadd",
 	"favorites.nobouquets",
+	"filebrowser.add",
 	"filebrowser.delete",
 	"filebrowser.denydirectoryleave",
 	"filebrowser.dodelete1",
@@ -568,6 +569,7 @@ const char * locale_real_names[] =
 	"filebrowser.head",
 	"filebrowser.mark",
 	"filebrowser.nextpage",
+	"filebrowser.pm",
 	"filebrowser.prevpage",
 	"filebrowser.scan",
 	"filebrowser.select",

From dbd4f773326e42ad41a2143bad71a50d2c30dd0b Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Wed, 26 Nov 2014 10:14:53 +0100
Subject: [PATCH 079/113] - movieplayer: disable clock and mute while
 playlist_manager

---
 src/gui/movieplayer.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
index 9c6171b8c..c95420328 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -886,6 +886,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
 				if (timeshift == TSHIFT_MODE_OFF)
 					callInfoViewer();
 			} else if (filelist.size() > 0) {
+				EnableClockAndMute(false);
 				CFileBrowser playlist;
 				CFile *pfile = NULL;
 				pfile = &(*filelist_it);
@@ -901,6 +902,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
 							break;
 					}
 				}
+				EnableClockAndMute(true);
 			}
 		} else if (msg == (neutrino_msg_t) g_settings.mpkey_pause) {
 			if (playstate == CMoviePlayerGui::PAUSE) {

From 38687897c5b2c719d212789ba952a7412d72ccfa Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Fri, 28 Nov 2014 09:19:18 +0100
Subject: [PATCH 080/113] - themes: move user-themes to /var/tuxbox/themes ...

... because the other user-stuff (icons, locale, plugins) is also
stored in /var/tuxbox.
The directory /var/share/tuxbox/neutrino/themes will be removed.
The parent directories should now be obsolete and can be removed too.
---
 src/gui/themes.cpp | 51 +++++++++++++++++++++++++++++++++++++++-------
 src/gui/themes.h   |  1 +
 2 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/src/gui/themes.cpp b/src/gui/themes.cpp
index 3729042cd..2e9016372 100644
--- a/src/gui/themes.cpp
+++ b/src/gui/themes.cpp
@@ -51,6 +51,7 @@
 #include "themes.h"
 
 #define THEMEDIR DATADIR "/neutrino/themes/"
+#define THEMEDIR_VAR "/var/tuxbox/themes/"
 #define USERDIR "/var" THEMEDIR
 #define FILE_PREFIX ".theme"
 
@@ -81,7 +82,7 @@ int CThemes::exec(CMenuTarget* parent, const std::string & actionKey)
 			if ( strstr(themeFile.c_str(), "{U}") != 0 ) 
 			{
 				themeFile.erase(0, 3);
-				readFile((char*)((std::string)USERDIR + themeFile + FILE_PREFIX).c_str());
+				readFile((char*)((std::string)THEMEDIR_VAR + themeFile + FILE_PREFIX).c_str());
 			} 
 			else
 				readFile((char*)((std::string)THEMEDIR + themeFile + FILE_PREFIX).c_str());
@@ -103,7 +104,7 @@ void CThemes::readThemes(CMenuWidget &themes)
 {
 	struct dirent **themelist;
 	int n;
-	const char *pfade[] = {THEMEDIR, USERDIR};
+	const char *pfade[] = {THEMEDIR, THEMEDIR_VAR};
 	bool hasCVSThemes, hasUserThemes;
 	hasCVSThemes = hasUserThemes = false;
 	std::string userThemeFile = "";
@@ -146,6 +147,8 @@ void CThemes::readThemes(CMenuWidget &themes)
 
 int CThemes::Show()
 {
+	move_userDir();
+
 	std::string file_name = "";
 
 	CMenuWidget themes (LOCALE_COLORMENU_MENUCOLORS, NEUTRINO_ICON_SETTINGS, width);
@@ -160,21 +163,21 @@ int CThemes::Show()
 	CKeyboardInput nameInput(LOCALE_COLORTHEMEMENU_NAME, &file_name);
 	CMenuForwarder *m1 = new CMenuForwarder(LOCALE_COLORTHEMEMENU_SAVE, true , NULL, &nameInput, NULL, CRCInput::RC_green);
 
-	if (mkdirhier(USERDIR) && errno != EEXIST) {
-		printf("[neutrino theme] error creating %s\n", USERDIR);
+	if (mkdirhier(THEMEDIR_VAR) && errno != EEXIST) {
+		printf("[neutrino theme] error creating %s\n", THEMEDIR_VAR);
 	}
-	if (access(USERDIR, F_OK) == 0 ) {
+	if (access(THEMEDIR_VAR, F_OK) == 0 ) {
 		themes.addItem(GenericMenuSeparatorLine);
 		themes.addItem(m1);
 	} else {
 		delete m1;
-		printf("[neutrino theme] error accessing %s\n", USERDIR);
+		printf("[neutrino theme] error accessing %s\n", THEMEDIR_VAR);
 	}
 
 	int res = themes.exec(NULL, "");
 
 	if (file_name.length() > 0) {
-		saveFile((char*)((std::string)USERDIR + file_name + FILE_PREFIX).c_str());
+		saveFile((char*)((std::string)THEMEDIR_VAR + file_name + FILE_PREFIX).c_str());
 	}
 
 	if (hasThemeChanged) {
@@ -335,3 +338,37 @@ void CThemes::getTheme(CConfigFile &configfile)
 	t.clock_Digit_green = configfile.getInt32( "clock_Digit_green", t.menu_Content_Text_green );
 	t.clock_Digit_blue = configfile.getInt32( "clock_Digit_blue", t.menu_Content_Text_blue );
 }
+
+void CThemes::move_userDir()
+{
+	if (access(USERDIR, F_OK) == 0)
+	{
+		if (mkdirhier(THEMEDIR_VAR) && errno != EEXIST)
+		{
+			printf("[neutrino theme] error creating %s\n", THEMEDIR_VAR);
+			return;
+		}
+		struct dirent **themelist;
+		int n = scandir(USERDIR, &themelist, 0, alphasort);
+		if (n < 0)
+		{
+			perror("loading themes: scandir");
+			return;
+		}
+		else
+		{
+			for (int count = 0; count < n; count++)
+			{
+				const char *file = themelist[count]->d_name;
+				if (strcmp(file, ".") == 0 || strcmp(file, "..") == 0)
+					continue;
+				const char *dest = (char*)((std::string)USERDIR + file).c_str();
+				const char *target = (char*)((std::string)THEMEDIR_VAR + file).c_str();
+				printf("[neutrino theme] moving %s to %s\n", dest, target);
+				rename(dest, target);
+			}
+		}
+		printf("[neutrino theme] removing %s\n", USERDIR);
+		remove(USERDIR);
+	}
+}
diff --git a/src/gui/themes.h b/src/gui/themes.h
index 981d6cc4a..2560c90e9 100644
--- a/src/gui/themes.h
+++ b/src/gui/themes.h
@@ -44,6 +44,7 @@ class CThemes : public CMenuTarget, CChangeObserver
 		void saveFile(char* themename);
 		void readThemes(CMenuWidget &);
 		void rememberOldTheme(bool remember);
+		void move_userDir();
 
 	public:
 		CThemes();

From 4c621f1dec4a8a584e5d9fef23e0153714ebe685 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Thu, 4 Dec 2014 16:47:30 +0100
Subject: [PATCH 081/113] - split epg_read from epg_save ...

... to get the possibility to read EPG-data from an external device
at boot w/o saving the own data at shutdown/standby.
---
 data/locale/deutsch.locale    |  6 ++-
 data/locale/english.locale    |  8 ++--
 src/gui/miscsettings_menu.cpp | 70 ++++++++++++++++++++++++++---------
 src/gui/miscsettings_menu.h   |  5 ++-
 src/neutrino.cpp              |  4 +-
 src/system/locals.h           |  2 +
 src/system/locals_intern.h    |  2 +
 src/system/settings.h         |  1 +
 8 files changed, 73 insertions(+), 25 deletions(-)

diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index 2db967ba5..f6b29c1f1 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -954,8 +954,9 @@ menu.hint_epg_extendedcache Maximum in Stunden, die die EPG-Daten bzw. die Event
 menu.hint_epg_fonts Ändern Sie die Schriftgrößen der EPG-Details
 menu.hint_epg_max_events Maxiale Anzahl der Events im Zwischenspeicher
 menu.hint_epg_old_events Veraltete EPG-Daten werden nach dieser Zeit (in Stunden) verworfen
-menu.hint_epg_save Speichert die EPG-Daten auf einem externen Datenträger und läd es von dort nach einen Neustart
-menu.hint_epg_save_standby Speichert die EPG-Daten auch im Standby-Modus
+menu.hint_epg_read Liest nach einem Neustart die EPG-Daten von einem externen Datenträger wieder ein
+menu.hint_epg_save Speichert die EPG-Daten beim Herunterfahren auf einem externen Datenträger
+menu.hint_epg_save_standby Speichert die EPG-Daten auch, wenn in den Standby-Modus geschalten wird
 menu.hint_epg_scan Zu scannende Bouquets wählen. Aktuelles Bouquet beim Umschalten, markierte Bouquets oder alle Favoriten
 menu.hint_epg_scan_mode Aktivieren Sie den Hintergrundscan der EPG-Daten, wenn ein freier Tuner vorhanden ist
 menu.hint_event_textcolor Ändern Sie die Farbe für farbige Events in der Kanalliste und der Infobar
@@ -1387,6 +1388,7 @@ miscsettings.epg_max_events_hint2 Standard 6000, 0 (ohne Limit)
 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_read Gespeicherte EPG-Daten einlesen
 miscsettings.epg_save EPG zwischenspeichern
 miscsettings.epg_save_standby EPG speichern in Standby-Modus
 miscsettings.epg_scan Hintergrundscan EPG
diff --git a/data/locale/english.locale b/data/locale/english.locale
index bee72c1cd..1aeed4f70 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -954,7 +954,8 @@ menu.hint_epg_extendedcache Maximum hours to cache extended\nevents descriptions
 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_read Read saved EPG data after boot from an external device
+menu.hint_epg_save Save cached EPG data to an external device
 menu.hint_epg_save_standby Save EPG on soft standby mode
 menu.hint_epg_scan Select bouquets to scan epg, current on zap,\nall or selected favorites
 menu.hint_epg_scan_mode Enable background epg scan using free tuner
@@ -1387,8 +1388,9 @@ miscsettings.epg_max_events_hint2 normaly 6000, 0 to disable limit
 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.epg_read Restore EPG on boot
+miscsettings.epg_save Save EPG on shutdown
+miscsettings.epg_save_standby Save EPG on soft standby
 miscsettings.epg_scan EPG scan mode
 miscsettings.epg_scan_always Always
 miscsettings.epg_scan_bouquets EPG scan bouquets
diff --git a/src/gui/miscsettings_menu.cpp b/src/gui/miscsettings_menu.cpp
index 03633f486..6626ca77a 100644
--- a/src/gui/miscsettings_menu.cpp
+++ b/src/gui/miscsettings_menu.cpp
@@ -63,11 +63,31 @@ extern cVideo *videoDecoder;
 CMiscMenue::CMiscMenue()
 {
 	width = w_max (40, 10);
+
+	epg_save = NULL;
+	epg_save_standby = NULL;
+	epg_read = NULL;
+	epg_dir = NULL;
 }
 
 CMiscMenue::~CMiscMenue()
 {
-
+	if (epg_save) {
+		delete epg_save;
+		epg_save = NULL;
+	}
+	if (epg_save_standby) {
+		delete epg_save_standby;
+		epg_save_standby = NULL;
+	}
+	if (epg_read) {
+		delete epg_read;
+		epg_read = NULL;
+	}
+	if (epg_dir) {
+		delete epg_dir;
+		epg_dir = NULL;
+	}
 }
 
 int CMiscMenue::exec(CMenuTarget* parent, const std::string &actionKey)
@@ -276,7 +296,6 @@ int CMiscMenue::showMiscSettingsMenu()
 
 	delete fanNotifier;
 	delete sectionsdConfigNotifier;
-	delete miscEpgNotifier;
 	delete miscEpgScanNotifier;
 	return res;
 }
@@ -390,8 +409,17 @@ void CMiscMenue::showMiscSettingsMenuEpg(CMenuWidget *ms_epg)
 	ms_epg->addIntroItems(LOCALE_MISCSETTINGS_EPG_HEAD);
 	ms_epg->addKey(CRCInput::RC_info, this, "info");
 
-	CMenuOptionChooser * mc1 = new CMenuOptionChooser(LOCALE_MISCSETTINGS_EPG_SAVE_STANDBY, &g_settings.epg_save_standby, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, g_settings.epg_save);
-	mc1->setHint("", LOCALE_MENU_HINT_EPG_SAVE_STANDBY);
+	epg_save = new CMenuOptionChooser(LOCALE_MISCSETTINGS_EPG_SAVE, &g_settings.epg_save, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this);
+	epg_save->setHint("", LOCALE_MENU_HINT_EPG_SAVE);
+
+	epg_save_standby = new CMenuOptionChooser(LOCALE_MISCSETTINGS_EPG_SAVE_STANDBY, &g_settings.epg_save_standby, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, g_settings.epg_save);
+	epg_save_standby->setHint("", LOCALE_MENU_HINT_EPG_SAVE_STANDBY);
+
+	epg_read = new CMenuOptionChooser(LOCALE_MISCSETTINGS_EPG_READ, &g_settings.epg_read, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this);
+	epg_read->setHint("", LOCALE_MENU_HINT_EPG_READ);
+
+	epg_dir = new CMenuForwarder(LOCALE_MISCSETTINGS_EPG_DIR, (g_settings.epg_save || g_settings.epg_read), g_settings.epg_dir, this, "epgdir");
+	epg_dir->setHint("", LOCALE_MENU_HINT_EPG_DIR);
 
 	epg_cache = to_string(g_settings.epg_cache);
 	if (epg_cache.length() < 2)
@@ -421,16 +449,6 @@ void CMiscMenue::showMiscSettingsMenuEpg(CMenuWidget *ms_epg)
 	CMenuForwarder * mf3 = new CMenuDForwarder(LOCALE_MISCSETTINGS_EPG_MAX_EVENTS, true, epg_max_events, miscSettings_epg_max_events);
 	mf3->setHint("", LOCALE_MENU_HINT_EPG_MAX_EVENTS);
 
-	CMenuForwarder * mf4 = new CMenuForwarder(LOCALE_MISCSETTINGS_EPG_DIR, g_settings.epg_save, g_settings.epg_dir, this, "epgdir");
-	mf4->setHint("", LOCALE_MENU_HINT_EPG_DIR);
-
-	miscEpgNotifier = new COnOffNotifier();
-	miscEpgNotifier->addItem(mc1);
-	miscEpgNotifier->addItem(mf4);
-
-	CMenuOptionChooser * mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_EPG_SAVE, &g_settings.epg_save, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true,miscEpgNotifier);
-	mc->setHint("", LOCALE_MENU_HINT_EPG_SAVE);
-
 	CMenuOptionChooser * mc2 = new CMenuOptionChooser(LOCALE_MISCSETTINGS_EPG_SCAN_BOUQUETS, &g_settings.epg_scan, EPG_SCAN_OPTIONS, EPG_SCAN_OPTION_COUNT,
 		g_settings.epg_scan_mode != CEpgScan::MODE_OFF);
 	mc2->setHint("", LOCALE_MENU_HINT_EPG_SCAN);
@@ -442,9 +460,10 @@ void CMiscMenue::showMiscSettingsMenuEpg(CMenuWidget *ms_epg)
 		CFEManager::getInstance()->getEnabledCount() > 1 ? EPG_SCAN_MODE_OPTION_COUNT : 2, true, miscEpgScanNotifier);
 	mc3->setHint("", LOCALE_MENU_HINT_EPG_SCAN_MODE);
 
-	ms_epg->addItem(mc);
-	ms_epg->addItem(mc1);
-	ms_epg->addItem(mf4);
+	ms_epg->addItem(epg_save);
+	ms_epg->addItem(epg_save_standby);
+	ms_epg->addItem(epg_read);
+	ms_epg->addItem(epg_dir);
 	ms_epg->addItem(GenericMenuSeparatorLine);
 	ms_epg->addItem(mf);
 	ms_epg->addItem(mf1);
@@ -541,6 +560,8 @@ void CMiscMenue::showMiscSettingsMenuCPUFreq(CMenuWidget *ms_cpu)
 
 bool CMiscMenue::changeNotify(const neutrino_locale_t OptionName, void * /*data*/)
 {
+	int ret = menu_return::RETURN_NONE;
+
 	if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_HDMI_CEC))
 	{
 		printf("[neutrino CEC Settings] %s set CEC settings...\n", __FUNCTION__);
@@ -555,6 +576,19 @@ bool CMiscMenue::changeNotify(const neutrino_locale_t OptionName, void * /*data*
 		videoDecoder->SetCECAutoView(g_settings.hdmi_cec_view_on == 1);
 		videoDecoder->SetCECMode((VIDEO_HDMI_CEC_MODE)g_settings.hdmi_cec_mode);
 	}
+	else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_MISCSETTINGS_EPG_SAVE))
+	{
+		if (g_settings.epg_save)
+			g_settings.epg_read = true;
+		epg_save_standby->setActive(g_settings.epg_save);
+		epg_dir->setActive(g_settings.epg_save || g_settings.epg_read);
 
-	return false;
+		ret = menu_return::RETURN_REPAINT;
+	}
+	else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_MISCSETTINGS_EPG_READ))
+	{
+		epg_dir->setActive(g_settings.epg_save || g_settings.epg_read);
+	}
+
+	return ret;
 }
diff --git a/src/gui/miscsettings_menu.h b/src/gui/miscsettings_menu.h
index 8958c0aae..6e82d409d 100644
--- a/src/gui/miscsettings_menu.h
+++ b/src/gui/miscsettings_menu.h
@@ -41,8 +41,11 @@ class CMiscMenue : public CMenuTarget, CChangeObserver
 		CFanControlNotifier *fanNotifier;
 		CSectionsdConfigNotifier* sectionsdConfigNotifier;
 		//COnOffNotifier* miscNotifier;
-		COnOffNotifier* miscEpgNotifier;
 		COnOffNotifier* miscEpgScanNotifier;
+		CMenuOptionChooser * epg_save;
+		CMenuOptionChooser * epg_save_standby;
+		CMenuOptionChooser * epg_read;
+		CMenuForwarder * epg_dir;
 		int width;
 		std::string epg_cache;
 		std::string epg_extendedcache;
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index cc3efef22..5cd71037b 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -512,6 +512,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
 
 	g_settings.epg_save = configfile.getBool("epg_save", false);
 	g_settings.epg_save_standby = configfile.getBool("epg_save_standby", true);
+	g_settings.epg_read = configfile.getBool("epg_read", g_settings.epg_save);
 	g_settings.epg_scan = configfile.getInt32("epg_scan", CEpgScan::SCAN_CURRENT);
 	g_settings.epg_scan_mode = configfile.getInt32("epg_scan_mode", CEpgScan::MODE_OFF);
 	// backward-compatible check
@@ -1018,6 +1019,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
 	// epg
 	configfile.setBool("epg_save", g_settings.epg_save);
 	configfile.setBool("epg_save_standby", g_settings.epg_save_standby);
+	configfile.setBool("epg_read", g_settings.epg_read);
 	configfile.setInt32("epg_scan", g_settings.epg_scan);
 	configfile.setInt32("epg_scan_mode", g_settings.epg_scan_mode);
 	configfile.setInt32("epg_cache_time"           ,g_settings.epg_cache );
@@ -1690,7 +1692,7 @@ void CNeutrinoApp::InitZapper()
 	struct stat my_stat;
 
 	g_InfoViewer->start();
-	if (g_settings.epg_save){
+	if (g_settings.epg_read) {
 		if(stat(g_settings.epg_dir.c_str(), &my_stat) == 0)
 			g_Sectionsd->readSIfromXML(g_settings.epg_dir.c_str());
 	}
diff --git a/src/system/locals.h b/src/system/locals.h
index 25932f0e7..2a5cf0779 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -981,6 +981,7 @@ typedef enum
 	LOCALE_MENU_HINT_EPG_FONTS,
 	LOCALE_MENU_HINT_EPG_MAX_EVENTS,
 	LOCALE_MENU_HINT_EPG_OLD_EVENTS,
+	LOCALE_MENU_HINT_EPG_READ,
 	LOCALE_MENU_HINT_EPG_SAVE,
 	LOCALE_MENU_HINT_EPG_SAVE_STANDBY,
 	LOCALE_MENU_HINT_EPG_SCAN,
@@ -1414,6 +1415,7 @@ typedef enum
 	LOCALE_MISCSETTINGS_EPG_OLD_EVENTS,
 	LOCALE_MISCSETTINGS_EPG_OLD_EVENTS_HINT1,
 	LOCALE_MISCSETTINGS_EPG_OLD_EVENTS_HINT2,
+	LOCALE_MISCSETTINGS_EPG_READ,
 	LOCALE_MISCSETTINGS_EPG_SAVE,
 	LOCALE_MISCSETTINGS_EPG_SAVE_STANDBY,
 	LOCALE_MISCSETTINGS_EPG_SCAN,
diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h
index 0d50f7579..0121fb3ca 100644
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -981,6 +981,7 @@ const char * locale_real_names[] =
 	"menu.hint_epg_fonts",
 	"menu.hint_epg_max_events",
 	"menu.hint_epg_old_events",
+	"menu.hint_epg_read",
 	"menu.hint_epg_save",
 	"menu.hint_epg_save_standby",
 	"menu.hint_epg_scan",
@@ -1414,6 +1415,7 @@ const char * locale_real_names[] =
 	"miscsettings.epg_old_events",
 	"miscsettings.epg_old_events_hint1",
 	"miscsettings.epg_old_events_hint2",
+	"miscsettings.epg_read",
 	"miscsettings.epg_save",
 	"miscsettings.epg_save_standby",
 	"miscsettings.epg_scan",
diff --git a/src/system/settings.h b/src/system/settings.h
index a1e325bd7..c4c3e468b 100644
--- a/src/system/settings.h
+++ b/src/system/settings.h
@@ -219,6 +219,7 @@ struct SNeutrinoSettings
 	// EPG
 	int epg_save;
 	int epg_save_standby;
+	int epg_read;
 	int epg_cache;
 	int epg_old_events;
 	int epg_max_events;

From e21a79195e878dac733d3351c794c4d15e0cffa6 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Thu, 4 Dec 2014 16:48:50 +0100
Subject: [PATCH 082/113] - add epg_save_frequently feature ...

... to provide the EPG data in frequently intervals on an external device
---
 data/locale/deutsch.locale              |  2 ++
 data/locale/english.locale              |  2 ++
 lib/sectionsdclient/sectionsdMsg.h      |  1 +
 lib/sectionsdclient/sectionsdclient.cpp |  1 +
 lib/sectionsdclient/sectionsdclient.h   |  1 +
 src/eitd/sectionsd.cpp                  | 23 ++++++++++++++++++++++-
 src/gui/miscsettings_menu.cpp           | 12 ++++++++++++
 src/gui/miscsettings_menu.h             |  1 +
 src/neutrino.cpp                        |  3 +++
 src/system/locals.h                     |  2 ++
 src/system/locals_intern.h              |  2 ++
 src/system/settings.h                   |  1 +
 12 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index f6b29c1f1..ff8429e72 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -956,6 +956,7 @@ menu.hint_epg_max_events Maxiale Anzahl der Events im Zwischenspeicher
 menu.hint_epg_old_events Veraltete EPG-Daten werden nach dieser Zeit (in Stunden) verworfen
 menu.hint_epg_read Liest nach einem Neustart die EPG-Daten von einem externen Datenträger wieder ein
 menu.hint_epg_save Speichert die EPG-Daten beim Herunterfahren auf einem externen Datenträger
+menu.hint_epg_save_frequently Speichert die EPG-Daten in regelmäßigen Abständen auf einem externen Datenträger
 menu.hint_epg_save_standby Speichert die EPG-Daten auch, wenn in den Standby-Modus geschalten wird
 menu.hint_epg_scan Zu scannende Bouquets wählen. Aktuelles Bouquet beim Umschalten, markierte Bouquets oder alle Favoriten
 menu.hint_epg_scan_mode Aktivieren Sie den Hintergrundscan der EPG-Daten, wenn ein freier Tuner vorhanden ist
@@ -1390,6 +1391,7 @@ miscsettings.epg_old_events_hint1 Wie lange abgelaufene EPG-Daten aufheben?
 miscsettings.epg_old_events_hint2 Angabe in Stunden
 miscsettings.epg_read Gespeicherte EPG-Daten einlesen
 miscsettings.epg_save EPG zwischenspeichern
+miscsettings.epg_save_frequently EPG regelmäßig speichern
 miscsettings.epg_save_standby EPG speichern in Standby-Modus
 miscsettings.epg_scan Hintergrundscan EPG
 miscsettings.epg_scan_always Immer
diff --git a/data/locale/english.locale b/data/locale/english.locale
index 1aeed4f70..20ad812c9 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -956,6 +956,7 @@ menu.hint_epg_max_events Maximum events to cache. After reaching limit\nEPG cach
 menu.hint_epg_old_events Hours after event end time to consider\nevent old and remove it from cache
 menu.hint_epg_read Read saved EPG data after boot from an external device
 menu.hint_epg_save Save cached EPG data to an external device
+menu.hint_epg_save_frequently Save cached EPG data in frequently intervals to an external device
 menu.hint_epg_save_standby Save EPG on soft standby mode
 menu.hint_epg_scan Select bouquets to scan epg, current on zap,\nall or selected favorites
 menu.hint_epg_scan_mode Enable background epg scan using free tuner
@@ -1390,6 +1391,7 @@ miscsettings.epg_old_events_hint1 How long will EPG-Data be stored after they ti
 miscsettings.epg_old_events_hint2 Set in hours
 miscsettings.epg_read Restore EPG on boot
 miscsettings.epg_save Save EPG on shutdown
+miscsettings.epg_save_frequently Save EPG frequently
 miscsettings.epg_save_standby Save EPG on soft standby
 miscsettings.epg_scan EPG scan mode
 miscsettings.epg_scan_always Always
diff --git a/lib/sectionsdclient/sectionsdMsg.h b/lib/sectionsdclient/sectionsdMsg.h
index 9358e8340..9b6b666a4 100644
--- a/lib/sectionsdclient/sectionsdMsg.h
+++ b/lib/sectionsdclient/sectionsdMsg.h
@@ -101,6 +101,7 @@ struct sectionsd
 		int epg_extendedcache;
 //		std::string network_ntpserver;
 //		std::string epg_dir;
+		int epg_save_frequently;
 	};
 
 };
diff --git a/lib/sectionsdclient/sectionsdclient.cpp b/lib/sectionsdclient/sectionsdclient.cpp
index c50066926..e4dcee4e5 100644
--- a/lib/sectionsdclient/sectionsdclient.cpp
+++ b/lib/sectionsdclient/sectionsdclient.cpp
@@ -206,6 +206,7 @@ void CSectionsdClient::setConfig(const epg_config config)
 	msg->network_ntprefresh	= config.network_ntprefresh;
 	msg->network_ntpenable	= config.network_ntpenable;
 	msg->epg_extendedcache	= config.epg_extendedcache;
+	msg->epg_save_frequently= config.epg_save_frequently;
 //	config.network_ntpserver:
 	strcpy(&pData[sizeof(sectionsd::commandSetConfig)], config.network_ntpserver.c_str());
 //	config.epg_dir:
diff --git a/lib/sectionsdclient/sectionsdclient.h b/lib/sectionsdclient/sectionsdclient.h
index f202ed94d..b020407a0 100644
--- a/lib/sectionsdclient/sectionsdclient.h
+++ b/lib/sectionsdclient/sectionsdclient.h
@@ -162,6 +162,7 @@ class CSectionsdClient : private CBasicClient
 		int network_ntpenable;
 		int epg_extendedcache;
 		std::string network_ntpserver;
+		int epg_save_frequently;
 		std::string epg_dir;
 	} epg_config;
 
diff --git a/src/eitd/sectionsd.cpp b/src/eitd/sectionsd.cpp
index 50e1522da..17aef38ad 100644
--- a/src/eitd/sectionsd.cpp
+++ b/src/eitd/sectionsd.cpp
@@ -71,6 +71,7 @@ static bool notify_complete = false;
 /* period to clean cached sections and force restart sections read */
 #define META_HOUSEKEEPING_COUNT (24 * 60 * 60) / HOUSEKEEPING_SLEEP // meta housekeeping after XX housekeepings - every 24h -
 #define STANDBY_HOUSEKEEPING_COUNT (60 * 60) / HOUSEKEEPING_SLEEP
+#define EPG_SAVE_FREQUENTLY_COUNT (60 * 60) / HOUSEKEEPING_SLEEP
 
 // Timeout bei tcp/ip connections in ms
 #define READ_TIMEOUT_IN_SECONDS  2
@@ -82,6 +83,7 @@ static bool notify_complete = false;
 // number of timeouts after which we stop waiting for an EIT version number
 #define TIMEOUTS_EIT_VERSION_WAIT	(2 * CHECK_RESTART_DMX_AFTER_TIMEOUTS)
 
+static unsigned int epg_save_frequently;
 static long secondsToCache;
 static long secondsExtendedTextCache;
 static long oldEventsAre;
@@ -1108,6 +1110,7 @@ static void commandSetConfig(int connfd, char *data, const unsigned /*dataLength
 	oldEventsAre = (long)(pmsg->epg_old_events)*60L*60L;
 	secondsExtendedTextCache = (long)(pmsg->epg_extendedcache)*60L*60L;
 	max_events = pmsg->epg_max_events;
+	epg_save_frequently = pmsg->epg_save_frequently;
 	unlockEvents();
 
 	bool time_wakeup = false;
@@ -2036,7 +2039,7 @@ static void print_meminfo(void)
 //---------------------------------------------------------------------
 static void *houseKeepingThread(void *)
 {
-	int count = 0, scount = 0;
+	int count = 0, scount = 0, ecount = 0;
 
 	dprintf("housekeeping-thread started.\n");
 	pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS, 0);
@@ -2065,6 +2068,23 @@ static void *houseKeepingThread(void *)
 
 		removeOldEvents(oldEventsAre); // alte Events
 
+		ecount++;
+		if (ecount == EPG_SAVE_FREQUENTLY_COUNT)
+		{
+			if (epg_save_frequently > 0)
+			{
+				std::string d = epg_dir;
+				if (d.length() > 1)
+				{
+					std::string::iterator it = d.end() - 1;
+					if (*it == '/')
+						d.erase(it);
+				}
+				writeEventsToFile((char *)d.c_str());
+			}
+			ecount = 0;
+		}
+
 		readLockEvents();
 		dprintf("Number of sptr events (event-ID): %u\n", (unsigned)mySIeventsOrderUniqueKey.size());
 		dprintf("Number of sptr events (service-id, start time, event-id): %u\n", (unsigned)mySIeventsOrderServiceUniqueKeyFirstStartTimeEventUniqueKey.size());
@@ -2118,6 +2138,7 @@ bool CEitManager::Start()
 	secondsExtendedTextCache = config.epg_extendedcache*60L*60L; //hours
 	oldEventsAre = config.epg_old_events*60L*60L; //hours
 	max_events = config.epg_max_events;
+	epg_save_frequently = config.epg_save_frequently;
 
 	if (find_executable("ntpdate").empty())
 		ntp_system_cmd_prefix = "ntpd -n -q -p ";
diff --git a/src/gui/miscsettings_menu.cpp b/src/gui/miscsettings_menu.cpp
index 6626ca77a..898b2e3b2 100644
--- a/src/gui/miscsettings_menu.cpp
+++ b/src/gui/miscsettings_menu.cpp
@@ -66,6 +66,7 @@ CMiscMenue::CMiscMenue()
 
 	epg_save = NULL;
 	epg_save_standby = NULL;
+	epg_save_frequently = NULL;
 	epg_read = NULL;
 	epg_dir = NULL;
 }
@@ -80,6 +81,10 @@ CMiscMenue::~CMiscMenue()
 		delete epg_save_standby;
 		epg_save_standby = NULL;
 	}
+	if (epg_save_frequently) {
+		delete epg_save_frequently;
+		epg_save_frequently = NULL;
+	}
 	if (epg_read) {
 		delete epg_read;
 		epg_read = NULL;
@@ -415,6 +420,9 @@ void CMiscMenue::showMiscSettingsMenuEpg(CMenuWidget *ms_epg)
 	epg_save_standby = new CMenuOptionChooser(LOCALE_MISCSETTINGS_EPG_SAVE_STANDBY, &g_settings.epg_save_standby, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, g_settings.epg_save);
 	epg_save_standby->setHint("", LOCALE_MENU_HINT_EPG_SAVE_STANDBY);
 
+	epg_save_frequently = new CMenuOptionChooser(LOCALE_MISCSETTINGS_EPG_SAVE_FREQUENTLY, &g_settings.epg_save_frequently, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, g_settings.epg_save, sectionsdConfigNotifier);
+	epg_save_frequently->setHint("", LOCALE_MENU_HINT_EPG_SAVE_FREQUENTLY);
+
 	epg_read = new CMenuOptionChooser(LOCALE_MISCSETTINGS_EPG_READ, &g_settings.epg_read, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this);
 	epg_read->setHint("", LOCALE_MENU_HINT_EPG_READ);
 
@@ -462,6 +470,7 @@ void CMiscMenue::showMiscSettingsMenuEpg(CMenuWidget *ms_epg)
 
 	ms_epg->addItem(epg_save);
 	ms_epg->addItem(epg_save_standby);
+	ms_epg->addItem(epg_save_frequently);
 	ms_epg->addItem(epg_read);
 	ms_epg->addItem(epg_dir);
 	ms_epg->addItem(GenericMenuSeparatorLine);
@@ -581,8 +590,11 @@ bool CMiscMenue::changeNotify(const neutrino_locale_t OptionName, void * /*data*
 		if (g_settings.epg_save)
 			g_settings.epg_read = true;
 		epg_save_standby->setActive(g_settings.epg_save);
+		epg_save_frequently->setActive(g_settings.epg_save);
 		epg_dir->setActive(g_settings.epg_save || g_settings.epg_read);
 
+		CNeutrinoApp::getInstance()->SendSectionsdConfig();
+
 		ret = menu_return::RETURN_REPAINT;
 	}
 	else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_MISCSETTINGS_EPG_READ))
diff --git a/src/gui/miscsettings_menu.h b/src/gui/miscsettings_menu.h
index 6e82d409d..7cc778774 100644
--- a/src/gui/miscsettings_menu.h
+++ b/src/gui/miscsettings_menu.h
@@ -44,6 +44,7 @@ class CMiscMenue : public CMenuTarget, CChangeObserver
 		COnOffNotifier* miscEpgScanNotifier;
 		CMenuOptionChooser * epg_save;
 		CMenuOptionChooser * epg_save_standby;
+		CMenuOptionChooser * epg_save_frequently;
 		CMenuOptionChooser * epg_read;
 		CMenuForwarder * epg_dir;
 		int width;
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 5cd71037b..438893820 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -512,6 +512,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
 
 	g_settings.epg_save = configfile.getBool("epg_save", false);
 	g_settings.epg_save_standby = configfile.getBool("epg_save_standby", true);
+	g_settings.epg_save_frequently = configfile.getInt32("epg_save_frequently", false);
 	g_settings.epg_read = configfile.getBool("epg_read", g_settings.epg_save);
 	g_settings.epg_scan = configfile.getInt32("epg_scan", CEpgScan::SCAN_CURRENT);
 	g_settings.epg_scan_mode = configfile.getInt32("epg_scan_mode", CEpgScan::MODE_OFF);
@@ -1019,6 +1020,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
 	// epg
 	configfile.setBool("epg_save", g_settings.epg_save);
 	configfile.setBool("epg_save_standby", g_settings.epg_save_standby);
+	configfile.setInt32("epg_save_frequently", g_settings.epg_save_frequently);
 	configfile.setBool("epg_read", g_settings.epg_read);
 	configfile.setInt32("epg_scan", g_settings.epg_scan);
 	configfile.setInt32("epg_scan_mode", g_settings.epg_scan_mode);
@@ -1674,6 +1676,7 @@ void CNeutrinoApp::MakeSectionsdConfig(CSectionsdClient::epg_config& config)
 	config.epg_old_events           = g_settings.epg_old_events;
 	config.epg_max_events           = g_settings.epg_max_events;
 	config.epg_extendedcache        = g_settings.epg_extendedcache;
+	config.epg_save_frequently      = g_settings.epg_save ? g_settings.epg_save_frequently : 0;
 	config.epg_dir                  = g_settings.epg_dir;
 	config.network_ntpserver        = g_settings.network_ntpserver;
 	config.network_ntprefresh       = atoi(g_settings.network_ntprefresh.c_str());
diff --git a/src/system/locals.h b/src/system/locals.h
index 2a5cf0779..ad1f4c7e3 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -983,6 +983,7 @@ typedef enum
 	LOCALE_MENU_HINT_EPG_OLD_EVENTS,
 	LOCALE_MENU_HINT_EPG_READ,
 	LOCALE_MENU_HINT_EPG_SAVE,
+	LOCALE_MENU_HINT_EPG_SAVE_FREQUENTLY,
 	LOCALE_MENU_HINT_EPG_SAVE_STANDBY,
 	LOCALE_MENU_HINT_EPG_SCAN,
 	LOCALE_MENU_HINT_EPG_SCAN_MODE,
@@ -1417,6 +1418,7 @@ typedef enum
 	LOCALE_MISCSETTINGS_EPG_OLD_EVENTS_HINT2,
 	LOCALE_MISCSETTINGS_EPG_READ,
 	LOCALE_MISCSETTINGS_EPG_SAVE,
+	LOCALE_MISCSETTINGS_EPG_SAVE_FREQUENTLY,
 	LOCALE_MISCSETTINGS_EPG_SAVE_STANDBY,
 	LOCALE_MISCSETTINGS_EPG_SCAN,
 	LOCALE_MISCSETTINGS_EPG_SCAN_ALWAYS,
diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h
index 0121fb3ca..38e37da30 100644
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -983,6 +983,7 @@ const char * locale_real_names[] =
 	"menu.hint_epg_old_events",
 	"menu.hint_epg_read",
 	"menu.hint_epg_save",
+	"menu.hint_epg_save_frequently",
 	"menu.hint_epg_save_standby",
 	"menu.hint_epg_scan",
 	"menu.hint_epg_scan_mode",
@@ -1417,6 +1418,7 @@ const char * locale_real_names[] =
 	"miscsettings.epg_old_events_hint2",
 	"miscsettings.epg_read",
 	"miscsettings.epg_save",
+	"miscsettings.epg_save_frequently",
 	"miscsettings.epg_save_standby",
 	"miscsettings.epg_scan",
 	"miscsettings.epg_scan_always",
diff --git a/src/system/settings.h b/src/system/settings.h
index c4c3e468b..5dde15d88 100644
--- a/src/system/settings.h
+++ b/src/system/settings.h
@@ -219,6 +219,7 @@ struct SNeutrinoSettings
 	// EPG
 	int epg_save;
 	int epg_save_standby;
+	int epg_save_frequently;
 	int epg_read;
 	int epg_cache;
 	int epg_old_events;

From c4a8d4085308fbc6450d5ff060fa280c476ab52d Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Fri, 5 Dec 2014 14:44:03 +0300
Subject: [PATCH 083/113] eitd/sectionsd.cpp: fix busywait loop after service
 stop

---
 src/eitd/dmx.cpp       | 1 +
 src/eitd/sectionsd.cpp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/eitd/dmx.cpp b/src/eitd/dmx.cpp
index 007676db1..e36ada64b 100644
--- a/src/eitd/dmx.cpp
+++ b/src/eitd/dmx.cpp
@@ -283,6 +283,7 @@ int DMX::getSection(uint8_t *buf, const unsigned timeoutInMSeconds, int &timeout
 	lock();
 	if (!isOpen()) {
 		unlock();
+		timeouts = -1;
 		return -1;
 	}
 
diff --git a/src/eitd/sectionsd.cpp b/src/eitd/sectionsd.cpp
index 17aef38ad..a2c06ce43 100644
--- a/src/eitd/sectionsd.cpp
+++ b/src/eitd/sectionsd.cpp
@@ -980,6 +980,7 @@ static void commandserviceStopped(int connfd, char * /* data */, const unsigned
 	threadCN.unlock();
 	threadEIT.unlock();
 	threadCN.stopUpdate();
+	current_channel_id = 0;
 	xprintf("[sectionsd] commandserviceStopped done\n");
 }
 

From ec219cc2a7ffa79e03821b0cdde19e6f84d2f813 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Fri, 5 Dec 2014 14:17:14 +0100
Subject: [PATCH 084/113] - yWeb: fix neutrino_pictureviewer_save_settings
 block

---
 src/nhttpd/web/Y_Version.txt         | 4 ++--
 src/nhttpd/web/Y_neutrino_Blocks.txt | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/nhttpd/web/Y_Version.txt b/src/nhttpd/web/Y_Version.txt
index d4a791c43..ebcb7a439 100644
--- a/src/nhttpd/web/Y_Version.txt
+++ b/src/nhttpd/web/Y_Version.txt
@@ -1,4 +1,4 @@
-version=2.8.0.62
-date=27.06.2014
+version=2.8.0.63
+date=05.12.2014
 type=Release
 info=Port CST
diff --git a/src/nhttpd/web/Y_neutrino_Blocks.txt b/src/nhttpd/web/Y_neutrino_Blocks.txt
index 1ef19390f..9c55ab772 100644
--- a/src/nhttpd/web/Y_neutrino_Blocks.txt
+++ b/src/nhttpd/web/Y_neutrino_Blocks.txt
@@ -252,7 +252,6 @@ end-block~neutrino_form-data_movieplayer
 # ------- yWeb save Settings
 start-block~neutrino_movieplayer_save_settings
 {=ini-set:/var/tuxbox/config/neutrino.conf;network_nfs_moviedir;{=network_nfs_moviedir=}=}
-
 end-block~neutrino_movieplayer_save_settings
 
 
@@ -905,7 +904,7 @@ end-block~neutrino_form-data_pictureviewer
 start-block~neutrino_pictureviewer_save_settings
 {=ini-set:/var/tuxbox/config/neutrino.conf;picviewer_scaling;{=picviewer_scaling=}~open=}
 {=ini-set:/var/tuxbox/config/neutrino.conf;picviewer_slide_time;{=picviewer_slide_time=}~cache=}
-{=ini-set:/var/tuxbox/config/neutrino.conf;network_nfs_picturedir;{=network_nfs_picturedir=}~cache=}
+{=ini-set:/var/tuxbox/config/neutrino.conf;network_nfs_picturedir;{=network_nfs_picturedir=}~save=}
 end-block~neutrino_pictureviewer_save_settings
 
 # ------- Neutrino form-data: audioplayer -------------------------------

From 1bf97d21f18d631c6cb236090973a8ef7137ec48 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Fri, 5 Dec 2014 14:29:35 +0100
Subject: [PATCH 085/113] - yWeb: (re)add EPG settings menu

---
 src/nhttpd/web/Y_Baselib.js          |   3 +
 src/nhttpd/web/Y_Settings_Menue.yhtm |   5 +
 src/nhttpd/web/Y_Version.txt         |   2 +-
 src/nhttpd/web/Y_neutrino_Blocks.txt | 164 ++++++++++++++++++++++-----
 src/nhttpd/web/languages/Deutsch     |   2 +
 src/nhttpd/web/languages/English     |   2 +
 6 files changed, 148 insertions(+), 30 deletions(-)

diff --git a/src/nhttpd/web/Y_Baselib.js b/src/nhttpd/web/Y_Baselib.js
index 79402b8b9..a9c208648 100644
--- a/src/nhttpd/web/Y_Baselib.js
+++ b/src/nhttpd/web/Y_Baselib.js
@@ -373,6 +373,9 @@ function bt_set_value(_bt_name, _text)
 }
 /*dbox*/
 /*expermental*/
+function reload_neutrino_conf() {
+	loadSyncURL("/control/reloadsetup");
+}
 function dbox_rcsim(_key){
 	loadSyncURL("/control/rcem?" + _key);
 }
diff --git a/src/nhttpd/web/Y_Settings_Menue.yhtm b/src/nhttpd/web/Y_Settings_Menue.yhtm
index 72d4f9f20..d009c55b9 100644
--- a/src/nhttpd/web/Y_Settings_Menue.yhtm
+++ b/src/nhttpd/web/Y_Settings_Menue.yhtm
@@ -60,6 +60,11 @@ function init(){
 					{=var-set:m_link_text={=L:set.menue.parental=}=}
 					{=include-block:Y_Blocks.txt;management_link=}
 				</li>
+				<li>
+					{=var-set:m_link_href=Y_Settings_neutrino_forms.yhtm?form=neutrino_form-data_epg=}
+					{=var-set:m_link_text={=L:set.menue.epg=}=}
+					{=include-block:Y_Blocks.txt;management_link=}
+				</li>
 				<li>
 					{=var-set:m_link_href=Y_Settings_neutrino_forms.yhtm?form=neutrino_form-data_record=}
 					{=var-set:m_link_text={=L:set.menue.recording=}=}
diff --git a/src/nhttpd/web/Y_Version.txt b/src/nhttpd/web/Y_Version.txt
index ebcb7a439..11e991a9c 100644
--- a/src/nhttpd/web/Y_Version.txt
+++ b/src/nhttpd/web/Y_Version.txt
@@ -1,4 +1,4 @@
-version=2.8.0.63
+version=2.8.0.64
 date=05.12.2014
 type=Release
 info=Port CST
diff --git a/src/nhttpd/web/Y_neutrino_Blocks.txt b/src/nhttpd/web/Y_neutrino_Blocks.txt
index 9c55ab772..9269e9199 100644
--- a/src/nhttpd/web/Y_neutrino_Blocks.txt
+++ b/src/nhttpd/web/Y_neutrino_Blocks.txt
@@ -333,6 +333,141 @@ start-block~neutrino_parental_save_settings
 {=ini-set:/var/tuxbox/config/neutrino.conf;parentallock_pincode;{=parentallock_pincode=}~save=}
 end-block~neutrino_parental_save_settings
 
+# ------- Neutrino form-data: EPG -------------------------------
+start-block~neutrino_form-data_epg
+<div class="work_box">
+	<div class="work_box_head"><div class="work_box_head_h2">
+	{=var-set:help_url=Help-Settings-EPG=}{=var-set:menu={=L:set.menue.epg=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	<div class="work_box_body">
+	<form name="f" action="/y/cgi" class="y_form">
+		<table cellspacing="0" border="0" cellpadding="2" width="100%">
+			<tr>
+				<td colspan="2" width="35%" class="y_form_header">{=L:miscsettings.epg_head=}</td>
+			</tr>
+			<tr>
+				<td>{=L:miscsettings.epg_save=}</td>
+				<td>
+					<input type="radio" name="epg_save" value="false"/>{=L:off=}&nbsp;
+					<input type="radio" name="epg_save" value="true"/>{=L:on=}
+				</td>
+			</tr>
+			<tr>
+				<td>{=L:miscsettings.epg_save_standby=}</td>
+				<td>
+					<input type="radio" name="epg_save_standby" value="false"/>{=L:off=}&nbsp;
+					<input type="radio" name="epg_save_standby" value="true"/>{=L:on=}
+				</td>
+			</tr>
+			<tr>
+				<td>{=L:miscsettings.epg_save_frequently=}</td>
+				<td>
+					<input type="radio" name="epg_save_frequently" value="0"/>{=L:off=}&nbsp;
+					<input type="radio" name="epg_save_frequently" value="1"/>{=L:on=}
+				</td>
+			</tr>
+			<tr>
+				<td>{=L:miscsettings.epg_read=}</td>
+				<td>
+					<input type="radio" name="epg_read" value="false"/>{=L:off=}&nbsp;
+					<input type="radio" name="epg_read" value="true"/>{=L:on=}
+				</td>
+			</tr>
+			<tr>
+				<td>{=L:miscsettings.epg_dir=}</td>
+				<td><input type="text" name="epg_dir" size="40" value="{=ini-get:/var/tuxbox/config/neutrino.conf;epg_dir~open=}" title="" />&nbsp;e.g. /media/sda1/epg/</td>
+			</tr>
+			<tr>
+				<td colspan="2"><br/></td>
+			</tr>
+			<tr>
+				<td>{=L:miscsettings.epg_cache=}</td>
+				<td><input type="text" name="epg_cache_time" size="5" value="{=ini-get:/var/tuxbox/config/neutrino.conf;epg_cache_time~cache=}" title="" /></td>
+			</tr>
+			<tr>
+				<td>{=L:miscsettings.epg_extendedcache=}</td>
+				<td><input type="text" name="epg_extendedcache_time" size="5" value="{=ini-get:/var/tuxbox/config/neutrino.conf;epg_extendedcache_time~cache=}" title="" /></td>
+			</tr>
+			<tr>
+				<td>{=L:miscsettings.epg_old_events=}</td>
+				<td><input type="text" name="epg_old_events" size="5" value="{=ini-get:/var/tuxbox/config/neutrino.conf;epg_old_events~cache=}" title="" /></td>
+			</tr>
+			<tr>
+				<td>{=L:miscsettings.epg_max_events=}</td>
+				<td><input type="text" name="epg_max_events" size="5" value="{=ini-get:/var/tuxbox/config/neutrino.conf;epg_max_events~cache=}" title="" /></td>
+			</tr>
+			<tr>
+				<td colspan="2"><br/></td>
+			</tr>
+			<tr>
+				<td>{=L:miscsettings.epg_scan=}</td>
+				<td>
+					<select name="epg_scan_mode" title="">
+					<option value="0" selected="selected">{=L:off=}</option>
+					<option value="1">{=L:miscsettings.epg_scan_live=}</option>
+					<option value="2">{=L:miscsettings.epg_scan_standby=}</option>
+					<option value="3">{=L:miscsettings.epg_scan_always=}</option>
+					</select>
+				</td>
+			</tr>
+			<tr>
+				<td>{=L:miscsettings.epg_scan_bouquets=}</td>
+				<td>
+					<select name="epg_scan" title="">
+					<option value="1" selected="selected">{=L:miscsettings.epg_scan_bq=}</option>
+					<option value="2">{=L:miscsettings.epg_scan_fav=}</option>
+					<option value="3">{=L:miscsettings.epg_scan_sel=}</option>
+					</select>
+				</td>
+			</tr>
+		</table>
+		<br/>
+		<input type="hidden" name="tmpl" value="Y_Settings_neutrino_forms.yhtm"/>
+		<input type="hidden" name="execute" value="include-block:Y_neutrino_Blocks.txt;neutrino_epg_save_settings;nix"/>
+		<input type="hidden" name="form" value="{=form=}"/>
+		<button type="button" ytype="save" title="{=L:save_values_desc=}" onclick="do_submit()">{=L:save=}</button>
+		&nbsp;<button type="button" ytype="refresh" onclick="reload_neutrino_conf()">{=L:apply=}</button>
+	</form>
+	</div>
+</div>
+<script type="text/javascript">
+//<![CDATA[
+function form_init()
+{
+	obj_set_radio_value('epg_save', "{=ini-get:/var/tuxbox/config/neutrino.conf;epg_save;false=}");
+	obj_set_radio_value('epg_save_standby', "{=ini-get:/var/tuxbox/config/neutrino.conf;epg_save_standby;false~cache=}");
+	obj_set_radio_value('epg_save_frequently', "{=ini-get:/var/tuxbox/config/neutrino.conf;epg_save_frequently;0~cache=}");
+	obj_set_radio_value('epg_read', "{=ini-get:/var/tuxbox/config/neutrino.conf;epg_read;false~cache=}");
+	val = "{=ini-get:/var/tuxbox/config/neutrino.conf;epg_scan_mode;0~cache=}";
+		document.f.epg_scan_mode.selectedIndex = val;
+	val = "{=ini-get:/var/tuxbox/config/neutrino.conf;epg_scan;1~cache=}";
+		document.f.epg_scan.selectedIndex = (val-1);
+}
+
+function do_submit()
+{
+	show_waitbox(true);
+	document.f.submit();
+}
+form_init();
+//]]>
+</script>
+end-block~neutrino_form-data_epg
+
+# ------- yWeb save EPG
+start-block~neutrino_epg_save_settings
+{=ini-set:/var/tuxbox/config/neutrino.conf;epg_save;{=epg_save=}~open=}
+{=ini-set:/var/tuxbox/config/neutrino.conf;epg_save_standby;{=epg_save_standby=}~cache=}
+{=ini-set:/var/tuxbox/config/neutrino.conf;epg_save_frequently;{=epg_save_frequently=}~cache=}
+{=ini-set:/var/tuxbox/config/neutrino.conf;epg_read;{=epg_read=}~cache=}
+{=ini-set:/var/tuxbox/config/neutrino.conf;epg_dir;{=epg_dir=}~cache=}
+{=ini-set:/var/tuxbox/config/neutrino.conf;epg_cache_time;{=epg_cache_time=}~cache=}
+{=ini-set:/var/tuxbox/config/neutrino.conf;epg_extendedcache_time;{=epg_extendedcache_time=}~cache=}
+{=ini-set:/var/tuxbox/config/neutrino.conf;epg_max_events;{=epg_max_events=}~cache=}
+{=ini-set:/var/tuxbox/config/neutrino.conf;epg_old_events;{=epg_old_events=}~cache=}
+{=ini-set:/var/tuxbox/config/neutrino.conf;epg_scan_mode;{=epg_scan_mode=}~cache=}
+{=ini-set:/var/tuxbox/config/neutrino.conf;epg_scan;{=epg_scan=}~save=}
+end-block~neutrino_epg_save_settings
+
 # ------- Neutrino form-data: diverse -------------------------------
 start-block~neutrino_form-data_diverse
 <div class="work_box">
@@ -490,29 +625,6 @@ start-block~neutrino_form-data_diverse
 					<input type="radio" name="channellist_extended" value="true"/>{=L:on=}
 				</td>
 			</tr>
-			<tr>
-				<td colspan="2" width="35%" class="y_form_header">EPG-Einstellungen</td>
-			</tr>
-			<tr>
-				<td>EPG-Cache (Tage)</td>
-				<td><input type="text" name="epg_cache_time" size="5" value="{=ini-get:/var/tuxbox/config/neutrino.conf;epg_cache_time~cache=}" title="EPG cache"/></td>
-			</tr>
-			<tr>
-				<td>EPG-Langtext (Stunden)</td>
-				<td><input type="text" name="epg_extendedcache_time" size="5" value="{=ini-get:/var/tuxbox/config/neutrino.conf;epg_extendedcache_time~cache=}" title="EPG extended cache"/></td>
-			</tr>
-			<tr>
-				<td>EPG verwerfen nach (Std.)</td>
-				<td><input type="text" name="epg_old_events" size="5" value="{=ini-get:/var/tuxbox/config/neutrino.conf;epg_old_events~cache=}" title=""/></td>
-			</tr>
-			<tr>
-				<td>Max. Events</td>
-				<td><input type="text" name="epg_max_events" size="5" value="{=ini-get:/var/tuxbox/config/neutrino.conf;epg_max_events~cache=}" title=""/></td>
-			</tr>
-			<tr>
-				<td>EPG Verzeichnis</td>
-				<td><input type="text" name="epg_dir" size="40" value="{=ini-get:/var/tuxbox/config/neutrino.conf;epg_dir~cache=}" title="epg dircetory"/>&nbsp;e.g. /mnt/mmc/epg/</td>
-			</tr>
 			<tr>
 				<td colspan="2" width="35%" class="y_form_header">Zapit (Hinweis: pzapit -kill vorm Speichern ausf&uuml;hren)</td>
 			</tr>
@@ -651,11 +763,6 @@ end-block~neutrino_form-data_diverse
 start-block~neutrino_diverse_save_settings
 {=ini-set:/var/tuxbox/config/neutrino.conf;channellist_epgtext_align_right;{=epgtext_align_right=}~open=}
 {=ini-set:/var/tuxbox/config/neutrino.conf;channellist_extended;{=channellist_extended=}~cache=}
-{=ini-set:/var/tuxbox/config/neutrino.conf;epg_cache_time;{=epg_cache_time=}~cache=}
-{=ini-set:/var/tuxbox/config/neutrino.conf;epg_dir;{=epg_dir=}~cache=}
-{=ini-set:/var/tuxbox/config/neutrino.conf;epg_extendedcache_time;{=epg_extendedcache_time=}~cache=}
-{=ini-set:/var/tuxbox/config/neutrino.conf;epg_max_events;{=epg_max_events=}~cache=}
-{=ini-set:/var/tuxbox/config/neutrino.conf;epg_old_events;{=epg_old_events=}~cache=}
 {=ini-set:/var/tuxbox/config/neutrino.conf;filebrowser_showrights;{=filebrowser_showrights=}~cache=}
 {=ini-set:/var/tuxbox/config/neutrino.conf;filebrowser_denydirectoryleave;{=filebrowser_denydirectoryleave=}~cache=}
 {=ini-set:/var/tuxbox/config/neutrino.conf;filesystem_is_utf8;{=filesystem_is_utf8=}~cache=}
@@ -1249,7 +1356,6 @@ end-block~neutrino_form-data_esound
 # ------- yWeb save Settings
 start-block~neutrino_esound_save_settings
 {=ini-set:/var/tuxbox/config/neutrino.conf;esound_port;{=esound_port=}=}
-
 end-block~neutrino_esound_save_settings
 
 # ------- list possible directorys for records
diff --git a/src/nhttpd/web/languages/Deutsch b/src/nhttpd/web/languages/Deutsch
index af16357b0..aa70dcb8f 100644
--- a/src/nhttpd/web/languages/Deutsch
+++ b/src/nhttpd/web/languages/Deutsch
@@ -29,6 +29,7 @@ send=Senden
 save=Speichern
 save_all=Alle &Auml;nderungen speichern
 cancel=Abbrechen
+apply=&Auml;nderungen anwenden
 answer=Antwort
 reboot=Neustart
 shutdown=Ausschalten
@@ -212,6 +213,7 @@ set.sync_with_neutrino=Zur Synchronisation mit Neutrino
 
 ========Settings General & Menue
 set.menue.webserver=Webserver
+set.menue.epg=EPG
 set.menue.timer_settings=Timer Einstellungen
 set.menue.zapit=Zapit
 set.menue.backup_restore=Sichern und Wiederherstellen
diff --git a/src/nhttpd/web/languages/English b/src/nhttpd/web/languages/English
index 1faa29a56..dd5f760e7 100644
--- a/src/nhttpd/web/languages/English
+++ b/src/nhttpd/web/languages/English
@@ -29,6 +29,7 @@ management=Management
 uninstaller=Uninstaller
 send=send
 cancel=cancel
+apply=Apply changes
 answer=Answer
 reboot=reboot
 shutdown=shutdown
@@ -215,6 +216,7 @@ set.sync_with_neutrino=Synchronization with Neutrino
 
 =======Settings General & Menue
 set.menue.webserver=Webserver
+set.menue.epg=EPG
 set.menue.timer_settings=Timer Settings
 set.menue.zapit=Zapit
 set.menue.backup_restore=Backup &amp; Restore

From 39c2636269cdb10afd1d7120ec48f667d2b43677 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Fri, 5 Dec 2014 14:48:24 +0100
Subject: [PATCH 086/113] - neutrino: SendSectionsdConfig() after
 NeutrinoMessages::RELOAD_SETUP

---
 src/neutrino.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 438893820..3d8e1fa48 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -2999,6 +2999,7 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
 		if(tmp1 != g_settings.make_hd_list || tmp2 != g_settings.make_webtv_list)
 			g_Zapit->reinitChannels();
 
+		SendSectionsdConfig();
 		return messages_return::handled;
 	}
 	else if( msg == NeutrinoMessages::STANDBY_TOGGLE ) {

From 3ff65299d24d29172d5ca501a6d891740f9708fe Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Fri, 5 Dec 2014 22:44:12 +0100
Subject: [PATCH 087/113] - controlapi: cleanup from unused esound rests

---
 src/nhttpd/tuxboxapi/coolstream/controlapi.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/nhttpd/tuxboxapi/coolstream/controlapi.h b/src/nhttpd/tuxboxapi/coolstream/controlapi.h
index ce7f7d9a3..0de76455c 100644
--- a/src/nhttpd/tuxboxapi/coolstream/controlapi.h
+++ b/src/nhttpd/tuxboxapi/coolstream/controlapi.h
@@ -65,7 +65,6 @@ private:
 	void ExecCGI(CyhookHandler *hh);
 	void SystemCGI(CyhookHandler *hh);
 	void StandbyCGI(CyhookHandler *hh);
-	void EsoundCGI(CyhookHandler *hh);
 	void RCCGI(CyhookHandler *hh);
 	void GetDateCGI(CyhookHandler *hh);
 	void GetTimeCGI(CyhookHandler *hh);

From 069defa31cd7add7b331000bd43535e2c1e9ff84 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Fri, 5 Dec 2014 22:49:21 +0100
Subject: [PATCH 088/113] - controlapi: fix horrible typo

---
 src/nhttpd/tuxboxapi/coolstream/controlapi.cpp | 4 ++--
 src/nhttpd/tuxboxapi/coolstream/controlapi.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
index 2064ed501..4f35d4568 100644
--- a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
+++ b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
@@ -174,7 +174,7 @@ const CControlAPI::TyCgiCall CControlAPI::yCgiCallList[]=
 	{"gettime", 		&CControlAPI::GetTimeCGI,		"text/plain"},
 	{"info", 			&CControlAPI::InfoCGI,			"text/plain"},
 	{"version", 		&CControlAPI::VersionCGI,		""},
-	{"reloadsetup", 	&CControlAPI::ReloadNutrinoSetupfCGI,		""},
+	{"reloadsetup", 	&CControlAPI::ReloadNeutrinoSetupCGI,		""},
 	{"reloadplugins", 	&CControlAPI::ReloadPluginsCGI,		""},
 	{"screenshot", 		&CControlAPI::ScreenshotCGI,		""},
 	// boxcontrol - devices
@@ -1561,7 +1561,7 @@ void CControlAPI::VersionCGI(CyhookHandler *hh)
 	hh->SendFile("/.version");
 }
 //-----------------------------------------------------------------------------
-void CControlAPI::ReloadNutrinoSetupfCGI(CyhookHandler *hh)
+void CControlAPI::ReloadNeutrinoSetupCGI(CyhookHandler *hh)
 {
 	NeutrinoAPI->EventServer->sendEvent(NeutrinoMessages::RELOAD_SETUP, CEventServer::INITID_HTTPD);
 	hh->SendOk();
diff --git a/src/nhttpd/tuxboxapi/coolstream/controlapi.h b/src/nhttpd/tuxboxapi/coolstream/controlapi.h
index 0de76455c..4234ba39b 100644
--- a/src/nhttpd/tuxboxapi/coolstream/controlapi.h
+++ b/src/nhttpd/tuxboxapi/coolstream/controlapi.h
@@ -82,7 +82,7 @@ private:
 	void GetBouquetsCGI(CyhookHandler *hh);
 	void EpgCGI(CyhookHandler *hh);
 	void VersionCGI(CyhookHandler *hh);
-	void ReloadNutrinoSetupfCGI(CyhookHandler *hh);
+	void ReloadNeutrinoSetupCGI(CyhookHandler *hh);
 	void ReloadPluginsCGI(CyhookHandler *hh);
 	void ScreenshotCGI(CyhookHandler *hh);
 	void ZaptoCGI(CyhookHandler *hh);

From 35b4cc148314c258e40ba8efec4a23eef7ab4cdd Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Fri, 5 Dec 2014 22:30:14 +0100
Subject: [PATCH 089/113] - yWeb: use an include-block to paint submit/apply
 buttons

---
 src/nhttpd/web/Y_Version.txt         |  2 +-
 src/nhttpd/web/Y_neutrino_Blocks.txt | 48 +++++++++++-----------------
 src/nhttpd/web/languages/Deutsch     |  1 +
 src/nhttpd/web/languages/English     |  3 +-
 4 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/src/nhttpd/web/Y_Version.txt b/src/nhttpd/web/Y_Version.txt
index 11e991a9c..14fadf2f3 100644
--- a/src/nhttpd/web/Y_Version.txt
+++ b/src/nhttpd/web/Y_Version.txt
@@ -1,4 +1,4 @@
-version=2.8.0.64
+version=2.8.0.65
 date=05.12.2014
 type=Release
 info=Port CST
diff --git a/src/nhttpd/web/Y_neutrino_Blocks.txt b/src/nhttpd/web/Y_neutrino_Blocks.txt
index 9269e9199..e69b9dbed 100644
--- a/src/nhttpd/web/Y_neutrino_Blocks.txt
+++ b/src/nhttpd/web/Y_neutrino_Blocks.txt
@@ -30,6 +30,15 @@ start-block~neutrino_form_helpbox
 </div>
 end-block~neutrino_form_helpbox
 
+# ------- Neutrino form submit buttons
+start-block~neutrino_form_submit
+	<button type="button" ytype="save" title="{=L:save_values_desc=}" onclick="do_submit()">{=L:save=}</button>
+	&nbsp;
+	<button type="button" ytype="refresh" title="{=L:apply_desc=}" onclick="reload_neutrino_conf()">{=L:apply=}</button>
+	&nbsp;
+	<a href="javascript:top.top_main.prim_menu.nav('info', 'Y_Info_Help.yhtm');" class="inlink">{=L:help=}</a>
+end-block~neutrino_form_submit
+
 # ------- Neutrino form-data: record -------------------------------
 start-block~neutrino_form-data_record
 <div class="work_box">
@@ -139,9 +148,7 @@ start-block~neutrino_form-data_record
 		<input type="hidden" name="tmpl" value="Y_Settings_neutrino_forms.yhtm"/>
 		<input type="hidden" name="execute" value="include-block:Y_neutrino_Blocks.txt;neutrino_record_save_settings;nix"/>
 		<input type="hidden" name="form" value="{=form=}"/>
-		<button type="button" ytype="save" title="{=L:save_values_desc=}s" onclick="do_submit()">{=L:save=}</button>
-		&nbsp;<button type="button" ytype="refresh" onclick="dbox_reload_neutrino()">{=L:set.reload_neutrino=}</button>
-		&nbsp;<a href="javascript:top.top_main.prim_menu.nav('info', 'Y_Info_Help.yhtm');" class="inlink">{=L:help=}</a>
+		{=include-block:Y_neutrino_Blocks.txt;neutrino_form_submit;nothing=}
 	</form>
 	</div>
 </div>
@@ -225,9 +232,7 @@ start-block~neutrino_form-data_movieplayer
 		<input type="hidden" name="tmpl" value="Y_Settings_neutrino_forms.yhtm"/>
 		<input type="hidden" name="execute" value="include-block:Y_neutrino_Blocks.txt;neutrino_movieplayer_save_settings;nix"/>
 		<input type="hidden" name="form" value="{=form=}"/>
-		<button type="button" ytype="save" title="{=L:save_values_desc=}" onclick="do_submit()">{=L:save=}</button>
-		&nbsp;<button type="button" ytype="refresh" onclick="dbox_reload_neutrino()">{=L:set.reload_neutrino=}</button>
-		&nbsp;<a href="javascript:top.top_main.prim_menu.nav('info', 'Y_Info_Help.yhtm');" class="inlink">{=L:help=}</a>
+		{=include-block:Y_neutrino_Blocks.txt;neutrino_form_submit;nothing=}
 	</form>
 	</div>
 </div>
@@ -292,9 +297,7 @@ start-block~neutrino_form-data_parental
 		<input type="hidden" name="tmpl" value="Y_Settings_neutrino_forms.yhtm"/>
 		<input type="hidden" name="execute" value="include-block:Y_neutrino_Blocks.txt;neutrino_parental_save_settings;nix"/>
 		<input type="hidden" name="form" value="{=form=}"/>
-		<button type="button" ytype="save" title="{=L:save_values_desc=}s" onclick="do_submit()">{=L:save=}</button>
-		&nbsp;<button type="button" ytype="refresh" onclick="dbox_reload_neutrino()">{=L:set.reload_neutrino=}</button>
-		&nbsp;<a href="javascript:top.top_main.prim_menu.nav('info', 'Y_Info_Help.yhtm');" class="inlink">{=L:help=}</a>
+		{=include-block:Y_neutrino_Blocks.txt;neutrino_form_submit;nothing=}
 	</form>
 	</div>
 </div>
@@ -424,8 +427,7 @@ start-block~neutrino_form-data_epg
 		<input type="hidden" name="tmpl" value="Y_Settings_neutrino_forms.yhtm"/>
 		<input type="hidden" name="execute" value="include-block:Y_neutrino_Blocks.txt;neutrino_epg_save_settings;nix"/>
 		<input type="hidden" name="form" value="{=form=}"/>
-		<button type="button" ytype="save" title="{=L:save_values_desc=}" onclick="do_submit()">{=L:save=}</button>
-		&nbsp;<button type="button" ytype="refresh" onclick="reload_neutrino_conf()">{=L:apply=}</button>
+		{=include-block:Y_neutrino_Blocks.txt;neutrino_form_submit;nothing=}
 	</form>
 	</div>
 </div>
@@ -697,9 +699,7 @@ start-block~neutrino_form-data_diverse
 		<input type="hidden" name="tmpl" value="Y_Settings_neutrino_forms.yhtm"/>
 		<input type="hidden" name="execute" value="include-block:Y_neutrino_Blocks.txt;neutrino_diverse_save_settings;nix"/>
 		<input type="hidden" name="form" value="{=form=}"/>
-		<button type="button" ytype="save" title="{=L:save_values_desc=}s" onclick="do_submit()">{=L:save=}</button>
-		&nbsp;<button type="button" ytype="refresh" onclick="dbox_reload_neutrino()">reload Neutrino</button>
-		&nbsp;<a href="javascript:top.top_main.prim_menu.nav('info', 'Y_Info_Help.yhtm');" class="inlink">{=L:help=}</a>
+		{=include-block:Y_neutrino_Blocks.txt;neutrino_form_submit;nothing=}
 	</form>
 	</div>
 </div>
@@ -893,9 +893,7 @@ start-block~neutrino_form-data_bootoptions
 		<input type="hidden" name="tmpl" value="Y_Settings_neutrino_forms.yhtm"/>
 		<input type="hidden" name="execute" value="include-block:Y_neutrino_Blocks.txt;neutrino_bootoptions_save_settings;nix"/>
 		<input type="hidden" name="form" value="{=form=}"/>
-		<button type="button" ytype="save" title="{=L:save_values_desc=}s" onclick="do_submit()">{=L:save=}</button>
-		&nbsp;<button type="button" ytype="refresh" onclick="dbox_reload_neutrino()">reload Neutrino</button>
-		&nbsp;<a href="javascript:top.top_main.prim_menu.nav('info', 'Y_Info_Help.yhtm');" class="inlink">{=L:help=}</a>
+		{=include-block:Y_neutrino_Blocks.txt;neutrino_form_submit;nothing=}
 	</form>
 	</div>
 </div>
@@ -981,9 +979,7 @@ start-block~neutrino_form-data_pictureviewer
 		<input type="hidden" name="tmpl" value="Y_Settings_neutrino_forms.yhtm"/>
 		<input type="hidden" name="execute" value="include-block:Y_neutrino_Blocks.txt;neutrino_pictureviewer_save_settings;nix"/>
 		<input type="hidden" name="form" value="{=form=}"/>
-		<button type="button" ytype="save" title="{=L:save_values_desc=}s" onclick="do_submit()">{=L:save=}</button>
-		&nbsp;<button type="button" ytype="refresh" onclick="dbox_reload_neutrino()">{=L:set.reload_neutrino=}</button>
-		&nbsp;<a href="javascript:top.top_main.prim_menu.nav('info', 'Y_Info_Help.yhtm');" class="inlink">{=L:help=}</a>
+		{=include-block:Y_neutrino_Blocks.txt;neutrino_form_submit;nothing=}
 	</form>
 	</div>
 </div>
@@ -1086,9 +1082,7 @@ start-block~neutrino_form-data_audioplayer
 		<input type="hidden" name="tmpl" value="Y_Settings_neutrino_forms.yhtm"/>
 		<input type="hidden" name="execute" value="include-block:Y_neutrino_Blocks.txt;neutrino_audioplayer_save_settings;nix"/>
 		<input type="hidden" name="form" value="{=form=}"/>
-		<button type="button" ytype="save" title="{=L:save_values_desc=}s" onclick="do_submit()">{=L:save=}</button>
-		&nbsp;<button type="button" ytype="refresh" onclick="dbox_reload_neutrino()">{=L:set.reload_neutrino=}</button>
-		&nbsp;<a href="javascript:top.top_main.prim_menu.nav('info', 'Y_Info_Help.yhtm');" class="inlink">{=L:help=}</a>
+		{=include-block:Y_neutrino_Blocks.txt;neutrino_form_submit;nothing=}
 	</form>
 	</div>
 </div>
@@ -1257,9 +1251,7 @@ start-block~neutrino_form-data_direct_recording
 		<input type="hidden" name="tmpl" value="Y_Settings_neutrino_forms.yhtm"/>
 		<input type="hidden" name="execute" value="include-block:Y_neutrino_Blocks.txt;neutrino_direct_recording_save_settings;nix"/>
 		<input type="hidden" name="form" value="{=form=}"/>
-		<button type="button" ytype="save" title="{=L:save_values_desc=}s" onclick="do_submit()">{=L:save=}</button>
-		&nbsp;<button type="button" ytype="refresh" onclick="dbox_reload_neutrino()">reload Neutrino</button>
-		&nbsp;<a href="javascript:top.top_main.prim_menu.nav('info', 'Y_Info_Help.yhtm');" class="inlink">{=L:help=}</a>
+		{=include-block:Y_neutrino_Blocks.txt;neutrino_form_submit;nothing=}
 	</form>
 	</div>
 </div>
@@ -1330,9 +1322,7 @@ start-block~neutrino_form-data_esound
 		<input type="hidden" name="tmpl" value="Y_Settings_neutrino_forms.yhtm"/>
 		<input type="hidden" name="execute" value="include-block:Y_neutrino_Blocks.txt;neutrino_esound_save_settings;nix"/>
 		<input type="hidden" name="form" value="{=form=}"/>
-		<button type="button" ytype="save" title="{=L:save_values_desc=}s" onclick="do_submit()">{=L:save=}</button>
-		&nbsp;<button type="button" ytype="refresh" onclick="dbox_reload_neutrino()">reload Neutrino</button>
-		&nbsp;<a href="javascript:top.top_main.prim_menu.nav('info', 'Y_Info_Help.yhtm');" class="inlink">{=L:help=}</a>
+		{=include-block:Y_neutrino_Blocks.txt;neutrino_form_submit;nothing=}
 	</form>
 	</div>
 </div>
diff --git a/src/nhttpd/web/languages/Deutsch b/src/nhttpd/web/languages/Deutsch
index aa70dcb8f..51a45530d 100644
--- a/src/nhttpd/web/languages/Deutsch
+++ b/src/nhttpd/web/languages/Deutsch
@@ -30,6 +30,7 @@ save=Speichern
 save_all=Alle &Auml;nderungen speichern
 cancel=Abbrechen
 apply=&Auml;nderungen anwenden
+apply_desc=Liest die Konfigurationsdatei von Neutrino neu ein
 answer=Antwort
 reboot=Neustart
 shutdown=Ausschalten
diff --git a/src/nhttpd/web/languages/English b/src/nhttpd/web/languages/English
index dd5f760e7..7f342bfe5 100644
--- a/src/nhttpd/web/languages/English
+++ b/src/nhttpd/web/languages/English
@@ -29,7 +29,8 @@ management=Management
 uninstaller=Uninstaller
 send=send
 cancel=cancel
-apply=Apply changes
+apply=apply changes
+apply_desc=reload neutrino configfile
 answer=Answer
 reboot=reboot
 shutdown=shutdown

From 0c63297f0bb7f05e1a40d43a07bdff9cb96fce4b Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Fri, 5 Dec 2014 22:41:48 +0100
Subject: [PATCH 090/113] - yWeb: cleanup from unused esound stuff

---
 src/nhttpd/web/Y_Blocks.txt                |  1 -
 src/nhttpd/web/Y_Settings_Menue.yhtm       |  5 ---
 src/nhttpd/web/Y_Settings_personalize.yhtm |  8 ----
 src/nhttpd/web/Y_Version.txt               |  2 +-
 src/nhttpd/web/Y_neutrino_Blocks.txt       | 43 ----------------------
 src/nhttpd/web/languages/Czech             |  1 -
 src/nhttpd/web/languages/Deutsch           |  1 -
 src/nhttpd/web/languages/English           |  1 -
 src/nhttpd/web/languages/Portuguese        |  1 -
 src/nhttpd/web/languages/Slovak            |  1 -
 10 files changed, 1 insertion(+), 63 deletions(-)

diff --git a/src/nhttpd/web/Y_Blocks.txt b/src/nhttpd/web/Y_Blocks.txt
index 5f216f7ab..12c71185c 100644
--- a/src/nhttpd/web/Y_Blocks.txt
+++ b/src/nhttpd/web/Y_Blocks.txt
@@ -122,7 +122,6 @@ start-block~personalize_save_settings
 {=ini-set:/var/tuxbox/config/neutrino.conf;personalize_games;{=p_games=}~cache=}
 {=ini-set:/var/tuxbox/config/neutrino.conf;personalize_audioplayer;{=p_audioplayer=}~cache=}
 {=ini-set:/var/tuxbox/config/neutrino.conf;personalize_inetradio;{=p_inetradio=}~cache=}
-{=ini-set:/var/tuxbox/config/neutrino.conf;personalize_esound;{=p_esound=}~cache=}
 {=ini-set:/var/tuxbox/config/neutrino.conf;personalize_movieplayer;{=p_movieplayer=}~cache=}
 {=ini-set:/var/tuxbox/config/neutrino.conf;personalize_pictureviewer;{=p_picviewer=}~cache=}
 {=ini-set:/var/tuxbox/config/neutrino.conf;personalize_pincode;{=p_pincode=}~cache=}
diff --git a/src/nhttpd/web/Y_Settings_Menue.yhtm b/src/nhttpd/web/Y_Settings_Menue.yhtm
index d009c55b9..fc4148215 100644
--- a/src/nhttpd/web/Y_Settings_Menue.yhtm
+++ b/src/nhttpd/web/Y_Settings_Menue.yhtm
@@ -91,11 +91,6 @@ function init(){
 					{=var-set:m_link_text={=L:set.menue.video_audio=}=}
 					{=include-block:Y_Blocks.txt;management_link=}
 				</li>
-				<li>
-					{=var-set:m_link_href=Y_Settings_neutrino_forms.yhtm?form=neutrino_form-data_esound=}
-					{=var-set:m_link_text={=L:set.menue.esound_server=}=}
-					{=include-block:Y_Blocks.txt;management_link=}
-				</li>
 				<li>
 					{=var-set:m_link_href=Y_Settings_neutrino_forms.yhtm?form=neutrino_form-data_direct_recording=}
 					{=var-set:m_link_text={=L:set.menue.direct_recording=}=}
diff --git a/src/nhttpd/web/Y_Settings_personalize.yhtm b/src/nhttpd/web/Y_Settings_personalize.yhtm
index a4bce8d7f..58fd92d01 100644
--- a/src/nhttpd/web/Y_Settings_personalize.yhtm
+++ b/src/nhttpd/web/Y_Settings_personalize.yhtm
@@ -21,7 +21,6 @@ function do_init()
 	obj_set_radio_value('p_games', "{=ini-get:/var/tuxbox/config/neutrino.conf;personalize_games;1~cache=}");
 	obj_set_radio_value('p_audioplayer', "{=ini-get:/var/tuxbox/config/neutrino.conf;personalize_audioplayer;1~cache=}");
 	obj_set_radio_value('p_inetradio', "{=ini-get:/var/tuxbox/config/neutrino.conf;personalize_inetradio;1~cache=}");
-	obj_set_radio_value('p_esound', "{=ini-get:/var/tuxbox/config/neutrino.conf;personalize_esound;1~cache=}");
 	obj_set_radio_value('p_movieplayer', "{=ini-get:/var/tuxbox/config/neutrino.conf;personalize_movieplayer;1~cache=}");
 	obj_set_radio_value('p_picviewer', "{=ini-get:/var/tuxbox/config/neutrino.conf;personalize_pictureviewer;1~cache=}");
 	obj_set_radio_value('p_pinstatus', "{=ini-get:/var/tuxbox/config/neutrino.conf;personalize_pinstatus;0~cache=}");
@@ -134,13 +133,6 @@ function do_init()
 					<input type="radio" name="p_inetradio" value="2"/>PIN
 				</td>
 			</tr>
-			<tr><td>Esound Soundserver</td>
-				<td>
-					<input type="radio" name="p_esound" value="0"/>nicht sichtbar&nbsp;
-					<input type="radio" name="p_esound" value="1"/>sichtbar&nbsp;
-					<input type="radio" name="p_esound" value="2"/>PIN
-				</td>
-			</tr>
 			<tr><td>Movieplayer</td>
 				<td>
 					<input type="radio" name="p_movieplayer" value="0"/>nicht sichtbar&nbsp;
diff --git a/src/nhttpd/web/Y_Version.txt b/src/nhttpd/web/Y_Version.txt
index 14fadf2f3..1280b6a20 100644
--- a/src/nhttpd/web/Y_Version.txt
+++ b/src/nhttpd/web/Y_Version.txt
@@ -1,4 +1,4 @@
-version=2.8.0.65
+version=2.8.0.66
 date=05.12.2014
 type=Release
 info=Port CST
diff --git a/src/nhttpd/web/Y_neutrino_Blocks.txt b/src/nhttpd/web/Y_neutrino_Blocks.txt
index e69b9dbed..b4f703fbc 100644
--- a/src/nhttpd/web/Y_neutrino_Blocks.txt
+++ b/src/nhttpd/web/Y_neutrino_Blocks.txt
@@ -1305,49 +1305,6 @@ start-block~neutrino_direct_recording_save_settings
 {=ini-set:/var/tuxbox/config/neutrino.conf;recording_dir_permissions_0;{=recording_dir_permissions_0=}~save=}
 end-block~neutrino_direct_recording_save_settings
 
-# ------- Neutrino form-data: esound -------------------------------
-start-block~neutrino_form-data_esound
-<div class="work_box">
-	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:help_url=Help-Settings-Esound_Soundserver=}{=var-set:menu=Esound Soundserver=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
-	<div class="work_box_body">
-	<form name="f" action="/y/cgi">
-		<table cellspacing="0" border="0" cellpadding="2" width="100%">
-			<tr>
-				<td width="35%">Esound Port</td>
-				<td><input type="text" name="esound_port" size="5" maxlength="5" value="{=ini-get:/var/tuxbox/config/neutrino.conf;esound_port~open=}" title="esound port"/>&nbsp;default: 16001</td>
-			</tr>
-		</table>
-		<br/>
-		<input type="hidden" name="tmpl" value="Y_Settings_neutrino_forms.yhtm"/>
-		<input type="hidden" name="execute" value="include-block:Y_neutrino_Blocks.txt;neutrino_esound_save_settings;nix"/>
-		<input type="hidden" name="form" value="{=form=}"/>
-		{=include-block:Y_neutrino_Blocks.txt;neutrino_form_submit;nothing=}
-	</form>
-	</div>
-</div>
-
-<script type="text/javascript">
-//<![CDATA[
-function form_init()
-{
-}
-
-function do_submit()
-{
-	show_waitbox(true);
-	document.f.submit();
-}
-form_init();
-//]]>
-</script>
-end-block~neutrino_form-data_esound
-
-# ------- yWeb save Settings
-start-block~neutrino_esound_save_settings
-{=ini-set:/var/tuxbox/config/neutrino.conf;esound_port;{=esound_port=}=}
-end-block~neutrino_esound_save_settings
-
 # ------- list possible directorys for records
 start-block~neutrino_list_record_dirs
 <select name="rec_dir" id="rec_dir" class="y_live_button">
diff --git a/src/nhttpd/web/languages/Czech b/src/nhttpd/web/languages/Czech
index d747a1703..8eace700f 100644
--- a/src/nhttpd/web/languages/Czech
+++ b/src/nhttpd/web/languages/Czech
@@ -222,7 +222,6 @@ set.menue.parental=Rodičovská kontrola
 set.menue.direct_recording=Přímé nahrávání
 set.menue.recording=Nahrávání
 set.menue.audio_player=Přehrávač hudby
-set.menue.esound_server=Server Esound
 set.menue.movieplayer=Přehrávač filmů
 set.menue.pictureviewer=Prohlížeč obrázků
 set.menue.lcd_display=LCD zobrazovač
diff --git a/src/nhttpd/web/languages/Deutsch b/src/nhttpd/web/languages/Deutsch
index 51a45530d..61d62a87a 100644
--- a/src/nhttpd/web/languages/Deutsch
+++ b/src/nhttpd/web/languages/Deutsch
@@ -224,7 +224,6 @@ set.menue.parental=Jugendschutz
 set.menue.direct_recording=Direktaufnahme
 set.menue.recording=Aufnahme
 set.menue.audio_player=Audioplayer
-set.menue.esound_server=Esound Server
 set.menue.movieplayer=Movieplayer
 set.menue.pictureviewer=Bildbetrachter
 set.menue.lcd_display=LC-Display
diff --git a/src/nhttpd/web/languages/English b/src/nhttpd/web/languages/English
index 7f342bfe5..004558a54 100644
--- a/src/nhttpd/web/languages/English
+++ b/src/nhttpd/web/languages/English
@@ -227,7 +227,6 @@ set.menue.parental=Parental
 set.menue.direct_recording=Direct Recording
 set.menue.recording=Recording
 set.menue.audio_player=Audioplayer
-set.menue.esound_server=Esound Server
 set.menue.movieplayer=Movieplayer
 set.menue.pictureviewer=Picture Viewer
 set.menue.lcd_display=LC-Display
diff --git a/src/nhttpd/web/languages/Portuguese b/src/nhttpd/web/languages/Portuguese
index cab847312..1dffab32c 100644
--- a/src/nhttpd/web/languages/Portuguese
+++ b/src/nhttpd/web/languages/Portuguese
@@ -228,7 +228,6 @@ set.menue.parental=Parental
 set.menue.direct_recording=Gravação Directa
 set.menue.recording=Gravação
 set.menue.audio_player=Audioplayer
-set.menue.esound_server=Server Esound
 set.menue.movieplayer=Movieplayer
 set.menue.pictureviewer=Picture Viewer
 set.menue.lcd_display=LC-Display
diff --git a/src/nhttpd/web/languages/Slovak b/src/nhttpd/web/languages/Slovak
index 1d45f5f24..440ce4ea7 100644
--- a/src/nhttpd/web/languages/Slovak
+++ b/src/nhttpd/web/languages/Slovak
@@ -222,7 +222,6 @@ set.menue.parental=Rodičovská kontrola
 set.menue.direct_recording=Priame nahrávanie
 set.menue.recording=Nahrávanie
 set.menue.audio_player=Prehrávač hudby
-set.menue.esound_server=Server Esound
 set.menue.movieplayer=Prehrávač filmov
 set.menue.pictureviewer=Prehliadač obrázkov
 set.menue.lcd_display=LCD zobrazovač

From 24fabb8daf34cdf01990625385b34f83177cf533 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Fri, 5 Dec 2014 22:54:13 +0100
Subject: [PATCH 091/113] - yWeb: remove unused/obsolete bootoptions blocks

---
 src/nhttpd/web/Y_Settings_Menue.yhtm |   5 -
 src/nhttpd/web/Y_Version.txt         |   2 +-
 src/nhttpd/web/Y_neutrino_Blocks.txt | 159 ---------------------------
 3 files changed, 1 insertion(+), 165 deletions(-)

diff --git a/src/nhttpd/web/Y_Settings_Menue.yhtm b/src/nhttpd/web/Y_Settings_Menue.yhtm
index fc4148215..7a27aa57c 100644
--- a/src/nhttpd/web/Y_Settings_Menue.yhtm
+++ b/src/nhttpd/web/Y_Settings_Menue.yhtm
@@ -106,11 +106,6 @@ function init(){
 					{=var-set:m_link_text={=L:set.menue.key_settings=}=}
 					{=include-block:Y_Blocks.txt;management_link=}
 				</li>
-				<li>
-					{=var-set:m_link_href=Y_Settings_neutrino_forms.yhtm?form=neutrino_form-data_bootoptions=}
-					{=var-set:m_link_text={=L:set.menue.boot_options=}=}
-					{=include-block:Y_Blocks.txt;management_link=}
-				</li>
 				<li>
 					{=var-set:m_link_href=Y_Settings_neutrino_forms.yhtm?form=neutrino_form-data_diverse=}
 					{=var-set:m_link_text={=L:set.menue.others=}=}
diff --git a/src/nhttpd/web/Y_Version.txt b/src/nhttpd/web/Y_Version.txt
index 1280b6a20..1dd7f9347 100644
--- a/src/nhttpd/web/Y_Version.txt
+++ b/src/nhttpd/web/Y_Version.txt
@@ -1,4 +1,4 @@
-version=2.8.0.66
+version=2.8.0.67
 date=05.12.2014
 type=Release
 info=Port CST
diff --git a/src/nhttpd/web/Y_neutrino_Blocks.txt b/src/nhttpd/web/Y_neutrino_Blocks.txt
index b4f703fbc..685609fa2 100644
--- a/src/nhttpd/web/Y_neutrino_Blocks.txt
+++ b/src/nhttpd/web/Y_neutrino_Blocks.txt
@@ -789,165 +789,6 @@ start-block~neutrino_diverse_save_settings
 {=ini-set:/var/tuxbox/config/zapit/zapit.conf;makeRemainingChannelsBouquet;{=bouquet_others=}~save=}
 end-block~neutrino_diverse_save_settings
 
-
-# ------- Neutrino form-data: bootoptions -------------------------------
-start-block~neutrino_form-data_bootoptions
-<div class="work_box">
-	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:help_url=Help-Settings-Bootoptionen=}{=var-set:menu=Treiber- und Bootoptionen=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
-	<div class="work_box_body">
-	<form name="f" class="y_form" action="/y/cgi">
-		<table cellspacing="0" border="0" cellpadding="2" width="100%">
-			<tr title="SPTS mode: off/on">
-				<td width="35%">SPTS-Mode Treiber laden</td>
-				<td>
-					<input type="radio" name="misc_spts" value="false"/>{=L:off=}&nbsp;
-					<input type="radio" name="misc_spts" value="true"/>{=L:on=}
-				</td>
-			</tr>
-			<tr title="Bootinfo: off/on">
-				<td>Infos beim Booten anzeigen</td>
-				<td>
-					<input type="radio" name="bootinfo" value="0"/>{=L:off=}&nbsp;
-					<input type="radio" name="bootinfo" value="1"/>{=L:on=}
-				</td>
-			</tr>
-			<tr title="HW Sections: off/on">
-				<td>HW-Sections verwenden</td>
-				<td>
-					<input type="radio" name="hwsections" value="0"/>{=L:off=}&nbsp;
-					<input type="radio" name="hwsections" value="1"/>{=L:on=}
-				</td>
-			</tr>
-			<tr title="AVIA-Watchdog: off/on">
-				<td>AVIA-Watchdog aktivieren</td>
-				<td>
-					<input type="radio" name="no_watchdog" value="0"/>{=L:off=}&nbsp;
-					<input type="radio" name="no_watchdog" value="1"/>{=L:on=}
-				</td>
-			</tr>
-			<tr title="eNX-Watchdog: off/on">
-				<td>eNX-Watchdog aktivieren</td>
-				<td>
-					<input type="radio" name="no_enxwatchdog" value="0"/>{=L:off=}&nbsp;
-					<input type="radio" name="no_enxwatchdog" value="1"/>{=L:on=}
-				</td>
-			</tr>
-			<tr title="philips rc patch: off/on">
-				<td>Philips/Sagem FB Workaround</td>
-				<td>
-					<input type="radio" name="philips_rc_patch" value="0"/>{=L:off=}&nbsp;
-					<input type="radio" name="philips_rc_patch" value="1"/>{=L:on=}
-				</td>
-			</tr>
-			<tr title="AVIA spts-fix: off/on">
-				<td>SPTS-Fix AVIA500</td>
-				<td>
-					<input type="radio" name="sptsfix" value="0"/>{=L:off=}&nbsp;
-					<input type="radio" name="sptsfix" value="1"/>{=L:on=}
-				</td>
-			</tr>
-			<tr title="RTC: off/on">
-				<td>Realtime Clock (RTC) aktivieren</td>
-				<td>
-					<input type="radio" name="rtc" value="0"/>{=L:off=}&nbsp;
-					<input type="radio" name="rtc" value="1"/>{=L:on=}
-				</td>
-			</tr>
-			<tr title="PMT Update: off/on">
-				<td>PMT Update verwenden</td>
-				<td>
-					<input type="radio" name="no_pmt_update" value="0"/>{=L:off=}&nbsp;
-					<input type="radio" name="no_pmt_update" value="1"/>{=L:on=}
-				</td>
-			</tr>
-			<tr>
-				<td>EXPERT! Boot-Konsole</td>
-				<td>
-					<select name="console" title="expert boot-console">
-					<option value="null" selected="selected">null</option>
-					<option value="ttyS0">seriell</option>
-					<option value="tty">framebuffer</option>
-					</select>
-				</td>
-			</tr>
-			<tr title="Fullduplex: off/on">
-				<td>FullDuplex Mode</td>
-				<td>
-					<input type="radio" name="dbox_duplex" value="0"/>{=L:off=}&nbsp;
-					<input type="radio" name="dbox_duplex" value="1"/>{=L:on=}
-				</td>
-			</tr>
-			<tr>
-				<td colspan="2" width="35%" class="y_form_header">Diverses</td>
-			</tr>
-			<tr title="Bootmenu: off/on">
-				<td>Bootmen&uuml; anzeigen</td>
-				<td>
-					<input type="radio" name="bootmenu" value="0"/>{=L:off=}&nbsp;
-					<input type="radio" name="bootmenu" value="1"/>{=L:on=}
-				</td>
-			</tr>
-		</table>
-		<br/>
-		<input type="hidden" name="tmpl" value="Y_Settings_neutrino_forms.yhtm"/>
-		<input type="hidden" name="execute" value="include-block:Y_neutrino_Blocks.txt;neutrino_bootoptions_save_settings;nix"/>
-		<input type="hidden" name="form" value="{=form=}"/>
-		{=include-block:Y_neutrino_Blocks.txt;neutrino_form_submit;nothing=}
-	</form>
-	</div>
-</div>
-<script type="text/javascript">
-//<![CDATA[
-function form_init()
-{
-	var val = "{=ini-get:/var/tuxbox/boot/boot.conf;console~open=}";
-	var sel = 0;
-	if(val=="ttyS0") sel=1;
-	if(val=="tty") sel=2;
-		document.f.console.selectedIndex = sel;
-	
-	obj_set_radio_value('dbox_duplex', "{=ini-get:/var/tuxbox/boot/boot.conf;dbox_duplex~cache=}");
-	obj_set_radio_value('misc_spts', "{=ini-get:/var/tuxbox/config/neutrino.conf;misc_spts~open=}");
-	obj_set_radio_value('bootmenu', "{=if-file-exists:/var/etc/.neutrino~0~1=}");
-	obj_set_radio_value('bootinfo', "{=if-file-exists:/var/etc/.boot_info~1~0=}");
-	obj_set_radio_value('hwsections', "{=if-file-exists:/var/etc/.hw_sections~0~1=}");
-	obj_set_radio_value('no_watchdog', "{=if-file-exists:/var/etc/.no_watchdog~0~1=}");
-	obj_set_radio_value('no_enxwatchdog', "{=if-file-exists:/var/etc/.no_enxwatchdog~0~1=}");
-	obj_set_radio_value('philips_rc_patch', "{=if-file-exists:/var/etc/.philips_rc_patch~1~0=}");
-	obj_set_radio_value('sptsfix', "{=if-file-exists:/var/etc/.sptsfix~1~0=}");
-	obj_set_radio_value('rtc', "{=if-file-exists:/var/etc/.rtc~1~0=}");
-	obj_set_radio_value('no_pmt_update', "{=if-file-exists:/var/etc/.no_pmt_update~0~1=}");
-}
-
-function do_submit()
-{
-	show_waitbox(true);
-	document.f.submit();
-}
-form_init();
-//]]>
-</script>
-end-block~neutrino_form-data_bootoptions
-
-# ------- yWeb save Settings
-start-block~neutrino_bootoptions_save_settings
-{=ini-set:/var/tuxbox/config/neutrino.conf;misc_spts;{=misc_spts=}=}
-{=file-action:/var/etc/.neutrino;{=if-equal:{=bootmenu=}~0~add~delete=}=}
-{=file-action:/var/etc/.boot_info;{=if-equal:{=bootinfo=}~1~add~delete=}=}
-{=file-action:/var/etc/.hw_sections;{=if-equal:{=hwsections=}~0~add~delete=}=}
-{=file-action:/var/etc/.no_watchdog;{=if-equal:{=no_watchdog=}~0~add~delete=}=}
-{=file-action:/var/etc/.no_enxwatchdog;{=if-equal:{=no_enxwatchdog=}~0~add~delete=}=}
-{=file-action:/var/etc/.philips_rc_patch;{=if-equal:{=philips_rc_patch=}~1~add~delete=}=}
-{=file-action:/var/etc/.sptsfix;{=if-equal:{=sptsfix=}~1~add~delete=}=}
-{=file-action:/var/etc/.rtc;{=if-equal:{=rtc=}~1~add~delete=}=}
-{=file-action:/var/etc/.no_pmt_update;{=if-equal:{=no_pmt_update=}~0~add~delete=}=}
-{=ini-set:/var/tuxbox/boot/boot.conf;console;{=console=}=}
-{=ini-set:/var/tuxbox/boot/boot.conf;dbox_duplex;{=dbox_duplex=}=}
-
-#{=file-action:/var/etc/.test;add;moin\nduu=}
-end-block~neutrino_bootoptions_save_settings
-
 # ------- Neutrino form-data: pictureviewer -------------------------------
 start-block~neutrino_form-data_pictureviewer
 <div class="work_box">

From 1e8d4bb7c2b042b1781c73f81de2af296f5b1f95 Mon Sep 17 00:00:00 2001
From: Jacek Jendrzej <crashdvb@googlemail.com>
Date: Mon, 8 Dec 2014 10:16:47 +0100
Subject: [PATCH 092/113] set cpufreq similar to
 wakeupFromStandby/standbyToStandby

---
 src/neutrino.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 3d8e1fa48..bb054b9c8 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -3514,8 +3514,9 @@ void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby )
 		puts("[neutrino.cpp] executing " NEUTRINO_ENTER_STANDBY_SCRIPT ".");
 		if (my_system(NEUTRINO_ENTER_STANDBY_SCRIPT) != 0)
 			perror(NEUTRINO_ENTER_STANDBY_SCRIPT " failed");
-
-		if(!CRecordManager::getInstance()->RecordingStatus())
+		bool alive = recordingstatus || CEpgScan::getInstance()->Running() ||
+		CStreamManager::getInstance()->StreamStatus();
+		if(!alive)
 			cpuFreq->SetCpuFreq(g_settings.standby_cpufreq * 1000 * 1000);
 
 		//fan speed

From 78c95831041a74ad3c0185197a43b5d296a6e968 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Fri, 12 Dec 2014 17:45:02 +0100
Subject: [PATCH 093/113] - deutsch.locale: fix terrible typo

---
 data/locale/deutsch.locale | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index ff8429e72..82fb627ad 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -653,12 +653,12 @@ fontmenu.head Schrift
 fontmenu.infobar Infobar
 fontmenu.menu Menü
 fontmenu.other Andere
-fontmenu.scaling Schriftgrössenfaktor
+fontmenu.scaling Schriftgrößenfaktor
 fontmenu.scaling_x Horizontal (in %)
 fontmenu.scaling_x_hint2 Horizontal (in %) min 50 / max 200
 fontmenu.scaling_y Vertikal (in %)
 fontmenu.scaling_y_hint2 Vertikal (in %) min 50 / max 200
-fontmenu.sizes Schriftgrössen
+fontmenu.sizes Schriftgrößen
 fontsize.channel_num_zap Direktauswahl
 fontsize.channellist Kanalliste
 fontsize.channellist_descr Beschreibung
@@ -1565,7 +1565,7 @@ moviebrowser.info_prodyear Jahr
 moviebrowser.info_quality Qualität
 moviebrowser.info_recorddate Aufnahmedatum
 moviebrowser.info_serie Serie
-moviebrowser.info_size Dateigrösse (MB)
+moviebrowser.info_size Dateigröße (MB)
 moviebrowser.info_title Titel
 moviebrowser.info_videoformat Bild
 moviebrowser.last_play_max_items Zeilen 'zuletzt aufgenommen'
@@ -1609,7 +1609,7 @@ moviebrowser.short_prodyear Jahr
 moviebrowser.short_quality Qualität
 moviebrowser.short_recorddate Datum
 moviebrowser.short_serie Serie
-moviebrowser.short_size Grösse
+moviebrowser.short_size Größe
 moviebrowser.short_title Titel
 moviebrowser.start_head Film starten von Position:
 moviebrowser.start_record_start Aufnahmestart

From 818c404831bb9e7b33fec1a7f49bd07fe7f22978 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Fri, 12 Dec 2014 17:48:59 +0100
Subject: [PATCH 094/113] - moviebrowser: allow 9 instead of 6 rows

* remove fake-entrys for lastPlayRow and lastRecordRow
---
 src/gui/moviebrowser.cpp   | 34 ++++++++++++++--------------------
 src/gui/moviebrowser.h     | 10 +++++-----
 src/gui/widget/listframe.h |  2 +-
 3 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp
index 5476c67ad..0060d47f7 100644
--- a/src/gui/moviebrowser.cpp
+++ b/src/gui/moviebrowser.cpp
@@ -362,15 +362,19 @@ CMovieBrowser::~CMovieBrowser()
 
 void CMovieBrowser::clearListLines()
 {
-	for (int i = 0; i < LF_MAX_ROWS; i++)
+	for (int i = 0; i < MB_MAX_ROWS; i++)
 	{
 		m_browserListLines.lineArray[i].clear();
-		m_recordListLines.lineArray[i].clear();
-		m_playListLines.lineArray[i].clear();
 		m_FilterLines.lineArray[i].clear();
 	}
 	m_browserListLines.Icon.clear();
 	m_browserListLines.marked.clear();
+
+	for (int i = 0; i < 2; i++)
+	{
+		m_recordListLines.lineArray[i].clear();
+		m_playListLines.lineArray[i].clear();
+	}
 	m_recordListLines.marked.clear();
 	m_playListLines.marked.clear();
 }
@@ -543,6 +547,9 @@ void CMovieBrowser::initGlobalSettings(void)
 	m_settings.browserRowItem[3] = MB_INFO_SIZE;
 	m_settings.browserRowItem[4] = MB_INFO_LENGTH;
 	m_settings.browserRowItem[5] = MB_INFO_INFO1;
+	m_settings.browserRowItem[6] = MB_INFO_MAX_NUMBER;
+	m_settings.browserRowItem[7] = MB_INFO_MAX_NUMBER;
+	m_settings.browserRowItem[8] = MB_INFO_MAX_NUMBER;
 
 	m_settings.browserRowWidth[0] = m_defaultRowWidth[m_settings.browserRowItem[0]];		//300;
 	m_settings.browserRowWidth[1] = m_defaultRowWidth[m_settings.browserRowItem[1]]; 		//100;
@@ -550,6 +557,9 @@ void CMovieBrowser::initGlobalSettings(void)
 	m_settings.browserRowWidth[3] = m_defaultRowWidth[m_settings.browserRowItem[3]]; 		//50;
 	m_settings.browserRowWidth[4] = m_defaultRowWidth[m_settings.browserRowItem[4]]; 		//30;
 	m_settings.browserRowWidth[5] = m_defaultRowWidth[m_settings.browserRowItem[5]]; 		//30;
+	m_settings.browserRowWidth[6] = m_defaultRowWidth[m_settings.browserRowItem[6]];
+	m_settings.browserRowWidth[7] = m_defaultRowWidth[m_settings.browserRowItem[7]];
+	m_settings.browserRowWidth[8] = m_defaultRowWidth[m_settings.browserRowItem[8]];
 
 	m_settings.ts_only = 1;
 	m_settings.ytmode = cYTFeedParser::MOST_POPULAR;
@@ -620,33 +630,17 @@ void CMovieBrowser::initRows(void)
 	m_settings.lastPlayRowNr = 2;
 	m_settings.lastPlayRow[0] = MB_INFO_TITLE;
 	m_settings.lastPlayRow[1] = MB_INFO_PREVPLAYDATE;
-	m_settings.lastPlayRow[2] = MB_INFO_MAX_NUMBER;
-	m_settings.lastPlayRow[3] = MB_INFO_MAX_NUMBER;
-	m_settings.lastPlayRow[4] = MB_INFO_MAX_NUMBER;
-	m_settings.lastPlayRow[5] = MB_INFO_MAX_NUMBER;
 	/* the "last played" / "last recorded" windows have only half the width, so
-	   multiply the relative width with 2 and add some fixed value for slack */
+	   multiply the relative width with 2 */
 	m_settings.lastPlayRowWidth[1] = m_defaultRowWidth[m_settings.lastPlayRow[1]] * 2 + 1;
 	m_settings.lastPlayRowWidth[0] = 100 - m_settings.lastPlayRowWidth[1];
-	m_settings.lastPlayRowWidth[2] = m_defaultRowWidth[m_settings.lastPlayRow[2]];
-	m_settings.lastPlayRowWidth[3] = m_defaultRowWidth[m_settings.lastPlayRow[3]];
-	m_settings.lastPlayRowWidth[4] = m_defaultRowWidth[m_settings.lastPlayRow[4]];
-	m_settings.lastPlayRowWidth[5] = m_defaultRowWidth[m_settings.lastPlayRow[5]];
 
 	/***** Last Record List **************/
 	m_settings.lastRecordRowNr = 2;
 	m_settings.lastRecordRow[0] = MB_INFO_TITLE;
 	m_settings.lastRecordRow[1] = MB_INFO_RECORDDATE;
-	m_settings.lastRecordRow[2] = MB_INFO_MAX_NUMBER;
-	m_settings.lastRecordRow[3] = MB_INFO_MAX_NUMBER;
-	m_settings.lastRecordRow[4] = MB_INFO_MAX_NUMBER;
-	m_settings.lastRecordRow[5] = MB_INFO_MAX_NUMBER;
 	m_settings.lastRecordRowWidth[1] = m_defaultRowWidth[m_settings.lastRecordRow[1]] * 2 + 1;
 	m_settings.lastRecordRowWidth[0] = 100 - m_settings.lastRecordRowWidth[1];
-	m_settings.lastRecordRowWidth[2] = m_defaultRowWidth[m_settings.lastRecordRow[2]];
-	m_settings.lastRecordRowWidth[3] = m_defaultRowWidth[m_settings.lastRecordRow[3]];
-	m_settings.lastRecordRowWidth[4] = m_defaultRowWidth[m_settings.lastRecordRow[4]];
-	m_settings.lastRecordRowWidth[5] = m_defaultRowWidth[m_settings.lastRecordRow[5]];
 }
 
 void CMovieBrowser::defaultSettings(MB_SETTINGS* /*settings*/)
diff --git a/src/gui/moviebrowser.h b/src/gui/moviebrowser.h
index bddfca3fc..ba8568ce0 100644
--- a/src/gui/moviebrowser.h
+++ b/src/gui/moviebrowser.h
@@ -190,7 +190,7 @@ typedef enum
 	MB_SHOW_YT
 } MB_SHOW_MODE;
 
-#define MB_MAX_ROWS 6
+#define MB_MAX_ROWS LF_MAX_ROWS
 #define MB_MAX_DIRS 5
 /* MB_SETTINGS to be stored in g_settings anytime ....*/
 typedef struct
@@ -222,13 +222,13 @@ typedef struct
 	// to be added to config later
 	int lastPlayMaxItems;
 	int lastPlayRowNr;
-	MB_INFO_ITEM lastPlayRow[MB_MAX_ROWS];
-	int lastPlayRowWidth[MB_MAX_ROWS];
+	MB_INFO_ITEM lastPlayRow[2];
+	int lastPlayRowWidth[2];
 
 	int lastRecordMaxItems;
 	int lastRecordRowNr;
-	MB_INFO_ITEM lastRecordRow[MB_MAX_ROWS];
-	int lastRecordRowWidth[MB_MAX_ROWS];
+	MB_INFO_ITEM lastRecordRow[2];
+	int lastRecordRowWidth[2];
 	int ytmode;
 	int ytorderby;
 	int ytresults;
diff --git a/src/gui/widget/listframe.h b/src/gui/widget/listframe.h
index 7a1503737..95c3b53e3 100644
--- a/src/gui/widget/listframe.h
+++ b/src/gui/widget/listframe.h
@@ -56,7 +56,7 @@
 #include <gui/widget/textbox.h>
 #include <driver/fb_window.h>
 
-#define LF_MAX_ROWS 6
+#define LF_MAX_ROWS 9
 typedef struct
 {
 	int rows;

From c993ef9e2829dca402c7b899660b9b609a24e5c7 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Fri, 12 Dec 2014 17:50:41 +0100
Subject: [PATCH 095/113] - moviebrowser: use pulldown-menu to show options to
 setup

---
 src/gui/moviebrowser.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp
index 0060d47f7..f522ffcbc 100644
--- a/src/gui/moviebrowser.cpp
+++ b/src/gui/moviebrowser.cpp
@@ -2829,7 +2829,7 @@ bool CMovieBrowser::showMenu(MI_MOVIE_INFO* /* movie_info */, bool calledExterna
 	for (i = 0; i < MB_MAX_ROWS; i++)
 	{
 		CIntInput* browserRowWidthIntInput = new CIntInput(LOCALE_MOVIEBROWSER_BROWSER_ROW_WIDTH,(int *)&m_settings.browserRowWidth[i], 3, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE);
-		optionsMenuBrowser.addItem(new CMenuOptionChooser(LOCALE_MOVIEBROWSER_BROWSER_ROW_ITEM, (int*)(&m_settings.browserRowItem[i]), MESSAGEBOX_BROWSER_ROW_ITEM, MESSAGEBOX_BROWSER_ROW_ITEM_COUNT, true));
+		optionsMenuBrowser.addItem(new CMenuOptionChooser(LOCALE_MOVIEBROWSER_BROWSER_ROW_ITEM, (int*)(&m_settings.browserRowItem[i]), MESSAGEBOX_BROWSER_ROW_ITEM, MESSAGEBOX_BROWSER_ROW_ITEM_COUNT, true, NULL, CRCInput::RC_nokey, NULL, true));
 		optionsMenuBrowser.addItem(new CMenuDForwarder(LOCALE_MOVIEBROWSER_BROWSER_ROW_WIDTH,    true, browserRowWidthIntInput->getValue(),      browserRowWidthIntInput));
 		if (i < MB_MAX_ROWS-1)
 			optionsMenuBrowser.addItem(GenericMenuSeparator);

From 598c79bd8343acef51054cedcdefc637da635e0c Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Fri, 12 Dec 2014 17:51:20 +0100
Subject: [PATCH 096/113] - moviebrowser: add hotkeys to options to setup

---
 src/gui/moviebrowser.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp
index f522ffcbc..8b1451bf5 100644
--- a/src/gui/moviebrowser.cpp
+++ b/src/gui/moviebrowser.cpp
@@ -2829,7 +2829,7 @@ bool CMovieBrowser::showMenu(MI_MOVIE_INFO* /* movie_info */, bool calledExterna
 	for (i = 0; i < MB_MAX_ROWS; i++)
 	{
 		CIntInput* browserRowWidthIntInput = new CIntInput(LOCALE_MOVIEBROWSER_BROWSER_ROW_WIDTH,(int *)&m_settings.browserRowWidth[i], 3, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE);
-		optionsMenuBrowser.addItem(new CMenuOptionChooser(LOCALE_MOVIEBROWSER_BROWSER_ROW_ITEM, (int*)(&m_settings.browserRowItem[i]), MESSAGEBOX_BROWSER_ROW_ITEM, MESSAGEBOX_BROWSER_ROW_ITEM_COUNT, true, NULL, CRCInput::RC_nokey, NULL, true));
+		optionsMenuBrowser.addItem(new CMenuOptionChooser(LOCALE_MOVIEBROWSER_BROWSER_ROW_ITEM, (int*)(&m_settings.browserRowItem[i]), MESSAGEBOX_BROWSER_ROW_ITEM, MESSAGEBOX_BROWSER_ROW_ITEM_COUNT, true, NULL, CRCInput::convertDigitToKey(i+1), NULL, true));
 		optionsMenuBrowser.addItem(new CMenuDForwarder(LOCALE_MOVIEBROWSER_BROWSER_ROW_WIDTH,    true, browserRowWidthIntInput->getValue(),      browserRowWidthIntInput));
 		if (i < MB_MAX_ROWS-1)
 			optionsMenuBrowser.addItem(GenericMenuSeparator);

From 4975b33dfd366f12cbe6b8fa692817b9934b3c2c Mon Sep 17 00:00:00 2001
From: Christian Schuett <Gaucho316@hotmail.com>
Date: Mon, 15 Dec 2014 08:50:22 +0100
Subject: [PATCH 097/113] - moviebrowser: sort column item option choosers
 alphabetically

  also add missing entry 'info2' to this option choosers and remove
  duplicate entry 'filename' from them

- english.locale: fix typo
---
 data/locale/deutsch.locale | 7 ++++---
 data/locale/english.locale | 7 ++++---
 src/gui/moviebrowser.cpp   | 8 ++++----
 src/system/locals.h        | 1 +
 src/system/locals_intern.h | 1 +
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index 82fb627ad..387468094 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -1544,12 +1544,13 @@ moviebrowser.hint_newbook_forward Neuer Werbesprung\n 'blue' für Endposition
 moviebrowser.info_audio Audio
 moviebrowser.info_channel Kanal
 moviebrowser.info_file Datei
-moviebrowser.info_filename Name
+moviebrowser.info_filename Dateiname
 moviebrowser.info_genre_major Genre
-moviebrowser.info_genre_minor Genre
+moviebrowser.info_genre_minor Genre (untergeordnet)
 moviebrowser.info_head Film Informationen
 moviebrowser.info_head_update Inhalte in allen sichtbaren Filminfos speichern
 moviebrowser.info_info1 Info 1
+moviebrowser.info_info2 Info 2
 moviebrowser.info_length Spieldauer (Min)
 moviebrowser.info_parental_lockage FSK
 moviebrowser.info_parental_lockage_0year immer
@@ -1567,7 +1568,7 @@ moviebrowser.info_recorddate Aufnahmedatum
 moviebrowser.info_serie Serie
 moviebrowser.info_size Dateigröße (MB)
 moviebrowser.info_title Titel
-moviebrowser.info_videoformat Bild
+moviebrowser.info_videoformat Bildformat
 moviebrowser.last_play_max_items Zeilen 'zuletzt aufgenommen'
 moviebrowser.last_record_max_items Zeilen 'zuletzt gesehen'
 moviebrowser.load_default Lade Voreinstellung
diff --git a/data/locale/english.locale b/data/locale/english.locale
index 20ad812c9..d9e26192e 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -1507,7 +1507,7 @@ moviebrowser.book_position Position:
 moviebrowser.book_type Jump (<0 back , >0 for):
 moviebrowser.book_type_backward Repeat
 moviebrowser.book_type_forward jump over
-moviebrowser.browser_frame_high Browser hight [%]
+moviebrowser.browser_frame_high Browser height [%]
 moviebrowser.browser_row_head Row settings
 moviebrowser.browser_row_item Row item
 moviebrowser.browser_row_nr Number of rows
@@ -1544,12 +1544,13 @@ moviebrowser.hint_newbook_forward New jump forward\n 'blue' for endposition
 moviebrowser.info_audio Audio
 moviebrowser.info_channel Channel
 moviebrowser.info_file File
-moviebrowser.info_filename Name
+moviebrowser.info_filename Filename
 moviebrowser.info_genre_major Genre
-moviebrowser.info_genre_minor Genre
+moviebrowser.info_genre_minor Genre (minor)
 moviebrowser.info_head Film Information
 moviebrowser.info_head_update Save changes in all movie info files
 moviebrowser.info_info1 Info 1
+moviebrowser.info_info2 Info 2
 moviebrowser.info_length Length (Min)
 moviebrowser.info_parental_lockage Parental Lock age
 moviebrowser.info_parental_lockage_0year always
diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp
index 8b1451bf5..e2db5aa02 100644
--- a/src/gui/moviebrowser.cpp
+++ b/src/gui/moviebrowser.cpp
@@ -98,8 +98,10 @@ const CMenuOptionChooser::keyval MESSAGEBOX_BROWSER_ROW_ITEM[MESSAGEBOX_BROWSER_
 	{ MB_INFO_INFO1,		LOCALE_MOVIEBROWSER_INFO_INFO1 },
 	{ MB_INFO_MAJOR_GENRE,		LOCALE_MOVIEBROWSER_INFO_GENRE_MAJOR },
 	{ MB_INFO_MINOR_GENRE,		LOCALE_MOVIEBROWSER_INFO_GENRE_MINOR },
+	{ MB_INFO_INFO2,		LOCALE_MOVIEBROWSER_INFO_INFO2 },
 	{ MB_INFO_PARENTAL_LOCKAGE,	LOCALE_MOVIEBROWSER_INFO_PARENTAL_LOCKAGE },
 	{ MB_INFO_CHANNEL,		LOCALE_MOVIEBROWSER_INFO_CHANNEL },
+	{ MB_INFO_BOOKMARK,		LOCALE_MOVIEBROWSER_MENU_MAIN_BOOKMARKS },
 	{ MB_INFO_QUALITY,		LOCALE_MOVIEBROWSER_INFO_QUALITY },
 	{ MB_INFO_PREVPLAYDATE,		LOCALE_MOVIEBROWSER_INFO_PREVPLAYDATE },
 	{ MB_INFO_RECORDDATE,		LOCALE_MOVIEBROWSER_INFO_RECORDDATE },
@@ -108,9 +110,7 @@ const CMenuOptionChooser::keyval MESSAGEBOX_BROWSER_ROW_ITEM[MESSAGEBOX_BROWSER_
 	{ MB_INFO_GEOMETRIE,		LOCALE_MOVIEBROWSER_INFO_VIDEOFORMAT },
 	{ MB_INFO_AUDIO,		LOCALE_MOVIEBROWSER_INFO_AUDIO },
 	{ MB_INFO_LENGTH,		LOCALE_MOVIEBROWSER_INFO_LENGTH },
-	{ MB_INFO_SIZE,			LOCALE_MOVIEBROWSER_INFO_SIZE },
-	{ MB_INFO_BOOKMARK,		LOCALE_MOVIEBROWSER_MENU_MAIN_BOOKMARKS },
-	{ MB_INFO_FILENAME,		LOCALE_MOVIEBROWSER_INFO_FILENAME }
+	{ MB_INFO_SIZE,			LOCALE_MOVIEBROWSER_INFO_SIZE }
 };
 
 #define MESSAGEBOX_YES_NO_OPTIONS_COUNT 2
@@ -2829,7 +2829,7 @@ bool CMovieBrowser::showMenu(MI_MOVIE_INFO* /* movie_info */, bool calledExterna
 	for (i = 0; i < MB_MAX_ROWS; i++)
 	{
 		CIntInput* browserRowWidthIntInput = new CIntInput(LOCALE_MOVIEBROWSER_BROWSER_ROW_WIDTH,(int *)&m_settings.browserRowWidth[i], 3, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE);
-		optionsMenuBrowser.addItem(new CMenuOptionChooser(LOCALE_MOVIEBROWSER_BROWSER_ROW_ITEM, (int*)(&m_settings.browserRowItem[i]), MESSAGEBOX_BROWSER_ROW_ITEM, MESSAGEBOX_BROWSER_ROW_ITEM_COUNT, true, NULL, CRCInput::convertDigitToKey(i+1), NULL, true));
+		optionsMenuBrowser.addItem(new CMenuOptionChooser(LOCALE_MOVIEBROWSER_BROWSER_ROW_ITEM, (int*)(&m_settings.browserRowItem[i]), MESSAGEBOX_BROWSER_ROW_ITEM, MESSAGEBOX_BROWSER_ROW_ITEM_COUNT, true, NULL, CRCInput::convertDigitToKey(i+1), NULL, true, true));
 		optionsMenuBrowser.addItem(new CMenuDForwarder(LOCALE_MOVIEBROWSER_BROWSER_ROW_WIDTH,    true, browserRowWidthIntInput->getValue(),      browserRowWidthIntInput));
 		if (i < MB_MAX_ROWS-1)
 			optionsMenuBrowser.addItem(GenericMenuSeparator);
diff --git a/src/system/locals.h b/src/system/locals.h
index ad1f4c7e3..bea11da8e 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -1577,6 +1577,7 @@ typedef enum
 	LOCALE_MOVIEBROWSER_INFO_HEAD,
 	LOCALE_MOVIEBROWSER_INFO_HEAD_UPDATE,
 	LOCALE_MOVIEBROWSER_INFO_INFO1,
+	LOCALE_MOVIEBROWSER_INFO_INFO2,
 	LOCALE_MOVIEBROWSER_INFO_LENGTH,
 	LOCALE_MOVIEBROWSER_INFO_PARENTAL_LOCKAGE,
 	LOCALE_MOVIEBROWSER_INFO_PARENTAL_LOCKAGE_0YEAR,
diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h
index 38e37da30..c1fd6fb8d 100644
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -1577,6 +1577,7 @@ const char * locale_real_names[] =
 	"moviebrowser.info_head",
 	"moviebrowser.info_head_update",
 	"moviebrowser.info_info1",
+	"moviebrowser.info_info2",
 	"moviebrowser.info_length",
 	"moviebrowser.info_parental_lockage",
 	"moviebrowser.info_parental_lockage_0year",

From 68e240b4e716b21d6271057a47f96b2ffac8f090 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Thu, 4 Dec 2014 19:21:14 +0300
Subject: [PATCH 098/113] gui/videosettings.cpp: split format key modes and
 auto-modes on apollo, disable broken 14:9 pan&scan on apollo

---
 data/locale/english.locale     |  2 ++
 src/gui/videosettings.cpp      | 28 +++++++++++++++++++++++-----
 src/neutrino.cpp               |  9 +++++++++
 src/system/locals.h            |  2 ++
 src/system/locals_intern.h     |  2 ++
 src/system/setting_helpers.cpp |  7 +++++--
 src/system/settings.h          |  1 +
 7 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/data/locale/english.locale b/data/locale/english.locale
index d9e26192e..f74088eb8 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -1347,6 +1347,7 @@ menu.hint_video_dbdr MPEG2 enhancement filters
 menu.hint_video_format TV aspect ratio
 menu.hint_video_mode HDMI output video mode
 menu.hint_video_modes VF key will cycle between enabled modes 
+menu.hint_video_modes_auto Enable modes to auto-select based on content
 menu.hint_video_pip Picture in picture size and position
 menu.hint_video_saturation Change picture saturation
 menu.hint_video_scart_mode Select analog output mode for SCART connectors
@@ -2251,6 +2252,7 @@ videomenu.dbdr_both de-block+de-ring
 videomenu.dbdr_deblock de-block
 videomenu.dbdr_none none
 videomenu.enabled_modes VF key enabled modes
+videomenu.enabled_modes_auto Auto-select enabled modes
 videomenu.fullscreen Full screen
 videomenu.hdmi_cec CSTLink (HDMI-CEC)
 videomenu.hdmi_cec_mode Receiver to use
diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp
index 491577a72..5ddcfeaec 100644
--- a/src/gui/videosettings.cpp
+++ b/src/gui/videosettings.cpp
@@ -101,15 +101,17 @@ int CVideoSettings::exec(CMenuTarget* parent, const std::string &/*actionKey*/)
 	return res;
 }
 
-#define VIDEOMENU_43MODE_OPTION_COUNT 4
-const CMenuOptionChooser::keyval VIDEOMENU_43MODE_OPTIONS[VIDEOMENU_43MODE_OPTION_COUNT] =
+const CMenuOptionChooser::keyval VIDEOMENU_43MODE_OPTIONS[] =
 {
 	{ DISPLAY_AR_MODE_PANSCAN, LOCALE_VIDEOMENU_PANSCAN },
+#ifndef BOXMODEL_APOLLO
 	{ DISPLAY_AR_MODE_PANSCAN2, LOCALE_VIDEOMENU_PANSCAN2 },
+#endif
 	{ DISPLAY_AR_MODE_LETTERBOX, LOCALE_VIDEOMENU_LETTERBOX },
 	{ DISPLAY_AR_MODE_NONE, LOCALE_VIDEOMENU_FULLSCREEN }
 	//{ 2, LOCALE_VIDEOMENU_AUTO } // whatever is this auto mode, it seems its totally broken
 };
+#define VIDEOMENU_43MODE_OPTION_COUNT (sizeof(VIDEOMENU_43MODE_OPTIONS)/sizeof(CMenuOptionChooser::keyval))
 
 #ifdef ANALOG_MODE
 #define VIDEOMENU_VIDEOSIGNAL_HD1_OPTION_COUNT 8
@@ -277,6 +279,10 @@ int CVideoSettings::showVideoSetup()
 	CMenuOptionChooser * vs_dbdropt_ch = NULL;
 	CMenuForwarder * vs_videomodes_fw = NULL;
 	CMenuWidget videomodes(LOCALE_MAINSETTINGS_VIDEO, NEUTRINO_ICON_SETTINGS);
+#ifdef BOXMODEL_APOLLO
+	CMenuForwarder * vs_automodes_fw = NULL;
+	CMenuWidget automodes(LOCALE_MAINSETTINGS_VIDEO, NEUTRINO_ICON_SETTINGS);
+#endif
 	CAutoModeNotifier anotify;
 	if (!g_settings.easymenu) {
 		//dbdr options
@@ -288,10 +294,19 @@ int CVideoSettings::showVideoSetup()
 
 		for (int i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT; i++)
 			videomodes.addItem(new CMenuOptionChooser(VIDEOMENU_VIDEOMODE_OPTIONS[i].valname, &g_settings.enabled_video_modes[i], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, &anotify));
-		//anotify.changeNotify(NONEXISTANT_LOCALE, 0);
 
 		vs_videomodes_fw = new CMenuForwarder(LOCALE_VIDEOMENU_ENABLED_MODES, true, NULL, &videomodes, NULL, CRCInput::RC_red);
 		vs_videomodes_fw->setHint("", LOCALE_MENU_HINT_VIDEO_MODES);
+
+#ifdef BOXMODEL_APOLLO
+		automodes.addIntroItems(LOCALE_VIDEOMENU_ENABLED_MODES_AUTO);
+
+		for (int i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT - 1; i++)
+			automodes.addItem(new CMenuOptionChooser(VIDEOMENU_VIDEOMODE_OPTIONS[i].valname, &g_settings.enabled_auto_modes[i], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, &anotify));
+
+		vs_automodes_fw = new CMenuForwarder(LOCALE_VIDEOMENU_ENABLED_MODES_AUTO, true, NULL, &automodes, NULL, CRCInput::RC_green);
+		vs_automodes_fw->setHint("", LOCALE_MENU_HINT_VIDEO_MODES_AUTO);
+#endif
 	}
 
 	//---------------------------------------
@@ -312,6 +327,9 @@ int CVideoSettings::showVideoSetup()
 	if (!g_settings.easymenu) {
 		videosetup->addItem(vs_dbdropt_ch);	  //dbdr options
 		videosetup->addItem(vs_videomodes_fw);	  //video modes submenue
+#ifdef BOXMODEL_APOLLO
+		videosetup->addItem(vs_automodes_fw);	  //video auto modes submenue
+#endif
 	}
 
 #ifdef BOXMODEL_APOLLO
@@ -497,14 +515,14 @@ void CVideoSettings::next43Mode(void)
 	neutrino_locale_t text;
 	int curmode = 0;
 
-	for (int i = 0; i < VIDEOMENU_43MODE_OPTION_COUNT; i++) {
+	for (int i = 0; i < (int) VIDEOMENU_43MODE_OPTION_COUNT; i++) {
 		if (VIDEOMENU_43MODE_OPTIONS[i].key == g_settings.video_43mode) {
 			curmode = i;
 			break;
 		}
 	}
 	curmode++;
-	if (curmode >= VIDEOMENU_43MODE_OPTION_COUNT)
+	if (curmode >= (int) VIDEOMENU_43MODE_OPTION_COUNT)
 		curmode = 0;
 
 	text =  VIDEOMENU_43MODE_OPTIONS[curmode].value;
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index bb054b9c8..4ad445803 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -398,6 +398,11 @@ int CNeutrinoApp::loadSetup(const char * fname)
 	g_settings.enabled_video_modes[3] = 1; // 720p 50Hz
 	g_settings.enabled_video_modes[4] = 1; // 1080i 50Hz
 
+	for(int i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT; i++) {
+		sprintf(cfg_key, "enabled_auto_mode_%d", i);
+		g_settings.enabled_auto_modes[i] = configfile.getInt32(cfg_key, 1);
+	}
+
 	g_settings.cpufreq = configfile.getInt32("cpufreq", 0);
 	g_settings.standby_cpufreq = configfile.getInt32("standby_cpufreq", 100);
 	g_settings.rounded_corners = configfile.getInt32("rounded_corners", 1);
@@ -936,6 +941,10 @@ void CNeutrinoApp::saveSetup(const char * fname)
 		sprintf(cfg_key, "enabled_video_mode_%d", i);
 		configfile.setInt32(cfg_key, g_settings.enabled_video_modes[i]);
 	}
+	for(int i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT; i++) {
+		sprintf(cfg_key, "enabled_auto_mode_%d", i);
+		configfile.setInt32(cfg_key, g_settings.enabled_auto_modes[i]);
+	}
 	configfile.setInt32( "cpufreq", g_settings.cpufreq);
 	configfile.setInt32( "standby_cpufreq", g_settings.standby_cpufreq);
 	configfile.setInt32("rounded_corners", g_settings.rounded_corners);
diff --git a/src/system/locals.h b/src/system/locals.h
index bea11da8e..92d169d82 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -1374,6 +1374,7 @@ typedef enum
 	LOCALE_MENU_HINT_VIDEO_FORMAT,
 	LOCALE_MENU_HINT_VIDEO_MODE,
 	LOCALE_MENU_HINT_VIDEO_MODES,
+	LOCALE_MENU_HINT_VIDEO_MODES_AUTO,
 	LOCALE_MENU_HINT_VIDEO_PIP,
 	LOCALE_MENU_HINT_VIDEO_SATURATION,
 	LOCALE_MENU_HINT_VIDEO_SCART_MODE,
@@ -2279,6 +2280,7 @@ typedef enum
 	LOCALE_VIDEOMENU_DBDR_DEBLOCK,
 	LOCALE_VIDEOMENU_DBDR_NONE,
 	LOCALE_VIDEOMENU_ENABLED_MODES,
+	LOCALE_VIDEOMENU_ENABLED_MODES_AUTO,
 	LOCALE_VIDEOMENU_FULLSCREEN,
 	LOCALE_VIDEOMENU_HDMI_CEC,
 	LOCALE_VIDEOMENU_HDMI_CEC_MODE,
diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h
index c1fd6fb8d..799b72fb7 100644
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -1374,6 +1374,7 @@ const char * locale_real_names[] =
 	"menu.hint_video_format",
 	"menu.hint_video_mode",
 	"menu.hint_video_modes",
+	"menu.hint_video_modes_auto",
 	"menu.hint_video_pip",
 	"menu.hint_video_saturation",
 	"menu.hint_video_scart_mode",
@@ -2279,6 +2280,7 @@ const char * locale_real_names[] =
 	"videomenu.dbdr_deblock",
 	"videomenu.dbdr_none",
 	"videomenu.enabled_modes",
+	"videomenu.enabled_modes_auto",
 	"videomenu.fullscreen",
 	"videomenu.hdmi_cec",
 	"videomenu.hdmi_cec_mode",
diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp
index 216724066..b041ea950 100644
--- a/src/system/setting_helpers.cpp
+++ b/src/system/setting_helpers.cpp
@@ -581,9 +581,12 @@ bool CAutoModeNotifier::changeNotify(const neutrino_locale_t /*OptionName*/, voi
 
 	memset(modes, 0, sizeof(int)*VIDEO_STD_MAX+1);
 
-	for(i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT; i++) {
+	for(i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT; i++)
+#ifdef BOXMODEL_APOLLO
+		modes[VIDEOMENU_VIDEOMODE_OPTIONS[i].key] = g_settings.enabled_auto_modes[i];
+#else
 		modes[VIDEOMENU_VIDEOMODE_OPTIONS[i].key] = g_settings.enabled_video_modes[i];
-	}
+#endif
 	videoDecoder->SetAutoModes(modes);
 	return false;
 }
diff --git a/src/system/settings.h b/src/system/settings.h
index 5dde15d88..7d6fe8194 100644
--- a/src/system/settings.h
+++ b/src/system/settings.h
@@ -188,6 +188,7 @@ struct SNeutrinoSettings
 	int hdmi_cec_view_on;
 	int hdmi_cec_standby;
 	int enabled_video_modes[VIDEOMENU_VIDEOMODE_OPTION_COUNT];
+	int enabled_auto_modes[VIDEOMENU_VIDEOMODE_OPTION_COUNT];
 	int cpufreq;
 	int standby_cpufreq;
 	int make_hd_list;

From 34691a17246da5515e6b7c1cd3d52d5a695a37aa Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Mon, 8 Dec 2014 17:22:41 +0300
Subject: [PATCH 099/113] gui/scan_setup.cpp: add pilot param to manual scan
 menu

---
 data/locale/english.locale               |  4 ++++
 src/gui/scan.cpp                         |  1 +
 src/gui/scan_setup.cpp                   | 15 +++++++++++++++
 src/system/locals.h                      |  4 ++++
 src/system/locals_intern.h               |  4 ++++
 src/system/settings.cpp                  |  2 ++
 src/system/settings.h                    |  1 +
 src/zapit/include/zapit/frontend_types.h |  9 ++++++++-
 src/zapit/src/frontend.cpp               | 16 +++++++++++++++-
 src/zapit/src/getservices.cpp            |  4 ++++
 10 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/data/locale/english.locale b/data/locale/english.locale
index f74088eb8..036f06f24 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -493,6 +493,9 @@ extra.tp_mod_4_nr QAM/4-NR
 extra.tp_mod_64 QAM/64
 extra.tp_mod_8 8PSK
 extra.tp_mod_auto QAM/AUTO
+extra.tp_pilot Pilot
+extra.tp_pilot_auto Auto (HW)
+extra.tp_pilot_auto_sw Auto (SW)
 extra.tp_pol Polarization
 extra.tp_pol_h H
 extra.tp_pol_l L
@@ -1258,6 +1261,7 @@ menu.hint_scan_motorpos Select stored position number for this satellite,\nignor
 menu.hint_scan_nid Enter decimal network ID
 menu.hint_scan_nit Add transpoders from network information
 menu.hint_scan_pids Scan and save audio/video/PMT PIDs
+menu.hint_scan_pilot Select pilot parameter
 menu.hint_scan_pol Select transponder polarization
 menu.hint_scan_rate Enter transponder symbol rate
 menu.hint_scan_reset_numbers Reset exising channel numbers\nand re-number channels after scan
diff --git a/src/gui/scan.cpp b/src/gui/scan.cpp
index 288d2ba09..6e451f94e 100644
--- a/src/gui/scan.cpp
+++ b/src/gui/scan.cpp
@@ -223,6 +223,7 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
 			TP.feparams.polarization = scansettings.sat_TP_pol;
 			TP.feparams.delsys = (delivery_system_t)scansettings.sat_TP_delsys;
 			TP.feparams.modulation = (fe_modulation_t) scansettings.sat_TP_mod;
+			TP.feparams.pilot = (zapit_pilot_t) scansettings.sat_TP_pilot;
 		} else if (CFrontend::isTerr(delsys)) {
 			/* DVB-T. TODO: proper menu and parameter setup, not all "AUTO" */
 			TP.feparams.frequency = atoi(scansettings.terrestrial_TP_freq.c_str());
diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp
index 5133310e0..7e266de83 100644
--- a/src/gui/scan_setup.cpp
+++ b/src/gui/scan_setup.cpp
@@ -266,6 +266,15 @@ const CMenuOptionChooser::keyval SATSETUP_SCANTP_POL[SATSETUP_SCANTP_POL_COUNT]
 	{ 3, LOCALE_EXTRA_TP_POL_R }
 };
 
+#define SATSETUP_SCANTP_PILOT_COUNT 4
+const CMenuOptionChooser::keyval SATSETUP_SCANTP_PILOT[SATSETUP_SCANTP_PILOT_COUNT] =
+{
+	{ ZPILOT_ON,      LOCALE_OPTIONS_ON },
+	{ ZPILOT_OFF,     LOCALE_OPTIONS_OFF },
+	{ ZPILOT_AUTO,    LOCALE_EXTRA_TP_PILOT_AUTO },
+	{ ZPILOT_AUTO_SW, LOCALE_EXTRA_TP_PILOT_AUTO_SW }
+};
+
 #define OPTIONS_SOUTH0_NORTH1_OPTION_COUNT 2
 const CMenuOptionChooser::keyval OPTIONS_SOUTH0_NORTH1_OPTIONS[OPTIONS_SOUTH0_NORTH1_OPTION_COUNT] =
 {
@@ -1635,6 +1644,7 @@ int CScanSetup::addScanOptionsItems(CMenuWidget *options_menu, const int &shortc
 	CMenuOptionChooser	*tm = NULL;
 	CMenuForwarder		*Freq = NULL;
 	CMenuForwarder		*Rate = NULL;
+	CMenuOptionChooser	*pilot = NULL;
 	if (r_system == ALL_SAT) {
 		delsys = new CMenuOptionChooser(LOCALE_EXTRA_TP_DELSYS, (int *)&scansettings.sat_TP_delsys, SATSETUP_SCANTP_DELSYS, SATSETUP_SCANTP_DELSYS_COUNT, true, NULL, CRCInput::convertDigitToKey(shortCut++), "", true);
 		delsys->setHint("", LOCALE_MENU_HINT_SCAN_DELSYS);
@@ -1650,6 +1660,8 @@ int CScanSetup::addScanOptionsItems(CMenuWidget *options_menu, const int &shortc
 		fec->setHint("", LOCALE_MENU_HINT_SCAN_FEC);
 		pol = new CMenuOptionChooser(LOCALE_EXTRA_TP_POL, (int *)&scansettings.sat_TP_pol, SATSETUP_SCANTP_POL, SATSETUP_SCANTP_POL_COUNT, true, NULL, CRCInput::convertDigitToKey(shortCut++));
 		pol->setHint("", LOCALE_MENU_HINT_SCAN_POL);
+		pilot = new CMenuOptionChooser(LOCALE_EXTRA_TP_PILOT, (int *)&scansettings.sat_TP_pilot, SATSETUP_SCANTP_PILOT, SATSETUP_SCANTP_PILOT_COUNT, true, NULL, CRCInput::convertDigitToKey(shortCut++));
+		pilot->setHint("", LOCALE_MENU_HINT_SCAN_PILOT);
 	} else if (r_system == ALL_CABLE) {
 		delsys = new CMenuOptionChooser(LOCALE_EXTRA_TP_DELSYS, (int *)&scansettings.cable_TP_delsys, CABLESETUP_SCANTP_DELSYS, CABLESETUP_SCANTP_DELSYS_COUNT, true, NULL, CRCInput::convertDigitToKey(shortCut++), "", true);
 		delsys->setHint("", LOCALE_MENU_HINT_SCAN_DELSYS);
@@ -1708,6 +1720,8 @@ int CScanSetup::addScanOptionsItems(CMenuWidget *options_menu, const int &shortc
 		options_menu->addItem(tm);
 	if (pol)
 		options_menu->addItem(pol);
+	if (pilot)
+		options_menu->addItem(pilot);
 
 	return shortCut;
 }
@@ -1998,6 +2012,7 @@ int CTPSelectHandler::exec(CMenuTarget* parent, const std::string &actionkey)
 			scansettings.sat_TP_pol = tmpI->second.feparams.polarization;
 			scansettings.sat_TP_delsys = tmpI->second.feparams.delsys;
 			scansettings.sat_TP_mod = tmpI->second.feparams.modulation;
+			scansettings.sat_TP_pilot = tmpI->second.feparams.pilot;
 		}
 		else if (CFrontend::isCable(tmpI->second.feparams.delsys)) {
 			scansettings.cable_TP_freq = to_string(tmpI->second.feparams.frequency);
diff --git a/src/system/locals.h b/src/system/locals.h
index 92d169d82..dddafab8b 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -520,6 +520,9 @@ typedef enum
 	LOCALE_EXTRA_TP_MOD_64,
 	LOCALE_EXTRA_TP_MOD_8,
 	LOCALE_EXTRA_TP_MOD_AUTO,
+	LOCALE_EXTRA_TP_PILOT,
+	LOCALE_EXTRA_TP_PILOT_AUTO,
+	LOCALE_EXTRA_TP_PILOT_AUTO_SW,
 	LOCALE_EXTRA_TP_POL,
 	LOCALE_EXTRA_TP_POL_H,
 	LOCALE_EXTRA_TP_POL_L,
@@ -1285,6 +1288,7 @@ typedef enum
 	LOCALE_MENU_HINT_SCAN_NID,
 	LOCALE_MENU_HINT_SCAN_NIT,
 	LOCALE_MENU_HINT_SCAN_PIDS,
+	LOCALE_MENU_HINT_SCAN_PILOT,
 	LOCALE_MENU_HINT_SCAN_POL,
 	LOCALE_MENU_HINT_SCAN_RATE,
 	LOCALE_MENU_HINT_SCAN_RESET_NUMBERS,
diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h
index 799b72fb7..aaed15ea7 100644
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -520,6 +520,9 @@ const char * locale_real_names[] =
 	"extra.tp_mod_64",
 	"extra.tp_mod_8",
 	"extra.tp_mod_auto",
+	"extra.tp_pilot",
+	"extra.tp_pilot_auto",
+	"extra.tp_pilot_auto_sw",
 	"extra.tp_pol",
 	"extra.tp_pol_h",
 	"extra.tp_pol_l",
@@ -1285,6 +1288,7 @@ const char * locale_real_names[] =
 	"menu.hint_scan_nid",
 	"menu.hint_scan_nit",
 	"menu.hint_scan_pids",
+	"menu.hint_scan_pilot",
 	"menu.hint_scan_pol",
 	"menu.hint_scan_rate",
 	"menu.hint_scan_reset_numbers",
diff --git a/src/system/settings.cpp b/src/system/settings.cpp
index 80ea42ef4..4ee846df1 100644
--- a/src/system/settings.cpp
+++ b/src/system/settings.cpp
@@ -145,6 +145,7 @@ bool CScanSettings::loadSettings(const char * const fileName)
 	sat_TP_rate = configfile.getString("sat_TP_rate", "27500000");
 	sat_TP_mod = configfile.getInt32("sat_TP_mod", QPSK);
 	sat_TP_delsys = configfile.getInt32("sat_TP_delsys", DVB_S);
+	sat_TP_pilot = configfile.getInt32("sat_TP_pilot", ZPILOT_AUTO_SW);
 
 	cableName     = configfile.getString("cableName", cableName);
 	cable_TP_mod  = configfile.getInt32("cable_TP_mod", QAM_64);
@@ -202,6 +203,7 @@ bool CScanSettings::saveSettings(const char * const fileName)
 	configfile.setString("sat_TP_rate", sat_TP_rate);
 	configfile.setInt32("sat_TP_delsys", sat_TP_delsys);
 	configfile.setInt32("sat_TP_mod", sat_TP_mod);
+	configfile.setInt32("sat_TP_pilot", sat_TP_pilot);
 
 	configfile.setString("cableName", cableName);
 	configfile.setInt32("cable_TP_fec", cable_TP_fec);
diff --git a/src/system/settings.h b/src/system/settings.h
index 7d6fe8194..957ec06b6 100644
--- a/src/system/settings.h
+++ b/src/system/settings.h
@@ -846,6 +846,7 @@ class CScanSettings
 		std::string	sat_TP_rate;
 		int		sat_TP_delsys;
 		int		sat_TP_mod;
+		int		sat_TP_pilot;
 
 		std::string	cableName;
 		int		cable_TP_mod;
diff --git a/src/zapit/include/zapit/frontend_types.h b/src/zapit/include/zapit/frontend_types.h
index 4d9bf9ee7..7e3591c70 100644
--- a/src/zapit/include/zapit/frontend_types.h
+++ b/src/zapit/include/zapit/frontend_types.h
@@ -79,6 +79,13 @@ typedef enum {
 	ALL_TERR = ZAPIT_DM_TERR,
 } delivery_system_t;
 
+typedef enum {
+	ZPILOT_ON,
+	ZPILOT_OFF,
+	ZPILOT_AUTO,
+	ZPILOT_AUTO_SW
+} zapit_pilot_t;
+
 typedef struct {
 	delivery_system_t	delsys;
 	uint32_t		frequency;
@@ -94,7 +101,7 @@ typedef struct {
 	fe_code_rate_t		code_rate_HP;
 	fe_code_rate_t		code_rate_LP;
 
-	fe_pilot_t		pilot;
+	zapit_pilot_t		pilot;
 	fe_rolloff_t		rolloff;
 
 	enum fe_interleaving	interleaving;
diff --git a/src/zapit/src/frontend.cpp b/src/zapit/src/frontend.cpp
index abb83d7e8..2bc885346 100644
--- a/src/zapit/src/frontend.cpp
+++ b/src/zapit/src/frontend.cpp
@@ -1099,6 +1099,20 @@ bool CFrontend::buildProperties(const FrontendParameters *feparams, struct dtv_p
 		fec = FEC_AUTO;
 		break;
 	}
+	switch(feparams->pilot) {
+		case ZPILOT_ON:
+			pilot = PILOT_ON;
+			break;
+		case ZPILOT_OFF:
+			pilot = PILOT_OFF;
+			break;
+		case ZPILOT_AUTO:
+			pilot = PILOT_AUTO;
+			break;
+		case ZPILOT_AUTO_SW:
+		default:
+			break;
+	}
 
 	int nrOfProps	= 0;
 
@@ -1112,7 +1126,7 @@ bool CFrontend::buildProperties(const FrontendParameters *feparams, struct dtv_p
 			cmdseq.props[MODULATION].u.data	= feparams->modulation;
 			cmdseq.props[ROLLOFF].u.data	= feparams->rolloff;
 			cmdseq.props[PILOTS].u.data	= pilot;
-			
+			printf("[fe%d] tuner pilot %d (feparams %d)\n", fenumber, pilot, feparams->pilot);
 		} else {
 			memcpy(cmdseq.props, dvbs_cmdargs, sizeof(dvbs_cmdargs));
 			nrOfProps	= FE_DVBS_PROPS;
diff --git a/src/zapit/src/getservices.cpp b/src/zapit/src/getservices.cpp
index 3f27f0611..10ca08dff 100644
--- a/src/zapit/src/getservices.cpp
+++ b/src/zapit/src/getservices.cpp
@@ -385,6 +385,8 @@ void CServiceManager::ParseTransponders(xmlNodePtr node, t_satellite_position sa
 				feparams.frequency = feparams.frequency*1000;
 			else
 				feparams.frequency = (int) 1000 * (int) round ((double) feparams.frequency / (double) 1000);
+			/* TODO: add xml tag ? */
+			feparams.pilot = ZPILOT_AUTO_SW;
 		}
 		else if (CFrontend::isTerr(delsys)) {
 			//<TS id="0001" on="7ffd" frq="650000" inv="2" bw="3" hp="9" lp="9" con="6" tm="2" gi="0" hi="4" sys="6">
@@ -609,6 +611,8 @@ void CServiceManager::ParseSatTransponders(delivery_system_t delsys, xmlNodePtr
 			const char *system = xmlGetAttribute(tps, "system");
 			const char *rolloff = xmlGetAttribute(tps, "rolloff");
 
+			/* TODO: add xml tag ? */
+			feparams.pilot = ZPILOT_AUTO_SW;
 			if (system) {
 				uint32_t s = xmlGetNumericAttribute(tps, "system", 0);
 				switch (s) {

From 778262d67a9153af85b88661a9481774cff6bfc6 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Thu, 18 Dec 2014 17:32:48 +0300
Subject: [PATCH 100/113] neutrino.cpp: in easymenu mode, revert channel list
 mode to favorites, if current channel present in favorite bouquets

---
 src/neutrino.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 4ad445803..5fde3e832 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -2498,6 +2498,12 @@ _repeat:
 		adjustToChannelID(live_channel_id);//FIXME what if deleted ?
 		delete hintBox;
 	}
+	if (g_settings.easymenu) {
+		CBouquetList * blist = (mode == mode_radio) ? RADIOfavList : TVfavList;
+		t_channel_id live_channel_id = channelList->getActiveChannel_ChannelID();
+		if (blist->hasChannelID(live_channel_id))
+			SetChannelMode(LIST_MODE_FAV);
+	}
 
 	channellist_visible = false;
 	if (!from_menu)

From 25f30a6fa48d0c8e40c30c6a827865d52e772366 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Thu, 18 Dec 2014 15:59:07 +0100
Subject: [PATCH 101/113] - infoviewer: fix calculation for time_width ...

  ... because some fonts has larger ' ' than ':'.
* align clock with 10 px right offset (same as the other elements)
* align depending elements with new clock dimensions
---
 src/gui/infoviewer.cpp | 23 +++++++++++------------
 src/gui/infoviewer.h   |  2 --
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp
index 64701d3ca..9c3f6f4ec 100644
--- a/src/gui/infoviewer.cpp
+++ b/src/gui/infoviewer.cpp
@@ -104,8 +104,6 @@ CInfoViewer::CInfoViewer ()
 	ChanNameY = 0;
 	ChanWidth = 0;
 	ChanHeight = 0;
-	time_left_width = 0;
-	time_dot_width = 0;
 	time_width = 0;
 	time_height = 0;
 	lastsnr = 0;
@@ -218,10 +216,11 @@ void CInfoViewer::start ()
 	ChanNameY = BoxStartY + (ChanHeight / 2) + SHADOW_OFFSET;	//oberkante schatten?
 	ChanInfoX = BoxStartX + (ChanWidth / 3);
 
+	int digit_width = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->getMaxDigitWidth();
+	int dot_width = max(g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->getRenderWidth(":"),
+			    g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->getRenderWidth(" "));
+	time_width = (digit_width * 4) + dot_width;
 	time_height = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->getHeight();
-	time_left_width = 2 * g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->getWidth(); /* still a kludge */
-	time_dot_width = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->getRenderWidth(":");
-	time_width = time_left_width* 2+ time_dot_width;
 
 	if (clock) {
 		delete clock;
@@ -253,10 +252,10 @@ void CInfoViewer::paintTime (bool show_dot)
 	if (!gotTime)
 		return;
 
-	int clock_x = BoxEndX - time_width - LEFT_OFFSET;
-	int clock_y = ChanNameY;
-	int clock_w = time_width + LEFT_OFFSET;
+	int clock_w = time_width;
 	int clock_h = time_height;
+	int clock_x = BoxEndX - 10 - clock_w;
+	int clock_y = ChanNameY;
 
 	if (clock == NULL){
 		clock = new CComponentsFrmClock();
@@ -527,7 +526,7 @@ void CInfoViewer::showMovieTitle(const int playState, const t_channel_id &Channe
 	if (g_settings.infobar_show_channellogo > 1)
 		ChannelLogoMode = showChannelLogo(channel_id, 0);
 	if (ChannelLogoMode == 0 || ChannelLogoMode == 3 || ChannelLogoMode == 4)
-		g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->RenderString(ChanNameX + 10 , ChanNameY + time_height,BoxEndX - (ChanNameX + 20) - time_width - LEFT_OFFSET - 5 ,ChannelName, COL_INFOBAR_TEXT);
+		g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->RenderString(ChanNameX + 10 , ChanNameY + time_height,BoxEndX - (ChanNameX + 20) - time_width - LEFT_OFFSET - 10 ,ChannelName, COL_INFOBAR_TEXT);
 
 	// show_Data
 	if (CMoviePlayerGui::getInstance().file_prozent > 100)
@@ -772,7 +771,7 @@ void CInfoViewer::showTitle (const int ChanNum, const std::string & Channel, con
 			fb_pixel_t color = COL_INFOBAR_TEXT;
 			g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->RenderString(
 				ChanNameX + 10 + ChanNumWidth, ChanNameY + time_height,
-				BoxEndX - (ChanNameX + 20) - time_width - LEFT_OFFSET - 5 - ChanNumWidth,
+				BoxEndX - (ChanNameX + 20) - time_width - LEFT_OFFSET - 10 - ChanNumWidth,
 				ChannelName, color /*COL_INFOBAR_TEXT*/);
 			//provider name
 			if(g_settings.infobar_show_channeldesc && pname){
@@ -789,7 +788,7 @@ void CInfoViewer::showTitle (const int ChanNum, const std::string & Channel, con
 						+ g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO]->getDigitOffset());
 				g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO]->RenderString(
 					ChanNameX + 10 + ChanNumWidth + chname_width, tmpY,
-					BoxEndX - (ChanNameX + 20) - time_width - LEFT_OFFSET - 5 - ChanNumWidth - chname_width,
+					BoxEndX - (ChanNameX + 20) - time_width - LEFT_OFFSET - 10 - ChanNumWidth - chname_width,
 					prov_name, color /*COL_INFOBAR_TEXT*/);
 			}
 
@@ -1979,7 +1978,7 @@ int CInfoViewer::showChannelLogo(const t_channel_id logo_channel_id, const int c
 	int logo_x = 0, logo_y = 0;
 	int res = 0;
 	int start_x = ChanNameX;
-	int chan_w = BoxEndX- (start_x+ 20)- time_width- 15;
+	int chan_w = BoxEndX- (start_x+ 20)- time_width- LEFT_OFFSET - 10;
 
 	bool logo_available = g_PicViewer->GetLogoName(logo_channel_id, ChannelName, strAbsIconPath, &logo_w, &logo_h);
 
diff --git a/src/gui/infoviewer.h b/src/gui/infoviewer.h
index 2438cbe63..a5292af74 100644
--- a/src/gui/infoviewer.h
+++ b/src/gui/infoviewer.h
@@ -89,8 +89,6 @@ class CInfoViewer
 	//uint32_t           fadeTimer;
 	COSDFader	fader;
 
-	int time_left_width;
-	int time_dot_width;
 	int time_width;
 	int time_height;
 	int info_time_width;

From 0013e139a58e75d50bd9414309fe845f9446874c Mon Sep 17 00:00:00 2001
From: Jacek Jendrzej <crashdvb@googlemail.com>
Date: Thu, 18 Dec 2014 19:08:38 +0100
Subject: [PATCH 102/113] infoviewer_bb.cpp CInfoViewerBB::getBBButtonInfo()
 fix audioname in ts mode

---
 src/gui/infoviewer_bb.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp
index d4ce67366..0694604c9 100644
--- a/src/gui/infoviewer_bb.cpp
+++ b/src/gui/infoviewer_bb.cpp
@@ -212,7 +212,7 @@ void CInfoViewerBB::getBBButtonInfo()
 	bbButtonMaxH = 0;
 	bbButtonMaxX = g_InfoViewer->ChanInfoX;
 	int bbButtonMaxW = 0;
-	int mode;
+	int mode = NeutrinoMessages::mode_unknown;
 	for (int i = 0; i < CInfoViewerBB::BUTTON_MAX; i++) {
 		int w = 0, h = 0;
 		bool active;
@@ -232,7 +232,8 @@ void CInfoViewerBB::getBBButtonInfo()
 			icon = NEUTRINO_ICON_BUTTON_GREEN;
 			frameBuffer->getIconSize(icon.c_str(), &w, &h);
 			text = CUserMenu::getUserMenuButtonName(1, active);
-			if (!text.empty())
+			mode = CNeutrinoApp::getInstance()->getMode();
+			if (!text.empty() && mode != NeutrinoMessages::mode_ts)
 				break;
 			text = g_settings.usermenu[SNeutrinoSettings::BUTTON_GREEN]->title;
 			if (text == g_Locale->getText(LOCALE_AUDIOSELECTMENUE_HEAD))

From a58bd6c2356c9b1ab8e9fa133c1a7d05ec12f3ff Mon Sep 17 00:00:00 2001
From: Thilo Graf <dbt@novatux.de>
Date: Fri, 19 Dec 2014 09:11:05 +0100
Subject: [PATCH 103/113] CInfoViewer: rework init and paint of clock

This removes some dimension assignments in start() because of
already existant and usable dimension values that comes directly
from clock object.
---
 src/gui/infoviewer.cpp | 47 +++++++++++++++++++-----------------------
 src/gui/infoviewer.h   |  2 +-
 2 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp
index 9c3f6f4ec..c27ff1cc3 100644
--- a/src/gui/infoviewer.cpp
+++ b/src/gui/infoviewer.cpp
@@ -130,6 +130,7 @@ CInfoViewer::~CInfoViewer()
 
 void CInfoViewer::Init()
 {
+	initClock();
 	BoxStartX = BoxStartY = BoxEndX = BoxEndY = 0;
 	recordModeActive = false;
 	is_visible = false;
@@ -216,16 +217,9 @@ void CInfoViewer::start ()
 	ChanNameY = BoxStartY + (ChanHeight / 2) + SHADOW_OFFSET;	//oberkante schatten?
 	ChanInfoX = BoxStartX + (ChanWidth / 3);
 
-	int digit_width = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->getMaxDigitWidth();
-	int dot_width = max(g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->getRenderWidth(":"),
-			    g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->getRenderWidth(" "));
-	time_width = (digit_width * 4) + dot_width;
-	time_height = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->getHeight();
-
-	if (clock) {
-		delete clock;
-		clock = NULL;
-	}
+	initClock();
+	time_height = clock->getHeight();
+	time_width = clock->getWidth();
 }
 
 void CInfoViewer::changePB()
@@ -244,6 +238,23 @@ void CInfoViewer::changePB()
 	timescale->setType(CProgressBar::PB_TIMESCALE);
 }
 
+void CInfoViewer::initClock()
+{
+	if (clock == NULL){
+		clock = new CComponentsFrmClock();
+		clock->doPaintBg(false);
+	}
+
+	clock->setColorBody(COL_INFOBAR_PLUS_0);
+	clock->setCorner(RADIUS_LARGE, CORNER_TOP_RIGHT);
+	clock->setClockFont(SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME);
+	clock->setClockAlignment(CC_ALIGN_RIGHT | CC_ALIGN_HOR_CENTER);
+	clock->refresh();
+
+	clock->setPos(BoxEndX - 10 - clock->getWidth(), ChanNameY);
+	clock->setTextColor(COL_INFOBAR_TEXT);
+}
+
 void CInfoViewer::paintTime (bool show_dot)
 {
 	if (!gotTime)
@@ -252,23 +263,7 @@ void CInfoViewer::paintTime (bool show_dot)
 	if (!gotTime)
 		return;
 
-	int clock_w = time_width;
-	int clock_h = time_height;
-	int clock_x = BoxEndX - 10 - clock_w;
-	int clock_y = ChanNameY;
-
-	if (clock == NULL){
-		clock = new CComponentsFrmClock();
-		clock->doPaintBg(false);
-	}
-
-	clock->setColorBody(COL_INFOBAR_PLUS_0);
-	clock->setCorner(RADIUS_LARGE, CORNER_TOP_RIGHT);
-	clock->setDimensionsAll(clock_x, clock_y, clock_w, clock_h);
-	clock->setClockFont(SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME);
 	clock->setClockFormat(show_dot ? "%H:%M" : "%H %M");
-	clock->setTextColor(COL_INFOBAR_TEXT);
-
 	clock->paint(CC_SAVE_SCREEN_NO);
 }
 
diff --git a/src/gui/infoviewer.h b/src/gui/infoviewer.h
index a5292af74..1047a41e4 100644
--- a/src/gui/infoviewer.h
+++ b/src/gui/infoviewer.h
@@ -115,8 +115,8 @@ class CInfoViewer
 			  const char *runningStart = NULL, const char *runningRest = NULL,
 			  const char *nextStart = NULL, const char *nextDuration = NULL,
 			  bool update_current = true, bool update_next = true);
+	void initClock();
 	void paintTime( bool show_dot );
-	
 	void showRecordIcon(const bool show);
 	void showIcon_Tuner() const;
 

From 1dc78e95842ee036f335c2a0decab850c13214ee Mon Sep 17 00:00:00 2001
From: Jacek Jendrzej <crashdvb@googlemail.com>
Date: Fri, 19 Dec 2014 15:38:10 +0100
Subject: [PATCH 104/113] supplement to
 0013e139a58e75d50bd9414309fe845f9446874c, fix upnpplayer mode

---
 src/gui/infoviewer_bb.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp
index 0694604c9..3d0c26bc2 100644
--- a/src/gui/infoviewer_bb.cpp
+++ b/src/gui/infoviewer_bb.cpp
@@ -233,13 +233,12 @@ void CInfoViewerBB::getBBButtonInfo()
 			frameBuffer->getIconSize(icon.c_str(), &w, &h);
 			text = CUserMenu::getUserMenuButtonName(1, active);
 			mode = CNeutrinoApp::getInstance()->getMode();
-			if (!text.empty() && mode != NeutrinoMessages::mode_ts)
+			if (!text.empty() && mode < NeutrinoMessages::mode_audio)
 				break;
 			text = g_settings.usermenu[SNeutrinoSettings::BUTTON_GREEN]->title;
 			if (text == g_Locale->getText(LOCALE_AUDIOSELECTMENUE_HEAD))
 				text = "";
-			mode = CNeutrinoApp::getInstance()->getMode();
-			if ((mode == NeutrinoMessages::mode_ts || mode == NeutrinoMessages::mode_webtv) && !CMoviePlayerGui::getInstance().timeshift) {
+			if ((mode == NeutrinoMessages::mode_ts || mode == NeutrinoMessages::mode_webtv || mode == NeutrinoMessages::mode_audio) && !CMoviePlayerGui::getInstance().timeshift) {
 				text = CMoviePlayerGui::getInstance().CurrentAudioName();
 			} else if (!g_RemoteControl->current_PIDs.APIDs.empty()) {
 				int selected = g_RemoteControl->current_PIDs.PIDs.selected_apid;

From 0f45e267286f1158c82ec923c5fb6942afb88a27 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Mon, 22 Dec 2014 09:15:26 +0100
Subject: [PATCH 105/113] - hintbox: allow plain neutrino locales in bodytext

---
 src/gui/widget/hintbox.cpp | 12 ++++++++++++
 src/gui/widget/hintbox.h   |  2 ++
 2 files changed, 14 insertions(+)

diff --git a/src/gui/widget/hintbox.cpp b/src/gui/widget/hintbox.cpp
index 217722790..eb9900a58 100644
--- a/src/gui/widget/hintbox.cpp
+++ b/src/gui/widget/hintbox.cpp
@@ -42,11 +42,23 @@ CHintBox::CHintBox(const neutrino_locale_t Caption, const char * const Text, con
 	init(caption_tmp, Text, Width, Icon);
 }
 
+CHintBox::CHintBox(const neutrino_locale_t Caption, const neutrino_locale_t Text, const int Width, const char * const Icon)
+{
+	const char * caption_tmp = g_Locale->getText(Caption);
+	const char * text_tmp = g_Locale->getText(Text);
+	init(caption_tmp, text_tmp, Width, Icon);
+}
+
 CHintBox::CHintBox(const char * const Caption, const char * const Text, const int Width, const char * const Icon)
 {
 	init(Caption, Text, Width, Icon);
 }
 
+CHintBox::CHintBox(const char * const Caption, const neutrino_locale_t Text, const int Width, const char * const Icon)
+{
+	const char * text_tmp = g_Locale->getText(Text);
+	init(Caption, text_tmp, Width, Icon);
+}
 void CHintBox::init(const char * const Caption, const char * const Text, const int Width, const char * const Icon)
 {
 	char * begin;
diff --git a/src/gui/widget/hintbox.h b/src/gui/widget/hintbox.h
index d58761c7d..460d9f556 100644
--- a/src/gui/widget/hintbox.h
+++ b/src/gui/widget/hintbox.h
@@ -65,7 +65,9 @@ class CHintBox
  public:
 	// Text is UTF-8 encoded
 	CHintBox(const neutrino_locale_t Caption, const char * const Text, const int Width = 450, const char * const Icon = NEUTRINO_ICON_INFO);
+	CHintBox(const neutrino_locale_t Caption, const neutrino_locale_t Text, const int Width = 450, const char * const Icon = NEUTRINO_ICON_INFO);
 	CHintBox(const char * const Caption, const char * const Text, const int Width = 450, const char * const Icon = NEUTRINO_ICON_INFO);
+	CHintBox(const char * const Caption, const neutrino_locale_t Text, const int Width = 450, const char * const Icon = NEUTRINO_ICON_INFO);
 	~CHintBox(void);
 
 	bool has_scrollbar(void);

From 3e24de2d67a4c33b994de6c4e5e34d4f5a9e7b54 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Mon, 22 Dec 2014 09:16:20 +0100
Subject: [PATCH 106/113] - moviebrowser: localize dialogs around TS-editing

---
 data/locale/deutsch.locale | 13 +++++++++++++
 data/locale/english.locale | 13 +++++++++++++
 src/gui/moviebrowser.cpp   | 24 ++++++++++++------------
 src/system/locals.h        | 13 +++++++++++++
 src/system/locals_intern.h | 13 +++++++++++++
 5 files changed, 64 insertions(+), 12 deletions(-)

diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index 387468094..fe0f6c246 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -1503,6 +1503,7 @@ moviebrowser.book_movieend Filmende:
 moviebrowser.book_moviestart Filmstart:
 moviebrowser.book_name Name:
 moviebrowser.book_new Neue Markierung
+moviebrowser.book_no_end Keine Endmarkierung gefunden
 moviebrowser.book_position Position:
 moviebrowser.book_type Sprung (<0 zurück, >0 vor):
 moviebrowser.book_type_backward Wiederholung
@@ -1513,7 +1514,15 @@ moviebrowser.browser_row_item Spalteninfo
 moviebrowser.browser_row_nr Anzahl Spalten
 moviebrowser.browser_row_width Spaltenbreite [% der Gesamtbreite]
 moviebrowser.cache_dir Cache-Verzeichnis
+moviebrowser.copies Kopiere Sprungmarken vom Film in neue Dateien?
+moviebrowser.copy Kopiere Sprungmarken vom Film in neue Datei?
+moviebrowser.copy_failed Fehler beim Kopieren. Sind Sprungmarken und genug freier Speicher vorhanden?
+moviebrowser.copying Kopiere Sprungmarken, bitte warten ...
+moviebrowser.cut Schneide Sprungmarken aus dem Film?
+moviebrowser.cut_failed Fehler beim Schneiden. Sind Sprungmarken und genug freier Speicher vorhanden?
+moviebrowser.cutting Schneide Film, bitte warten ...
 moviebrowser.delete_info Lösche Dateien, bitte warten...
+moviebrowser.delete_screenshot Lösche Screenshot?
 moviebrowser.dir Pfad
 moviebrowser.dir_head Zusätzliche Verzeichnisse
 moviebrowser.edit_book Bookmark Ändern
@@ -1614,6 +1623,10 @@ moviebrowser.short_size Größe
 moviebrowser.short_title Titel
 moviebrowser.start_head Film starten von Position:
 moviebrowser.start_record_start Aufnahmestart
+moviebrowser.truncate Film kürzen?
+moviebrowser.truncate_failed Fehler beim Kürzen des Films
+moviebrowser.truncate_failed_playing Kürzen des Films während der Wiedergabe nicht möglich.
+moviebrowser.truncating Kürze Film, bitte warten ...
 moviebrowser.ts_only Nur Aufnahmen zeigen
 moviebrowser.update_if_dest_empty_only Übernehmen nur wenn Ziel leer
 moviebrowser.use_dir Verzeichnis verwenden
diff --git a/data/locale/english.locale b/data/locale/english.locale
index 036f06f24..747d55236 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -1508,6 +1508,7 @@ moviebrowser.book_movieend Movie end:
 moviebrowser.book_moviestart User Movie start:
 moviebrowser.book_name Name:
 moviebrowser.book_new New Bookmark
+moviebrowser.book_no_end No end bookmark defined
 moviebrowser.book_position Position:
 moviebrowser.book_type Jump (<0 back , >0 for):
 moviebrowser.book_type_backward Repeat
@@ -1518,7 +1519,15 @@ moviebrowser.browser_row_item Row item
 moviebrowser.browser_row_nr Number of rows
 moviebrowser.browser_row_width Row width (% of screenwidth)
 moviebrowser.cache_dir Cache directory
+moviebrowser.copies Copy jumps from movie to new files?
+moviebrowser.copy Copy jumps from movie to new file?
+moviebrowser.copy_failed Copy failed, are there jump bookmarks and enough free space?
+moviebrowser.copying Coping, please wait ...
+moviebrowser.cut Cut jumps from movie?
+moviebrowser.cut_failed Cut failed, are there jump bookmarks and enough free space?
+moviebrowser.cutting Cutting movie, please wait ...
 moviebrowser.delete_info Delete files, please wait...
+moviebrowser.delete_screenshot Delete screenshot?
 moviebrowser.dir Path
 moviebrowser.dir_head Additional paths
 moviebrowser.edit_book Bookmark change
@@ -1619,6 +1628,10 @@ moviebrowser.short_size MB
 moviebrowser.short_title Title
 moviebrowser.start_head Start movie from:
 moviebrowser.start_record_start Movie start
+moviebrowser.truncate Truncate movie?
+moviebrowser.truncate_failed Truncate failed.
+moviebrowser.truncate_failed_playing Impossible to truncate playing movie.
+moviebrowser.truncating Truncating movie, please wait ...
 moviebrowser.ts_only Show recordings only
 moviebrowser.update_if_dest_empty_only Copy if destination is empty only
 moviebrowser.use_dir Use directory
diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp
index e2db5aa02..dd65a9d31 100644
--- a/src/gui/moviebrowser.cpp
+++ b/src/gui/moviebrowser.cpp
@@ -1751,8 +1751,8 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg)
 	}
 	else if (msg == CRCInput::RC_text || msg == CRCInput::RC_radio) {
 		if ((show_mode == MB_SHOW_RECORDS) &&
-				(ShowMsg(LOCALE_MESSAGEBOX_INFO, msg == CRCInput::RC_radio ? "Copy jumps from movie to new file ?" : "Copy jumps from movie to new files ?", CMessageBox::mbrNo, CMessageBox::mbYes | CMessageBox::mbNo) == CMessageBox::mbrYes)) {
-			CHintBox * hintBox = new CHintBox(LOCALE_MESSAGEBOX_INFO, "Coping, please wait");
+				(ShowMsg(LOCALE_MESSAGEBOX_INFO, msg == CRCInput::RC_radio ? LOCALE_MOVIEBROWSER_COPY : LOCALE_MOVIEBROWSER_COPIES, CMessageBox::mbrNo, CMessageBox::mbYes | CMessageBox::mbNo) == CMessageBox::mbrYes)) {
+			CHintBox * hintBox = new CHintBox(LOCALE_MESSAGEBOX_INFO, LOCALE_MOVIEBROWSER_COPYING);
 			hintBox->paint();
 			sleep(1);
 			hintBox->hide();
@@ -1761,7 +1761,7 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg)
 			off64_t res = copy_movie(m_movieSelectionHandler, &m_movieInfo, msg == CRCInput::RC_radio);
 			//g_RCInput->clearRCMsg();
 			if (res == 0)
-				ShowMsg(LOCALE_MESSAGEBOX_ERROR, "Copy failed, is there jump bookmarks ? Or check free space.", CMessageBox::mbrCancel, CMessageBox::mbCancel, NEUTRINO_ICON_ERROR);
+				ShowMsg(LOCALE_MESSAGEBOX_ERROR, LOCALE_MOVIEBROWSER_COPY_FAILED, CMessageBox::mbrCancel, CMessageBox::mbCancel, NEUTRINO_ICON_ERROR);
 			else
 				loadMovies();
 			refresh();
@@ -1774,8 +1774,8 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg)
 		else
 #endif
 		if ((show_mode == MB_SHOW_RECORDS) &&
-				(ShowMsg(LOCALE_MESSAGEBOX_INFO, "Cut jumps from movie ?", CMessageBox::mbrNo, CMessageBox::mbYes | CMessageBox::mbNo) == CMessageBox::mbrYes)) {
-			CHintBox * hintBox = new CHintBox(LOCALE_MESSAGEBOX_INFO, "Cutting, please wait");
+				(ShowMsg(LOCALE_MESSAGEBOX_INFO, LOCALE_MOVIEBROWSER_CUT, CMessageBox::mbrNo, CMessageBox::mbYes | CMessageBox::mbNo) == CMessageBox::mbrYes)) {
+			CHintBox * hintBox = new CHintBox(LOCALE_MESSAGEBOX_INFO, LOCALE_MOVIEBROWSER_CUTTING);
 			hintBox->paint();
 			sleep(1);
 			hintBox->hide();
@@ -1784,7 +1784,7 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg)
 			off64_t res = cut_movie(m_movieSelectionHandler, &m_movieInfo);
 			//g_RCInput->clearRCMsg();
 			if (res == 0)
-				ShowMsg(LOCALE_MESSAGEBOX_ERROR, "Cut failed, is there jump bookmarks ? Or check free space.", CMessageBox::mbrCancel, CMessageBox::mbCancel, NEUTRINO_ICON_ERROR);
+				ShowMsg(LOCALE_MESSAGEBOX_ERROR, LOCALE_MOVIEBROWSER_CUT_FAILED, CMessageBox::mbrCancel, CMessageBox::mbCancel, NEUTRINO_ICON_ERROR);
 			else {
 				loadMovies();
 			}
@@ -1794,19 +1794,19 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg)
 	else if (msg == CRCInput::RC_games) {
 		if ((show_mode == MB_SHOW_RECORDS) && m_movieSelectionHandler != NULL) {
 			if ((m_movieSelectionHandler == playing_info) && (NeutrinoMessages::mode_ts == CNeutrinoApp::getInstance()->getMode()))
-				ShowMsg(LOCALE_MESSAGEBOX_ERROR, "Impossible to truncate playing movie.", CMessageBox::mbrCancel, CMessageBox::mbCancel, NEUTRINO_ICON_ERROR);
+				ShowMsg(LOCALE_MESSAGEBOX_ERROR, LOCALE_MOVIEBROWSER_TRUNCATE_FAILED_PLAYING, CMessageBox::mbrCancel, CMessageBox::mbCancel, NEUTRINO_ICON_ERROR);
 			else if (m_movieSelectionHandler->bookmarks.end == 0)
-				ShowMsg(LOCALE_MESSAGEBOX_ERROR, "No End bookmark defined!", CMessageBox::mbrCancel, CMessageBox::mbCancel, NEUTRINO_ICON_ERROR);
+				ShowMsg(LOCALE_MESSAGEBOX_ERROR, LOCALE_MOVIEBROWSER_BOOK_NO_END, CMessageBox::mbrCancel, CMessageBox::mbCancel, NEUTRINO_ICON_ERROR);
 			else {
-				if (ShowMsg(LOCALE_MESSAGEBOX_INFO, "Truncate movie ?", CMessageBox::mbrNo, CMessageBox::mbYes | CMessageBox::mbNo) == CMessageBox::mbrYes) {
-					CHintBox * hintBox = new CHintBox(LOCALE_MESSAGEBOX_INFO, "Truncating, please wait");
+				if (ShowMsg(LOCALE_MESSAGEBOX_INFO, LOCALE_MOVIEBROWSER_TRUNCATE, CMessageBox::mbrNo, CMessageBox::mbYes | CMessageBox::mbNo) == CMessageBox::mbrYes) {
+					CHintBox * hintBox = new CHintBox(LOCALE_MESSAGEBOX_INFO, LOCALE_MOVIEBROWSER_TRUNCATING);
 					hintBox->paint();
 					off64_t res = truncate_movie(m_movieSelectionHandler);
 					hintBox->hide();
 					delete hintBox;
 					g_RCInput->clearRCMsg();
 					if (res == 0)
-						ShowMsg(LOCALE_MESSAGEBOX_ERROR, "Truncate failed.", CMessageBox::mbrCancel, CMessageBox::mbCancel, NEUTRINO_ICON_ERROR);
+						ShowMsg(LOCALE_MESSAGEBOX_ERROR, LOCALE_MOVIEBROWSER_TRUNCATE_FAILED, CMessageBox::mbrCancel, CMessageBox::mbCancel, NEUTRINO_ICON_ERROR);
 					else {
 						//printf("New movie info: size %lld len %d\n", res, m_movieSelectionHandler->bookmarks.end/60);
 						m_movieInfo.saveMovieInfo(*m_movieSelectionHandler);
@@ -1818,7 +1818,7 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg)
 		}
 	} else if (msg == CRCInput::RC_favorites) {
 		if (m_movieSelectionHandler != NULL) {
-			if (ShowMsg(LOCALE_MESSAGEBOX_INFO, "Remove screenshot ?", CMessageBox::mbrNo, CMessageBox:: mbYes | CMessageBox::mbNo) == CMessageBox::mbrYes) {
+			if (ShowMsg(LOCALE_MESSAGEBOX_INFO, LOCALE_MOVIEBROWSER_DELETE_SCREENSHOT, CMessageBox::mbrNo, CMessageBox:: mbYes | CMessageBox::mbNo) == CMessageBox::mbrYes) {
 				std::string fname = getScreenshotName(m_movieSelectionHandler->file.Name, S_ISDIR(m_movieSelectionHandler->file.Mode));
 				if (fname != "")
 					unlink(fname.c_str());
diff --git a/src/system/locals.h b/src/system/locals.h
index dddafab8b..4a7e97367 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -1535,6 +1535,7 @@ typedef enum
 	LOCALE_MOVIEBROWSER_BOOK_MOVIESTART,
 	LOCALE_MOVIEBROWSER_BOOK_NAME,
 	LOCALE_MOVIEBROWSER_BOOK_NEW,
+	LOCALE_MOVIEBROWSER_BOOK_NO_END,
 	LOCALE_MOVIEBROWSER_BOOK_POSITION,
 	LOCALE_MOVIEBROWSER_BOOK_TYPE,
 	LOCALE_MOVIEBROWSER_BOOK_TYPE_BACKWARD,
@@ -1545,7 +1546,15 @@ typedef enum
 	LOCALE_MOVIEBROWSER_BROWSER_ROW_NR,
 	LOCALE_MOVIEBROWSER_BROWSER_ROW_WIDTH,
 	LOCALE_MOVIEBROWSER_CACHE_DIR,
+	LOCALE_MOVIEBROWSER_COPIES,
+	LOCALE_MOVIEBROWSER_COPY,
+	LOCALE_MOVIEBROWSER_COPY_FAILED,
+	LOCALE_MOVIEBROWSER_COPYING,
+	LOCALE_MOVIEBROWSER_CUT,
+	LOCALE_MOVIEBROWSER_CUT_FAILED,
+	LOCALE_MOVIEBROWSER_CUTTING,
 	LOCALE_MOVIEBROWSER_DELETE_INFO,
+	LOCALE_MOVIEBROWSER_DELETE_SCREENSHOT,
 	LOCALE_MOVIEBROWSER_DIR,
 	LOCALE_MOVIEBROWSER_DIR_HEAD,
 	LOCALE_MOVIEBROWSER_EDIT_BOOK,
@@ -1646,6 +1655,10 @@ typedef enum
 	LOCALE_MOVIEBROWSER_SHORT_TITLE,
 	LOCALE_MOVIEBROWSER_START_HEAD,
 	LOCALE_MOVIEBROWSER_START_RECORD_START,
+	LOCALE_MOVIEBROWSER_TRUNCATE,
+	LOCALE_MOVIEBROWSER_TRUNCATE_FAILED,
+	LOCALE_MOVIEBROWSER_TRUNCATE_FAILED_PLAYING,
+	LOCALE_MOVIEBROWSER_TRUNCATING,
 	LOCALE_MOVIEBROWSER_TS_ONLY,
 	LOCALE_MOVIEBROWSER_UPDATE_IF_DEST_EMPTY_ONLY,
 	LOCALE_MOVIEBROWSER_USE_DIR,
diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h
index aaed15ea7..6a0230a01 100644
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -1535,6 +1535,7 @@ const char * locale_real_names[] =
 	"moviebrowser.book_moviestart",
 	"moviebrowser.book_name",
 	"moviebrowser.book_new",
+	"moviebrowser.book_no_end",
 	"moviebrowser.book_position",
 	"moviebrowser.book_type",
 	"moviebrowser.book_type_backward",
@@ -1545,7 +1546,15 @@ const char * locale_real_names[] =
 	"moviebrowser.browser_row_nr",
 	"moviebrowser.browser_row_width",
 	"moviebrowser.cache_dir",
+	"moviebrowser.copies",
+	"moviebrowser.copy",
+	"moviebrowser.copy_failed",
+	"moviebrowser.copying",
+	"moviebrowser.cut",
+	"moviebrowser.cut_failed",
+	"moviebrowser.cutting",
 	"moviebrowser.delete_info",
+	"moviebrowser.delete_screenshot",
 	"moviebrowser.dir",
 	"moviebrowser.dir_head",
 	"moviebrowser.edit_book",
@@ -1646,6 +1655,10 @@ const char * locale_real_names[] =
 	"moviebrowser.short_title",
 	"moviebrowser.start_head",
 	"moviebrowser.start_record_start",
+	"moviebrowser.truncate",
+	"moviebrowser.truncate_failed",
+	"moviebrowser.truncate_failed_playing",
+	"moviebrowser.truncating",
 	"moviebrowser.ts_only",
 	"moviebrowser.update_if_dest_empty_only",
 	"moviebrowser.use_dir",

From 97875b48556ad468be77cf5c927d9b22ca779a70 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Tue, 23 Dec 2014 17:11:59 +0300
Subject: [PATCH 107/113] daemonc/remotecontrol.cpp: stop playback before lock
 on cst too, this fixes blank video and background picture in ie audioplayer
 started on locked channel

---
 src/daemonc/remotecontrol.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/daemonc/remotecontrol.cpp b/src/daemonc/remotecontrol.cpp
index b17174a1a..26b6519c4 100644
--- a/src/daemonc/remotecontrol.cpp
+++ b/src/daemonc/remotecontrol.cpp
@@ -733,11 +733,9 @@ void CRemoteControl::stopvideo()
 	if ( is_video_started )
 	{
 		is_video_started= false;
-#if HAVE_TRIPLEDRAGON
 		/* we need stopPlayback to blank video,
 		   lockPlayback prevents it from being inadvertently starting */
 		g_Zapit->stopPlayBack();
-#endif
 		g_Zapit->lockPlayBack();
 	}
 }

From f816efadc6926aa97b82b26c221b18b682de3d2c Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Tue, 23 Dec 2014 19:07:51 +0300
Subject: [PATCH 108/113] eitd/sectionsd.cpp: try to fix filter restart on
 service stop

---
 src/eitd/dmx.cpp       |  2 +-
 src/eitd/sectionsd.cpp | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/eitd/dmx.cpp b/src/eitd/dmx.cpp
index e36ada64b..693bc8257 100644
--- a/src/eitd/dmx.cpp
+++ b/src/eitd/dmx.cpp
@@ -283,7 +283,7 @@ int DMX::getSection(uint8_t *buf, const unsigned timeoutInMSeconds, int &timeout
 	lock();
 	if (!isOpen()) {
 		unlock();
-		timeouts = -1;
+		timeouts = -3;
 		return -1;
 	}
 
diff --git a/src/eitd/sectionsd.cpp b/src/eitd/sectionsd.cpp
index a2c06ce43..630a38917 100644
--- a/src/eitd/sectionsd.cpp
+++ b/src/eitd/sectionsd.cpp
@@ -972,15 +972,11 @@ static void commandserviceChanged(int connfd, char *data, const unsigned dataLen
 static void commandserviceStopped(int connfd, char * /* data */, const unsigned /* dataLength */)
 {
 	xprintf("[sectionsd] commandserviceStopped\n");
-	sendEmptyResponse(connfd, NULL, 0);
-	threadCN.lock();
-	threadEIT.lock();
-	threadCN.closefd();
-	threadEIT.closefd();
-	threadCN.unlock();
-	threadEIT.unlock();
-	threadCN.stopUpdate();
 	current_channel_id = 0;
+	sendEmptyResponse(connfd, NULL, 0);
+	threadEIT.stop();
+	threadCN.stop();
+	threadCN.stopUpdate();
 	xprintf("[sectionsd] commandserviceStopped done\n");
 }
 
@@ -1585,8 +1581,12 @@ void CSectionThread::run()
 			xprintf("%s: skipping to next filter %d from %d (timeouts %d)\n",
 				name.c_str(), filter_index+1, (int)filters.size(), timeoutsDMX);
 #endif
+			if (timeoutsDMX == -3)
+				sendToSleepNow = true;
+			else
+				need_change = true;
+
 			timeoutsDMX = 0;
-			need_change = true;
 		}
 		if (zeit > lastChanged + skipTime) {
 #ifdef DEBUG_SECTION_THREADS

From 75bae10ba9b4bcbc93d011b887ee2d00a5d9f6c8 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Tue, 23 Dec 2014 19:12:17 +0300
Subject: [PATCH 109/113] zapit/src/getservices.cpp: change default pilot param
 to auto

---
 src/zapit/src/getservices.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/zapit/src/getservices.cpp b/src/zapit/src/getservices.cpp
index 10ca08dff..5f2734a4c 100644
--- a/src/zapit/src/getservices.cpp
+++ b/src/zapit/src/getservices.cpp
@@ -386,7 +386,7 @@ void CServiceManager::ParseTransponders(xmlNodePtr node, t_satellite_position sa
 			else
 				feparams.frequency = (int) 1000 * (int) round ((double) feparams.frequency / (double) 1000);
 			/* TODO: add xml tag ? */
-			feparams.pilot = ZPILOT_AUTO_SW;
+			feparams.pilot = ZPILOT_AUTO;
 		}
 		else if (CFrontend::isTerr(delsys)) {
 			//<TS id="0001" on="7ffd" frq="650000" inv="2" bw="3" hp="9" lp="9" con="6" tm="2" gi="0" hi="4" sys="6">
@@ -612,7 +612,7 @@ void CServiceManager::ParseSatTransponders(delivery_system_t delsys, xmlNodePtr
 			const char *rolloff = xmlGetAttribute(tps, "rolloff");
 
 			/* TODO: add xml tag ? */
-			feparams.pilot = ZPILOT_AUTO_SW;
+			feparams.pilot = ZPILOT_AUTO;
 			if (system) {
 				uint32_t s = xmlGetNumericAttribute(tps, "system", 0);
 				switch (s) {

From f236b4807bea99a22730e133a7f674d976d549b1 Mon Sep 17 00:00:00 2001
From: Jacek Jendrzej <crashdvb@googlemail.com>
Date: Tue, 23 Dec 2014 17:45:17 +0100
Subject: [PATCH 110/113] nhttpd - fix select audio pid in live (vlc) mode

---
 .../tuxboxapi/coolstream/neutrinoyparser.cpp  | 117 ++++++++++++------
 src/nhttpd/web/Y_Live.js                      |   2 +-
 2 files changed, 80 insertions(+), 39 deletions(-)

diff --git a/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp b/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp
index 9ada60023..d2219e8e7 100644
--- a/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp
+++ b/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp
@@ -563,68 +563,109 @@ std::string  CNeutrinoYParser::func_get_audio_pids_as_dropdown(CyhookHandler *,
 	std::string yresult;
 	static bool init_iso=true;
 	bool idx_as_id=true;
-
+	unsigned int selected_apid = 0;
+	t_channel_id current_channel_id = 0;
+	CZapitChannel * channel = NULL;
 	if(para == "apid")
 		idx_as_id=false;
+	else if(!para.empty() && ("channel="== para.substr(0,8))){
+		if (sscanf(para.c_str(), "channel=%llx:audio=%i:", &current_channel_id,&selected_apid) == 2) {
+			if(current_channel_id != 0 && CZapit::getInstance()->GetCurrentChannelID() != current_channel_id){
+				channel = CServiceManager::getInstance()->FindChannel(current_channel_id);
+			}
+		}
+	}
 	if(init_iso)
 	{
 		if(_initialize_iso639_map())
 			init_iso=false;
 	}
-	bool eit_not_ok=true;
-	CZapitClient::responseGetPIDs pids;
+	if (channel){//check audio pid if current_channel != vlc live channel
+		//wait for channel lock
+		for (int i = 0; i < 30 && channel->getAudioChannelCount()==0;i++){
+			usleep(100000);
+		}
+		for (unsigned int i = 0; i <  channel->getAudioChannelCount(); i++) {
+			CZapitAudioChannel::ZapitAudioChannelType atype = channel->getAudioChannel(i)->audioChannelType;
+			std::string a_desc;
+			if(!(init_iso)){
+				a_desc = _getISO639Description( channel->getAudioChannel(i)->description.c_str() );
+			}else{
+				a_desc = channel->getAudioChannel(i)->description.c_str();
+			}
+			if (channel->getAudioChannel(i)->audioChannelType == CZapitAudioChannel::EAC3) {
+				yresult += string_printf("<option value=%05u %s>%s %s</option>\r\n",i
+				, (i==selected_apid) ? "selected=\"selected\"" : ""
+				, a_desc.c_str()
+				,"(EAC3)");
+			} else {
+				yresult += string_printf("<option value=%05u %s>%s %s</option>\r\n",i
+				, (i==selected_apid) ? "selected=\"selected\"" : ""
+				,a_desc.c_str()
+				,atype?"(AC3)":" ");
+			}
+		}
+	}
+	if( yresult.empty()){
+		bool eit_not_ok=true;
+		if(current_channel_id==0)
+			current_channel_id = CZapit::getInstance()->GetCurrentChannelID();
 
-	CSectionsdClient::ComponentTagList tags;
-	pids.PIDs.vpid=0;
-	NeutrinoAPI->Zapit->getPIDS(pids);
+		CZapitClient::responseGetPIDs pids;
+		CSectionsdClient::ComponentTagList tags;
+		pids.PIDs.vpid=0;
+		NeutrinoAPI->Zapit->getPIDS(pids);
 
-	t_channel_id current_channel = CZapit::getInstance()->GetCurrentChannelID();
-	CSectionsdClient::responseGetCurrentNextInfoChannelID currentNextInfo;
-	CEitManager::getInstance()->getCurrentNextServiceKey(current_channel, currentNextInfo);
-	if (CEitManager::getInstance()->getComponentTagsUniqueKey(currentNextInfo.current_uniqueKey,tags))
-	{
-		for (unsigned int i=0; i< tags.size(); i++)
+		CSectionsdClient::responseGetCurrentNextInfoChannelID currentNextInfo;
+		CEitManager::getInstance()->getCurrentNextServiceKey(current_channel_id, currentNextInfo);
+		if (CEitManager::getInstance()->getComponentTagsUniqueKey(currentNextInfo.current_uniqueKey,tags))
 		{
-			for (unsigned short j=0; j< pids.APIDs.size(); j++)
+			unsigned int tag = 0;
+			for (unsigned int i=0; i< tags.size(); i++)
 			{
-				if ( pids.APIDs[j].component_tag == tags[i].componentTag )
+				for (unsigned short j=0; j< pids.APIDs.size(); j++)
 				{
- 					if(!tags[i].component.empty())
+					if ( pids.APIDs[j].component_tag == tags[i].componentTag )
 					{
-						if(!(isalnum(tags[i].component[0])))
-							tags[i].component=tags[i].component.substr(1,tags[i].component.length()-1);
-						yresult += string_printf("<option value=%05u>%s</option>\r\n",idx_as_id ? j : pids.APIDs[j].pid,tags[i].component.c_str());
-					}
-					else
-					{
-						if(!(init_iso))
+						if(!tags[i].component.empty())
 						{
-							strcpy( pids.APIDs[j].desc, _getISO639Description( pids.APIDs[j].desc ) );
+							if(!(isalnum(tags[i].component[0])))
+								tags[i].component=tags[i].component.substr(1,tags[i].component.length()-1);
+							yresult += string_printf("<option value=%05u %s>%s</option>\r\n",idx_as_id ? j : pids.APIDs[j].pid,(tag==selected_apid) ? "selected=\"selected\"" : "",tags[i].component.c_str());
+							tag++;
 						}
-			 			yresult += string_printf("<option value=%05u>%s %s</option>\r\n",idx_as_id ? j : pids.APIDs[j].pid,std::string(pids.APIDs[j].desc).c_str(),pids.APIDs[j].is_ac3 ? " (AC3)": pids.APIDs[j].is_aac ? "(AAC)" : pids.APIDs[j].is_eac3 ? "(EAC3)" : " ");
+						else
+						{
+							if(!(init_iso))
+							{
+								strcpy( pids.APIDs[j].desc, _getISO639Description( pids.APIDs[j].desc ) );
+							}
+							yresult += string_printf("<option value=%05u %s>%s %s</option>\r\n",idx_as_id ? j : pids.APIDs[j].pid,(j==selected_apid) ? "selected=\"selected\"" : "",std::string(pids.APIDs[j].desc).c_str(),pids.APIDs[j].is_ac3 ? " (AC3)": pids.APIDs[j].is_aac ? "(AAC)" : pids.APIDs[j].is_eac3 ? "(EAC3)" : " ");
+						}
+						eit_not_ok=false;
+						break;
 					}
-					eit_not_ok=false;
-					break;
 				}
 			}
 		}
-	}
-	if(eit_not_ok)
-	{
-		unsigned short i = 0;
-		for (CZapitClient::APIDList::iterator it = pids.APIDs.begin(); it!=pids.APIDs.end(); ++it)
+		if(eit_not_ok)
 		{
-			if(!(init_iso))
+			unsigned short i = 0;
+			for (CZapitClient::APIDList::iterator it = pids.APIDs.begin(); it!=pids.APIDs.end(); ++it)
 			{
-				strcpy( pids.APIDs[i].desc, _getISO639Description( pids.APIDs[i].desc ) );
+				if(!(init_iso))
+				{
+					strcpy( pids.APIDs[i].desc, _getISO639Description( pids.APIDs[i].desc ) );
+				}
+				yresult += string_printf("<option value=%05u %s>%s %s</option>\r\n",
+							 idx_as_id ? i : it->pid, (i==selected_apid) ? "selected=\"selected\"" : "",pids.APIDs[i].desc,
+							 pids.APIDs[i].is_ac3 ? " (AC3)": pids.APIDs[i].is_aac ? "(AAC)" : pids.APIDs[i].is_eac3 ? "(EAC3)" : " ");
+				i++;
 			}
-			yresult += string_printf("<option value=%05u>%s %s</option>\r\n",idx_as_id ? i : it->pid,pids.APIDs[i].desc,pids.APIDs[i].is_ac3 ? " (AC3)": pids.APIDs[i].is_aac ? "(AAC)" : pids.APIDs[i].is_eac3 ? "(EAC3)" : " ");
-			i++;
 		}
+		if(pids.APIDs.empty())
+			yresult = "00000"; // shouldnt happen, but print at least one apid
 	}
-
-	if(pids.APIDs.empty())
-		yresult = "00000"; // shouldnt happen, but print at least one apid
 	return yresult;
 }
 
diff --git a/src/nhttpd/web/Y_Live.js b/src/nhttpd/web/Y_Live.js
index 77ae189d3..7b9144088 100644
--- a/src/nhttpd/web/Y_Live.js
+++ b/src/nhttpd/web/Y_Live.js
@@ -329,7 +329,7 @@ function doChangeAudioPid(){
 	window.setTimeout("change_channel_play()",100);
 }
 function build_audio_pid_list(){
-	var audio_pids_url = "/y/cgi?execute=func:get_audio_pids_as_dropdown";
+	var audio_pids_url = "/y/cgi?execute=func:get_audio_pids_as_dropdown%20channel="+current_channel+":audio="+AudioChannel+":";
 	var audio_pid_list = loadSyncURL(audio_pids_url);
 	audio_pid_list = "<select size=\"1\" class=\"y_live_audio_pids\" id=\"audiopid\" onChange=\"doChangeAudioPid()\">"
 			+ audio_pid_list

From 7b356ad58f79022121cee74f38cd6023b72d4590 Mon Sep 17 00:00:00 2001
From: Jacek Jendrzej <crashdvb@googlemail.com>
Date: Wed, 24 Dec 2014 14:52:57 +0100
Subject: [PATCH 111/113] fix sort freq with negative satellite position

---
 src/zapit/include/zapit/channel.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zapit/include/zapit/channel.h b/src/zapit/include/zapit/channel.h
index b3c020d9e..ccdc4cd85 100644
--- a/src/zapit/include/zapit/channel.h
+++ b/src/zapit/include/zapit/channel.h
@@ -315,7 +315,7 @@ struct CmpChannelByFreq: public std::binary_function <const CZapitChannel * cons
 		if((c1->getTransponderId() == c2->getTransponderId()) && ((uint64_t)c1->getFreqId() <<32 | c1->polarization <<16 | c1->getSatellitePosition()) == ((uint64_t)c2->getFreqId()<<32 | c2->polarization <<16| c2->getSatellitePosition()))
 			return std::lexicographical_compare(c1->getName().begin(), c1->getName().end(), c2->getName().begin(), c2->getName().end(), comparetolower);
 		else
-			return ((uint64_t)c1->getFreqId()<<32 | c1->polarization <<16 | c1->getSatellitePosition()) < ((uint64_t)c2->getFreqId()<<32 | c2->polarization <<16 | c2->getSatellitePosition());
+			return ((uint64_t)c1->getFreqId()<<32 | c1->polarization <<16 | abs(c1->getSatellitePosition())) < ((uint64_t)c2->getFreqId()<<32 | c2->polarization <<16 | abs(c2->getSatellitePosition()));
 		;
 	};
 };

From 751d23fbbb8a0615d1e604e856c910e13723ab33 Mon Sep 17 00:00:00 2001
From: Jacek Jendrzej <crashdvb@googlemail.com>
Date: Wed, 24 Dec 2014 16:41:39 +0100
Subject: [PATCH 112/113] refix sort freq with negative satellite position (thx
 Houdini)

---
 src/zapit/include/zapit/channel.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zapit/include/zapit/channel.h b/src/zapit/include/zapit/channel.h
index ccdc4cd85..60dd7e37f 100644
--- a/src/zapit/include/zapit/channel.h
+++ b/src/zapit/include/zapit/channel.h
@@ -315,7 +315,7 @@ struct CmpChannelByFreq: public std::binary_function <const CZapitChannel * cons
 		if((c1->getTransponderId() == c2->getTransponderId()) && ((uint64_t)c1->getFreqId() <<32 | c1->polarization <<16 | c1->getSatellitePosition()) == ((uint64_t)c2->getFreqId()<<32 | c2->polarization <<16| c2->getSatellitePosition()))
 			return std::lexicographical_compare(c1->getName().begin(), c1->getName().end(), c2->getName().begin(), c2->getName().end(), comparetolower);
 		else
-			return ((uint64_t)c1->getFreqId()<<32 | c1->polarization <<16 | abs(c1->getSatellitePosition())) < ((uint64_t)c2->getFreqId()<<32 | c2->polarization <<16 | abs(c2->getSatellitePosition()));
+			return ((int64_t)c1->getSatellitePosition() <<32 | c1->getFreqId()<<16 | c1->polarization ) < ((int64_t)c2->getSatellitePosition() << 32 | c2->getFreqId()<<16 | c2->polarization);		;
 		;
 	};
 };

From 9b78e49d0ebedc67b7de489b9706d0712fcc4695 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Fri, 26 Dec 2014 14:16:02 +0300
Subject: [PATCH 113/113] gui/mediaplayer_setup.cpp: integrate MB / YT
 settings, (c) martii

---
 data/locale/deutsch.locale    |   4 ++
 data/locale/english.locale    |   4 ++
 src/gui/mediaplayer_setup.cpp |  49 ++++++++++++++--
 src/gui/moviebrowser.cpp      | 103 +++++++++++++++++++++-------------
 src/gui/moviebrowser.h        |   4 +-
 src/system/locals.h           |   4 ++
 src/system/locals_intern.h    |   4 ++
 7 files changed, 124 insertions(+), 48 deletions(-)

diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index fe0f6c246..4ee859428 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -885,6 +885,7 @@ menu.back Zurück
 menu.cancel Abbrechen
 menu.hint_a_pic Konfigurieren Sie den Audioplayer und den Bildbetrachter
 menu.hint_aplay Audioplayer
+menu.hint_aplay_setup Ändern Sie Audioplayer-Einstellungen wie Titel-Anzeige, Startverzeichnis oder Bildschirmschoner.
 menu.hint_audio Audio-Ausgang, Dolby Digital und SRS TruVolume Optionen und mehr
 menu.hint_audio_adjust_vol_ac3 Lautstärkeanpassung für AC3-Tonspuren
 menu.hint_audio_adjust_vol_clear Alle gespeicherten Werte für AC3- und PCM-Tonspuren löschen
@@ -1101,6 +1102,7 @@ menu.hint_misc_filebrowser Dateisystem, Dateirechte anzeigen im Dateibrowser, St
 menu.hint_misc_general Standby-, Teletext- und Rotor-Einstellungen, Pluginverzeichnis auf externem Datenträger
 menu.hint_misc_zapit Verwaltung der Start-Kanäle für den TV/Radio-Modus
 menu.hint_movie Wiedergabe von Filmen
+menu.hint_moviebrowser_setup Legen Sie Auswahl- und Anzeigeoptionen des MovieBrowsers fest
 menu.hint_movieplayer_plugin Wählen Sie ein Plugin, das mit einer Schnellstart-Taste im Movieplayer-Modus gestartet wird
 menu.hint_net_broadcast Ändern Sie die Broadcast-Adresse.\nWenn Sie unsicher sind, verwenden Sie zuletzt .255
 menu.hint_net_dhcp Verwenden Sie einen DHCP-Server für die automatische Vergabe einer IP-Adresse im Netzwerk
@@ -1152,6 +1154,7 @@ menu.hint_parentallock_prompt Legen Sie fest, wann die Eingabe einer PIN erfolge
 menu.hint_personalize Personalisieren Sie ihre Menüs und konfigurieren Sie ihre Benutzermenüs
 menu.hint_pictureviewer_defdir Wählen Sie das Startverzeichnis für den Bildbetrachter
 menu.hint_pictureviewer_scaling Stellen Sie die Bildauflösung ein
+menu.hint_pictureviewer_setup Konfigurieren Sie die Bildbetrachter-Optionen
 menu.hint_pictureviewer_slide_time Ändern Sie den Diashow-Intervall.\nStandardmäßig sind 10 Sekunden eingstellt
 menu.hint_picview Bilder anzeigen
 menu.hint_plugin_type_games Legt fest, ob Spiele im Benutzermenü unter der Rubrik 'Plugin-Typen' gezeigt werden sollen
@@ -1358,6 +1361,7 @@ menu.hint_volume_size Wählen Sie die Höhe der Lautstärkeanzeige
 menu.hint_webtv_setup Hier konfigurierte WebTV-Kanäle finden Sie in der Kanalverwaltung.
 menu.hint_window_size Kanalliste, EPG-Infos und einige andere Fenster werden mit diesem Faktor skaliert
 menu.hint_ytplay Wiedergabe von ausgewählten Youtube Feeds
+menu.hint_ytplay_setup Konfigurieren Sie YouTube-spezifische Optionen wie maximale Ergebnisse bei Suchen oder Cache-Verzeichnis
 menu.hint_zap_cycle Wählen Sie, ob nur innerhalb des aktiven Bouquets umgeschaltet werden kann
 menu.next Weiter (Menü zum Beenden)
 messagebox.back Zurück
diff --git a/data/locale/english.locale b/data/locale/english.locale
index 747d55236..ed8961ab4 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -888,6 +888,7 @@ menu.back Back
 menu.cancel Cancel
 menu.hint_a_pic Configure audio player and picture viewer
 menu.hint_aplay Audio player
+menu.hint_aplay_setup Change title display, start directory, screen saver and more
 menu.hint_audio Audio output, DD\nSRS True volume options
 menu.hint_audio_adjust_vol_ac3 Channel specific volume adjustment for AC3 streams
 menu.hint_audio_adjust_vol_clear Clear all saved values for PCM and AC3 streams
@@ -1104,6 +1105,7 @@ menu.hint_misc_filebrowser Filesystem encoding, file rights\ndeny directory leav
 menu.hint_misc_general Start to standby, cache teletext, swp rotor\nplugin hdd dir
 menu.hint_misc_zapit Initial TV/Radio channels
 menu.hint_movie Play movies
+menu.hint_moviebrowser_setup Set selection and display options.
 menu.hint_movieplayer_plugin Choose a plugin that's executed with the one touch key in movieplayer mode
 menu.hint_net_broadcast Enter broadcast address\nif unsure, use IP address with last .255
 menu.hint_net_dhcp Use DHCP server to auto-configure
@@ -1155,6 +1157,7 @@ menu.hint_parentallock_prompt Configure when Neutrino-HD will ask you\nfor PIN c
 menu.hint_personalize Enable, disable or Protect menu items\nConfigure color-buttons user menus
 menu.hint_pictureviewer_defdir Default picture viewer directory
 menu.hint_pictureviewer_scaling Picture scaling algorithm
+menu.hint_pictureviewer_setup Configure pictureviewer behavior
 menu.hint_pictureviewer_slide_time Slideshow interval, in seconds
 menu.hint_picview View pictures
 menu.hint_plugin_type_games Show games in usermenu at selection 'Plugin types'
@@ -1363,6 +1366,7 @@ menu.hint_volume_size Select volume indicator height
 menu.hint_webtv_setup WebTV channels configured here will be available in the standard channel lists.
 menu.hint_window_size Channellist, EPG-infos and some other windows are scaled by this factor
 menu.hint_ytplay Play selected youtube feeds
+menu.hint_ytplay_setup Configure YouTube-specific options, e.g. an upper limit for search results
 menu.hint_zap_cycle When swithing channels, stay in current bouquet
 menu.next Next (press Menu to quit)
 messagebox.back Back
diff --git a/src/gui/mediaplayer_setup.cpp b/src/gui/mediaplayer_setup.cpp
index 319b22e3b..8f6bd02bf 100644
--- a/src/gui/mediaplayer_setup.cpp
+++ b/src/gui/mediaplayer_setup.cpp
@@ -34,7 +34,6 @@
 #include <config.h>
 #endif
 
-
 #include "mediaplayer_setup.h"
 
 #include <global.h>
@@ -43,18 +42,15 @@
 #include <gui/widget/icons.h>
 #include <gui/widget/stringinput.h>
 
-
 #include <gui/audioplayer_setup.h>
 #include <gui/pictureviewer_setup.h>
 #include <gui/webtv_setup.h>
-
+#include <gui/moviebrowser.h>
 
 #include <driver/screen_max.h>
 
 #include <system/debug.h>
 
-
-
 CMediaPlayerSetup::CMediaPlayerSetup()
 {
 	width = w_max (40, 10);
@@ -63,7 +59,6 @@ CMediaPlayerSetup::CMediaPlayerSetup()
 
 CMediaPlayerSetup::~CMediaPlayerSetup()
 {
-
 }
 
 int CMediaPlayerSetup::exec(CMenuTarget* parent, const std::string & /*actionKey*/)
@@ -83,7 +78,48 @@ int CMediaPlayerSetup::exec(CMenuTarget* parent, const std::string & /*actionKey
 /*shows media setup menue entries*/
 int CMediaPlayerSetup::showMediaPlayerSetup()
 {
+	CMenuWidget* mediaSetup = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width);
+	mediaSetup->setSelected(selected);
 
+	// intros
+	mediaSetup->addIntroItems(LOCALE_MAINMENU_MEDIA);
+
+	CMenuForwarder *mf;
+
+	CAudioPlayerSetup asetup;
+	mf = new CMenuForwarder(LOCALE_AUDIOPLAYER_NAME, true, NULL, &asetup, "", CRCInput::RC_red);
+	mf->setHint(NEUTRINO_ICON_HINT_APLAY, LOCALE_MENU_HINT_APLAY_SETUP);
+	mediaSetup->addItem(mf);
+
+	CPictureViewerSetup psetup;
+	mf = new CMenuForwarder(LOCALE_PICTUREVIEWER_HEAD, true, NULL, &psetup, "", CRCInput::RC_green);
+	mf->setHint(NEUTRINO_ICON_HINT_PICVIEW, LOCALE_MENU_HINT_PICTUREVIEWER_SETUP);
+	mediaSetup->addItem(mf);
+
+	CWebTVSetup wsetup;
+	mf = new CMenuForwarder(LOCALE_WEBTV_HEAD, true, NULL, &wsetup, "show_menu", CRCInput::RC_yellow);
+	mf->setHint(NEUTRINO_ICON_HINT_TVMODE /* FIXME */, LOCALE_MENU_HINT_WEBTV_SETUP);
+	mediaSetup->addItem(mf);
+
+	mediaSetup->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MAINMENU_MOVIEPLAYER));
+
+	CMovieBrowser msetup;
+	int shortcut = 1;
+	mf = new CMenuForwarder(LOCALE_MOVIEBROWSER_HEAD, true, NULL, &msetup, "show_menu", CRCInput::convertDigitToKey(shortcut++));
+	mf->setHint(NEUTRINO_ICON_HINT_MB, LOCALE_MENU_HINT_MOVIEBROWSER_SETUP);
+	mediaSetup->addItem(mf);
+
+	mf = new CMenuForwarder(LOCALE_MOVIEPLAYER_YTPLAYBACK, true, NULL, &msetup, "show_ytmenu", CRCInput::convertDigitToKey(shortcut++));
+	mf->setHint(NEUTRINO_ICON_HINT_YTPLAY, LOCALE_MENU_HINT_YTPLAY_SETUP);
+	mediaSetup->addItem(mf);
+
+
+	int res = mediaSetup->exec (NULL, "");
+	selected = mediaSetup->getSelected();
+	delete mediaSetup;
+	return res;
+
+#if 0
 	CMenuWidget* mediaSetup = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width);
 	mediaSetup->setSelected(selected);
 
@@ -105,4 +141,5 @@ int CMediaPlayerSetup::showMediaPlayerSetup()
 	selected = mediaSetup->getSelected();
 	delete mediaSetup;
 	return res;
+#endif
 }
diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp
index dd65a9d31..c2b7b5b23 100644
--- a/src/gui/moviebrowser.cpp
+++ b/src/gui/moviebrowser.cpp
@@ -863,6 +863,16 @@ int CMovieBrowser::exec(CMenuTarget* parent, const std::string & actionKey)
 			m_movieSelectionHandler->bookmarks.user[i].pos =0;
 		}
 	}
+	else if(actionKey == "show_menu")
+	{
+		showMenu(true);
+	}
+	else if(actionKey == "show_ytmenu")
+	{
+		showYTMenu(true);
+		saveSettings(&m_settings);
+	}
+
 	return returnval;
 }
 
@@ -1746,7 +1756,7 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg)
 		if (show_mode == MB_SHOW_YT)
 			showYTMenu();
 		else
-			showMenu(m_movieSelectionHandler);
+			showMenu();
 
 	}
 	else if (msg == CRCInput::RC_text || msg == CRCInput::RC_radio) {
@@ -2764,7 +2774,7 @@ int CMovieBrowser::showMovieInfoMenu(MI_MOVIE_INFO* movie_info)
 	return res;
 }
 
-bool CMovieBrowser::showMenu(MI_MOVIE_INFO* /* movie_info */, bool calledExternally)
+bool CMovieBrowser::showMenu(bool calledExternally)
 {
 	/* first clear screen */
 	framebuffer->paintBackground();
@@ -2864,19 +2874,22 @@ bool CMovieBrowser::showMenu(MI_MOVIE_INFO* /* movie_info */, bool calledExterna
 	CMovieHelp* movieHelp = new CMovieHelp();
 	CNFSSmallMenu* nfs =    new CNFSSmallMenu();
 
-	CMenuWidget mainMenu(LOCALE_MOVIEBROWSER_HEAD, NEUTRINO_ICON_MOVIEPLAYER);
-	mainMenu.addIntroItems(LOCALE_MOVIEBROWSER_MENU_MAIN_HEAD);
-	mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_INFO_HEAD, (m_movieSelectionHandler != NULL), NULL, this,   "show_movie_info_menu",    CRCInput::RC_red));
-	mainMenu.addItem(GenericMenuSeparatorLine);
-	mainMenu.addItem(new CMenuForwarder(LOCALE_EPGPLUS_OPTIONS,                    true, NULL, &optionsMenu,NULL,                                  CRCInput::RC_green));
-	mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_MENU_DIRECTORIES_HEAD, true, NULL, &dirMenu,    NULL,                                  CRCInput::RC_yellow));
-	mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_SCAN_FOR_MOVIES,       true, NULL, this,        "reload_movie_info",                   CRCInput::RC_blue));
-	//mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_MENU_NFS_HEAD,       true, NULL, nfs,         NULL,                                  CRCInput::RC_setup));
-	mainMenu.addItem(GenericMenuSeparatorLine);
-	mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_MENU_HELP_HEAD,        true, NULL, movieHelp,   NULL,                                  CRCInput::RC_help));
-	//mainMenu.addItem(GenericMenuSeparator);
+	if (!calledExternally) {
+		CMenuWidget mainMenu(LOCALE_MOVIEBROWSER_HEAD, NEUTRINO_ICON_MOVIEPLAYER);
+		mainMenu.addIntroItems(LOCALE_MOVIEBROWSER_MENU_MAIN_HEAD);
+		mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_INFO_HEAD, (m_movieSelectionHandler != NULL), NULL, this,   "show_movie_info_menu",    CRCInput::RC_red));
+		mainMenu.addItem(GenericMenuSeparatorLine);
+		mainMenu.addItem(new CMenuForwarder(LOCALE_EPGPLUS_OPTIONS,                    true, NULL, &optionsMenu,NULL,                                  CRCInput::RC_green));
+		mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_MENU_DIRECTORIES_HEAD, true, NULL, &dirMenu,    NULL,                                  CRCInput::RC_yellow));
+		mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_SCAN_FOR_MOVIES,       true, NULL, this,        "reload_movie_info",                   CRCInput::RC_blue));
+		//mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_MENU_NFS_HEAD,       true, NULL, nfs,         NULL,                                  CRCInput::RC_setup));
+		mainMenu.addItem(GenericMenuSeparatorLine);
+		mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_MENU_HELP_HEAD,        true, NULL, movieHelp,   NULL,                                  CRCInput::RC_help));
+		//mainMenu.addItem(GenericMenuSeparator);
 
-	mainMenu.exec(NULL, " ");
+		mainMenu.exec(NULL, " ");
+	} else
+		optionsMenu.exec(NULL, "");
 
 	// post menu handling
 	if (m_parentalLock != MB_PARENTAL_LOCK_OFF_TMP)
@@ -3441,7 +3454,7 @@ int CYTHistory::exec(CMenuTarget* parent, const std::string &actionKey)
 	return menu_return::RETURN_EXIT;
 }
 
-bool CMovieBrowser::showYTMenu()
+bool CMovieBrowser::showYTMenu(bool calledExternally)
 {
 	framebuffer->paintBackground();
 
@@ -3452,30 +3465,36 @@ bool CMovieBrowser::showYTMenu()
 	CMenuSelectorTarget * selector = new CMenuSelectorTarget(&select);
 
 	char cnt[5];
-	for (unsigned i = 0; i < YT_FEED_OPTION_COUNT; i++) {
-		sprintf(cnt, "%d", YT_FEED_OPTIONS[i].key);
-		mainMenu.addItem(new CMenuForwarder(YT_FEED_OPTIONS[i].value, true, NULL, selector, cnt, CRCInput::convertDigitToKey(i + 1)), m_settings.ytmode == (int) YT_FEED_OPTIONS[i].key);
+	if (!calledExternally) {
+		for (unsigned i = 0; i < YT_FEED_OPTION_COUNT; i++) {
+			sprintf(cnt, "%d", YT_FEED_OPTIONS[i].key);
+			mainMenu.addItem(new CMenuForwarder(YT_FEED_OPTIONS[i].value, true, NULL, selector, cnt, CRCInput::convertDigitToKey(i + 1)), m_settings.ytmode == (int) YT_FEED_OPTIONS[i].key);
+		}
+		mainMenu.addItem(GenericMenuSeparatorLine);
+
+		bool enabled = (!m_vMovieInfo.empty()) && (m_movieSelectionHandler != NULL);
+		sprintf(cnt, "%d", cYTFeedParser::RELATED);
+		mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_YT_RELATED, enabled, NULL, selector, cnt, CRCInput::RC_red));
+
+		mainMenu.addItem(GenericMenuSeparatorLine);
 	}
-	mainMenu.addItem(GenericMenuSeparatorLine);
-
-	bool enabled = (!m_vMovieInfo.empty()) && (m_movieSelectionHandler != NULL);
-	sprintf(cnt, "%d", cYTFeedParser::RELATED);
-	mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_YT_RELATED, enabled, NULL, selector, cnt, CRCInput::RC_red));
-
-	mainMenu.addItem(GenericMenuSeparatorLine);
 
 	std::string search = m_settings.ytsearch;
 	CKeyboardInput stringInput(LOCALE_MOVIEBROWSER_YT_SEARCH, &search);
-	mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_YT_SEARCH, true, search, &stringInput, NULL, CRCInput::RC_green));
-	mainMenu.addItem(new CMenuOptionChooser(LOCALE_MOVIEBROWSER_YT_ORDERBY, &m_settings.ytorderby, YT_ORDERBY_OPTIONS, YT_ORDERBY_OPTION_COUNT, true, NULL, CRCInput::RC_nokey, "", true));
-	sprintf(cnt, "%d", cYTFeedParser::SEARCH);
-	mainMenu.addItem(new CMenuForwarder(LOCALE_EVENTFINDER_START_SEARCH, true, NULL, selector, cnt, CRCInput::RC_yellow));
+	if (!calledExternally) {
+		mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_YT_SEARCH, true, search, &stringInput, NULL, CRCInput::RC_green));
+		mainMenu.addItem(new CMenuOptionChooser(LOCALE_MOVIEBROWSER_YT_ORDERBY, &m_settings.ytorderby, YT_ORDERBY_OPTIONS, YT_ORDERBY_OPTION_COUNT, true, NULL, CRCInput::RC_nokey, "", true));
+		sprintf(cnt, "%d", cYTFeedParser::SEARCH);
+		mainMenu.addItem(new CMenuForwarder(LOCALE_EVENTFINDER_START_SEARCH, true, NULL, selector, cnt, CRCInput::RC_yellow));
+	}
 
 	CYTHistory ytHistory(m_settings, search);
-	if (m_settings.ytsearch_history_size > 0)
-		mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_YT_HISTORY, true, NULL, &ytHistory, "", CRCInput::RC_blue));
+	if (!calledExternally) {
+		if (m_settings.ytsearch_history_size > 0)
+			mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_YT_HISTORY, true, NULL, &ytHistory, "", CRCInput::RC_blue));
 
-	mainMenu.addItem(GenericMenuSeparatorLine);
+		mainMenu.addItem(GenericMenuSeparatorLine);
+	}
 	mainMenu.addItem(new CMenuOptionNumberChooser(LOCALE_MOVIEBROWSER_YT_MAX_RESULTS, &m_settings.ytresults, true, 10, 50, NULL));
 	mainMenu.addItem(new CMenuOptionNumberChooser(LOCALE_MOVIEBROWSER_YT_MAX_HISTORY, &m_settings.ytsearch_history_max, true, 10, 50, NULL));
 
@@ -3524,8 +3543,18 @@ bool CMovieBrowser::showYTMenu()
 	delete selector;
 
 	bool reload = false;
-	printf("MovieBrowser::showYTMenu(): selected: %d\n", select);
 	int newmode = -1;
+	if (rstr != m_settings.ytregion) {
+		m_settings.ytregion = rstr;
+		if (newmode < 0)
+			newmode = m_settings.ytmode;
+		reload = true;
+		printf("change region to %s\n", m_settings.ytregion.c_str());
+	}
+	if (calledExternally)
+		return true;
+
+	printf("MovieBrowser::showYTMenu(): selected: %d\n", select);
 	if (select >= 0) {
 		newmode = select;
 		if (select == cYTFeedParser::RELATED) {
@@ -3565,13 +3594,7 @@ bool CMovieBrowser::showYTMenu()
 			reload = true;
 		}
 	}
-	if (rstr != m_settings.ytregion) {
-		m_settings.ytregion = rstr;
-		if (newmode < 0)
-			newmode = m_settings.ytmode;
-		reload = true;
-		printf("change region to %s\n", m_settings.ytregion.c_str());
-	}
+
 	if (reload) {
 		CHintBox loadBox(LOCALE_MOVIEPLAYER_YTPLAYBACK, g_Locale->getText(LOCALE_MOVIEBROWSER_SCAN_FOR_MOVIES));
 		loadBox.paint();
diff --git a/src/gui/moviebrowser.h b/src/gui/moviebrowser.h
index ba8568ce0..0cf21f829 100644
--- a/src/gui/moviebrowser.h
+++ b/src/gui/moviebrowser.h
@@ -354,7 +354,7 @@ class CMovieBrowser : public CMenuTarget
 		std::vector<MI_MOVIE_INFO> yt_completed;
 		std::vector<MI_MOVIE_INFO> yt_failed;
 		void loadYTitles(int mode, std::string search = "", std::string id = "");
-		bool showYTMenu(void);
+		bool showYTMenu(bool calledExternally = false);
 		void refreshYTMenu();
 
 	public:  // Functions //////////////////////////////////////////////////////////7
@@ -430,7 +430,7 @@ class CMovieBrowser : public CMenuTarget
 		void getStorageInfo(void); // P3
 
 		///// Menu ////////////////////////////////////
-		bool showMenu(MI_MOVIE_INFO* movie_info, bool calledExternally = false); // P2
+		bool showMenu(bool calledExternally = false);
 		int showMovieInfoMenu(MI_MOVIE_INFO* movie_info); // P2
 		int  showStartPosSelectionMenu(void); // P2
 
diff --git a/src/system/locals.h b/src/system/locals.h
index 4a7e97367..699b40583 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -915,6 +915,7 @@ typedef enum
 	LOCALE_MENU_CANCEL,
 	LOCALE_MENU_HINT_A_PIC,
 	LOCALE_MENU_HINT_APLAY,
+	LOCALE_MENU_HINT_APLAY_SETUP,
 	LOCALE_MENU_HINT_AUDIO,
 	LOCALE_MENU_HINT_AUDIO_ADJUST_VOL_AC3,
 	LOCALE_MENU_HINT_AUDIO_ADJUST_VOL_CLEAR,
@@ -1131,6 +1132,7 @@ typedef enum
 	LOCALE_MENU_HINT_MISC_GENERAL,
 	LOCALE_MENU_HINT_MISC_ZAPIT,
 	LOCALE_MENU_HINT_MOVIE,
+	LOCALE_MENU_HINT_MOVIEBROWSER_SETUP,
 	LOCALE_MENU_HINT_MOVIEPLAYER_PLUGIN,
 	LOCALE_MENU_HINT_NET_BROADCAST,
 	LOCALE_MENU_HINT_NET_DHCP,
@@ -1182,6 +1184,7 @@ typedef enum
 	LOCALE_MENU_HINT_PERSONALIZE,
 	LOCALE_MENU_HINT_PICTUREVIEWER_DEFDIR,
 	LOCALE_MENU_HINT_PICTUREVIEWER_SCALING,
+	LOCALE_MENU_HINT_PICTUREVIEWER_SETUP,
 	LOCALE_MENU_HINT_PICTUREVIEWER_SLIDE_TIME,
 	LOCALE_MENU_HINT_PICVIEW,
 	LOCALE_MENU_HINT_PLUGIN_TYPE_GAMES,
@@ -1390,6 +1393,7 @@ typedef enum
 	LOCALE_MENU_HINT_WEBTV_SETUP,
 	LOCALE_MENU_HINT_WINDOW_SIZE,
 	LOCALE_MENU_HINT_YTPLAY,
+	LOCALE_MENU_HINT_YTPLAY_SETUP,
 	LOCALE_MENU_HINT_ZAP_CYCLE,
 	LOCALE_MENU_NEXT,
 	LOCALE_MESSAGEBOX_BACK,
diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h
index 6a0230a01..baa00f4a2 100644
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -915,6 +915,7 @@ const char * locale_real_names[] =
 	"menu.cancel",
 	"menu.hint_a_pic",
 	"menu.hint_aplay",
+	"menu.hint_aplay_setup",
 	"menu.hint_audio",
 	"menu.hint_audio_adjust_vol_ac3",
 	"menu.hint_audio_adjust_vol_clear",
@@ -1131,6 +1132,7 @@ const char * locale_real_names[] =
 	"menu.hint_misc_general",
 	"menu.hint_misc_zapit",
 	"menu.hint_movie",
+	"menu.hint_moviebrowser_setup",
 	"menu.hint_movieplayer_plugin",
 	"menu.hint_net_broadcast",
 	"menu.hint_net_dhcp",
@@ -1182,6 +1184,7 @@ const char * locale_real_names[] =
 	"menu.hint_personalize",
 	"menu.hint_pictureviewer_defdir",
 	"menu.hint_pictureviewer_scaling",
+	"menu.hint_pictureviewer_setup",
 	"menu.hint_pictureviewer_slide_time",
 	"menu.hint_picview",
 	"menu.hint_plugin_type_games",
@@ -1390,6 +1393,7 @@ const char * locale_real_names[] =
 	"menu.hint_webtv_setup",
 	"menu.hint_window_size",
 	"menu.hint_ytplay",
+	"menu.hint_ytplay_setup",
 	"menu.hint_zap_cycle",
 	"menu.next",
 	"messagebox.back",