X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a36d71485cec16ba09beb5c267a4467d0f10bb1f..7b0d371a7bbfb9e8d624eec9ed97e9a835f75ca7:/mytest.py

diff --git a/mytest.py b/mytest.py
index 66d9eb39..3a5ec3ec 100644
--- a/mytest.py
+++ b/mytest.py
@@ -1,4 +1,3 @@
-from Tools import RedirectOutput, RedirectTime
 from enigma import runMainloop, eDVBDB, eTimer, quitMainloop, eDVBVolumecontrol, \
 	getDesktop, ePythonConfigQuery, eAVSwitch, eWindow, eServiceEvent
 from tools import *
@@ -17,8 +16,6 @@ from Screens.SimpleSummary import SimpleSummary
 
 from sys import stdout, exc_info
 
-import ServiceReference
-
 from Components.ParentalControl import InitParentalControl
 InitParentalControl()
 
@@ -34,12 +31,12 @@ eDVBDB.getInstance().reloadBouquets()
 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
 
+	import e2reactor
+	e2reactor.install()
+
 	from twisted.internet import reactor
 
 	def runReactor():
@@ -95,6 +92,12 @@ class GUIOutputDevice(OutputDevice):
 	def create(self, comp, desktop):
 		comp.createGUIScreen(self.parent, desktop)
 
+from Screens.Globals import Globals
+from Screens.SessionGlobals import SessionGlobals
+from Screens.Screen import Screen
+
+Screen.global_screen = Globals()
+
 # Session.open:
 # * push current active dialog ('current_dialog') onto stack
 # * call execEnd for this dialog
@@ -136,6 +139,8 @@ class Session:
 
 		self.in_exec = False
 
+		self.screen = SessionGlobals(self)
+
 		for p in plugins.getPlugins(PluginDescriptor.WHERE_SESSIONSTART):
 			p(reason=0, session=self)
 
@@ -521,8 +526,6 @@ def runScreenTest():
 
 	return 0
 
-import keymapparser
-keymapparser.readKeymap()
 import skin
 skin.loadSkinData(getDesktop(0))
 
@@ -538,6 +541,9 @@ Components.RecordingConfig.InitRecordingConfig()
 import Components.UsageConfig
 Components.UsageConfig.InitUsageConfig()
 
+import keymapparser
+keymapparser.readKeymap(config.usage.keymap.value)
+
 import Components.Network
 Components.Network.InitNetwork()
 
@@ -550,8 +556,6 @@ Components.SetupDevices.InitSetupDevices()
 import Components.RFmod
 Components.RFmod.InitRFmod()
 
-import Components.NimManager
-
 import Screens.Ci
 Screens.Ci.InitCiConfig()