X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=mytest.py;h=c335bf2dd8e5e566a791eb5b45d13c3ce03ed98a;hb=d58ca4cf34b7621aea4e2c1ff07bed6b2cd6b763;hp=886efab2fca53b56f9308e69f1d011cfe014ca53;hpb=5f5bf69803be617adb7364f61c6eed9fd32d6d14;p=vuplus_dvbapp

diff --git a/mytest.py b/mytest.py
old mode 100644
new mode 100755
index 886efab..c335bf2
--- a/mytest.py
+++ b/mytest.py
@@ -76,7 +76,6 @@ from Components.PluginComponent import plugins
 profile("LOAD:Wizard")
 from Screens.Wizard import wizardManager
 from Screens.DefaultWizard import *
-from Screens.ImageWizard import *
 from Screens.StartWizard import *
 from Screens.TutorialWizard import *
 import Screens.Rc
@@ -277,7 +276,7 @@ class Session:
 
 	def open(self, screen, *arguments, **kwargs):
 		if len(self.dialog_stack) and not self.in_exec:
-			raise "modal open are allowed only from a screen which is modal!"
+			raise RuntimeError("modal open are allowed only from a screen which is modal!")
 			# ...unless it's the very first screen.
 
 		self.pushCurrent()
@@ -321,7 +320,6 @@ class Session:
 profile("Standby,PowerKey")
 import Screens.Standby
 from Screens.Menu import MainMenu, mdom
-import xml.dom.minidom
 from GlobalActions import globalActionMap
 
 class PowerKey:
@@ -344,27 +342,25 @@ class PowerKey:
 			self.session.open(Screens.Standby.TryQuitMainloop, 1)
 
 	def powerlong(self):
+		if Screens.Standby.inTryQuitMainloop or (self.session.current_dialog and not self.session.current_dialog.ALLOW_SUSPEND):
+			return
+
 		self.standbyblocked = 1
 		action = config.usage.on_long_powerpress.value
 		if action == "shutdown":
 			self.shutdown()
 		elif action == "show_menu":
 			print "Show shutdown Menu"
-			menu = mdom.childNodes[0]
-			for x in menu.childNodes:
-				if x.nodeType != xml.dom.minidom.Element.nodeType:
-				    continue
-				elif x.tagName == 'menu':
-					for y in x.childNodes:
-						if y.nodeType != xml.dom.minidom.Element.nodeType:
-							continue
-						elif y.tagName == 'id':
-							id = y.getAttribute("val")
-							if id and id == "shutdown":
-								self.session.infobar = self
-								menu_screen = self.session.openWithCallback(self.MenuClosed, MainMenu, x, x.childNodes)
-								menu_screen.setTitle(_("Standby / Restart"))
-								return
+			root = mdom.getroot()
+			for x in root.findall("menu"):
+				y = x.find("id")
+				if y is not None:
+					id = y.get("val")
+					if id and id == "shutdown":
+						self.session.infobar = self
+						menu_screen = self.session.openWithCallback(self.MenuClosed, MainMenu, x)
+						menu_screen.setTitle(_("Standby / Restart"))
+						return
 
 	def powerdown(self):
 		self.standbyblocked = 0