Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25116/src/gui

Modified Files:
        wxMessageView.cpp 
Log Message:
change the viewer for the current message only when the user selects it from 
the viewer menu; show accelerators in this menu

Index: wxMessageView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMessageView.cpp,v
retrieving revision 1.303
retrieving revision 1.304
diff -b -u -2 -r1.303 -r1.304
--- wxMessageView.cpp   25 Jun 2005 15:30:30 -0000      1.303
+++ wxMessageView.cpp   16 Jul 2005 19:46:43 -0000      1.304
@@ -318,5 +318,9 @@
       const int id = WXMENU_VIEW_VIEWERS_BEGIN + 1 + nViewer;
 
-      menuView->AppendRadioItem(id, descViewers[nViewer]);
+      // add an accelerator for the viewer
+      String desc = descViewers[nViewer];
+      desc << _T("\tShift-Ctrl-") << nViewer + 1;
+
+      menuView->AppendRadioItem(id, desc);
 
       if ( m_namesViewers[nViewer] == nameCurViewer )
@@ -350,11 +354,14 @@
    while ( cont )
    {
+      // remember this filter
       m_namesFilters.Add(name);
       m_statesFilters.Add(enabled);
 
+      // append it to the menu
       menuFlt->AppendCheckItem(id, desc);
       if ( enabled )
          menuFlt->Check(id, true);
 
+      // pass to the next one
       id++;
 
@@ -395,15 +402,5 @@
               _T("invalid viewer selected from the menu?") );
 
-   // this one must not be DecRef()'d
-   Profile * const profile = GetProfile();
-   CHECK_RET( profile, _T("no Profile in wxMessageView?") );
-
-   profile->writeEntry(MP_MSGVIEW_VIEWER, m_namesViewers[n]);
-
-   MEventManager::Send(new MEventOptionsChangeData
-                           (
-                            profile,
-                            MEventOptionsChangeData::Ok
-                           ));
+   ChangeViewer(m_namesViewers[n]);
 }
 



-------------------------------------------------------
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

Reply via email to