[Spambayes-checkins] spambayes/Outlook2000/dialogs/resources
dialogs.h, 1.3, 1.4 dialogs.rc, 1.4, 1.5
Adam Walker
xenogeist at users.sourceforge.net
Mon Aug 18 07:31:56 EDT 2003
Update of /cvsroot/spambayes/spambayes/Outlook2000/dialogs/resources
In directory sc8-pr-cvs1:/tmp/cvs-serv26085/Outlook2000/dialogs/resources
Modified Files:
dialogs.h dialogs.rc
Log Message:
Changed the property pages to change styles at runtime so we can put the captions in the rc file and removed the caption_map hack. Recombined the filter pages. Moved two options to a seperate diagnosic dialog.
Index: dialogs.h
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/dialogs/resources/dialogs.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** dialogs.h 17 Aug 2003 21:19:05 -0000 1.3
--- dialogs.h 18 Aug 2003 13:31:53 -0000 1.4
***************
*** 11,17 ****
#define IDB_BITMAP1 107
#define IDD_GENERAL 108
- #define IDD_FILTER_FOLDERS 109
#define IDD_FILTER_SPAM 110
#define IDD_FILTER_UNSURE 111
#define IDC_PROGRESS 1000
#define IDC_PROGRESS_TEXT 1001
--- 11,17 ----
#define IDB_BITMAP1 107
#define IDD_GENERAL 108
#define IDD_FILTER_SPAM 110
#define IDD_FILTER_UNSURE 111
+ #define IDD_DIAGNOSIC 113
#define IDC_PROGRESS 1000
#define IDC_PROGRESS_TEXT 1001
***************
*** 78,82 ****
#define IDC_DEL_SPAM_RS 1071
#define IDC_RECOVER_RS 1072
! #define IDC_EDIT1 1073
// Next default values for new objects
--- 78,82 ----
#define IDC_DEL_SPAM_RS 1071
#define IDC_RECOVER_RS 1072
! #define IDC_EDIT1 1074
// Next default values for new objects
***************
*** 84,90 ****
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
! #define _APS_NEXT_RESOURCE_VALUE 112
#define _APS_NEXT_COMMAND_VALUE 40001
! #define _APS_NEXT_CONTROL_VALUE 1074
#define _APS_NEXT_SYMED_VALUE 101
#endif
--- 84,90 ----
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
! #define _APS_NEXT_RESOURCE_VALUE 114
#define _APS_NEXT_COMMAND_VALUE 40001
! #define _APS_NEXT_CONTROL_VALUE 1075
#define _APS_NEXT_SYMED_VALUE 101
#endif
Index: dialogs.rc
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/dialogs/resources/dialogs.rc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** dialogs.rc 17 Aug 2003 23:08:40 -0000 1.4
--- dialogs.rc 18 Aug 2003 13:31:54 -0000 1.5
***************
*** 28,34 ****
//
! IDD_ADVANCED DIALOGEX 0, 0, 248, 185
! STYLE DS_SETFONT | WS_CHILD | WS_SYSMENU
EXSTYLE WS_EX_CONTEXTHELP
FONT 8, "Tahoma", 400, 0, 0x0
BEGIN
--- 28,35 ----
//
! IDD_ADVANCED DIALOGEX 0, 0, 248, 179
! STYLE DS_SETFONT | DS_MODALFRAME | WS_CHILD | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_CONTEXTHELP
+ CAPTION "Advanced"
FONT 8, "Tahoma", 400, 0, 0x0
BEGIN
***************
*** 53,63 ****
COMBOBOX IDC_DEL_SPAM_RS,25,124,97,54,CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
! COMBOBOX IDC_RECOVER_RS,25,149,97,63,CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
- LTEXT "Log Level",IDC_STATIC,7,174,31,8
- EDITTEXT IDC_VERBOSE_LOG,45,171,40,14,ES_AUTOHSCROLL
END
! IDD_MANAGER DIALOGEX 0, 0, 275, 291
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_CONTEXTHELP
--- 54,62 ----
COMBOBOX IDC_DEL_SPAM_RS,25,124,97,54,CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
! COMBOBOX IDC_RECOVER_RS,25,148,97,63,CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
END
! IDD_MANAGER DIALOGEX 0, 0, 275, 300
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_CONTEXTHELP
***************
*** 65,91 ****
FONT 8, "Tahoma", 400, 0, 0x0
BEGIN
! DEFPUSHBUTTON "OK",IDOK,158,270,50,14
! PUSHBUTTON "Cancel",IDCANCEL,216,270,50,14
CONTROL 1062,IDC_LOGO_GRAPHIC,"Static",SS_BITMAP |
SS_REALSIZEIMAGE,0,0,275,52
! CONTROL "",IDC_TAB,"SysTabControl32",0x0,9,64,255,202
! LTEXT "SpamBayes Version Here",IDC_VERSION,14,55,238,8
! PUSHBUTTON "About",IDC_ABOUT_BTN,9,270,50,14
! END
!
! IDD_FILTER_FOLDERS DIALOGEX 0, 0, 244, 183
! STYLE DS_SETFONT | WS_CHILD | WS_SYSMENU
! FONT 8, "Tahoma", 400, 0, 0x0
! BEGIN
! LTEXT "Filter the following folders as messages arrive",
! IDC_STATIC,11,9,168,11
! CONTROL "Folder names...\nLine 2",IDC_FOLDER_WATCH,"Static",
! SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | SS_SUNKEN |
! WS_GROUP,10,20,177,12
! PUSHBUTTON "Browse...",IDC_BROWSE_WATCH,187,19,50,14
END
IDD_FILTER_SPAM DIALOGEX 0, 0, 251, 147
! STYLE DS_SETFONT | WS_CHILD | WS_SYSMENU
FONT 8, "Tahoma", 400, 0, 0x0
BEGIN
--- 64,78 ----
FONT 8, "Tahoma", 400, 0, 0x0
BEGIN
! DEFPUSHBUTTON "OK",IDOK,158,279,50,14
! PUSHBUTTON "Cancel",IDCANCEL,216,279,50,14
CONTROL 1062,IDC_LOGO_GRAPHIC,"Static",SS_BITMAP |
SS_REALSIZEIMAGE,0,0,275,52
! CONTROL "",IDC_TAB,"SysTabControl32",0x0,9,54,255,220
! PUSHBUTTON "About",IDC_ABOUT_BTN,9,279,50,14
END
IDD_FILTER_SPAM DIALOGEX 0, 0, 251, 147
! STYLE DS_SETFONT | DS_MODALFRAME | WS_CHILD | WS_CAPTION | WS_SYSMENU
! CAPTION "Spam"
FONT 8, "Tahoma", 400, 0, 0x0
BEGIN
***************
*** 95,100 ****
SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | SS_SUNKEN |
WS_GROUP,7,20,177,12
! PUSHBUTTON "Browse...",IDC_BROWSE_WATCH,192,19,50,14
! GROUPBOX "Certain Spam",IDC_STATIC,7,43,235,80
LTEXT "To be considered certain spam, a message must score at least",
IDC_STATIC,13,52,212,10
--- 82,87 ----
SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | SS_SUNKEN |
WS_GROUP,7,20,177,12
! PUSHBUTTON "Browse...",IDC_BROWSE_WATCH,194,19,50,14
! GROUPBOX "Certain Spam",IDC_STATIC,7,43,237,80
LTEXT "To be considered certain spam, a message must score at least",
IDC_STATIC,13,52,212,10
***************
*** 115,119 ****
IDD_FILTER_UNSURE DIALOGEX 0, 0, 249, 124
! STYLE DS_SETFONT | WS_CHILD | WS_SYSMENU
FONT 8, "Tahoma", 400, 0, 0x0
BEGIN
--- 102,107 ----
IDD_FILTER_UNSURE DIALOGEX 0, 0, 249, 124
! STYLE DS_SETFONT | DS_MODALFRAME | WS_CHILD | WS_CAPTION | WS_SYSMENU
! CAPTION "Possible Spam"
FONT 8, "Tahoma", 400, 0, 0x0
BEGIN
***************
*** 135,138 ****
--- 123,140 ----
END
+ IDD_DIAGNOSIC DIALOGEX 0, 0, 179, 52
+ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+ CAPTION "Diagnosic"
+ FONT 8, "MS Shell Dlg", 400, 0, 0x1
+ BEGIN
+ DEFPUSHBUTTON "OK",IDOK,122,7,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,122,24,50,14
+ CONTROL "Save Spam Score",IDC_SAVE_SPAM_SCORE,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,7,72,10
+ LTEXT "Log level",IDC_STATIC,7,29,29,8
+ EDITTEXT IDC_VERBOSE_LOG,43,25,40,14,ES_AUTOHSCROLL
+ END
+
/////////////////////////////////////////////////////////////////////////////
***************
*** 148,165 ****
LEFTMARGIN, 7
RIGHTMARGIN, 241
! BOTTOMMARGIN, 180
END
IDD_MANAGER, DIALOG
BEGIN
! BOTTOMMARGIN, 284
! END
!
! IDD_FILTER_FOLDERS, DIALOG
! BEGIN
! LEFTMARGIN, 7
! RIGHTMARGIN, 237
! TOPMARGIN, 7
! BOTTOMMARGIN, 176
END
--- 150,159 ----
LEFTMARGIN, 7
RIGHTMARGIN, 241
! BOTTOMMARGIN, 174
END
IDD_MANAGER, DIALOG
BEGIN
! BOTTOMMARGIN, 293
END
***************
*** 179,182 ****
--- 173,184 ----
BOTTOMMARGIN, 117
END
+
+ IDD_DIAGNOSIC, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 172
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 45
+ END
END
#endif // APSTUDIO_INVOKED
***************
*** 207,245 ****
//
! IDD_GENERAL DIALOGEX 0, 0, 253, 172
! STYLE DS_SETFONT | WS_CHILD | WS_VISIBLE
EXSTYLE WS_EX_CONTEXTHELP
FONT 8, "Tahoma", 0, 0, 0x1
BEGIN
! GROUPBOX "Training",IDC_STATIC,8,2,240,103
LTEXT "Training is the process of giving examples of both good and bad email to the system so it can classify future email.",
! IDC_STATIC,17,12,222,17
LTEXT "Automatically train that a message is good when:",
! IDC_STATIC,15,35,208,10
CONTROL "It is moved from a spam folder back to the Inbox",
IDC_BUT_TRAIN_FROM_SPAM_FOLDER,"Button",BS_AUTOCHECKBOX |
! WS_TABSTOP,17,45,204,9
LTEXT "Automatically train that a message is spam when:",
! IDC_STATIC,15,59,208,10
CONTROL "It is moved to the certain-spam folder",
IDC_BUT_TRAIN_TO_SPAM_FOLDER,"Button",BS_AUTOCHECKBOX |
! WS_TABSTOP,17,70,204,9
CONTROL "123 spam messages; 456 good messages",
IDC_TRAINING_STATUS,"Static",SS_LEFTNOWORDWRAP |
! SS_CENTERIMAGE | SS_SUNKEN | WS_GROUP,15,83,223,14
! GROUPBOX "Filtering",IDC_STATIC,7,107,241,60
LTEXT "Filtering defines how spam is handled as it arrives",
! IDC_STATIC,15,117,205,8
CONTROL "Enable &Filtering",IDC_BUT_FILTER_ENABLE,"Button",
! BS_AUTOCHECKBOX | WS_TABSTOP,15,128,66,11
LTEXT "Certain spam is moved to Folder1\nPossible spam is moved too",
! IDC_FILTER_STATUS,15,143,223,18,SS_SUNKEN
! CONTROL "Save Spam Score",IDC_SAVE_SPAM_SCORE,"Button",
! BS_AUTOCHECKBOX | WS_TABSTOP,165,128,72,10
END
IDD_TRAINING DIALOGEX 0, 0, 241, 140
! STYLE DS_SETFONT | WS_CHILD | WS_SYSMENU
EXSTYLE WS_EX_CONTEXTHELP
FONT 8, "Tahoma", 0, 0, 0x1
BEGIN
--- 209,248 ----
//
! IDD_GENERAL DIALOGEX 0, 0, 253, 187
! STYLE DS_SETFONT | DS_MODALFRAME | WS_CHILD | WS_VISIBLE | WS_CAPTION
EXSTYLE WS_EX_CONTEXTHELP
+ CAPTION "General"
FONT 8, "Tahoma", 0, 0, 0x1
BEGIN
! GROUPBOX "Training",IDC_STATIC,8,12,240,103
LTEXT "Training is the process of giving examples of both good and bad email to the system so it can classify future email.",
! IDC_STATIC,17,22,222,17
LTEXT "Automatically train that a message is good when:",
! IDC_STATIC,15,45,208,10
CONTROL "It is moved from a spam folder back to the Inbox",
IDC_BUT_TRAIN_FROM_SPAM_FOLDER,"Button",BS_AUTOCHECKBOX |
! WS_TABSTOP,17,55,204,9
LTEXT "Automatically train that a message is spam when:",
! IDC_STATIC,15,69,208,10
CONTROL "It is moved to the certain-spam folder",
IDC_BUT_TRAIN_TO_SPAM_FOLDER,"Button",BS_AUTOCHECKBOX |
! WS_TABSTOP,17,80,204,9
CONTROL "123 spam messages; 456 good messages",
IDC_TRAINING_STATUS,"Static",SS_LEFTNOWORDWRAP |
! SS_CENTERIMAGE | SS_SUNKEN | WS_GROUP,15,93,223,14
! GROUPBOX "Filtering",IDC_STATIC,7,116,241,60
LTEXT "Filtering defines how spam is handled as it arrives",
! IDC_STATIC,15,127,205,8
CONTROL "Enable &Filtering",IDC_BUT_FILTER_ENABLE,"Button",
! BS_AUTOCHECKBOX | WS_TABSTOP,15,138,66,11
LTEXT "Certain spam is moved to Folder1\nPossible spam is moved too",
! IDC_FILTER_STATUS,15,153,223,18,SS_SUNKEN
! LTEXT "SpamBayes Version Here",IDC_VERSION,5,1,238,8
END
IDD_TRAINING DIALOGEX 0, 0, 241, 140
! STYLE DS_SETFONT | DS_MODALFRAME | WS_CHILD | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_CONTEXTHELP
+ CAPTION "Training"
FONT 8, "Tahoma", 0, 0, 0x1
BEGIN
***************
*** 265,270 ****
IDD_FILTER_NOW DIALOGEX 0, 0, 244, 178
! STYLE DS_SETFONT | WS_CHILD | WS_SYSMENU
EXSTYLE WS_EX_CONTEXTHELP
FONT 8, "Tahoma", 0, 0, 0x1
BEGIN
--- 268,274 ----
IDD_FILTER_NOW DIALOGEX 0, 0, 244, 178
! STYLE DS_SETFONT | DS_MODALFRAME | WS_CHILD | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_CONTEXTHELP
+ CAPTION "Filter Now"
FONT 8, "Tahoma", 0, 0, 0x1
BEGIN
***************
*** 291,340 ****
END
! IDD_FILTER DIALOGEX 0, 0, 249, 252
! STYLE DS_SETFONT | WS_CHILD | WS_SYSMENU
EXSTYLE WS_EX_CONTEXTHELP
FONT 8, "Tahoma", 0, 0, 0x1
BEGIN
LTEXT "Filter the following folders as messages arrive",
! IDC_STATIC,8,9,168,11
CONTROL "Folder names...\nLine 2",IDC_FOLDER_WATCH,"Static",
SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | SS_SUNKEN |
! WS_GROUP,7,20,177,12
! PUSHBUTTON "Browse...",IDC_BROWSE_WATCH,192,19,50,14
! GROUPBOX "Certain Spam",IDC_STATIC,7,43,235,80
LTEXT "To be considered certain spam, a message must score at least",
! IDC_STATIC,13,52,212,10
CONTROL "Slider1",IDC_SLIDER_CERTAIN,"msctls_trackbar32",
! TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,13,62,165,22
! EDITTEXT IDC_EDIT_CERTAIN,184,63,51,14,ES_AUTOHSCROLL
! LTEXT "and these mesages should be:",IDC_STATIC,13,82,107,10
! COMBOBOX IDC_ACTION_CERTAIN,13,93,55,40,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
! LTEXT "to folder",IDC_STATIC,75,95,31,10
CONTROL "Folder names...",IDC_FOLDER_CERTAIN,"Static",
SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | SS_SUNKEN |
! WS_GROUP,120,93,59,14
! PUSHBUTTON "Browse",IDC_BROWSE_CERTAIN,184,93,50,14
! GROUPBOX "Possible Spam",IDC_STATIC,6,127,235,81
LTEXT "To be considered uncertain, a message must score at least",
! IDC_STATIC,12,138,212,10
CONTROL "Slider1",IDC_SLIDER_UNSURE,"msctls_trackbar32",
! TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,12,145,165,20
! EDITTEXT IDC_EDIT_UNSURE,183,151,54,14,ES_AUTOHSCROLL
! LTEXT "and these mesages should be:",IDC_STATIC,12,165,107,10
! COMBOBOX IDC_ACTION_UNSURE,12,176,55,40,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
! LTEXT "to folder",IDC_STATIC,74,179,31,10
CONTROL "(folder name)",IDC_FOLDER_UNSURE,"Static",
SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | SS_SUNKEN |
! WS_GROUP,119,176,59,14
! PUSHBUTTON "&Browse",IDC_BROWSE_UNSURE,183,176,50,14
! GROUPBOX "Good messages",IDC_STATIC,9,212,235,25
! LTEXT "All other messages are considered good, and are not filtered",
! IDC_STATIC,16,223,212,10
CONTROL "Mark spam as read",IDC_MARK_SPAM_AS_READ,"Button",
! BS_AUTOCHECKBOX | WS_TABSTOP,13,110,81,10
CONTROL "Mark posiible spam as read",IDC_MARK_UNSURE_AS_READ,
! "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,196,101,10
END
--- 295,342 ----
END
! IDD_FILTER DIALOGEX 0, 0, 249, 195
! STYLE DS_SETFONT | DS_MODALFRAME | WS_CHILD | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_CONTEXTHELP
+ CAPTION "Filter"
FONT 8, "Tahoma", 0, 0, 0x1
BEGIN
LTEXT "Filter the following folders as messages arrive",
! IDC_STATIC,8,0,168,11
CONTROL "Folder names...\nLine 2",IDC_FOLDER_WATCH,"Static",
SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | SS_SUNKEN |
! WS_GROUP,7,11,177,12
! PUSHBUTTON "Browse...",IDC_BROWSE_WATCH,192,10,50,14
! GROUPBOX "Certain Spam",IDC_STATIC,7,26,235,80
LTEXT "To be considered certain spam, a message must score at least",
! IDC_STATIC,13,35,212,10
CONTROL "Slider1",IDC_SLIDER_CERTAIN,"msctls_trackbar32",
! TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,13,45,165,22
! EDITTEXT IDC_EDIT_CERTAIN,184,46,51,14,ES_AUTOHSCROLL
! LTEXT "and these mesages should be:",IDC_STATIC,13,65,107,10
! COMBOBOX IDC_ACTION_CERTAIN,13,76,55,40,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
! LTEXT "to folder",IDC_STATIC,75,78,31,10
CONTROL "Folder names...",IDC_FOLDER_CERTAIN,"Static",
SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | SS_SUNKEN |
! WS_GROUP,120,76,59,14
! PUSHBUTTON "Browse",IDC_BROWSE_CERTAIN,184,76,50,14
! GROUPBOX "Possible Spam",IDC_STATIC,6,110,235,81
LTEXT "To be considered uncertain, a message must score at least",
! IDC_STATIC,12,121,212,10
CONTROL "Slider1",IDC_SLIDER_UNSURE,"msctls_trackbar32",
! TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,12,128,165,20
! EDITTEXT IDC_EDIT_UNSURE,183,134,54,14,ES_AUTOHSCROLL
! LTEXT "and these mesages should be:",IDC_STATIC,12,148,107,10
! COMBOBOX IDC_ACTION_UNSURE,12,159,55,40,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
! LTEXT "to folder",IDC_STATIC,74,162,31,10
CONTROL "(folder name)",IDC_FOLDER_UNSURE,"Static",
SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | SS_SUNKEN |
! WS_GROUP,119,159,59,14
! PUSHBUTTON "&Browse",IDC_BROWSE_UNSURE,183,159,50,14
CONTROL "Mark spam as read",IDC_MARK_SPAM_AS_READ,"Button",
! BS_AUTOCHECKBOX | WS_TABSTOP,13,93,81,10
CONTROL "Mark posiible spam as read",IDC_MARK_UNSURE_AS_READ,
! "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,179,101,10
END
***************
*** 370,379 ****
BEGIN
RIGHTMARGIN, 248
! BOTTOMMARGIN, 167
END
IDD_FILTER, DIALOG
BEGIN
! BOTTOMMARGIN, 244
HORZGUIDE, 127
END
--- 372,381 ----
BEGIN
RIGHTMARGIN, 248
! BOTTOMMARGIN, 182
END
IDD_FILTER, DIALOG
BEGIN
! BOTTOMMARGIN, 192
HORZGUIDE, 127
END
More information about the Spambayes-checkins
mailing list