[Spambayes-checkins] spambayes/Outlook2000/dialogs dialog_map.py, 1.20, 1.21

[Mark Hammond]

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

Modified Files:
	dialog_map.py 
Log Message:
Fix a few loose ends, make About buttons work, etc.


Index: dialog_map.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/dialogs/dialog_map.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** dialog_map.py	24 Aug 2003 13:22:06 -0000	1.20
--- dialog_map.py	24 Aug 2003 14:08:03 -0000	1.21
***************
*** 189,193 ****
              self.addPage(index, page_id, template[0][0])
          self.switchToPage(0)
!         print "TabProcessor init"
      def Done(self):
          print "TabProcessor Done"
--- 189,193 ----
              self.addPage(index, page_id, template[0][0])
          self.switchToPage(0)
! 
      def Done(self):
          print "TabProcessor Done"
***************
*** 248,252 ****
                 "training information, but all other options will be reset\r\n" \
                 "and SpamBayes will need to be re-enabled before it will\r\n" \
!                "continuefiltering.\r\n\r\n" \
                 "Are you sure you wish to reset all options?"
      flags = win32con.MB_ICONQUESTION | win32con.MB_YESNO | win32con.MB_DEFBUTTON2
--- 248,252 ----
                 "training information, but all other options will be reset\r\n" \
                 "and SpamBayes will need to be re-enabled before it will\r\n" \
!                "continue filtering.\r\n\r\n" \
                 "Are you sure you wish to reset all options?"
      flags = win32con.MB_ICONQUESTION | win32con.MB_YESNO | win32con.MB_DEFBUTTON2
***************
*** 392,399 ****
          (FilterEnableProcessor,   "IDC_BUT_FILTER_ENABLE", "Filter.enabled"),
          (FilterStatusProcessor,   "IDC_FILTER_STATUS"),
-         (DialogCommand,           "IDC_BUT_FILTER_NOW", "IDD_FILTER_NOW"),
-         (DialogCommand,           "IDC_BUT_FILTER_DEFINE", "IDD_FILTER"),
-         (DialogCommand,           "IDC_BUT_TRAIN_NOW", "IDD_TRAINING"),
-         (DialogCommand,           "IDC_ADVANCED_BTN", "IDD_ADVANCED"),
          (ShowWizardCommand,       "IDC_BUT_WIZARD", "IDD_WIZARD"),
          (CommandButtonProcessor,  "IDC_BUT_RESET", ResetConfig, ()),
--- 392,395 ----
***************
*** 479,487 ****
          ),
      "IDD_WIZARD_WELCOME": (
!         (CommandButtonProcessor,  "IDC_ABOUT_BTN", ShowAbout, ()),
          (RadioButtonProcessor,    "IDC_BUT_PREPARATION", "Wizard.preparation"),
          ),
      "IDD_WIZARD_TRAINING_IS_IMPORTANT" : (
          (BoolButtonProcessor,     "IDC_BUT_TRAIN IDC_BUT_UNTRAINED",    "Wizard.will_train_later"),
      ),
      "IDD_WIZARD_FOLDERS_REST": (
--- 475,484 ----
          ),
      "IDD_WIZARD_WELCOME": (
!         (CommandButtonProcessor,  "IDC_BUT_ABOUT", ShowAbout, ()),
          (RadioButtonProcessor,    "IDC_BUT_PREPARATION", "Wizard.preparation"),
          ),
      "IDD_WIZARD_TRAINING_IS_IMPORTANT" : (
          (BoolButtonProcessor,     "IDC_BUT_TRAIN IDC_BUT_UNTRAINED",    "Wizard.will_train_later"),
+         (CommandButtonProcessor,  "IDC_BUT_ABOUT", ShowAbout, ()),
      ),
      "IDD_WIZARD_FOLDERS_REST": (