X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2590d97005eecab111a4bf8476da9eb1c700654c..18ee5e9c8a01b3ddd899a6aeea40ab0a6ce3da7d:/components.py diff --git a/components.py b/components.py index 76423387..abf25f20 100644 --- a/components.py +++ b/components.py @@ -22,18 +22,21 @@ class HTMLSkin: class GUISkin: def __init__(self): - self.data = { } + pass def createGUIScreen(self, parent): for (name, val) in self.items(): - self.data[name] = { } - val.GUIcreate(self.data[name], parent, None) + if isinstance(val, GUIComponent): + val.GUIcreate(parent, None) def deleteGUIScreen(self): for (name, val) in self.items(): - w = self.data[name]["instance"] - val.GUIdelete(self.data[name]) - del self.data[name] + if isinstance(val, GUIComponent): + val.GUIdelete() + try: + val.fix() + except: + pass # note: you'll probably run into this assert. if this happens, don't panic! # yes, it's evil. I told you that programming in python is just fun, and @@ -60,7 +63,7 @@ class GUISkin: # way of having refcounted objects. So it must be in python.) # # It could be possible that you're calling deleteGUIscreen trough a call of - # a PSignal. For example, you could try to call session.close() in response + # a PSignal. For example, you could try to call screen.doClose() in response # to a Button::click. This will fail. (It wouldn't work anyway, as you would # remove a dialog while running it. It never worked - enigma1 just set a # per-mainloop variable on eWidget::close() to leave the exec()...) @@ -73,43 +76,21 @@ class GUISkin: # If you can't help yourself, just ask me. I'll be glad to help you out. # Sorry for not keeping this code foolproof. I really wanted to archive # that, but here I failed miserably. All I could do was to add this assert. - assert sys.getrefcount(w) == 2, "too many refs hold to " + str(w) +# assert sys.getrefcount(w) == 2, "too many refs hold to " + str(w) def close(self): self.deleteGUIScreen() - del self.data - -# note: components can be used in multiple screens, so we have kind of -# two contexts: first the per-component one (self), then the per-screen (i.e.: -# per eWidget one), called "priv". In "priv", for example, the instance -# of the eWidget is stored. - -# GUI components have a "notifier list" of associated eWidgets to one component -# (as said - one component instance can be used at multiple screens) class GUIComponent: """ GUI component """ def __init__(self): - self.notifier = [ ] + pass + + def execBegin(self): + pass - def GUIcreate(self, priv, parent, skindata): - i = self.GUIcreateInstance(self, parent, skindata) - priv["instance"] = i - self.notifier.append(i) - try: - self.notifierAdded(i) - except: - pass - - # GUIdelete must delete *all* references to the current component! - def GUIdelete(self, priv): - g = priv["instance"] - self.notifier.remove(g) - self.GUIdeleteInstance(g) - del priv["instance"] - - def GUIdeleteInstance(self, priv): + def execEnd(self): pass class VariableText: @@ -117,36 +98,52 @@ class VariableText: def __init__(self): self.message = "" + self.instance = None - def notifierAdded(self, notifier): - notifier.setText(self.message) - def setText(self, text): - if self.message != text: - self.message = text - for x in self.notifier: - x.setText(self.message) + self.message = text + if self.instance: + self.instance.setText(self.message) def getText(self): return self.message + + def GUIcreate(self, parent, skindata): + self.instance = self.createWidget(parent, skindata) + self.instance.setText(self.message) + + def GUIdelete(self): + self.removeWidget(self.instance) + del self.instance + + def removeWidget(self, instance): + pass class VariableValue: """VariableValue can be used for components which have a variable value (like eSlider), based on any widget with setValue call""" def __init__(self): self.value = 0 + self.instance = None - def notifierAdded(self, notifier): - notifier.setValue(self.value) - def setValue(self, value): - if self.value != value: - self.value = value - for x in self.notifier: - x.setValue(self.value) + self.value = value + if self.instance: + self.instance.setValue(self.value) def getValue(self): return self.value + + def GUIcreate(self, parent, skindata): + self.instance = self.createWidget(parent, skindata) + self.instance.setValue(self.value) + + def GUIdelete(self): + self.removeWidget(self.instance) + del self.instance + + def removeWidget(self, instance): + pass # now some "real" components: @@ -162,42 +159,67 @@ class Clock(HTMLComponent, GUIComponent, VariableText): # "funktionalitaet" def doClock(self): - self.setText("clock: " + time.asctime()) + t = time.localtime() + self.setText("%2d:%02d:%02d" % (t[3], t[4], t[5])) # realisierung als GUI - def GUIcreateInstance(self, priv, parent, skindata): - g = eLabel(parent) - return g + def createWidget(self, parent, skindata): + return eLabel(parent) + + def removeWidget(self, w): + del self.clockTimer # ...und als HTML: def produceHTML(self): return self.getText() - + class Button(HTMLComponent, GUIComponent, VariableText): - def __init__(self, text=""): + def __init__(self, text="", onClick = [ ]): GUIComponent.__init__(self) VariableText.__init__(self) self.setText(text) - self.onClick = [ ] + self.onClick = onClick def push(self): for x in self.onClick: x() return 0 -# html: + def disable(self): +# self.instance.hide() + pass + + def enable(self): +# self.instance.show() + pass + +# html: def produceHTML(self): return "\n" # GUI: - def GUIcreateInstance(self, priv, parent, skindata): + def createWidget(self, parent, skindata): g = eButton(parent) g.selected.get().append(self.push) return g + + def removeWidget(self, w): + w.selected.get().remove(self.push) + +class Label(HTMLComponent, GUIComponent, VariableText): + def __init__(self, text=""): + GUIComponent.__init__(self) + VariableText.__init__(self) + self.setText(text) - def GUIdeleteInstance(self, g): - g.selected.get().remove(self.push) +# html: + def produceHTML(self): + return self.getText() +# GUI: + def createWidget(self, parent, skindata): + return eLabel(parent) + class Header(HTMLComponent, GUIComponent, VariableText): def __init__(self, message): @@ -208,9 +230,8 @@ class Header(HTMLComponent, GUIComponent, VariableText): def produceHTML(self): return "

