- fixed console input mode restore
[enigma2.git] / mytest.py
index 53a398e..2f6cecf 100644 (file)
--- a/mytest.py
+++ b/mytest.py
@@ -6,6 +6,13 @@ 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
@@ -25,17 +32,7 @@ def dump(dir, p = ""):
 components = {}
 
 # do global
-screens["global"](components)
-
-# test our screens
-components["$001"] = screens["testDialog"]()
-components["$002"] = screens["clockDisplay"](components["clock"])
-
-print "*** classes:"
-dump(screens)
-
-print "*** instances:"
-dump(components)
+doGlobal(components)
 
 # display
 
@@ -55,93 +52,83 @@ class GUIOutputDevice(OutputDevice):
        def create(self, comp):
                comp.createGUIScreen(self.parent)
 
-
-
-def test():
-       desktop = getDesktop()
-       print "desktop: " + str(desktop)
-
-       wnd = eWindow(desktop)
-       print "window " + str(wnd)
-       wnd.setTitle("python")
-       wnd.move(ePoint(300, 100))
-       wnd.resize(eSize(300, 300))
-
-       gui = GUIOutputDevice()
-       gui.parent = wnd
-       gui.create(components["$002"])
-#      for (x,y) in components["$001"].data.items():
-#              print str(x) + " -> " + str(y) + " (" + y["instance"].getText() + ")"
-
-#      print components["$001"].data["okbutton"]["instance"].doClick()
-
-# diese sachen gehoeren in den skin! :)
-       applyGUIskin(components["$002"], None, "clockDialog")
-       
-# das ist dann schon die echte funktionalitaet ;)
-       components["clock"].doClock()
-       components["clock"].doClock()
-
-
-# output as html
-       print "--------------------------------------"
-       html.create(components["$001"])
-       print "--------------------------------------"
-       html.create(components["$002"])
-       print "--------------------------------------"
+class Session:
+       def __init__(self):
+               self.desktop = None
+               self.delayTimer = eTimer()
+               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()
+               
+               del self.currentDialog
+               del self.currentWindow
+               
+               if len(self.dialogStack):
+                       (self.currentDialog, self.currentWindow) = self.dialogStack.pop()
+                       self.currentWindow.show()
        
-# direkter test der GUI aus python:
-#      label1 = eLabel(wnd)
-#      label1.setText("hello world!\nfrom python!")
-#      label1.move(ePoint(10, 10))
-#      label1.resize(eSize(80, 50))
-#
-#      label2 = eLabel(wnd)
-#      label2.setText("the second\nlabel works\nas well!")
-#      label2.move(ePoint(90, 10))
-#      label2.resize(eSize(80, 50))
-#
-#      button = eButton(wnd)
-#      button.setText("OK")
-#      button.move(ePoint(200, 10))
-#      button.resize(eSize(80, 50)) 
-
-       wnd.show()
-       
-       components["$002"].data["okbutton"]["instance"].push()  
-
-       for x in range(200):
-               time.sleep(0.1)
-               components["clock"].doClock()
-               if x > 100:
-                       r = 200 - x
+       def open(self, screen):
+               if self.currentDialog:
+                       self.dialogStack.append((self.currentDialog, self.currentWindow))
+                       self.currentWindow.hide()
+               
+               self.currentDialog = screen
+               screen.session = self
+               
+               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, wnd, None, screen.__class__.__name__)
+
+                       wnd.show()
                else:
-                       r = x
-#              components["$002"]["okbutton"].setValue(r)
-               desktop.paint()
+                       self.currentWindow = None
+
+       def keyEvent(self, code):
+#              print "code " + str(code)
+               if code == 32:
+                       self.currentDialog.data["okbutton"]["instance"].push()
+
+               if code == 33:
+                       self.currentDialog.data["channelSwitcher"]["instance"].push()
+               
+               if code >= 0x30 and code <= 0x39:
+                       try:
+                               self.currentDialog.data["menu"]["instance"].moveSelection(code - 0x31)
+                       except:
+                               self.currentDialog.data["list"]["instance"].moveSelection(code - 0x31)
+
+       def close(self):
+               self.delayTimer.start(0, 1)
+
+def runScreenTest():
+       session = Session()
+       session.desktop = getDesktop()
        
-#      
-#      print "delete label1"
-#      del button
-#      del label2
-#      del label1
-#      print "delete wnd"
-#      del wnd
-#      print "bye"
+       session.open(infoBar())
 
+       CONNECT(keyPressedSignal(), session.keyEvent)
        
+       runMainloop()
        
        return 0
 
-def testI2(a):
-       print "PYTHON says: it's a " + str(a) + "!!!"
-       return 0
 
-def testI(a = 0):
-       print "magic integer is " + str(a)
-       
-       list = testsignal.get()
-       print "list -> " + str(list)
-       list.append(testI2)
-       return 1
+# first, setup a screen
+runScreenTest()
+
+# now, run the mainloop