Merge lp:~jtatum/quidgets/params-bug into lp:~rick-rickspencer3/quidgets/trunk

[James Tatum]

[James Tatum (jtatum)]

Params is optional. If params isn't specified, the code for adding the update_progress_function param would throw an exception. This is already handled for the case of params["kill"], so moving the code down there. Hopefully this is the last of the bugs that I added :)

Unmerged revisions

82. By James Tatum on 2010-02-13

Moving the update_progress_function param setting to killablethread where the kill param is set.

=== modified file 'quickly/widgets/asynch_task_progressbox.py'
--- quickly/widgets/asynch_task_progressbox.py	2010-02-11 22:49:17 +0000
+++ quickly/widgets/asynch_task_progressbox.py	2010-02-13 01:34:14 +0000
@@ -50,7 +50,6 @@
   self.cancel_button = gtk.Button(stock=gtk.STOCK_CANCEL)
   if cancelable:
    self.cancel_button.show()
-  params["update_progress_function"] = self.update
   self.cancel_button.set_sensitive(False)
   self.cancel_button.connect("clicked",self.__stop_clicked)
   self.pack_end(self.cancel_button, False)
@@ -79,7 +78,8 @@
 
   #Create and start a thread to run the users task
   #pass in a callback and the user's params
-  self.work_thread = KillableThread(self.run_function, self.__on_complete, self.params)
+  self.work_thread = KillableThread(self.run_function, self.__on_complete, 
+                                    self.update, self.params)
   self.work_thread.start()
   
   #create a thread to display the user feedback
@@ -190,12 +190,13 @@
  """Class for use by AsynchTaskProgressBox. Not for general use.
 
  """
- def __init__(self,run_function, on_complete,  params = None):
+ def __init__(self,run_function, on_complete, update, params = None):
   threading.Thread.__init__(self)
   self.setDaemon(False)
   self.run_function = run_function
   self.params = params
   self.on_complete = on_complete
+  self.update = update
 
  #As a subclass of Thread, this function runs when start() is called
  #It will run the user's function on this thread
@@ -204,6 +205,7 @@
   if self.params == None:
    self.params = {}
   self.params["kill"] = False
+  self.params["update_progress_function"] = self.update
   #tell the function to run
   data = self.run_function(self.params)
   #return any data from the function so it can be sent in the complete signal