[Spambayes-checkins] spambayes/Outlook2000 manager.py,1.82,1.83

[Mark Hammond]

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

Modified Files:
	manager.py 
Log Message:
Update our "verbose" variable from the config when saving it, so that
changes made to the log level in the dialogs are reflected immediately.

Move another "database not dirty" message from a print to a LogDebug

Add a little more explanation to the "disabled reason" - specifically,
tell them to use the 'Filtering' tab.


Index: manager.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/manager.py,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** manager.py	27 Aug 2003 11:28:04 -0000	1.82
--- manager.py	29 Aug 2003 00:10:33 -0000	1.83
***************
*** 719,722 ****
--- 719,724 ----
          import locale; locale.setlocale(locale.LC_NUMERIC, "C")
  
+         # Update our runtime verbosity from the options.
+         self.verbose = self.config.general.verbose
          print "Saving configuration ->", self.config_filename.encode("mbcs", "replace")
          assert self.config and self.options, "Have no config to save!"
***************
*** 734,738 ****
              self.classifier_data.Save()
          else:
!             print "Bayes database is not dirty - not writing"
  
      def Close(self):
--- 736,740 ----
              self.classifier_data.Save()
          else:
!             self.LogDebug(1, "Bayes database is not dirty - not writing")
  
      def Close(self):
***************
*** 774,782 ****
          ok_to_enable = operator.truth(config.watch_folder_ids)
          if not ok_to_enable:
!             return "You must define folders to watch for new messages"
  
          ok_to_enable = operator.truth(config.spam_folder_id)
          if not ok_to_enable:
!             return "You must define the folder to receive your certain spam"
  
          return None
--- 776,786 ----
          ok_to_enable = operator.truth(config.watch_folder_ids)
          if not ok_to_enable:
!             return "You must define folders to watch for new messages.  " \
!                    "Select the 'Filtering' tab to define these folders."
  
          ok_to_enable = operator.truth(config.spam_folder_id)
          if not ok_to_enable:
!             return "You must define the folder to receive your certain spam.  " \
!                    "Select the 'Filtering' tab to define this folders."
  
          return None