Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2

2 files changed, 14 insertions, 66 deletions

diff --git a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
index d67a97cb..928d72a6 100644
--- a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
@@ -26,22 +26,20 @@ class PositionerSetup(Screen):
 			<widget name="green" position="140,155" size="140,80" backgroundColor="green" halign="center" valign="center" font="Regular;21" />
 			<widget name="yellow" position="280,155" size="140,80" backgroundColor="yellow" halign="center" valign="center" font="Regular;21" />
 			<widget name="blue" position="420,155" size="140,80" backgroundColor="blue" halign="center" valign="center" font="Regular;21" />
-			
-			<widget name="snr" text="SNR:" position="0,245" size="60,22" font="Regular;21" />
-			<widget name="agc" text="AGC:" position="0,270" size="60,22" font="Regular;21" />
-			<widget name="ber" text="BER:" position="0,295" size="60,22" font="Regular;21" />
-			<widget name="lock" text="Lock:" position="0,320" size="60,22" font="Regular;21" />
-			<widget name="snr_percentage" position="220,245" size="60,22" font="Regular;21" />
-			<widget name="agc_percentage" position="220,270" size="60,22" font="Regular;21" />
+
+			<widget name="snr_db" position="60,245" size="150,22" halign="center" valign="center" font="Regular;21" />
+			<eLabel text="SNR:" position="0,270" size="60,22" font="Regular;21" />
+			<eLabel text="BER:" position="0,295" size="60,22" font="Regular;21" />
+			<eLabel text="Lock:" position="0,320" size="60,22" font="Regular;21" />
+			<widget name="snr_percentage" position="220,270" size="60,22" font="Regular;21" />
 			<widget name="ber_value" position="220,295" size="60,22" font="Regular;21" />
 			<widget name="lock_state" position="60,320" size="150,22" font="Regular;21" />
-			<widget name="snr_bar" position="60,245" size="150,22" />
-			<widget name="agc_bar" position="60,270" size="150,22" />
+			<widget name="snr_bar" position="60,270" size="150,22" />
 			<widget name="ber_bar" position="60,295" size="150,22" />
 
-			<widget name="frequency" text="Frequency:" position="300,245" size="120,22" font="Regular;21" />
-			<widget name="symbolrate" text="Symbolrate:" position="300,270" size="120,22" font="Regular;21" />
-			<widget name="fec" text="FEC:" position="300,295" size="120,22" font="Regular;21" />
+			<eLabel text="Frequency:" position="300,245" size="120,22" font="Regular;21" />
+			<eLabel text="Symbolrate:" position="300,270" size="120,22" font="Regular;21" />
+			<eLabel text="FEC:" position="300,295" size="120,22" font="Regular;21" />
 			<widget name="frequency_value" position="420,245" size="120,22" font="Regular;21" />
 			<widget name="symbolrate_value" position="420,270" size="120,22" font="Regular;21" />
 			<widget name="fec_value" position="420,295" size="120,22" font="Regular;21" />
@@ -81,27 +79,18 @@ class PositionerSetup(Screen):
 		self["yellow"] = self.yellow
 		self.blue = Label("")
 		self["blue"] = self.blue
-		
+
 		self.list = []
 		self["list"] = ConfigList(self.list)
 		self.createSetup()
-		
-		self["snr"] = Label()
-		self["agc"] = Label()
-		self["ber"] = Label()
-		self["lock"] = Label()
+
+		self["snr_db"] = TunerInfo(TunerInfo.SNR_DB, statusDict = self.frontendStatus)
 		self["snr_percentage"] = TunerInfo(TunerInfo.SNR_PERCENTAGE, statusDict = self.frontendStatus)
-		self["agc_percentage"] = TunerInfo(TunerInfo.AGC_PERCENTAGE, statusDict = self.frontendStatus)
 		self["ber_value"] = TunerInfo(TunerInfo.BER_VALUE, statusDict = self.frontendStatus)
 		self["snr_bar"] = TunerInfo(TunerInfo.SNR_BAR, statusDict = self.frontendStatus)
-		self["agc_bar"] = TunerInfo(TunerInfo.AGC_BAR, statusDict = self.frontendStatus)
 		self["ber_bar"] = TunerInfo(TunerInfo.BER_BAR, statusDict = self.frontendStatus)
 		self["lock_state"] = TunerInfo(TunerInfo.LOCK_STATE, statusDict = self.frontendStatus)
 
-		self["frequency"] = Label()
-		self["symbolrate"] = Label()
-		self["fec"] = Label()
-
 		self["frequency_value"] = Label("")
 		self["symbolrate_value"] = Label("")
 		self["fec_value"] = Label("")
@@ -329,11 +318,10 @@ class PositionerSetup(Screen):
 	def updateStatus(self):
 		if self.frontend:
 			self.frontend.getFrontendStatus(self.frontendStatus)
+		self["snr_db"].update()
 		self["snr_percentage"].update()
-		self["agc_percentage"].update()
 		self["ber_value"].update()
 		self["snr_bar"].update()
-		self["agc_bar"].update()
 		self["ber_bar"].update()
 		self["lock_state"].update()
 		transponderdata = self.tuner.getTransponderData()
diff --git a/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py b/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
index 74568855..064ac673 100644
--- a/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
@@ -39,46 +39,6 @@ class Tuner:
 			self.frontend.tune(self.lastparm)
 
 class Satfinder(ScanSetup):
-	skin = """
-		<screen position="90,100" size="520,400" title="Tune">
-			<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" />
-			<eLabel text="AGC:" position="23,280" size="60,22" font="Regular;21" />
-			<eLabel text="BER:" position="23,305" size="60,22" font="Regular;21" />
-			<eLabel text="Lock:" position="23,330" size="60,22" font="Regular;21" />
-			<widget source="Frontend" render="Label" position="295,230" size="60,22" font="Regular;21" >
-				<convert type="FrontendInfo">SNRdB</convert>
-			</widget>
-			<widget source="Frontend" render="Label" position="295,255" size="60,22" font="Regular;21" >
-				<convert type="FrontendInfo">SNR</convert>
-			</widget>
-			<widget source="Frontend" render="Label" position="295,280" size="60,22" font="Regular;21" >
-				<convert type="FrontendInfo">AGC</convert>
-			</widget>
-			<widget source="Frontend" render="Label" position="295,305" size="60,22" font="Regular;21" >
-				<convert type="FrontendInfo">BER</convert>
-			</widget>
-			<widget source="Frontend" render="Progress" position="85,257" size="200,22" >
-				<convert type="FrontendInfo">SNR</convert>
-			</widget>
-			<widget source="Frontend" render="Progress" position="85,282" size="200,22" >
-				<convert type="FrontendInfo">AGC</convert>
-			</widget>
-			<widget source="Frontend" render="Progress" position="85,307" size="200,22" >
-				<convert type="FrontendInfo">BER</convert>
-			</widget>
-			<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="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>
-		</screen>"""
-
 	def openFrontend(self):
 		res_mgr = eDVBResourceManager.getInstance()
 		if res_mgr: