X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=mytest.py;h=7d87a9cd63daef035733229955b0d6f366f39f6b;hp=db720a6288f11b2a20743bdbd33e91a798f2a76f;hb=0dbb36049c5f14bbabc4596448dc148f108a2137;hpb=03379b6e86edfcce851da2d11c3189d1b7843afb

diff --git a/mytest.py b/mytest.py
index db720a6..7d87a9c 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
 from tools import *
 
 from Components.Language import language
@@ -10,30 +11,35 @@ 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
 
+from Components.ParentalControl import InitParentalControl
+InitParentalControl()
+
 from Navigation import Navigation
 
 from skin import readSkin, applyAllAttributes
 
 from Tools.Directories import InitFallbackFiles, resolveFilename, SCOPE_PLUGINS, SCOPE_SKIN_IMAGE
-from Components.config import configfile, configElement, configText, ConfigSubsection, config, configSequence, configsequencearg
+from Components.config import config, configfile, ConfigText, ConfigSubsection, ConfigInteger
 InitFallbackFiles()
 eDVBDB.getInstance().reloadBouquets()
 
-config.misc.radiopic = configElement("config.misc.radiopic", configText, resolveFilename(SCOPE_SKIN_IMAGE)+"radio.mvi", 0)
+config.misc.radiopic = ConfigText(default = resolveFilename(SCOPE_SKIN_IMAGE)+"radio.mvi")
 
 try:
 	import e2reactor
 	e2reactor.install()
 	
+	import twisted.python.runtime
+	twisted.python.runtime.platform.supportsThreads = lambda: False
+	
 	from twisted.internet import reactor
 	
 	def runReactor():
@@ -185,14 +191,18 @@ 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):
 		return self.doInstantiateDialog(screen, arguments, kwargs, self.desktop)
 	
+	def deleteDialog(self, screen):
+		screen.hide()
+		screen.doClose()
+	
 	def instantiateSummaryDialog(self, screen, *arguments, **kwargs):
 		return self.doInstantiateDialog(screen, arguments, kwargs, self.summary_desktop)
 	
@@ -204,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
 		
@@ -316,7 +326,7 @@ class VolumeControl:
 		globalActionMap.actions["volumeMute"]=self.volMute
 
 		config.audio = ConfigSubsection()
-		config.audio.volume = configElement("config.audio.volume", configSequence, [100], configsequencearg.get("INTEGER", (0, 100)))
+		config.audio.volume = ConfigInteger(default = 100, limits = (0, 100))
 
 		self.volumeDialog = session.instantiateDialog(Volume)
 		self.muteDialog = session.instantiateDialog(Mute)
@@ -324,45 +334,60 @@ class VolumeControl:
 		self.hideVolTimer = eTimer()
 		self.hideVolTimer.timeout.get().append(self.volHide)
 
-		vol = config.audio.volume.value[0]
+		vol = config.audio.volume.value
 		self.volumeDialog.setValue(vol)
-		eDVBVolumecontrol.getInstance().setVolume(vol, vol)
+		self.volctrl = eDVBVolumecontrol.getInstance()
+		self.volctrl.setVolume(vol, vol)
 
 	def volSave(self):
-		config.audio.volume.value = eDVBVolumecontrol.getInstance().getVolume()
+		if self.volctrl.isMuted():
+			config.audio.volume.value = 0
+		else:
+			config.audio.volume.value = self.volctrl.getVolume()
 		config.audio.volume.save()
 
-	def	volUp(self):
-		if (eDVBVolumecontrol.getInstance().isMuted()):
-			self.volMute()
-		eDVBVolumecontrol.getInstance().volumeUp()
-		self.volumeDialog.show()
-		self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume())
-		self.volSave()
-		self.hideVolTimer.start(3000, True)
+	def volUp(self):
+		self.setVolume(+1)
 
