fix seekable status when service is already running, only show infobar if InfoBarShow...

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

diff --git a/lib/python/Screens/Subtitles.py b/lib/python/Screens/Subtitles.py
index 6a1deedb5bdb16f3abdc560a65319adcdd0888a5..ac2937ff867eba8604e40b379f9ed081262a2cfd 100644 (file)
--- a/lib/python/Screens/Subtitles.py
+++ b/lib/python/Screens/Subtitles.py
@@ -25,17 +25,23 @@ class Subtitles(Screen, ConfigListScreen):
                else:
                        sel = None
                for x in self.getSubtitleList():
-                       if sel and sel == x:
+                       if sel and sel[:4] == x[:4]: #ignore Language code in compare
                                text = _("Running")
                        else:
                                text = _("Enable")
                        if x[0] == 0:
-                               self.list.append(getConfigListEntry(text+" DVB "+LanguageCodes[x[4]][0], ConfigNothing(), x))
+                               if LanguageCodes.has_key(x[4]):
+                                       self.list.append(getConfigListEntry(text+" DVB "+LanguageCodes[x[4]][0], ConfigNothing(), x))
+                               else:
+                                       self.list.append(getConfigListEntry(text+" DVB "+x[4], ConfigNothing(), x))
                        elif x[0] == 1:
                                if x[4] == 'und': #undefined
-                                       self.list.append(getConfigListEntry(text+" TTX "+_("Page")+" "+str(x[2])+"/"+str(x[3]), ConfigNothing(), x))
+                                       self.list.append(getConfigListEntry(text+" TTX "+_("Page")+" %x%02x"%(x[3],x[2]), ConfigNothing(), x))
                                else:
-                                       self.list.append(getConfigListEntry(text+" TTX "+LanguageCodes[x[4]][0], ConfigNothing(), x))
+                                       if LanguageCodes.has_key(x[4]):
+                                               self.list.append(getConfigListEntry(text+" TTX "+_("Page")+" %x%02x"%(x[3],x[2])+" "+LanguageCodes[x[4]][0], ConfigNothing(), x))
+                                       else:
+                                               self.list.append(getConfigListEntry(text+" TTX "+_("Page")+" %x%02x"%(x[3],x[2])+" "+x[4], ConfigNothing(), x))
 #              return _("Disable subtitles")
                self["config"].list = self.list
                self["config"].l.setList(self.list)
@@ -50,7 +56,6 @@ class Subtitles(Screen, ConfigListScreen):
 
        def enableSubtitle(self, subtitles):
                if self.infobar.selected_subtitle != subtitles:
-                       print "enable subtitles", subtitles
                        self.infobar.subtitles_enabled = False
                        self.infobar.selected_subtitle = subtitles
                        self.infobar.subtitles_enabled = True