[Subtitle] added rewrap option for TTX subtitle.

[vuplus_dvbapp] / lib / python / Screens / InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 6a148eb..186b07a 100755 (executable)
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -47,10 +47,12 @@ from Menu import MainMenu, mdom
 class InfoBarDish:
        def __init__(self):
                self.dishDialog = self.session.instantiateDialog(Dish)
+               self.dishDialog.setAnimationMode(0)
 
 class InfoBarUnhandledKey:
        def __init__(self):
                self.unhandledKeyDialog = self.session.instantiateDialog(UnhandledKey)
+               self.unhandledKeyDialog.setAnimationMode(0)
                self.hideUnhandledKeySymbolTimer = eTimer()
                self.hideUnhandledKeySymbolTimer.callback.append(self.unhandledKeyDialog.hide)
                self.checkUnusedTimer = eTimer()
@@ -687,6 +689,7 @@ class InfoBarRdsDecoder:
        """provides RDS and Rass support/display"""
        def __init__(self):
                self.rds_display = self.session.instantiateDialog(RdsInfoDisplay)
+               self.rds_display.setAnimationMode(0)
                self.rass_interactive = None
 
                self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
@@ -772,7 +775,7 @@ class InfoBarSeek:
 
                self["SeekActions"] = InfoBarSeekActionMap(self, actionmap,
                        {
-                               "playpauseService": self.playpauseService,
+                               "playpauseService": (self.playpauseService, _("Pause/Continue")),
                                "pauseService": (self.pauseService, _("pause")),
                                "unPauseService": (self.unPauseService, _("continue")),
 
@@ -1105,6 +1108,7 @@ class InfoBarPVRState:
        def __init__(self, screen=PVRState, force_show = False):
                self.onPlayStateChanged.append(self.__playStateChanged)
                self.pvrStateDialog = self.session.instantiateDialog(screen)
+               self.pvrStateDialog.setAnimationMode(0)
                self.onShow.append(self._mayShow)
                self.onHide.append(self.pvrStateDialog.hide)
                self.force_show = force_show
@@ -1318,6 +1322,9 @@ class InfoBarExtensions:
                                "extensions": (self.showExtensionSelection, _("view extensions...")),
                        }, 1) # lower priority
 
+               for p in plugins.getPlugins(PluginDescriptor.WHERE_EXTENSIONSINGLE):
+                       p(self)
+
        def addExtension(self, extension, key = None, type = EXTENSION_SINGLE):
                self.list.append((type, extension, key))
 
@@ -1459,6 +1466,7 @@ class InfoBarPiP:
                        self.session.pipshown = False
                else:
                        self.session.pip = self.session.instantiateDialog(PictureInPicture)
+                       self.session.pip.setAnimationMode(0)
                        self.session.pip.show()
                        newservice = self.session.nav.getCurrentlyPlayingServiceReference()
                        if self.session.pip.playService(newservice):
@@ -1654,7 +1662,7 @@ class InfoBarInstantRecord:
                dir = preferredInstantRecordPath()
                if not dir or not fileExists(dir, 'w'):
                        dir = defaultMoviePath()
-#      ikseong
+
                if not fileExists("/hdd", 0):
                        print "not found /hdd"
                        system("ln -s /media/hdd /hdd")
@@ -1829,6 +1837,7 @@ class InfoBarSubserviceSelection:
                        del self.selectedSubservice
 
 from Components.Sources.HbbtvApplication import HbbtvApplication
+gHbbtvApplication = HbbtvApplication()
 class InfoBarRedButton:
        def __init__(self):
                if not (config.misc.rcused.value == 1):
@@ -1836,7 +1845,7 @@ class InfoBarRedButton:
                                {
                                        "activateRedButton": (self.activateRedButton, _("Red button...")),
                                })
-                       self["HbbtvApplication"] = HbbtvApplication()
+                       self["HbbtvApplication"] = gHbbtvApplication
                else:
                        self["HbbtvApplication"] = Boolean(fixed=0)
                        self["HbbtvApplication"].name = "" #is this a hack?
@@ -1859,8 +1868,11 @@ class InfoBarRedButton:
                                #self.onReadyForAIT.remove(x)
 
        def updateInfomation(self):
-               self["HbbtvApplication"].setApplicationName("")
-               self.updateAIT()
+               try:
+                       self["HbbtvApplication"].setApplicationName("")
+                       self.updateAIT()
+               except Exception, ErrMsg:
+                       pass
                
        def detectedHbbtvApplication(self):
                service = self.session.nav.getCurrentService()
@@ -1868,7 +1880,7 @@ class InfoBarRedButton:
                try:
                        for x in info.getInfoObject(iServiceInformation.sHBBTVUrl):
                                print x
-                               if x[0] == 1:
+                               if x[0] in (-1, 1):
                                        self.updateAIT(x[3])
                                        self["HbbtvApplication"].setApplicationName(x[1])
                                        break
@@ -2223,6 +2235,7 @@ class InfoBarSubtitleSupport(object):
        def __init__(self):
                object.__init__(self)
                self.subtitle_window = self.session.instantiateDialog(SubtitleDisplay)
+               self.subtitle_window.setAnimationMode(0)
                self.__subtitles_enabled = False
 
                self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
@@ -2241,8 +2254,7 @@ class InfoBarSubtitleSupport(object):
                        self.__selected_subtitle = None
 
        def __updatedInfo(self):
-               if not self.cached_subtitle_checked:
-                       self.cached_subtitle_checked = True
+               if not self.__selected_subtitle:
                        subtitle = self.getCurrentServiceSubtitle()
                        self.setSelectedSubtitle(subtitle and subtitle.getCachedSubtitle())
                        if self.__selected_subtitle:
@@ -2263,7 +2275,7 @@ class InfoBarSubtitleSupport(object):
                else:
                        if subtitle:
                                subtitle.disableSubtitles(self.subtitle_window.instance)
-                       self.__selected_subtitle = False
+                       self.__selected_subtitle = None
                        self.__subtitles_enabled = False
                        self.subtitle_window.hide()