git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
this fix has side-effects... so we reverse it which breaks initial status again
[enigma2.git]
/
lib
/
python
/
Components
/
Pixmap.py
diff --git
a/lib/python/Components/Pixmap.py
b/lib/python/Components/Pixmap.py
index b6620d9ace5a8513dc79c053224dada66b77e715..2a54ea9864b8dbba8d814fe6702bbdd635798a7a 100644
(file)
--- a/
lib/python/Components/Pixmap.py
+++ b/
lib/python/Components/Pixmap.py
@@
-1,24
+1,24
@@
-import skin
+from ConditionalWidget import *
from enigma import *
from enigma import *
-class Pixmap:
- """Pixmap can be used for components which diplay a pixmap"""
-
+class Pixmap(Widget):
def __init__(self):
def __init__(self):
- self.instance = None
-
- def GUIcreate(self, parent):
- self.instance = self.createWidget(parent)
-
- def GUIdelete(self):
- self.removeWidget(self.instance)
- self.instance = None
-
+ Widget.__init__(self)
+
def getePixmap(self, parent):
#pixmap = ePixmap(parent)
#pixmap.setPixmapFromFile(self.filename)
return ePixmap(parent)
def getePixmap(self, parent):
#pixmap = ePixmap(parent)
#pixmap.setPixmapFromFile(self.filename)
return ePixmap(parent)
- def removeWidget(self, instance):
+ def createWidget(self, parent):
+ return self.getePixmap(parent)
+
+ def removeWidget(self, w):
pass
pass
+
+class PixmapConditional(ConditionalWidget, Pixmap):
+ def __init__(self, withTimer = True):
+ ConditionalWidget.__init__(self)
+ Pixmap.__init__(self)
+