X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FButton.py;h=2a60a98fa9a241e1f1083653127505442cb4e7cb;hp=d9226b6dbeaf516a9d1e2ad928cc7c1805fe7149;hb=f5f419866f81d7c356c633acdb39c9da91c3377c;hpb=98c4b5bb004e9297bffa8e1c3572572741fda933

diff --git a/lib/python/Components/Button.py b/lib/python/Components/Button.py
index d9226b6..2a60a98 100644
--- a/lib/python/Components/Button.py
+++ b/lib/python/Components/Button.py
@@ -1,10 +1,10 @@
-from HTMLComponent import *
-from GUIComponent import *
-from VariableText import *
+from HTMLComponent import HTMLComponent
+from GUIComponent import GUIComponent
+from VariableText import VariableText
 
 from enigma import eButton
 
-class Button(HTMLComponent, GUIComponent, VariableText):
+class Button(VariableText, HTMLComponent, GUIComponent):
 	def __init__(self, text="", onClick = [ ]):
 		GUIComponent.__init__(self)
 		VariableText.__init__(self)
@@ -17,23 +17,20 @@ class Button(HTMLComponent, GUIComponent, VariableText):
 		return 0
 	
 	def disable(self):
-#		self.instance.hide()
 		pass
 	
 	def enable(self):
-#		self.instance.show()
 		pass
 
 # html:
 	def produceHTML(self):
 		return "<input type=\"submit\" text=\"" + self.getText() + "\">\n"
 
-# GUI:
-	def createWidget(self, parent):
-		g = eButton(parent)
-		g.selected.get().append(self.push)
-		return g
+	GUI_WIDGET = eButton
 
-	def removeWidget(self, w):
-		w.selected.get().remove(self.push)
+	def postWidgetCreate(self, instance):
+		instance.setText(self.text)
+		instance.selected.get().append(self.push)
 
+	def preWidgetRemove(self, instance):
+		instance.selected.get().remove(self.push)