Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25802/src/gui
Modified Files:
wxMenuDefs.cpp wxMainFrame.cpp
Log Message:
added spam menu commands; moved select submenu from message to folder menu
Index: wxMenuDefs.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMenuDefs.cpp,v
retrieving revision 1.216
retrieving revision 1.217
diff -b -u -2 -r1.216 -r1.217
--- wxMenuDefs.cpp 22 Apr 2004 12:12:48 -0000 1.216
+++ wxMenuDefs.cpp 4 Jul 2004 23:46:58 -0000 1.217
@@ -275,5 +275,5 @@
// folder
- // available accels: DGHJKQVWXYZ
+ // available accels: DGJKQVWXYZ
{ WXMENU_FOLDER_OPEN, gettext_noop("&Open...\tCtrl-O"), gettext_noop("Open
an existing message folder") , wxITEM_NORMAL },
{ WXMENU_FOLDER_OPEN_RO, gettext_noop("Open read-onl&y..."), gettext_noop("Open
a folder in read only mode") , wxITEM_NORMAL },
@@ -294,5 +294,11 @@
{ WXMENU_FOLDER_BROWSESUB, gettext_noop("&Browse..."), gettext_noop("Show
subfolders of the current folder") , wxITEM_NORMAL },
{ WXMENU_SEPARATOR, wxEmptyString, wxEmptyString
, wxITEM_NORMAL },
- { WXMENU_FOLDER_SEARCH, gettext_noop("&Search..."), gettext_noop("Search for
the messages in folder(s)") , wxITEM_NORMAL },
+ { WXMENU_SUBMENU, gettext_noop("&Select"), wxEmptyString, wxITEM_NORMAL },
+ { WXMENU_MSG_SELECTALL, gettext_noop("Select &all\tCtrl-A"),
gettext_noop("Select all messages") , wxITEM_NORMAL },
+ { WXMENU_MSG_SELECTUNREAD, gettext_noop("Select all &unread\tShift-Ctrl-A"),
gettext_noop("Select all unread messages") , wxITEM_NORMAL },
+ { WXMENU_MSG_SELECTFLAGGED, gettext_noop("Select all &flagged"),
gettext_noop("Select all flagged messages") , wxITEM_NORMAL },
+ { WXMENU_MSG_DESELECTALL,gettext_noop("&Deselect all\tCtrl-B"),
gettext_noop("Deselect all messages") , wxITEM_NORMAL },
+ { WXMENU_SUBMENU, wxEmptyString, wxEmptyString, wxITEM_NORMAL },
+ { WXMENU_FOLDER_SEARCH, gettext_noop("Searc&h..."), gettext_noop("Search for
the messages in folder(s)") , wxITEM_NORMAL },
{ WXMENU_SEPARATOR, wxEmptyString, wxEmptyString
, wxITEM_NORMAL },
{ WXMENU_FOLDER_FILTERS, gettext_noop("&Filters..."), gettext_noop("Edit the
filters to use for current folder") , wxITEM_NORMAL },
@@ -428,9 +434,8 @@
{ WXMENU_MSG_MARK_UNREAD, gettext_noop("Mar&k unread\tShift-Ctrl-U"),
gettext_noop("Mark message as unread"), wxITEM_NORMAL },
{ WXMENU_SEPARATOR, wxEmptyString, wxEmptyString
, wxITEM_NORMAL },
- { WXMENU_SUBMENU, gettext_noop("&Select"), wxEmptyString, wxITEM_NORMAL },
- { WXMENU_MSG_SELECTALL, gettext_noop("Select &all\tCtrl-A"),
gettext_noop("Select all messages") , wxITEM_NORMAL },
- { WXMENU_MSG_SELECTUNREAD, gettext_noop("Select all &unread\tShift-Ctrl-A"),
gettext_noop("Select all unread messages") , wxITEM_NORMAL },
- { WXMENU_MSG_SELECTFLAGGED, gettext_noop("Select all &flagged"),
gettext_noop("Select all flagged messages") , wxITEM_NORMAL },
- { WXMENU_MSG_DESELECTALL,gettext_noop("&Deselect all\tCtrl-B"),
gettext_noop("Deselect all messages") , wxITEM_NORMAL },
+ { WXMENU_SUBMENU, gettext_noop("&Spam"), wxEmptyString, wxITEM_NORMAL },
+ { WXMENU_MSG_SPAM_MARK, gettext_noop("Dispose as &spam"),
gettext_noop("Classify the message as spam and treat it accordingly"), wxITEM_NORMAL },
+ { 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("&Check message..."), gettext_noop("Check
if this message is a spam"), wxITEM_NORMAL },
{ WXMENU_SUBMENU, wxEmptyString, wxEmptyString, wxITEM_NORMAL },
{ WXMENU_SEPARATOR, wxEmptyString, wxEmptyString
, wxITEM_NORMAL },
Index: wxMainFrame.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMainFrame.cpp,v
retrieving revision 1.182
retrieving revision 1.183
diff -b -u -2 -r1.182 -r1.183
--- wxMainFrame.cpp 8 Apr 2004 13:26:15 -0000 1.182
+++ wxMainFrame.cpp 4 Jul 2004 23:46:58 -0000 1.183
@@ -842,5 +842,5 @@
const int id = event.GetId();
- if ( WXMENU_CONTAINS(FOLDER, id) )
+ if ( WXMENU_CONTAINS(FOLDER, id) && !WXSUBMENU_CONTAINS(MSG_SELECT, id) )
{
switch ( id )
@@ -998,5 +998,6 @@
}
else if ( m_FolderView &&
- ( WXMENU_CONTAINS(MSG, id) ||
+ ( WXSUBMENU_CONTAINS(MSG_SELECT, id) ||
+ WXMENU_CONTAINS(MSG, id) ||
WXMENU_CONTAINS(LAYOUT, id) ||
( WXMENU_CONTAINS(LANG, id) && (id != WXMENU_LANG_SET_DEFAULT) ) ||
-------------------------------------------------------
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
