DiseqcTester/plugin.py: -use "Setup" Skin but still allow individual skinning over own Skin entry "DiseqcTesterTestTypeSelection"

- add SetupSummary

1 files changed, 34 insertions, 9 deletions

diff --git a/lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py b/lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py
index 71ae50b6..5b7edcf6 100644..100755
--- a/lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py
@@ -560,24 +560,34 @@ class DiseqcTester(Screen, TuneTest, ResultParser):
 			self["CmdText"].setText(_("Press OK to get further details for %s") % str(self["progress_list"].getCurrent()[1]))
 
 class DiseqcTesterTestTypeSelection(Screen, ConfigListScreen):
-	skin = """<screen position="80,95" size="560,412" title="DiSEqC Tester Test Settings">
-		<widget name="config" position="10,10" size="540,402" scrollbarMode="showOnDemand" />
-	</screen>
-	"""
+
 	def __init__(self, session, feid):
 		Screen.__init__(self, session)
+		# for the skin: first try MediaPlayerSettings, then Setup, this allows individual skinning
+		self.skinName = ["DiseqcTesterTestTypeSelection", "Setup" ]
+		self.setup_title = _("DiSEqC-Tester settings")
+		self.onChangedEntry = [ ]
 		self.feid = feid
 		
 		self.list = []
-		ConfigListScreen.__init__(self, self.list)
+		ConfigListScreen.__init__(self, self.list, session = self.session, on_change = self.changedEntry)
 		
 		self["actions"] = ActionMap(["SetupActions"],
-		{
-			"cancel": self.keyCancel
-		}, -2)
+			{
+				"cancel": self.keyCancel,
+				"save": self.keyOK,
+				"ok": self.keyOK,
+			}, -2)
+
+		self["key_red"] = StaticText(_("Cancel"))
+		self["key_green"] = StaticText(_("OK"))
 		
 		self.createSetup()
-		
+		self.onLayoutFinish.append(self.layoutFinished)
+
+	def layoutFinished(self):
+		self.setTitle(self.setup_title)
+
 	def createSetup(self):
 		self.testtype = ConfigSelection(choices={"quick": _("Quick"), "random": _("Random"), "complete": _("Complete")}, default = "quick")
 		self.testtypeEntry = getConfigListEntry(_("Test Type"), self.testtype)
@@ -613,6 +623,21 @@ class DiseqcTesterTestTypeSelection(Screen, ConfigListScreen):
 	def keyCancel(self):
 		self.close()
 
+	# for summary:
+	def changedEntry(self):
+		for x in self.onChangedEntry:
+			x()
+
+	def getCurrentEntry(self):
+		return self["config"].getCurrent()[0]
+
+	def getCurrentValue(self):
+		return str(self["config"].getCurrent()[1].getText())
+
+	def createSummary(self):
+		from Screens.Setup import SetupSummary
+		return SetupSummary
+
 class DiseqcTesterNimSelection(NimSelection):
 	skin = """
 		<screen position="160,123" size="400,330" title="Choose Tuner">