git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
some fixes on the subservices quickzapper
[enigma2.git]
/
lib
/
python
/
Components
/
PerServiceDisplay.py
diff --git
a/lib/python/Components/PerServiceDisplay.py
b/lib/python/Components/PerServiceDisplay.py
index 821f6d165bc2a070a271761e59de42dd0948b5a2..27f151715e182c81bb9ff628ee466785fc9f865c 100644
(file)
--- a/
lib/python/Components/PerServiceDisplay.py
+++ b/
lib/python/Components/PerServiceDisplay.py
@@
-5,26
+5,29
@@
from VariableValue import *
from enigma import iPlayableService
from enigma import eLabel, eSlider, eTimer
from enigma import iPlayableService
from enigma import eLabel, eSlider, eTimer
-class PerServiceBase(GUIComponent):
- def __init__(self, navcore, eventmap):
- GUIComponent.__init__(self)
+class PerServiceBase(object):
+ def __init__(self, navcore, eventmap, with_event=False):
self.eventmap = eventmap
self.navcore = navcore
self.eventmap = eventmap
self.navcore = navcore
- self.navcore.event.append(self.event)
+ self.navcore.event.append(self.event
_callback
)
self.poll_timer = eTimer()
self.poll_timer.timeout.get().append(self.poll)
self.poll_timer = eTimer()
self.poll_timer.timeout.get().append(self.poll)
+ self.with_event = with_event
# start with stopped state, so simulate that
# start with stopped state, so simulate that
- self.event(iPlayableService.evEnd)
+ self.event
_callback
(iPlayableService.evEnd)
def destroy(self):
def destroy(self):
- self.navcore.event.remove(self.event)
+ self.navcore.event.remove(self.event
_callback
)
- def event(self, ev):
+ def event
_callback
(self, ev):
# loop up if we need to handle this event
if self.eventmap.has_key(ev):
# call handler
# loop up if we need to handle this event
if self.eventmap.has_key(ev):
# call handler
- self.eventmap[ev]()
+ if self.with_event:
+ self.eventmap[ev](ev)
+ else:
+ self.eventmap[ev]()
def enablePolling(self, interval=60000):
if interval:
def enablePolling(self, interval=60000):
if interval:
@@
-38,21
+41,20
@@
class PerServiceBase(GUIComponent):
def poll(self):
pass
def poll(self):
pass
-class PerServiceDisplay(PerServiceBase, VariableText):
+class PerServiceDisplay(PerServiceBase, VariableText
, GUIComponent
):
"""Mixin for building components which display something which changes on navigation events, for example "service name" """
def __init__(self, navcore, eventmap):
"""Mixin for building components which display something which changes on navigation events, for example "service name" """
def __init__(self, navcore, eventmap):
+ GUIComponent.__init__(self)
VariableText.__init__(self)
PerServiceBase.__init__(self, navcore, eventmap)
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)
def __init__(self, navcore, eventmap):
GUIComponent.__init__(self)
VariableValue.__init__(self)
+ PerServiceBase.__init__(self, navcore, eventmap)
self.eventmap = eventmap
self.navcore = navcore
self.navcore.event.append(self.event)
self.eventmap = eventmap
self.navcore = navcore
self.navcore.event.append(self.event)
@@
-60,7
+62,4
@@
class PerServiceDisplayProgress(GUIComponent, VariableValue, PerServiceBase):
# start with stopped state, so simulate that
self.event(iPlayableService.evEnd)
# 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