diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2006-08-21 23:02:23 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2006-08-21 23:02:23 +0000 |
| commit | be481547e9c93583098b54a37034ff164b5804f5 (patch) | |
| tree | dfb1312211c3fc337403112bfd1c8be9a8166de0 /lib/python/Components | |
| parent | 6bdfaadd65fe35ba568799b0e42c54e5a95e27ed (diff) | |
| download | enigma2-be481547e9c93583098b54a37034ff164b5804f5.tar.gz enigma2-be481547e9c93583098b54a37034ff164b5804f5.zip | |
add support for umlauts
Diffstat (limited to 'lib/python/Components')
| -rw-r--r-- | lib/python/Components/Input.py | 16 | ||||
| -rw-r--r-- | lib/python/Components/Language.py | 13 |
2 files changed, 17 insertions, 12 deletions
diff --git a/lib/python/Components/Input.py b/lib/python/Components/Input.py index b140ef51..e27ef524 100644 --- a/lib/python/Components/Input.py +++ b/lib/python/Components/Input.py @@ -10,10 +10,11 @@ class Input(VariableText, HTMLComponent, GUIComponent): TEXT = 0 PIN = 1 NUMBER = 2 - + def __init__(self, text="", maxSize = False, type = TEXT): GUIComponent.__init__(self) VariableText.__init__(self) + self.table = 0 self.numericalTextInput = NumericalTextInput(self.right) self.type = type self.maxSize = maxSize @@ -21,12 +22,13 @@ class Input(VariableText, HTMLComponent, GUIComponent): self.Text = text self.overwrite = 0 self.update() + def update(self): self.setMarkedPos(self.currPos) if self.type == self.PIN: self.message = "*" * len(self.Text) else: - self.message = convertDVBUTF8(self.Text, 0) + self.message = convertDVBUTF8(self.Text, self.table) if self.instance: self.instance.setText(self.message) @@ -35,13 +37,13 @@ class Input(VariableText, HTMLComponent, GUIComponent): self.currPos = 0 self.Text = "" elif isUTF8(text): - self.Text = convertUTF8DVB(text, 0) + self.Text = convertUTF8DVB(text, self.table) else: self.Text = text self.update() def getText(self): - return convertDVBUTF8(self.Text, 0) + return convertDVBUTF8(self.Text, self.table) def createWidget(self, parent): return eLabel(parent, self.currPos) @@ -87,7 +89,7 @@ class Input(VariableText, HTMLComponent, GUIComponent): def end(self): self.currPos = len(self.Text) - 1 self.update() - + def tab(self): if self.currPos == len(self.Text) - 1: self.Text=self.Text+ " " @@ -95,11 +97,11 @@ class Input(VariableText, HTMLComponent, GUIComponent): else: self.Text = self.Text[0:self.currPos] + " " + self.Text[self.currPos:] self.update() - + def delete(self): self.Text = self.Text[:self.currPos] + self.Text[self.currPos + 1:] self.update() - + def toggleOverwrite(self): if self.overwrite==1: self.overwrite=0 diff --git a/lib/python/Components/Language.py b/lib/python/Components/Language.py index f08ae34b..d825af95 100644 --- a/lib/python/Components/Language.py +++ b/lib/python/Components/Language.py @@ -49,14 +49,17 @@ class Language: for x in self.langlist: list.append((x, self.lang[x])) return list - + def getActiveLanguage(self): return self.activeLanguage - + def getLanguage(self): - return str(self.lang[self.activeLanguage][2]) + "_" + str(self.lang[self.activeLanguage][3]) - + try: + return str(self.lang[self.activeLanguage][2]) + "_" + str(self.lang[self.activeLanguage][3]) + except: + return '' + def addCallback(self, callback): self.callbacks.append(callback) - + language = Language() |