X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/e1493861d34034f141b90c97ff7d918dabb26a4d..9ebda6e28dcc96d34b6c5c63d94883adc7ef2dd3:/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py

diff --git a/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py b/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
index 6d177e4c..73a857ec 100644
--- a/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
@@ -1,4 +1,4 @@
-from enigma import eTimer, eDVBResourceManager,\
+from enigma import eDVBResourceManager,\
 	eDVBFrontendParametersSatellite, eDVBFrontendParameters
 
 from Screens.Screen import Screen
@@ -41,7 +41,7 @@ class Tuner:
 class Satfinder(ScanSetup):
 	skin = """
 		<screen position="90,100" size="520,400" title="Tune">
-			<widget name="config" position="20,10" size="460,240" scrollbarMode="showOnDemand" />
+			<widget name="config" position="20,10" size="460,210" scrollbarMode="showOnDemand" />
 			<widget name="introduction" position="20,360" zPosition="-10" size="350,30" font="Regular;23" />
 			<eLabel text="dB:" position="23,230" size="60,22" font="Regular;21" />
 			<eLabel text="SNR:" position="23,255" size="60,22" font="Regular;21" />
@@ -69,11 +69,11 @@ class Satfinder(ScanSetup):
 			<widget source="Frontend" render="Progress" position="85,307" size="200,22" >
 				<convert type="FrontendInfo">BER</convert>
 			</widget>
-			<widget source="Frontend" render="Pixmap" pixmap="key_green-fs8.png" position="295,330" zPosition="4" size="28,20" alphatest="on" >
+			<widget source="Frontend" render="Pixmap" pixmap="skin_default/buttons/key_green.png" position="295,330" zPosition="4" size="28,20" alphatest="on" >
 				<convert type="FrontendInfo">LOCK</convert>
 			<convert type="ConditionalShowHide" />
 			</widget>
-			<widget source="Frontend" render="Pixmap" pixmap="key_red-fs8.png" position="295,330" zPosition="4" size="28,20" alphatest="on" >
+			<widget source="Frontend" render="Pixmap" pixmap="skin_default/buttons/key_red.png" position="295,330" zPosition="4" size="28,20" alphatest="on" >
 				<convert type="FrontendInfo">LOCK</convert>
 			<convert type="ConditionalShowHide">Invert</convert>
 			</widget>
@@ -113,7 +113,7 @@ class Satfinder(ScanSetup):
 		ScanSetup.__init__(self, session)
 		self.tuner = Tuner(self.frontend)
 		self["introduction"].setText("")
-		self["Frontend"] = FrontendStatus(frontend_source = self.frontend, update_interval = 100)
+		self["Frontend"] = FrontendStatus(frontend_source = lambda : self.frontend, update_interval = 100)
 		self.initcomplete = True
 
 	def createSetup(self):
@@ -189,6 +189,8 @@ class Satfinder(ScanSetup):
 					pol = "CL"
 				elif x[3] == 3:
 					pol = "CR"
+				else:
+					pol = "??"
 				if x[4] == 0:
 					fec = "FEC_AUTO"
 				elif x[4] == 1:
@@ -205,6 +207,8 @@ class Satfinder(ScanSetup):
 					fec = "FEC_8_9"
 				elif x[4] == 6:
 					fec = "FEC_None"
+				else:
+					fec = "FEC_Unknown"
 				list.append(str(x[1]) + "," + str(x[2]) + "," + pol + "," + fec)
 			self.tuning_transponder = ConfigSelection(choices = list)
 			self.tuning_transponder.addNotifier(self.retune, initial_call = False)
@@ -272,12 +276,12 @@ def SatfinderMain(session, **kwargs):
 
 def SatfinderStart(menuid, **kwargs):
 	if menuid == "scan":
-		return [(_("Satfinder"), SatfinderMain)]
+		return [(_("Satfinder"), SatfinderMain, "satfinder", None)]
 	else:
 		return []
 
 def Plugins(**kwargs):
 	if (nimmanager.hasNimType("DVB-S")):
-		return PluginDescriptor(name=_("Satfinder"), description="Helps setting up your dish", where = PluginDescriptor.WHERE_SETUP, fnc=SatfinderStart)
+		return PluginDescriptor(name=_("Satfinder"), description="Helps setting up your dish", where = PluginDescriptor.WHERE_MENU, fnc=SatfinderStart)
 	else:
 		return []