take care of scrollbar size when build movielist and timerlist entries

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

diff --git a/lib/python/Components/MovieList.py b/lib/python/Components/MovieList.py
index fca96e249c88380693bdc537cf5c9f268f50912c..993e2eeb0dedcca88f028c0b9e54027c3f33fb6c 100644 (file)
--- a/lib/python/Components/MovieList.py
+++ b/lib/python/Components/MovieList.py
@@ -1,16 +1,12 @@
-from HTMLComponent import *
-from GUIComponent import *
+from GUIComponent import GUIComponent
 from Tools.FuzzyDate import FuzzyTime
 from ServiceReference import ServiceReference
-from Components.MultiContent import MultiContentEntryText, RT_HALIGN_LEFT, RT_HALIGN_RIGHT
+from Components.MultiContent import MultiContentEntryText
 
-from enigma import eListboxPythonMultiContent, eListbox, gFont, iServiceInformation
+from enigma import eListboxPythonMultiContent, eListbox, gFont, iServiceInformation, \
+       RT_HALIGN_LEFT, RT_HALIGN_RIGHT, eServiceReference, eServiceCenter
 
-from enigma import eServiceReference, eServiceCenter, \
-       eServiceCenterPtr, iListableServicePtr, \
-       iStaticServiceInformationPtr
-
-class MovieList(HTMLComponent, GUIComponent):
+class MovieList(GUIComponent):
        def __init__(self, root):
                GUIComponent.__init__(self)
                self.l = eListboxPythonMultiContent()
@@ -21,6 +17,7 @@ class MovieList(HTMLComponent, GUIComponent):
                self.l.setFont(1, gFont("Regular", 18))
                self.l.setFont(2, gFont("Regular", 16))
                self.l.setBuildFunc(self.buildMovieListEntry)
+               self.l.setItemHeight(75)
 
        #
        # | name of movie              |
@@ -28,6 +25,13 @@ class MovieList(HTMLComponent, GUIComponent):
        def buildMovieListEntry(self, serviceref, info, begin, len):
                if serviceref.flags & eServiceReference.mustDescent:
                        return None
+               width = self.entry_width
+
+               if len <= 0: #recalc len when not already done
+                       cur_idx = self.l.getCurrentSelectionIndex()
+                       x = self.list[cur_idx]
+                       len = x[1].getLength(x[0]) #recalc the movie length...
+                       self.list[cur_idx] = (x[0], x[1], x[2], len) #update entry in list... so next time we don't need to recalc
 
                if len > 0:
                        len = "%d:%02d" % (len / 60, len % 60)
@@ -36,10 +40,10 @@ class MovieList(HTMLComponent, GUIComponent):
 
                res = [ None ]
 
-               res.append(MultiContentEntryText(pos=(0, 0), size=(420, 30), font = 0, flags = RT_HALIGN_LEFT, text = info.getName(serviceref)))
+               res.append(MultiContentEntryText(pos=(0, 0), size=(width-140, 30), font = 0, flags = RT_HALIGN_LEFT, text = info.getName(serviceref)))
                service = ServiceReference(info.getInfoString(serviceref, iServiceInformation.sServiceref))
                if service is not None:
-                       res.append(MultiContentEntryText(pos=(420, 0), size=(140, 30), font = 2, flags = RT_HALIGN_RIGHT, text = service.getServiceName()))
+                       res.append(MultiContentEntryText(pos=(width-140, 0), size=(140, 30), font = 2, flags = RT_HALIGN_RIGHT, text = service.getServiceName()))
 
                description = info.getInfoString(serviceref, iServiceInformation.sDescription)
 
@@ -48,9 +52,9 @@ class MovieList(HTMLComponent, GUIComponent):
                        t = FuzzyTime(begin)
                        begin_string = t[0] + ", " + t[1]
 
-               res.append(MultiContentEntryText(pos=(0, 30), size=(560, 20), font=1, flags=RT_HALIGN_LEFT, text=description))
-               res.append(MultiContentEntryText(pos=(0, 50), size=(270, 20), font=1, flags=RT_HALIGN_LEFT, text=begin_string))
-               res.append(MultiContentEntryText(pos=(290, 50), size=(270, 20), font=1, flags=RT_HALIGN_RIGHT, text=len))
+               res.append(MultiContentEntryText(pos=(0, 30), size=(width, 20), font=1, flags=RT_HALIGN_LEFT, text=description))
+               res.append(MultiContentEntryText(pos=(0, 50), size=(width-270, 20), font=1, flags=RT_HALIGN_LEFT, text=begin_string))
+               res.append(MultiContentEntryText(pos=(width, 50), size=(270, 20), font=1, flags=RT_HALIGN_RIGHT, text=len))
 
                return res
 
@@ -72,30 +76,26 @@ class MovieList(HTMLComponent, GUIComponent):
        
        def postWidgetCreate(self, instance):
                instance.setContent(self.l)
-               instance.setItemHeight(75)
-       
+               self.entry_width = self.l.getItemSize().width()
+
        def reload(self, root = None, filter_tags = None):
                if root is not None:
                        self.load(root, filter_tags)
                else:
                        self.load(self.root, filter_tags)
                self.l.setList(self.list)
+               self.entry_width = self.l.getItemSize().width()
 
        def removeService(self, service):
                for l in self.list[:]:
                        if l[0] == service:
                                self.list.remove(l)
                self.l.setList(self.list)
+               self.entry_width = self.l.getItemSize().width()
 
        def __len__(self):
                return len(self.list)
 
-       def updateLengthOfIndex(self, index):
-               if len(self.list) > index:
-                       x = self.list[index]
-                       self.list[index] = (x[0], x[1], x[2], x[1].getLength(x[0]))
-                       self.l.invalidateEntry(index)
-
        def load(self, root, filter_tags):
                # this lists our root service, then building a 
                # nice list