X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FPlugins%2FExtensions%2FHbbTV%2Fplugin.py;h=6d51dde496d11aee22d7136110c749d22f25eb44;hb=e495dc944b3214be7c8458ed4253f939a4cf28da;hp=d6ed07bf5248e5658721191e8587fdee128662e0;hpb=ea5327e8c1b22fa809b4ca8b37af5395cc368312;p=vuplus_dvbapp

diff --git a/lib/python/Plugins/Extensions/HbbTV/plugin.py b/lib/python/Plugins/Extensions/HbbTV/plugin.py
index d6ed07b..6d51dde 100644
--- a/lib/python/Plugins/Extensions/HbbTV/plugin.py
+++ b/lib/python/Plugins/Extensions/HbbTV/plugin.py
@@ -190,8 +190,8 @@ class MMSStreamURL:
 		sock = socket.socket(socket.AF_INET,socket.SOCK_STREAM)
 		sock.connect((host, port))
 		sock.send(self.sendmsg%(location, host))
-		print "Request."
-		print self.sendmsg%(location, host)
+		#print "Request."
+		#print self.sendmsg%(location, host)
 		fullydata = ''
 		while 1:
 			res = sock.recv(1024)
@@ -780,7 +780,8 @@ class HandlerHbbTV(Handler):
 		for ii in range(5):
 			self._vod_service = None
 			try:
-				print "Try to open vod [%d] : %s" % (ii, url)
+				#print "Try to open vod [%d] : %s" % (ii, url)
+				print "Try to open vod"
 				self._vod_service = eServiceReference(4097, 0, url)
 				self._session.nav.playService(self._vod_service)
 				if self._vod_service is not None:
@@ -942,7 +943,7 @@ class HbbTVWindow(Screen, InfoBarNotifications):
 	def _serviceForbiden(self):
 		global __gval__
 		real_url = MMSStreamURL().getLocationData(__gval__.hbbtv_handelr.getUrl())
-		print "Received URI :\n", real_url
+		#print "Received URI :\n", real_url
 
 		if real_url is not None:
 			__gval__.hbbtv_handelr.doRetryOpen(real_url.strip())
@@ -1768,20 +1769,27 @@ class OperaBrowser(Screen):
 	# submenulist->position->x : SUBMENULIST_WIDTH+50+SUBMENULIST_NEXT
 	# submenulist->position->y : MENUBAR_ITEM_HEIGHT+30
 	# submenulist->size->x  : SUBMENULIST_WIDTH
