From: kos Date: Tue, 11 Oct 2011 09:08:43 +0000 (+0900) Subject: [webbrowser] change keymap. X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=6a5d53104815fdf706c1c9ea17c2bbd66fa3d9bf [webbrowser] change keymap. --- diff --git a/configure.ac b/configure.ac index ac69b2a..5aa3862 100644 --- a/configure.ac +++ b/configure.ac @@ -163,6 +163,7 @@ lib/python/Plugins/Extensions/TuxboxPlugins/Makefile lib/python/Plugins/Extensions/TuxboxPlugins/meta/Makefile lib/python/Plugins/Extensions/WebBrowser/Makefile lib/python/Plugins/Extensions/WebBrowser/meta/Makefile +lib/python/Plugins/Extensions/WebBrowser/keymap/Makefile lib/python/Plugins/SystemPlugins/CleanupWizard/Makefile lib/python/Plugins/SystemPlugins/CleanupWizard/meta/Makefile lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/Makefile diff --git a/lib/python/Plugins/Extensions/WebBrowser/Makefile.am b/lib/python/Plugins/Extensions/WebBrowser/Makefile.am index 82d426a..11f2495 100755 --- a/lib/python/Plugins/Extensions/WebBrowser/Makefile.am +++ b/lib/python/Plugins/Extensions/WebBrowser/Makefile.am @@ -1,6 +1,6 @@ installdir = $(pkglibdir)/python/Plugins/Extensions/WebBrowser -SUBDIRS = meta +SUBDIRS = meta keymap install_PYTHON = \ __init__.py \ diff --git a/lib/python/Plugins/Extensions/WebBrowser/keymap/Makefile.am b/lib/python/Plugins/Extensions/WebBrowser/keymap/Makefile.am new file mode 100644 index 0000000..27d1bc7 --- /dev/null +++ b/lib/python/Plugins/Extensions/WebBrowser/keymap/Makefile.am @@ -0,0 +1,3 @@ +installdir = $(datadir)/keymaps/vuplus + +install_DATA = de.qmap diff --git a/lib/python/Plugins/Extensions/WebBrowser/keymap/de.qmap b/lib/python/Plugins/Extensions/WebBrowser/keymap/de.qmap new file mode 100644 index 0000000..95c42af Binary files /dev/null and b/lib/python/Plugins/Extensions/WebBrowser/keymap/de.qmap differ diff --git a/lib/python/Plugins/Extensions/WebBrowser/plugin.py b/lib/python/Plugins/Extensions/WebBrowser/plugin.py index d4bf7b1..bf91f97 100644 --- a/lib/python/Plugins/Extensions/WebBrowser/plugin.py +++ b/lib/python/Plugins/Extensions/WebBrowser/plugin.py @@ -19,6 +19,7 @@ from httplib import HTTPConnection, CannotSendRequest, BadStatusLine, HTTPExcept from Components.Button import Button from Components.Label import Label from Components.Pixmap import Pixmap +from Components.Language import language from Components.Sources.List import List from Components.ConfigList import ConfigListScreen from Components.Sources.StaticText import StaticText @@ -404,15 +405,15 @@ class VuPlayerService: class BrowserLauncher(ConfigListScreen, Screen): skin= """ - + - - - + + + """ @@ -438,6 +439,7 @@ class BrowserLauncher(ConfigListScreen, Screen): self.conf_alpha = "" self.conf_mouse = "" self.conf_keyboard = "" + self.conf_keymap = "" self.usb_mouse = None self.usb_keyboard = None @@ -456,6 +458,7 @@ class BrowserLauncher(ConfigListScreen, Screen): self.timer_exit_cond.callback.append(self.resetExitCond) self.test_cond = True + self.current_lang_idx = language.getActiveLanguageIndex() def keyNone(self): None @@ -467,6 +470,7 @@ class BrowserLauncher(ConfigListScreen, Screen): excute_cmd("killall -15 %s"%(self.browser_name)) excute_cmd("echo 60 > /proc/sys/vm/swappiness") enable_rc_mouse(False) #rc-mouse off + language.activateLanguageIndex(self.current_lang_idx) fbClass.getInstance().unlock() #eRCInput.getInstance().unlock() self.close() @@ -499,7 +503,7 @@ class BrowserLauncher(ConfigListScreen, Screen): # mouse:keyboard:alpha_value def saveConfig(self): if is_process_running(self.browser_name) == False: - command = "echo \"%s:%s:%d\" > %s"%(self.mouse.value, self.keyboard.value, int(self.alpha.value), self.conf_file) + command = "echo \"%s:%s:%d:%s\" > %s"%(self.mouse.value, self.keyboard.value, int(self.alpha.value), self.langs.value, self.conf_file) excute_cmd(command) # mouse:keyboard:alpha_value @@ -511,6 +515,11 @@ class BrowserLauncher(ConfigListScreen, Screen): self.conf_mouse = config_list[0] self.conf_keyboard = config_list[1] self.conf_alpha = config_list[2] + elif len(config_list) == 4: + self.conf_mouse = config_list[0] + self.conf_keyboard = config_list[1] + self.conf_alpha = config_list[2] + self.conf_keymap = config_list[3] print "load config : ", config_list def resetExitCond(self): @@ -537,22 +546,33 @@ class BrowserLauncher(ConfigListScreen, Screen): if self.conf_mouse == "" or self.getHandlerName(self.conf_mouse) is None: self.conf_mouse = self.mouse_list[0][0] + self.mouse = ConfigSelection(default = self.conf_mouse, choices = self.mouse_list) + self.list.append(getConfigListEntry(_('Mouse'), self.mouse)) + if self.conf_keyboard == "" or self.getHandlerName(self.conf_keyboard) is None: self.conf_keyboard = self.keyboard_list[0][0] + self.keyboard = ConfigSelection(default = self.conf_keyboard, choices = self.keyboard_list) + self.list.append(getConfigListEntry(_('Keyboard'), self.keyboard)) + if self.conf_alpha == "": self.conf_alpha = "255" - - self.mouse = ConfigSelection(default = self.conf_mouse, choices = self.mouse_list) - self.keyboard = ConfigSelection(default = self.conf_keyboard, choices = self.keyboard_list) - self.alpha = ConfigSlider(default = int(self.conf_alpha), increment = 10, limits = (0, 255)) - - self.list.append(getConfigListEntry(_('Mouse'), self.mouse)) - self.list.append(getConfigListEntry(_('Keyboard'), self.keyboard)) + self.alpha = ConfigSlider(default = int(self.conf_alpha), increment = 10, limits = (0, 255)) self.list.append(getConfigListEntry(_("Alpha Value"), self.alpha)) + if self.conf_keymap == "": + self.conf_keymap = self.getLanguage() + self.lang_list = [("en", "English"), ("de", "German")] + self.langs = ConfigSelection(default = self.conf_keymap, choices = self.lang_list) + self.list.append(getConfigListEntry(_("Language"), self.langs)) + self["config"].list = self.list self["config"].l.setList(self.list) + def getLanguage(self, lang=language.getLanguage()): + if self.current_lang_idx == 1: + return "de" + return "en" + def makeHandlerList(self, data): n = "" p = "" @@ -643,7 +663,11 @@ class BrowserLauncher(ConfigListScreen, Screen): enable_rc_mouse(True) #rc-mouse on if str(mouse_param).startswith("event"): mouse_cmd = "export QWS_MOUSE_PROTO=LinuxInput:/dev/input/%s; " % (str(mouse_param)) - kbd_cmd = "export QWS_KEYBOARD=LinuxInput:/dev/input/%s; " % (str(keyboard_param)) + + keymap_param = "" + if self.langs.value == "de": + keymap_param = ":keymap=/usr/share/keymaps/vuplus/de.qmap" + kbd_cmd = "export QWS_KEYBOARD=LinuxInput:/dev/input/%s%s; " % (str(keyboard_param), keymap_param) cmd = "%s%s%s%s" % (extra_cmd, kbd_cmd, mouse_cmd, browser_cmd) print "prepared command : [%s]" % cmd @@ -666,6 +690,10 @@ class BrowserLauncher(ConfigListScreen, Screen): self.saveConfig() self.info.setText("Starting Webbrowser. Please wait...") if self.lock == False: + if self.langs.value == "de": + language.activateLanguageIndex(1) + else: + language.activateLanguageIndex(0) self.timer_start = eTimer() self.timer_start.callback.append(self.startBrowser) self.timer_start.start(10) @@ -706,4 +734,3 @@ def Plugins(**kwargs): PluginDescriptor(name=_("Web Browser"), description="start web browser", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=main)] -