use session.CurrentService in PVRState
authorFelix Domke <tmbinc@elitedvb.net>
Sun, 7 Oct 2007 09:10:23 +0000 (09:10 +0000)
committerFelix Domke <tmbinc@elitedvb.net>
Sun, 7 Oct 2007 09:10:23 +0000 (09:10 +0000)
data/skin_default.xml
lib/python/Screens/PVRState.py

index 06aa859..18db44d 100644 (file)
@@ -787,7 +787,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
        <!-- Timeshift state -->
        <screen name="TimeshiftState" flags="wfNoBorder" position="70,70" size="150,60" backgroundColor="transpBlack" zPosition="2">
                <widget name="state" position="0,0" size="150,30" font="Regular;25" halign="center" backgroundColor="transpBlack" />
        <!-- Timeshift state -->
        <screen name="TimeshiftState" flags="wfNoBorder" position="70,70" size="150,60" backgroundColor="transpBlack" zPosition="2">
                <widget name="state" position="0,0" size="150,30" font="Regular;25" halign="center" backgroundColor="transpBlack" />
-               <widget source="CurrentService" render="Label" position="0,30" size="150,30" font="Regular;25" halign="center" backgroundColor="transpBlack" foregroundColor="white" >
+               <widget source="session.CurrentService" render="Label" position="0,30" size="150,30" font="Regular;25" halign="center" backgroundColor="transpBlack" foregroundColor="white" >
                        <convert type="ServicePosition">Remaining</convert>
                </widget>
        </screen>
                        <convert type="ServicePosition">Remaining</convert>
                </widget>
        </screen>
index f7b2abf..8b90c42 100644 (file)
@@ -1,16 +1,12 @@
 from Screen import Screen
 
 from Components.Label import Label
 from Screen import Screen
 
 from Components.Label import Label
-from Components.Sources.CurrentService import CurrentService
 
 class PVRState(Screen):
        def __init__(self, session):
                Screen.__init__(self, session)
 
 class PVRState(Screen):
        def __init__(self, session):
                Screen.__init__(self, session)
-               
                self["state"] = Label(text="")
 
 class TimeshiftState(PVRState):
        def __init__(self, session):
                PVRState.__init__(self, session)
                self["state"] = Label(text="")
 
 class TimeshiftState(PVRState):
        def __init__(self, session):
                PVRState.__init__(self, session)
-               
-               self["CurrentService"] = CurrentService(self.session.nav)