From 4ae10f76135d53a4285fd458a87f485695c9fbd7 Mon Sep 17 00:00:00 2001
From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Sat, 26 Nov 2005 03:00:38 +0000
Subject: get the file for the BlinkingPixmap from skin.xml

---
 lib/python/Components/BlinkingPixmap.py | 24 +++++++++++-------------
 lib/python/Components/Pixmap.py         | 11 +++++------
 2 files changed, 16 insertions(+), 19 deletions(-)

(limited to 'lib/python/Components')

diff --git a/lib/python/Components/BlinkingPixmap.py b/lib/python/Components/BlinkingPixmap.py
index e34e9165..1f2f4225 100644
--- a/lib/python/Components/BlinkingPixmap.py
+++ b/lib/python/Components/BlinkingPixmap.py
@@ -11,12 +11,10 @@ class BlinkingPixmap(GUIComponent, Pixmap):
 	SHOWN = 0
 	HIDDEN = 1
 	
-	def __init__(self, filename):
+	def __init__(self):
 		Pixmap.__init__(self)
 		GUIComponent.__init__(self)
 		
-		self.filename = filename
-		
 		self.state = self.SHOWN
 		self.blinking = False
 		
@@ -27,18 +25,18 @@ class BlinkingPixmap(GUIComponent, Pixmap):
 	
 		
 	def createWidget(self, parent):
-		return self.getePixmap(parent, self.filename)
+		return self.getePixmap(parent)
 
 	def removeWidget(self, w):
 		pass
 	
-	def showPoint(self):
-		print "Show point"
+	def showPixmap(self):
+		print "Show pixmap"
 		self.state = self.SHOWN
 		self.instance.show()
 
-	def hidePoint(self):
-		print "Hide point"
+	def hidePixmap(self):
+		print "Hide pixmap"
 		self.state = self.HIDDEN
 		self.instance.hide()
 		
@@ -48,9 +46,9 @@ class BlinkingPixmap(GUIComponent, Pixmap):
 	def blink(self):
 		if self.blinking == True:
 			if (self.state == self.SHOWN):
-				self.hidePoint()
+				self.hidePixmap()
 			elif (self.state == self.HIDDEN):
-				self.showPoint()
+				self.showPixmap()
 			
 	def startBlinking(self):
 		self.blinking = True
@@ -59,12 +57,12 @@ class BlinkingPixmap(GUIComponent, Pixmap):
 	def stopBlinking(self):
 		self.blinking = False
 		if (self.state == self.SHOWN):
-			self.hidePoint()
+			self.hidePixmap()
 		self.timer.stop()
 		
 class BlinkingPixmapConditional(BlinkingPixmap):
-	def __init__(self, filename):
-		BlinkingPixmap.__init__(self, filename)
+	def __init__(self):
+		BlinkingPixmap.__init__(self)
 		
 		self.setConnect(None)
 		
diff --git a/lib/python/Components/Pixmap.py b/lib/python/Components/Pixmap.py
index c97c0ab1..b6620d9a 100644
--- a/lib/python/Components/Pixmap.py
+++ b/lib/python/Components/Pixmap.py
@@ -3,23 +3,22 @@ import skin
 from enigma import *
 
 class Pixmap:
-	"""Pixmap can be used for components which use a pixmap"""
+	"""Pixmap can be used for components which diplay a pixmap"""
 	
 	def __init__(self):
 		self.instance = None
 	
 	def GUIcreate(self, parent):
 		self.instance = self.createWidget(parent)
-		#self.instance.setText(self.message)
 	
 	def GUIdelete(self):
 		self.removeWidget(self.instance)
 		self.instance = None
 	
-	def getePixmap(self, parent, filename):
-		pixmap = ePixmap(parent)
-		pixmap.setPixmapFromFile(filename)
-		return pixmap
+	def getePixmap(self, parent):
+		#pixmap = ePixmap(parent)
+		#pixmap.setPixmapFromFile(self.filename)
+		return ePixmap(parent)
 	
 	def removeWidget(self, instance):
 		pass
-- 
cgit v1.2.3