- add sendSignal to eThread
[enigma2.git] / mytest.py
index edaf24a..1a4b036 100644 (file)
--- a/mytest.py
+++ b/mytest.py
@@ -1,4 +1,6 @@
 from enigma import *
+from tools import *
+
 
 import sys
 import time
@@ -6,13 +8,6 @@ import time
 from screens import *
 from skin import applyGUIskin
 
-
-def CONNECT(slot, fnc):
-       slot.get().append(fnc)
-
-def DISCONNECT(slot, fnc):
-       slot.get().remove(fnc)
-
 # 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
@@ -22,26 +17,29 @@ def DISCONNECT(slot, fnc):
 # 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__)
+                       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__)
 
 # defined components
 components = {}
 
 # do global
-screens["global"](components)
-
-# test our screens
-components["$001"] = screens["testDialog"]()
-
-#print "*** classes:"
-#dump(screens)
-#
-#print "*** instances:"
-#dump(components)
+doGlobal(components)
 
 # display
 
@@ -68,44 +66,82 @@ class Session:
                self.delayTimer.timeout.get().append(self.processDelay)
                
                self.currentDialog = None
+               
+               self.dialogStack = [ ]
        
        def processDelay(self):
-               self.currentDialog.doClose()
-               if self.currentWindow != None:
-                       self.currentWindow.hide()
+               self.execEnd()
                
-               del self.currentDialog
-               del self.currentWindow
+               if self.currentDialog.isTmp:
+                       self.currentDialog.doClose()
                
-               self.open(screens["testDialog"]())
-
-       def open(self, screen):
-               self.currentDialog = screen
-               screen.session = self
+                       print sys.getrefcount(self.currentDialog)
+                       del self.currentDialog.instance
+                       dump(self.currentDialog)
+                       del self.currentDialog
                
-               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()
-               else:
-                       self.currentWindow = None
+               self.popCurrent()
+                       
+       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)
+               return screen(self, *arguments)
+       
+       def instantiateDialog(self, screen, *arguments):
+               dlg = self.create(screen, arguments)
+               assert self.desktop != None
+               dlg.instance = eWindow(self.desktop)
+
+               gui = GUIOutputDevice()
+               gui.parent = dlg.instance
+               gui.create(dlg)
+
+               applyGUIskin(dlg, None, dlg.skinName, 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.execBegin()
+
+       def open(self, screen, *arguments):
+               self.pushCurrent()
+               self.currentDialog = self.instantiateDialog(screen, *arguments)
+               self.currentDialog.isTmp = True
+               self.execBegin()
 
        def keyEvent(self, code):
 #              print "code " + str(code)
                if code == 32:
-                       self.currentDialog.data["okbutton"]["instance"].push()
+                       self.currentDialog["okbutton"].instance.push()
+
+               if code == 33:
+                       self.currentDialog["channelSwitcher"].instance.push()
                
                if code >= 0x30 and code <= 0x39:
-                       self.currentDialog.data["menu"]["instance"].moveSelection(code - 0x31)
+                       try:
+                               self.currentDialog["menu"].instance.moveSelection(code - 0x31)
+                       except:
+                               self.currentDialog["list"].instance.moveSelection(code - 0x31)
 
        def close(self):
                self.delayTimer.start(0, 1)
@@ -114,29 +150,39 @@ 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 = pNavigation()
+       
+       session.open(infoBar)
+
        CONNECT(keyPressedSignal(), session.keyEvent)
        
        runMainloop()
        
        return 0
 
+import keymapparser
+keymapparser.readKeymap()
+import skin
+skin.loadSkin()
 
 # first, setup a screen
 runScreenTest()
 
 # now, run the mainloop
+
+#pt = eDebugClassPtr()
+#eDebugClass.getDebug(pt, 12)
+#p = pt.__deref__()
+#print pt.x
+#print p.x
+#print "removing ptr..."
+#pt = 0
+#print "now"
+#print "p is " + str(p)
+#print p.x
+#p = 0
+#
+#bla = eDebugClass()
+#bla = eDebugClass(2)
+#
+