X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FInfoBar.py;h=ed8acf6c5ba238ba9f8cfa2730776c8aab00ac3b;hb=2205f0ce601ffaf54c65a5e530d1562afdc4f572;hp=a6403a30226b57ed49b1d799ecee2438d2fa7fc2;hpb=79f0f14b59c1943261983e92f0b97b9ce7df4bed;p=vuplus_dvbapp

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
old mode 100644
new mode 100755
index a6403a3..ed8acf6
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -11,7 +11,7 @@ from enigma import iPlayableService
 profile("LOAD:InfoBarGenerics")
 from Screens.InfoBarGenerics import InfoBarShowHide, \
 	InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarRdsDecoder, \
-	InfoBarEPG, InfoBarSeek, InfoBarInstantRecord, \
+	InfoBarEPG, InfoBarSeek, InfoBarInstantRecord, InfoBarRedButton, \
 	InfoBarAudioSelection, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, InfoBarUnhandledKey, \
 	InfoBarSubserviceSelection, InfoBarShowMovies, InfoBarTimeshift,  \
 	InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView, \
@@ -28,7 +28,7 @@ from Screens.HelpMenu import HelpableScreen
 
 class InfoBar(InfoBarBase, InfoBarShowHide,
 	InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, InfoBarRdsDecoder,
-	InfoBarInstantRecord, InfoBarAudioSelection, 
+	InfoBarInstantRecord, InfoBarAudioSelection, InfoBarRedButton,
 	HelpableScreen, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, InfoBarUnhandledKey,
 	InfoBarSubserviceSelection, InfoBarTimeshift, InfoBarSeek,
 	InfoBarSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions,
@@ -45,6 +45,8 @@ 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)
 		
 		self.allowPiP = True
@@ -52,7 +54,7 @@ class InfoBar(InfoBarBase, InfoBarShowHide,
 		for x in HelpableScreen, \
 				InfoBarBase, InfoBarShowHide, \
 				InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, InfoBarRdsDecoder, \
-				InfoBarInstantRecord, InfoBarAudioSelection, InfoBarUnhandledKey, \
+				InfoBarInstantRecord, InfoBarAudioSelection, InfoBarRedButton, InfoBarUnhandledKey, \
 				InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, InfoBarSubserviceSelection, \
 				InfoBarTimeshift, InfoBarSeek, InfoBarSummarySupport, InfoBarTimeshiftState, \
 				InfoBarTeletextPlugin, InfoBarExtensions, InfoBarPiP, InfoBarSubtitleSupport, InfoBarJobman, \
@@ -123,6 +125,11 @@ 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)
+
 class MoviePlayer(InfoBarBase, InfoBarShowHide, \
 		InfoBarMenu, \
 		InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications,
@@ -138,6 +145,8 @@ 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..."))
 			})
 		
@@ -174,7 +183,7 @@ class MoviePlayer(InfoBarBase, InfoBarShowHide, \
 					(_("Yes, returning to movie list"), "movielist"),
 					(_("Yes, and delete this movie"), "quitanddelete"),
 					(_("No"), "continue"),
-					(_("No, but restart from the beginning"), "restart")
+					(_("No, but restart from begin"), "restart")
 				)
 
 			from Screens.ChoiceBox import ChoiceBox
@@ -242,3 +251,8 @@ 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)