lib/gui/elistboxcontent.cpp: fix compiler warning

[enigma2.git] / mytest.py

diff --git a/mytest.py b/mytest.py
old mode 100644 (file)
new mode 100755 (executable)
index 627d16f..c748538
--- a/mytest.py
+++ b/mytest.py
@@ -1,9 +1,16 @@
+import eConsoleImpl
+import eBaseImpl
+import enigma
+enigma.eTimer = eBaseImpl.eTimer
+enigma.eSocketNotifier = eBaseImpl.eSocketNotifier
+enigma.eConsoleAppContainer = eConsoleImpl.eConsoleAppContainer
+

 from Tools.Profile import profile, profile_final
 
 profile("PYTHON_START")
 
 from Tools.Profile import profile, profile_final
 
 profile("PYTHON_START")
 

-from enigma import runMainloop, eDVBDB, eTimer, quitMainloop, eDVBVolumecontrol, \
-       getDesktop, ePythonConfigQuery, eAVSwitch, eWindow, eServiceEvent
+from enigma import runMainloop, eDVBDB, eTimer, quitMainloop, \
+       getDesktop, ePythonConfigQuery, eAVSwitch, eServiceEvent

 from tools import *
 
 profile("LANGUAGE")
 from tools import *
 
 profile("LANGUAGE")


@@ -31,17 +38,37 @@ 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")
 
 profile("LOAD:Tools")

-from Tools.Directories import InitFallbackFiles, resolveFilename, SCOPE_PLUGINS, SCOPE_SKIN_IMAGE
-from Components.config import config, configfile, ConfigText, ConfigSubsection, ConfigInteger
+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()
 
 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...
+config.misc.standbyCounter = NoSave(ConfigInteger(default=0)) # number of standby
+
+#demo code for use of standby enter leave callbacks
+#def leaveStandby():
+#      print "!!!!!!!!!!!!!!!!!leave standby"
+
+#def standbyCountChanged(configElement):
+#      print "!!!!!!!!!!!!!!!!!enter standby num", configElement.value
+#      from Screens.Standby import inStandby
+#      inStandby.onClose.append(leaveStandby)
+
+#config.misc.standbyCounter.addNotifier(standbyCountChanged, initial_call = False)
+####################################################
+
+def useTransponderTimeChanged(configElement):
+       enigma.eDVBLocalTimeHandler.getInstance().setUseDVBTime(configElement.value)
+config.misc.useTransponderTime.addNotifier(useTransponderTimeChanged)

 
 profile("Twisted")
 try:
 
 profile("Twisted")
 try:


@@ -54,7 +81,7 @@ try:
        from twisted.internet import reactor
 
        def runReactor():
        from twisted.internet import reactor
 
        def runReactor():

-               reactor.run()
+               reactor.run(installSignalHandlers=False)

 except ImportError:
        print "twisted not available"
        def runReactor():
 except ImportError:
        print "twisted not available"
        def runReactor():


@@ -67,9 +94,10 @@ from Components.PluginComponent import plugins
 
 profile("LOAD:Wizard")
 from Screens.Wizard import wizardManager
 
 profile("LOAD:Wizard")
 from Screens.Wizard import wizardManager

-from Screens.ImageWizard import *
+from Screens.DefaultWizard import *

 from Screens.StartWizard import *
 from Screens.TutorialWizard import *
 from Screens.StartWizard 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
 


@@ -94,14 +122,6 @@ def dump(dir, p = ""):
 
 # display
 
 
 # display
 

-class OutputDevice:
-       def create(self, screen): pass
-
-class GUIOutputDevice(OutputDevice):
-       parent = None
-       def create(self, comp, desktop):
-               comp.createGUIScreen(self.parent, desktop)
-

 profile("LOAD:ScreenGlobals")
 from Screens.Globals import Globals
 from Screens.SessionGlobals import SessionGlobals
 profile("LOAD:ScreenGlobals")
 from Screens.Globals import Globals
 from Screens.SessionGlobals import SessionGlobals


@@ -141,7 +161,7 @@ class Session:
                self.summary_desktop = summary_desktop
                self.nav = navigation
                self.delay_timer = eTimer()
                self.summary_desktop = summary_desktop
                self.nav = navigation
                self.delay_timer = eTimer()

-               self.delay_timer.timeout.get().append(self.processDelay)
+               self.delay_timer.callback.append(self.processDelay)

 
                self.current_dialog = None
 
 
                self.current_dialog = None
 


@@ -244,20 +264,8 @@ class Session:
                # create GUI view of this dialog
                assert desktop is not None
 
                # create GUI view of this dialog
                assert desktop is not None
 

-               z = 0
-               title = ""
-               for (key, value) in dlg.skinAttributes:
-                       if key == "zPosition":
-                               z = int(value)
-                       elif key == "title":
-                               title = value
-
-               dlg.instance = eWindow(desktop, z)
-               dlg.title = title
-               applyAllAttributes(dlg.instance, desktop, dlg.skinAttributes)
-               gui = GUIOutputDevice()
-               gui.parent = dlg.instance
-               gui.create(dlg, desktop)
+               dlg.setDesktop(desktop)
+               dlg.applySkin()

 
                return dlg
 
 
                return dlg
 


@@ -267,7 +275,7 @@ class Session:
                        self.execEnd(last=False)
 
        def popCurrent(self):
                        self.execEnd(last=False)
 
        def popCurrent(self):

-               if len(self.dialog_stack):
+               if self.dialog_stack:

                        (self.current_dialog, do_show) = self.dialog_stack.pop()
                        self.execBegin(first=False, do_show=do_show)
                else:
                        (self.current_dialog, do_show) = self.dialog_stack.pop()
                        self.execBegin(first=False, do_show=do_show)
                else:


@@ -286,8 +294,8 @@ class Session:
                return dlg
 
        def open(self, screen, *arguments, **kwargs):
                return dlg
 
        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!"
+               if self.dialog_stack and not self.in_exec:
+                       raise RuntimeError("modal open are allowed only from a screen which is modal!")

                        # ...unless it's the very first screen.
 
                self.pushCurrent()
                        # ...unless it's the very first screen.
 
                self.pushCurrent()


@@ -328,87 +336,10 @@ class Session:
                if self.summary is not None:
                        self.summary.show()
 
                if self.summary is not None:
                        self.summary.show()
 

-from Screens.Volume import Volume
-from Screens.Mute import Mute
-from GlobalActions import globalActionMap
-
-profile("VolumeControl")
-#TODO .. move this to a own .py file
-class VolumeControl:
-       """Volume control, handles volUp, volDown, volMute actions and display
-       a corresponding dialog"""
-       def __init__(self, session):
-               global globalActionMap
-               globalActionMap.actions["volumeUp"]=self.volUp
-               globalActionMap.actions["volumeDown"]=self.volDown
-               globalActionMap.actions["volumeMute"]=self.volMute
-
-               config.audio = ConfigSubsection()
-               config.audio.volume = ConfigInteger(default = 100, limits = (0, 100))
-
-               self.volumeDialog = session.instantiateDialog(Volume)
-               self.muteDialog = session.instantiateDialog(Mute)
-
-               self.hideVolTimer = eTimer()
-               self.hideVolTimer.timeout.get().append(self.volHide)
-
-               vol = config.audio.volume.value
-               self.volumeDialog.setValue(vol)
-               self.volctrl = eDVBVolumecontrol.getInstance()
-               self.volctrl.setVolume(vol, vol)
-
-       def volSave(self):
-               if self.volctrl.isMuted():
-                       config.audio.volume.value = 0
-               else:
-                       config.audio.volume.value = self.volctrl.getVolume()
-               config.audio.volume.save()
-
-       def volUp(self):
-               self.setVolume(+1)
-
-       def volDown(self):
-               self.setVolume(-1)
-
-       def setVolume(self, direction):
-               oldvol = self.volctrl.getVolume()
-               if direction > 0:
-                       self.volctrl.volumeUp()
-               else:
-                       self.volctrl.volumeDown()
-               is_muted = self.volctrl.isMuted()
-               vol = self.volctrl.getVolume()
-               self.volumeDialog.show()
-               if is_muted:
-                       self.volMute() # unmute
-               elif not vol:
-                       self.volMute(False, True) # mute but dont show mute symbol
-               if self.volctrl.isMuted():
-                       self.volumeDialog.setValue(0)
-               else:
-                       self.volumeDialog.setValue(self.volctrl.getVolume())
-               self.volSave()
-               self.hideVolTimer.start(3000, True)
-
-       def volHide(self):
-               self.volumeDialog.hide()
-
-       def volMute(self, showMuteSymbol=True, force=False):
-               vol = self.volctrl.getVolume()
-               if vol or force:
-                       self.volctrl.volumeToggleMute()
-                       if self.volctrl.isMuted():
-                               if showMuteSymbol:
-                                       self.muteDialog.show()
-                               self.volumeDialog.setValue(0)
-                       else:
-                               self.muteDialog.hide()
-                               self.volumeDialog.setValue(vol)
-

 profile("Standby,PowerKey")
 import Screens.Standby
 from Screens.Menu import MainMenu, mdom
 profile("Standby,PowerKey")
 import Screens.Standby
 from Screens.Menu import MainMenu, mdom

-import xml.dom.minidom
+from GlobalActions import globalActionMap

 
 class PowerKey:
        """ PowerKey stuff - handles the powerkey press and powerkey release actions"""
 
 class PowerKey:
        """ PowerKey stuff - handles the powerkey press and powerkey release actions"""


@@ -426,31 +357,29 @@ class PowerKey:
 
        def shutdown(self):
                print "PowerOff - Now!"
 
        def shutdown(self):
                print "PowerOff - Now!"

-               if not Screens.Standby.inTryQuitMainloop:
+               if not Screens.Standby.inTryQuitMainloop and self.session.current_dialog and self.session.current_dialog.ALLOW_SUSPEND:

                        self.session.open(Screens.Standby.TryQuitMainloop, 1)
                        self.session.open(Screens.Standby.TryQuitMainloop, 1)

-               
+

        def powerlong(self):
        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"
                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
 
        def powerdown(self):
                self.standbyblocked = 0


@@ -461,7 +390,7 @@ class PowerKey:
                        self.standby()
 
        def standby(self):
                        self.standby()
 
        def standby(self):

-               if not Screens.Standby.inStandby and self.session.current_dialog and self.session.current_dialog.ALLOW_SUSPEND:
+               if not Screens.Standby.inStandby and self.session.current_dialog and self.session.current_dialog.ALLOW_SUSPEND and self.session.in_exec:

                        self.session.open(Screens.Standby.Standby)
 
 profile("Scart")
                        self.session.open(Screens.Standby.Standby)
 
 profile("Scart")


@@ -494,24 +423,29 @@ profile("Load:CI")
 from enigma import eDVBCIInterfaces
 from Screens.Ci import CiHandler
 
 from enigma import eDVBCIInterfaces
 from Screens.Ci import CiHandler
 

+profile("Load:VolumeControl")
+from Components.VolumeControl import VolumeControl
+

 def runScreenTest():
 def runScreenTest():

+       config.misc.startCounter.value += 1
+

        profile("readPluginList")
        plugins.readPluginList(resolveFilename(SCOPE_PLUGINS))
 
        profile("Init:Session")
        profile("readPluginList")
        plugins.readPluginList(resolveFilename(SCOPE_PLUGINS))
 
        profile("Init:Session")

-       session = Session(desktop = getDesktop(0), summary_desktop = getDesktop(1), navigation = Navigation())
+       nav = Navigation(config.misc.isNextRecordTimerAfterEventActionAuto.value)
+       session = Session(desktop = getDesktop(0), summary_desktop = getDesktop(1), navigation = nav)

 
        CiHandler.setSession(session)
 
 
        CiHandler.setSession(session)
 

-       screensToRun = [ ]
-
-       for p in plugins.getPlugins(PluginDescriptor.WHERE_WIZARD):
-               screensToRun.append(p.__call__)
+       screensToRun = [ p.__call__ for p in plugins.getPlugins(PluginDescriptor.WHERE_WIZARD) ]

 
        profile("wizards")
        screensToRun += wizardManager.getWizards()
 
 
        profile("wizards")
        screensToRun += wizardManager.getWizards()
 

-       screensToRun.append(Screens.InfoBar.InfoBar)
+       screensToRun.append((100, Screens.InfoBar.InfoBar))
+
+       screensToRun.sort()

 
        ePythonConfigQuery.setQueryFunc(configfile.getResolvedKey)
 
 
        ePythonConfigQuery.setQueryFunc(configfile.getResolvedKey)
 


@@ -526,12 +460,13 @@ def runScreenTest():
                        quitMainloop(*result)
                        return
 
                        quitMainloop(*result)
                        return
 

-               screen = screensToRun[0]
+               screen = screensToRun[0][1]
+               args = screensToRun[0][2:]

 
 

-               if len(screensToRun):
-                       session.openWithCallback(boundFunction(runNextScreen, session, screensToRun[1:]), screen)
+               if screensToRun:
+                       session.openWithCallback(boundFunction(runNextScreen, session, screensToRun[1:]), screen, *args)

                else:
                else:

-                       session.open(screen)
+                       session.open(screen, *args)

 
        runNextScreen(session, screensToRun)
 
 
        runNextScreen(session, screensToRun)
 


@@ -546,33 +481,46 @@ def runScreenTest():
        profile("RunReactor")
        profile_final()
        runReactor()
        profile("RunReactor")
        profile_final()
        runReactor()

-       profile("configfile.save")
-       configfile.save()
+
+       config.misc.startCounter.save()

 
        profile("wakeup")
 
        profile("wakeup")

-       from time import time
-       from Tools.DreamboxHardware import setFPWakeuptime
+       from time import time, strftime, localtime
+       from Tools.DreamboxHardware import setFPWakeuptime, getFPWakeuptime, setRTCtime

        #get currentTime
        nowTime = time()
        wakeupList = [
        #get currentTime
        nowTime = time()
        wakeupList = [

-               x for x in
-                               [session.nav.RecordTimer.getNextRecordingTime(),
-                               session.nav.RecordTimer.getNextZapTime(),
-                               plugins.getNextWakeupTime()]
-               if x != -1
+               x for x in ((session.nav.RecordTimer.getNextRecordingTime(), 0, session.nav.RecordTimer.isNextRecordAfterEventActionAuto()),
+                                       (session.nav.RecordTimer.getNextZapTime(), 1),
+                                       (plugins.getNextWakeupTime(), 2))
+               if x[0] != -1

        ]
        wakeupList.sort()
        ]
        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
+       recordTimerWakeupAuto = False
+       if wakeupList:
+               from time import strftime
+               startTime = wakeupList[0]
+               if (startTime[0] - nowTime) < 270: # no time to switch box back on
+                       wptime = nowTime + 30  # so switch back on in 30 seconds

                else:
                else:

-                       setFPWakeuptime(startTime - 300)
+                       wptime = startTime[0] - 240
+               if not config.misc.useTransponderTime.value:
+                       print "dvb time sync disabled... so set RTC now to current linux time!", strftime("%Y/%m/%d %H:%M", localtime(nowTime))
+                       setRTCtime(nowTime)
+               print "set wakeup time to", strftime("%Y/%m/%d %H:%M", localtime(wptime))
+               setFPWakeuptime(wptime)
+               recordTimerWakeupAuto = startTime[1] == 0 and startTime[2]
+       config.misc.isNextRecordTimerAfterEventActionAuto.value = recordTimerWakeupAuto
+       config.misc.isNextRecordTimerAfterEventActionAuto.save()
+

        profile("stopService")
        session.nav.stopService()
        profile("nav shutdown")
        session.nav.shutdown()
 
        profile("stopService")
        session.nav.stopService()
        profile("nav shutdown")
        session.nav.shutdown()
 

+       profile("configfile.save")
+       configfile.save()
+

        return 0
 
 profile("Init:skin")
        return 0
 
 profile("Init:skin")


@@ -619,6 +567,11 @@ profile("Init:CI")
 import Screens.Ci
 Screens.Ci.InitCiConfig()
 
 import Screens.Ci
 Screens.Ci.InitCiConfig()
 

+#from enigma import dump_malloc_stats
+#t = eTimer()
+#t.callback.append(dump_malloc_stats)
+#t.start(1000)
+

 # first, setup a screen
 try:
        runScreenTest()
 # first, setup a screen
 try:
        runScreenTest()