Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15439/src/gui
Modified Files:
wxMenuDefs.cpp wxMFrame.cpp wxMsgCmdProc.cpp
Log Message:
moved spam config command from Message|Spam to Edit menu
Index: wxMenuDefs.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMenuDefs.cpp,v
retrieving revision 1.220
retrieving revision 1.221
diff -b -u -2 -r1.220 -r1.221
--- wxMenuDefs.cpp 11 Jul 2004 19:04:35 -0000 1.220
+++ wxMenuDefs.cpp 11 Jul 2004 22:51:49 -0000 1.221
@@ -308,6 +308,6 @@
// the available accelerators for this menu:
- // BHJKNOVWYZ
- { WXMENU_EDIT_CUT, gettext_noop("C&ut\tCtrl-X"), gettext_noop("Cut selection and
copy it to clipboard") , wxITEM_NORMAL },
+ // BHJNVUWYZ
+ { WXMENU_EDIT_CUT, gettext_noop("Cu&t\tCtrl-X"), gettext_noop("Cut selection and
copy it to clipboard") , wxITEM_NORMAL },
{ WXMENU_EDIT_COPY, gettext_noop("&Copy\tCtrl-C"), gettext_noop("Copy selection to
clipboard") , wxITEM_NORMAL },
{ WXMENU_EDIT_PASTE,gettext_noop("&Paste\tCtrl-V"), gettext_noop("Paste from
clipboard") , wxITEM_NORMAL },
@@ -318,15 +318,15 @@
{ WXMENU_EDIT_FINDAGAIN, gettext_noop("Find a&gain\tCtrl-F3"), gettext_noop("Find
the same text again") , wxITEM_NORMAL },
{ WXMENU_SEPARATOR, wxEmptyString, wxEmptyString
, wxITEM_NORMAL },
- { WXMENU_EDIT_ADB, gettext_noop("&Address books...\tCtrl-D"),
gettext_noop("Edit the address book(s)") , wxITEM_NORMAL },
+ { WXMENU_EDIT_ADB, gettext_noop("Address boo&ks...\tCtrl-D"),
gettext_noop("Edit the address book(s)") , wxITEM_NORMAL },
{ WXMENU_EDIT_PREF, gettext_noop("Pr&eferences...\tCtrl-Shift-E"),
gettext_noop("Change options") , wxITEM_NORMAL },
- { WXMENU_EDIT_MODULES, gettext_noop("&Modules..."), gettext_noop("Choose which
extension modules to use") , wxITEM_NORMAL },
+ { WXMENU_EDIT_MODULES, gettext_noop("M&odules..."), gettext_noop("Choose which
extension modules to use") , wxITEM_NORMAL },
{ WXMENU_EDIT_FILTERS, gettext_noop("Filter &rules..."), gettext_noop("Edit rules
for message filtering") , wxITEM_NORMAL },
- { WXMENU_EDIT_TEMPLATES,gettext_noop("&Templates..."), gettext_noop("Edit
templates used for message composition") , wxITEM_NORMAL },
+ { WXMENU_EDIT_TEMPLATES,gettext_noop("Te&mplates..."), gettext_noop("Edit
templates used for message composition") , wxITEM_NORMAL },
+ { WXMENU_EDIT_SPAM_CONFIG, gettext_noop("Sp&am filters..."), gettext_noop("Set the
options for spam detection"), wxITEM_NORMAL },
{ WXMENU_SEPARATOR, wxEmptyString, wxEmptyString
, wxITEM_NORMAL },
{ WXMENU_EDIT_SAVE_PREF,gettext_noop("&Save preferences"), gettext_noop("Save
options") , wxITEM_NORMAL },
{ WXMENU_EDIT_EXPORT_PREF,gettext_noop("E&xport preferences..."),
gettext_noop("Export options") , wxITEM_NORMAL },
{ WXMENU_EDIT_IMPORT_PREF,gettext_noop("&Import preferences..."),
gettext_noop("Import options") , wxITEM_NORMAL },
- { WXMENU_EDIT_RESTORE_PREF,
- gettext_noop("Restore &defaults..."),
gettext_noop("Restore default options values") , wxITEM_NORMAL },
+ { WXMENU_EDIT_RESTORE_PREF, gettext_noop("Restore &defaults..."),
gettext_noop("Restore default options values") , wxITEM_NORMAL },
// msg
@@ -438,6 +438,4 @@
{ WXMENU_MSG_SPAM_UNMARK, gettext_noop("Mark as &ham"), gettext_noop("Classify
the message as non-spam"), wxITEM_NORMAL },
{ WXMENU_MSG_SPAM_CHECK, gettext_noop("Chec&k message...\tShift-Ctrl-K"),
gettext_noop("Check if this message is spam"), wxITEM_NORMAL },
- { WXMENU_SEPARATOR, wxEmptyString, wxEmptyString
, wxITEM_NORMAL },
- { WXMENU_MSG_SPAM_CONFIG, gettext_noop("&Configure spam filters..."),
gettext_noop("Set the options for spam detection"), wxITEM_NORMAL },
{ WXMENU_SUBMENU, wxEmptyString, wxEmptyString, wxITEM_NORMAL },
{ WXMENU_SEPARATOR, wxEmptyString, wxEmptyString
, wxITEM_NORMAL },
Index: wxMFrame.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMFrame.cpp,v
retrieving revision 1.170
retrieving revision 1.171
diff -b -u -2 -r1.170 -r1.171
--- wxMFrame.cpp 20 Apr 2004 13:09:54 -0000 1.170
+++ wxMFrame.cpp 11 Jul 2004 22:51:50 -0000 1.171
@@ -51,4 +51,5 @@
#include "Composer.h"
#include "MImport.h"
+#include "SpamFilter.h"
#include "gui/wxFiltersDialog.h" // for ConfigureAllFilters()
@@ -645,4 +646,8 @@
break;
+ case WXMENU_EDIT_SPAM_CONFIG:
+ SpamFilter::Configure(this);
+ break;
+
case WXMENU_EDIT_RESTORE_PREF:
(void)ShowRestoreDefaultsDialog(mApplication->GetProfile(), this);
Index: wxMsgCmdProc.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMsgCmdProc.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -b -u -2 -r1.59 -r1.60
--- wxMsgCmdProc.cpp 11 Jul 2004 19:04:35 -0000 1.59
+++ wxMsgCmdProc.cpp 11 Jul 2004 22:51:50 -0000 1.60
@@ -897,8 +897,4 @@
break;
- case WXMENU_MSG_SPAM_CONFIG:
- SpamFilter::Configure(GetFrame());
- break;
-
default:
// try passing it to message view
@@ -1049,7 +1045,6 @@
String str(_("The message with subject \"%s\" from \"%s\"\n"));
- wxArrayString params;
String result;
- if ( SpamFilter::CheckIfSpam(*msg, params, &result) )
+ if ( SpamFilter::CheckIfSpam(*msg, _T(""), &result) )
{
wxLogWarning(str + _("seems to be a spam (%s)."),
-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 -
digital self defense, top technical experts, no vendor pitches,
unmatched networking opportunities. Visit www.blackhat.com
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
