AutoPoller.py: fix missing import

[vuplus_dvbapp-plugin] / autotimer / src / AutoTimerOverview.py

diff --git a/autotimer/src/AutoTimerOverview.py b/autotimer/src/AutoTimerOverview.py
index e46b9a5..dd3ea29 100644 (file)
--- a/autotimer/src/AutoTimerOverview.py
+++ b/autotimer/src/AutoTimerOverview.py
@@ -18,13 +18,10 @@ from Components.ActionMap import HelpableActionMap
 from Components.config import config
 from Components.Sources.StaticText import StaticText
 
-# Plugin
-from AutoTimerComponent import AutoTimerComponent
-
 class AutoTimerOverviewSummary(Screen):
        skin = """
        <screen position="0,0" size="132,64">
-               <widget source="parent.title" render="Label" position="6,4" size="120,21" font="Regular;18" />
+               <widget source="parent.Title" render="Label" position="6,4" size="120,21" font="Regular;18" />
                <widget source="entry" render="Label" position="6,25" size="120,21" font="Regular;16" />
                <widget source="global.CurrentTime" render="Label" position="56,46" size="82,18" font="Regular;16" >
                        <convert type="ClockToText">WithSeconds</convert>
@@ -45,20 +42,20 @@ class AutoTimerOverviewSummary(Screen):
                self.parent.onChangedEntry.remove(self.selectionChanged)
 
        def selectionChanged(self, text):
-               self["entry"].setText(text)
+               self["entry"].text = text
 
 class AutoTimerOverview(Screen, HelpableScreen):
        """Overview of AutoTimers"""
 
        skin = """<screen name="AutoTimerOverview" position="center,center" size="460,280" title="AutoTimer Overview">
-                       <widget name="entries" position="5,5" size="450,225" scrollbarMode="showOnDemand" />
-                       <ePixmap position="0,235" size="140,40" pixmap="skin_default/buttons/green.png" transparent="1" alphatest="on" />
-                       <ePixmap position="140,235" size="140,40" pixmap="skin_default/buttons/yellow.png" transparent="1" alphatest="on" />
-                       <ePixmap position="280,235" size="140,40" pixmap="skin_default/buttons/blue.png" transparent="1" alphatest="on" />
-                       <ePixmap position="422,245" zPosition="1" size="35,25" pixmap="skin_default/buttons/key_menu.png" alphatest="on" />
-                       <widget source="key_green" render="Label" position="0,235" zPosition="1" size="140,40" valign="center" halign="center" font="Regular;21" transparent="1" foregroundColor="white" shadowColor="black" shadowOffset="-1,-1" />
-                       <widget source="key_yellow" render="Label" position="140,235" zPosition="1" size="140,40" valign="center" halign="center" font="Regular;21" transparent="1" foregroundColor="white" shadowColor="black" shadowOffset="-1,-1" />
-                       <widget source="key_blue" render="Label" position="280,235" zPosition="1" size="140,40" valign="center" halign="center" font="Regular;21" transparent="1" foregroundColor="white" shadowColor="black" shadowOffset="-1,-1" />
+                       <ePixmap position="0,0" size="140,40" pixmap="skin_default/buttons/green.png" transparent="1" alphatest="on" />
+                       <ePixmap position="140,0" size="140,40" pixmap="skin_default/buttons/yellow.png" transparent="1" alphatest="on" />
+                       <ePixmap position="280,0" size="140,40" pixmap="skin_default/buttons/blue.png" transparent="1" alphatest="on" />
+                       <ePixmap position="422,10" zPosition="1" size="35,25" pixmap="skin_default/buttons/key_menu.png" alphatest="on" />
+                       <widget source="key_green" render="Label" position="0,0" zPosition="1" size="140,40" valign="center" halign="center" font="Regular;21" transparent="1" foregroundColor="white" shadowColor="black" shadowOffset="-1,-1" />
+                       <widget source="key_yellow" render="Label" position="140,0" zPosition="1" size="140,40" valign="center" halign="center" font="Regular;21" transparent="1" foregroundColor="white" shadowColor="black" shadowOffset="-1,-1" />
+                       <widget source="key_blue" render="Label" position="280,0" zPosition="1" size="140,40" valign="center" halign="center" font="Regular;21" transparent="1" foregroundColor="white" shadowColor="black" shadowOffset="-1,-1" />
+                       <widget name="entries" position="5,45" size="450,225" scrollbarMode="showOnDemand" />
                </screen>"""
 
        def __init__(self, session, autotimer):
@@ -80,7 +77,6 @@ class AutoTimerOverview(Screen, HelpableScreen):
 
                # Summary
                self.onChangedEntry = []
-               self["title"] = StaticText()
                self["entries"].onSelectionChanged.append(self.selectionChanged)
 
                # Define Actions
@@ -107,12 +103,8 @@ class AutoTimerOverview(Screen, HelpableScreen):
 
                self.onLayoutFinish.append(self.setCustomTitle)
 
-       def setTitle(self, title):
-               Screen.setTitle(self, title)
-               self["title"].setText(title)
-
        def setCustomTitle(self):
-               self.setTitle(_("AutoTimer Overview"))
+               self.setTitle(_("AutoTimer overview"))
 
        def createSummary(self):
                return AutoTimerOverviewSummary
@@ -236,7 +228,7 @@ class AutoTimerOverview(Screen, HelpableScreen):
                ret = ret and ret[1]
                if ret:
                        if ret == "preview":
-                               total, new, modified, timers = self.autotimer.parseEPG(simulateOnly = True)
+                               total, new, modified, timers, conflicts = self.autotimer.parseEPG(simulateOnly = True)
                                self.session.open(
                                        AutoTimerPreview,
                                        timers
@@ -251,7 +243,8 @@ class AutoTimerOverview(Screen, HelpableScreen):
                                        newTimer
                                )
                        elif ret == "import_epg":
-                               self.session.open(
+                               self.session.openWithCallback(
+                                       self.refresh,
                                        AutoTimerChannelSelection,
                                        self.autotimer
                                )