X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/8cdb470ac78c6692503d50fb1a80126f5c3dcea9..661a3e90b05b18185639d43ff30b9ae3532561c4:/mytest.py

diff --git a/mytest.py b/mytest.py
index ea4913cc..aab7e0ab 100644
--- a/mytest.py
+++ b/mytest.py
@@ -16,7 +16,28 @@ from Navigation import Navigation
 from skin import readSkin, applyAllAttributes
 
 from Components.config import configfile
-from Screens.Wizard import listActiveWizards
+from Tools.Directories import InitFallbackFiles
+InitFallbackFiles()
+eDVBDB.getInstance().reloadBouquets()
+
+try:
+	from twisted.internet import e2reactor
+	e2reactor.install()
+	
+	from twisted.internet import reactor
+	
+	def runReactor():
+		reactor.run()
+except:
+	def runReactor():
+		runMainloop()
+
+# initialize autorun plugins and plugin menu entries
+from Components.PluginComponent import plugins
+plugins.getPluginList(runAutostartPlugins=True)
+from Screens.Wizard import wizardManager
+from Screens.StartWizard import *
+from Screens.TutorialWizard import *
 from Tools.BoundFunction import boundFunction
 
 had = dict()
@@ -69,12 +90,11 @@ class Session:
 		self.execEnd()
 		
 		callback = self.currentDialog.callback
+
 		retval = self.currentDialog.returnValue
-		
+
 		if self.currentDialog.isTmp:
 			self.currentDialog.doClose()
-		
-			del self.currentDialog.instance
 #			dump(self.currentDialog)
 			del self.currentDialog
 		else:
@@ -85,12 +105,16 @@ class Session:
 			callback(*retval)
 
 	def execBegin(self):
-			self.currentDialog.execBegin()
-			self.currentDialog.instance.show()
+		c = self.currentDialog
+		c.execBegin()
+
+		# when execBegin opened a new dialog, don't bother showing the old one.
+		if c == self.currentDialog:
+			c.instance.show()
 		
 	def execEnd(self):
-			self.currentDialog.execEnd()
-			self.currentDialog.instance.hide()
+		self.currentDialog.execEnd()
+		self.currentDialog.instance.hide()
 	
 	def create(self, screen, arguments):
 		# creates an instance of 'screen' (which is a class)
@@ -115,12 +139,21 @@ class Session:
 			quitMainloop(5)
 			print '-'*60
 		
+		if dlg is None:
+			return
+
 		# read skin data
 		readSkin(dlg, None, dlg.skinName, self.desktop)
 
 		# create GUI view of this dialog
 		assert self.desktop != None
-		dlg.instance = eWindow(self.desktop)
+		
+		z = 0
+		for (key, value) in dlg.skinAttributes:
+			if key == "zPosition":
+				z = int(value)
+
+		dlg.instance = eWindow(self.desktop, z)
 		applyAllAttributes(dlg.instance, self.desktop, dlg.skinAttributes)
 		gui = GUIOutputDevice()
 		gui.parent = dlg.instance
@@ -148,15 +181,16 @@ class Session:
 		self.execBegin()
 
 	def openWithCallback(self, callback, screen, *arguments):
-		self.open(screen, *arguments)
-		self.currentDialog.callback = callback
+		dlg = self.open(screen, *arguments)
+		dlg.callback = callback
 
 	def open(self, screen, *arguments):
 		self.pushCurrent()
-		self.currentDialog = self.instantiateDialog(screen, *arguments)
-		self.currentDialog.isTmp = True
-		self.currentDialog.callback = None
+		dlg = self.currentDialog = self.instantiateDialog(screen, *arguments)
+		dlg.isTmp = True
+		dlg.callback = None
 		self.execBegin()
+		return dlg
 
 	def keyEvent(self, code):
 		print "code " + str(code)
@@ -165,7 +199,67 @@ class Session:
 		self.currentDialog.returnValue = retval
 		self.delayTimer.start(0, 1)
 
