[Spambayes-checkins] spambayes/Outlook2000/dialogs/resources dialogs.h, 1.23, 1.24 dialogs.rc, 1.49, 1.50

Tony Meyer anadelonbrin at users.sourceforge.net
Thu Dec 23 06:18:24 CET 2004


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

Modified Files:
	dialogs.h dialogs.rc 
Log Message:
Enlarge the Manager dialog.  This makes room for all the statistics that we want to
 show (plus one or two more later), and a control to set the ham folder.  The general
 tab has more room to show the folders being filtered (it never fit well before).
  There's room on the training tab for some sort of option controlling the training
 regime, and room on the advanced tab for something new, too.

Is this too large now?  I don't think we'd want to go larger than this.

Index: dialogs.h
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/dialogs/resources/dialogs.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** dialogs.h	22 Dec 2004 18:55:54 -0000	1.23
--- dialogs.h	23 Dec 2004 05:18:21 -0000	1.24
***************
*** 56,63 ****
--- 56,66 ----
  #define IDC_EDIT_UNSURE                 1030
  #define IDC_ACTION_UNSURE               1031
+ #define IDC_ACTION_HAM                  1032
  #define IDC_FOLDER_UNSURE               1033
  #define IDC_BROWSE_UNSURE               1034
  #define IDC_TRAINING_STATUS             1035
+ #define IDC_FOLDER_HAM                  1098
  #define IDC_FOLDER_NAMES                1036
+ #define IDC_BROWSE_HAM                  1099
  #define IDC_BROWSE                      1037
  #define IDC_FOLDER_WATCH                1038

Index: dialogs.rc
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/dialogs/resources/dialogs.rc,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** dialogs.rc	22 Dec 2004 18:55:55 -0000	1.49
--- dialogs.rc	23 Dec 2004 05:18:21 -0000	1.50
***************
*** 28,36 ****
  //
  
! IDD_ADVANCED DIALOGEX 0, 0, 248, 209
  STYLE DS_MODALFRAME | WS_CHILD | WS_CAPTION | WS_SYSMENU
  EXSTYLE WS_EX_CONTEXTHELP
  CAPTION "Advanced"
! FONT 8, "Tahoma", 400
  BEGIN
      GROUPBOX        "Filter timer",IDC_STATIC,7,3,234,117
--- 28,36 ----
  //
  
! IDD_ADVANCED DIALOGEX 0, 0, 248, 257
  STYLE DS_MODALFRAME | WS_CHILD | WS_CAPTION | WS_SYSMENU
  EXSTYLE WS_EX_CONTEXTHELP
  CAPTION "Advanced"
! FONT 8, "Tahoma", 400, 0, 0x1
  BEGIN
      GROUPBOX        "Filter timer",IDC_STATIC,7,3,234,117
***************
*** 48,80 ****
                      IDC_INBOX_TIMER_ONLY,"Button",BS_AUTOCHECKBOX | 
                      WS_TABSTOP,16,100,217,10
!     PUSHBUTTON      "Show Data Folder",IDC_SHOW_DATA_FOLDER,7,190,70,14
      CONTROL         "Enable background filtering",IDC_BUT_TIMER_ENABLED,
                      "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,12,162,10
!     PUSHBUTTON      "Diagnostics...",IDC_BUT_SHOW_DIAGNOSTICS,171,190,70,14
  END
  
! IDD_STATISTICS DIALOG DISCARDABLE  0, 0, 248, 209
  STYLE WS_CHILD | WS_CAPTION
  CAPTION "Statistics"
  FONT 8, "Tahoma"
  BEGIN
!     GROUPBOX        "Statistics",IDC_STATIC,7,3,241,181
      LTEXT           "some stats\nand some more\nline 3\nline 4\nline 5",
!                     IDC_STATISTICS,12,12,230,166
!     PUSHBUTTON      "Reset Statistics",IDC_BUT_RESET_STATS,178,190,70,14
!     LTEXT           "Last reset:",IDC_STATIC,7,193,36,8
!     LTEXT           "<<<Date>>>",IDC_LAST_RESET_DATE,47,193,107,8
  END
  
! IDD_MANAGER DIALOGEX 0, 0, 275, 260
  STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU
  EXSTYLE WS_EX_CONTEXTHELP
  CAPTION "SpamBayes Manager"
! FONT 8, "Tahoma", 400
  BEGIN
