X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FServiceList.py;h=3452e27d7341f4ae641bce298e35e6d92896a568;hp=6145adefffae00fe418f2411cf313727e7c1bf3d;hb=1398385cff4a4fc4d770afa1e9d1f6d560431b23;hpb=e3f30d7502421d19d5ecf421bbc107ae1d316587 diff --git a/lib/python/Components/ServiceList.py b/lib/python/Components/ServiceList.py index 6145ade..3452e27 100644 --- a/lib/python/Components/ServiceList.py +++ b/lib/python/Components/ServiceList.py @@ -1,11 +1,13 @@ -from HTMLComponent import * -from GUIComponent import * +from HTMLComponent import HTMLComponent +from GUIComponent import GUIComponent +from skin import parseColor, parseFont -from enigma import * +from enigma import eListboxServiceContent, eListbox, eServiceCenter, eServiceReference, gFont, eRect +from Tools.LoadPixmap import LoadPixmap -from string import upper +from Tools.Directories import resolveFilename, SCOPE_CURRENT_SKIN -from Tools.Directories import resolveFilename, SCOPE_SKIN, SCOPE_SKIN_IMAGE, SCOPE_FONTS +from Components.config import config class ServiceList(HTMLComponent, GUIComponent): MODE_NORMAL = 0 @@ -15,28 +17,89 @@ class ServiceList(HTMLComponent, GUIComponent): GUIComponent.__init__(self) self.l = eListboxServiceContent() - pic = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "folder.png")) + pic = LoadPixmap(cached=True, path=resolveFilename(SCOPE_CURRENT_SKIN, "skin_default/icons/folder.png")) if pic: self.l.setPixmap(self.l.picFolder, pic) - pic = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "marker-fs8.png")) + pic = LoadPixmap(resolveFilename(SCOPE_CURRENT_SKIN, "skin_default/icons/marker.png")) if pic: self.l.setPixmap(self.l.picMarker, pic) - pic = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "ico_dvb_s-fs8.png")) + pic = LoadPixmap(resolveFilename(SCOPE_CURRENT_SKIN, "ico_dvb_s-fs8.png")) if pic: self.l.setPixmap(self.l.picDVB_S, pic) - pic = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "ico_dvb_c-fs8.png")) + pic = LoadPixmap(resolveFilename(SCOPE_CURRENT_SKIN, "ico_dvb_c-fs8.png")) if pic: self.l.setPixmap(self.l.picDVB_C, pic) - pic = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "ico_dvb_t-fs8.png")) + pic = LoadPixmap(resolveFilename(SCOPE_CURRENT_SKIN, "ico_dvb_t-fs8.png")) if pic: self.l.setPixmap(self.l.picDVB_T, pic) + pic = LoadPixmap(resolveFilename(SCOPE_CURRENT_SKIN, "ico_service_group-fs8.png")) + if pic: + self.l.setPixmap(self.l.picServiceGroup, pic) + self.root = None self.mode = self.MODE_NORMAL + self.ItemHeight = 28 + self.ServiceNameFont = parseFont("Regular;22", ((1,1),(1,1))) + self.ServiceInfoFont = parseFont("Regular;18", ((1,1),(1,1))) + self.ServiceNumberFont = parseFont("Regular;20", ((1,1),(1,1))) + self.onSelectionChanged = [ ] + + def applySkin(self, desktop, parent): + attribs = [ ] + if self.skinAttributes is not None: + attribs = [ ] + for (attrib, value) in self.skinAttributes: + if attrib == "foregroundColorMarked": + self.l.setColor(eListboxServiceContent.markedForeground, parseColor(value)) + elif attrib == "foregroundColorMarkedSelected": + self.l.setColor(eListboxServiceContent.markedForegroundSelected, parseColor(value)) + elif attrib == "backgroundColorMarked": + self.l.setColor(eListboxServiceContent.markedBackground, parseColor(value)) + elif attrib == "backgroundColorMarkedSelected": + self.l.setColor(eListboxServiceContent.markedBackgroundSelected, parseColor(value)) + elif attrib == "foregroundColorServiceNotAvail": + self.l.setColor(eListboxServiceContent.serviceNotAvail, parseColor(value)) + elif attrib == "colorEventProgressbar": + self.l.setColor(eListboxServiceContent.serviceEventProgressbarColor, parseColor(value)) + elif attrib == "colorEventProgressbarSelected": + self.l.setColor(eListboxServiceContent.serviceEventProgressbarColorSelected, parseColor(value)) + elif attrib == "colorEventProgressbarBorder": + self.l.setColor(eListboxServiceContent.serviceEventProgressbarBorderColor, parseColor(value)) + elif attrib == "colorEventProgressbarBorderSelected": + self.l.setColor(eListboxServiceContent.serviceEventProgressbarBorderColorSelected, parseColor(value)) + elif attrib == "picServiceEventProgressbar": + pic = LoadPixmap(resolveFilename(SCOPE_CURRENT_SKIN, value)) + if pic: + self.l.setPixmap(self.l.picServiceEventProgressbar, pic) + elif attrib == "serviceItemHeight": + self.ItemHeight = int(value) + elif attrib == "serviceNameFont": + self.ServiceNameFont = parseFont(value, ((1,1),(1,1))) + elif attrib == "serviceInfoFont": + self.ServiceInfoFont = parseFont(value, ((1,1),(1,1))) + elif attrib == "serviceNumberFont": + self.ServiceNumberFont = parseFont(value, ((1,1),(1,1))) + else: + attribs.append((attrib, value)) + self.skinAttributes = attribs + return GUIComponent.applySkin(self, desktop, parent) + + def connectSelChanged(self, fnc): + if not fnc in self.onSelectionChanged: + self.onSelectionChanged.append(fnc) + + def disconnectSelChanged(self, fnc): + if fnc in self.onSelectionChanged: + self.onSelectionChanged.remove(fnc) + + def selectionChanged(self): + for x in self.onSelectionChanged: + x() def setCurrent(self, ref): self.l.setCurrent(ref) @@ -62,7 +125,7 @@ class ServiceList(HTMLComponent, GUIComponent): # TODO fill with life print "Next char: " index = self.l.getNextBeginningWithChar(char) - indexup = self.l.getNextBeginningWithChar(upper(char)) + indexup = self.l.getNextBeginningWithChar(char.upper()) if indexup != 0: if (index > indexup or index == 0): index = indexup @@ -89,8 +152,13 @@ class ServiceList(HTMLComponent, GUIComponent): def postWidgetCreate(self, instance): instance.setWrapAround(True) instance.setContent(self.l) + instance.selectionChanged.get().append(self.selectionChanged) self.setMode(self.mode) + def preWidgetRemove(self, instance): + instance.setContent(None) + instance.selectionChanged.get().remove(self.selectionChanged) + def getRoot(self): return self.root @@ -118,6 +186,7 @@ class ServiceList(HTMLComponent, GUIComponent): self.l.setRoot(root, justSet) if not justSet: self.l.sort() + self.selectionChanged() def removeCurrent(self): self.l.removeCurrent() @@ -158,17 +227,24 @@ class ServiceList(HTMLComponent, GUIComponent): def setMode(self, mode): self.mode = mode - + self.l.setItemHeight(self.ItemHeight) + self.l.setVisualMode(eListboxServiceContent.visModeComplex) if mode == self.MODE_NORMAL: - self.instance.setItemHeight(28) - self.l.setVisualMode(eListboxServiceContent.visModeSimple) - self.l.setElementFont(self.l.celServiceName, gFont("Regular", 22)) - self.l.setElementPosition(self.l.celServiceName, eRect(0, 0, self.instance.size().width(), 28)) + if config.usage.show_event_progress_in_servicelist.value: + self.l.setElementPosition(self.l.celServiceEventProgressbar, eRect(0, 0, 52, self.ItemHeight)) + else: + self.l.setElementPosition(self.l.celServiceEventProgressbar, eRect(0, 0, 0, 0)) + self.l.setElementFont(self.l.celServiceName, self.ServiceNameFont) + self.l.setElementPosition(self.l.celServiceName, eRect(0, 0, self.instance.size().width(), self.ItemHeight)) + self.l.setElementFont(self.l.celServiceInfo, self.ServiceInfoFont) else: - self.instance.setItemHeight(28) - self.l.setElementFont(self.l.celServiceNumber, gFont("Regular", 20)) - self.l.setElementPosition(self.l.celServiceNumber, eRect(0, 0, 50, 28)) - self.l.setElementFont(self.l.celServiceName, gFont("Regular", 22)) - self.l.setElementPosition(self.l.celServiceName, eRect(60, 0, self.instance.size().width()-60, 28)) - self.l.setElementFont(self.l.celServiceInfo, gFont("Regular", 18)) - self.l.setVisualMode(eListboxServiceContent.visModeComplex) + if config.usage.show_event_progress_in_servicelist.value: + self.l.setElementPosition(self.l.celServiceEventProgressbar, eRect(60, 0, 52, self.ItemHeight)) + else: + self.l.setElementPosition(self.l.celServiceEventProgressbar, eRect(60, 0, 0, 0)) + self.l.setElementFont(self.l.celServiceNumber, self.ServiceNumberFont) + self.l.setElementPosition(self.l.celServiceNumber, eRect(0, 0, 50, self.ItemHeight)) + self.l.setElementFont(self.l.celServiceName, self.ServiceNameFont) + self.l.setElementPosition(self.l.celServiceName, eRect(60, 0, self.instance.size().width()-60, self.ItemHeight)) + self.l.setElementFont(self.l.celServiceInfo, self.ServiceInfoFont) +