diff options
| author | Mladen Horvat <acid-burn@opendreambox.org> | 2011-04-18 16:28:58 +0200 |
|---|---|---|
| committer | Mladen Horvat <acid-burn@opendreambox.org> | 2011-04-18 16:28:58 +0200 |
| commit | e21855aec03a8bb3f6182e5ddf40ce97d427bd0b (patch) | |
| tree | 530dcf3f0087f2e108a7e18cb500d704051bd31d | |
| parent | 348cf0e4d7fa1e615635984c9325fc0e8fa4e72b (diff) | |
| download | enigma2-e21855aec03a8bb3f6182e5ddf40ce97d427bd0b.tar.gz enigma2-e21855aec03a8bb3f6182e5ddf40ce97d427bd0b.zip | |
NumericalTextInput: Add cz/sk layout (patch from Petr)to NumericalTextInput and change font of NumericalTextInputHelpDialog from console to regular for better utf-8 charset support.
refs #750
| -rwxr-xr-x | data/skin_default.xml | 24 | ||||
| -rw-r--r-- | lib/python/Tools/NumericalTextInput.py | 16 |
2 files changed, 26 insertions, 14 deletions
diff --git a/data/skin_default.xml b/data/skin_default.xml index 48267066..75c9dc41 100755 --- a/data/skin_default.xml +++ b/data/skin_default.xml @@ -728,18 +728,18 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) <!-- Numerical help dialog --> <screen name="NumericalTextInputHelpDialog" position="190,400" zPosition="2" size="394,124" backgroundColor="#202020" flags="wfNoBorder"> <eLabel position="0,0" size="392,122" backgroundColor="#c0c0c0" zPosition="-1" /> - <widget name="key1" position="2,2" size="130,30" font="Console;16" halign="center" valign="center" /> - <widget name="key2" position="132,2" size="130,30" font="Console;16" halign="center" valign="center" /> - <widget name="key3" position="262,2" size="130,30" font="Console;16" halign="center" valign="center" /> - <widget name="key4" position="2,32" size="130,30" font="Console;16" halign="center" valign="center" /> - <widget name="key5" position="132,32" size="130,30" font="Console;16" halign="center" valign="center" /> - <widget name="key6" position="262,32" size="130,30" font="Console;16" halign="center" valign="center" /> - <widget name="key7" position="2,62" size="130,30" font="Console;16" halign="center" valign="center" /> - <widget name="key8" position="132,62" size="130,30" font="Console;16" halign="center" valign="center" /> - <widget name="key9" position="262,62" size="130,30" font="Console;16" halign="center" valign="center" /> - <widget name="help1" position="2,92" size="130,30" font="Console;16" halign="center" valign="center" /> - <widget name="key0" position="132,92" size="130,30" font="Console;12" halign="center" valign="center" /> - <widget name="help2" position="262,92" size="130,30" font="Console;16" halign="center" valign="center" /> + <widget name="key1" position="2,2" size="130,30" font="Regular;18" halign="center" valign="center" /> + <widget name="key2" position="132,2" size="130,30" font="Regular;18" halign="center" valign="center" /> + <widget name="key3" position="262,2" size="130,30" font="Regular;18" halign="center" valign="center" /> + <widget name="key4" position="2,32" size="130,30" font="Regular;18" halign="center" valign="center" /> + <widget name="key5" position="132,32" size="130,30" font="Regular;18" halign="center" valign="center" /> + <widget name="key6" position="262,32" size="130,30" font="Regular;18" halign="center" valign="center" /> + <widget name="key7" position="2,62" size="130,30" font="Regular;18" halign="center" valign="center" /> + <widget name="key8" position="132,62" size="130,30" font="Regular;18" halign="center" valign="center" /> + <widget name="key9" position="262,62" size="130,30" font="Regular;18" halign="center" valign="center" /> + <widget name="help1" position="2,92" size="130,30" font="Regular;18" halign="center" valign="center" /> + <widget name="key0" position="132,92" size="130,30" font="Regular;14" halign="center" valign="center" /> + <widget name="help2" position="262,92" size="130,30" font="Regular;18" halign="center" valign="center" /> </screen> <!-- Parental control - editor --> <screen name="ParentalControlEditor" position="center,center" size="520,400" title="Parental control services Editor"> diff --git a/lib/python/Tools/NumericalTextInput.py b/lib/python/Tools/NumericalTextInput.py index 63a58ea4..252e174e 100644 --- a/lib/python/Tools/NumericalTextInput.py +++ b/lib/python/Tools/NumericalTextInput.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# -*- coding: UTF-8 -*- from enigma import eTimer from Components.Language import language @@ -63,6 +63,17 @@ class NumericalTextInput: self.mapping.append (u"pqrs7PQRS") # 7 self.mapping.append (u"tuv8TUV") # 8 self.mapping.append (u"wxyz9WXYZ") # 9 + elif self.lang in ('cs_CZ', 'sk_SK'): + self.mapping.append (u"0,?'+\"()@$!=&*") # 0 + self.mapping.append (u" 1.:/-_") # 1 + self.mapping.append (u"abc2áäčABCÁÄČ") # 2 + self.mapping.append (u"def3ďéěDEFĎÉĚ") # 3 + self.mapping.append (u"ghi4íGHIÍ") # 4 + self.mapping.append (u"jkl5ľĺJKLĽĹ") # 5 + self.mapping.append (u"mno6ňóöôMNOŇÓÖÔ") # 6 + self.mapping.append (u"pqrs7řŕšPQRSŘŔŠ") # 7 + self.mapping.append (u"tuv8ťúůüTUVŤÚŮÜ") # 8 + self.mapping.append (u"wxyz9ýžWXYZÝŽ") # 9 else: self.mapping.append (u"0,?!&@=*'+\"()$~") # 0 self.mapping.append (u" 1.:/-_") # 1 @@ -76,7 +87,8 @@ class NumericalTextInput: self.mapping.append (u"wxyz9WXYZ") # 9 def setUseableChars(self, useable): - self.useableChars = useable + self.useableChars = unicode(useable) + def getKey(self, num): cnt=0 |