" + self.getText() + "

\n" - def GUIcreateInstance(self, priv, parent, skindata): + def createWidget(self, parent, skindata): g = eLabel(parent) - g.setText(self.message) return g class VolumeBar(HTMLComponent, GUIComponent, VariableValue): @@ -219,12 +240,22 @@ class VolumeBar(HTMLComponent, GUIComponent, VariableValue): GUIComponent.__init__(self) VariableValue.__init__(self) - def GUIcreateInstance(self, priv, parent, skindata): + def createWidget(self, parent, skindata): g = eSlider(parent) g.setRange(0, 100) return g + +# a general purpose progress bar +class ProgressBar(HTMLComponent, GUIComponent, VariableValue): + def __init__(self): + GUIComponent.__init__(self) + VariableValue.__init__(self) - + def createWidget(self, parent, skindata): + g = eSlider(parent) + g.setRange(0, 100) + return g + class MenuList(HTMLComponent, GUIComponent): def __init__(self, list): GUIComponent.__init__(self) @@ -234,10 +265,186 @@ class MenuList(HTMLComponent, GUIComponent): def getCurrent(self): return self.l.getCurrentSelection() - def GUIcreateInstance(self, priv, parent, skindata): - g = eListbox(parent) - g.setContent(self.l) + def GUIcreate(self, parent, skindata): + self.instance = eListbox(parent) + self.instance.setContent(self.l) + + def GUIdelete(self): + self.instance.setContent(None) + del self.instance + +class ServiceList(HTMLComponent, GUIComponent): + def __init__(self): + GUIComponent.__init__(self) + self.l = eListboxServiceContent() + + def getCurrent(self): + r = eServiceReference() + self.l.getCurrent(r) + return r + + def GUIcreate(self, parent, skindata): + self.instance = eListbox(parent) + self.instance.setContent(self.l) + + def GUIdelete(self): + del self.instance + + def setRoot(self, root): + self.l.setRoot(root) + + # mark stuff + def clearMarked(self): + self.l.clearMarked() + + def isMarked(self, ref): + return self.l.isMarked(ref) + + def addMarked(self, ref): + self.l.addMarked(ref) + + def removeMarked(self, ref): + self.l.removeMarked(ref) + +class ServiceScan: + + Idle = 1 + Running = 2 + Done = 3 + Error = 4 + + def scanStatusChanged(self): + if self.state == self.Running: + self.progressbar.setValue(self.scan.getProgress()) + if self.scan.isDone(): + self.state = self.Done + else: + self.text.setText("scan in progress - %d %% done!\n%d services found!" % (self.scan.getProgress(), self.scan.getNumServices())) + + if self.state == self.Done: + self.text.setText("scan done!") + + if self.state == self.Error: + self.text.setText("ERROR - failed to scan!") + + def __init__(self, progressbar, text): + self.progressbar = progressbar + self.text = text + self.scan = eComponentScan() + self.state = self.Idle + self.scanStatusChanged() + + def execBegin(self): + self.scan.statusChanged.get().append(self.scanStatusChanged) + if self.scan.start(): + self.state = self.Error + else: + self.state = self.Running + self.scanStatusChanged() + + def execEnd(self): + self.scan.statusChanged.get().remove(self.scanStatusChanged) + if not self.isDone(): + print "*** warning *** scan was not finished!" + + def isDone(self): + return self.state == self.Done + +class ActionMap: + def __init__(self, contexts = [ ], actions = { }, prio=0): + self.actions = actions + self.contexts = contexts + self.prio = prio + self.p = eActionMapPtr() + eActionMap.getInstance(self.p) + + def execBegin(self): + for ctx in self.contexts: + self.p.bindAction(ctx, self.prio, self.action) + + def execEnd(self): + for ctx in self.contexts: + self.p.unbindAction(ctx, self.action) + + def action(self, context, action): + print " ".join(("action -> ", context, action)) + try: + self.actions[action]() + except KeyError: + print "unknown action %s/%s! typo in keymap?" % (context, action) + +class PerServiceDisplay(GUIComponent, VariableText): + """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) + self.eventmap = eventmap + navcore.m_event.get().append(self.event) + self.navcore = navcore + + # start with stopped state, so simulate that + self.event(pNavigation.evStopService) + + def event(self, ev): + # loop up if we need to handle this event + if self.eventmap.has_key(ev): + # call handler + self.eventmap[ev]() + + def createWidget(self, parent, skindata): + # by default, we use a label to display our data. + g = eLabel(parent) return g + +class EventInfo(PerServiceDisplay): + Now = 0 + Next = 1 + Now_Duration = 2 + Next_Duration = 3 + + def __init__(self, navcore, now_or_next): + # listen to evUpdatedEventInfo and evStopService + # note that evStopService will be called once to establish a known state + PerServiceDisplay.__init__(self, navcore, + { + pNavigation.evUpdatedEventInfo: self.ourEvent, + pNavigation.evStopService: self.stopEvent + }) + self.now_or_next = now_or_next + + def ourEvent(self): + info = iServiceInformationPtr() + service = iPlayableServicePtr() + + if not self.navcore.getCurrentService(service): + if not service.info(info): + ev = eServiceEventPtr() + info.getEvent(ev, self.now_or_next & 1) + if self.now_or_next & 2: + self.setText("%d min" % (ev.m_duration / 60)) + else: + self.setText(ev.m_event_name) + print "new event info in EventInfo! yeah!" + + def stopEvent(self): + self.setText("waiting for event data..."); + +class ServiceName(PerServiceDisplay): + def __init__(self, navcore): + PerServiceDisplay.__init__(self, navcore, + { + pNavigation.evNewService: self.newService, + pNavigation.evStopService: self.stopEvent + }) + + def newService(self): + info = iServiceInformationPtr() + service = iPlayableServicePtr() + + if not self.navcore.getCurrentService(service): + if not service.info(info): + self.setText("no name known, but it should be here :)") - def GUIdeleteInstance(self, g): - g.setContent(None) + def stopEvent(self): + self.setText("");