-	def	volDown(self):
-		if (eDVBVolumecontrol.getInstance().isMuted()):
-			self.volMute()
-		eDVBVolumecontrol.getInstance().volumeDown()
+	def volDown(self):
+		self.setVolume(-1)
+
+	def setVolume(self, direction):
+		oldvol = self.volctrl.getVolume()
+		if direction > 0:
+			self.volctrl.volumeUp()
+		else:
+			self.volctrl.volumeDown()
+		is_muted = self.volctrl.isMuted()
+		vol = self.volctrl.getVolume()
 		self.volumeDialog.show()
-		self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume())
+		if is_muted:
+			self.volMute() # unmute
+		elif not vol:
+			self.volMute(False, True) # mute but dont show mute symbol
+		if self.volctrl.isMuted():
+			self.volumeDialog.setValue(0)
+		else:
+			self.volumeDialog.setValue(self.volctrl.getVolume())
 		self.volSave()
 		self.hideVolTimer.start(3000, True)
 
 	def volHide(self):
 		self.volumeDialog.hide()
 
-	def	volMute(self):
-		eDVBVolumecontrol.getInstance().volumeToggleMute()
-		self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume())
-
-		if (eDVBVolumecontrol.getInstance().isMuted()):
-			self.muteDialog.show()
-		else:
-			self.muteDialog.hide()
+	def volMute(self, showMuteSymbol=True, force=False):
+		vol = self.volctrl.getVolume()
+		if vol or force:
+			self.volctrl.volumeToggleMute()
+			if self.volctrl.isMuted():
+				if showMuteSymbol:
+					self.muteDialog.show()
+				self.volumeDialog.setValue(0)
+			else:
+				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"""
@@ -373,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,
@@ -384,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
@@ -397,11 +423,33 @@ class PowerKey:
 			self.standby()
 
 	def standby(self):
-		self.session.open(Standby, self)
+		if not Screens.Standby.inStandby and self.session.current_dialog and self.session.current_dialog.ALLOW_SUSPEND:
+			self.session.open(Screens.Standby.Standby)
 
-	def quit(self):
-		# halt
-		quitMainloop(1)
+from Screens.Scart import Scart
+
+class AutoScartControl:
+	def __init__(self, session):
+		self.force = False
+		self.current_vcr_sb = eAVSwitch.getInstance().getVCRSlowBlanking()
+		if self.current_vcr_sb and config.av.vcrswitch.value:
+			self.scartDialog = session.instantiateDialog(Scart, True)
+		else:
+			self.scartDialog = session.instantiateDialog(Scart, False)
+		config.av.vcrswitch.addNotifier(self.recheckVCRSb)
+		eAVSwitch.getInstance().vcr_sb_notifier.get().append(self.VCRSbChanged)
+
+	def recheckVCRSb(self, configElement):
+		self.VCRSbChanged(self.current_vcr_sb)
+
+	def VCRSbChanged(self, value):
+		#print "vcr sb changed to", value
+		self.current_vcr_sb = value
+		if config.av.vcrswitch.value or value > 2:
+			if value:
+				self.scartDialog.showMessageBox()
+			else:
+				self.scartDialog.switchToTV()
 
 def runScreenTest():
 	plugins.readPluginList(resolveFilename(SCOPE_PLUGINS))
@@ -435,13 +483,16 @@ def runScreenTest():
 	
 	vol = VolumeControl(session)
 	power = PowerKey(session)
-	
+
+	# 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
@@ -449,6 +500,7 @@ def runScreenTest():
 		else:
 			setFPWakeuptime(nextRecordingTime - (300))
 	
+	session.nav.stopService()
 	session.nav.shutdown()
 	
 	return 0
@@ -484,14 +536,20 @@ Components.RFmod.InitRFmod()
 
 import Components.NimManager
 
+import Screens.Ci
+Screens.Ci.InitCiConfig()
+
 # first, setup a screen
 try:
 	runScreenTest()
 
 	plugins.shutdown()
+	
+	from Components.ParentalControl import parentalControl
+	parentalControl.save()
 except:
 	print 'EXCEPTION IN PYTHON STARTUP CODE:'
 	print '-'*60
-	traceback.print_exc(file=sys.stdout)
+	print_exc(file=stdout)
 	quitMainloop(5)
 	print '-'*60