From: ghost <andreas.monzner@multimedia-labs.de>
Date: Mon, 15 Nov 2010 18:20:05 +0000 (+0100)
Subject: Merge branch 'bug_618_fix_display_recording_indication'
X-Git-Tag: 3.0.1~3^2~2
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/b3f896da795632d0f8c17d0a64108d4e5a53a349?hp=447f15a477f3f7b8016074750ea245a3d76174a5

Merge branch 'bug_618_fix_display_recording_indication'
---

diff --git a/data/defaults/Dream/Makefile.am b/data/defaults/Dream/Makefile.am
index 1758f67d..ee66c93a 100644
--- a/data/defaults/Dream/Makefile.am
+++ b/data/defaults/Dream/Makefile.am
@@ -15,4 +15,6 @@ dist_install_DATA = \
 	settings.7020hd \
 	settings.7025 \
 	settings.800 \
-	settings.8000
+	settings.8000 \
+	settings.c \
+	settings.t
diff --git a/data/defaults/Dream/dm500hd.info b/data/defaults/Dream/dm500hd.info
index b1b4d53d..9743c1f1 100644
--- a/data/defaults/Dream/dm500hd.info
+++ b/data/defaults/Dream/dm500hd.info
@@ -19,8 +19,28 @@
 				<satellite type="192" />
 			</prerequisites>
 		</file-->
-		<file type="favourites" directory="" name="bouquets.tv" />		
-		<file type="favourites" directory="hdbouquets/" name="userbouquet.favourites.tv" />
+		<file type="favourites" directory="" name="bouquets.tv">
+			<prerequisites>
+				<bcastsystem type="DVB-S" />
+				<satellite type="192" />
+			</prerequisites>
+		</file>
+		<file type="favourites" directory="hdbouquets/" name="userbouquet.favourites.tv">
+			<prerequisites>
+				<bcastsystem type="DVB-S" />
+				<satellite type="192" />
+			</prerequisites>
+		</file>
+		<file type="config" name="settings.c">
+			<prerequisites>
+				<bcastsystem type="DVB-C" />
+			</prerequisites>
+		</file>
+		<file type="config" name="settings.t">
+			<prerequisites>
+				<bcastsystem type="DVB-T" />
+			</prerequisites>
+		</file>
 		<!--file type="package" directory="packages/" name="small-test_1.0_mipsel.ipk" /-->
 	</files>
 </default>
diff --git a/data/defaults/Dream/dm7020hd.info b/data/defaults/Dream/dm7020hd.info
index 3af46795..c0b89452 100644
--- a/data/defaults/Dream/dm7020hd.info
+++ b/data/defaults/Dream/dm7020hd.info
@@ -19,8 +19,28 @@
 				<satellite type="192" />
 			</prerequisites>
 		</file-->
-		<file type="favourites" directory="" name="bouquets.tv" />		
-		<file type="favourites" directory="hdbouquets/" name="userbouquet.favourites.tv" />
+		<file type="favourites" directory="" name="bouquets.tv">
+			<prerequisites>
+				<bcastsystem type="DVB-S" />
+				<satellite type="192" />
+			</prerequisites>
+		</file>
+		<file type="favourites" directory="hdbouquets/" name="userbouquet.favourites.tv">
+			<prerequisites>
+				<bcastsystem type="DVB-S" />
+				<satellite type="192" />
+			</prerequisites>
+		</file>
+		<file type="config" name="settings.c">
+			<prerequisites>
+				<bcastsystem type="DVB-C" />
+			</prerequisites>
+		</file>
+		<file type="config" name="settings.t">
+			<prerequisites>
+				<bcastsystem type="DVB-T" />
+			</prerequisites>
+		</file>
 		<!--file type="package" directory="packages/" name="small-test_1.0_mipsel.ipk" /-->
 	</files>
 </default>
diff --git a/data/defaults/Dream/dm7025.info b/data/defaults/Dream/dm7025.info
index a1585cfe..9201aa17 100644
--- a/data/defaults/Dream/dm7025.info
+++ b/data/defaults/Dream/dm7025.info
@@ -19,8 +19,28 @@
 				<satellite type="192" />
 			</prerequisites>
 		</file-->
