X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=mytest.py;h=4b687e05440aa322ab3c6b75f0b8eddd63ddd287;hp=1d9594a9ad77b5489bae307412ae626cb46e227b;hb=78329e83433e005aa3d4e6a6f0d526ec2bb9b8f6;hpb=54475ce18e43482b2ec1a150f7fa07c3464ec6d2

diff --git a/mytest.py b/mytest.py
index 1d9594a..4b687e0 100755
--- a/mytest.py
+++ b/mytest.py
@@ -41,16 +41,30 @@ profile("LOAD:skin")
 from skin import readSkin
 
 profile("LOAD:Tools")
-from Tools.Directories import InitFallbackFiles, resolveFilename, SCOPE_PLUGINS, SCOPE_SKIN_IMAGE
-from Components.config import config, configfile, ConfigText, ConfigYesNo
+from Tools.Directories import InitFallbackFiles, resolveFilename, SCOPE_PLUGINS, SCOPE_CURRENT_SKIN
+from Components.config import config, configfile, ConfigText, ConfigYesNo, ConfigInteger, NoSave
 InitFallbackFiles()
 
 profile("ReloadProfiles")
 eDVBDB.getInstance().reloadBouquets()
 
-config.misc.radiopic = ConfigText(default = resolveFilename(SCOPE_SKIN_IMAGE)+"radio.mvi")
+config.misc.radiopic = ConfigText(default = resolveFilename(SCOPE_CURRENT_SKIN, "radio.mvi"))
 config.misc.isNextRecordTimerAfterEventActionAuto = ConfigYesNo(default=False)
 config.misc.useTransponderTime = ConfigYesNo(default=True)
+config.misc.startCounter = ConfigInteger(default=0) # number of e2 starts...
+config.misc.standbyCounter = NoSave(ConfigInteger(default=0)) # number of standby
+
+#demo code for use of standby enter leave callbacks
+#def leaveStandby():
+#	print "!!!!!!!!!!!!!!!!!leave standby"
+
+#def standbyCountChanged(configElement):
+#	print "!!!!!!!!!!!!!!!!!enter standby num", configElement.value
+#	from Screens.Standby import inStandby
+#	inStandby.onClose.append(leaveStandby)
+
+#config.misc.standbyCounter.addNotifier(standbyCountChanged, initial_call = False)
+####################################################
 
 def useTransponderTimeChanged(configElement):
 	enigma.eDVBLocalTimeHandler.getInstance().setUseDVBTime(configElement.value)
@@ -349,9 +363,10 @@ class PowerKey:
 	def powerlong(self):
 		if Screens.Standby.inTryQuitMainloop or (self.session.current_dialog and not self.session.current_dialog.ALLOW_SUSPEND):
 			return
+		self.doAction(action = config.usage.on_long_powerpress.value)
 
+	def doAction(self, action):
 		self.standbyblocked = 1
-		action = config.usage.on_long_powerpress.value
 		if action == "shutdown":
 			self.shutdown()
 		elif action == "show_menu":
@@ -366,14 +381,15 @@ class PowerKey:
 						menu_screen = self.session.openWithCallback(self.MenuClosed, MainMenu, x)
 						menu_screen.setTitle(_("Standby / Restart"))
 						return
+		elif action == "standby":
+			self.standby()
 
 	def powerdown(self):
 		self.standbyblocked = 0
 
 	def powerup(self):
 		if self.standbyblocked == 0:
-			self.standbyblocked = 1
-			self.standby()
+			self.doAction(action = config.usage.on_short_powerpress.value)
 
 	def standby(self):
 		if not Screens.Standby.inStandby and self.session.current_dialog and self.session.current_dialog.ALLOW_SUSPEND and self.session.in_exec:
@@ -413,6 +429,8 @@ profile("Load:VolumeControl")
 from Components.VolumeControl import VolumeControl
 
 def runScreenTest():
+	config.misc.startCounter.value += 1
+
 	profile("readPluginList")
 	plugins.readPluginList(resolveFilename(SCOPE_PLUGINS))
 
@@ -445,11 +463,12 @@ def runScreenTest():
 			return
 
 		screen = screensToRun[0][1]
+		args = screensToRun[0][2:]
 
 		if screensToRun:
-			session.openWithCallback(boundFunction(runNextScreen, session, screensToRun[1:]), screen)
+			session.openWithCallback(boundFunction(runNextScreen, session, screensToRun[1:]), screen, *args)
 		else:
-			session.open(screen)
+			session.open(screen, *args)
 
 	runNextScreen(session, screensToRun)
 
@@ -465,6 +484,8 @@ def runScreenTest():
 	profile_final()
 	runReactor()
 
+	config.misc.startCounter.save()
+
 	profile("wakeup")
 	from time import time, strftime, localtime
 	from Tools.DreamboxHardware import setFPWakeuptime, getFPWakeuptime, setRTCtime
@@ -481,10 +502,10 @@ def runScreenTest():
 	if wakeupList:
 		from time import strftime
 		startTime = wakeupList[0]
-		if (startTime[0] - nowTime) < 330: # no time to switch box back on
+		if (startTime[0] - nowTime) < 270: # no time to switch box back on
 			wptime = nowTime + 30  # so switch back on in 30 seconds
 		else:
-			wptime = startTime[0] - 300
+			wptime = startTime[0] - 240
 		if not config.misc.useTransponderTime.value:
 			print "dvb time sync disabled... so set RTC now to current linux time!", strftime("%Y/%m/%d %H:%M", localtime(nowTime))
 			setRTCtime(nowTime)