From: Andreas Monzner <andreas.monzner@multimedia-labs.de>
Date: Fri, 29 Dec 2006 15:19:16 +0000 (+0000)
Subject: show current running event in channelist not only in bouquets
X-Git-Tag: 2.6.0~2540
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/5cb2d3d4e46a40693cee0173425f8bc2ade2f09b

show current running event in channelist not only in bouquets
---

diff --git a/lib/python/Components/ServiceList.py b/lib/python/Components/ServiceList.py
index c2d58f2f..0532d248 100644
--- a/lib/python/Components/ServiceList.py
+++ b/lib/python/Components/ServiceList.py
@@ -161,14 +161,15 @@ class ServiceList(HTMLComponent, GUIComponent):
 
 		if mode == self.MODE_NORMAL:
 			self.instance.setItemHeight(28)
-			self.l.setVisualMode(eListboxServiceContent.visModeSimple)
+			self.l.setVisualMode(eListboxServiceContent.visModeComplex)
 			self.l.setElementFont(self.l.celServiceName, gFont("Regular", 22))
 			self.l.setElementPosition(self.l.celServiceName, eRect(0, 0, self.instance.size().width(), 28))
+			self.l.setElementFont(self.l.celServiceInfo, gFont("Regular", 18))
 		else:
 			self.instance.setItemHeight(28)
+			self.l.setVisualMode(eListboxServiceContent.visModeComplex)
 			self.l.setElementFont(self.l.celServiceNumber, gFont("Regular", 20))
 			self.l.setElementPosition(self.l.celServiceNumber, eRect(0, 0, 50, 28))
 			self.l.setElementFont(self.l.celServiceName, gFont("Regular", 22))
 			self.l.setElementPosition(self.l.celServiceName, eRect(60, 0, self.instance.size().width()-60, 28))
 			self.l.setElementFont(self.l.celServiceInfo, gFont("Regular", 18))
-			self.l.setVisualMode(eListboxServiceContent.visModeComplex)
diff --git a/lib/python/Screens/ServiceInfo.py b/lib/python/Screens/ServiceInfo.py
index e4735f41..fa948150 100644
--- a/lib/python/Screens/ServiceInfo.py
+++ b/lib/python/Screens/ServiceInfo.py
@@ -100,7 +100,7 @@ class ServiceInfo(Screen):
 
 	def information(self):
 		if self.type == TYPE_SERVICE_INFO:
-			if self.session.nav.getCurrentlyPlayingServiceReference() is not None:
+			if self.session.nav.getCurrentlyPlayingServiceReference():
 				name = ServiceReference(self.session.nav.getCurrentlyPlayingServiceReference()).getServiceName()
 			else:
 				name = "N/A"
diff --git a/lib/service/listboxservice.cpp b/lib/service/listboxservice.cpp
index bcd6342b..d87e3155 100644
--- a/lib/service/listboxservice.cpp
+++ b/lib/service/listboxservice.cpp
@@ -195,16 +195,18 @@ int eListboxServiceContent::lookupService(const eServiceReference &ref)
 
 void eListboxServiceContent::setVisualMode(int mode)
 {
+	for (int i=0; i < celElements; ++i)
+	{
+		m_element_position[i] = eRect();
+		m_element_font[i] = 0;
+	}
+
 	m_visual_mode = mode;
-	
+
 	if (m_visual_mode == visModeSimple)
 	{
 		m_element_position[celServiceName] = eRect(ePoint(0, 0), m_itemsize);
 		m_element_font[celServiceName] = new gFont("Regular", 23);
-		m_element_position[celServiceNumber] = eRect();
-		m_element_font[celServiceNumber] = 0;
-		m_element_position[celServiceInfo] = eRect();
-		m_element_font[celServiceInfo] = 0;
 	}
 }
 
@@ -411,7 +413,8 @@ int eListboxServiceContent::size()
 void eListboxServiceContent::setSize(const eSize &size)
 {
 	m_itemsize = size;
-	setVisualMode(m_visual_mode);
+	if (m_visual_mode == visModeSimple)
+		setVisualMode(m_visual_mode);
 }
 
 void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected)