From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Tue, 15 Jul 2008 09:49:20 +0000 (+0000)
Subject: disable instant record by pressing red button with new rcs
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=7c01e1138eaef94a506371c3eccf66329af39e9b;ds=sidebyside

disable instant record by pressing red button with new rcs
---

diff --git a/data/keymap.xml b/data/keymap.xml
index e83b851..3f8e681 100644
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -89,7 +89,9 @@
 		<device name="dreambox ir keyboard">
 			<key id="KEY_RECORD" mapto="instantRecord" flags="m" />
 		</device>
-		<key id="KEY_RED" mapto="instantRecord" flags="b" />
+		<device name="dreambox remote control (native)">
+			<key id="KEY_RED" mapto="instantRecord" flags="b" />
+		</device>
 	</map>
 
 	<map context="InfobarExtensions">
diff --git a/data/skin.xml b/data/skin.xml
index f1e2549..472994d 100644
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -184,7 +184,10 @@
 		<widget source="RecordingPossible" render="Pixmap" pixmap="skin_default/buttons/button_red.png" position="212,130" zPosition="1" size="15,16" alphatest="on">
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<eLabel text="Record" position="232,130" size="80,22" font="Regular;16" foregroundColor="#7f848d" backgroundColor="#182946" transparent="1" />
+		<!--eLabel text="Record" position="232,130" size="80,22" font="Regular;16" foregroundColor="#7f848d" backgroundColor="#182946" transparent="1" /-->
+		<widget source="ShowRecordOnRed" render="FixedLabel" text="Record" position="232,130" zPosition="1" size="80,22" font="Regular;16" foregroundColor="#7f848d" backgroundColor="#182946" transparent="1">
+			<convert type="ConditionalShowHide" />
+		</widget>
 		<widget source="RecordingPossible" render="FixedLabel" text="Record" position="232,130" zPosition="1" size="80,22" font="Regular;16" backgroundColor="#182946" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1">
 			<convert type="ConditionalShowHide" />
 		</widget>
diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 718c2d5..428ecbc 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -1731,10 +1731,11 @@ class InfoBarSubserviceSelection:
 class InfoBarAdditionalInfo:
 	def __init__(self):
 
-		self["RecordingPossible"] = Boolean(fixed=harddiskmanager.HDDCount() > 0)
-		self["TimeshiftPossible"] = Boolean(fixed=(harddiskmanager.HDDCount() > 0 and config.misc.rcused.value == 1))
+		self["RecordingPossible"] = Boolean(fixed=harddiskmanager.HDDCount() > 0 and config.misc.rcused.value == 1)
+		self["TimeshiftPossible"] = self["RecordingPossible"]
 		self["ShowTimeshiftOnYellow"] = Boolean(fixed=(not config.misc.rcused.value == 0))
 		self["ShowAudioOnYellow"] = Boolean(fixed=config.misc.rcused.value == 0)
+		self["ShowRecordOnRed"] = Boolean(fixed=config.misc.rcused.value == 1)
 		self["ExtensionsAvailable"] = Boolean(fixed=1)
 
 class InfoBarNotifications: