[Spambayes-checkins] spambayes/Outlook2000/dialogs FilterDialog.py,1.7,1.8 ManagerDialog.py,1.4,1.5 TrainingDialog.py,1.6,1.7

Tim Peters tim_one@users.sourceforge.net
Fri Nov 1 02:04:39 2002


Update of /cvsroot/spambayes/spambayes/Outlook2000/dialogs
In directory usw-pr-cvs1:/tmp/cvs-serv5945/Outlook2000/dialogs

Modified Files:
	FilterDialog.py ManagerDialog.py TrainingDialog.py 
Log Message:
Whitespace normalization.


Index: FilterDialog.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/dialogs/FilterDialog.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** FilterDialog.py	1 Nov 2002 01:23:27 -0000	1.7
--- FilterDialog.py	1 Nov 2002 02:03:46 -0000	1.8
***************
*** 213,217 ****
          slider_pos = slider.GetPos()
          self.SetDlgItemText(idc_edit, "%d" % slider_pos)
!  
      def _InitSlider(self, idc_slider, idc_edit):
          slider = self.GetDlgItem(idc_slider)
--- 213,217 ----
          slider_pos = slider.GetPos()
          self.SetDlgItemText(idc_edit, "%d" % slider_pos)
! 
      def _InitSlider(self, idc_slider, idc_edit):
          slider = self.GetDlgItem(idc_slider)
***************
*** 285,289 ****
          [BUTTON,          action_score,         IDC_BUT_ACT_SCORE,   (15,62,203,10), csts | win32con.BS_AUTORADIOBUTTON],
  
!         
          [BUTTON,          only_group,           -1,                  (7,84,230,35),  cs   | win32con.BS_GROUPBOX | win32con.WS_GROUP],
          [BUTTON,          only_unread,          IDC_BUT_UNREAD,      (15,94,149,9),  csts | win32con.BS_AUTOCHECKBOX],
--- 285,289 ----
          [BUTTON,          action_score,         IDC_BUT_ACT_SCORE,   (15,62,203,10), csts | win32con.BS_AUTORADIOBUTTON],
  
! 
          [BUTTON,          only_group,           -1,                  (7,84,230,35),  cs   | win32con.BS_GROUPBOX | win32con.WS_GROUP],
          [BUTTON,          only_unread,          IDC_BUT_UNREAD,      (15,94,149,9),  csts | win32con.BS_AUTOCHECKBOX],

Index: ManagerDialog.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/dialogs/ManagerDialog.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ManagerDialog.py	31 Oct 2002 21:57:00 -0000	1.4
--- ManagerDialog.py	1 Nov 2002 02:03:48 -0000	1.5
***************
*** 28,32 ****
      training_intro = "Training is the process of giving examples of both good and bad email to the system so it can classify future email"
      filtering_intro = "Filtering defines how spam is handled as it arrives"
!     
      dt = [
          # Dialog itself.
--- 28,32 ----
      training_intro = "Training is the process of giving examples of both good and bad email to the system so it can classify future email"
      filtering_intro = "Filtering defines how spam is handled as it arrives"
! 
      dt = [
          # Dialog itself.
***************
*** 39,48 ****
          [BUTTON,          "It is moved from a spam folder back to the Inbox",
                                                  IDC_BUT_TRAIN_FROM_SPAM_FOLDER,(20,50,204,9), csts | win32con.BS_AUTOCHECKBOX],
!         
          [STATIC,          "Automatically train that a message is spam when",
                                                  -1,                  (15,64,208,10), cs],
          [BUTTON,          "It is moved to the certain-spam folder",
                                                  IDC_BUT_TRAIN_TO_SPAM_FOLDER,(20,75,204,9), csts | win32con.BS_AUTOCHECKBOX],
!         
          [STATIC,          "",                   IDC_TRAINING_STATUS, (15,88,146,14),       cs   | win32con.SS_LEFTNOWORDWRAP | win32con.SS_CENTERIMAGE | win32con.SS_SUNKEN],
          [BUTTON,          'Train Now...',       IDC_BUT_TRAIN_NOW,   (167,88,63,14),       csts | win32con.BS_PUSHBUTTON],
--- 39,48 ----
          [BUTTON,          "It is moved from a spam folder back to the Inbox",
                                                  IDC_BUT_TRAIN_FROM_SPAM_FOLDER,(20,50,204,9), csts | win32con.BS_AUTOCHECKBOX],
! 
          [STATIC,          "Automatically train that a message is spam when",
                                                  -1,                  (15,64,208,10), cs],
          [BUTTON,          "It is moved to the certain-spam folder",
                                                  IDC_BUT_TRAIN_TO_SPAM_FOLDER,(20,75,204,9), csts | win32con.BS_AUTOCHECKBOX],
! 
          [STATIC,          "",                   IDC_TRAINING_STATUS, (15,88,146,14),       cs   | win32con.SS_LEFTNOWORDWRAP | win32con.SS_CENTERIMAGE | win32con.SS_SUNKEN],
          [BUTTON,          'Train Now...',       IDC_BUT_TRAIN_NOW,   (167,88,63,14),       csts | win32con.BS_PUSHBUTTON],
***************
*** 72,76 ****
              (IDC_BUT_TRAIN_TO_SPAM_FOLDER, "self.mgr.config.training.train_manual_spam"),
          ]
!         
          dialog.Dialog.__init__(self, self.dt)
  
--- 72,76 ----
              (IDC_BUT_TRAIN_TO_SPAM_FOLDER, "self.mgr.config.training.train_manual_spam"),
          ]
! 
          dialog.Dialog.__init__(self, self.dt)
  
***************
*** 125,129 ****
                  filter_status = "Watching '%s'. Spam managed in '%s', unsure managed in '%s'" \
                                  % (watch_names, certain_spam_name, unsure_name)
!                 
          self.GetDlgItem(IDC_BUT_FILTER_ENABLE).EnableWindow(ok_to_enable)
          enabled = config.enabled
--- 125,129 ----
                  filter_status = "Watching '%s'. Spam managed in '%s', unsure managed in '%s'" \
                                  % (watch_names, certain_spam_name, unsure_name)
! 
          self.GetDlgItem(IDC_BUT_FILTER_ENABLE).EnableWindow(ok_to_enable)
          enabled = config.enabled
***************
*** 133,137 ****
      def OnButAbout(self, id, code):
          if code == win32con.BN_CLICKED:
!             
              fname = os.path.join(os.path.dirname(__file__), os.pardir, "about.html")
              fname = os.path.abspath(fname)
--- 133,137 ----
      def OnButAbout(self, id, code):
          if code == win32con.BN_CLICKED:
! 
              fname = os.path.join(os.path.dirname(__file__), os.pardir, "about.html")
              fname = os.path.abspath(fname)

Index: TrainingDialog.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/dialogs/TrainingDialog.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TrainingDialog.py	31 Oct 2002 21:57:00 -0000	1.6
--- TrainingDialog.py	1 Nov 2002 02:03:52 -0000	1.7
***************
*** 76,80 ****
          if len(self.config.spam_folder_ids)==0 and self.mgr.config.filter.spam_folder_id:
              self.config.spam_folder_ids = [self.mgr.config.filter.spam_folder_id]
!         
          names = []
          for eid in self.config.ham_folder_ids:
--- 76,80 ----
          if len(self.config.spam_folder_ids)==0 and self.mgr.config.filter.spam_folder_id:
              self.config.spam_folder_ids = [self.mgr.config.filter.spam_folder_id]
! 
          names = []
          for eid in self.config.ham_folder_ids: