Welcome to SpamBayes

Thanks to this remarkable open source duo, I am ready to declare victory on spam.

setup.py install
/usr/local/bin/hammiefilter.py -d $HOME/.hammie.db -n
/usr/local/bin/mboxtrain.py -d $HOME/.hammiedb -g $HOME/Mail/inbox -s $HOME/Mail/spam
!       :0fw:hamlock
!       | /usr/local/bin/hammiefilter.py
! 
!       :0
!       * ^X-Spambayes-Classification: spam 
!       ${MAILDIR}/spam
!       
!       :0
!       * ^X-Spambayes-Classification: unsure
!       ${MAILDIR}/unsure
! 
21 2 * * * /usr/local/bin/mboxtrain.py -d $HOME/.hammiedb -g $HOME/Mail/Inbox -s $HOME/Mail/spam
/usr/local/bin/hammiefilter.py -d $HOME/.hammie.db -n
/usr/local/bin/mboxtrain.py -d $HOME/.hammiedb -g $HOME/Mail/inbox -s $HOME/Mail/spam
--- 27,31 ----
  /usr/local/bin/hammiefilter.py -d $HOME/.hammie.db -n
/usr/local/bin/mboxtrain.py -d $HOME/.hammie.db -g $HOME/Mail/inbox -s $HOME/Mail/spam
***************
*** 43,47 ****

21 2 * * * /usr/local/bin/mboxtrain.py -d $HOME/.hammiedb -g $HOME/Mail/Inbox -s $HOME/Mail/spam
21 2 * * * /usr/local/bin/mboxtrain.py -d $HOME/.hammie.db -g $HOME/Mail/Inbox -s $HOME/Mail/spam
        :0fw:hamlock
!       | /usr/local/bin/hammiefilter.py

        :0
--- 31,35 ----
          :0fw:hamlock
!       | /usr/local/bin/hammiefilter.py -d $HOME/.hammie.db

        :0

From xenogeist at users.sourceforge.net  Wed Aug 13 13:31:12 2003
From: xenogeist at users.sourceforge.net (Adam Walker)
Date: Wed Aug 13 15:31:26 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000/dialogs/resources
	rcparser.py, 1.2, 1.3
Message-ID: 

Update of /cvsroot/spambayes/spambayes/Outlook2000/dialogs/resources
In directory sc8-pr-cvs1:/tmp/cvs-serv28122/Outlook2000/dialogs/resources

Modified Files:
	rcparser.py 
Log Message:
Handle case where dialogs are not grouped together.

Index: rcparser.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/dialogs/resources/rcparser.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** rcparser.py	10 Aug 2003 07:26:50 -0000	1.2
--- rcparser.py	13 Aug 2003 19:31:10 -0000	1.3
***************
*** 120,126 ****
          f = open(rcFileName)
          self.open(f)
!         while self.token!=None and self.token[0:4]!="IDD_":
!             self.getToken()
!         while self.token!=None and self.token[0:4]=="IDD_":
              self.parse()
              self.getToken()
--- 120,125 ----
          f = open(rcFileName)
          self.open(f)
!         self.getToken()
!         while self.token!=None:
              self.parse()
              self.getToken()
***************
*** 131,138 ****

      def parse(self):
          if self.token == None:
              more == None
!         elif "LANGUAGE" == self.token:
!             more = self.lang()
          else:
              possibleDlgName = self.token
--- 130,146 ----

      def parse(self):
+         deep = 0
          if self.token == None:
              more == None
!         elif "BEGIN" == self.token:
!             deep = 1
!             while deep!=0:
!                 self.getToken()
!                 if "BEGIN" == self.token:
!                     deep += 1
!                 elif "END" == self.token:
!                     deep -= 1
!         elif "IDD_" != self.token[:4]:
!             self.getToken()
          else:
              possibleDlgName = self.token

From anadelonbrin at users.sourceforge.net  Wed Aug 13 16:48:40 2003
From: anadelonbrin at users.sourceforge.net (Tony Meyer)
Date: Wed Aug 13 18:48:50 2003
Subject: [Spambayes-checkins] spambayes/spambayes hammiebulk.py,1.8,1.9
Message-ID: 

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

Modified Files:
	hammiebulk.py 
Log Message:
Update option retrieval, since some of the backwards compat code isn't
working as it should.

This should fix both:
[ 787296 ] Local installation problem: hammiefilter_persistent_storage
and
[ 788002 ] hammiebulk.py uses wrong option name

Index: hammiebulk.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/hammiebulk.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** hammiebulk.py	9 Jul 2003 00:53:38 -0000	1.8
--- hammiebulk.py	13 Aug 2003 22:48:38 -0000	1.9
***************
*** 60,64 ****

  # Default database name
! DEFAULTDB = os.path.expanduser(options.hammiefilter_persistent_storage_file)
  # This is a bit of a hack to counter the default for
  # persistent_storage_file changing from ~/.hammiedb to hammie.db
--- 60,64 ----

  # Default database name
! DEFAULTDB = os.path.expanduser(options["Storage", "persistent_storage_file"])
  # This is a bit of a hack to counter the default for
  # persistent_storage_file changing from ~/.hammiedb to hammie.db

From anadelonbrin at users.sourceforge.net  Wed Aug 13 16:49:43 2003
From: anadelonbrin at users.sourceforge.net (Tony Meyer)
Date: Wed Aug 13 18:49:52 2003
Subject: [Spambayes-checkins] spambayes hammiefilter.py,1.18,1.19
Message-ID: 

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

Modified Files:
	hammiefilter.py 
Log Message:
Update option retrieval, since some of the backwards compat code isn't
working as it should.

Index: hammiefilter.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/hammiefilter.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** hammiefilter.py	5 Jun 2003 15:06:24 -0000	1.18
--- hammiefilter.py	13 Aug 2003 22:49:41 -0000	1.19
***************
*** 100,112 ****
          #   * had hammie.db as their value for persistent_storage_file, and
          #   * their config file was loaded by Options.py.
!         if options["hammiefilter", "persistent_storage_file"] == \
             options.default("Storage", "persistent_storage_file"):
!             options["hammiefilter", "persistent_storage_file"] = \
                                      "~/.hammiedb"
          options.merge_files(['/etc/hammierc',
                              os.path.expanduser('~/.hammierc')])
!         self.dbname = options["hammiefilter", "persistent_storage_file"]
          self.dbname = os.path.expanduser(self.dbname)
!         self.usedb = options["hammiefilter", "persistent_use_database"]

      def newdb(self):
--- 100,112 ----
          #   * had hammie.db as their value for persistent_storage_file, and
          #   * their config file was loaded by Options.py.
!         if options["Storage", "persistent_storage_file"] == \
             options.default("Storage", "persistent_storage_file"):
!             options["Storage", "persistent_storage_file"] = \
                                      "~/.hammiedb"
          options.merge_files(['/etc/hammierc',
                              os.path.expanduser('~/.hammierc')])
!         self.dbname = options["Storage", "persistent_storage_file"]
          self.dbname = os.path.expanduser(self.dbname)
!         self.usedb = options["Storage", "persistent_use_database"]

      def newdb(self):

From anadelonbrin at users.sourceforge.net  Wed Aug 13 16:59:54 2003
From: anadelonbrin at users.sourceforge.net (Tony Meyer)
Date: Wed Aug 13 19:00:18 2003
Subject: [Spambayes-checkins] spambayes mboxtrain.py,1.11,1.12
Message-ID: 

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

Modified Files:
	mboxtrain.py 
Log Message:
Implement patches from:
[ 788001 ] mboxtrain.py maildir bugfix and feature

The main change is the addition of an "-r" switch that will remove the
training data after it is used.  There are also a couple of other minor
improvements.

Index: mboxtrain.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/mboxtrain.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** mboxtrain.py	9 Jul 2003 06:35:49 -0000	1.11
--- mboxtrain.py	13 Aug 2003 22:59:52 -0000	1.12
***************
*** 35,39 ****

      -n  train mail residing in "new" directory, in addition to "cur" directory,
!         which is always trained
  """

--- 35,41 ----

      -n  train mail residing in "new" directory, in addition to "cur" directory,
!         which is always trained (Maildir only)
! 
!     -r  remove mail which was trained on (Maildir only)
  """

***************
*** 46,49 ****
--- 48,52 ----
  import sys, os, getopt
  from spambayes import hammie, mboxutils
+ from spambayes.Options import options

  program = sys.argv[0]
***************
*** 63,69 ****

      if is_spam:
!         spamtxt = "spam"
      else:
!         spamtxt = "ham"
      oldtxt = msg.get(TRAINED_HDR)
      if force:
--- 66,72 ----

      if is_spam:
!         spamtxt = options["Headers", "header_spam_string"]
      else:
!         spamtxt = options["Headers", "header_ham_string"]
      oldtxt = msg.get(TRAINED_HDR)
      if force:
***************
*** 83,90 ****
      return True

! def maildir_train(h, path, is_spam, force):
      """Train bayes with all messages from a maildir."""

!     if loud: print "  Reading as Maildir"

      import time
--- 86,93 ----
      return True

! def maildir_train(h, path, is_spam, force, removetrained):
      """Train bayes with all messages from a maildir."""

!     if loud: print "  Reading %s as Maildir" % (path,)

      import time
***************
*** 97,105 ****

      for fn in os.listdir(path):
-         counter += 1
          cfn = os.path.join(path, fn)
          tfn = os.path.normpath(os.path.join(path, "..", "tmp",
                             "%d.%d_%d.%s" % (time.time(), pid,
                                              counter, host)))
          if loud:
              sys.stdout.write("  %s        \r" % fn)
--- 100,110 ----

      for fn in os.listdir(path):
          cfn = os.path.join(path, fn)
          tfn = os.path.normpath(os.path.join(path, "..", "tmp",
                             "%d.%d_%d.%s" % (time.time(), pid,
                                              counter, host)))
+         if (os.path.isdir(cfn)):
+             continue
+         counter += 1
          if loud:
              sys.stdout.write("  %s        \r" % fn)
***************
*** 117,120 ****
--- 122,127 ----
          # people actually use Maildirs?
          os.rename(tfn, cfn)
+         if (removetrained):
+             os.unlink(cfn)

      if loud:
***************
*** 208,212 ****
                 (trained, counter))

! def train(h, path, is_spam, force, trainnew):
      if not os.path.exists(path):
          raise ValueError("Nonexistent path: %s" % path)
--- 215,219 ----
                 (trained, counter))

! def train(h, path, is_spam, force, trainnew, removetrained):
      if not os.path.exists(path):
          raise ValueError("Nonexistent path: %s" % path)
***************
*** 214,220 ****
          mbox_train(h, path, is_spam, force)
      elif os.path.isdir(os.path.join(path, "cur")):
!         maildir_train(h, os.path.join(path, "cur"), is_spam, force)
          if trainnew:
!             maildir_train(h, os.path.join(path, "new"), is_spam, force)
      elif os.path.isdir(path):
          mhdir_train(h, path, is_spam, force)
