X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FInfoBar.py;h=8fec85cd4e746a1c62dbc9118bd4a73c58a20b03;hp=ed8acf6c5ba238ba9f8cfa2730776c8aab00ac3b;hb=0fee8bdaa26f854460b63475c91f1f2cf762594b;hpb=0da688aba6cca5cc5b0b4406e384fa9e3345859c diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py index ed8acf6..8fec85c 100755 --- a/lib/python/Screens/InfoBar.py +++ b/lib/python/Screens/InfoBar.py @@ -16,7 +16,8 @@ from Screens.InfoBarGenerics import InfoBarShowHide, \ InfoBarSubserviceSelection, InfoBarShowMovies, InfoBarTimeshift, \ InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView, \ InfoBarSummarySupport, InfoBarMoviePlayerSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, \ - InfoBarSubtitleSupport, InfoBarPiP, InfoBarPlugins, InfoBarServiceErrorPopupSupport, InfoBarJobman + InfoBarSubtitleSupport, InfoBarPiP, InfoBarPlugins, InfoBarServiceErrorPopupSupport, InfoBarJobman, \ + InfoBarHDMI profile("LOAD:InitBar_Components") from Components.ActionMap import HelpableActionMap @@ -33,7 +34,7 @@ class InfoBar(InfoBarBase, InfoBarShowHide, InfoBarSubserviceSelection, InfoBarTimeshift, InfoBarSeek, InfoBarSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, InfoBarPiP, InfoBarPlugins, InfoBarSubtitleSupport, InfoBarServiceErrorPopupSupport, InfoBarJobman, - Screen): + InfoBarHDMI, Screen): ALLOW_SUSPEND = True instance = None @@ -45,7 +46,6 @@ class InfoBar(InfoBarBase, InfoBarShowHide, "showMovies": (self.showMovies, _("Play recorded movies...")), "showRadio": (self.showRadio, _("Show the radio player...")), "showTv": (self.showTv, _("Show the tv player...")), - # ikseong action for subtitle hotkey "showSubtitle":(self.showSubtitle, _("Show the Subtitle...")), }, prio=2) @@ -58,7 +58,7 @@ class InfoBar(InfoBarBase, InfoBarShowHide, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, InfoBarSubserviceSelection, \ InfoBarTimeshift, InfoBarSeek, InfoBarSummarySupport, InfoBarTimeshiftState, \ InfoBarTeletextPlugin, InfoBarExtensions, InfoBarPiP, InfoBarSubtitleSupport, InfoBarJobman, \ - InfoBarPlugins, InfoBarServiceErrorPopupSupport: + InfoBarPlugins, InfoBarServiceErrorPopupSupport, InfoBarHDMI: x.__init__(self) self.helpList.append((self["actions"], "InfobarActions", [("showMovies", _("view recordings..."))])) @@ -125,7 +125,6 @@ class InfoBar(InfoBarBase, InfoBarShowHide, if service is not None: self.session.open(MoviePlayer, service) - # ikseong action for subtitle hotkey def showSubtitle(self): from Screens.Subtitles import Subtitles self.session.open(Subtitles) @@ -135,7 +134,7 @@ class MoviePlayer(InfoBarBase, InfoBarShowHide, \ InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications, InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView, InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, Screen, InfoBarTeletextPlugin, - InfoBarServiceErrorPopupSupport, InfoBarExtensions, InfoBarPlugins, InfoBarPiP): + InfoBarServiceErrorPopupSupport, InfoBarExtensions, InfoBarPlugins, InfoBarPiP, InfoBarHDMI): ENABLE_RESUME_SUPPORT = True ALLOW_SUSPEND = True @@ -145,7 +144,6 @@ class MoviePlayer(InfoBarBase, InfoBarShowHide, \ self["actions"] = HelpableActionMap(self, "MoviePlayerActions", { - # ikseong action for subtitle hotkey "showSubtitle":(self.showSubtitle, _("Show the Subtitle...")), "leavePlayer": (self.leavePlayer, _("leave movie player...")) }) @@ -251,8 +249,7 @@ class MoviePlayer(InfoBarBase, InfoBarShowHide, \ self.returning = False elif self.returning: self.close() - - # ikseong action for subtitle hotkey + def showSubtitle(self): from Screens.Subtitles import Subtitles self.session.open(Subtitles)