help: improve key description, a bit.

[enigma2.git] / lib / python / Screens / Satconfig.py

diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index 1e7887077a6939de5d514d46d7eabf268a0b16aa..ffbad26088c17af72a73419ed1e5f44360c2f541 100644 (file)
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -1,4 +1,5 @@
 from Screen import Screen
 from Screen import Screen

+from Components.ActionMap import NumberActionMap

 from Components.ActionMap import ActionMap
 from Components.ConfigList import ConfigList
 from Components.config import *
 from Components.ActionMap import ActionMap
 from Components.ConfigList import ConfigList
 from Components.config import *


@@ -8,29 +9,28 @@ from Components.config import getConfigListEntry
 
 class NimSetup(Screen):
        def createSimpleSetup(self, nim, list, mode):
 
 class NimSetup(Screen):
        def createSimpleSetup(self, nim, list, mode):

-

                if mode == 0:                   #single Sat
                if mode == 0:                   #single Sat

-                       list.append(getConfigListEntry("Satellite", config.Nims[nim.slotid].diseqcA))
+                       list.append(getConfigListEntry(_("Satellite"), config.Nims[nim.slotid].diseqcA))

                else:                                                   # > 1 Sats
                else:                                                   # > 1 Sats

-                       list.append(getConfigListEntry("Port A", config.Nims[nim.slotid].diseqcA))
-               
+                       list.append(getConfigListEntry(_("Port A"), config.Nims[nim.slotid].diseqcA))
+

                if mode >= 1:                   # > 1 Sats
                if mode >= 1:                   # > 1 Sats

-                       list.append(getConfigListEntry("Port B", config.Nims[nim.slotid].diseqcB))
+                       list.append(getConfigListEntry(_("Port B"), config.Nims[nim.slotid].diseqcB))

                        if mode >= 3:           # > 2 Sats
                        if mode >= 3:           # > 2 Sats

-                               list.append(getConfigListEntry("Port C", config.Nims[nim.slotid].diseqcC))
-                               list.append(getConfigListEntry("Port D", config.Nims[nim.slotid].diseqcD))
+                               list.append(getConfigListEntry(_("Port C"), config.Nims[nim.slotid].diseqcC))
+                               list.append(getConfigListEntry(_("Port D"), config.Nims[nim.slotid].diseqcD))

        def createPositionerSetup(self, nim, list):
        def createPositionerSetup(self, nim, list):

-               list.append(getConfigListEntry("Longitude", config.Nims[nim.slotid].longitude))
-               list.append(getConfigListEntry("Latitude", config.Nims[nim.slotid].latitude))
+               list.append(getConfigListEntry(_("Longitude"), config.Nims[nim.slotid].longitude))
+               list.append(getConfigListEntry(_("Latitude"), config.Nims[nim.slotid].latitude))

                pass
        
        def createSetup(self):
                self.list = [ ]
                
                pass
        
        def createSetup(self):
                self.list = [ ]
                

-               self.list.append(getConfigListEntry("Configmode", config.Nims[self.nim.slotid].configMode))
+               self.list.append(getConfigListEntry(_("Configmode"), config.Nims[self.nim.slotid].configMode))

                
                if config.Nims[self.nim.slotid].configMode.value == 0:                  #simple setup
                
                if config.Nims[self.nim.slotid].configMode.value == 0:                  #simple setup

-                       self.list.append(getConfigListEntry("Diseqcmode", config.Nims[self.nim.slotid].diseqcMode))
+                       self.list.append(getConfigListEntry(_("Diseqcmode"), config.Nims[self.nim.slotid].diseqcMode))

                
                        if (0 <= config.Nims[self.nim.slotid].diseqcMode.value < 4):
                                self.createSimpleSetup(self.nim, self.list, config.Nims[self.nim.slotid].diseqcMode.value)
                
                        if (0 <= config.Nims[self.nim.slotid].diseqcMode.value < 4):
                                self.createSimpleSetup(self.nim, self.list, config.Nims[self.nim.slotid].diseqcMode.value)


@@ -43,9 +43,9 @@ class NimSetup(Screen):
                self["config"].l.setList(self.list)
                
        def newConfig(self):    
                self["config"].l.setList(self.list)
                
        def newConfig(self):    

-               if self["config"].getCurrent()[0] == "Diseqcmode":
+               if self["config"].getCurrent()[0] == _("Diseqcmode"):

                        self.createSetup()
                        self.createSetup()

-               if self["config"].getCurrent()[0] == "Configmode":
+               if self["config"].getCurrent()[0] == _("Configmode"):

                        self.createSetup()
                
        def keyLeft(self):
                        self.createSetup()
                
        def keyLeft(self):


@@ -53,12 +53,20 @@ class NimSetup(Screen):
                self.newConfig()
 
        def keyRight(self):
                self.newConfig()
 
        def keyRight(self):

-               self["config"].handleKey(config.key["nextElement"])
+               #forbid to enable advanced mode until its ready
+               if self["config"].getCurrent()[0] != _("Configmode"):
+                       self["config"].handleKey(config.key["nextElement"])

                self.newConfig()
 
                self.newConfig()
 

+       def keyNumberGlobal(self, number):
+               print "You pressed number " + str(number)
+               if (self["config"].getCurrent()[1].parent.enabled == True):
+                       self["config"].handleKey(config.key[str(number)])
+

        def keySave(self):
                for x in self["config"].list:
                        x[1].save()
        def keySave(self):
                for x in self["config"].list:
                        x[1].save()

+               nimmanager.sec.update() 

                self.close()
 
        def keyCancel(self):
                self.close()
 
        def keyCancel(self):


@@ -69,13 +77,23 @@ class NimSetup(Screen):
        def __init__(self, session, nim):
                Screen.__init__(self, session)
                self.nim = nim
        def __init__(self, session, nim):
                Screen.__init__(self, session)
                self.nim = nim

-
-               self["actions"] = ActionMap(["SetupActions"],
+               
+               self["actions"] = NumberActionMap(["SetupActions"],

                {
                        "ok": self.keySave,
                        "cancel": self.keyCancel,
                        "left": self.keyLeft,
                {
                        "ok": self.keySave,
                        "cancel": self.keyCancel,
                        "left": self.keyLeft,

-                       "right": self.keyRight
+                       "right": self.keyRight,
+                       "1": self.keyNumberGlobal,
+                       "2": self.keyNumberGlobal,
+                       "3": self.keyNumberGlobal,
+                       "4": self.keyNumberGlobal,
+                       "5": self.keyNumberGlobal,
+                       "6": self.keyNumberGlobal,
+                       "7": self.keyNumberGlobal,
+                       "8": self.keyNumberGlobal,
+                       "9": self.keyNumberGlobal,
+                       "0": self.keyNumberGlobal

                }, -1)
 
                self.list = [ ]
                }, -1)
 
                self.list = [ ]