--- 221,227 ----
          mbox_train(h, path, is_spam, force)
      elif os.path.isdir(os.path.join(path, "cur")):
!         maildir_train(h, os.path.join(path, "cur"), is_spam, force, removetrained)
          if trainnew:
!             maildir_train(h, os.path.join(path, "new"), is_spam, force, removetrained)
      elif os.path.isdir(path):
          mhdir_train(h, path, is_spam, force)
***************
*** 237,241 ****

      try:
!         opts, args = getopt.getopt(sys.argv[1:], 'hfqnd:D:g:s:')
      except getopt.error, msg:
          usage(2, msg)
--- 244,248 ----

      try:
!         opts, args = getopt.getopt(sys.argv[1:], 'hfqnrd:D:g:s:')
      except getopt.error, msg:
          usage(2, msg)
***************
*** 248,251 ****
--- 255,259 ----
      force = False
      trainnew = False
+     removetrained = False
      good = []
      spam = []
***************
*** 263,266 ****
--- 271,276 ----
          elif opt == '-s':
              spam.append(arg)
+         elif opt == "-r":
+             removetrained = True
          elif opt == "-d":
              usedb = True
***************
*** 279,288 ****
      for g in good:
          if loud: print "Training ham (%s):" % g
!         train(h, g, False, force, trainnew)
          save = True

      for s in spam:
          if loud: print "Training spam (%s):" % s
!         train(h, s, True, force, trainnew)
          save = True

--- 289,298 ----
      for g in good:
          if loud: print "Training ham (%s):" % g
!         train(h, g, False, force, trainnew, removetrained)
          save = True

      for s in spam:
          if loud: print "Training spam (%s):" % s
!         train(h, s, True, force, trainnew, removetrained)
          save = True

From anadelonbrin at users.sourceforge.net  Wed Aug 13 17:10:51 2003
From: anadelonbrin at users.sourceforge.net (Tony Meyer)
Date: Wed Aug 13 19:11:06 2003
Subject: [Spambayes-checkins] spambayes smtpproxy.py,1.7,1.8
Message-ID: 

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

Modified Files:
	smtpproxy.py 
Log Message:
Although the RFC requires that MAIL FROM addresses have < and > around
them, apparently some MUA doesn't do this, so allow for this.

Fixes:
 [ spambayes-Bugs-788008 ] smtpproxy.py assumes toogood format for addresses

Index: smtpproxy.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/smtpproxy.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** smtpproxy.py	28 Apr 2003 00:36:03 -0000	1.7
--- smtpproxy.py	13 Aug 2003 23:10:49 -0000	1.8
***************
*** 292,298 ****
          getting FROM: addresses.
          """
!         start = string.index(address, '<') + 1
!         end = string.index(address, '>')
!         return address[start:end]

      def splitTo(self, address):
--- 292,301 ----
          getting FROM: addresses.
          """
!         if '<' in address:
!             start = string.index(address, '<') + 1
!             end = string.index(address, '>')
!             return address[start:end]
!         else:
!             return address

      def splitTo(self, address):

From xenogeist at users.sourceforge.net  Thu Aug 14 15:12:00 2003
From: xenogeist at users.sourceforge.net (Adam Walker)
Date: Thu Aug 14 17:12:04 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000/dialogs/resources
	rc2py.py, 1.2, 1.3 rcparser.py, 1.3, 1.4
Message-ID: 

Update of /cvsroot/spambayes/spambayes/Outlook2000/dialogs/resources
In directory sc8-pr-cvs1:/tmp/cvs-serv9932/Outlook2000/dialogs/resources

Modified Files:
	rc2py.py rcparser.py 
Log Message:
Parse .h file. Allow parsing of picture boxes (static controls with a image), these controls require that the ids of the bitmaps match the .h file. Parse BITMAP clauses in the .rc and store the filenames in a dict member of RCParser called 'bitmaps'

Index: rc2py.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/dialogs/resources/rc2py.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** rc2py.py	10 Aug 2003 07:26:50 -0000	1.2
--- rc2py.py	14 Aug 2003 21:11:57 -0000	1.3
***************
*** 23,26 ****
--- 23,27 ----
      out.write("\tids = "+repr(rcp.ids)+"\n")
      out.write("\tnames = "+repr(rcp.names)+"\n")
+     out.write("\tbitmaps = "+repr(rcp.bitmaps)+"\n")
      out.write("def ParseDialogs(s):\n")
      out.write("\treturn FakeParser()\n")

Index: rcparser.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/dialogs/resources/rcparser.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** rcparser.py	13 Aug 2003 19:31:10 -0000	1.3
--- rcparser.py	14 Aug 2003 21:11:57 -0000	1.4
***************
*** 8,11 ****
--- 8,12 ----
  import sys, os, shlex
  import win32con
+ #import win32gui
  import commctrl

***************
*** 92,97 ****

  class RCParser:
-     ids = {"IDOK":1, "IDCANCEL":2, "IDC_STATIC": -1}
-     names = {1:"IDOK", 2:"IDCANCEL", -1:"IDC_STATIC"}
      next_id = 1001
      dialogs = {}
--- 93,96 ----
***************
*** 100,103 ****
--- 99,107 ----
      token = ""

+     def __init__(self):    
+         self.ids = {"IDOK":1, "IDCANCEL":2, "IDC_STATIC": -1}
+         self.names = {1:"IDOK", 2:"IDCANCEL", -1:"IDC_STATIC"}
+         self.bitmaps = {}
+ 
      def debug(self, *args):
          if self.debugEnabled:
