Update of /cvsroot/mahogany/M/src/classes
In directory sc8-pr-cvs1:/tmp/cvs-serv28646/src/classes
Modified Files:
MessageView.cpp Mpers.cpp
Log Message:
added View|Viewers menu, removed (took inside #ifdef USE_VIEWER_BAR which is not
defined by default) the viewer bar
Index: MessageView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/MessageView.cpp,v
retrieving revision 1.128
retrieving revision 1.129
diff -b -u -2 -r1.128 -r1.129
--- MessageView.cpp 13 Sep 2003 23:04:55 -0000 1.128
+++ MessageView.cpp 14 Sep 2003 14:10:11 -0000 1.129
@@ -735,5 +735,5 @@
prio,
name,
- filterFactory->GetDescription(),
+ _(filterFactory->GetDescription()),
node
);
@@ -1086,5 +1086,5 @@
// update the parents menu as the show headers option might have changed
- UpdateShowHeadersInMenu();
+ OnShowHeadersChange();
m_viewer->UpdateOptions();
@@ -2790,7 +2790,4 @@
MessageView::DoMenuCommand(int id)
{
- if ( m_uid == UID_ILLEGAL )
- return false;
-
CHECK( GetFolder(), false, _T("no folder in message view?") );
@@ -2798,7 +2795,4 @@
CHECK( profile, false, _T("no profile in message view?") );
- UIdArray msgs;
- msgs.Add(m_uid);
-
switch ( id )
{
@@ -2808,4 +2802,5 @@
case WXMENU_EDIT_FIND:
+ if ( m_uid != UID_ILLEGAL )
{
String text;
@@ -2827,5 +2822,5 @@
case WXMENU_EDIT_FINDAGAIN:
- if ( !m_viewer->FindAgain() )
+ if ( m_uid != UID_ILLEGAL && !m_viewer->FindAgain() )
{
wxLogStatus(GetParentFrame(), _("No more matches"));
@@ -2838,8 +2833,11 @@
case WXMENU_MSG_TOGGLEHEADERS:
+ if ( m_uid != UID_ILLEGAL )
+ {
m_ProfileValues.showHeaders = !m_ProfileValues.showHeaders;
profile->writeEntry(MP_SHOWHEADERS, m_ProfileValues.showHeaders);
- UpdateShowHeadersInMenu();
+ OnShowHeadersChange();
Update();
+ }
break;
@@ -2849,4 +2847,12 @@
SetLanguage(id);
}
+ else if ( WXMENU_CONTAINS(VIEW_FILTERS, id) )
+ {
+ OnToggleViewFilter(id);
+ }
+ else if ( WXMENU_CONTAINS(VIEW_VIEWERS, id) )
+ {
+ OnSelectViewer(id);
+ }
else
{
@@ -2916,16 +2922,4 @@
m_encodingUser = (wxFontEncoding)(long)
READ_CONFIG(GetProfile(), MP_MSGVIEW_DEFAULT_ENCODING);
-}
-
-void
-MessageView::UpdateShowHeadersInMenu()
-{
- wxFrame *frame = GetParentFrame();
- CHECK_RET( frame, _T("message view without parent frame?") );
-
- wxMenuBar *mbar = frame->GetMenuBar();
- CHECK_RET( mbar, _T("message view frame without menu bar?") );
-
- mbar->Check(WXMENU_MSG_TOGGLEHEADERS, m_ProfileValues.showHeaders);
}
Index: Mpers.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/Mpers.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -b -u -2 -r1.14 -r1.15
--- Mpers.cpp 22 Aug 2003 13:03:50 -0000 1.14
+++ Mpers.cpp 14 Sep 2003 14:10:12 -0000 1.15
@@ -148,5 +148,7 @@
{ "EditOnOpenFail", gettext_noop("propose to edit folder settings if
opening it failed") },
{ "ExplainColClick", gettext_noop("give explanation when clicking on a
column in the folder view") },
+#ifdef USE_VIEWER_BAR
{ "ViewerBarTip", gettext_noop("give tip about reenabling the viewer
bar when closing it") },
+#endif // USE_VIEWER_BAR
{ "EmptyTrashOnExit", gettext_noop("purge trash folder on exit") },
{ "SendOffline", gettext_noop("send mail when the system is offline")
},
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
