From af5dfb0ec911f152f909530cf29c9e2ba74e2c1f Mon Sep 17 00:00:00 2001 From: Stefan Pluecken Date: Mon, 3 Apr 2006 07:46:11 +0000 Subject: show service name in movielist --- lib/python/Components/MovieList.py | 7 +++++-- lib/service/iservice.h | 1 + lib/service/servicedvb.cpp | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/python/Components/MovieList.py b/lib/python/Components/MovieList.py index bc659114..a921b8df 100644 --- 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 e74fa0a6..822910f9 100644 --- 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 033d13d3..94c31b4f 100644 --- 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 ""; } -- cgit v1.2.3