projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'dm/experimental' into test_0127
[vuplus_dvbapp]
/
lib
/
python
/
Screens
/
Subtitles.py
diff --git
a/lib/python/Screens/Subtitles.py
b/lib/python/Screens/Subtitles.py
old mode 100644
(file)
new mode 100755
(executable)
index
e637861
..
8cabac4
--- a/
lib/python/Screens/Subtitles.py
+++ b/
lib/python/Screens/Subtitles.py
@@
-7,8
+7,11
@@
from enigma import iPlayableService
from Tools.ISO639 import LanguageCodes
from Tools.ISO639 import LanguageCodes
+# ikseong for subtitle hotkey
+from Screens.InfoBar import InfoBar
+
class Subtitles(Screen, ConfigListScreen):
class Subtitles(Screen, ConfigListScreen):
- def __init__(self, session):
+ def __init__(self, session
, infobar=None
):
Screen.__init__(self, session)
self["actions"] = ActionMap(["SetupActions"],
Screen.__init__(self, session)
self["actions"] = ActionMap(["SetupActions"],
@@
-19,7
+22,13
@@
class Subtitles(Screen, ConfigListScreen):
self.list = []
ConfigListScreen.__init__(self, self.list)
self.list = []
ConfigListScreen.__init__(self, self.list)
- self.infobar = self.session.infobar
+# ikseong for subtitle hotkey
+ if self.session.infobar is None:
+ if InfoBar.instance:
+ self.infobar = InfoBar.instance
+ else:
+ self.infobar = self.session.infobar
+#
self.fillList()
self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
self.fillList()
self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
@@
-30,10
+39,11
@@
class Subtitles(Screen, ConfigListScreen):
self.__selected_subtitle = None
def fillList(self):
self.__selected_subtitle = None
def fillList(self):
- del self.list[:]
- print "self.list", self.list
+ list = self.list
+ del list[:]
+ print "self.list", list
if self.subtitlesEnabled():
if self.subtitlesEnabled():
-
self.
list.append(getConfigListEntry(_("Disable Subtitles"), ConfigNothing(), None))
+ list.append(getConfigListEntry(_("Disable Subtitles"), ConfigNothing(), None))
sel = self.infobar.selected_subtitle
else:
sel = None
sel = self.infobar.selected_subtitle
else:
sel = None
@@
-44,29
+54,29
@@
class Subtitles(Screen, ConfigListScreen):
text = _("Enable")
if x[0] == 0:
if LanguageCodes.has_key(x[4]):
text = _("Enable")
if x[0] == 0:
if LanguageCodes.has_key(x[4]):
-
self.
list.append(getConfigListEntry(text+" DVB "+LanguageCodes[x[4]][0], ConfigNothing(), x))
+ list.append(getConfigListEntry(text+" DVB "+LanguageCodes[x[4]][0], ConfigNothing(), x))
else:
else:
-
self.
list.append(getConfigListEntry(text+" DVB "+x[4], ConfigNothing(), x))
+ list.append(getConfigListEntry(text+" DVB "+x[4], ConfigNothing(), x))
elif x[0] == 1:
if x[4] == 'und': #undefined
elif x[0] == 1:
if x[4] == 'und': #undefined
-
self.
list.append(getConfigListEntry(text+" TTX "+_("Page")+" %x%02x"%(x[3],x[2]), ConfigNothing(), x))
+ list.append(getConfigListEntry(text+" TTX "+_("Page")+" %x%02x"%(x[3],x[2]), ConfigNothing(), x))
else:
if LanguageCodes.has_key(x[4]):
else:
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))
+ list.append(getConfigListEntry(text+" TTX "+_("Page")+" %x%02x"%(x[3],x[2])+" "+LanguageCodes[x[4]][0], ConfigNothing(), x))
else:
else:
-
self.
list.append(getConfigListEntry(text+" TTX "+_("Page")+" %x%02x"%(x[3],x[2])+" "+x[4], ConfigNothing(), x))
+ list.append(getConfigListEntry(text+" TTX "+_("Page")+" %x%02x"%(x[3],x[2])+" "+x[4], ConfigNothing(), x))
elif x[0] == 2:
elif x[0] == 2:
- types =
[" UTF-8 text "," SSA / AAS "," .SRT file "]
+ types =
(" UTF-8 text "," SSA / AAS "," .SRT file ")
if x[4] == 'und': #undefined
if x[4] == 'und': #undefined
-
self.
list.append(getConfigListEntry(text+types[x[2]]+_("Subtitles")+" %d" % x[1], ConfigNothing(), x))
+ list.append(getConfigListEntry(text+types[x[2]]+_("Subtitles")+" %d" % x[1], ConfigNothing(), x))
else:
if LanguageCodes.has_key(x[4]):
else:
if LanguageCodes.has_key(x[4]):
-
self.
list.append(getConfigListEntry(text+types[x[2]]+_("Subtitles") + ' ' + LanguageCodes[x[4]][0], ConfigNothing(), x))
+ list.append(getConfigListEntry(text+types[x[2]]+_("Subtitles") + ' ' + LanguageCodes[x[4]][0], ConfigNothing(), x))
else:
else:
-
self.
list.append(getConfigListEntry(text+types[x[2]]+_("Subtitles")+" %d " % x[1] +x[4], ConfigNothing(), x))
+ list.append(getConfigListEntry(text+types[x[2]]+_("Subtitles")+" %d " % x[1] +x[4], ConfigNothing(), x))
# return _("Disable subtitles")
# return _("Disable subtitles")
- self["config"].list =
self.
list
- self["config"].l.setList(
self.
list)
+ self["config"].list = list
+ self["config"].l.setList(list)
def __updatedInfo(self):
self.fillList()
def __updatedInfo(self):
self.fillList()
@@
-83,10
+93,8
@@
class Subtitles(Screen, ConfigListScreen):
if self.infobar.selected_subtitle != subtitles:
self.infobar.subtitles_enabled = False
self.infobar.selected_subtitle = subtitles
if self.infobar.selected_subtitle != subtitles:
self.infobar.subtitles_enabled = False
self.infobar.selected_subtitle = subtitles
- self.infobar.subtitles_enabled = True
-
- def disableSubtitles(self):
- self.infobar.subtitles_enabled = False
+ if subtitles:
+ self.infobar.subtitles_enabled = True
def keyLeft(self):
ConfigListScreen.keyLeft(self)
def keyLeft(self):
ConfigListScreen.keyLeft(self)
@@
-95,7
+103,7
@@
class Subtitles(Screen, ConfigListScreen):
ConfigListScreen.keyRight(self)
def ok(self):
ConfigListScreen.keyRight(self)
def ok(self):
- if
len(self.list)
:
+ if
self.list
:
cur = self["config"].getCurrent()
self.enableSubtitle(cur[2])
self.close(1)
cur = self["config"].getCurrent()
self.enableSubtitle(cur[2])
self.close(1)