do not allow colon in filenames

[enigma2.git] / lib / python / Components / NimManager.py

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 550ce846caa2b5edb45aa05c39004244b9a96196..8769aae96d2a457ea139ca16645494f80eece437 100644 (file)
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -2,7 +2,6 @@ from config import config       #global config instance
 
 from config import configElement
 from config import ConfigSubsection
-from config import ConfigSlider
 from config import configSelection
 from config import currentConfigSelectionElement
 from config import getConfigSelectionElement
@@ -381,7 +380,6 @@ class NimManager:
                                        pass
                                else:
                                        self.transponders[self.parsedCab] = [ ]
-
                                self.transponders[self.parsedCab].append((1, freq, sr, mod, fec))
 
        class parseTerrestrials(ContentHandler):
@@ -416,7 +414,16 @@ class NimManager:
                                self.transponders[self.parsedTer].append((2, freq, bw, const, crh, crl, guard, transm, hierarchy, inv))
 
        def getTransponders(self, pos):
-               return self.transponders[pos]
+               if self.transponders.has_key(pos):
+                       return self.transponders[pos]
+               else:
+                       return []
+
+       def getTranspondersCable(self, cable):
+               return self.transponderscable[cable]
+
+       def getCableDescription(self, nim):
+               return self.cablesList[config.Nims[nim].cable.value]
 
        def getConfiguredSats(self):
                return self.sec.getSatList()
@@ -480,10 +487,16 @@ class NimManager:
 
        def getNimType(self, slotID):
                if slotID >= self.nimCount:
-                       return "empty/unknown"
+                       return self.nimType["empty/unknown"]
                else:   
                        return self.nimType[self.nimTypes[slotID]]
                        
+       def getNimTypeName(self, slotID):
+               if slotID >= self.nimCount:
+                       return "empty/unknown"
+               else:   
+                       return self.nimTypes[slotID]
+               
        def getNimName(self, slotID):
                return self.nimNames[slotID]
 
@@ -544,7 +557,10 @@ class NimManager:
                                nimText += ("DVB-S", "DVB-C", "DVB-T")[slot.nimType] + ")"
                        list.append((nimText, slot))
                return list
-       
+
+       def getNimConfigMode(self, slotid):
+               return currentConfigSelectionElement(config.Nims[slotid].configMode)
+
        def getSatListForNim(self, slotid):
                list = []
                if (self.getNimType(slotid) == self.nimType["DVB-S"]):