-		<file type="favourites" directory="" name="bouquets.tv" />		
-		<file type="favourites" directory="sdbouquets/" name="userbouquet.favourites.tv" />
+		<file type="favourites" directory="" name="bouquets.tv">
+			<prerequisites>
+				<bcastsystem type="DVB-S" />
+				<satellite type="192" />
+			</prerequisites>
+		</file>
+		<file type="favourites" directory="sdbouquets/" name="userbouquet.favourites.tv">
+			<prerequisites>
+				<bcastsystem type="DVB-S" />
+				<satellite type="192" />
+			</prerequisites>
+		</file>
+		<file type="config" name="settings.c">
+			<prerequisites>
+				<bcastsystem type="DVB-C" />
+			</prerequisites>
+		</file>
+		<file type="config" name="settings.t">
+			<prerequisites>
+				<bcastsystem type="DVB-T" />
+			</prerequisites>
+		</file>
 		<!--file type="package" directory="packages/" name="small-test_1.0_mipsel.ipk" /-->
 	</files>
 </default>
diff --git a/data/defaults/Dream/dm800.info b/data/defaults/Dream/dm800.info
index 4793bd85..b91f7a74 100644
--- a/data/defaults/Dream/dm800.info
+++ b/data/defaults/Dream/dm800.info
@@ -19,8 +19,28 @@
 				<satellite type="192" />
 			</prerequisites>
 		</file-->
-		<file type="favourites" directory="" name="bouquets.tv" />		
-		<file type="favourites" directory="hdbouquets/" name="userbouquet.favourites.tv" />
+		<file type="favourites" directory="" name="bouquets.tv">
+			<prerequisites>
+				<bcastsystem type="DVB-S" />
+				<satellite type="192" />
+			</prerequisites>
+		</file>
+		<file type="favourites" directory="hdbouquets/" name="userbouquet.favourites.tv">
+			<prerequisites>
+				<bcastsystem type="DVB-S" />
+				<satellite type="192" />
+			</prerequisites>
+		</file>
+		<file type="config" name="settings.c">
+			<prerequisites>
+				<bcastsystem type="DVB-C" />
+			</prerequisites>
+		</file>
+		<file type="config" name="settings.t">
+			<prerequisites>
+				<bcastsystem type="DVB-T" />
+			</prerequisites>
+		</file>
 		<!--file type="package" directory="packages/" name="small-test_1.0_mipsel.ipk" /-->
 	</files>
 </default>
diff --git a/data/defaults/Dream/dm8000.info b/data/defaults/Dream/dm8000.info
index 2ef2013a..ff60dd57 100644
--- a/data/defaults/Dream/dm8000.info
+++ b/data/defaults/Dream/dm8000.info
@@ -19,8 +19,28 @@
 				<satellite type="192" />
 			</prerequisites>
 		</file-->
-		<file type="favourites" directory="" name="bouquets.tv" />		
-		<file type="favourites" directory="hdbouquets/" name="userbouquet.favourites.tv" />
+		<file type="favourites" directory="" name="bouquets.tv">
+			<prerequisites>
+				<bcastsystem type="DVB-S" />
+				<satellite type="192" />
+			</prerequisites>
+		</file>
+		<file type="favourites" directory="hdbouquets/" name="userbouquet.favourites.tv">
+			<prerequisites>
+				<bcastsystem type="DVB-S" />
+				<satellite type="192" />
+			</prerequisites>
+		</file>
+		<file type="config" name="settings.c">
+			<prerequisites>
+				<bcastsystem type="DVB-C" />
+			</prerequisites>
+		</file>
+		<file type="config" name="settings.t">
+			<prerequisites>
+				<bcastsystem type="DVB-T" />
+			</prerequisites>
+		</file>
 		<!--file type="package" directory="packages/" name="small-test_1.0_mipsel.ipk" /-->
 	</files>
 </default>