***************
*** 118,121 ****
--- 122,132 ----
          The "names" member contains the dictionary of name->id
          """
+         hFileName = rcFileName[:-2]+"h"
+         try:
+             h = open(hFileName, "rU")
+             self.parseH(h)
+             h.close()
+         except:
+             print "No .h file. ignoring."
          f = open(rcFileName)
          self.open(f)
***************
*** 129,132 ****
--- 140,160 ----
          self.lex.commenters = "//#"

+     def parseH(self, file):
+         lex = shlex.shlex(file)
+         lex.commenters = "//"
+         token = " "
+         while token is not None:
+             token = lex.get_token()
+             if token == "" or token is None:
+                 token = None
+             else:
+                 if token=='define':
+                     n = lex.get_token()
+                     i = int(lex.get_token())
+                     self.ids[n] = i
+                     self.names[i] = n
+                     if self.next_id<=i:
+                         self.next_id = i+1
+ 
      def parse(self):
          deep = 0
***************
*** 141,151 ****
                  elif "END" == self.token:
                      deep -= 1
!         elif "IDD_" != self.token[:4]:
!             self.getToken()
!         else:
              possibleDlgName = self.token
              self.getToken()
              if "DIALOG" == self.token or "DIALOGEX" == self.token:
                  self.dialog(possibleDlgName)

      def addId(self, id_name):
--- 169,187 ----
                  elif "END" == self.token:
                      deep -= 1
!         elif "IDD_" == self.token[:4]:
              possibleDlgName = self.token
+             #print "possible dialog:", possibleDlgName
              self.getToken()
              if "DIALOG" == self.token or "DIALOGEX" == self.token:
                  self.dialog(possibleDlgName)
+         elif "IDB_" == self.token[:4]:
+             possibleBitmap = self.token
+             self.getToken()
+             if "BITMAP" == self.token:
+                 self.getToken()
+                 bmf = self.token[1:-1] # quotes
+                 self.bitmaps[possibleBitmap] = bmf
+                 print "BITMAP", possibleBitmap, bmf
+                 #print win32gui.LoadImage(0, bmf, win32con.IMAGE_BITMAP,0,0,win32con.LR_DEFAULTCOLOR|win32con.LR_LOADFROMFILE)

      def addId(self, id_name):
***************
*** 263,266 ****
--- 299,306 ----
              if self.token[0:1]=='"':
                  control.label = self.token[1:-1]
+                 self.getToken() # ,
+                 self.getToken()
+             elif self.token.isdigit():
+                 control.label = self.token
                  self.getToken() # ,
                  self.getToken()

From xenogeist at users.sourceforge.net  Thu Aug 14 18:37:22 2003
From: xenogeist at users.sourceforge.net (Adam Walker)
Date: Thu Aug 14 20:37:26 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000/dialogs processors.py,
	1.2, 1.3
Message-ID: 

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

Modified Files:
	processors.py 
Log Message:
Added ImageProcessor class that loads images for picture boxes.

Index: processors.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/dialogs/processors.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** processors.py	10 Aug 2003 07:26:50 -0000	1.2
--- processors.py	15 Aug 2003 00:37:20 -0000	1.3
***************
*** 37,40 ****
--- 37,58 ----
          pass

+ class ImageProcessor(ControlProcessor):
+     def Init(self):
+         filename = ""
+         rcp = self.window.manager.dialog_parser;
+         text = win32gui.GetWindowText(self.GetControl())
+         name = rcp.names[int(text)]
+         filename = rcp.bitmaps[name]
+         import os
+         if not os.path.isabs(filename):
+             filename = os.path.join( os.path.dirname( __file__ ), "resources", filename)
+         handle = win32gui.LoadImage(0, filename, win32con.IMAGE_BITMAP,0,0,
+                                     win32con.LR_COLOR|win32con.LR_LOADFROMFILE|win32con.LR_SHARED)
+         win32gui.SendMessage(self.GetControl(), win32con.STM_SETIMAGE, win32con.IMAGE_BITMAP, handle)
+         
+ 
+     def GetPopupHelpText(self, cid):
+         return None
+     
  class ButtonProcessor(ControlProcessor):
      def OnCommand(self, wparam, lparam):

From anadelonbrin at users.sourceforge.net  Sat Aug 16 01:24:35 2003
From: anadelonbrin at users.sourceforge.net (Tony Meyer)
Date: Sat Aug 16 03:24:37 2003
Subject: [Spambayes-checkins] website quotes.ht,1.2,1.3
Message-ID: 

Update of /cvsroot/spambayes/website
In directory sc8-pr-cvs1:/tmp/cvs-serv19127

Modified Files:
	quotes.ht 
Log Message:
Add a quote from the WatchGuard LiveSecurity column that Neale forwarded to
spambayes-dev.

Index: quotes.ht
===================================================================
RCS file: /cvsroot/spambayes/website/quotes.ht,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** quotes.ht	12 Aug 2003 04:54:18 -0000	1.2
--- quotes.ht	16 Aug 2003 07:24:32 -0000	1.3
***************
*** 43,47 ****
  SpamBayes is currently the best solution to the spam problem. In fact, after I started using it I hardly notice there is a spam problem at all
  Kristian Eide in a 
! review comparing POPFile and Spambayes

  What we are saying about us
--- 43,53 ----
  SpamBayes is currently the best solution to the spam problem. In fact, after I started using it I hardly notice there is a spam problem at all
  Kristian Eide in a 
! review comparing POPFile and Spambayes
! 
! 
! 
! Now you know a simple way to regain absolute control of your Inbox/i>
! Corey Nachreiner in "Keep Spam at Bay with SpamBayes", a WatchGuard LiveSecurity column
! 

  What we are saying about us

From anadelonbrin at users.sourceforge.net  Sat Aug 16 01:46:43 2003
From: anadelonbrin at users.sourceforge.net (Tony Meyer)
Date: Sat Aug 16 03:46:47 2003
Subject: [Spambayes-checkins] spambayes/utilities which_database.py,1.1,1.2
Message-ID: 

Update of /cvsroot/spambayes/spambayes/utilities
In directory sc8-pr-cvs1:/tmp/cvs-serv21247/utilities

Modified Files:
	which_database.py 
Log Message:
Make the script a little smarter about checking if bsddb[3] is available.

Index: which_database.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/utilities/which_database.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** which_database.py	29 Jul 2003 23:25:31 -0000	1.1
--- which_database.py	16 Aug 2003 07:46:41 -0000	1.2
***************
*** 31,35 ****
  import dbhash
  import whichdb
! import bsddb3

  def main():
--- 31,41 ----
  import dbhash
  import whichdb
! try:
!     import bsddb
! except ImportError:
!     try:
!         import bsddb3 as bsddb
!     except ImportError:
!         bsddb = None

  def main():
***************
*** 53,64 ****
          print "Dbhash is not available."

!     db = bsddb3.hashopen("bsddb3", "c")
!     db["1"] = "1"
!     db.close()
!     str = whichdb.whichdb("bsddb3")
      if str == "dbhash":
!         print "Bsddb3 is available."
      else:
!         print "Bsddb3 is not available."

      print
--- 59,73 ----
          print "Dbhash is not available."

!     if bsddb is None:
!         str = ""
!     else:
!         db = bsddb.hashopen("bsddb3", "c")
!         db["1"] = "1"
!         db.close()
!         str = whichdb.whichdb("bsddb3")
      if str == "dbhash":
!         print "Bsddb[3] is available."
      else:
!         print "Bsddb[3] is not available."

      print

From montanaro at users.sourceforge.net  Sat Aug 16 07:39:19 2003
From: montanaro at users.sourceforge.net (Skip Montanaro)
Date: Sat Aug 16 09:39:28 2003
Subject: [Spambayes-checkins] website quotes.ht,1.3,1.4
Message-ID: 

Update of /cvsroot/spambayes/website
In directory sc8-pr-cvs1:/tmp/cvs-serv30218

Modified Files:
	quotes.ht 
Log Message:
markup typo

Index: quotes.ht
===================================================================
RCS file: /cvsroot/spambayes/website/quotes.ht,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** quotes.ht	16 Aug 2003 07:24:32 -0000	1.3
--- quotes.ht	16 Aug 2003 13:39:17 -0000	1.4
***************
*** 47,51 ****

! Now you know a simple way to regain absolute control of your Inbox/i>
  Corey Nachreiner in "Keep Spam at Bay with SpamBayes", a WatchGuard LiveSecurity column

--- 47,51 ----

! Now you know a simple way to regain absolute control of your Inbox
  Corey Nachreiner in "Keep Spam at Bay with SpamBayes", a WatchGuard LiveSecurity column

From xenogeist at users.sourceforge.net  Sun Aug 17 15:09:02 2003
From: xenogeist at users.sourceforge.net (Adam Walker)
Date: Sun Aug 17 17:09:05 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000/dialogs/resources
	rcparser.py, 1.4, 1.5
Message-ID: 

Update of /cvsroot/spambayes/spambayes/Outlook2000/dialogs/resources
In directory sc8-pr-cvs1:/tmp/cvs-serv15486/Outlook2000/dialogs/resources

Modified Files:
	rcparser.py 
Log Message:
Ignore 0x0 in styles. VS puts that in sometimes 

Index: rcparser.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/dialogs/resources/rcparser.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** rcparser.py	14 Aug 2003 21:11:57 -0000	1.4
--- rcparser.py	17 Aug 2003 21:09:00 -0000	1.5
***************
*** 259,263 ****
                      value = getattr(win32con,self.token)
                  else:
!                     value = getattr(commctrl,self.token)
                  if Not:
                      list.append("NOT "+self.token)
--- 259,266 ----
                      value = getattr(win32con,self.token)
                  else:
!                     if self.token in commctrl.__dict__:
!                         value = getattr(commctrl,self.token)
!                     else:
!                         value = 0
                  if Not:
                      list.append("NOT "+self.token)

From xenogeist at users.sourceforge.net  Sun Aug 17 15:12:14 2003
From: xenogeist at users.sourceforge.net (Adam Walker)
Date: Sun Aug 17 17:12:16 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000/dialogs
	opt_processors.py, 1.3, 1.4
Message-ID: 

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

Modified Files:
	opt_processors.py 
Log Message:
Fixed (unreported) bug where combo box options would not save.

Index: opt_processors.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/dialogs/opt_processors.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** opt_processors.py	11 Aug 2003 12:19:08 -0000	1.3
--- opt_processors.py	17 Aug 2003 21:12:11 -0000	1.4
***************
*** 73,76 ****
--- 73,80 ----
  # A "Combo" processor, that loads valid strings from the option.
  class ComboProcessor(OptionControlProcessor):
+     def OnCommand(self, wparam, lparam):
+         code = win32api.HIWORD(wparam)
+         if code == win32con.CBN_SELCHANGE:
+             self.UpdateValue_FromControl()
      def UpdateControl_FromValue(self):
          # First load the combo options.

From xenogeist at users.sourceforge.net  Sun Aug 17 15:14:40 2003
From: xenogeist at users.sourceforge.net (Adam Walker)
Date: Sun Aug 17 17:14:44 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000/dialogs dlgcore.py, 1.3,
	1.4
Message-ID: 

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

Modified Files:
	dlgcore.py 
Log Message:
Added support for modeless dialogs and property pages. Dialogs will close the tooltip in OnDestroy as well.

Index: dlgcore.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/dialogs/dlgcore.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** dlgcore.py	13 Aug 2003 13:40:47 -0000	1.3
--- dlgcore.py	17 Aug 2003 21:14:37 -0000	1.4
***************
*** 83,87 ****

      def CreateWindow(self):
!         self._DoCreate(win32gui.CreateDialogIndirect)

      def DoModal(self):
--- 83,87 ----

      def CreateWindow(self):
!         return self._DoCreate(win32gui.CreateDialogIndirect)

      def DoModal(self):
***************
*** 152,155 ****
--- 152,158 ----
          self.tt.HideTooltip()

+     def OnDestroy(self, hwnd, msg, wparam, lparam):
+         self.tt.HideTooltip()
+         
      def OnHelp(self, hwnd, msg, wparam, lparam):
          format = "iiiiiii"
***************
*** 228,231 ****
--- 231,235 ----
      def OnDestroy(self, hwnd, msg, wparam, lparam):
          #print "OnDestroy"
+         TooltipDialog.OnDestroy(self, hwnd, msg, wparam, lparam)
          self.command_processors = None
          self.all_processors = None
***************
*** 273,277 ****
              print "Ignoring OnNotify for", self._GetIDName(idFrom)
              return
!         handler.OnNotify( (hwndFrom, idFrom, code), wparam, lparam)

      def OnCommand(self, hwnd, msg, wparam, lparam):
--- 277,281 ----
              print "Ignoring OnNotify for", self._GetIDName(idFrom)
              return
!         return handler.OnNotify( (hwndFrom, idFrom, code), wparam, lparam)

      def OnCommand(self, hwnd, msg, wparam, lparam):
***************
*** 284,285 ****
--- 288,303 ----

          self.ApplyHandlingOptionValueError(handler.OnCommand, wparam, lparam)
+ 
+ class ProcessorPage(ProcessorDialog):
+     def __init__(self, parent, manager, idd, option_handlers):
+         ProcessorDialog.__init__(self, parent, manager, idd,option_handlers)
+     def OnInitDialog(self, hwnd, msg, wparam, lparam):
+         self.hwnd = hwnd
+         # The hardcoded values are a bit of a hack.
+         win32gui.SetWindowPos(self.hwnd, win32con.HWND_TOP, 1, 24, 0, 0, win32con.SWP_NOSIZE)
+         self.LoadAllControls()
+     def CreateWindow(self):
+         # modeless. Pages should have the WS_CHILD window style
+         message_map = self.GetMessageMap()
+         return win32gui.CreateDialogIndirect(self.hinst, self.template, self.parent, message_map)
+ 

From xenogeist at users.sourceforge.net  Sun Aug 17 15:15:27 2003
From: xenogeist at users.sourceforge.net (Adam Walker)
Date: Sun Aug 17 17:15:30 2003
Subject: [Spambayes-checkins] 
	spambayes/Outlook2000/dialogs __init__.py, 1.3, 1.4
Message-ID: 

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

Modified Files:
	__init__.py 
Log Message:
Added support for modeless dialogs and property pages.

Index: __init__.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/dialogs/__init__.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** __init__.py	10 Aug 2003 07:26:49 -0000	1.3
--- __init__.py	17 Aug 2003 21:15:25 -0000	1.4
***************
*** 26,29 ****
--- 26,42 ----
      dlg.DoModal()

+ def MakePropertyPage(parent, manager, idd):
+     """Creates a child dialog box to use as property page in a tab control"""
+     if manager.dialog_parser is None:
+         manager.dialog_parser = LoadDialogs()
+     import dialog_map
+     commands = dialog_map.dialog_map[idd]
+     if not parent:
+         raise "Parent must be the tab control"
+         
+     import dlgcore
+     dlg = dlgcore.ProcessorPage(parent, manager, idd, commands)
+     return dlg
+     
  import dlgutils
  SetWaitCursor = dlgutils.SetWaitCursor

From xenogeist at users.sourceforge.net  Sun Aug 17 15:16:53 2003
From: xenogeist at users.sourceforge.net (Adam Walker)
Date: Sun Aug 17 17:16:57 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000/dialogs processors.py,
	1.3, 1.4
Message-ID: 

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

Modified Files:
	processors.py 
Log Message:
Added support for property pages. GetControl searches the window's grandparent for a control if it was not found in the window.

Index: processors.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/dialogs/processors.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** processors.py	15 Aug 2003 00:37:20 -0000	1.3
--- processors.py	17 Aug 2003 21:16:51 -0000	1.4
***************
*** 23,27 ****
      def GetControl(self, control_id = None):
          control_id = control_id or self.control_id
!         return win32gui.GetDlgItem(self.window.hwnd, control_id)
      def GetPopupHelpText(self, idFrom):
          return None
--- 23,33 ----
      def GetControl(self, control_id = None):
          control_id = control_id or self.control_id
!         try:
!             h = win32gui.GetDlgItem(self.window.hwnd, control_id)
!         except:
!             hparent = win32gui.GetParent(self.window.hwnd)
!             hparent = win32gui.GetParent(hparent)
!             h = win32gui.GetDlgItem(hparent, control_id)
!         return h
      def GetPopupHelpText(self, idFrom):
          return None

From xenogeist at users.sourceforge.net  Sun Aug 17 15:19:07 2003
From: xenogeist at users.sourceforge.net (Adam Walker)
Date: Sun Aug 17 17:19:11 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000/dialogs dialog_map.py,
	1.2, 1.3
Message-ID: 

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

Modified Files:
	dialog_map.py 
Log Message:
Dialog re-org. Added a sb logo and moved most dialogs into a tab control on the manager dialog. One thing left to do is supply a true cancel action, currently cancel and ok do the same thing.

Index: dialog_map.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/dialogs/dialog_map.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dialog_map.py	10 Aug 2003 07:26:49 -0000	1.2
--- dialog_map.py	17 Aug 2003 21:19:05 -0000	1.3
***************
*** 6,10 ****
  from opt_processors import *

! from dialogs import ShowDialog

  # "dialog specific" processors:
--- 6,10 ----
  from opt_processors import *

! from dialogs import ShowDialog, MakePropertyPage

  # "dialog specific" processors:
***************
*** 35,38 ****
--- 35,60 ----
                               0, db_status)

+ class IntProcessor(OptionControlProcessor):
+     def UpdateControl_FromValue(self):
+         win32gui.SendMessage(self.GetControl(), win32con.WM_SETTEXT, 0, str(self.option.get()))
+     def UpdateValue_FromControl(self):
+         buf_size = 100
+         buf = win32gui.PyMakeBuffer(buf_size)
+         nchars = win32gui.SendMessage(self.GetControl(), win32con.WM_GETTEXT,
+                                       buf_size, buf)
+         str_val = buf[:nchars]
+         val = int(str_val)
+         if val < 0 or val > 10:
+             raise ValueError, "Value must be between 0 and 10"
+         self.SetOptionValue(val)
+     def OnCommand(self, wparam, lparam):
+         code = win32api.HIWORD(wparam)
+         if code==win32con.EN_CHANGE:
+             try:
+                 self.UpdateValue_FromControl()
+             except ValueError:
+                 # They are typing - value may be currently invalid
+                 pass
+ 
  class FilterEnableProcessor(BoolButtonProcessor):
      def UpdateValue_FromControl(self):
***************
*** 45,48 ****
--- 67,116 ----
          check = not not check # force bool!
          self.SetOptionValue(check)
+ 
+ # This class will likely go away when the real options are made for
+ # delay timers
+ class MsSliderProcessor(EditNumberProcessor):
+     def __init__(self, window, control_ids, option):
+         EditNumberProcessor.__init__(self, window, control_ids, option)
+     def InitSlider(self):
+         slider = self.GetControl(self.slider_id)
+         win32gui.SendMessage(slider, commctrl.TBM_SETRANGE, 0, MAKELONG(0, 10))
+         win32gui.SendMessage(slider, commctrl.TBM_SETLINESIZE, 0, 1)
+         win32gui.SendMessage(slider, commctrl.TBM_SETPAGESIZE, 0, 1)
+         win32gui.SendMessage(slider, commctrl.TBM_SETTICFREQ, 1, 0)
+         self.UpdateSlider_FromEdit()
+     def OnMessage(self, msg, wparam, lparam):
+         slider = self.GetControl(self.slider_id)
+         if slider == lparam:
+             slider_pos = win32gui.SendMessage(slider, commctrl.TBM_GETPOS, 0, 0)
+             slider_pos = int(slider_pos)
+             str_val = str(slider_pos)
+             edit = self.GetControl()
+             win32gui.SendMessage(edit, win32con.WM_SETTEXT, 0, str_val)
+     def UpdateSlider_FromEdit(self):
+         slider = self.GetControl(self.slider_id)
+         try:
+             # Get as float so we dont fail should the .0 be there, but
+             # then convert to int as the slider only works with ints
+             val = int(float(self.option.get()/1000))
+         except ValueError:
+             return
+         win32gui.SendMessage(slider, commctrl.TBM_SETPOS, 1, val)
+ 
+     def UpdateControl_FromValue(self):
+         value = self.option.get()/1000
+         win32gui.SendMessage(self.GetControl(), win32con.WM_SETTEXT, 0, str(value))
+         self.UpdateSlider_FromEdit()
+     def UpdateValue_FromControl(self):
+         buf_size = 100
+         buf = win32gui.PyMakeBuffer(buf_size)
+         nchars = win32gui.SendMessage(self.GetControl(), win32con.WM_GETTEXT,
+                                       buf_size, buf)
+         str_val = buf[:nchars]
+         val = int(str_val)
+         if val < 0 or val > 10:
+             raise ValueError, "Value must be between 0 and 10"
+         self.SetOptionValue(val*1000)
+ 

  class FilterStatusProcessor(ControlProcessor):
***************
*** 81,84 ****
--- 149,207 ----
          win32gui.SendMessage(self.GetControl(), win32con.WM_SETTEXT,
                               0, filter_status)
+ class TabProcessor(ControlProcessor):
+     def Init(self):
+         self.pages = {}
+         self.currentPage = None
+         self.currentPageIndex = -1
+         self.currentPageHwnd = None
+         self.addPage(0, "IDD_GENERAL", "General")
+         self.addPage(1, "IDD_FILTER_SPAM", "Spam")
+         self.addPage(2, "IDD_FILTER_UNSURE", "Possible Spam")
+         self.addPage(3, "IDD_FILTER_NOW", "Filter Now")
+         self.addPage(4, "IDD_TRAINING", "Training")
+         self.addPage(5, "IDD_ADVANCED", "Advanced")
+         self.switchToPage(0)
+     def OnNotify(self, nmhdr, wparam, lparam):
+         # this does not appear to be in commctrl module
+         selChangedCode =  5177342
+         code = nmhdr[2]
+         if code==selChangedCode:
+             index = win32gui.SendMessage(self.GetControl(), commctrl.TCM_GETCURSEL, 0,0)
+             if index!=self.currentPageIndex:
+                 self.switchToPage(index)
+ 
+     def switchToPage(self, index):
+         if self.currentPageHwnd is not None:
+             if not self.currentPage.SaveAllControls():
+                 win32gui.SendMessage(self.GetControl(), commctrl.TCM_SETCURSEL, self.currentPageIndex,0)
+                 return 1
+             win32gui.DestroyWindow(self.currentPageHwnd)
+         self.currentPage = MakePropertyPage(self.GetControl(), self.window.manager, self.pages[index])
+         self.currentPageHwnd = self.currentPage.CreateWindow()
+         self.currentPageIndex = index
+         return 0
+         
+     def addPage(self, item, idName, label):
+         format = "iiiiiii"
+         lbuf = win32gui.PyMakeBuffer(len(label)+1)
+         address,l = win32gui.PyGetBufferAddressAndLen(lbuf)
+         win32gui.PySetString(address, label)
+         
+         buf = struct.pack(format,
+             commctrl.TCIF_TEXT, # mask
+             0, # state
+             0, # state mask
+             address,
+             0, #unused
+             0, #image
+             item
+             )
+         item = win32gui.SendMessage(self.GetControl(),
+                              commctrl.TCM_INSERTITEM,
+                              item,
+                              buf)
+         self.pages[item] = idName
+         
+ 
  def ShowAbout(mgr):
      mgr.ShowHtml("about.html")
***************
*** 107,112 ****
--- 230,240 ----
  dialog_map = {
      "IDD_MANAGER" : (
+         (ImageProcessor,          "IDC_LOGO_GRAPHIC"),
          (CloseButtonProcessor,    "IDOK IDCANCEL"),
+         (TabProcessor,            "IDC_TAB"),
          (VersionStringProcessor,  "IDC_VERSION"),
+         (CommandButtonProcessor,  "IDC_ABOUT_BTN", ShowAbout, ()),
+     ),
+     "IDD_GENERAL": (
          (TrainingStatusProcessor, "IDC_TRAINING_STATUS"),
          (FilterEnableProcessor,   "IDC_BUT_FILTER_ENABLE", "Filter.enabled"),
***************
*** 119,126 ****
          (DialogCommand,           "IDC_BUT_FILTER_DEFINE", "IDD_FILTER"),
          (DialogCommand,           "IDC_BUT_TRAIN_NOW", "IDD_TRAINING"),
!         (CommandButtonProcessor,  "IDC_BUT_ABOUT", ShowAbout, ()),
!     ),
      "IDD_FILTER_NOW" : (
-         (CloseButtonProcessor,    "IDOK IDCANCEL"),
          (BoolButtonProcessor,     "IDC_BUT_UNREAD",    "Filter_Now.only_unread"),
          (BoolButtonProcessor,     "IDC_BUT_UNSEEN",    "Filter_Now.only_unseen"),
--- 247,254 ----
          (DialogCommand,           "IDC_BUT_FILTER_DEFINE", "IDD_FILTER"),
          (DialogCommand,           "IDC_BUT_TRAIN_NOW", "IDD_TRAINING"),
!         (DialogCommand,           "IDC_ADVANCED_BTN", "IDD_ADVANCED"),
!         (BoolButtonProcessor,     "IDC_SAVE_SPAM_SCORE",    "Filter.save_spam_info"),
!         ),
      "IDD_FILTER_NOW" : (
          (BoolButtonProcessor,     "IDC_BUT_UNREAD",    "Filter_Now.only_unread"),
          (BoolButtonProcessor,     "IDC_BUT_UNSEEN",    "Filter_Now.only_unseen"),
***************
*** 132,150 ****
          (AsyncCommandProcessor,   "IDC_START IDC_PROGRESS IDC_PROGRESS_TEXT",
                                    filter.filterer, "Start Filtering", "Stop Filtering",
!                                   "IDC_BUT_UNSEEN IDC_BUT_UNREAD IDC_BROWSE " \
!                                   "IDOK IDC_BUT_ACT_SCORE IDC_BUT_ACT_ALL"),
      ),
!     "IDD_FILTER" : (
!         (CloseButtonProcessor,    "IDOK IDCANCEL"),
          (FolderIDProcessor,       "IDC_FOLDER_WATCH IDC_BROWSE_WATCH",
                                    "Filter.watch_folder_ids",
                                    "Filter.watch_include_sub"),
          (ComboProcessor,          "IDC_ACTION_CERTAIN", "Filter.spam_action"),
- 
          (FolderIDProcessor,       "IDC_FOLDER_CERTAIN IDC_BROWSE_CERTAIN",
                                    "Filter.spam_folder_id"),
          (EditNumberProcessor,     "IDC_EDIT_CERTAIN IDC_SLIDER_CERTAIN",
                                    "Filter.spam_threshold"),
!         
          (FolderIDProcessor,       "IDC_FOLDER_UNSURE IDC_BROWSE_UNSURE",
                                    "Filter.unsure_folder_id"),
--- 260,278 ----
          (AsyncCommandProcessor,   "IDC_START IDC_PROGRESS IDC_PROGRESS_TEXT",
                                    filter.filterer, "Start Filtering", "Stop Filtering",
!                                   "IDOK IDCANCEL IDC_TAB IDC_BUT_UNSEEN IDC_BUT_UNREAD IDC_BROWSE " \
!                                   "IDC_BUT_ACT_SCORE IDC_BUT_ACT_ALL"),
      ),
!     "IDD_FILTER_SPAM" : (
          (FolderIDProcessor,       "IDC_FOLDER_WATCH IDC_BROWSE_WATCH",
                                    "Filter.watch_folder_ids",
                                    "Filter.watch_include_sub"),
          (ComboProcessor,          "IDC_ACTION_CERTAIN", "Filter.spam_action"),
          (FolderIDProcessor,       "IDC_FOLDER_CERTAIN IDC_BROWSE_CERTAIN",
                                    "Filter.spam_folder_id"),
          (EditNumberProcessor,     "IDC_EDIT_CERTAIN IDC_SLIDER_CERTAIN",
                                    "Filter.spam_threshold"),
!         (BoolButtonProcessor,     "IDC_MARK_SPAM_AS_READ",    "Filter.spam_mark_as_read"),
!         ),
!     "IDD_FILTER_UNSURE" : (
          (FolderIDProcessor,       "IDC_FOLDER_UNSURE IDC_BROWSE_UNSURE",
                                    "Filter.unsure_folder_id"),
***************
*** 153,160 ****

          (ComboProcessor,          "IDC_ACTION_UNSURE", "Filter.unsure_action"),
!         (DialogCommand,           "IDC_BUT_FILTER_NOW", "IDD_FILTER_NOW"),
!     ),
      "IDD_TRAINING" : (
-         (CloseButtonProcessor,    "IDOK IDCANCEL"),
          (FolderIDProcessor,       "IDC_STATIC_HAM IDC_BROWSE_HAM",
                                    "Training.ham_folder_ids",
--- 281,287 ----

          (ComboProcessor,          "IDC_ACTION_UNSURE", "Filter.unsure_action"),
!         (BoolButtonProcessor,     "IDC_MARK_UNSURE_AS_READ",    "Filter.unsure_mark_as_read"),
!         ),
      "IDD_TRAINING" : (
          (FolderIDProcessor,       "IDC_STATIC_HAM IDC_BROWSE_HAM",
                                    "Training.ham_folder_ids",
***************
*** 167,172 ****
          (AsyncCommandProcessor,   "IDC_START IDC_PROGRESS IDC_PROGRESS_TEXT",
                                    train.trainer, "Start Training", "Stop",
!                                   "IDC_BROWSE_HAM IDC_BROWSE_SPAM " \
                                    "IDC_BUT_REBUILD IDC_BUT_RESCORE"),
!     )
  }
--- 294,307 ----
          (AsyncCommandProcessor,   "IDC_START IDC_PROGRESS IDC_PROGRESS_TEXT",
                                    train.trainer, "Start Training", "Stop",
!                                   "IDOK IDCANCEL IDC_TAB IDC_BROWSE_HAM IDC_BROWSE_SPAM " \
                                    "IDC_BUT_REBUILD IDC_BUT_RESCORE"),
!     ),
!     "IDD_ADVANCED" : (
!         (IntProcessor,   "IDC_VERBOSE_LOG",  "General.verbose"),
!         (MsSliderProcessor,   "IDC_DELAY1_TEXT IDC_DELAY1_SLIDER", "Experimental.timer_start_delay"),
!         (MsSliderProcessor,   "IDC_DELAY2_TEXT IDC_DELAY2_SLIDER", "Experimental.timer_interval"),
!         (BoolButtonProcessor,   "IDC_INBOX_TIMER_ONLY", "Experimental.timer_only_receive_folders"),
!         (ComboProcessor,          "IDC_DEL_SPAM_RS", "General.delete_as_spam_message_state"),
!         (ComboProcessor,          "IDC_RECOVER_RS", "General.recover_from_spam_message_state"),
!         )
  }

From xenogeist at users.sourceforge.net  Sun Aug 17 15:19:08 2003
From: xenogeist at users.sourceforge.net (Adam Walker)
Date: Sun Aug 17 17:19:15 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000/dialogs/resources
	sblogo.bmp, NONE, 1.1 dialogs.h, 1.2, 1.3 dialogs.rc, 1.2, 1.3
Message-ID: 

Update of /cvsroot/spambayes/spambayes/Outlook2000/dialogs/resources
In directory sc8-pr-cvs1:/tmp/cvs-serv18534/Outlook2000/dialogs/resources

Modified Files:
	dialogs.h dialogs.rc 
Added Files:
	sblogo.bmp 
Log Message:
Dialog re-org. Added a sb logo and moved most dialogs into a tab control on the manager dialog. One thing left to do is supply a true cancel action, currently cancel and ok do the same thing.

--- NEW FILE: sblogo.bmp ---
(This appears to be a binary file; contents omitted.)

Index: dialogs.h
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/dialogs/resources/dialogs.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dialogs.h	10 Aug 2003 07:26:50 -0000	1.2
--- dialogs.h	17 Aug 2003 21:19:05 -0000	1.3
***************
*** 1,4 ****
  //{{NO_DEPENDENCIES}}
! // Microsoft Developer Studio generated include file.
  // Used by dialogs.rc
  //
--- 1,4 ----
  //{{NO_DEPENDENCIES}}
! // Microsoft Visual C++ generated include file.
  // Used by dialogs.rc
  //
***************
*** 8,11 ****
--- 8,17 ----
  #define IDD_FILTER_NOW                  104
  #define IDD_FOLDER_SELECTOR             105
+ #define IDD_ADVANCED                    106
+ #define IDB_BITMAP1                     107
+ #define IDD_GENERAL                     108
+ #define IDD_FILTER_FOLDERS              109
+ #define IDD_FILTER_SPAM                 110
+ #define IDD_FILTER_UNSURE               111
  #define IDC_PROGRESS                    1000
  #define IDC_PROGRESS_TEXT               1001
***************
*** 53,56 ****
--- 59,82 ----
  #define IDC_STATUS1                     1043
  #define IDC_STATUS2                     1044
+ #define IDC_MARK_SPAM_AS_READ           1048
+ #define IDC_SAVE_SPAM_SCORE             1050
+ #define IDC_MARK_UNSURE_AS_READ         1051
+ #define IDC_ADVANCED_BTN                1055
+ #define IDC_DELAY1_SLIDER               1056
+ #define IDC_DELAY1_TEXT                 1057
+ #define IDC_DELAY2_SLIDER               1058
+ #define IDC_DELAY2_TEXT                 1059
+ #define IDC_INBOX_TIMER_ONLY            1060
+ #define IDC_VERBOSE_LOG                 1061
+ #define IDB_SBLOGO                      1062
+ #define IDC_LOGO_GRAPHIC                1063
+ #define IDC_USE_DELAY1                  1064
+ #define IDC_USE_DELAY2                  1065
+ #define IDC_TAB                         1068
+ #define IDC_BUTTON1                     1069
+ #define IDC_ABOUT_BTN                   1070
+ #define IDC_DEL_SPAM_RS                 1071
+ #define IDC_RECOVER_RS                  1072
+ #define IDC_EDIT1                       1073

  // Next default values for new objects
***************
*** 58,64 ****
  #ifdef APSTUDIO_INVOKED
  #ifndef APSTUDIO_READONLY_SYMBOLS
! #define _APS_NEXT_RESOURCE_VALUE        106
  #define _APS_NEXT_COMMAND_VALUE         40001
! #define _APS_NEXT_CONTROL_VALUE         1045
  #define _APS_NEXT_SYMED_VALUE           101
  #endif
--- 84,90 ----
  #ifdef APSTUDIO_INVOKED
  #ifndef APSTUDIO_READONLY_SYMBOLS
! #define _APS_NEXT_RESOURCE_VALUE        112
  #define _APS_NEXT_COMMAND_VALUE         40001
! #define _APS_NEXT_CONTROL_VALUE         1074
  #define _APS_NEXT_SYMED_VALUE           101
  #endif

Index: dialogs.rc
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/dialogs/resources/dialogs.rc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dialogs.rc	10 Aug 2003 07:26:50 -0000	1.2
--- dialogs.rc	17 Aug 2003 21:19:05 -0000	1.3
***************
*** 1,3 ****
! //Microsoft Developer Studio generated resource script.
  //
  #include "dialogs.h"
--- 1,3 ----
! // Microsoft Visual C++ generated resource script.
  //
  #include "dialogs.h"
***************
*** 15,18 ****
--- 15,197 ----

  /////////////////////////////////////////////////////////////////////////////
+ // English (U.S.) resources
+ 
+ #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+ #ifdef _WIN32
+ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+ #pragma code_page(1252)
+ #endif //_WIN32
+ 
+ /////////////////////////////////////////////////////////////////////////////
+ //
+ // Dialog
+ //
+ 
+ IDD_ADVANCED DIALOGEX 0, 0, 248, 185
+ STYLE DS_SETFONT | WS_CHILD | WS_SYSMENU
+ EXSTYLE WS_EX_CONTEXTHELP
+ FONT 8, "Tahoma", 400, 0, 0x0
+ BEGIN
+     GROUPBOX        "Filter timer",IDC_STATIC,7,0,234,104
+     CONTROL         "",IDC_DELAY1_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | 
+                     TBS_TOP | WS_TABSTOP,16,18,148,22
+     LTEXT           "Processing start delay",IDC_STATIC,14,9,101,8
+     EDITTEXT        IDC_DELAY1_TEXT,165,25,40,14,ES_AUTOHSCROLL
+     LTEXT           "seconds",IDC_STATIC,208,27,28,8
+     CONTROL         "",IDC_DELAY2_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | 
+                     TBS_TOP | WS_TABSTOP,16,60,148,22
+     LTEXT           "Delay between new mail check",IDC_STATIC,14,47,101,8
+     EDITTEXT        IDC_DELAY2_TEXT,165,69,40,14,ES_AUTOHSCROLL
+     LTEXT           "seconds",IDC_STATIC,207,69,28,8
+     CONTROL         "Timer only applies to Inbox",IDC_INBOX_TIMER_ONLY,
+                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,89,104,10
+     GROUPBOX        "Read States",IDC_STATIC,7,104,234,63
+     LTEXT           "When a message is deleted as spam, change its read state to",
+                     IDC_STATIC,17,115,198,8
+     LTEXT           "When a message is recovered from spam, change its read state to",
+                     IDC_STATIC,14,139,214,8
+     COMBOBOX        IDC_DEL_SPAM_RS,25,124,97,54,CBS_DROPDOWN | CBS_SORT | 
+                     WS_VSCROLL | WS_TABSTOP
+     COMBOBOX        IDC_RECOVER_RS,25,149,97,63,CBS_DROPDOWN | CBS_SORT | 
+                     WS_VSCROLL | WS_TABSTOP
+     LTEXT           "Log Level",IDC_STATIC,7,174,31,8
+     EDITTEXT        IDC_VERBOSE_LOG,45,171,40,14,ES_AUTOHSCROLL
+ END
+ 
+ IDD_MANAGER DIALOGEX 0, 0, 275, 291
+ STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+ EXSTYLE WS_EX_CONTEXTHELP
+ CAPTION "SpamBayes"
+ FONT 8, "Tahoma", 400, 0, 0x0
+ BEGIN
+     DEFPUSHBUTTON   "OK",IDOK,158,270,50,14
+     PUSHBUTTON      "Cancel",IDCANCEL,216,270,50,14
+     CONTROL         1062,IDC_LOGO_GRAPHIC,"Static",SS_BITMAP | 
+                     SS_REALSIZEIMAGE,0,0,275,52
+     CONTROL         "",IDC_TAB,"SysTabControl32",0x0,9,64,255,202
+     LTEXT           "SpamBayes Version Here",IDC_VERSION,14,55,238,8
+     PUSHBUTTON      "About",IDC_ABOUT_BTN,9,270,50,14
+ END
+ 
+ IDD_FILTER_FOLDERS DIALOGEX 0, 0, 244, 183
+ STYLE DS_SETFONT | WS_CHILD | WS_SYSMENU
+ FONT 8, "Tahoma", 400, 0, 0x0
+ BEGIN
+     LTEXT           "Filter the following folders as messages arrive",
+                     IDC_STATIC,11,9,168,11
+     CONTROL         "Folder names...\nLine 2",IDC_FOLDER_WATCH,"Static",
+                     SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | SS_SUNKEN | 
+                     WS_GROUP,10,20,177,12
+     PUSHBUTTON      "Browse...",IDC_BROWSE_WATCH,187,19,50,14
+ END
+ 
+ IDD_FILTER_SPAM DIALOGEX 0, 0, 251, 147
+ STYLE DS_SETFONT | WS_CHILD | WS_SYSMENU
+ FONT 8, "Tahoma", 400, 0, 0x0
+ BEGIN
+     LTEXT           "Filter the following folders as messages arrive",
+                     IDC_STATIC,8,9,168,11
+     CONTROL         "Folder names...\nLine 2",IDC_FOLDER_WATCH,"Static",
+                     SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | SS_SUNKEN | 
+                     WS_GROUP,7,20,177,12
+     PUSHBUTTON      "Browse...",IDC_BROWSE_WATCH,192,19,50,14
+     GROUPBOX        "Certain Spam",IDC_STATIC,7,43,235,80
+     LTEXT           "To be considered certain spam, a message must score at least",
+                     IDC_STATIC,13,52,212,10
+     CONTROL         "",IDC_SLIDER_CERTAIN,"msctls_trackbar32",TBS_AUTOTICKS | 
+                     TBS_TOP | WS_TABSTOP,13,62,165,22
+     EDITTEXT        IDC_EDIT_CERTAIN,184,63,51,14,ES_AUTOHSCROLL
+     LTEXT           "and these mesages should be:",IDC_STATIC,13,82,107,10
+     COMBOBOX        IDC_ACTION_CERTAIN,13,93,55,40,CBS_DROPDOWNLIST | 
+                     WS_VSCROLL | WS_TABSTOP
+     LTEXT           "to folder",IDC_STATIC,75,95,31,10
+     CONTROL         "Folder names...",IDC_FOLDER_CERTAIN,"Static",
+                     SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | SS_SUNKEN | 
+                     WS_GROUP,120,93,59,14
+     PUSHBUTTON      "Browse",IDC_BROWSE_CERTAIN,184,93,50,14
+     CONTROL         "Mark spam as read",IDC_MARK_SPAM_AS_READ,"Button",
+                     BS_AUTOCHECKBOX | WS_TABSTOP,13,110,81,10
+ END
+ 
+ IDD_FILTER_UNSURE DIALOGEX 0, 0, 249, 124
+ STYLE DS_SETFONT | WS_CHILD | WS_SYSMENU
+ FONT 8, "Tahoma", 400, 0, 0x0
+ BEGIN
+     LTEXT           "To be considered uncertain, a message must score at least",
+                     IDC_STATIC,12,11,212,10
+     CONTROL         "",IDC_SLIDER_UNSURE,"msctls_trackbar32",TBS_AUTOTICKS | 
+                     TBS_TOP | WS_TABSTOP,12,18,165,20
+     EDITTEXT        IDC_EDIT_UNSURE,183,24,54,14,ES_AUTOHSCROLL
+     LTEXT           "and these mesages should be:",IDC_STATIC,12,38,107,10
+     COMBOBOX        IDC_ACTION_UNSURE,12,49,55,40,CBS_DROPDOWNLIST | 
+                     WS_VSCROLL | WS_TABSTOP
+     LTEXT           "to folder",IDC_STATIC,74,52,31,10
+     CONTROL         "(folder name)",IDC_FOLDER_UNSURE,"Static",
+                     SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | SS_SUNKEN | 
+                     WS_GROUP,119,49,59,14
+     PUSHBUTTON      "&Browse",IDC_BROWSE_UNSURE,183,49,50,14
+     CONTROL         "Mark posiible spam as read",IDC_MARK_UNSURE_AS_READ,
+                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,70,101,10
+ END
+ 
+ 
+ /////////////////////////////////////////////////////////////////////////////
+ //
+ // DESIGNINFO
+ //
+ 
+ #ifdef APSTUDIO_INVOKED
+ GUIDELINES DESIGNINFO 
+ BEGIN
+     IDD_ADVANCED, DIALOG
+     BEGIN
+         LEFTMARGIN, 7
+         RIGHTMARGIN, 241
+         BOTTOMMARGIN, 180
+     END
+ 
+     IDD_MANAGER, DIALOG
+     BEGIN
+         BOTTOMMARGIN, 284
+     END
+ 
+     IDD_FILTER_FOLDERS, DIALOG
+     BEGIN
+         LEFTMARGIN, 7
+         RIGHTMARGIN, 237
+         TOPMARGIN, 7
+         BOTTOMMARGIN, 176
+     END
+ 
+     IDD_FILTER_SPAM, DIALOG
+     BEGIN
+         LEFTMARGIN, 7
+         RIGHTMARGIN, 244
+         TOPMARGIN, 7
+         BOTTOMMARGIN, 140
+     END
+ 
+     IDD_FILTER_UNSURE, DIALOG
+     BEGIN
+         LEFTMARGIN, 7
+         RIGHTMARGIN, 242
+         TOPMARGIN, 7
+         BOTTOMMARGIN, 117
+     END
+ END
+ #endif    // APSTUDIO_INVOKED
+ 
+ 
+ /////////////////////////////////////////////////////////////////////////////
+ //
+ // Bitmap
+ //
+ 
+ IDB_SBLOGO              BITMAP                  "sblogo.bmp"
+ #endif    // English (U.S.) resources
+ /////////////////////////////////////////////////////////////////////////////
+ 
+ 
+ /////////////////////////////////////////////////////////////////////////////
  // English (Australia) resources

***************
*** 28,73 ****
  //

! IDD_MANAGER DIALOGEX 0, 0, 242, 201
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  EXSTYLE WS_EX_CONTEXTHELP
- CAPTION "SpamBayes"
  FONT 8, "Tahoma", 0, 0, 0x1
  BEGIN
!     CONTROL         "SpamBayes version xxx",IDC_VERSION,"Static",
!                     SS_LEFTNOWORDWRAP | WS_GROUP,8,4,230,11
!     GROUPBOX        "Training",IDC_STATIC,8,17,227,103
!     LTEXT           "Training is the process of giving examples of both good and bad email to the system so it can classify future email",
!                     IDC_STATIC,17,27,215,17
      LTEXT           "Automatically train that a message is good when:",
!                     IDC_STATIC,15,50,208,10
      CONTROL         "It is moved from a spam folder back to the Inbox",
                      IDC_BUT_TRAIN_FROM_SPAM_FOLDER,"Button",BS_AUTOCHECKBOX | 
!                     WS_TABSTOP,20,60,204,9
      LTEXT           "Automatically train that a message is spam when:",
!                     IDC_STATIC,15,74,208,10
      CONTROL         "It is moved to the certain-spam folder",
                      IDC_BUT_TRAIN_TO_SPAM_FOLDER,"Button",BS_AUTOCHECKBOX | 
!                     WS_TABSTOP,20,85,204,9
      CONTROL         "123 spam messages; 456 good messages",
                      IDC_TRAINING_STATUS,"Static",SS_LEFTNOWORDWRAP | 
!                     SS_CENTERIMAGE | SS_SUNKEN | WS_GROUP,15,98,146,14
!     PUSHBUTTON      "Train Now...",IDC_BUT_TRAIN_NOW,167,98,63,14
!     GROUPBOX        "Filtering",IDC_STATIC,7,122,228,57
      LTEXT           "Filtering defines how spam is handled as it arrives",
!                     IDC_STATIC,15,131,202,8
      CONTROL         "Enable &Filtering",IDC_BUT_FILTER_ENABLE,"Button",
!                     BS_AUTOCHECKBOX | WS_TABSTOP,20,143,120,11
      LTEXT           "Certain spam is moved to Folder1\nPossible spam is moved too",
!                     IDC_FILTER_STATUS,15,157,146,18,SS_SUNKEN
!     PUSHBUTTON      "Filter Now...",IDC_BUT_FILTER_NOW,167,141,63,14
!     PUSHBUTTON      "Define Filters...",IDC_BUT_FILTER_DEFINE,167,160,63,14
!     PUSHBUTTON      "About...",IDC_BUT_ABOUT,99,184,62,14
!     DEFPUSHBUTTON   "Close",IDOK,167,184,62,14
  END

  IDD_TRAINING DIALOGEX 0, 0, 241, 140
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  EXSTYLE WS_EX_CONTEXTHELP
- CAPTION "Training"
  FONT 8, "Tahoma", 0, 0, 0x1
  BEGIN
--- 207,245 ----
  //

! IDD_GENERAL DIALOGEX 0, 0, 253, 172
! STYLE DS_SETFONT | WS_CHILD | WS_VISIBLE
  EXSTYLE WS_EX_CONTEXTHELP
  FONT 8, "Tahoma", 0, 0, 0x1
  BEGIN
!     GROUPBOX        "Training",IDC_STATIC,8,2,240,103
!     LTEXT           "Training is the process of giving examples of both good and bad email to the system so it can classify future email.",
!                     IDC_STATIC,17,12,222,17
      LTEXT           "Automatically train that a message is good when:",
!                     IDC_STATIC,15,35,208,10
      CONTROL         "It is moved from a spam folder back to the Inbox",
                      IDC_BUT_TRAIN_FROM_SPAM_FOLDER,"Button",BS_AUTOCHECKBOX | 
!                     WS_TABSTOP,17,45,204,9
      LTEXT           "Automatically train that a message is spam when:",
!                     IDC_STATIC,15,59,208,10
      CONTROL         "It is moved to the certain-spam folder",
                      IDC_BUT_TRAIN_TO_SPAM_FOLDER,"Button",BS_AUTOCHECKBOX | 
!                     WS_TABSTOP,17,70,204,9
      CONTROL         "123 spam messages; 456 good messages",
                      IDC_TRAINING_STATUS,"Static",SS_LEFTNOWORDWRAP | 
!                     SS_CENTERIMAGE | SS_SUNKEN | WS_GROUP,15,83,223,14
!     GROUPBOX        "Filtering",IDC_STATIC,7,107,241,60
      LTEXT           "Filtering defines how spam is handled as it arrives",
!                     IDC_STATIC,15,117,205,8
      CONTROL         "Enable &Filtering",IDC_BUT_FILTER_ENABLE,"Button",
!                     BS_AUTOCHECKBOX | WS_TABSTOP,15,128,66,11
      LTEXT           "Certain spam is moved to Folder1\nPossible spam is moved too",
!                     IDC_FILTER_STATUS,15,143,223,18,SS_SUNKEN
!     CONTROL         "Save Spam Score",IDC_SAVE_SPAM_SCORE,"Button",
!                     BS_AUTOCHECKBOX | WS_TABSTOP,165,128,72,10
  END

  IDD_TRAINING DIALOGEX 0, 0, 241, 140
! STYLE DS_SETFONT | WS_CHILD | WS_SYSMENU
  EXSTYLE WS_EX_CONTEXTHELP
  FONT 8, "Tahoma", 0, 0, 0x1
  BEGIN
***************
*** 90,100 ****
                      92,166,11
      LTEXT           "",IDC_PROGRESS_TEXT,7,108,227,10
-     DEFPUSHBUTTON   "Close",IDOK,184,119,50,14
  END

! IDD_FILTER_NOW DIALOGEX 0, 0, 244, 182
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  EXSTYLE WS_EX_CONTEXTHELP
- CAPTION "Filter Now"
  FONT 8, "Tahoma", 0, 0, 0x1
  BEGIN
--- 262,270 ----
                      92,166,11
      LTEXT           "",IDC_PROGRESS_TEXT,7,108,227,10
  END

! IDD_FILTER_NOW DIALOGEX 0, 0, 244, 178
! STYLE DS_SETFONT | WS_CHILD | WS_SYSMENU
  EXSTYLE WS_EX_CONTEXTHELP
  FONT 8, "Tahoma", 0, 0, 0x1
  BEGIN
***************
*** 119,129 ****
      LTEXT           "Static",IDC_PROGRESS_TEXT,7,144,227,10
      PUSHBUTTON      "Filter Now",IDC_START,7,161,50,14
-     DEFPUSHBUTTON   "Close",IDOK,187,161,50,14
  END

! IDD_FILTER DIALOGEX 0, 0, 249, 239
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  EXSTYLE WS_EX_CONTEXTHELP
- CAPTION "Filter Rules"
  FONT 8, "Tahoma", 0, 0, 0x1
  BEGIN
--- 289,297 ----
      LTEXT           "Static",IDC_PROGRESS_TEXT,7,144,227,10
      PUSHBUTTON      "Filter Now",IDC_START,7,161,50,14
  END

! IDD_FILTER DIALOGEX 0, 0, 249, 252
! STYLE DS_SETFONT | WS_CHILD | WS_SYSMENU
  EXSTYLE WS_EX_CONTEXTHELP
  FONT 8, "Tahoma", 0, 0, 0x1
  BEGIN
***************
*** 134,174 ****
                      WS_GROUP,7,20,177,12
      PUSHBUTTON      "Browse...",IDC_BROWSE_WATCH,192,19,50,14
!     GROUPBOX        "Certain Spam",IDC_STATIC,7,43,235,65
      LTEXT           "To be considered certain spam, a message must score at least",
                      IDC_STATIC,13,52,212,10
      CONTROL         "Slider1",IDC_SLIDER_CERTAIN,"msctls_trackbar32",
!                     TBS_AUTOTICKS | TBS_BOTH | WS_TABSTOP,13,62,165,12
      EDITTEXT        IDC_EDIT_CERTAIN,184,63,51,14,ES_AUTOHSCROLL
!     LTEXT           "and these mesages should be:",IDC_STATIC,13,76,107,10
!     COMBOBOX        IDC_ACTION_CERTAIN,13,88,55,40,CBS_DROPDOWNLIST | 
                      WS_VSCROLL | WS_TABSTOP
!     LTEXT           "to folder",IDC_STATIC,75,90,31,10
      CONTROL         "Folder names...",IDC_FOLDER_CERTAIN,"Static",
                      SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | SS_SUNKEN | 
!                     WS_GROUP,120,88,59,14
!     PUSHBUTTON      "Browse",IDC_BROWSE_CERTAIN,184,88,50,14
!     GROUPBOX        "Possible Spam",IDC_STATIC,7,114,235,68
      LTEXT           "To be considered uncertain, a message must score at least",
!                     IDC_STATIC,13,124,212,10
      CONTROL         "Slider1",IDC_SLIDER_UNSURE,"msctls_trackbar32",
!                     TBS_AUTOTICKS | TBS_BOTH | WS_TABSTOP,13,137,165,12
!     EDITTEXT        IDC_EDIT_UNSURE,184,137,54,14,ES_AUTOHSCROLL
!     LTEXT           "and these mesages should be:",IDC_STATIC,13,150,107,10
!     COMBOBOX        IDC_ACTION_UNSURE,13,161,55,40,CBS_DROPDOWNLIST | 
                      WS_VSCROLL | WS_TABSTOP
!     LTEXT           "to folder",IDC_STATIC,75,164,31,10
      CONTROL         "(folder name)",IDC_FOLDER_UNSURE,"Static",
                      SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | SS_SUNKEN | 
!                     WS_GROUP,120,161,59,14
!     PUSHBUTTON      "&Browse",IDC_BROWSE_UNSURE,184,161,50,14
!     GROUPBOX        "Good messages",IDC_STATIC,7,185,235,25
      LTEXT           "All other messages are considered good, and are not filtered",
!                     IDC_STATIC,14,196,212,10
!     PUSHBUTTON      "Filter Now...",IDC_BUT_FILTER_NOW,7,218,50,14
!     PUSHBUTTON      "Close",IDOK,192,218,50,14
  END

! IDD_FOLDER_SELECTOR DIALOG DISCARDABLE  0, 0, 247, 215
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "Dialog"
  FONT 8, "Tahoma"
--- 302,344 ----
                      WS_GROUP,7,20,177,12
      PUSHBUTTON      "Browse...",IDC_BROWSE_WATCH,192,19,50,14
!     GROUPBOX        "Certain Spam",IDC_STATIC,7,43,235,80
      LTEXT           "To be considered certain spam, a message must score at least",
                      IDC_STATIC,13,52,212,10
      CONTROL         "Slider1",IDC_SLIDER_CERTAIN,"msctls_trackbar32",
!                     TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,13,62,165,22
      EDITTEXT        IDC_EDIT_CERTAIN,184,63,51,14,ES_AUTOHSCROLL
!     LTEXT           "and these mesages should be:",IDC_STATIC,13,82,107,10
!     COMBOBOX        IDC_ACTION_CERTAIN,13,93,55,40,CBS_DROPDOWNLIST | 
                      WS_VSCROLL | WS_TABSTOP
!     LTEXT           "to folder",IDC_STATIC,75,95,31,10
      CONTROL         "Folder names...",IDC_FOLDER_CERTAIN,"Static",
                      SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | SS_SUNKEN | 
!                     WS_GROUP,120,93,59,14
!     PUSHBUTTON      "Browse",IDC_BROWSE_CERTAIN,184,93,50,14
!     GROUPBOX        "Possible Spam",IDC_STATIC,6,127,235,81
      LTEXT           "To be considered uncertain, a message must score at least",
!                     IDC_STATIC,12,138,212,10
      CONTROL         "Slider1",IDC_SLIDER_UNSURE,"msctls_trackbar32",
!                     TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,12,145,165,20
!     EDITTEXT        IDC_EDIT_UNSURE,183,151,54,14,ES_AUTOHSCROLL
!     LTEXT           "and these mesages should be:",IDC_STATIC,12,165,107,10
!     COMBOBOX        IDC_ACTION_UNSURE,12,176,55,40,CBS_DROPDOWNLIST | 
                      WS_VSCROLL | WS_TABSTOP
!     LTEXT           "to folder",IDC_STATIC,74,179,31,10
      CONTROL         "(folder name)",IDC_FOLDER_UNSURE,"Static",
                      SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | SS_SUNKEN | 
!                     WS_GROUP,119,176,59,14
!     PUSHBUTTON      "&Browse",IDC_BROWSE_UNSURE,183,176,50,14
!     GROUPBOX        "Good messages",IDC_STATIC,9,212,235,25
      LTEXT           "All other messages are considered good, and are not filtered",
!                     IDC_STATIC,16,223,212,10
!     CONTROL         "Mark spam as read",IDC_MARK_SPAM_AS_READ,"Button",
!                     BS_AUTOCHECKBOX | WS_TABSTOP,13,110,81,10
!     CONTROL         "Mark posiible spam as read",IDC_MARK_UNSURE_AS_READ,
!                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,196,101,10
  END

! IDD_FOLDER_SELECTOR DIALOG  0, 0, 247, 215
! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "Dialog"
  FONT 8, "Tahoma"
***************
*** 189,192 ****
--- 359,385 ----

+ /////////////////////////////////////////////////////////////////////////////
+ //
+ // DESIGNINFO
+ //
+ 
+ #ifdef APSTUDIO_INVOKED
+ GUIDELINES DESIGNINFO 
+ BEGIN
+     IDD_GENERAL, DIALOG
+     BEGIN
+         RIGHTMARGIN, 248
+         BOTTOMMARGIN, 167
+     END
+ 
+     IDD_FILTER, DIALOG
+     BEGIN
+         BOTTOMMARGIN, 244
+         HORZGUIDE, 127
+     END
+ END
+ #endif    // APSTUDIO_INVOKED
+ 
+ 
  #ifdef APSTUDIO_INVOKED
  /////////////////////////////////////////////////////////////////////////////
***************
*** 195,204 ****
  //

! 1 TEXTINCLUDE DISCARDABLE 
  BEGIN
      "dialogs.h\0"
  END

! 2 TEXTINCLUDE DISCARDABLE 
  BEGIN
      "#include ""winres.h""\r\n"
--- 388,397 ----
  //

! 1 TEXTINCLUDE 
  BEGIN
      "dialogs.h\0"
  END

! 2 TEXTINCLUDE 
  BEGIN
      "#include ""winres.h""\r\n"
***************
*** 207,211 ****
  END

! 3 TEXTINCLUDE DISCARDABLE 
  BEGIN
      "\r\n"
--- 400,404 ----
  END

! 3 TEXTINCLUDE 
  BEGIN
      "\r\n"

From xenogeist at users.sourceforge.net  Sun Aug 17 17:08:42 2003
From: xenogeist at users.sourceforge.net (Adam Walker)
Date: Sun Aug 17 19:08:49 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000/dialogs/resources
	dialogs.rc, 1.3, 1.4
Message-ID: 

Update of /cvsroot/spambayes/spambayes/Outlook2000/dialogs/resources
In directory sc8-pr-cvs1:/tmp/cvs-serv5117/Outlook2000/dialogs/resources

Modified Files:
	dialogs.rc 
Log Message:
Made the dropdowns droplists on the advanced page.

Index: dialogs.rc
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/dialogs/resources/dialogs.rc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** dialogs.rc	17 Aug 2003 21:19:05 -0000	1.3
--- dialogs.rc	17 Aug 2003 23:08:40 -0000	1.4
***************
*** 51,57 ****
      LTEXT           "When a message is recovered from spam, change its read state to",
                      IDC_STATIC,14,139,214,8
!     COMBOBOX        IDC_DEL_SPAM_RS,25,124,97,54,CBS_DROPDOWN | CBS_SORT | 
                      WS_VSCROLL | WS_TABSTOP
!     COMBOBOX        IDC_RECOVER_RS,25,149,97,63,CBS_DROPDOWN | CBS_SORT | 
                      WS_VSCROLL | WS_TABSTOP
      LTEXT           "Log Level",IDC_STATIC,7,174,31,8
--- 51,57 ----
      LTEXT           "When a message is recovered from spam, change its read state to",
                      IDC_STATIC,14,139,214,8
!     COMBOBOX        IDC_DEL_SPAM_RS,25,124,97,54,CBS_DROPDOWNLIST | CBS_SORT | 
                      WS_VSCROLL | WS_TABSTOP
!     COMBOBOX        IDC_RECOVER_RS,25,149,97,63,CBS_DROPDOWNLIST | CBS_SORT | 
                      WS_VSCROLL | WS_TABSTOP
      LTEXT           "Log Level",IDC_STATIC,7,174,31,8

From xenogeist at users.sourceforge.net  Sun Aug 17 17:10:32 2003
From: xenogeist at users.sourceforge.net (Adam Walker)
Date: Sun Aug 17 19:10:34 2003
Subject: [Spambayes-checkins] spambayes/Outlook2000/dialogs dialog_map.py,
	1.3, 1.4
Message-ID: 

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

Modified Files:
	dialog_map.py 
Log Message:
Moved training to be the second tab.

Index: dialog_map.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/dialogs/dialog_map.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** dialog_map.py	17 Aug 2003 21:19:05 -0000	1.3
--- dialog_map.py	17 Aug 2003 23:10:30 -0000	1.4
***************
*** 156,163 ****
          self.currentPageHwnd = None
          self.addPage(0, "IDD_GENERAL", "General")
!         self.addPage(1, "IDD_FILTER_SPAM", "Spam")
!         self.addPage(2, "IDD_FILTER_UNSURE", "Possible Spam")
!         self.addPage(3, "IDD_FILTER_NOW", "Filter Now")
!         self.addPage(4, "IDD_TRAINING", "Training")
          self.addPage(5, "IDD_ADVANCED", "Advanced")
          self.switchToPage(0)
--- 156,163 ----
          self.currentPageHwnd = None
          self.addPage(0, "IDD_GENERAL", "General")
!         self.addPage(1, "IDD_TRAINING", "Training")
!         self.addPage(2, "IDD_FILTER_SPAM", "Spam")
!         self.addPage(3, "IDD_FILTER_UNSURE", "Possible Spam")
!         self.addPage(4, "IDD_FILTER_NOW", "Filter Now")
          self.addPage(5, "IDD_ADVANCED", "Advanced")
          self.switchToPage(0)

From anadelonbrin at users.sourceforge.net  Sun Aug 17 17:46:58 2003
From: anadelonbrin at users.sourceforge.net (Tony Meyer)
Date: Sun Aug 17 19:47:04 2003
Subject: [Spambayes-checkins] website faq.txt,1.35,1.36
Message-ID: 

Update of /cvsroot/spambayes/website
In directory sc8-pr-cvs1:/tmp/cvs-serv11673

Modified Files:
	faq.txt 
Log Message:
Add more information about identifying dumbdbm, as suggested by
Peter Beckman.

Index: faq.txt
===================================================================
RCS file: /cvsroot/spambayes/website/faq.txt,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** faq.txt	13 Aug 2003 14:52:27 -0000	1.35
--- faq.txt	17 Aug 2003 23:46:56 -0000	1.36
***************
*** 941,948 ****
  as it is very inefficient.  Instead, either
  `use a pickle <#how-do-i-use-a-pickle-for-storage>`_ or install `pybsddb`_
! (bsddb3) and use that instead.  If you are not sure which database systems
  you have available, and/or which one you are currently using, there is a
  script in the utilities folder called `which_database.py`_ that will display
! this information (Windows users should run it from a command prompt).

  Support for dumbdbm will be dropped in a future release.
--- 941,956 ----
  as it is very inefficient.  Instead, either
  `use a pickle <#how-do-i-use-a-pickle-for-storage>`_ or install `pybsddb`_
! (bsddb3) and use that instead.
! 
! If you are not sure which database systems
  you have available, and/or which one you are currently using, there is a
  script in the utilities folder called `which_database.py`_ that will display
! this information (Windows users should run it from a command prompt).  This
! file is only included in releases after 1.0a4 - if you are using an earlier
! version, you can download it from cvs, or just go by the name(s) of the
! database file(s).  If you have a single file, probably called ``hammie.db``,
! then you are probably not using dumbdbm.  If you have three files (probably
! called ``hammie.db.dir``, ``hammie.db.dat`` and ``hammie.db.bak``), then you
! most likely are using dumbdbm, and should stop.

  Support for dumbdbm will be dropped in a future release.

From anadelonbrin at users.sourceforge.net  Sun Aug 17 18:53:14 2003
From: anadelonbrin at users.sourceforge.net (Tony Meyer)
Date: Sun Aug 17 20:53:17 2003
Subject: [Spambayes-checkins] spambayes/spambayes ImapUI.py, 1.14,
	1.15 ProxyUI.py, 1.14, 1.15 UserInterface.py, 1.14, 1.15
Message-ID: 

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

Modified Files:
	ImapUI.py ProxyUI.py UserInterface.py 
Log Message:
Add version information to the web interface, as requested in
[ spambayes-Bugs-790051 ] Can't review messages if probability header is turned on

Index: ImapUI.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/ImapUI.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ImapUI.py	17 Jun 2003 07:36:49 -0000	1.14
--- ImapUI.py	18 Aug 2003 00:53:11 -0000	1.15
***************
*** 98,101 ****
--- 98,102 ----
          self.imap_pwd = pwd
          self.imap_logged_in = False
+         self.app_for_version = "IMAP Filter"

      def onHome(self):

Index: ProxyUI.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/ProxyUI.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ProxyUI.py	12 Aug 2003 04:41:46 -0000	1.14
--- ProxyUI.py	18 Aug 2003 00:53:11 -0000	1.15
***************
*** 118,121 ****
--- 118,122 ----
          state = proxy_state
          self.state_recreator = state_recreator # ugly
+         self.app_for_version = "POP3 Proxy"

      def onHome(self):

Index: UserInterface.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/UserInterface.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** UserInterface.py	12 Aug 2003 05:51:55 -0000	1.14
--- UserInterface.py	18 Aug 2003 00:53:11 -0000	1.15
***************
*** 74,77 ****
--- 74,78 ----

  import PyMeldLite
+ import Version
  import Dibbler
  import tokenizer
***************
*** 96,99 ****
--- 97,101 ----
          htmlSource, self._images = self.readUIResources()
          self.html = PyMeldLite.Meld(htmlSource, readonly=True)
+         self.app_for_version = None

      def onIncomingConnection(self, clientSocket):
***************
*** 103,111 ****

      def _getHTMLClone(self):
!         """Gets a clone of the HTML, with the footer timestamped, ready to be
!         modified and sent to the browser."""
          clone = self.html.clone()
          timestamp = time.strftime('%H:%M on %A %B %d %Y', time.localtime())
          clone.footer.timestamp = timestamp
          return clone

--- 105,115 ----

      def _getHTMLClone(self):
!         """Gets a clone of the HTML, with the footer timestamped, and
!         version information added, ready to be modified and sent to the
!         browser."""
          clone = self.html.clone()
          timestamp = time.strftime('%H:%M on %A %B %d %Y', time.localtime())
          clone.footer.timestamp = timestamp
+         clone.footer.version = Version.get_version_string(self.app_for_version)
          return clone

From anadelonbrin at users.sourceforge.net  Sun Aug 17 18:53:14 2003
From: anadelonbrin at users.sourceforge.net (Tony Meyer)
Date: Sun Aug 17 20:53:23 2003
Subject: [Spambayes-checkins] spambayes/spambayes/resources ui.html, 1.15,
	1.16 ui_html.py, 1.16, 1.17
Message-ID: 

Update of /cvsroot/spambayes/spambayes/spambayes/resources
In directory sc8-pr-cvs1:/tmp/cvs-serv20254/spambayes/resources

Modified Files:
	ui.html ui_html.py 
Log Message:
Add version information to the web interface, as requested in
[ spambayes-Bugs-790051 ] Can't review messages if probability header is turned on

Index: ui.html
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/resources/ui.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ui.html	7 Jul 2003 20:58:37 -0000	1.15
--- ui.html	18 Aug 2003 00:53:12 -0000	1.16
***************
*** 403,406 ****
--- 403,407 ----

%s
%s

News

What is SpamBayes?

SpamBayes donations

About the PSF

Why donate to the PSF?

Yeah yeah, but why donate to the PSF?

What will the PSF do with my money? Will it be spent on SpamBayes?

OK, OK, where do I pay?

About the PSF

Why donate to the PSF?

About the PSF

Why donate to the PSF?

Yeah yeah, but why donate to the PSF?

What will the PSF do with my money? Will it be spent on SpamBayes?

OK, OK, where do I pay?

Yeah yeah, but why donate to the PSF?

What will the PSF do with my money? Will it be spent on SpamBayes?

OK, OK, where do I pay?

POP3

POP3

Installing and Configuring the plugin

Installing and Configuring the plugin

Platforms

Availability

Availability

Binary Releases

Outlook Plugin

Other

Binary Releases

Outlook Plugin

Other

What people are saying about us

What we are saying about us

News

What is SpamBayes?

News

What is SpamBayes?

Installing and Configuring the plugin

Installing and Configuring the plugin

Spam Score: %g

Spam Score: %d%% (%g)

What we are saying about us

Mailing lists

Submitting a bug report

Send a mail

Related Projects

Related Websites

OpenSource or free "Bayesian" filters

Projects based on SpamBayes

Projects based on SpamBayes (Commercial or otherwise)

Other Commercial Products using "Bayesian" style filtering

Availability

Availability

Binary Releases

Outlook Plugin

Binary Releases

Outlook Plugin

News

News

Outlook 2000/Outlook XP

Outlook 2000/Outlook XP

News

News

Mailing lists

What we are saying about us

What we are saying about us

Projects based on SpamBayes (Commercial or otherwise)

Other Commercial Products using "Bayesian" style filtering

Commercial products based on SpamBayes

Other Commercial Products using "Bayesian" style filtering

Related Websites

OpenSource or free "Bayesian" filters

Commercial products based on SpamBayes

Other Commercial Products using "Bayesian" style filtering

Related Websites

OpenSource or free "Bayesian" filters

Products based on SpamBayes

Other Commercial Products using "Bayesian" style filtering

Availability

notesfilter.py

Using the plugin
!

Tips and Common Problems
!

Welcome to SpamBayes
--- 7,11 ---- !