[Ai.HD] Add dynamic Picons ServiceSelection-screens

4 files changed, 75 insertions, 4 deletions

diff --git a/aihdcontroler/src/comp/valiRefString.py b/aihdcontroler/src/comp/valiRefString.py
new file mode 100644
index 0000000..9f3a470
--- /dev/null
+++ b/aihdcontroler/src/comp/valiRefString.py
@@ -0,0 +1,52 @@
+#######################################################################
+#
+#
+#    ReferenceToString for Dreambox/Enigma-2
+#    Coded by Vali (c)2011
+#    Support: www.dreambox-tools.info
+#
+#
+#  This plugin is licensed under the Creative Commons 
+#  Attribution-NonCommercial-ShareAlike 3.0 Unported License.
+#  To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/3.0/
+#  or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA.
+#
+#  Alternatively, this plugin may be distributed and executed on hardware which
+#  is licensed by Dream Multimedia GmbH.
+#
+#
+#  This plugin is NOT free software. It is open source, you are allowed to
+#  modify it (if you keep the license), but it may not be commercially 
+#  distributed other than under the conditions noted above.
+#
+#
+#######################################################################
+
+from Components.Converter.Converter import Converter
+from Components.Element import cached
+from Screens.InfoBar import InfoBar
+
+class valiRefString(Converter, object):
+	CURRENT = 0
+	EVENT = 1
+	def __init__(self, type):
+		Converter.__init__(self, type)
+		self.CHANSEL = None
+		self.type = {
+				"CurrentRef": self.CURRENT,
+				"ServicelistRef": self.EVENT
+			}[type]
+
+	@cached
+	def getText(self):
+		if (self.type == self.EVENT):
+			return str(self.source.service.toString())
+		elif (self.type == self.CURRENT):
+			if self.CHANSEL == None:
+				self.CHANSEL = InfoBar.instance.servicelist
+			vSrv = self.CHANSEL.servicelist.getCurrent()
+			return str(vSrv.toString())
+		else:
+			return "na"
+
+	text = property(getText)
diff --git a/aihdcontroler/src/data/channelselector-full.xml b/aihdcontroler/src/data/channelselector-full.xml
index d739701..412e426 100644
--- a/aihdcontroler/src/data/channelselector-full.xml
+++ b/aihdcontroler/src/data/channelselector-full.xml
@@ -12,6 +12,9 @@
 		<widget backgroundColor="background" font="Regular;20" foregroundColor="grey" halign="right" position="910,72" render="Label" size="310,22" source="global.CurrentTime" transparent="1">
 			<convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
 		</widget>
+		<widget alphatest="blend" position="845,40" render="Picon" size="100,60" source="ServiceEvent" transparent="1" zPosition="5">
+			<convert type="valiRefString">ServicelistRef</convert>
+		</widget>
 		<widget backgroundColor="background" font="Regular;22" foregroundColor="foreground" halign="left" name="key_red" position="145,645" size="220,26" transparent="1"/>
 		<widget backgroundColor="background" font="Regular;22" foregroundColor="foreground" halign="left" name="key_green" position="435,644" size="220,27" transparent="1"/>
 		<widget backgroundColor="background" font="Regular;22" foregroundColor="foreground" halign="left" name="key_yellow" position="725,645" size="220,26" transparent="1"/>
@@ -51,6 +54,9 @@
 		<widget backgroundColor="background" font="Regular;20" foregroundColor="grey" halign="right" position="910,72" render="Label" size="310,22" source="global.CurrentTime" transparent="1">
 			<convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
 		</widget>
+		<widget alphatest="blend" position="845,40" render="Picon" size="100,60" source="Event" transparent="1" zPosition="5">
+			<convert type="valiRefString">CurrentRef</convert>
+		</widget>
 		<widget backgroundColor="background" font="Regular;22" foregroundColor="foreground" halign="left" name="key_red" position="145,645" size="220,26" transparent="1"/>
 		<widget backgroundColor="background" font="Regular;22" foregroundColor="foreground" halign="left" name="key_green" position="435,644" size="220,27" transparent="1"/>
 		<widget backgroundColor="background" font="Regular;22" foregroundColor="foreground" halign="left" name="key_yellow" position="725,645" size="220,26" transparent="1"/>
