Update of /cvsroot/mahogany/M/include
In directory sc8-pr-cvs1:/tmp/cvs-serv28646/include
Modified Files:
MessageView.h MpersIds.h
Log Message:
added View|Viewers menu, removed (took inside #ifdef USE_VIEWER_BAR which is not
defined by default) the viewer bar
Index: MessageView.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MessageView.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -b -u -2 -r1.46 -r1.47
--- MessageView.h 13 Sep 2003 23:04:54 -0000 1.46
+++ MessageView.h 14 Sep 2003 14:10:11 -0000 1.47
@@ -227,6 +227,19 @@
virtual void CreateViewMenu();
- /// called when view filter state is toggled
- virtual void OnToggleViewFilter(int id, bool checked) = 0;
+ /**
+ Called when view filter state is toggled.
+
+ @param id the corresponding menu id, starting from
+ WXMENU_VIEW_FILTERS_BEGIN + 1
+ */
+ virtual void OnToggleViewFilter(int id) = 0;
+
+ /**
+ Called to change the viewer to be used.
+
+ @param id the corresponding menu id, starting from
+ WXMENU_VIEW_VIEWERS_BEGIN + 1
+ */
+ virtual void OnSelectViewer(int id) = 0;
protected:
@@ -240,4 +253,109 @@
//@}
+ /** @name Options
+
+ Message view uses the options from the profile of the folder it
+ currently shows.
+ */
+ //@{
+
+ /// All values read from the profile
+ struct AllProfileValues
+ {
+ /** @name Appearance parameters
+ */
+ //@{
+ /// message viewer (LayoutViewer, TextViewer, ...)
+ String msgViewer;
+
+ /// Background and foreground colours, colours for URLs and headers
+ wxColour BgCol,
+ FgCol,
+ AttCol, // attachment colour
+ HeaderNameCol,
+ HeaderValueCol;
+
+ /// the native font description
+ String fontDesc;
+
+ /// font family (wxROMAN/wxSWISS/wxTELETYPE/...) used if font is empty
+ int fontFamily;
+
+ /// font size (used only if font is empty)
+ int fontSize;
+ //@}
+
+ /// @name MIME options
+ //@{
+
+ /// show all headers?
+ bool showHeaders:1;
+
+ /// inline MESSAGE/RFC822 attachments?
+ bool inlineRFC822:1;
+
+ /// inline TEXT/PLAIN attachments?
+ bool inlinePlainText:1;
+
+ /// max size of inline graphics: 0 if never inline at all, -1 if no limit
+ long inlineGFX;
+
+ /// follow the links to external images in the HTML messages?
+ bool showExtImages:1;
+
+ /// Show XFaces?
+ bool showFaces:1;
+
+ //@}
+
+ /// @name URL viewing
+ //@{
+
+ /// highlight the URLs in the message?
+ bool highlightURLs;
+
+ /// the colour to use for URL highlighting (if highlightURLs is true)
+ wxColour UrlCol;
+
+ //@}
+
+ /// @name Address autocollection
+ //@{
+
+ /// Autocollect email addresses?
+ int autocollect;
+
+ /// Autocollect only email sender's address?
+ int autocollectSenderOnly;
+
+ /// Autocollect only email addresses with complete name?
+ int autocollectNamed;
+
+ /// Name of the ADB book to use for autocollect.
+ String autocollectBookName;
+
+ //@}
+
+ AllProfileValues();
+
+ bool operator==(const AllProfileValues& other) const;
+ bool operator!=(const AllProfileValues& other) const
+ { return !(*this == other); }
+
+ /// get the font corresponding to the current options
+ wxFont GetFont(wxFontEncoding enc = wxFONTENCODING_DEFAULT) const;
+ } m_ProfileValues;
+
+ /// read all our options from the current profile (returned by GetProfile())
+ void ReadAllSettings(AllProfileValues *settings);
+
+ /// reread the entries from our profile
+ void UpdateProfileValues();
+
+ /// get the profile values (mainly for MessageViewer)
+ const AllProfileValues& GetProfileValues() const { return m_ProfileValues; }
+
+ //@}
+
/** @name GUI stuff
@@ -247,7 +365,4 @@
//@{
- /// update the "show headers" menu item from m_ProfileValues.showHeaders
- void UpdateShowHeadersInMenu();
-
/// show this message in the viewer
virtual void DoShowMessage(Message *msg);
@@ -257,4 +372,7 @@
const MessageViewer *viewerNew) = 0;
+ /// update GUI to indicate the new "show headers" options state
+ virtual void OnShowHeadersChange() = 0;
+
//@}
@@ -469,109 +587,4 @@
/// printing helper, called by Print() and PrintPreview()
void PrepareForPrinting();
-
- /** @name Options
-
- Message view uses the options from the profile of the folder it
- currently shows.
- */
- //@{
-
- /// All values read from the profile
- struct AllProfileValues
- {
- /** @name Appearance parameters
- */
- //@{
- /// message viewer (LayoutViewer, TextViewer, ...)
- String msgViewer;
-
- /// Background and foreground colours, colours for URLs and headers
- wxColour BgCol,
- FgCol,
- AttCol, // attachment colour
- HeaderNameCol,
- HeaderValueCol;
-
- /// the native font description
- String fontDesc;
-
- /// font family (wxROMAN/wxSWISS/wxTELETYPE/...) used if font is empty
- int fontFamily;
-
- /// font size (used only if font is empty)
- int fontSize;
- //@}
-
- /// @name MIME options
- //@{
-
- /// show all headers?
- bool showHeaders:1;
-
- /// inline MESSAGE/RFC822 attachments?
- bool inlineRFC822:1;
-
- /// inline TEXT/PLAIN attachments?
- bool inlinePlainText:1;
-
- /// max size of inline graphics: 0 if never inline at all, -1 if no limit
- long inlineGFX;
-
- /// follow the links to external images in the HTML messages?
- bool showExtImages:1;
-
- /// Show XFaces?
- bool showFaces:1;
-
- //@}
-
- /// @name URL viewing
- //@{
-
- /// highlight the URLs in the message?
- bool highlightURLs;
-
- /// the colour to use for URL highlighting (if highlightURLs is true)
- wxColour UrlCol;
-
- //@}
-
- /// @name Address autocollection
- //@{
-
- /// Autocollect email addresses?
- int autocollect;
-
- /// Autocollect only email sender's address?
- int autocollectSenderOnly;
-
- /// Autocollect only email addresses with complete name?
- int autocollectNamed;
-
- /// Name of the ADB book to use for autocollect.
- String autocollectBookName;
-
- //@}
-
- AllProfileValues();
-
- bool operator==(const AllProfileValues& other) const;
- bool operator!=(const AllProfileValues& other) const
- { return !(*this == other); }
-
- /// get the font corresponding to the current options
- wxFont GetFont(wxFontEncoding enc = wxFONTENCODING_DEFAULT) const;
- } m_ProfileValues;
-
- /// read all our options from the current profile (returned by GetProfile())
- void ReadAllSettings(AllProfileValues *settings);
-
- /// reread the entries from our profile
- void UpdateProfileValues();
-
- /// get the profile values - mainly for MessageViewer
- const AllProfileValues& GetProfileValues() const { return m_ProfileValues; }
-
- //@}
/** @name Viewer related stuff
Index: MpersIds.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MpersIds.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -b -u -2 -r1.12 -r1.13
--- MpersIds.h 22 Aug 2003 13:03:50 -0000 1.12
+++ MpersIds.h 14 Sep 2003 14:10:11 -0000 1.13
@@ -94,5 +94,7 @@
DECL_OR_DEF(EDIT_FOLDER_ON_OPEN_FAIL);
DECL_OR_DEF(EXPLAIN_COLUMN_CLICK);
+#ifdef USE_VIEWER_BAR
DECL_OR_DEF(VIEWER_BAR_TIP);
+#endif // USE_VIEWER_BAR
DECL_OR_DEF(EMPTY_TRASH_ON_EXIT);
-------------------------------------------------------
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
