[Spambayes-checkins] spambayes/Outlook2000/dialogs dialog_map.py, 1.39, 1.40 opt_processors.py, 1.15, 1.16

[Tony Meyer]

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

Modified Files:
	dialog_map.py opt_processors.py 
Log Message:
Add [ 938992 ] Allow longer background filtering delays.

You can now use background filtering delays up to one minute.  The slider on the dialog
 still only goes up to 10 seconds (for fine control), but larger values can be entered
 via the edit box.

Index: dialog_map.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/dialogs/dialog_map.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** dialog_map.py	28 Apr 2004 22:30:13 -0000	1.39
--- dialog_map.py	28 Oct 2004 04:29:00 -0000	1.40
***************
*** 478,483 ****
                                     IDC_DELAY2_TEXT IDC_DELAY2_SLIDER
                                     IDC_INBOX_TIMER_ONLY"""),
!         (EditNumberProcessor,   "IDC_DELAY1_TEXT IDC_DELAY1_SLIDER", "Filter.timer_start_delay", 0, 10, 20),
!         (EditNumberProcessor,   "IDC_DELAY2_TEXT IDC_DELAY2_SLIDER", "Filter.timer_interval", 0, 10, 20),
          (BoolButtonProcessor,   "IDC_INBOX_TIMER_ONLY", "Filter.timer_only_receive_folders"),
          (StatsProcessor,        "IDC_STATISTICS"),
--- 478,483 ----
                                     IDC_DELAY2_TEXT IDC_DELAY2_SLIDER
                                     IDC_INBOX_TIMER_ONLY"""),
!         (EditNumberProcessor,   "IDC_DELAY1_TEXT IDC_DELAY1_SLIDER", "Filter.timer_start_delay", 0, 10, 20, 60),
!         (EditNumberProcessor,   "IDC_DELAY2_TEXT IDC_DELAY2_SLIDER", "Filter.timer_interval", 0, 10, 20, 60),
          (BoolButtonProcessor,   "IDC_INBOX_TIMER_ONLY", "Filter.timer_only_receive_folders"),
          (StatsProcessor,        "IDC_STATISTICS"),

Index: opt_processors.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/dialogs/opt_processors.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** opt_processors.py	16 Dec 2003 05:06:33 -0000	1.15
--- opt_processors.py	28 Oct 2004 04:29:00 -0000	1.16
***************
*** 168,175 ****
  
  class EditNumberProcessor(OptionControlProcessor):
!     def __init__(self, window, control_ids, option, min_val = 0, max_val = 100, ticks = 100):
          self.slider_id = control_ids and control_ids[1]
          self.min_val = min_val
          self.max_val = max_val
          self.ticks = ticks
          OptionControlProcessor.__init__(self, window, control_ids, option)
--- 168,177 ----
  
  class EditNumberProcessor(OptionControlProcessor):
!     def __init__(self, window, control_ids, option, min_val=0, max_val=100,
!                  ticks=100, max_edit_val=100):
          self.slider_id = control_ids and control_ids[1]
          self.min_val = min_val
          self.max_val = max_val
+         self.max_edit_val = max_edit_val
          self.ticks = ticks
          OptionControlProcessor.__init__(self, window, control_ids, option)
***************
*** 246,250 ****
          str_val = buf[:nchars]
          val = float(str_val)
!         if val < self.min_val or val > self.max_val:
              raise ValueError, "Value must be between %d and %d" % (self.min_val, self.max_val)
          self.SetOptionValue(val)
--- 248,252 ----
          str_val = buf[:nchars]
          val = float(str_val)
!         if val < self.min_val or val > self.max_edit_val:
              raise ValueError, "Value must be between %d and %d" % (self.min_val, self.max_val)
          self.SetOptionValue(val)