!     DEFPUSHBUTTON   "Close",IDOK,216,239,50,14
!     PUSHBUTTON      "Cancel",IDCANCEL,155,239,50,14,NOT WS_VISIBLE
!     CONTROL         "",IDC_TAB,"SysTabControl32",0x0,8,7,258,228
!     PUSHBUTTON      "About",IDC_ABOUT_BTN,8,239,50,14
  END
  
--- 48,80 ----
                      IDC_INBOX_TIMER_ONLY,"Button",BS_AUTOCHECKBOX | 
                      WS_TABSTOP,16,100,217,10
!     PUSHBUTTON      "Show Data Folder",IDC_SHOW_DATA_FOLDER,7,238,70,14
      CONTROL         "Enable background filtering",IDC_BUT_TIMER_ENABLED,
                      "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,12,162,10
!     PUSHBUTTON      "Diagnostics...",IDC_BUT_SHOW_DIAGNOSTICS,171,238,70,14
  END
  
! IDD_STATISTICS DIALOG DISCARDABLE  0, 0, 248, 257
  STYLE WS_CHILD | WS_CAPTION
  CAPTION "Statistics"
  FONT 8, "Tahoma"
  BEGIN
!     GROUPBOX        "Statistics",IDC_STATIC,7,3,241,229
      LTEXT           "some stats\nand some more\nline 3\nline 4\nline 5",
!                     IDC_STATISTICS,12,12,230,204
!     PUSHBUTTON      "Reset Statistics",IDC_BUT_RESET_STATS,178,238,70,14
!     LTEXT           "Last reset:",IDC_STATIC,7,241,36,8
!     LTEXT           "<<<Date>>>",IDC_LAST_RESET_DATE,47,241,107,8
  END
  
! IDD_MANAGER DIALOGEX 0, 0, 275, 308
  STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU
  EXSTYLE WS_EX_CONTEXTHELP
  CAPTION "SpamBayes Manager"
! FONT 8, "Tahoma"
  BEGIN
!     DEFPUSHBUTTON   "Close",IDOK,216,287,50,14
!     PUSHBUTTON      "Cancel",IDCANCEL,155,287,50,14,NOT WS_VISIBLE
!     CONTROL         "",IDC_TAB,"SysTabControl32",0x0,8,7,258,276
!     PUSHBUTTON      "About",IDC_ABOUT_BTN,8,287,50,14
  END
  
***************
*** 82,86 ****
  STYLE DS_MODALFRAME | WS_CHILD | WS_CAPTION | WS_SYSMENU
  CAPTION "Spam"
! FONT 8, "Tahoma", 400
  BEGIN
      LTEXT           "Filter the following folders as messages arrive",
--- 82,86 ----
  STYLE DS_MODALFRAME | WS_CHILD | WS_CAPTION | WS_SYSMENU
  CAPTION "Spam"
! FONT 8, "Tahoma", 400, 0, 0x1
  BEGIN
      LTEXT           "Filter the following folders as messages arrive",
***************
*** 111,115 ****
  STYLE DS_MODALFRAME | WS_CHILD | WS_CAPTION | WS_SYSMENU
  CAPTION "Possible Spam"
! FONT 8, "Tahoma", 400
  BEGIN
      LTEXT           "To be considered uncertain, a message must score at least",
--- 111,115 ----
  STYLE DS_MODALFRAME | WS_CHILD | WS_CAPTION | WS_SYSMENU
  CAPTION "Possible Spam"
! FONT 8, "Tahoma", 400, 0, 0x1
  BEGIN
      LTEXT           "To be considered uncertain, a message must score at least",
***************
*** 134,138 ****
  EXSTYLE WS_EX_CONTEXTHELP
  CAPTION "Diagnostics"
! FONT 8, "Tahoma", 400
  BEGIN
      LTEXT           "These advanced options are for diagnostic or debugging purposes only.  You should only change these options if specifically asked to, or you know exactly what they mean.",
--- 134,138 ----
  EXSTYLE WS_EX_CONTEXTHELP
  CAPTION "Diagnostics"
! FONT 8, "Tahoma", 400, 0, 0x1
  BEGIN
      LTEXT           "These advanced options are for diagnostic or debugging purposes only.  You should only change these options if specifically asked to, or you know exactly what they mean.",
***************
*** 151,155 ****
  EXSTYLE WS_EX_CONTEXTHELP
  CAPTION "SpamBayes Configuration Wizard"
