user predefined vars instead of integers for keyhandling in Config

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index ed85ed220ec5637ed42a6fe29dafed3ba5078ac0..5a96a100366316b1cc4cd1fab8d4b5e5001cb67c 100644 (file)
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -65,9 +65,9 @@ class configBoolean:
                self.parent.save()
 
        def handleKey(self, key):
                self.parent.save()
 
        def handleKey(self, key):

-               if key == 1:
+               if key == config.prevElement:

                        self.parent.value = self.parent.value - 1
                        self.parent.value = self.parent.value - 1

-               if key == 2:
+               if key == config.nextElement:

                        self.parent.value = self.parent.value + 1
                
                self.checkValues()                      
                        self.parent.value = self.parent.value + 1
                
                self.checkValues()                      


@@ -87,8 +87,10 @@ class configValue:
 
 class Config:
        def __init__(self):
 
 class Config:
        def __init__(self):

-               pass
-               
+               self.choseElement = 0
+               self.prevElement = 1
+               self.nextElement = 2
+                                               

 config = Config();
 configfile = configFile()
 
 config = Config();
 configfile = configFile()
 


@@ -110,9 +112,9 @@ class ConfigSlider:
                        self.parent.value = 10  
 
        def handleKey(self, key):
                        self.parent.value = 10  
 
        def handleKey(self, key):

-               if key == 1:
+               if key == config.prevElement:

                        self.parent.value = self.parent.value - 1
                        self.parent.value = self.parent.value - 1

-               if key == 2:
+               if key == config.nextElement:

                        self.parent.value = self.parent.value + 1
                                        
                self.checkValues()      
                        self.parent.value = self.parent.value + 1
                                        
                self.checkValues()      

diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
index cb2685804652dfa11adb8a08694a7ac29a4284ab..e2e55974bf524b967f72a2261adf1f0cf4965e83 100644 (file)
--- a/lib/python/Screens/Setup.py
+++ b/lib/python/Screens/Setup.py
@@ -51,11 +51,11 @@ class Setup(Screen):
                                list.append( (ItemText, item) )
 
        def keyOk(self):
                                list.append( (ItemText, item) )
 
        def keyOk(self):

-               self["config"].handleKey(0)
+               self["config"].handleKey(config.choseElement)

        def keyLeft(self):
        def keyLeft(self):

-               self["config"].handleKey(1)
+               self["config"].handleKey(config.prevElement)

        def keyRight(self):
        def keyRight(self):

-               self["config"].handleKey(2)
+               self["config"].handleKey(config.nextElement)

 
        def keySave(self):
                print "save requested"
 
        def keySave(self):
                print "save requested"