define movepaths for MovingPixmaps and proof of concept in the start-wizard

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

diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index 204c6a809aaf0ae65ddad215ee3ca01d3c3ab8eb..21063942c5f5119f6b0a6a150eac40e50af373d3 100644 (file)
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -19,25 +19,41 @@ class NimSetup(Screen):
                        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
+               list.append(getConfigListEntry(_("Positioner mode"), config.Nims[nim.slotid].positionerMode))
+               if (config.Nims[nim.slotid].positionerMode.value == 0): # USALS
+                       list.append(getConfigListEntry(_("Longitude"), config.Nims[nim.slotid].longitude))
+                       list.append(getConfigListEntry("", config.Nims[nim.slotid].longitudeOrientation))
+                       list.append(getConfigListEntry(_("Latitude"), config.Nims[nim.slotid].latitude))
+                       list.append(getConfigListEntry("", config.Nims[nim.slotid].latitudeOrientation))
+               elif (config.Nims[nim.slotid].positionerMode.value == 1): # manual
+                       pass
        
        def createSetup(self):
                self.list = [ ]
                
-               self.list.append(getConfigListEntry(_("Configmode"), config.Nims[self.nim.slotid].configMode))
-               
-               if config.Nims[self.nim.slotid].configMode.value == 0:                  #simple setup
-                       self.list.append(getConfigListEntry(_("Diseqcmode"), config.Nims[self.nim.slotid].diseqcMode))
+               if (nimmanager.getNimType(self.nim.slotid) == nimmanager.nimType["DVB-S"]):
+                       self.list.append(getConfigListEntry(_("Configmode"), config.Nims[self.nim.slotid].configMode))
+                       
+                       if config.Nims[self.nim.slotid].configMode.value == 0:                  #simple setup
+                               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 (config.Nims[self.nim.slotid].diseqcMode.value == 4):
+                                       self.createPositionerSetup(self.nim, self.list)
+                       elif config.Nims[self.nim.slotid].configMode.value == 1: # linked tuner
+                               #self.list.append(getConfigListEntry(_("Linked to"), config.Nims[self.nim.slotid].linkedTo))
+                               pass
+                       elif config.Nims[self.nim.slotid].configMode.value == 2: # advanced mode
+                               print "FIXME: implement advanced mode"
                
-                       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"
+               elif (nimmanager.getNimType(self.nim.slotid) == nimmanager.nimType["DVB-C"]):
+                       self.list.append(getConfigListEntry(_("Cable provider"), config.Nims[self.nim.slotid].cable))
+               elif (nimmanager.getNimType(self.nim.slotid) == nimmanager.nimType["DVB-T"]):
+                       self.list.append(getConfigListEntry(_("Terrestrial provider"), config.Nims[self.nim.slotid].terrestrial))
+
 
                self["config"].list = self.list
                self["config"].l.setList(self.list)
@@ -49,13 +65,21 @@ class NimSetup(Screen):
                        self.createSetup()
                
        def keyLeft(self):
+               if self["config"].getCurrent()[0] == _("Configmode"):
+                       if self.nim.slotid == 0:
+                               return
                self["config"].handleKey(config.key["prevElement"])
                self.newConfig()
 
        def keyRight(self):
                #forbid to enable advanced mode until its ready
-               if self["config"].getCurrent()[0] != "Configmode":
-                       self["config"].handleKey(config.key["nextElement"])
+               #perhaps its better to use an own element here
+               #this suckz .. how enable advanced config?
+               if self["config"].getCurrent()[0] == _("Configmode"):
+                       if self.nim.slotid == 0:
+                               return
+
+               self["config"].handleKey(config.key["nextElement"])
                self.newConfig()
 
        def keyNumberGlobal(self, number):