Revision: 7462
http://mahogany.svn.sourceforge.net/mahogany/?rev=7462&view=rev
Author: vadz
Date: 2008-05-03 14:21:53 -0700 (Sat, 03 May 2008)
Log Message:
-----------
renamed WXMENU_MSG_XXX items in "View" menu to WXMENU_VIEW_XXX; moved filters
submenu together with the viewers one
Modified Paths:
--------------
trunk/M/include/gui/wxMenuDefs.h
trunk/M/src/classes/MessageView.cpp
trunk/M/src/gui/wxFolderView.cpp
trunk/M/src/gui/wxMenuDefs.cpp
trunk/M/src/gui/wxMessageView.cpp
trunk/M/src/gui/wxMsgCmdProc.cpp
Modified: trunk/M/include/gui/wxMenuDefs.h
===================================================================
--- trunk/M/include/gui/wxMenuDefs.h 2008-05-03 19:01:13 UTC (rev 7461)
+++ trunk/M/include/gui/wxMenuDefs.h 2008-05-03 21:21:53 UTC (rev 7462)
@@ -260,21 +260,18 @@
// this submenu is filled dynamically and the ids of its items start at
// WXMENU_VIEW_VIEWERS_BEGIN defined below
WXMENU_VIEW_VIEWERS_SUBMENU_END,
- WXMENU_VIEW_SEP1,
- // for backwards compatibility the commands below have MSG (as they were in
- // the "Message" menu earlier), even though if they're in "View" menu now
- WXMENU_MSG_TOGGLEHEADERS,
- WXMENU_MSG_SHOWRAWTEXT,
-#ifdef EXPERIMENTAL_show_uid
- WXMENU_MSG_SHOWUID,
-#endif // EXPERIMENTAL_show_uid
- WXMENU_MSG_SHOWMIME,
- WXMENU_VIEW_SEP2,
WXMENU_VIEW_FILTERS_SUBMENU_BEGIN,
// this submenu is filled dynamically and the ids of its items start at
// WXMENU_VIEW_FILTERS_BEGIN defined below
WXMENU_VIEW_FILTERS_SUBMENU_END,
- WXMENU_VIEW_END = WXMENU_VIEW_FILTERS_SUBMENU_END,
+ WXMENU_VIEW_SEP1,
+ WXMENU_VIEW_HEADERS,
+ WXMENU_VIEW_SHOWRAWTEXT,
+#ifdef EXPERIMENTAL_show_uid
+ WXMENU_VIEW_SHOWUID,
+#endif // EXPERIMENTAL_show_uid
+ WXMENU_VIEW_SHOWMIME,
+ WXMENU_VIEW_END = WXMENU_VIEW_SHOWMIME,
WXMENU_COMPOSE_BEGIN = WXMENU_VIEW_END,
WXMENU_COMPOSE_INSERTFILE,
Modified: trunk/M/src/classes/MessageView.cpp
===================================================================
--- trunk/M/src/classes/MessageView.cpp 2008-05-03 19:01:13 UTC (rev 7461)
+++ trunk/M/src/classes/MessageView.cpp 2008-05-03 21:21:53 UTC (rev 7462)
@@ -3606,7 +3606,7 @@
mApplication->Help(MH_MESSAGE_VIEW, GetParentFrame());
break;
- case WXMENU_MSG_TOGGLEHEADERS:
+ case WXMENU_VIEW_HEADERS:
if ( m_uid != UID_ILLEGAL )
{
m_ProfileValues.showHeaders = !m_ProfileValues.showHeaders;
Modified: trunk/M/src/gui/wxFolderView.cpp
===================================================================
--- trunk/M/src/gui/wxFolderView.cpp 2008-05-03 19:01:13 UTC (rev 7461)
+++ trunk/M/src/gui/wxFolderView.cpp 2008-05-03 21:21:53 UTC (rev 7462)
@@ -1753,7 +1753,7 @@
WXMENU_MSG_SPAM_MARK,
WXMENU_MSG_SPAM_UNMARK,
WXMENU_MSG_SEP3,
- WXMENU_MSG_SHOWRAWTEXT,
+ WXMENU_VIEW_SHOWRAWTEXT,
};
m_menu = new wxMenu;
@@ -4559,7 +4559,7 @@
break;
case 'H': // headers
- cmd = WXMENU_MSG_TOGGLEHEADERS;
+ cmd = WXMENU_VIEW_HEADERS;
break;
case '*':
Modified: trunk/M/src/gui/wxMenuDefs.cpp
===================================================================
--- trunk/M/src/gui/wxMenuDefs.cpp 2008-05-03 19:01:13 UTC (rev 7461)
+++ trunk/M/src/gui/wxMenuDefs.cpp 2008-05-03 21:21:53 UTC (rev 7462)
@@ -451,16 +451,15 @@
// ABCDEFGIJKNOPQRSTUVXYZ
{ WXMENU_SUBMENU, gettext_noop("&Viewer to use"), "", wxITEM_NORMAL },
{ WXMENU_SUBMENU, "", "", wxITEM_NORMAL },
+ { WXMENU_SUBMENU, gettext_noop("&Filters"), "", wxITEM_NORMAL },
+ { WXMENU_SUBMENU, "", "", wxITEM_NORMAL },
{ WXMENU_SEPARATOR, "", "" ,
wxITEM_NORMAL },
- { WXMENU_MSG_TOGGLEHEADERS, gettext_noop("Show &headers"),
gettext_noop("Toggle display of message header") , wxITEM_CHECK },
- { WXMENU_MSG_SHOWRAWTEXT, gettext_noop("Show ra&w message\tCtrl-Z"),
gettext_noop("Show the raw message text") , wxITEM_NORMAL },
+ { WXMENU_VIEW_HEADERS, gettext_noop("Show &headers"), gettext_noop("Toggle
display of message header") , wxITEM_CHECK },
+ { WXMENU_VIEW_SHOWRAWTEXT, gettext_noop("Show ra&w message\tCtrl-Z"),
gettext_noop("Show the raw message text") , wxITEM_NORMAL },
#ifdef EXPERIMENTAL_show_uid
- { WXMENU_MSG_SHOWUID, "Show message UID&L", "", wxITEM_NORMAL },
+ { WXMENU_VIEW_SHOWUID, "Show message UID&L", "", wxITEM_NORMAL },
#endif // EXPERIMENTAL_show_uid
- { WXMENU_MSG_SHOWMIME, gettext_noop("Show &MIME
structure...\tShift-Ctrl-Z"), gettext_noop("Show the MIME structure of the
message") , wxITEM_NORMAL },
- { WXMENU_SEPARATOR, "", "" ,
wxITEM_NORMAL },
- { WXMENU_SUBMENU, gettext_noop("&Filters"), "", wxITEM_NORMAL },
- { WXMENU_SUBMENU, "", "", wxITEM_NORMAL },
+ { WXMENU_VIEW_SHOWMIME, gettext_noop("Show &MIME
structure...\tShift-Ctrl-Z"), gettext_noop("Show the MIME structure of the
message") , wxITEM_NORMAL },
// compose
Modified: trunk/M/src/gui/wxMessageView.cpp
===================================================================
--- trunk/M/src/gui/wxMessageView.cpp 2008-05-03 19:01:13 UTC (rev 7461)
+++ trunk/M/src/gui/wxMessageView.cpp 2008-05-03 21:21:53 UTC (rev 7462)
@@ -415,7 +415,7 @@
wxMenuBar *mbar = frame->GetMenuBar();
CHECK_RET( mbar, _T("message view frame without menu bar?") );
- mbar->Check(WXMENU_MSG_TOGGLEHEADERS, GetProfileValues().showHeaders);
+ mbar->Check(WXMENU_VIEW_HEADERS, GetProfileValues().showHeaders);
}
// ----------------------------------------------------------------------------
@@ -474,12 +474,12 @@
WXMENU_MSG_UNDELETE,
WXMENU_MSG_SEP3,
WXMENU_MSG_SAVEADDRESSES,
- WXMENU_MSG_TOGGLEHEADERS,
- WXMENU_MSG_SHOWRAWTEXT,
+ WXMENU_VIEW_HEADERS,
+ WXMENU_VIEW_SHOWRAWTEXT,
#ifdef EXPERIMENTAL_show_uid
- WXMENU_MSG_SHOWUID,
+ WXMENU_VIEW_SHOWUID,
#endif // EXPERIMENTAL_show_uid
- WXMENU_MSG_SHOWMIME,
+ WXMENU_VIEW_SHOWMIME,
};
wxMenu *menu = new wxMenu(wxEmptyString, wxMENU_TEAROFF);
Modified: trunk/M/src/gui/wxMsgCmdProc.cpp
===================================================================
--- trunk/M/src/gui/wxMsgCmdProc.cpp 2008-05-03 19:01:13 UTC (rev 7461)
+++ trunk/M/src/gui/wxMsgCmdProc.cpp 2008-05-03 21:21:53 UTC (rev 7462)
@@ -715,17 +715,17 @@
ApplyFilters(messages);
break;
- case WXMENU_MSG_SHOWRAWTEXT:
+ case WXMENU_VIEW_SHOWRAWTEXT:
ShowRawText(messages[0]);
break;
#ifdef EXPERIMENTAL_show_uid
- case WXMENU_MSG_SHOWUID:
+ case WXMENU_VIEW_SHOWUID:
ShowUIDL(messages[0]);
break;
#endif // EXPERIMENTAL_show_uid
- case WXMENU_MSG_SHOWMIME:
+ case WXMENU_VIEW_SHOWMIME:
ShowMIMEDialog(messages[0]);
break;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
