aboutsummaryrefslogtreecommitdiff
path: root/lib/python
diff options
context:
space:
mode:
authorghost <andreas.monzner@multimedia-labs.de>2009-04-15 21:29:06 +0200
committerghost <andreas.monzner@multimedia-labs.de>2009-04-15 21:29:06 +0200
commit0447cc6150e7100bb749e8dfb49ae161eb349691 (patch)
tree1d6e00f824853db292ae862ab76f2edfae54261f /lib/python
parent937ea5edd21860ff826f84213cbe6ced09bd8c2d (diff)
downloadenigma2-0447cc6150e7100bb749e8dfb49ae161eb349691.tar.gz
enigma2-0447cc6150e7100bb749e8dfb49ae161eb349691.zip
Virtualkeyboard.py: dont crash on empty fields
Diffstat (limited to 'lib/python')
-rwxr-xr-xlib/python/Screens/VirtualKeyBoard.py16
1 files changed, 11 insertions, 5 deletions
diff --git a/lib/python/Screens/VirtualKeyBoard.py b/lib/python/Screens/VirtualKeyBoard.py
index 9b676a5f..bde6f75d 100755
--- a/lib/python/Screens/VirtualKeyBoard.py
+++ b/lib/python/Screens/VirtualKeyBoard.py
@@ -157,6 +157,8 @@ class VirtualKeyBoard(Screen):
}, -2)
self.onLayoutFinish.append(self.buildVirtualKeyBoard)
+
+ self.max_key=47+len(self.keys_list[4])
def buildVirtualKeyBoard(self, selectedKey=0):
list = []
@@ -251,7 +253,7 @@ class VirtualKeyBoard(Screen):
elif self.selectedKey == 35:
self.selectedKey = 47
elif self.selectedKey == 47:
- self.selectedKey = 59
+ self.selectedKey = self.max_key
self.showActiveKey()
@@ -266,7 +268,7 @@ class VirtualKeyBoard(Screen):
self.selectedKey = 24
elif self.selectedKey == 48:
self.selectedKey = 36
- elif self.selectedKey == 60:
+ elif self.selectedKey > self.max_key:
self.selectedKey = 48
self.showActiveKey()
@@ -274,16 +276,20 @@ class VirtualKeyBoard(Screen):
def up(self):
self.selectedKey -= 12
- if self.selectedKey < 0:
- self.selectedKey += 60
+ if (self.selectedKey < 0) and (self.selectedKey > (self.max_key-60)):
+ self.selectedKey += 48
+ elif self.selectedKey < 0:
+ self.selectedKey += 60
self.showActiveKey()
def down(self):
self.selectedKey += 12
- if self.selectedKey > 59:
+ if (self.selectedKey > self.max_key) and (self.selectedKey > 59):
self.selectedKey -= 60
+ elif self.selectedKey > self.max_key:
+ self.selectedKey -= 48
self.showActiveKey()