add SNRdB to TunerInfo

[enigma2.git] / lib / python / Components / ServiceList.py

diff --git a/lib/python/Components/ServiceList.py b/lib/python/Components/ServiceList.py
index 84e9e82e3b33996cf874bc520bb58dd96decc83a..b5e44b4d3ef72a38c6b7a32e2bf4e30901726552 100644 (file)
--- a/lib/python/Components/ServiceList.py
+++ b/lib/python/Components/ServiceList.py
@@ -1,21 +1,93 @@
-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 string import upper
 

-class ServiceList(HTMLComponent, GUIComponent):
+from Tools.Directories import resolveFilename, SCOPE_SKIN_IMAGE

 
 

+class ServiceList(HTMLComponent, GUIComponent):

        MODE_NORMAL = 0
        MODE_FAVOURITES = 1
 
        def __init__(self):
                GUIComponent.__init__(self)
                self.l = eListboxServiceContent()
        MODE_NORMAL = 0
        MODE_FAVOURITES = 1
 
        def __init__(self):
                GUIComponent.__init__(self)
                self.l = eListboxServiceContent()

+
+               pic = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/icons/folder.png"))
+               if pic:
+                       self.l.setPixmap(self.l.picFolder, pic)
+
+               pic = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/icons/marker.png"))
+               if pic:
+                       self.l.setPixmap(self.l.picMarker, pic)
+
+               pic = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "ico_dvb_s-fs8.png"))
+               if pic:
+                       self.l.setPixmap(self.l.picDVB_S, pic)
+
+               pic = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "ico_dvb_c-fs8.png"))
+               if pic:
+                       self.l.setPixmap(self.l.picDVB_C, pic)
+
+               pic = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "ico_dvb_t-fs8.png"))
+               if pic:
+                       self.l.setPixmap(self.l.picDVB_T, pic)
+
+               pic = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "ico_service_group-fs8.png"))
+               if pic:
+                       self.l.setPixmap(self.l.picServiceGroup, pic)
+

                self.root = None
                self.root = None

-               

                self.mode = self.MODE_NORMAL
                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 == "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)
 
        def setCurrent(self, ref):
                self.l.setCurrent(ref)


@@ -25,12 +97,18 @@ class ServiceList(HTMLComponent, GUIComponent):
                self.l.getCurrent(r)
                return r
 
                self.l.getCurrent(r)
                return r
 

+       def atBegin(self):
+               return self.instance.atBegin()
+
+       def atEnd(self):
+               return self.instance.atEnd()
+

        def moveUp(self):
                self.instance.moveSelection(self.instance.moveUp)
 
        def moveDown(self):
                self.instance.moveSelection(self.instance.moveDown)
        def moveUp(self):
                self.instance.moveSelection(self.instance.moveUp)
 
        def moveDown(self):
                self.instance.moveSelection(self.instance.moveDown)

-               
+

        def moveToChar(self, char):
                # TODO fill with life
                print "Next char: "
        def moveToChar(self, char):
                # TODO fill with life
                print "Next char: "


@@ -43,13 +121,31 @@ class ServiceList(HTMLComponent, GUIComponent):
                self.instance.moveSelectionTo(index)
                print "Moving to character " + str(char)
 
                self.instance.moveSelectionTo(index)
                print "Moving to character " + str(char)
 

-       def GUIcreate(self, parent):
-               self.instance = eListbox(parent)
-               self.instance.setContent(self.l)
-               self.setMode(self.mode)
+       def moveToNextMarker(self):
+               idx = self.l.getNextMarkerPos()
+               self.instance.moveSelectionTo(idx)
+
+       def moveToPrevMarker(self):
+               idx = self.l.getPrevMarkerPos()
+               self.instance.moveSelectionTo(idx)
+
+       def moveToIndex(self, index):
+               self.instance.moveSelectionTo(index)
+
+       def getCurrentIndex(self):
+               return self.instance.getCurrentIndex()
+
+       GUI_WIDGET = eListbox

        
        

-       def GUIdelete(self):
-               self.instance = None
+       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
 
        def getRoot(self):
                return self.root


@@ -70,9 +166,24 @@ class ServiceList(HTMLComponent, GUIComponent):
        def setNumberOffset(self, offset):
                self.l.setNumberOffset(offset)
 
        def setNumberOffset(self, offset):
                self.l.setNumberOffset(offset)
 

-       def setRoot(self, root):
+       def setPlayableIgnoreService(self, ref):
+               self.l.setIgnoreService(ref)
+
+       def setRoot(self, root, justSet=False):

                self.root = root
                self.root = root

-               self.l.setRoot(root)
+               self.l.setRoot(root, justSet)
+               if not justSet:
+                       self.l.sort()
+               self.selectionChanged()
+
+       def removeCurrent(self):
+               self.l.removeCurrent()
+
+       def addService(self, service, beforeCurrent=False):
+               self.l.addService(service, beforeCurrent)
+
+       def finishFill(self):
+               self.l.FillFinished()

                self.l.sort()
 
 # stuff for multiple marks (edit mode / later multiepg)
                self.l.sort()
 
 # stuff for multiple marks (edit mode / later multiepg)


@@ -104,22 +215,17 @@ class ServiceList(HTMLComponent, GUIComponent):
 
        def setMode(self, mode):
                self.mode = mode
 
        def setMode(self, mode):
                self.mode = mode

-
-               try:
-                       self.instance
-               except:
-                       return
-               

                if mode == self.MODE_NORMAL:
                if mode == self.MODE_NORMAL:

-                       self.instance.setItemHeight(28)
-                       self.l.setVisualMode(eListboxServiceContent.visModeSimple)
-                       self.l.setElementFont(self.l.celServiceName, gFont("Arial", 22))
-                       self.l.setElementPosition(self.l.celServiceName, eRect(0, 0, self.instance.size().width(), 28))
+                       self.l.setItemHeight(self.ItemHeight)
+                       self.l.setVisualMode(eListboxServiceContent.visModeComplex)
+                       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:
                else:

-                       self.instance.setItemHeight(28)
-                       self.l.setElementFont(self.l.celServiceNumber, gFont("Arial", 20))
-                       self.l.setElementPosition(self.l.celServiceNumber, eRect(0, 0, 40, 28))
-                       self.l.setElementFont(self.l.celServiceName, gFont("Arial", 22))
-                       self.l.setElementPosition(self.l.celServiceName, eRect(50, 0, self.instance.size().width()-50, 28))
-                       self.l.setElementFont(self.l.celServiceInfo, gFont("Arial", 18))
+                       self.l.setItemHeight(self.ItemHeight)

                        self.l.setVisualMode(eListboxServiceContent.visModeComplex)
                        self.l.setVisualMode(eListboxServiceContent.visModeComplex)

+                       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)