Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11365/src/gui
Modified Files:
wxMessageView.cpp wxOptionsDlg.cpp
Log Message:
automatically select the viewer best fit for the shown message
Index: wxMessageView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMessageView.cpp,v
retrieving revision 1.302
retrieving revision 1.303
diff -b -u -2 -r1.302 -r1.303
--- wxMessageView.cpp 8 Sep 2004 22:49:06 -0000 1.302
+++ wxMessageView.cpp 25 Jun 2005 15:30:30 -0000 1.303
@@ -243,5 +243,6 @@
void
wxMessageView::OnViewerChange(const MessageViewer *viewerOld,
- const MessageViewer *viewerNew)
+ const MessageViewer *viewerNew,
+ const String& nameViewer)
{
if ( m_FolderView )
@@ -258,5 +259,4 @@
// we also need to update the viewers menu to indicate the currently
// selected one (if we do have a viewer, i.e. are not using the dummy one)
- const String& nameViewer = GetProfileValues().msgViewer;
if ( viewerNew && !nameViewer.empty() )
{
Index: wxOptionsDlg.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxOptionsDlg.cpp,v
retrieving revision 1.420
retrieving revision 1.421
diff -b -u -2 -r1.420 -r1.421
--- wxOptionsDlg.cpp 15 May 2005 21:18:24 -0000 1.420
+++ wxOptionsDlg.cpp 25 Jun 2005 15:30:47 -0000 1.421
@@ -348,4 +348,9 @@
ConfigField_MsgViewerBar,
#endif // USE_VIEWER_BAR
+ ConfigField_MessageViewAutoViewer,
+ ConfigField_MessageViewPreferHTML,
+ ConfigField_MessageViewAllowHTML,
+ ConfigField_MessageViewAllowImages,
+ ConfigField_MessageViewSpacer,
#ifdef USE_FONT_DESC
ConfigField_MessageViewFont,
@@ -1375,8 +1380,7 @@
// message view
- // FIXME: this text is stupid but we should have _some_ explanation, right?
{ gettext_noop("Mahogany has several standard message viewers and more\n"
- "can be plugged in. The default one is the safest choice\n"
- "but you may try the others for an alternative look."),
+ "can be plugged in. The viewer here will be used by
default\n"
+ "but may be automatically adjusted for message contents."),
Field_Message |
Field_Advanced, -1 },
@@ -1386,4 +1390,9 @@
{ gettext_noop("Show viewer &bar"), Field_Bool, -1 },
#endif // USE_VIEWER_BAR
+ { gettext_noop("A&utomatically adjust to contents"), Field_Bool, -1 },
+ { gettext_noop("Prefer &HTML to plain text"), Field_Bool,
ConfigField_MessageViewAutoViewer },
+ { gettext_noop("Sho&w HTML if no text"), Field_Bool,
ConfigField_MessageViewAutoViewer },
+ { gettext_noop("Ensure &images are shown"), Field_Bool,
ConfigField_MessageViewAutoViewer },
+ { _T(""), Field_Message, -1},
#ifdef USE_FONT_DESC
@@ -1980,4 +1989,9 @@
CONFIG_ENTRY(MP_MSGVIEW_SHOWBAR),
#endif // USE_VIEWER_BAR
+ CONFIG_ENTRY(MP_MSGVIEW_AUTO_VIEWER),
+ CONFIG_ENTRY(MP_MSGVIEW_PREFER_HTML),
+ CONFIG_ENTRY(MP_MSGVIEW_ALLOW_HTML),
+ CONFIG_ENTRY(MP_MSGVIEW_ALLOW_IMAGES),
+ CONFIG_NONE(),
#ifdef USE_FONT_DESC
CONFIG_ENTRY(MP_MVIEW_FONT_DESC),
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
