From: ghost <andreas.monzner@multimedia-labs.de>
Date: Thu, 4 Jun 2009 20:23:53 +0000 (+0200)
Subject: Merge branch 'master' of git.opendreambox.org:/git/enigma2
X-Git-Tag: 2.6.0~263
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/e26b2adba2dad6e9c25196d841657d31e4f21046?hp=b7f07b6052ac2ca6b5e2a2c9e322b26e2c506109

Merge branch 'master' of git.opendreambox.org:/git/enigma2
---

diff --git a/RecordTimer.py b/RecordTimer.py
index e8b76e92..1f65038c 100644
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -356,8 +356,8 @@ class RecordTimerEntry(timer.TimerEntry, object):
 			if self.dirnameHadToFallback:
 				text = '\n'.join((text, _("Please note that the previously selected media could not be accessed and therefore the default directory is being used instead.")))
 
-			# maybe this should be configurable?
-			Notifications.AddPopup(text = text, type = MessageBox.TYPE_INFO, timeout = 3)
+			if config.usage.show_message_when_recording_starts.value:
+				Notifications.AddPopup(text = text, type = MessageBox.TYPE_INFO, timeout = 3)
 
 	# we have record_service as property to automatically subscribe to record service events
 	def setRecordService(self, service):
diff --git a/data/setup.xml b/data/setup.xml
index d8d58369..fe91ba25 100644
--- a/data/setup.xml
+++ b/data/setup.xml
@@ -24,6 +24,7 @@
 			<item level="0" text="Margin before record (minutes)">config.recording.margin_before</item>
 			<item level="0" text="Margin after record">config.recording.margin_after</item>
 			<item level="0" text="Show blinking clock in display during recording">config.usage.blinking_display_clock_during_recording</item>
+			<item level="2" text="Show Message when Recording starts">config.usage.show_message_when_recording_starts</item>
 			<item level="2" text="Load Length of Movies in Movielist">config.usage.load_length_of_movies_in_moviellist</item>
 			<item level="1" text="Show positioner movement">config.usage.showdish</item>
 			<item level="1" text="Enable multiple bouquets">config.usage.multibouquet</item>
diff --git a/lib/python/Components/UsageConfig.py b/lib/python/Components/UsageConfig.py
index 26138f20..6fcab8bc 100644
--- a/lib/python/Components/UsageConfig.py
+++ b/lib/python/Components/UsageConfig.py
@@ -58,6 +58,9 @@ def InitUsageConfig():
 		("5", "DVB-T/-S/-C") ])
 
 	config.usage.blinking_display_clock_during_recording = ConfigYesNo(default = False)
+
+	config.usage.show_message_when_recording_starts = ConfigYesNo(default = True)
+
 	config.usage.load_length_of_movies_in_moviellist = ConfigYesNo(default = True)
 	
 	def TunerTypePriorityOrderChanged(configElement):