from enigma import *
from tools import *
-import RecordTimer
+import Screens.InfoBar
import sys
import time
-from screens import *
-from skin import applyGUIskin
+import ServiceReference
+
+from Navigation import Navigation
+
+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.
# + ":" + 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):
print sys.getrefcount(self.currentDialog)
del self.currentDialog.instance
- dump(self.currentDialog)
+# dump(self.currentDialog)
del self.currentDialog
self.popCurrent()
return screen(self, *arguments)
def instantiateDialog(self, screen, *arguments):
+ # create dialog
dlg = self.create(screen, arguments)
+
+ # 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):
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):
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()
+ session.nav.shutdown()
+
return 0
import keymapparser
keymapparser.readKeymap()
import skin
-skin.loadSkin()
+skin.loadSkin(getDesktop())
# first, setup a screen
runScreenTest()