git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix mkisofs syntax and fix menu layout so that titles fit on 4:3 pal crt screens
[enigma2.git]
/
mytest.py
diff --git
a/mytest.py
b/mytest.py
index d58649cfafe45126ccf7a0f918803706058ace58..810edd000a50b7da5f1ed50f0cc0476e1033571c 100644
(file)
--- a/
mytest.py
+++ b/
mytest.py
@@
-36,11
+36,11
@@
profile("LOAD:Navigation")
from Navigation import Navigation
profile("LOAD:skin")
from Navigation import Navigation
profile("LOAD:skin")
-from skin import readSkin
, applyAllAttributes
+from skin import readSkin
profile("LOAD:Tools")
from Tools.Directories import InitFallbackFiles, resolveFilename, SCOPE_PLUGINS, SCOPE_SKIN_IMAGE
profile("LOAD:Tools")
from Tools.Directories import InitFallbackFiles, resolveFilename, SCOPE_PLUGINS, SCOPE_SKIN_IMAGE
-from Components.config import config, configfile, ConfigText
, ConfigSubsection, ConfigInteger
+from Components.config import config, configfile, ConfigText
InitFallbackFiles()
profile("ReloadProfiles")
InitFallbackFiles()
profile("ReloadProfiles")
@@
-72,10
+72,11
@@
from Components.PluginComponent import plugins
profile("LOAD:Wizard")
from Screens.Wizard import wizardManager
profile("LOAD:Wizard")
from Screens.Wizard import wizardManager
+from Screens.DefaultWizard import *
from Screens.ImageWizard import *
from Screens.StartWizard import *
from Screens.ImageWizard import *
from Screens.StartWizard import *
-from Screens.DefaultWizard import *
from Screens.TutorialWizard import *
from Screens.TutorialWizard import *
+import Screens.Rc
from Tools.BoundFunction import boundFunction
from Plugins.Plugin import PluginDescriptor
from Tools.BoundFunction import boundFunction
from Plugins.Plugin import PluginDescriptor
@@
-466,7
+467,7
@@
def runScreenTest():
profile("wakeup")
from time import time
profile("wakeup")
from time import time
- from Tools.DreamboxHardware import setFPWakeuptime
+ from Tools.DreamboxHardware import setFPWakeuptime
, getFPWakeuptime
#get currentTime
nowTime = time()
wakeupList = [
#get currentTime
nowTime = time()
wakeupList = [
@@
-479,10
+480,11
@@
def runScreenTest():
wakeupList.sort()
if len(wakeupList):
startTime = wakeupList.pop(0)
wakeupList.sort()
if len(wakeupList):
startTime = wakeupList.pop(0)
- if (startTime - nowTime
< 330)
: # no time to switch box back on
-
setFPWakeuptime(nowTime + 30)
# so switch back on in 30 seconds
+ if (startTime - nowTime
) < 330
: # no time to switch box back on
+
wptime = nowTime + 30
# so switch back on in 30 seconds
else:
else:
- setFPWakeuptime(startTime - 300)
+ wptime = startTime - 300
+ setFPWakeuptime(wptime)
profile("stopService")
session.nav.stopService()
profile("nav shutdown")
profile("stopService")
session.nav.stopService()
profile("nav shutdown")