git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'remotes/origin/bug_593_i2c_device_from_file'
[enigma2.git]
/
mytest.py
diff --git
a/mytest.py
b/mytest.py
index 7eb045ee4812038df183ae5521d2b95cb4509b19..a3cfb5a2bddf44588edfb3eeecdb09565e369282 100755
(executable)
--- a/
mytest.py
+++ b/
mytest.py
@@
-30,6
+30,9
@@
from Screens.SimpleSummary import SimpleSummary
from sys import stdout, exc_info
from sys import stdout, exc_info
+profile("Bouquets")
+eDVBDB.getInstance().reloadBouquets()
+
profile("ParentalControl")
from Components.ParentalControl import InitParentalControl
InitParentalControl()
profile("ParentalControl")
from Components.ParentalControl import InitParentalControl
InitParentalControl()
@@
-45,8
+48,7
@@
from Tools.Directories import InitFallbackFiles, resolveFilename, SCOPE_PLUGINS,
from Components.config import config, configfile, ConfigText, ConfigYesNo, ConfigInteger, NoSave
InitFallbackFiles()
from Components.config import config, configfile, ConfigText, ConfigYesNo, ConfigInteger, NoSave
InitFallbackFiles()
-profile("ReloadProfiles")
-eDVBDB.getInstance().reloadBouquets()
+profile("config.misc")
config.misc.radiopic = ConfigText(default = resolveFilename(SCOPE_CURRENT_SKIN, "radio.mvi"))
config.misc.isNextRecordTimerAfterEventActionAuto = ConfigYesNo(default=False)
config.misc.radiopic = ConfigText(default = resolveFilename(SCOPE_CURRENT_SKIN, "radio.mvi"))
config.misc.isNextRecordTimerAfterEventActionAuto = ConfigYesNo(default=False)
@@
-363,9
+365,10
@@
class PowerKey:
def powerlong(self):
if Screens.Standby.inTryQuitMainloop or (self.session.current_dialog and not self.session.current_dialog.ALLOW_SUSPEND):
return
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
self.standbyblocked = 1
- action = config.usage.on_long_powerpress.value
if action == "shutdown":
self.shutdown()
elif action == "show_menu":
if action == "shutdown":
self.shutdown()
elif action == "show_menu":
@@
-388,8
+391,7
@@
class PowerKey:
def powerup(self):
if 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:
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: