X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ace3f764c4db999f9e63a904caf14282a7e3626f..e7a4be1d20a33dbd97acfa021db2f8b82bf7a844:/mytest.py

diff --git a/mytest.py b/mytest.py
index 79dd6277..99aecb14 100644
--- a/mytest.py
+++ b/mytest.py
@@ -404,18 +404,22 @@ class PowerKey:
 		globalActionMap.actions["power_down"]=self.powerdown
 		globalActionMap.actions["power_up"]=self.powerup
 		globalActionMap.actions["power_long"]=self.powerlong
+		globalActionMap.actions["deepstandby"]=self.shutdown # frontpanel long power button press
 		self.standbyblocked = 1
 
 	def MenuClosed(self, *val):
 		self.session.infobar = None
 
+	def shutdown(self):
+		print "PowerOff - Now!"
+		if not Screens.Standby.inTryQuitMainloop:
+			self.session.open(Screens.Standby.TryQuitMainloop, 1)
+		
 	def powerlong(self):
 		self.standbyblocked = 1
 		action = config.usage.on_long_powerpress.value
 		if action == "shutdown":
-			print "PowerOff - Now!"
-			if not Screens.Standby.inTryQuitMainloop:
-				self.session.open(Screens.Standby.TryQuitMainloop, 1)
+			self.shutdown()
 		elif action == "show_menu":
 			print "Show shutdown Menu"
 			menu = mdom.childNodes[0]
@@ -430,8 +434,8 @@ class PowerKey:
 							id = y.getAttribute("val")
 							if id and id == "shutdown":
 								self.session.infobar = self
-								menu_screen = self.session.openWithCallback(self.MenuClosed, MainMenu, menu, x.childNodes)
-								menu_screen.setTitle(_("Standby Menu"))
+								menu_screen = self.session.openWithCallback(self.MenuClosed, MainMenu, x, x.childNodes)
+								menu_screen.setTitle(_("Standby / Restart"))
 								return
 
 	def powerdown(self):
@@ -472,12 +476,15 @@ class AutoScartControl:
 				self.scartDialog.switchToTV()
 
 from enigma import eDVBCIInterfaces
+from Screens.Ci import CiHandler
 
 def runScreenTest():
 	plugins.readPluginList(resolveFilename(SCOPE_PLUGINS))
 
 	session = Session(desktop = getDesktop(0), summary_desktop = getDesktop(1), navigation = Navigation())
 
+	CiHandler.setSession(session)
+
 	screensToRun = [ ]
 
 	for p in plugins.getPlugins(PluginDescriptor.WHERE_WIZARD):