From 3c79adcf97b4c2c84ede4212b6ede42c5987db83 Mon Sep 17 00:00:00 2001
From: Andreas Monzner <andreas.monzner@multimedia-labs.de>
Date: Fri, 6 Jan 2006 18:32:06 +0000
Subject: [PATCH] show servicename and clock in radio player

---
 data/skin.xml                          | 16 +++++++++-------
 lib/python/Screens/ChannelSelection.py |  4 ++++
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/data/skin.xml b/data/skin.xml
index aa8874e5..9a4eaa13 100644
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -241,13 +241,15 @@
 			<widget name="key_blue" position="420,0" size="140,40" backgroundColor="blue" font="Regular;21" />
 			<widget name="list" position="0,45" size="560,252" scrollbarMode="showOnDemand" />
 		</screen>
-		<screen name="ServiceInfoWindow" position="90,420" size="560,65">
-			<widget name="Event_Now_StartTime" position="0,0" size="60,22" font="Regular;20" backgroundColor="dark" />
-			<widget name="Event_Next_StartTime" position="0,30" size="60,22" font="Regular;20" backgroundColor="dark" />
-			<widget name="Event_Now" position="80,0" size="380,22" font="Regular;20" backgroundColor="dark" />
-			<widget name="Event_Next" position="80,30" size="380,22" font="Regular;20" backgroundColor="dark" />
-			<widget name="Event_Now_Duration" position="470,0" size="150,26" font="Regular;22" backgroundColor="dark" />
-			<widget name="Event_Next_Duration" position="470,30" size="150,26" font="Regular;22" backgroundColor="dark" />
+		<screen name="ServiceInfoWindow" position="90,420" size="560,95">
+			<widget name="Service_Name" position="0,0" size="400,26" font="Regular;22" backgroundColor="dark" />
+			<widget name="Clock" position="470,0" size="90,26" font="Regular;22" backgroundColor="dark" />
+			<widget name="Event_Now_StartTime" position="0,35" size="60,22" font="Regular;20" backgroundColor="dark" />
+			<widget name="Event_Next_StartTime" position="0,65" size="60,22" font="Regular;20" backgroundColor="dark" />
+			<widget name="Event_Now" position="80,35" size="380,22" font="Regular;20" backgroundColor="dark" />
+			<widget name="Event_Next" position="80,65" size="380,22" font="Regular;20" backgroundColor="dark" />
+			<widget name="Event_Now_Duration" position="470,35" size="150,22" font="Regular;20" backgroundColor="dark" />
+			<widget name="Event_Next_Duration" position="470,65" size="150,22" font="Regular;20" backgroundColor="dark" />
 		</screen>
 		<screen name="SimpleChannelSelection" position="90,98" size="560,417" title="Channel Selection">
 			<widget name="list" position="00,45" size="560,364" scrollbarMode="showOnDemand" />
diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index e9eb8605..d4a1e7ce 100644
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -8,6 +8,8 @@ from Components.config import config, configElement, ConfigSubsection, configTex
 from Screens.FixedMenu import FixedMenu
 from Tools.NumericalTextInput import NumericalTextInput
 from Components.NimManager import nimmanager
+from Components.ServiceName import ServiceName
+from Components.Clock import Clock
 from Components.EventInfo import EventInfo
 
 import xml.dom.minidom
@@ -546,6 +548,8 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit):
 class ServiceInfoWindow(Screen):
 	def __init__(self, session):
 		Screen.__init__(self, session)
+		self["Service_Name"] = ServiceName(self.session.nav)
+		self["Clock"] = Clock()
 		self["Event_Now_StartTime"] = EventInfo(self.session.nav, EventInfo.Now_StartTime)
 		self["Event_Next_StartTime"] = EventInfo(self.session.nav, EventInfo.Next_StartTime)
 		self["Event_Now"] = EventInfo(self.session.nav, EventInfo.Now)
-- 
2.30.2