! FONT 8, "Tahoma", 400
  BEGIN
      PUSHBUTTON      "Cancel",IDCANCEL,328,173,50,14
--- 151,155 ----
  EXSTYLE WS_EX_CONTEXTHELP
  CAPTION "SpamBayes Configuration Wizard"
! FONT 8, "Tahoma", 400, 0, 0x1
  BEGIN
      PUSHBUTTON      "Cancel",IDCANCEL,328,173,50,14
***************
*** 164,168 ****
  STYLE DS_MODALFRAME | WS_CHILD | WS_CAPTION
  EXSTYLE WS_EX_CONTEXTHELP
! FONT 8, "Tahoma"
  BEGIN
      LTEXT           "Welcome to the SpamBayes configuration wizard",
--- 164,168 ----
  STYLE DS_MODALFRAME | WS_CHILD | WS_CAPTION
  EXSTYLE WS_EX_CONTEXTHELP
! FONT 8, "Tahoma", 0, 0, 0x1
  BEGIN
      LTEXT           "Welcome to the SpamBayes configuration wizard",
***************
*** 189,193 ****
  STYLE DS_MODALFRAME | WS_CHILD | WS_CAPTION
  EXSTYLE WS_EX_CONTEXTHELP
! FONT 8, "Tahoma"
  BEGIN
      LTEXT           "Congratulations",IDC_STATIC,20,4,247,14
--- 189,193 ----
  STYLE DS_MODALFRAME | WS_CHILD | WS_CAPTION
  EXSTYLE WS_EX_CONTEXTHELP
! FONT 8, "Tahoma", 0, 0, 0x1
  BEGIN
      LTEXT           "Congratulations",IDC_STATIC,20,4,247,14
***************
*** 207,211 ****
  STYLE DS_MODALFRAME | WS_CHILD | WS_CAPTION
  EXSTYLE WS_EX_CONTEXTHELP
! FONT 8, "Tahoma"
  BEGIN
      PUSHBUTTON      "Browse...",IDC_BROWSE_SPAM,208,85,60,15
--- 207,211 ----
  STYLE DS_MODALFRAME | WS_CHILD | WS_CAPTION
  EXSTYLE WS_EX_CONTEXTHELP
! FONT 8, "Tahoma", 0, 0, 0x1
  BEGIN
      PUSHBUTTON      "Browse...",IDC_BROWSE_SPAM,208,85,60,15
***************
*** 227,231 ****
  STYLE DS_MODALFRAME | WS_CHILD | WS_CAPTION
  EXSTYLE WS_EX_CONTEXTHELP
! FONT 8, "Tahoma"
  BEGIN
      PUSHBUTTON      "Browse...",IDC_BROWSE_WATCH,225,134,50,14
--- 227,231 ----
  STYLE DS_MODALFRAME | WS_CHILD | WS_CAPTION
  EXSTYLE WS_EX_CONTEXTHELP
! FONT 8, "Tahoma", 0, 0, 0x1
  BEGIN
      PUSHBUTTON      "Browse...",IDC_BROWSE_WATCH,225,134,50,14
***************
*** 245,249 ****
  STYLE DS_MODALFRAME | WS_CHILD | WS_CAPTION
  EXSTYLE WS_EX_CONTEXTHELP
! FONT 8, "Tahoma"
  BEGIN
      LTEXT           "Configuration cancelled",IDC_STATIC,20,4,247,14
--- 245,249 ----
  STYLE DS_MODALFRAME | WS_CHILD | WS_CAPTION
  EXSTYLE WS_EX_CONTEXTHELP
! FONT 8, "Tahoma", 0, 0, 0x1
  BEGIN
      LTEXT           "Configuration cancelled",IDC_STATIC,20,4,247,14
***************
*** 257,261 ****
  STYLE DS_MODALFRAME | WS_CHILD | WS_CAPTION
  EXSTYLE WS_EX_CONTEXTHELP
! FONT 8, "Tahoma"
  BEGIN
      PUSHBUTTON      "Browse...",IDC_BROWSE_HAM,208,49,60,15
--- 257,261 ----
  STYLE DS_MODALFRAME | WS_CHILD | WS_CAPTION
  EXSTYLE WS_EX_CONTEXTHELP
! FONT 8, "Tahoma", 0, 0, 0x1
  BEGIN
      PUSHBUTTON      "Browse...",IDC_BROWSE_HAM,208,49,60,15
