show plugin description in plugin list

[enigma2.git] / lib / python / Screens / ChannelSelection.py

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index b850b2cbdbcadd385b9f37c6605afba7030d2de2..d4a1e7cea08d9911cd5eece5d98f3b65efc7c0d2 100644 (file)
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -8,6 +8,8 @@ from Components.config import config, configElement, ConfigSubsection, configTex
 from Screens.FixedMenu import FixedMenu
 from Tools.NumericalTextInput import NumericalTextInput
 from Components.NimManager import nimmanager
 from Screens.FixedMenu import FixedMenu
 from Tools.NumericalTextInput import NumericalTextInput
 from Components.NimManager import nimmanager

+from Components.ServiceName import ServiceName
+from Components.Clock import Clock

 from Components.EventInfo import EventInfo
 
 import xml.dom.minidom
 from Components.EventInfo import EventInfo
 
 import xml.dom.minidom


@@ -546,6 +548,8 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit):
 class ServiceInfoWindow(Screen):
        def __init__(self, session):
                Screen.__init__(self, session)
 class ServiceInfoWindow(Screen):
        def __init__(self, session):
                Screen.__init__(self, session)

+               self["Service_Name"] = ServiceName(self.session.nav)
+               self["Clock"] = Clock()

                self["Event_Now_StartTime"] = EventInfo(self.session.nav, EventInfo.Now_StartTime)
                self["Event_Next_StartTime"] = EventInfo(self.session.nav, EventInfo.Next_StartTime)
                self["Event_Now"] = EventInfo(self.session.nav, EventInfo.Now)
                self["Event_Now_StartTime"] = EventInfo(self.session.nav, EventInfo.Now_StartTime)
                self["Event_Next_StartTime"] = EventInfo(self.session.nav, EventInfo.Next_StartTime)
                self["Event_Now"] = EventInfo(self.session.nav, EventInfo.Now)


@@ -621,18 +625,14 @@ class ChannelSelectionRadio(ChannelSelectionBase, ChannelSelectionEdit):
                        self.servicelist.setPlayableIgnoreService(ref)
                        config.radio.lastservice.value = ref.toString()
                        config.radio.lastservice.save()
                        self.servicelist.setPlayableIgnoreService(ref)
                        config.radio.lastservice.value = ref.toString()
                        config.radio.lastservice.save()

-
+                       config.radio.lastroot.value = self.getRoot().toString()
+                       config.radio.lastroot.save()
+               

        def setRoot(self, root, justSet=False):
                self.setRootBase(root, justSet)
 
        def closeRadio(self):
                self.info.instance.hide()
        def setRoot(self, root, justSet=False):
                self.setRootBase(root, justSet)
 
        def closeRadio(self):
                self.info.instance.hide()

-               lastroot=eServiceReference(config.radio.lastroot.value)
-               lastservice=eServiceReference(config.radio.lastservice.value)
-               if lastroot.valid() and self.getRoot() != lastroot:
-                       self.setRoot(lastroot)
-               if lastservice.valid() and self.getCurrentSelection() != lastservice:
-                       self.servicelist.setCurrent(lastservice)

                #set previous tv service
                lastservice=eServiceReference(config.tv.lastservice.value)
                self.session.nav.playService(lastservice)
                #set previous tv service
                lastservice=eServiceReference(config.tv.lastservice.value)
                self.session.nav.playService(lastservice)