show service name in movielist

diff --git a/lib/python/Components/MovieList.py b/lib/python/Components/MovieList.py
index bc659114f308bbf7a596a04a37d1dbf793129e20..a921b8df088daacc16d7837b4b521fbcc6a50b0e 100644 (file)
--- a/lib/python/Components/MovieList.py
+++ b/lib/python/Components/MovieList.py
@@ -32,7 +32,10 @@ def MovieListEntry(serviceref, serviceHandler):
        begin = info.getInfo(serviceref, iServiceInformation.sTimeCreate)
        res = [ (serviceref, begin) ]
 
-       res.append(MultiContentEntryText(pos=(0, 0), size=(560, 30), font = 0, flags = RT_HALIGN_LEFT, text = info.getName(serviceref)))
+       res.append(MultiContentEntryText(pos=(0, 0), size=(420, 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 = 0, flags = RT_HALIGN_RIGHT, text = service.getServiceName()))
        
        description = info.getInfoString(serviceref, iServiceInformation.sDescription)
 
@@ -53,7 +56,7 @@ class MovieList(HTMLComponent, GUIComponent):
                self.l = eListboxPythonMultiContent()
                if root is not None:
                        self.reload(root)
-               self.l.setFont(0, gFont("Regular", 30))
+               self.l.setFont(0, gFont("Regular", 22))
                self.l.setFont(1, gFont("Regular", 18))
                
        def moveToIndex(self, index):

diff --git a/lib/service/iservice.h b/lib/service/iservice.h
index e74fa0a689692bd40872e7032139bd6734b0c09c..822910f9ae4798642e42125b38c245b7627b67f8 100644 (file)
--- a/lib/service/iservice.h
+++ b/lib/service/iservice.h
@@ -251,6 +251,7 @@ public:
                sProvider,
                
                sDescription,
+               sServiceref,
                sTimeCreate,    // unix time or string
                
                sTitle,

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 033d13d3906702be1a6fb0ae843a59a1a6e162c6..94c31b4f1ab787dfe6b89519a7f7e3157c3f631a 100644 (file)
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -186,6 +186,8 @@ int eStaticServiceDVBPVRInformation::getInfo(const eServiceReference &ref, int w
        {
        case iServiceInformation::sDescription:
                return iServiceInformation::resIsString;
+       case iServiceInformation::sServiceref:
+               return iServiceInformation::resIsString;
        case iServiceInformation::sTimeCreate:
                if (m_parser.m_time_create)
                        return m_parser.m_time_create;
@@ -202,6 +204,8 @@ std::string eStaticServiceDVBPVRInformation::getInfoString(const eServiceReferen
        {
        case iServiceInformation::sDescription:
                return m_parser.m_description;
+       case iServiceInformation::sServiceref:
+               return m_parser.m_ref.toString();
        default:
                return "";
        }