diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2009-04-19 23:33:44 +0200 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2009-04-19 23:33:44 +0200 |
| commit | e8f443313e47e0653d61d23c90352572194e5608 (patch) | |
| tree | 7188d3ea5a8c91066fe1dfd5f7241eeb3e3c5226 /lib/python/Screens/VirtualKeyBoard.py | |
| parent | 2d7f4e102ee3231bdb600b0ac7e2d8f898034b78 (diff) | |
| parent | 0d076f400e8740e55289427c0f19c8055c74bbc5 (diff) | |
| download | enigma2-e8f443313e47e0653d61d23c90352572194e5608.tar.gz enigma2-e8f443313e47e0653d61d23c90352572194e5608.zip | |
Merge branch 'master' of /home/tmbinc/enigma2-git
Diffstat (limited to 'lib/python/Screens/VirtualKeyBoard.py')
| -rwxr-xr-x | lib/python/Screens/VirtualKeyBoard.py | 16 |
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() |