[Spambayes-checkins] spambayes/Outlook2000 manager.py,1.34,1.35

[Mark Hammond]

Update of /cvsroot/spambayes/spambayes/Outlook2000
In directory sc8-pr-cvs1:/tmp/cvs-serv9065

Modified Files:
	manager.py 
Log Message:
Make ShowManager() an instance method as well as a module method.

Index: manager.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/manager.py,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** manager.py	12 Nov 2002 04:52:12 -0000	1.34
--- manager.py	23 Nov 2002 10:32:48 -0000	1.35
***************
*** 282,285 ****
--- 282,311 ----
              return score
  
+     def ShowManager(self):
+         def do_train(dlg):
+             import train
+             import dialogs.TrainingDialog
+             d = dialogs.TrainingDialog.TrainingDialog(dlg.mgr, train.trainer)
+             d.DoModal()
+ 
+         def do_filter(dlg):
+             import filter
+             import dialogs.FilterDialog
+             d = dialogs.FilterDialog.FilterNowDialog(dlg.mgr, filter.filterer)
+             d.DoModal()
+ 
+         def define_filter(dlg):
+             import filter
+             import dialogs.FilterDialog
+             d = dialogs.FilterDialog.FilterArrivalsDialog(dlg.mgr, filter.filterer)
+             d.DoModal()
+             if dlg.mgr.addin is not None:
+                 dlg.mgr.addin.FiltersChanged()
+ 
+ 
+         import dialogs.ManagerDialog
+         d = dialogs.ManagerDialog.ManagerDialog(self, do_train, do_filter, define_filter)
+         d.DoModal()
+ 
  _mgr = None
  
***************
*** 296,323 ****
  
  def ShowManager(mgr):
!     def do_train(dlg):
!         import train
!         import dialogs.TrainingDialog
!         d = dialogs.TrainingDialog.TrainingDialog(dlg.mgr, train.trainer)
!         d.DoModal()
! 
!     def do_filter(dlg):
!         import filter
!         import dialogs.FilterDialog
!         d = dialogs.FilterDialog.FilterNowDialog(dlg.mgr, filter.filterer)
!         d.DoModal()
! 
!     def define_filter(dlg):
!         import filter
!         import dialogs.FilterDialog
!         d = dialogs.FilterDialog.FilterArrivalsDialog(dlg.mgr, filter.filterer)
!         d.DoModal()
!         if dlg.mgr.addin is not None:
!             dlg.mgr.addin.FiltersChanged()
! 
! 
!     import dialogs.ManagerDialog
!     d = dialogs.ManagerDialog.ManagerDialog(mgr, do_train, do_filter, define_filter)
!     d.DoModal()
  
  def main(verbose_level = 1):
--- 322,326 ----
  
  def ShowManager(mgr):
!     mgr.ShowManager()
  
  def main(verbose_level = 1):