diff --git a/data/defaults/Dream/dm800se.info b/data/defaults/Dream/dm800se.info
index 6974b120..2e11cdcb 100644
--- a/data/defaults/Dream/dm800se.info
+++ b/data/defaults/Dream/dm800se.info
@@ -19,8 +19,28 @@
 				<satellite type="192" />
 			</prerequisites>
 		</file-->
-		<file type="favourites" directory="" name="bouquets.tv" />		
-		<file type="favourites" directory="hdbouquets/" name="userbouquet.favourites.tv" />
+		<file type="favourites" directory="" name="bouquets.tv">
+			<prerequisites>
+				<bcastsystem type="DVB-S" />
+				<satellite type="192" />
+			</prerequisites>
+		</file>
+		<file type="favourites" directory="hdbouquets/" name="userbouquet.favourites.tv">
+			<prerequisites>
+				<bcastsystem type="DVB-S" />
+				<satellite type="192" />
+			</prerequisites>
+		</file>
+		<file type="config" name="settings.c">
+			<prerequisites>
+				<bcastsystem type="DVB-C" />
+			</prerequisites>
+		</file>
+		<file type="config" name="settings.t">
+			<prerequisites>
+				<bcastsystem type="DVB-T" />
+			</prerequisites>
+		</file>
 		<!--file type="package" directory="packages/" name="small-test_1.0_mipsel.ipk" /-->
 	</files>
 </default>
diff --git a/data/defaults/Dream/settings.c b/data/defaults/Dream/settings.c
new file mode 100644
index 00000000..72ab9382
--- /dev/null
+++ b/data/defaults/Dream/settings.c
@@ -0,0 +1 @@
+config.tv.lastroot=1:7:1:0:0:0:0:0:0:0:(type == 1) || (type == 17) || (type == 22) || (type == 25) || (type == 134) || (type == 195) ORDER BY name;
diff --git a/data/defaults/Dream/settings.t b/data/defaults/Dream/settings.t
new file mode 100644
index 00000000..72ab9382
--- /dev/null
+++ b/data/defaults/Dream/settings.t
@@ -0,0 +1 @@
+config.tv.lastroot=1:7:1:0:0:0:0:0:0:0:(type == 1) || (type == 17) || (type == 22) || (type == 25) || (type == 134) || (type == 195) ORDER BY name;
diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index d7506e31..44ad6d2a 100755
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -1624,16 +1624,17 @@ class Config(ConfigSubsection):
 		self.pickle_this("config", self.saved_value, result)
 		return ''.join(result)
 
-	def unpickle(self, lines):
+	def unpickle(self, lines, base_file=True):
 		tree = { }
 		for l in lines:
 			if not l or l[0] == '#':
 				continue
 
 			n = l.find('=')
+			name = l[:n]
 			val = l[n+1:].strip()
 
-			names = l[:n].split('.')
+			names = name.split('.')
 #			if val.find(' ') != -1:
 #				val = val[:val.find(' ')]
 
@@ -1644,6 +1645,12 @@ class Config(ConfigSubsection):
 
 			base[names[-1]] = val
 
+			if not base_file: # not the initial config file..
+				#update config.x.y.value when exist
+				configEntry = eval(name)
+				if configEntry is not None:
+					configEntry.value = val
+
 		# we inherit from ConfigSubsection, so ...
 		#object.__setattr__(self, "saved_value", tree["config"])
 		if "config" in tree:
@@ -1655,9 +1662,9 @@ class Config(ConfigSubsection):
 		f.write(text)
 		f.close()
 
-	def loadFromFile(self, filename):
+	def loadFromFile(self, filename, base_file=False):
 		f = open(filename, "r")
-		self.unpickle(f.readlines())
+		self.unpickle(f.readlines(), base_file)
 		f.close()
 
 config = Config()
@@ -1668,7 +1675,7 @@ class ConfigFile:
 
 	def load(self):
 		try:
-			config.loadFromFile(self.CONFIG_FILE)
+			config.loadFromFile(self.CONFIG_FILE, True)
 		except IOError, e:
 			print "unable to load config (%s), assuming defaults..." % str(e)