X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/eafe6abdba24ab9f4336baf0eb9940981e2969b1..ef25d742a5eda3b2b679d39c38cb1ce4c8daa5d4:/mytest.py

diff --git a/mytest.py b/mytest.py
index e42c1003..4b687e05 100755
--- a/mytest.py
+++ b/mytest.py
@@ -41,14 +41,14 @@ profile("LOAD:skin")
 from skin import readSkin
 
 profile("LOAD:Tools")
-from Tools.Directories import InitFallbackFiles, resolveFilename, SCOPE_PLUGINS, SCOPE_SKIN_IMAGE
+from Tools.Directories import InitFallbackFiles, resolveFilename, SCOPE_PLUGINS, SCOPE_CURRENT_SKIN
 from Components.config import config, configfile, ConfigText, ConfigYesNo, ConfigInteger, NoSave
 InitFallbackFiles()
 
 profile("ReloadProfiles")
 eDVBDB.getInstance().reloadBouquets()
 
-config.misc.radiopic = ConfigText(default = resolveFilename(SCOPE_SKIN_IMAGE)+"radio.mvi")
+config.misc.radiopic = ConfigText(default = resolveFilename(SCOPE_CURRENT_SKIN, "radio.mvi"))
 config.misc.isNextRecordTimerAfterEventActionAuto = ConfigYesNo(default=False)
 config.misc.useTransponderTime = ConfigYesNo(default=True)
 config.misc.startCounter = ConfigInteger(default=0) # number of e2 starts...
@@ -363,9 +363,10 @@ class PowerKey:
 	def powerlong(self):
 		if Screens.Standby.inTryQuitMainloop or (self.session.current_dialog and not self.session.current_dialog.ALLOW_SUSPEND):
 			return
+		self.doAction(action = config.usage.on_long_powerpress.value)
 
+	def doAction(self, action):
 		self.standbyblocked = 1
-		action = config.usage.on_long_powerpress.value
 		if action == "shutdown":
 			self.shutdown()
 		elif action == "show_menu":
@@ -380,14 +381,15 @@ class PowerKey:
 						menu_screen = self.session.openWithCallback(self.MenuClosed, MainMenu, x)
 						menu_screen.setTitle(_("Standby / Restart"))
 						return
+		elif action == "standby":
+			self.standby()
 
 	def powerdown(self):
 		self.standbyblocked = 0
 
 	def powerup(self):
 		if self.standbyblocked == 0:
-			self.standbyblocked = 1
-			self.standby()
+			self.doAction(action = config.usage.on_short_powerpress.value)
 
 	def standby(self):
 		if not Screens.Standby.inStandby and self.session.current_dialog and self.session.current_dialog.ALLOW_SUSPEND and self.session.in_exec: