timer: fix displayed state. Don't save instant records. properly remove timerentries.
[enigma2.git] / mytest.py
index e4a722ac3cc265c527271649b03ac83c85e7a650..ef2f6fb6388a8971ff74e3939fe015e1a7547cf8 100644 (file)
--- a/mytest.py
+++ b/mytest.py
@@ -1,47 +1,37 @@
 from enigma import *
+from tools import *
+
+import traceback
+import Screens.InfoBar
 
 import sys
 import time
 
-from screens import *
-from skin import applyGUIskin
-
+import ServiceReference
 
-def CONNECT(slot, fnc):
-       slot.get().append(fnc)
+from Navigation import Navigation
 
-def DISCONNECT(slot, fnc):
-       slot.get().remove(fnc)
+from skin import readSkin, applyAllAttributes
 
-# A screen is a function which instanciates all components of a screen into a temporary component.
-# Thus, the global stuff is a screen, too.
-# In a screen, components can either be instanciated from the class-tree, cloned (copied) or
-# "linked" from the instance tree.
-# A screen itself lives as the container of the components, so a screen is a component, too.
+from Components.config import configfile
 
-# we thus have one (static) hierarchy of screens (classes, not instances)
-# and one with the instanciated components itself (both global and dynamic)
+had = dict()
 
 def dump(dir, p = ""):
        if isinstance(dir, dict):
                for (entry, val) in dir.items():
-                       dump(val, p + "/" + entry)
-       print p + ":" + str(dir.__class__)
-
-# defined components
-components = {}
-
-# do global
-screens["global"](components)
-
-# test our screens
-components["$001"] = screens["testDialog"]()
-
-#print "*** classes:"
-#dump(screens)
-#
-#print "*** instances:"
-#dump(components)
+                       dump(val, p + "(dict)/" + entry)
+       if hasattr(dir, "__dict__"):
+               for name, value in dir.__dict__.items():
+                       if not had.has_key(str(value)):
+                               had[str(value)] = 1
+                               dump(value, p + "/" + str(name))
+                       else:
+                               print p + "/" + str(name) + ":" + str(dir.__class__) + "(cycle)"
+       else:
+               print p + ":" + str(dir)
+
+# + ":" + str(dir.__class__)
 
 # display
 
@@ -58,8 +48,8 @@ html = HTMLOutputDevice()
 
 class GUIOutputDevice(OutputDevice):
        parent = None
-       def create(self, comp):
-               comp.createGUIScreen(self.parent)
+       def create(self, comp, desktop):
+               comp.createGUIScreen(self.parent, desktop)
 
 class Session:
        def __init__(self):
@@ -68,75 +58,154 @@ class Session:
                self.delayTimer.timeout.get().append(self.processDelay)
                
                self.currentDialog = None
+               
+               self.dialogStack = [ ]
        
        def processDelay(self):
-               self.currentDialog.close()
-               if self.currentWindow != None:
-                       self.currentWindow.hide()
+               self.execEnd()
                
-               del self.currentDialog
-               del self.currentWindow
+               callback = self.currentDialog.callback
+               retval = self.currentDialog.returnValue
                
-               self.open(screens["testDialog"]())
-
-       def open(self, screen):
-               self.currentDialog = screen
-               screen.session = self
+               if self.currentDialog.isTmp:
+                       self.currentDialog.doClose()
                
-               if self.desktop != None:
-                       self.currentWindow = wnd = eWindow(self.desktop)
-                       wnd.setTitle("Screen from python!")
-                       wnd.move(ePoint(300, 100))
-                       wnd.resize(eSize(300, 300))
-
-                       gui = GUIOutputDevice()
-                       gui.parent = wnd
-                       gui.create(self.currentDialog)
-
-                       applyGUIskin(self.currentDialog, None, screen.__class__.__name__)
-
-                       wnd.show()
+                       del self.currentDialog.instance
+#                      dump(self.currentDialog)
+                       del self.currentDialog
                else:
-                       self.currentWindow = None
+                       del self.currentDialog.callback
+               
+               self.popCurrent()
+               if callback is not None:
+                       callback(*retval)
 
-       def keyEvent(self, code):
-#              print "code " + str(code)
-               if code == 32:
-                       self.currentDialog.data["okbutton"]["instance"].push()
+       def execBegin(self):
+                       self.currentDialog.execBegin()
+                       self.currentDialog.instance.show()
+               
+       def execEnd(self):
+                       self.currentDialog.execEnd()
+                       self.currentDialog.instance.hide()
+       
+       def create(self, screen, arguments):
+               # creates an instance of 'screen' (which is a class)
+               try:
+                       return screen(self, *arguments)
+               except TypeError, x:
+                       errstr = "Screen %s(%s): %s" % (str(screen), str(arguments), str(x))
+                       raise TypeError(errstr)
+       
+       def instantiateDialog(self, screen, *arguments):
+               # create dialog
+               
+               try:
+                       dlg = self.create(screen, arguments)
+               except:
+                       print 'EXCEPTION IN DIALOG INIT CODE, ABORTING:'
+                       print '-'*60
+                       traceback.print_exc(file=sys.stdout)
+                       quitMainloop(5)
+                       print '-'*60
                
-               if code >= 0x30 and code <= 0x39:
-                       self.currentDialog.data["menu"]["instance"].moveSelection(code - 0x31)
+               # read skin data
+               readSkin(dlg, None, dlg.skinName, self.desktop)
+
+               # create GUI view of this dialog
+               assert self.desktop != None
+               dlg.instance = eWindow(self.desktop)
+               applyAllAttributes(dlg.instance, self.desktop, dlg.skinAttributes)
+               gui = GUIOutputDevice()
+               gui.parent = dlg.instance
+               gui.create(dlg, self.desktop)
+               
+               return dlg
+        
+       def pushCurrent(self):
+               if self.currentDialog:
+                       self.dialogStack.append(self.currentDialog)
+                       self.execEnd()
+       
+       def popCurrent(self):
+               if len(self.dialogStack):
+                       self.currentDialog = self.dialogStack.pop()
+                       self.execBegin()
+
+       def execDialog(self, dialog):
+               self.pushCurrent()
+               self.currentDialog = dialog
+               self.currentDialog.isTmp = False
+               self.currentDialog.callback = None # would cause re-entrancy problems.
+               self.execBegin()
+
+       def openWithCallback(self, callback, screen, *arguments):
+               self.open(screen, *arguments)
+               self.currentDialog.callback = callback
+
+       def open(self, screen, *arguments):
+               self.pushCurrent()
+               self.currentDialog = self.instantiateDialog(screen, *arguments)
+               self.currentDialog.isTmp = True
+               self.currentDialog.callback = None
+               self.execBegin()
 
-       def close(self):
+       def keyEvent(self, code):
+               print "code " + str(code)
+
+       def close(self, *retval):
+               self.currentDialog.returnValue = retval
                self.delayTimer.start(0, 1)
 
+
 def runScreenTest():
        session = Session()
        session.desktop = getDesktop()
        
-       session.open(screens["clockDisplay"](components["clock"]))
-#      session.open(screens["testDialog"]())
-
-       # simple reason for this helper function: we want to call the currently
-       # active "okbutton", even when we changed the dialog
-       #
-       # more complicated reason: we don't want to hold a reference.
-#      def blub():
-#              session.currentDialog.data["okbutton"]["instance"].push()       
-#              session.currentDialog["okbutton"].setText("hello!")
-#      
-#      tmr = eTimer()
-#      CONNECT(tmr.timeout, blub)
-#      tmr.start(4000, 0)
-#      
+       session.nav = Navigation()
+       
+       session.open(Screens.InfoBar.InfoBar)
+
        CONNECT(keyPressedSignal(), session.keyEvent)
        
        runMainloop()
        
+       configfile.save()
+       
+       session.nav.shutdown()
+       
        return 0
 
+import keymapparser
+keymapparser.readKeymap()
+import skin
+skin.loadSkin(getDesktop())
 
-# first, setup a screen
-runScreenTest()
+import Components.InputDevice
+Components.InputDevice.InitInputDevices()
+
+import Components.AVSwitch
+Components.AVSwitch.InitAVSwitch()
+
+import Components.Network
+Components.Network.InitNetwork()
+
+import Components.Lcd
+Components.Lcd.InitLcd()
 
-# now, run the mainloop
+import Components.SetupDevices
+Components.SetupDevices.InitSetupDevices()
+
+import Components.RFmod
+Components.RFmod.InitRFmod()
+
+import Components.NimManager
+
+# first, setup a screen
+try:
+       runScreenTest()
+except:
+       print 'EXCEPTION IN PYTHON STARTUP CODE:'
+       print '-'*60
+       traceback.print_exc(file=sys.stdout)
+       quitMainloop(5)
+       print '-'*60