X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=mytest.py;h=0eab8a65ac72df8ebdff30d8e4d45df30217d214;hb=a3d4ed7a6cafe80056916cfc6f27e8d4df94a90d;hp=9587273a3dc1bc9f912ef4ff7f6495e1025bd6bd;hpb=f1ba8813bfe7a7ceedbf9175126264158ed85409;p=vuplus_dvbapp

diff --git a/mytest.py b/mytest.py
index 9587273..0eab8a6 100644
--- a/mytest.py
+++ b/mytest.py
@@ -1,5 +1,6 @@
 from Tools import RedirectOutput
-from enigma import *
+from enigma import runMainloop, eDVBDB, eTimer, quitMainloop, eDVBVolumecontrol, \
+	getDesktop, ePythonConfigQuery, eAVSwitch, eWindow, eServiceEvent
 from tools import *
 
 from Components.Language import language
@@ -10,12 +11,11 @@ def setEPGLanguage():
 	
 language.addCallback(setEPGLanguage)
 
-import traceback
+from traceback import print_exc
 import Screens.InfoBar
 from Screens.SimpleSummary import SimpleSummary
 
-import sys
-import time
+from sys import stdout, exc_info
 
 import ServiceReference
 
@@ -27,7 +27,7 @@ from Navigation import Navigation
 from skin import readSkin, applyAllAttributes
 
 from Tools.Directories import InitFallbackFiles, resolveFilename, SCOPE_PLUGINS, SCOPE_SKIN_IMAGE
-from Components.config import config, ConfigText, configfile, ConfigSubsection, ConfigInteger
+from Components.config import config, configfile, ConfigText, ConfigSubsection, ConfigInteger
 InitFallbackFiles()
 eDVBDB.getInstance().reloadBouquets()
 
@@ -191,9 +191,9 @@ class Session:
 		try:
 			return screen(self, *arguments, **kwargs)
 		except:
-			errstr = "Screen %s(%s, %s): %s" % (str(screen), str(arguments), str(kwargs), sys.exc_info()[0])
+			errstr = "Screen %s(%s, %s): %s" % (str(screen), str(arguments), str(kwargs), exc_info()[0])
 			print errstr
-			traceback.print_exc(file=sys.stdout)
+			print_exc(file=stdout)
 			quitMainloop(5)
 	
 	def instantiateDialog(self, screen, *arguments, **kwargs):
@@ -214,7 +214,7 @@ class Session:
 		except:
 			print 'EXCEPTION IN DIALOG INIT CODE, ABORTING:'
 			print '-'*60
-			traceback.print_exc(file=sys.stdout)
+			print_exc(file=stdout)
 			quitMainloop(5)
 			print '-'*60
 		
@@ -387,7 +387,7 @@ class VolumeControl:
 				self.muteDialog.hide()
 				self.volumeDialog.setValue(vol)
 
-from Screens.Standby import Standby
+import Screens.Standby
 
 class PowerKey:
 	""" PowerKey stuff - handles the powerkey press and powerkey release actions"""
@@ -398,7 +398,7 @@ class PowerKey:
 		self.powerKeyTimer.timeout.get().append(self.powertimer)
 		globalActionMap.actions["powerdown"]=self.powerdown
 		globalActionMap.actions["powerup"]=self.powerup
-		self.standbyblocked = 0
+		self.standbyblocked = 1
 #		self["PowerKeyActions"] = HelpableActionMap(self, "PowerKeyActions",
 			#{
 				#"powerdown": self.powerdown,
@@ -409,7 +409,8 @@ class PowerKey:
 
 	def powertimer(self):	
 		print "PowerOff - Now!"
-		self.quit()
+		if not Screens.Standby.inTryQuitMainloop:
+			self.session.open(Screens.Standby.TryQuitMainloop, 1)
 	
 	def powerdown(self):
 		self.standbyblocked = 0
@@ -422,12 +423,8 @@ class PowerKey:
 			self.standby()
 
 	def standby(self):
-		if self.session.current_dialog and self.session.current_dialog.ALLOW_SUSPEND:
-			self.session.open(Standby, self)
-
-	def quit(self):
-		# halt
-		quitMainloop(1)
+		if not Screens.Standby.inStandby and self.session.current_dialog and self.session.current_dialog.ALLOW_SUSPEND:
+			self.session.open(Screens.Standby.Standby)
 
 from Screens.Scart import Scart
 
@@ -489,13 +486,13 @@ def runScreenTest():
 
 	# we need session.scart to access it from within menu.xml
 	session.scart = AutoScartControl(session)
-	
+
 	runReactor()
 	
 	configfile.save()
-	
-	from Tools.DreamboxHardware import setFPWakeuptime
+
 	from time import time
+	from Tools.DreamboxHardware import setFPWakeuptime
 	nextRecordingTime = session.nav.RecordTimer.getNextRecordingTime()
 	if nextRecordingTime != -1:
 		if (nextRecordingTime - time() < 330): # no time to switch box back on
@@ -553,6 +550,6 @@ try:
 except:
 	print 'EXCEPTION IN PYTHON STARTUP CODE:'
 	print '-'*60
-	traceback.print_exc(file=sys.stdout)
+	print_exc(file=stdout)
 	quitMainloop(5)
 	print '-'*60