ServiceList: allow setMode before GUIcreate

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

diff --git a/lib/python/Components/ServiceList.py b/lib/python/Components/ServiceList.py
index 76e1c822b08a58471b5bb09e68f6da31001f19cf..89b40ed2260eaa48bcaaaad8f35992a819f1fb18 100644 (file)
--- a/lib/python/Components/ServiceList.py
+++ b/lib/python/Components/ServiceList.py
@@ -12,6 +12,11 @@ class ServiceList(HTMLComponent, GUIComponent):
                GUIComponent.__init__(self)
                self.l = eListboxServiceContent()
                self.root = None
+               
+               self.mode = self.MODE_NORMAL
+
+       def setCurrent(self, ref):
+               self.l.setCurrent(ref)
 
        def getCurrent(self):
                r = eServiceReference()
@@ -27,6 +32,7 @@ class ServiceList(HTMLComponent, GUIComponent):
        def GUIcreate(self, parent):
                self.instance = eListbox(parent)
                self.instance.setContent(self.l)
+               self.setMode(self.mode)
        
        def GUIdelete(self):
                self.instance = None
@@ -47,17 +53,14 @@ class ServiceList(HTMLComponent, GUIComponent):
                                        break
                return dest
 
+       def setNumberOffset(self, offset):
+               self.l.setNumberOffset(offset)
+
        def setRoot(self, root):
                self.root = root
                self.l.setRoot(root)
                self.l.sort()
 
-       def cursorGet(self):
-               return self.l.cursorGet()
-
-       def cursorSet(self, val):
-               self.l.cursorSet(val)
-
 # stuff for multiple marks (edit mode / later multiepg)
        def clearMarks(self):
                self.l.initMarked()
@@ -86,13 +89,23 @@ class ServiceList(HTMLComponent, GUIComponent):
                self.l.setCurrentMarked(state)
 
        def setMode(self, mode):
+               self.mode = mode
+
+               try:
+                       self.instance
+               except:
+                       return
+               
                if mode == self.MODE_NORMAL:
-                       self.instance.setItemHeight(25)
+                       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))
                else:
-                       self.instance.setItemHeight(40)
-                       self.l.setElementFont(self.l.celServiceName, gFont("Arial", 30))
-                       self.l.setElementPosition(self.l.celServiceName, eRect(40, 0, self.instance.size().width(), 40))
+                       self.instance.setItemHeight(28)
                        self.l.setElementFont(self.l.celServiceNumber, gFont("Arial", 20))
-                       self.l.setElementPosition(self.l.celServiceNumber, eRect(0, 10, 40, 30))
+                       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.setVisualMode(eListboxServiceContent.visModeComplex)