add teletext parser

[enigma2.git] / lib / python / Components / PerServiceDisplay.py

diff --git a/lib/python/Components/PerServiceDisplay.py b/lib/python/Components/PerServiceDisplay.py
index 55ef3d18672509e756618b610a058a7fba24f7e5..22305ca94ab8c94fd8dcff70254b458e85000e91 100644 (file)
--- a/lib/python/Components/PerServiceDisplay.py
+++ b/lib/python/Components/PerServiceDisplay.py
@@ -17,6 +17,9 @@ class PerServiceBase(GUIComponent):
                # start with stopped state, so simulate that
                self.event(iPlayableService.evEnd)
 
+       def destroy(self):
+               self.navcore.event.remove(self.event)
+
        def event(self, ev):
                # loop up if we need to handle this event
                if self.eventmap.has_key(ev):
@@ -41,12 +44,9 @@ class PerServiceDisplay(PerServiceBase, VariableText):
                VariableText.__init__(self)
                PerServiceBase.__init__(self, navcore, eventmap)
 
-       def createWidget(self, parent):
-               # by default, we use a label to display our data.
-               g = eLabel(parent)
-               return g
+       GUI_WIDGET = eLabel
 
-class PerServiceDisplayProgress(GUIComponent, VariableValue, PerServiceBase):
+class PerServiceDisplayProgress(PerServiceBase, VariableValue, GUIComponent):
        def __init__(self, navcore, eventmap):
                GUIComponent.__init__(self)
                VariableValue.__init__(self)
@@ -57,7 +57,4 @@ class PerServiceDisplayProgress(GUIComponent, VariableValue, PerServiceBase):
                # start with stopped state, so simulate that
                self.event(iPlayableService.evEnd)
 
-       def createWidget(self, parent):
-               # by default, we use a label to display our data.
-               self.g = eSlider(parent)
-               return self.g
+       GUI_WIDGET = eSlider