***************
*** 281,285 ****
  STYLE DS_MODALFRAME | WS_CHILD | WS_CAPTION
  EXSTYLE WS_EX_CONTEXTHELP
! FONT 8, "Tahoma"
  BEGIN
      LTEXT           "Training",-1,20,4,247,14
--- 281,285 ----
  STYLE DS_MODALFRAME | WS_CHILD | WS_CAPTION
  EXSTYLE WS_EX_CONTEXTHELP
! FONT 8, "Tahoma", 0, 0, 0x1
  BEGIN
      LTEXT           "Training",-1,20,4,247,14
***************
*** 294,298 ****
  STYLE DS_MODALFRAME | WS_CHILD | WS_CAPTION
  EXSTYLE WS_EX_CONTEXTHELP
! FONT 8, "Tahoma"
  BEGIN
      LTEXT           "Congratulations",IDC_STATIC,20,4,247,14
--- 294,298 ----
  STYLE DS_MODALFRAME | WS_CHILD | WS_CAPTION
  EXSTYLE WS_EX_CONTEXTHELP
! FONT 8, "Tahoma", 0, 0, 0x1
  BEGIN
      LTEXT           "Congratulations",IDC_STATIC,20,4,247,14
***************
*** 308,312 ****
  STYLE DS_MODALFRAME | WS_CHILD | WS_CAPTION
  EXSTYLE WS_EX_CONTEXTHELP
! FONT 8, "Tahoma"
  BEGIN
      LTEXT           "SpamBayes will not be effective until it is trained.",
--- 308,312 ----
  STYLE DS_MODALFRAME | WS_CHILD | WS_CAPTION
  EXSTYLE WS_EX_CONTEXTHELP
! FONT 8, "Tahoma", 0, 0, 0x1
  BEGIN
      LTEXT           "SpamBayes will not be effective until it is trained.",
***************
*** 331,335 ****
  STYLE DS_MODALFRAME | WS_CHILD | WS_CAPTION
  EXSTYLE WS_EX_CONTEXTHELP
! FONT 8, "Tahoma"
  BEGIN
      LTEXT           "Configuration suspended",IDC_STATIC,20,4,247,14
--- 331,335 ----
  STYLE DS_MODALFRAME | WS_CHILD | WS_CAPTION
  EXSTYLE WS_EX_CONTEXTHELP
! FONT 8, "Tahoma", 0, 0, 0x1
  BEGIN
      LTEXT           "Configuration suspended",IDC_STATIC,20,4,247,14
***************
*** 495,499 ****
  //
  
! IDD_GENERAL DIALOGEX 0, 0, 253, 210
  STYLE DS_MODALFRAME | WS_CHILD | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
  EXSTYLE WS_EX_CONTEXTHELP
--- 495,499 ----
  //
  
! IDD_GENERAL DIALOGEX 0, 0, 253, 257
  STYLE DS_MODALFRAME | WS_CHILD | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
  EXSTYLE WS_EX_CONTEXTHELP
***************
*** 508,516 ****
                      IDC_TRAINING_STATUS,6,101,242,27,SS_SUNKEN
      CONTROL         "Enable SpamBayes",IDC_BUT_FILTER_ENABLE,"Button",
!                     BS_AUTOCHECKBOX | WS_TABSTOP,6,173,97,11
      LTEXT           "Certain spam is moved to Folder1\nPossible spam is moved too",
!                     IDC_FILTER_STATUS,6,146,242,19,SS_SUNKEN
!     PUSHBUTTON      "Reset Configuration...",IDC_BUT_RESET,6,190,84,15
!     PUSHBUTTON      "Configuration Wizard...",IDC_BUT_WIZARD,164,190,84,15
      LTEXT           "Filter status:",IDC_STATIC,6,135,222,8
      CONTROL         1062,IDC_LOGO_GRAPHIC,"Static",SS_BITMAP | 
--- 508,516 ----
                      IDC_TRAINING_STATUS,6,101,242,27,SS_SUNKEN
      CONTROL         "Enable SpamBayes",IDC_BUT_FILTER_ENABLE,"Button",
!                     BS_AUTOCHECKBOX | WS_TABSTOP,6,221,97,11
      LTEXT           "Certain spam is moved to Folder1\nPossible spam is moved too",
