projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'FactoryTest' into vuplus_experimental
[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
54bc7a5
..
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=
@@
-84,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)