From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Tue, 15 Jul 2008 09:33:50 +0000 (+0000)
Subject: display "audio" instead of "timeshift" in the infobar next to the yellow knob for... 
X-Git-Tag: 2.6.0~1031
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/13e3018673a588fe5225bc1c3fe893593a9eadb3

display "audio" instead of "timeshift" in the infobar next to the yellow knob for new rc boxes
---

diff --git a/data/skin.xml b/data/skin.xml
index a05128f5..f1e25496 100644
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -204,10 +204,20 @@
 		<widget source="TimeshiftPossible" render="Pixmap" pixmap="skin_default/buttons/button_yellow.png" position="440,130" zPosition="1" size="15,16" alphatest="on">
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<eLabel text="Timeshift" position="460,130" size="85,22" font="Regular;16" foregroundColor="#7f848d" backgroundColor="#182946" transparent="1" />
+		<widget source="ShowTimeshiftOnYellow" render="FixedLabel" text="Timeshift" position="460,130" zPosition="1" size="85,22" font="Regular;16" foregroundColor="#7f848d" backgroundColor="#182946" shadowOffset="-1,-1" transparent="1">
+			<convert type="ConditionalShowHide" />
+		</widget>
 		<widget source="TimeshiftPossible" render="FixedLabel" text="Timeshift" position="460,130" zPosition="1" size="85,22" font="Regular;16" backgroundColor="#182946" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1">
 			<convert type="ConditionalShowHide" />
 		</widget>
+		
+		<!-- Yellow button (used for audio on boxes with new rc?) -->
+		<widget source="ShowAudioOnYellow" render="Pixmap" pixmap="skin_default/buttons/button_yellow.png" position="440,130" zPosition="1" size="15,16" alphatest="on">
+			<convert type="ConditionalShowHide" />
+		</widget>
+		<widget source="ShowAudioOnYellow" render="FixedLabel" text="Audio" position="460,130" zPosition="1" size="85,22" font="Regular;16" backgroundColor="#182946" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1">
+			<convert type="ConditionalShowHide" />
+		</widget>
 		<!-- Blue button (is extensions available?) -->
 		<ePixmap pixmap="skin_default/buttons/button_blue_off.png" position="545,130" size="15,16" alphatest="on" />
 		<widget source="ExtensionsAvailable" render="Pixmap" pixmap="skin_default/buttons/button_blue.png" position="545,130" zPosition="1" size="15,16" alphatest="on">
diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 4526a0c6..718c2d54 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -1732,7 +1732,9 @@ class InfoBarAdditionalInfo:
 	def __init__(self):
 
 		self["RecordingPossible"] = Boolean(fixed=harddiskmanager.HDDCount() > 0)
-		self["TimeshiftPossible"] = self["RecordingPossible"]
+		self["TimeshiftPossible"] = Boolean(fixed=(harddiskmanager.HDDCount() > 0 and config.misc.rcused.value == 1))
+		self["ShowTimeshiftOnYellow"] = Boolean(fixed=(not config.misc.rcused.value == 0))
+		self["ShowAudioOnYellow"] = Boolean(fixed=config.misc.rcused.value == 0)
 		self["ExtensionsAvailable"] = Boolean(fixed=1)
 
 class InfoBarNotifications:
diff --git a/mytest.py b/mytest.py
index 8c900c18..0c448d70 100644
--- a/mytest.py
+++ b/mytest.py
@@ -72,10 +72,11 @@ from Components.PluginComponent import plugins
 
 profile("LOAD:Wizard")
 from Screens.Wizard import wizardManager
+from Screens.DefaultWizard import *
 from Screens.ImageWizard import *
 from Screens.StartWizard import *
-from Screens.DefaultWizard import *
 from Screens.TutorialWizard import *
+import Screens.Rc
 from Tools.BoundFunction import boundFunction
 from Plugins.Plugin import PluginDescriptor