+
+	size = getDesktop(0).size()
+	WIDTH  = int(size.width())
+	HEIGHT = int(size.height())
 	skin =	"""
-		<screen name="OperaBrowser" position="0,0" size="1280,720" backgroundColor="transparent" flags="wfNoBorder" title="Opera Browser">
+		<screen name="OperaBrowser" position="0,0" size="%(width)d,%(height)d" backgroundColor="transparent" flags="wfNoBorder" title="Opera Browser">
 			<widget name="topArea" zPosition="-1" position="0,0" size="1280,60" font="Regular;20" valign="center" halign="center" backgroundColor="#000000" />
 			<widget name="menuitemFile" position="30,20" size="150,30" font="Regular;20" valign="center" halign="center" backgroundColor="#000000" foregroundColors="#9f1313,#a08500" />
 			<widget name="menuitemTool" position="180,20" size="150,30" font="Regular;20" valign="center" halign="center" backgroundColor="#000000" foregroundColors="#9f1313,#a08500" />
 			<widget name="menuitemHelp" position="330,20" size="150,30" font="Regular;20" valign="center" halign="center" backgroundColor="#000000" foregroundColors="#9f1313,#a08500" />
 			<widget name="menulist" position="50,60" size="200,150" backgroundColor="#000000" zPosition="10" scrollbarMode="showOnDemand" />
 			<widget name="submenulist" position="252,60" size="200,150" backgroundColor="#000000" zPosition="10" scrollbarMode="showOnDemand" />
-			<widget name="bottomArea" position="0,640" size="1280,80" font="Regular;20" valign="center" halign="center" backgroundColor="#000000" />
+			<widget name="bottomArea" position="0,%(bottom_pos_y)d" size="%(bottom_size_x)d,80" font="Regular;20" valign="center" halign="center" backgroundColor="#000000" />
 		</screen>
-		"""
-	MENUITEMS_LIST =[[(_('Open Startpage'), None), (_('Open URL'), None), (_('Start/Stop'),None), (_('Exit'), None)],
-			 [(_('Bookmark'), None), (_('Preference'), None)],
-			 [(_('About'), None), (_('Help'), None)]]
+		""" % { 'width'  :WIDTH,
+			'height' :HEIGHT,
+			'bottom_pos_y'  :HEIGHT-80,
+			'bottom_size_x' :WIDTH }
+
+	COMMAND_MAP = {}
+	MENUITEMS_LIST =[]
 	def __init__(self, session, url=None):
 		Screen.__init__(self, session)
 		self["actions"] = ActionMap(["DirectionActions", "MenuActions", "OkCancelActions"], {
@@ -1794,6 +1802,8 @@ class OperaBrowser(Screen):
 			,"menu"        : self.keyMenu
 		}, -2)
 
+		self.UpdateLanguageCB()
+
 		self._terminatedBrowser = True
 		self._enableKeyEvent = True
 		self._currentPageUrl = None
@@ -1823,6 +1833,24 @@ class OperaBrowser(Screen):
 		self._onCloseTimer.callback.append(self._cb_onClose)
 
 		self.paramUrl = url
+		language.addCallback(self.UpdateLanguageCB)
+
+	def UpdateLanguageCB(self):
+		# modify menu
+		self.MENUITEMS_LIST = [
+			[(_('Open Startpage'), None), (_('Open URL'), None), (_('Start/Stop'),None), (_('Exit'), None)],
+			[(_('Bookmark'), None), (_('Preference'), None)],
+			[(_('About'), None), (_('Help'), None)]]
+		self.COMMAND_MAP = {}
+		self.COMMAND_MAP[_('Exit')] = self._cmd_on_Exit
+		self.COMMAND_MAP[_('Help')] = self._cmd_on_Help
+		self.COMMAND_MAP[_('About')] = self._cmd_on_About
+		self.COMMAND_MAP[_('Open URL')] = self._cmd_on_OpenUrl
+		self.COMMAND_MAP[_('Start/Stop')] = self._cmd_on_StartStop
+		self.COMMAND_MAP[_('Bookmark')] = self._cmd_on_Bookmark
+		self.COMMAND_MAP[_('Preference')] = self._cmd_on_Preference
+		self.COMMAND_MAP[_('Return')] = self._cmd_on_ReturnToBrowser
+		self.COMMAND_MAP[_('Open Startpage')] = self._cmd_on_OpenStartpage
 
 	def enableRCMouse(self, mode): #mode=[0|1]|[False|True]
 		rcmouse_path = "/proc/stb/fp/mouse"
@@ -2027,19 +2055,8 @@ class OperaBrowser(Screen):
 		self.session.open(BrowserHelpWindow)
 
 	def doCommand(self, command):
-		# modify menu
-		cmd_map = {}
-		cmd_map[_('Exit')] = self._cmd_on_Exit
-		cmd_map[_('Help')] = self._cmd_on_Help
-		cmd_map[_('About')] = self._cmd_on_About
-		cmd_map[_('Open URL')] = self._cmd_on_OpenUrl
-		cmd_map[_('Start/Stop')] = self._cmd_on_StartStop
-		cmd_map[_('Bookmark')] = self._cmd_on_Bookmark
-		cmd_map[_('Preference')] = self._cmd_on_Preference
-		cmd_map[_('Return')] = self._cmd_on_ReturnToBrowser
-		cmd_map[_('Open Startpage')] = self._cmd_on_OpenStartpage
 		try:
-			cmd_map[command]()
+			self.COMMAND_MAP[command]()
 		except Exception, ErrMsg: print ErrMsg
 
 	def keyOK(self):