sync spaces & CR

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

diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index 6313fb7fea8c9a7110d646af1437dc4824122854..1e3cbd513f181f85a120d0035d035ef2d033dfef 100644 (file)
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -1,55 +1,46 @@
 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.MenuList import MenuList
 from Components.NimManager import nimmanager
+from Components.config import getConfigListEntry
 
 class NimSetup(Screen):
        def createSimpleSetup(self, nim, list, mode):
-               print "request for diseqcmode:" + str(mode)
-               
-               b = config.Nims[nim.slotid].diseqcA
-               item = b.controlType(b)
-               if mode == 0:
-                       list.append( ("Satellite", item) )
-               else:
-                       list.append( ("Port A", item) )
-               
-               if mode >= 1:
-                       b = config.Nims[nim.slotid].diseqcB
-                       item = b.controlType(b)
-                       list.append( ("Port B", item) )
-                       if mode >= 3:
-                               b = config.Nims[nim.slotid].diseqcC
-                               item = b.controlType(b)
-                               list.append( ("Port C", item) )
+               if mode == 0:                   #single Sat
+                       list.append(getConfigListEntry("Satellite", config.Nims[nim.slotid].diseqcA))
+               else:                                                   # > 1 Sats
+                       list.append(getConfigListEntry("Port A", config.Nims[nim.slotid].diseqcA))
 
-                               b = config.Nims[nim.slotid].diseqcD
-                               item = b.controlType(b)
-                               list.append( ("Port D", item) )
-                               
+               if mode >= 1:                   # > 1 Sats
+                       list.append(getConfigListEntry("Port B", config.Nims[nim.slotid].diseqcB))
+                       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))
+       def createPositionerSetup(self, nim, list):
+               list.append(getConfigListEntry("Longitude", config.Nims[nim.slotid].longitude))
+               list.append(getConfigListEntry("Latitude", config.Nims[nim.slotid].latitude))
+               pass
+       
        def createSetup(self):
-               print "createSetup"
                self.list = [ ]
                
-               b = config.Nims[self.nim.slotid].configMode
-               item = b.controlType(b)
-               self.list.append( ("Configmode", item) )
+               self.list.append(getConfigListEntry("Configmode", config.Nims[self.nim.slotid].configMode))
                
-               if b.value == 0:                        #simple setup
-                       b = config.Nims[self.nim.slotid].diseqcMode
-                       item = b.controlType(b)
-                       self.list.append( ("Diseqcmode", item) )
+               if config.Nims[self.nim.slotid].configMode.value == 0:                  #simple setup
+                       self.list.append(getConfigListEntry("Diseqcmode", config.Nims[self.nim.slotid].diseqcMode))
                
-                       self.createSimpleSetup(self.nim, self.list, b.value)
+                       if (0 <= config.Nims[self.nim.slotid].diseqcMode.value < 4):
+                               self.createSimpleSetup(self.nim, self.list, config.Nims[self.nim.slotid].diseqcMode.value)
+                       if (config.Nims[self.nim.slotid].diseqcMode.value == 4):
+                               self.createPositionerSetup(self.nim, self.list)
                else:   
                        print "FIXME: implement advanced mode"
 
-               #???
                self["config"].list = self.list
                self["config"].l.setList(self.list)
-               self["config"].l.invalidate()
                
        def newConfig(self):    
                if self["config"].getCurrent()[0] == "Diseqcmode":
@@ -62,19 +53,47 @@ class NimSetup(Screen):
                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()
 
+       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()
+               nimmanager.sec.update() 
+               self.close()
+
+       def keyCancel(self):
+               for x in self["config"].list:
+                       x[1].cancel()
+               self.close()
+
        def __init__(self, session, nim):
                Screen.__init__(self, session)
                self.nim = nim
-
-               self["actions"] = ActionMap(["SetupActions"],
+               
+               self["actions"] = NumberActionMap(["SetupActions"],
                {
-                       "ok": self.close,
-                       "cancel": self.close,
+                       "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 = [ ]