-
+from Screens.Volume import Volume
+from Screens.Mute import Mute
+from GlobalActions import globalActionMap
+from Components.config import ConfigSubsection, configSequence, configElement, configsequencearg
+
+#TODO .. move this to a own .py file
+class VolumeControl:
+	"""Volume control, handles volUp, volDown, volMute actions and display
+	a corresponding dialog"""
+	def __init__(self, session):
+		global globalActionMap
+		globalActionMap.actions["volumeUp"]=self.volUp
+		globalActionMap.actions["volumeDown"]=self.volDown
+		globalActionMap.actions["volumeMute"]=self.volMute
+
+		config.audio = ConfigSubsection()
+		config.audio.volume = configElement("config.audio.volume", configSequence, [100], configsequencearg.get("INTEGER", (0, 100)))
+
+		self.volumeDialog = session.instantiateDialog(Volume)
+		self.muteDialog = session.instantiateDialog(Mute)
+
+		self.hideVolTimer = eTimer()
+		self.hideVolTimer.timeout.get().append(self.volHide)
+
+		vol = config.audio.volume.value[0]
+		self.volumeDialog.setValue(vol)
+		eDVBVolumecontrol.getInstance().setVolume(vol, vol)
+
+	def volSave(self):
+		config.audio.volume.value = eDVBVolumecontrol.getInstance().getVolume()
+		config.audio.volume.save()
+
+	def	volUp(self):
+		if (eDVBVolumecontrol.getInstance().isMuted()):
+			self.volMute()
+		eDVBVolumecontrol.getInstance().volumeUp()
+		self.volumeDialog.instance.show()
+		self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume())
+		self.volSave()
+		self.hideVolTimer.start(3000, True)
+
+	def	volDown(self):
+		if (eDVBVolumecontrol.getInstance().isMuted()):
+			self.volMute()
+		eDVBVolumecontrol.getInstance().volumeDown()
+		self.volumeDialog.instance.show()
+		self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume())
+		self.volSave()
+		self.hideVolTimer.start(3000, True)
+
+	def volHide(self):
+		self.volumeDialog.instance.hide()
+
+	def	volMute(self):
+		eDVBVolumecontrol.getInstance().volumeToggleMute()
+		self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume())
+
+		if (eDVBVolumecontrol.getInstance().isMuted()):
+			self.muteDialog.instance.show()
+		else:
+			self.muteDialog.instance.hide()
 
 def runScreenTest():
 	session = Session()
@@ -173,13 +267,13 @@ def runScreenTest():
 	
 	session.nav = Navigation()
 	
-	screensToRun = listActiveWizards()
+	screensToRun = wizardManager.getWizards()
 	screensToRun.append(Screens.InfoBar.InfoBar)
-	
+
 	def runNextScreen(session, screensToRun, *result):
 		if result:
 			quitMainloop(result)
-
+	
 		screen = screensToRun[0]
 		
 		if len(screensToRun):
@@ -188,10 +282,12 @@ def runScreenTest():
 			session.open(screen)
 	
 	runNextScreen(session, screensToRun)
-
+	
 	CONNECT(keyPressedSignal(), session.keyEvent)
 	
-	runMainloop()
+	vol = VolumeControl(session)
+	
+	runReactor()
 	
 	configfile.save()
 	
@@ -210,6 +306,12 @@ Components.InputDevice.InitInputDevices()
 import Components.AVSwitch
 Components.AVSwitch.InitAVSwitch()
 
+import Components.RecordingConfig
+Components.RecordingConfig.InitRecordingConfig()
+
+import Components.UsageConfig
+Components.UsageConfig.InitUsageConfig()
+
 import Components.Network
 Components.Network.InitNetwork()
 
@@ -227,6 +329,7 @@ import Components.NimManager
 # first, setup a screen
 try:
 	runScreenTest()
+	plugins.getPluginList(runAutoendPlugins=True)
 except:
 	print 'EXCEPTION IN PYTHON STARTUP CODE:'
 	print '-'*60