@@ -75,6 +81,9 @@
 		<widget backgroundColor="background" font="Regular;20" foregroundColor="grey" halign="right" position="910,72" render="Label" size="310,22" source="global.CurrentTime" transparent="1">
 			<convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
 		</widget>
+		<widget alphatest="blend" position="845,40" render="Picon" size="100,60" source="Title" transparent="1" zPosition="5">
+			<convert type="valiRefString">CurrentRef</convert>
+		</widget>
 		<widget backgroundColor="background" font="Regular;22" foregroundColor="foreground" halign="left" name="key_red" position="145,645" size="220,26" transparent="1"/>
 		<widget backgroundColor="background" font="Regular;22" foregroundColor="foreground" halign="left" name="key_green" position="435,644" size="220,27" transparent="1"/>
 		<widget backgroundColor="background" font="Regular;22" foregroundColor="foreground" halign="left" name="key_yellow" position="725,645" size="220,26" transparent="1"/>
diff --git a/aihdcontroler/src/data/channelselector-pig.xml b/aihdcontroler/src/data/channelselector-pig.xml
index 7e54710..13cd3c7 100644
--- a/aihdcontroler/src/data/channelselector-pig.xml
+++ b/aihdcontroler/src/data/channelselector-pig.xml
@@ -4,10 +4,13 @@
 	<screen backgroundColor="noTransBG" flags="wfNoBorder" name="ChannelSelection" position="0,0" size="1280,720" title="Channel Selection">
 		<ePixmap pixmap="Ai.HD/top_bg.png" position="0,0" size="1280,90"/>
 		<ePixmap pixmap="Ai.HD/bottom_bg.png" position="0,630" size="1280,2"/>
-		<widget backgroundColor="darkgrey" font="Regular;22" position="70,35" render="Label" size="850,50" source="Title" transparent="1" valign="center" zPosition="1"/>
+		<widget backgroundColor="darkgrey" font="Regular;22" position="190,35" render="Label" size="730,50" source="Title" transparent="1" valign="center" zPosition="1"/>
 		<widget backgroundColor="darkgrey" font="Regular;20" halign="right" position="940,35" render="Label" size="270,50" source="global.CurrentTime" transparent="1" valign="center" zPosition="1">
 			<convert type="vhdConvClockToText">LocaleLang:%w %d %m</convert>
 		</widget>
+		<widget alphatest="blend" position="70,30" render="Picon" size="100,60" source="ServiceEvent" transparent="1" zPosition="5">
+			<convert type="valiRefString">ServicelistRef</convert>
+		</widget>
 		<widget backgroundColor="transparent" position="0,90" render="Pig" size="501,282" source="session.VideoPicture" zPosition="1"/>
 		<ePixmap alphatest="on" pixmap="Ai.HD/red.png" position="100,643" size="30,30"/>
 		<ePixmap alphatest="on" pixmap="Ai.HD/green.png" position="390,643" size="30,30"/>
@@ -41,10 +44,13 @@
 	<screen backgroundColor="noTransBG" flags="wfNoBorder" name="EPGSelection" position="0,0" size="1280,720" title="EPG Selection">
 		<ePixmap pixmap="Ai.HD/top_bg.png" position="0,0" size="1280,90"/>
 		<ePixmap pixmap="Ai.HD/bottom_bg.png" position="0,630" size="1280,2"/>