!                     IDC_FILTER_STATUS,6,146,242,67,SS_SUNKEN
!     PUSHBUTTON      "Reset Configuration...",IDC_BUT_RESET,6,238,84,15
!     PUSHBUTTON      "Configuration Wizard...",IDC_BUT_WIZARD,164,238,84,15
      LTEXT           "Filter status:",IDC_STATIC,6,135,222,8
      CONTROL         1062,IDC_LOGO_GRAPHIC,"Static",SS_BITMAP | 
***************
*** 518,522 ****
  END
  
! IDD_TRAINING DIALOGEX 0, 0, 252, 210
  STYLE DS_MODALFRAME | WS_CHILD | WS_CAPTION | WS_SYSMENU
  EXSTYLE WS_EX_CONTEXTHELP
--- 518,522 ----
  END
  
! IDD_TRAINING DIALOGEX 0, 0, 252, 257
  STYLE DS_MODALFRAME | WS_CHILD | WS_CAPTION | WS_SYSMENU
  EXSTYLE WS_EX_CONTEXTHELP
***************
*** 589,597 ****
  END
  
! IDD_FILTER DIALOGEX 0, 0, 249, 209
  STYLE DS_MODALFRAME | WS_CHILD | WS_CAPTION | WS_SYSMENU
  EXSTYLE WS_EX_CONTEXTHELP
  CAPTION "Filtering"
! FONT 8, "Tahoma", 0, 0, 0x1
  BEGIN
      LTEXT           "Filter the following folders as messages arrive",
--- 589,597 ----
  END
  
! IDD_FILTER DIALOGEX 0, 0, 249, 257
  STYLE DS_MODALFRAME | WS_CHILD | WS_CAPTION | WS_SYSMENU
  EXSTYLE WS_EX_CONTEXTHELP
  CAPTION "Filtering"
! FONT 8, "Tahoma"
  BEGIN
      LTEXT           "Filter the following folders as messages arrive",
***************
*** 628,636 ****
                      SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | SS_SUNKEN | 
                      WS_GROUP,102,166,77,14
!     PUSHBUTTON      "&Browse",IDC_BROWSE_UNSURE,183,166,50,14
      CONTROL         "Mark spam as read",IDC_MARK_SPAM_AS_READ,"Button",
                      BS_AUTOCHECKBOX | WS_TABSTOP,13,100,81,10
      CONTROL         "Mark possible spam as read",IDC_MARK_UNSURE_AS_READ,
                      "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,186,101,10
  END
  
--- 628,645 ----
                      SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | SS_SUNKEN | 
                      WS_GROUP,102,166,77,14
!     PUSHBUTTON      "&Browse",IDC_BROWSE_UNSURE,184,166,50,14
      CONTROL         "Mark spam as read",IDC_MARK_SPAM_AS_READ,"Button",
                      BS_AUTOCHECKBOX | WS_TABSTOP,13,100,81,10
      CONTROL         "Mark possible spam as read",IDC_MARK_UNSURE_AS_READ,
                      "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,186,101,10
+     GROUPBOX        "Certain Good",IDC_STATIC,6,203,235,48
+     LTEXT           "These messages should be:",IDC_STATIC,12,215,107,10
+     COMBOBOX        IDC_ACTION_HAM,12,228,55,40,CBS_DROPDOWNLIST | 
+                     WS_VSCROLL | WS_TABSTOP
+     LTEXT           "to folder",IDC_STATIC,71,230,27,10
+     CONTROL         "(folder name)",IDC_FOLDER_HAM,"Static",
+                     SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | SS_SUNKEN | 
+                     WS_GROUP,102,228,77,14
+     PUSHBUTTON      "&Browse",IDC_BROWSE_HAM,184,228,50,14
  END
  
***************
*** 638,642 ****
  STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "Dialog"
! FONT 8, "Tahoma"
  BEGIN
      LTEXT           "&Folders:",IDC_STATIC,7,7,47,9
--- 647,651 ----
  STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "Dialog"
! FONT 8, "Tahoma", 0, 0, 0x1
  BEGIN
      LTEXT           "&Folders:",IDC_STATIC,7,7,47,9
***************
*** 689,693 ****
      IDD_FILTER, DIALOG
      BEGIN
!         BOTTOMMARGIN, 206
          HORZGUIDE, 127
      END
--- 698,702 ----
      IDD_FILTER, DIALOG
      BEGIN
!         BOTTOMMARGIN, 254
          HORZGUIDE, 127
      END



More information about the Spambayes-checkins mailing list