[Spambayes-checkins] spambayes/Outlook2000/dialogs/resources dialogs.rc, 1.13, 1.14

Mark Hammond mhammond at users.sourceforge.net
Sat Aug 23 21:05:18 EDT 2003 

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

Modified Files:
	dialogs.rc 
Log Message:
Explicitly pass the 'config' object around the dialogs, and lots
of Wizard work.  The wizard pretty much is now fully functional (but only
via test_dialogs.py)


Index: dialogs.rc
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/dialogs/resources/dialogs.rc,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** dialogs.rc	22 Aug 2003 06:13:30 -0000	1.13
--- dialogs.rc	24 Aug 2003 03:05:16 -0000	1.14
***************
*** 193,196 ****
--- 193,198 ----
      LTEXT           "As you train, you will find the accuracy of SpamBayes increases",
                      IDC_STATIC,20,69,247,15
+     LTEXT           "Click Finish to close the wizard.",IDC_STATIC,20,121,
+                     148,9
  END
  
***************
*** 200,216 ****
  FONT 8, "Tahoma", 0, 0, 0x0
  BEGIN
!     PUSHBUTTON      "Browse...",IDC_BROWSE_SPAM,208,83,60,15
      LTEXT           "Spam and Unsure Folders",IDC_STATIC,20,4,247,14
      LTEXT           "SpamBayes uses two folders to manage your Spam - a folder where 'certain' spam is stored, and another for unsure messages.",
                      IDC_STATIC,20,20,247,22
      LTEXT           "If you enter a folder name and it does not exist, it will be automatically created.  If you would prefer to select an existing folder, click the Browse button",
!                     IDC_STATIC,20,44,243,16
!     EDITTEXT        IDC_FOLDER_CERTAIN,20,83,179,14,ES_AUTOHSCROLL
      LTEXT           "Unsure messages will be delivered to a folder named",
!                     IDC_STATIC,20,104,186,12
!     EDITTEXT        IDC_FOLDER_UNSURE,20,116,177,14,ES_AUTOHSCROLL
      LTEXT           "Spam will be delivered to a folder named",IDC_STATIC,20,
!                     71,137,12
!     PUSHBUTTON      "Browse...",IDC_BROWSE_UNSURE,208,116,60,15
  END
  
--- 202,218 ----
  FONT 8, "Tahoma", 0, 0, 0x0
  BEGIN
!     PUSHBUTTON      "Browse...",IDC_BROWSE_SPAM,208,85,60,15
      LTEXT           "Spam and Unsure Folders",IDC_STATIC,20,4,247,14
      LTEXT           "SpamBayes uses two folders to manage your Spam - a folder where 'certain' spam is stored, and another for unsure messages.",
                      IDC_STATIC,20,20,247,22
      LTEXT           "If you enter a folder name and it does not exist, it will be automatically created.  If you would prefer to select an existing folder, click the Browse button",
!                     IDC_STATIC,20,44,243,24
!     EDITTEXT        IDC_FOLDER_CERTAIN,20,85,179,14,ES_AUTOHSCROLL
      LTEXT           "Unsure messages will be delivered to a folder named",
!                     IDC_STATIC,20,105,186,12
!     EDITTEXT        IDC_FOLDER_UNSURE,20,117,177,14,ES_AUTOHSCROLL
      LTEXT           "Spam will be delivered to a folder named",IDC_STATIC,20,
!                     72,137,8
!     PUSHBUTTON      "Browse...",IDC_BROWSE_UNSURE,208,117,60,15
  END
  
***************
*** 229,233 ****
      LTEXT           "If you use the Outlook rule wizard to move messages into folders, you may like to select these folders in addition to your inbox",
                      IDC_STATIC,20,51,241,20
!     EDITTEXT        IDC_FOLDER_WATCH,20,108,195,42,ES_MULTILINE | 
                      ES_AUTOHSCROLL | ES_READONLY
  END
--- 231,235 ----
      LTEXT           "If you use the Outlook rule wizard to move messages into folders, you may like to select these folders in addition to your inbox",
                      IDC_STATIC,20,51,241,20
!     EDITTEXT        IDC_FOLDER_WATCH,20,100,195,48,ES_MULTILINE | 
                      ES_AUTOHSCROLL | ES_READONLY
  END
***************
*** 241,244 ****
--- 243,248 ----
      LTEXT           "SpamBayes has not been configured, and will be disabled until you configure it manually",
                      IDC_STATIC,20,57,247,16
+     LTEXT           "Click Finish to close the wizard.",IDC_STATIC,20,113,
+                     148,9
  END
  
***************
*** 260,265 ****
                      20,38,153,8
      PUSHBUTTON      "Browse...",IDC_BROWSE_SPAM,208,81,60,15
!     LTEXT           "If you have not pre-sorted your messages, please select the Back button, then indicate you have not prepared for SpamBayes",
!                     IDC_STATIC,20,138,243,16
      CONTROL         "Score messages when training is complete",
                      IDC_BUT_RESCORE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,
--- 264,269 ----
                      20,38,153,8
      PUSHBUTTON      "Browse...",IDC_BROWSE_SPAM,208,81,60,15
!     LTEXT           "If you have not pre-sorted your messages, or already have training information you wish to keep, please select the Back button and indicate you have not prepared for SpamBayes",
!                     IDC_STATIC,20,128,243,26
      CONTROL         "Score messages when training is complete",
                      IDC_BUT_RESCORE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,
***************
*** 286,293 ****
  BEGIN
      LTEXT           "Congratulations",IDC_STATIC,20,4,247,14
!     LTEXT           "SpamBayes has been successfully trained and configured.  You should find Spam is immediately effective in filtering spam.",
                      IDC_STATIC,20,42,247,25
      LTEXT           "Even though SpamBayes has been trained, it does continue to learn - please ensure you regularly check your Unsure folder, and use the 'Delete as Spam' or 'Recover from Spam' buttons as appropriate.",
                      IDC_STATIC,20,68,249,30
  END
  
--- 290,299 ----
  BEGIN
      LTEXT           "Congratulations",IDC_STATIC,20,4,247,14
!     LTEXT           "SpamBayes has been successfully trained and configured.  You should find the system is immediately effective at filtering spam.",
                      IDC_STATIC,20,42,247,25
      LTEXT           "Even though SpamBayes has been trained, it does continue to learn - please ensure you regularly check your Unsure folder, and use the 'Delete as Spam' or 'Recover from Spam' buttons as appropriate.",
                      IDC_STATIC,20,68,249,30
+     LTEXT           "Click Finish to close the wizard.",IDC_STATIC,20,104,
+                     148,9
  END
  
***************
*** 354,359 ****
          VERTGUIDE, 268
          BOTTOMMARGIN, 161
!         HORZGUIDE, 83
!         HORZGUIDE, 116
      END
  
--- 360,365 ----
          VERTGUIDE, 268
          BOTTOMMARGIN, 161
!         HORZGUIDE, 85
!         HORZGUIDE, 117
      END

More information about the Spambayes-checkins mailing list