X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a0842dd1b96a660acedf4894690c3ab37c24094d..2b6021b22bea4aacfec94140138c3f42262bf5fb:/lib/python/Screens/Console.py

diff --git a/lib/python/Screens/Console.py b/lib/python/Screens/Console.py
index 17d706f5..03b0249b 100644
--- a/lib/python/Screens/Console.py
+++ b/lib/python/Screens/Console.py
@@ -10,10 +10,12 @@ class Console(Screen):
 			<widget name="text" position="0,0" size="550,400" font="Regular;15" />
 		</screen>"""
 		
-	def __init__(self, session, args = None):
+	def __init__(self, session, title = "Console", cmdlist = None, finishedCallback = None):
 		self.skin = Console.skin
 		Screen.__init__(self, session)
 
+		self.finishedCallback = finishedCallback
+
 		self["text"] = ScrollLabel("")
 		self["actions"] = ActionMap(["WizardActions", "DirectionActions"], 
 		{
@@ -23,7 +25,10 @@ class Console(Screen):
 			"down": self["text"].pageDown
 		}, -1)
 		
-		self.cmdlist = args
+		self.cmdlist = cmdlist
+		self.newtitle = title
+		
+		self.onShown.append(self.updateTitle)
 		
 		self.container = eConsoleAppContainer()
 		self.run = 0
@@ -31,9 +36,13 @@ class Console(Screen):
 		self.container.dataAvail.get().append(self.dataAvail)
 		self.onLayoutFinish.append(self.startRun) # dont start before gui is finished
 
+	def updateTitle(self):
+		self.setTitle(self.newtitle)
+
 	def startRun(self):
 		self["text"].setText(_("Execution Progress:") + "\n\n")
-		self.container.execute("ipkg update")
+		print "Console: executing in run", self.run, " the command:", self.cmdlist[self.run]
+		self.container.execute(self.cmdlist[self.run])
 
 	def runFinished(self, retval):
 		self.run += 1
@@ -43,10 +52,12 @@ class Console(Screen):
 			str = self["text"].getText()
 			str += _("Execution finished!!");
 			self["text"].setText(str)
+			if self.finishedCallback is not None:
+				self.finishedCallback()
 			
 	def cancel(self):
 		if self.run == len(self.cmdlist):
 			self.close()
 
 	def dataAvail(self, str):
-		self["text"].setText(self["text"].getText() + str)
\ No newline at end of file
+		self["text"].setText(self["text"].getText() + str)