use screen.skin_summary if defined as summary skin

[enigma2.git] / lib / python / Screens / SimpleSummary.py

diff --git a/lib/python/Screens/SimpleSummary.py b/lib/python/Screens/SimpleSummary.py
index f4502a7628bdea84d5a2f3dce951ba9e05adb1cb..5f76f16f9f40c5ae2855f755579050affe93c9e5 100644 (file)
--- a/lib/python/Screens/SimpleSummary.py
+++ b/lib/python/Screens/SimpleSummary.py
@@ -1,19 +1,30 @@
 from Screens.Screen import Screen
-from Components.Sources.Clock import Clock
+from Components.Sources.Source import ObsoleteSource
 
 class SimpleSummary(Screen):
        skin = """
        <screen position="0,0" size="132,64">
-               <widget name="Clock" position="50,46" size="82,18" font="Regular;16">
+               <widget source="global.CurrentTime" render="Label" position="56,46" size="82,18" font="Regular;16">
                        <convert type="ClockToText">WithSeconds</convert>
                </widget>
-               <widget name="Title" position="0,4" size="132,42" font="Regular;18" />
+               <widget name="Title" position="6,4" size="120,42" font="Regular;18" />
        </screen>"""
-       def __init__(self, session, root_screen):
+       def __init__(self, session, parent):
                from Components.Label import Label
-               Screen.__init__(self, session)
-               self["Clock"] = Clock()
-               self["Title"] = Label(root_screen.title)
+               Screen.__init__(self, session, parent = parent)
+
+               names = parent.skinName
+               if not isinstance(names, list):
+                 names = [names]
+
+               self.skinName = [ x + "_summary" for x in names ]
+               self.skinName.append("SimpleSummary")
+
+               # if parent has a "skin_summary" defined, use that as default
+               self.skin = parent.__dict__.get("skin_summary", self.skin)
+
+               self["Clock"] = ObsoleteSource(new_source = "global.CurrentTime", removal_date = "2008-01")
+               self["Title"] = Label(parent.title or "")
 
        def setTitle(self, title):
                self["Title"].setText(title)