X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=mytest.py;h=fc3cb5702372ee9c41ea24d1811dfa0d3742d385;hb=bf614597c93e12e267a18928da300ac2760d4bfe;hp=e65f8ff159d776047f95af1824c490ce1883ed46;hpb=219beec914037da0010a11c563b97b16e6e227ef;p=vuplus_dvbapp

diff --git a/mytest.py b/mytest.py
index e65f8ff..fc3cb57 100644
--- a/mytest.py
+++ b/mytest.py
@@ -5,8 +5,8 @@ from tools import *
 from Components.Language import language
 
 def setEPGLanguage():
-	#eServiceEvent.setEPGLanguage(language.getLanguage())
 	print "language set to", language.getLanguage()
+	eServiceEvent.setEPGLanguage(language.getLanguage())
 	
 language.addCallback(setEPGLanguage)
 
@@ -311,6 +311,47 @@ class VolumeControl:
 		else:
 			self.muteDialog.hide()
 
+from Screens.Standby import Standby
+
+class PowerKey:
+	""" PowerKey stuff - handles the powerkey press and powerkey release actions"""
+	
+	def __init__(self, session):
+		self.session = session
+		self.powerKeyTimer = eTimer()
+		self.powerKeyTimer.timeout.get().append(self.powertimer)
+		globalActionMap.actions["powerdown"]=self.powerdown
+		globalActionMap.actions["powerup"]=self.powerup
+		self.standbyblocked = 0
+#		self["PowerKeyActions"] = HelpableActionMap(self, "PowerKeyActions",
+			#{
+				#"powerdown": self.powerdown,
+				#"powerup": self.powerup,
+				#"discreteStandby": (self.standby, "Go standby"),
+				#"discretePowerOff": (self.quit, "Go to deep standby"),
+			#})
+
+	def powertimer(self):	
+		print "PowerOff - Now!"
+		self.quit()
+	
+	def powerdown(self):
+		self.standbyblocked = 0
+		self.powerKeyTimer.start(3000, True)
+
+	def powerup(self):
+		self.powerKeyTimer.stop()
+		if self.standbyblocked == 0:
+			self.standbyblocked = 1
+			self.standby()
+
+	def standby(self):
+		self.session.open(Standby, self)
+
+	def quit(self):
+		# halt
+		quitMainloop(1)
+
 def runScreenTest():
 	plugins.readPluginList(resolveFilename(SCOPE_PLUGINS))
 
@@ -342,6 +383,7 @@ def runScreenTest():
 	CONNECT(keyPressedSignal(), session.keyEvent)
 	
 	vol = VolumeControl(session)
+	power = PowerKey(session)
 	
 	runReactor()
 	
@@ -363,7 +405,7 @@ def runScreenTest():
 import keymapparser
 keymapparser.readKeymap()
 import skin
-skin.loadSkin(getDesktop(0))
+skin.loadSkinData(getDesktop(0))
 
 import Components.InputDevice
 Components.InputDevice.InitInputDevices()