-		<widget backgroundColor="darkgrey" font="Regular;22" position="70,35" render="Label" size="850,50" source="Title" transparent="1" valign="center" zPosition="1"/>
+		<widget backgroundColor="darkgrey" font="Regular;22" position="190,35" render="Label" size="730,50" source="Title" transparent="1" valign="center" zPosition="1"/>
 		<widget backgroundColor="darkgrey" font="Regular;20" halign="right" position="940,35" render="Label" size="270,50" source="global.CurrentTime" transparent="1" valign="center" zPosition="1">
 			<convert type="vhdConvClockToText">LocaleLang:%w %d %m</convert>
 		</widget>
+		<widget alphatest="blend" position="70,30" render="Picon" size="100,60" source="Event" transparent="1" zPosition="5">
+			<convert type="valiRefString">CurrentRef</convert>
+		</widget>
 		<widget backgroundColor="transparent" position="0,90" render="Pig" size="501,282" source="session.VideoPicture" zPosition="1"/>
 		<ePixmap alphatest="on" pixmap="Ai.HD/red.png" position="100,643" size="30,30"/>
 		<ePixmap alphatest="on" pixmap="Ai.HD/green.png" position="390,643" size="30,30"/>
@@ -66,10 +72,13 @@
 	<screen backgroundColor="noTransBG" flags="wfNoBorder" name="EventView" position="0,0" size="1280,720" title="Eventview">
 		<ePixmap pixmap="Ai.HD/top_bg.png" position="0,0" size="1280,90"/>
 		<ePixmap pixmap="Ai.HD/bottom_bg.png" position="0,630" size="1280,2"/>
-		<widget backgroundColor="darkgrey" font="Regular;22" position="70,35" render="Label" size="850,50" source="Title" transparent="1" valign="center" zPosition="1"/>
+		<widget backgroundColor="darkgrey" font="Regular;22" position="190,35" render="Label" size="730,50" source="Title" transparent="1" valign="center" zPosition="1"/>
 		<widget backgroundColor="darkgrey" font="Regular;20" halign="right" position="940,35" render="Label" size="270,50" source="global.CurrentTime" transparent="1" valign="center" zPosition="1">
 			<convert type="vhdConvClockToText">LocaleLang:%w %d %m</convert>
 		</widget>
+		<widget alphatest="blend" position="70,30" render="Picon" size="100,60" source="Title" transparent="1" zPosition="5">
+			<convert type="valiRefString">CurrentRef</convert>
+		</widget>
 		<widget backgroundColor="transparent" position="0,90" render="Pig" size="501,282" source="session.VideoPicture" zPosition="1"/>
 		<ePixmap alphatest="on" pixmap="Ai.HD/red.png" position="100,643" size="30,30"/>
 		<ePixmap alphatest="on" pixmap="Ai.HD/green.png" position="390,643" size="30,30"/>
diff --git a/aihdcontroler/src/plugin.py b/aihdcontroler/src/plugin.py
index f5a9e62..841de9a 100644
--- a/aihdcontroler/src/plugin.py
+++ b/aihdcontroler/src/plugin.py
@@ -86,7 +86,7 @@ class AIHDsetup(ConfigListScreen, Screen):
 		</screen>"""
 
 	def __init__(self, session):
-		self.release = ".release20110128"
+		self.release = ".release20110129"
 		Screen.__init__(self, session)
 		self.session = session
 		self.datei = "/usr/share/enigma2/Ai.HD/skin.xml"
@@ -116,6 +116,7 @@ class AIHDsetup(ConfigListScreen, Screen):
 			system('cp ' + self.komponente + 'vhdRendNextEvent.py /usr/lib/enigma2/python/Components/Renderer/vhdRendNextEvent.py')
 			system('cp ' + self.komponente + 'vhdConvSmartInfo.py /usr/lib/enigma2/python/Components/Converter/vhdConvSmartInfo.py')
 			system('cp ' + self.komponente + 'vhdConvClockToText.py /usr/lib/enigma2/python/Components/Converter/vhdConvClockToText.py')
+			system('cp ' + self.komponente + 'valiRefString.py /usr/lib/enigma2/python/Components/Converter/valiRefString.py')
 			system("touch " + self.datei + self.release)
 
 	def save(self):