[tuxdroid-svn] r881 - in software/gadgets/shortcuts_manager/trunk: . shortcuts_manager shortcuts_ma
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
[tuxdroid-svn] r881 - in software/gadgets/shortcuts_manager/trunk: . shortcuts_manager shortcuts_manager/Scripts/Python shortcuts_manager/Scripts/Python/GUI/add shortcuts_manager/Scripts/Python/GUI/conf shortcuts_manager/Scripts/Python/GUI/modify
Author: jerome
Date: 2008-01-25 10:56:22 +0100 (Fri, 25 Jan 2008)
New Revision: 881
Modified:
software/gadgets/shortcuts_manager/trunk/shortcuts_manager.tgf
software/gadgets/shortcuts_manager/trunk/shortcuts_manager/Scripts/Python/GUI/add/other.pyp
software/gadgets/shortcuts_manager/trunk/shortcuts_manager/Scripts/Python/GUI/conf/other.pyp
software/gadgets/shortcuts_manager/trunk/shortcuts_manager/Scripts/Python/GUI/modify/other.pyp
software/gadgets/shortcuts_manager/trunk/shortcuts_manager/Scripts/Python/init.pyp
software/gadgets/shortcuts_manager/trunk/shortcuts_manager/Scripts/Python/main.pyp
software/gadgets/shortcuts_manager/trunk/shortcuts_manager/settings.xml
Log:
* change combobox entry text language when manager language have changed.
Modified: software/gadgets/shortcuts_manager/trunk/shortcuts_manager/Scripts/Python/GUI/add/other.pyp
===================================================================
--- software/gadgets/shortcuts_manager/trunk/shortcuts_manager/Scripts/Python/GUI/add/other.pyp 2008-01-24 15:26:36 UTC (rev 880)
+++ software/gadgets/shortcuts_manager/trunk/shortcuts_manager/Scripts/Python/GUI/add/other.pyp 2008-01-25 09:56:22 UTC (rev 881)
@@ -9,31 +9,10 @@
SimpleGladeApp.__init__(self, path, root, domain, **kwargs)
def new(self):
- availables_buttons_en = {'0':'K_0', '1':'K_1', '2':'K_2', '3':'K_3', '4':'K_4',\
- '5':'K_5', '6':'K_6', '7':'K_7', '8':'K_8', '9':'K_9',\
- 'mute':'K_MUTE', 'volume plus':'K_VOLUMEPLUS', 'volume minus':'K_VOLUMEMINUS',\
- 'escape':'K_ESCAPE', 'yes':'K_YES', 'no':'K_NO', 'backspace':'K_BACKSPACE',\
- 'ip voice': 'K_STARTVOIP', 'receive call': 'K_RECEIVECALL', 'hang up':'K_HANGUP',\
- 'star':'K_START', 'sharp':'K_SHARP', 'red':'K_RED', 'green':'K_GREEN',\
- 'blue':'K_BLUE', 'yellow':'K_YELLOW', 'channel plus': 'K_CHANELPLUS',\
- 'channel minus':'K_CHANELMINUS', 'up':'K_UP', 'down': 'K_DOWN',\
- 'left':'K_LEFT', 'right': 'K_RIGHT', 'ok':'K_OK', 'fast rewind': 'K_FASTREWIND',\
- 'fast forward': 'K_FASTFORWARD', 'play/pause': 'K_PLAYPAUSE',\
- 'stop': 'K_STOP', 'recording': 'K_RECORDING', 'previous': 'K_PREVIOUS',\
- 'next': 'K_NEXT', 'menu': 'K_MENU', 'mouse': 'K_MOUSE', 'alt': 'K_ALT'}
-
- availables_buttons_fr = {'0':'K_0', '1':'K_1', '2':'K_2', '3':'K_3', '4':'K_4',\
- '5':'K_5', '6':'K_6', '7':'K_7', '8':'K_8', '9':'K_9',\
- 'mute':'K_MUTE', 'volume plus':'K_VOLUMEPLUS', 'volume moins':'K_VOLUMEMINUS',\
- 'espace':'K_ESCAPE', 'oui':'K_YES', 'non':'K_NO', 'espace arrière':'K_BACKSPACE',\
- 'voix ip': 'K_STARTVOIP', 'recevoir appel': 'K_RECEIVECALL', 'raccrocher':'K_HANGUP',\
- 'étoile':'K_START', 'dièse':'K_SHARP', 'rouge':'K_RED', 'vert':'K_GREEN',\
- 'bleu':'K_BLUE', 'jaune':'K_YELLOW', 'channel plus': 'K_CHANELPLUS',\
- 'channel moins':'K_CHANELMINUS', 'flèche haut':'K_UP', 'flèche bas': 'K_DOWN',\
- 'gauche':'K_LEFT', 'droite': 'K_RIGHT', 'ok':'K_OK', 'retour rapide': 'K_FASTREWIND',\
- 'avance rapide': 'K_FASTFORWARD', 'play/pause': 'K_PLAYPAUSE',\
- 'stop': 'K_STOP', 'enregistrer': 'K_RECORDING', 'précédent': 'K_PREVIOUS',\
- 'suivant': 'K_NEXT', 'menu': 'K_MENU', 'souris': 'K_MOUSE', 'alt': 'K_ALT'}
+ _me.get_funct('translate')()
+ _me.set_param('last_language', _me.get_var('language'))
+ availables_buttons_fr = _me.get_param('availables_buttons_fr')
+ availables_buttons_en = _me.get_param('availables_buttons_en')
list_of_shortcuts = _me.get_param('list_of_shortcuts')
temp = []
Modified: software/gadgets/shortcuts_manager/trunk/shortcuts_manager/Scripts/Python/GUI/conf/other.pyp
===================================================================
--- software/gadgets/shortcuts_manager/trunk/shortcuts_manager/Scripts/Python/GUI/conf/other.pyp 2008-01-24 15:26:36 UTC (rev 880)
+++ software/gadgets/shortcuts_manager/trunk/shortcuts_manager/Scripts/Python/GUI/conf/other.pyp 2008-01-25 09:56:22 UTC (rev 881)
@@ -38,6 +38,8 @@
"""
Called function.
"""
+ _me.get_funct('translate')()
+ _me.set_param('last_language', _me.get_var('language'))
self.list_store = gtk.ListStore(str, str, str)
self.get_widget("window1").set_title(_me.string('name_to_read'))
application = _me.string('shortcut_name')
Modified: software/gadgets/shortcuts_manager/trunk/shortcuts_manager/Scripts/Python/GUI/modify/other.pyp
===================================================================
--- software/gadgets/shortcuts_manager/trunk/shortcuts_manager/Scripts/Python/GUI/modify/other.pyp 2008-01-24 15:26:36 UTC (rev 880)
+++ software/gadgets/shortcuts_manager/trunk/shortcuts_manager/Scripts/Python/GUI/modify/other.pyp 2008-01-25 09:56:22 UTC (rev 881)
@@ -9,32 +9,11 @@
SimpleGladeApp.__init__(self, path, root, domain, **kwargs)
def new(self):
+ _me.get_funct('translate')()
+ _me.set_param('last_language', _me.get_var('language'))
#Set values of the combobox entry.
- availables_buttons_en = {'0':'K_0', '1':'K_1', '2':'K_2', '3':'K_3', '4':'K_4',\
- '5':'K_5', '6':'K_6', '7':'K_7', '8':'K_8', '9':'K_9',\
- 'mute':'K_MUTE', 'volume plus':'K_VOLUMEPLUS', 'volume minus':'K_VOLUMEMINUS',\
- 'escape':'K_ESCAPE', 'yes':'K_YES', 'no':'K_NO', 'backspace':'K_BACKSPACE',\
- 'ip voice': 'K_STARTVOIP', 'receive call': 'K_RECEIVECALL', 'hang up':'K_HANGUP',\
- 'star':'K_STAR', 'sharp':'K_SHARP', 'red':'K_RED', 'green':'K_GREEN',\
- 'blue':'K_BLUE', 'yellow':'K_YELLOW', 'channel plus': 'K_CHANELPLUS',\
- 'channel minus':'K_CHANELMINUS', 'up':'K_UP', 'down': 'K_DOWN',\
- 'left':'K_LEFT', 'right': 'K_RIGHT', 'ok':'K_OK', 'fast rewind': 'K_FASTREWIND',\
- 'fast forward': 'K_FASTFORWARD', 'play/pause': 'K_PLAYPAUSE',\
- 'stop': 'K_STOP', 'recording': 'K_RECORDING', 'previous': 'K_PREVIOUS',\
- 'next': 'K_NEXT', 'menu': 'K_MENU', 'mouse': 'K_MOUSE', 'alt': 'K_ALT'}
-
- availables_buttons_fr = {'0':'K_0', '1':'K_1', '2':'K_2', '3':'K_3', '4':'K_4',\
- '5':'K_5', '6':'K_6', '7':'K_7', '8':'K_8', '9':'K_9',\
- 'mute':'K_MUTE', 'volume plus':'K_VOLUMEPLUS', 'volume moins':'K_VOLUMEMINUS',\
- 'espace':'K_ESCAPE', 'oui':'K_YES', 'non':'K_NO', 'espace arrière':'K_BACKSPACE',\
- 'voix ip': 'K_STARTVOIP', 'recevoir appel': 'K_RECEIVECALL', 'raccrocher':'K_HANGUP',\
- 'étoile':'K_STAR', 'dièse':'K_SHARP', 'rouge':'K_RED', 'vert':'K_GREEN',\
- 'bleu':'K_BLUE', 'jaune':'K_YELLOW', 'channel plus': 'K_CHANELPLUS',\
- 'channel moins':'K_CHANELMINUS', 'flèche haut':'K_UP', 'flèche bas': 'K_DOWN',\
- 'gauche':'K_LEFT', 'droite': 'K_RIGHT', 'ok':'K_OK', 'retour rapide': 'K_FASTREWIND',\
- 'avance rapide': 'K_FASTFORWARD', 'play/pause': 'K_PLAYPAUSE',\
- 'stop': 'K_STOP', 'enregistrer': 'K_RECORDING', 'précédent': 'K_PREVIOUS',\
- 'suivant': 'K_NEXT', 'menu': 'K_MENU', 'souris': 'K_MOUSE', 'alt': 'K_ALT'}
+ availables_buttons_en = _me.get_param('availables_buttons_en')
+ availables_buttons_fr = _me.get_param('availables_buttons_fr')
#Set globals values of the widgets components
Modified: software/gadgets/shortcuts_manager/trunk/shortcuts_manager/Scripts/Python/init.pyp
===================================================================
--- software/gadgets/shortcuts_manager/trunk/shortcuts_manager/Scripts/Python/init.pyp 2008-01-24 15:26:36 UTC (rev 880)
+++ software/gadgets/shortcuts_manager/trunk/shortcuts_manager/Scripts/Python/init.pyp 2008-01-25 09:56:22 UTC (rev 881)
@@ -4,6 +4,7 @@
import signal
import os
import thread
+import threading
import sys
import gtk
@@ -11,6 +12,34 @@
# Definition and initialization of the shared parameters
# ----------------------------------------------------------------------------
+_me.set_param('availables_buttons_en', {'0':'K_0', '1':'K_1', '2':'K_2', '3':'K_3', '4':'K_4',\
+ '5':'K_5', '6':'K_6', '7':'K_7', '8':'K_8', '9':'K_9',\
+ 'mute':'K_MUTE', 'volume plus':'K_VOLUMEPLUS', 'volume minus':'K_VOLUMEMINUS',\
+ 'escape':'K_ESCAPE', 'yes':'K_YES', 'no':'K_NO', 'backspace':'K_BACKSPACE',\
+ 'ip voice': 'K_STARTVOIP', 'receive call': 'K_RECEIVECALL', 'hang up':'K_HANGUP',\
+ 'star':'K_START', 'sharp':'K_SHARP', 'red':'K_RED', 'green':'K_GREEN',\
+ 'blue':'K_BLUE', 'yellow':'K_YELLOW', 'channel plus': 'K_CHANELPLUS',\
+ 'channel minus':'K_CHANELMINUS', 'up':'K_UP', 'down': 'K_DOWN',\
+ 'left':'K_LEFT', 'right': 'K_RIGHT', 'ok':'K_OK', 'fast rewind': 'K_FASTREWIND',\
+ 'fast forward': 'K_FASTFORWARD', 'play/pause': 'K_PLAYPAUSE',\
+ 'stop': 'K_STOP', 'recording': 'K_RECORDING', 'previous': 'K_PREVIOUS',\
+ 'next': 'K_NEXT', 'menu': 'K_MENU', 'mouse': 'K_MOUSE', 'alt': 'K_ALT'})
+
+_me.set_param('availables_buttons_fr', {'0':'K_0', '1':'K_1', '2':'K_2', '3':'K_3', '4':'K_4',\
+ '5':'K_5', '6':'K_6', '7':'K_7', '8':'K_8', '9':'K_9',\
+ 'mute':'K_MUTE', 'volume plus':'K_VOLUMEPLUS', 'volume moins':'K_VOLUMEMINUS',\
+ 'espace':'K_ESCAPE', 'oui':'K_YES', 'non':'K_NO', 'espace arrière':'K_BACKSPACE',\
+ 'voix ip': 'K_STARTVOIP', 'recevoir appel': 'K_RECEIVECALL', 'raccrocher':'K_HANGUP',\
+ 'étoile':'K_START', 'dièse':'K_SHARP', 'rouge':'K_RED', 'vert':'K_GREEN',\
+ 'bleu':'K_BLUE', 'jaune':'K_YELLOW', 'channel plus': 'K_CHANELPLUS',\
+ 'channel moins':'K_CHANELMINUS', 'flèche haut':'K_UP', 'flèche bas': 'K_DOWN',\
+ 'gauche':'K_LEFT', 'droite': 'K_RIGHT', 'ok':'K_OK', 'retour rapide': 'K_FASTREWIND',\
+ 'avance rapide': 'K_FASTFORWARD', 'play/pause': 'K_PLAYPAUSE',\
+ 'stop': 'K_STOP', 'enregistrer': 'K_RECORDING', 'précédent': 'K_PREVIOUS',\
+ 'suivant': 'K_NEXT', 'menu': 'K_MENU', 'souris': 'K_MOUSE', 'alt': 'K_ALT'})
+
+
+
_me.set_param('shortcut', '')
_me.set_param('name', '')
@@ -428,6 +457,37 @@
"""
tux.tts.speak_free(_me.string('testing') % _me.get_param('name'))
thread.start_new_thread(launch_test, ())
+
+
+def translate():
+ """
+ """
+ language = _me.get_var('language')
+ list = _me.get_param('list_of_shortcuts')
+
+ if (len(list) > 0):
+ if _me.get_var('language') != _me.get_param('last_language'):
+ #translate
+ list = _me.get_param('list_of_shortcuts')
+ key = ''
+ val_key = 0
+ tmp = []
+ for i in list:
+ #getting corrspondings values.
+ if _me.get_var('language') == 'fr_ALL':
+ #we have no more than two languages used, let user modify parameters translation.
+ val_key = _me.get_param('availables_buttons_en')[i[2]]
+ for j in _me.get_param('availables_buttons_fr'):
+ if _me.get_param('availables_buttons_fr')[j] == val_key:
+ tmp.append([i[0], i[1], j])
+
+ else:
+ val_key = _me.get_param('availables_buttons_fr')[i[2]]
+ for j in _me.get_param('availables_buttons_en'):
+ if _me.get_param('availables_buttons_en')[j] == val_key:
+ tmp.append([i[0], i[1], j])
+ _me.set_param('list_of_shortcuts', tmp)
+
# ----------------------------------------------------------------------------
# Initialization and finalization shared functions
@@ -497,3 +557,4 @@
_me.insert_funct('assign_keys', assign_keys)
_me.insert_funct('test_shortcut', test_shortcut)
+_me.insert_funct('translate', translate)
Modified: software/gadgets/shortcuts_manager/trunk/shortcuts_manager/Scripts/Python/main.pyp
===================================================================
--- software/gadgets/shortcuts_manager/trunk/shortcuts_manager/Scripts/Python/main.pyp 2008-01-24 15:26:36 UTC (rev 880)
+++ software/gadgets/shortcuts_manager/trunk/shortcuts_manager/Scripts/Python/main.pyp 2008-01-25 09:56:22 UTC (rev 881)
@@ -1,10 +1,13 @@
# 'Voiceget' part of the gadget. This code is executed when the
# gadget is launched in the gadgets manager.
+language = _me.get_var('language')
+_me.set_param('last_language', language)
list = _me.get_param('list_of_shortcuts')
-language = _me.get_var('language')
tmp_list = []
+_me.get_funct('translate')()
+
availables_buttons_en = {'0':0, '1': 1, '2':2, '3':3, '4':4,\
'5':5, '6':6, '7':7, '8':8, '9':9,\
'mute':K_MUTE, 'volume plus':K_VOLUMEPLUS, 'volume minus':K_VOLUMEMINUS,\
Modified: software/gadgets/shortcuts_manager/trunk/shortcuts_manager/settings.xml
===================================================================
--- software/gadgets/shortcuts_manager/trunk/shortcuts_manager/settings.xml 2008-01-24 15:26:36 UTC (rev 880)
+++ software/gadgets/shortcuts_manager/trunk/shortcuts_manager/settings.xml 2008-01-25 09:56:22 UTC (rev 881)
@@ -24,6 +24,7 @@
</general>
<parameters>
<hidden_in_manager type='bool'>False</hidden_in_manager>
+ <last_language type='str'>en_US</last_language>
<list_of_shortcuts type='list'>[]</list_of_shortcuts>
</parameters>
</settings>
Modified: software/gadgets/shortcuts_manager/trunk/shortcuts_manager.tgf
===================================================================
(Binary files differ)
|
