X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=components.py;h=63e5669e9e0e59af5ade944c976ecfe1b7c996a8;hb=d7d291938c45893e28715fb12ae5b83d334084e9;hp=8115ecf420bd7b9e3bea285bfa705487483585a8;hpb=8ade23537a682d4b0c9709d533b25702bde2ee23;p=vuplus_dvbapp
diff --git a/components.py b/components.py
index 8115ecf..63e5669 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,80 +76,68 @@ 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 = [ ]
-
- 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):
pass
-
+
class VariableText:
"""VariableText can be used for components which have a variable text, based on any widget with setText call"""
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:
@@ -165,39 +156,63 @@ class Clock(HTMLComponent, GUIComponent, VariableText):
self.setText("clock: " + time.asctime())
# 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 +223,8 @@ class Header(HTMLComponent, GUIComponent, VariableText):
def produceHTML(self):
return "