from enigma import *
from tools import *
-import RecordTimer
+import traceback
+import Screens.InfoBar
import sys
import time
-from screens import *
-from skin import applyGUIskin
+import ServiceReference
-# 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 Navigation import Navigation
-# we thus have one (static) hierarchy of screens (classes, not instances)
-# and one with the instanciated components itself (both global and dynamic)
+from skin import readSkin, applyAllAttributes
+
+from Components.config import configfile
had = dict()
# + ":" + str(dir.__class__)
-# defined components
-components = {}
-
-# do global
-doGlobal(components)
-
# display
class OutputDevice:
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):
def processDelay(self):
self.execEnd()
+ callback = self.currentDialog.callback
+ retval = self.currentDialog.returnValue
+
if self.currentDialog.isTmp:
self.currentDialog.doClose()
- print sys.getrefcount(self.currentDialog)
del self.currentDialog.instance
- dump(self.currentDialog)
+# dump(self.currentDialog)
del self.currentDialog
+ else:
+ del self.currentDialog.callback
self.popCurrent()
-
+ if callback is not None:
+ callback(*retval)
+
def execBegin(self):
self.currentDialog.execBegin()
self.currentDialog.instance.show()
def create(self, screen, arguments):
# creates an instance of 'screen' (which is a class)
- return screen(self, *arguments)
+ 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):
- dlg = self.create(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
+
+ # 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)
-
- applyGUIskin(dlg, None, dlg.skinName, self.desktop)
-
+ gui.create(dlg, self.desktop)
+
return dlg
def pushCurrent(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 keyEvent(self, code):
-# print "code " + str(code)
- if code == 32:
- self.currentDialog["okbutton"].instance.push()
-
- if code == 33:
- self.currentDialog["channelSwitcher"].instance.push()
-
- if code >= 0x30 and code <= 0x39:
- try:
- self.currentDialog["menu"].instance.moveSelection(code - 0x31)
- except:
- self.currentDialog["list"].instance.moveSelection(code - 0x31)
+ print "code " + str(code)
- def close(self):
+ def close(self, *retval):
+ self.currentDialog.returnValue = retval
self.delayTimer.start(0, 1)
-# TODO: remove pNavgation, eNavigation and rewrite this stuff in python.
-class Navigation:
- def __init__(self):
- self.pnav = pNavigation()
- self.pnav.m_event.get().append(self.callEvent)
- self.event = [ ]
- self.currentlyPlayingService = None
-
- self.RecordTimer = RecordTimer.RecordTimer()
-
- def callEvent(self, i):
- for x in self.event:
- x(i)
-
- def playService(self, ref):
- self.currentlyPlayingServiceReference = None
- if not self.pnav.playService(ref):
- self.currentlyPlayingServiceReference = ref
- return 0
- return 1
-
- def getCurrentlyPlayingServiceReference(self):
- return self.currentlyPlayingServiceReference
-
- def recordService(self, ref):
- service = iRecordableServicePtr()
- print "recording service: %s" % (str(ref))
- if self.pnav.recordService(ref, service):
- print "record returned non-zero"
- return None
- else:
- print "ok, recordService didn't fail"
- return service
-
- def enqueueService(self, ref):
- return self.pnav.enqueueService(ref)
-
- def getCurrentService(self):
- service = iPlayableServicePtr()
- if self.pnav.getCurrentService(service):
- return None
- return service
-
- def getPlaylist(self):
- playlist = ePlaylistPtr()
- if self.pnav.getPlaylist(playlist):
- return None
- return playlist
-
- def pause(self, p):
- return self.pnav.pause(p)
-
- def recordWithTimer(self, begin, end, ref, epg):
- entry = RecordTimer.RecordTimerEntry(begin, end, self, ref, epg)
- self.RecordTimer.record(entry)
- return entry
def runScreenTest():
session = Session()
session.nav = Navigation()
- session.open(infoBar)
+ 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()
+skin.loadSkin(getDesktop())
-# 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)
-#
+import Components.InputDevice
+Components.InputDevice.InitInputDevices()
+
+import Components.AVSwitch
+Components.AVSwitch.InitAVSwitch()
+
+import Components.Network
+Components.Network.InitNetwork()
+import Components.Lcd
+Components.Lcd.InitLcd()
+
+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
git.cweiske.de / enigma2.git / blobdiff