Update of /cvsroot/mahogany/M/src/modules
In directory sc8-pr-cvs1:/tmp/cvs-serv22568/src/modules
Modified Files:
HtmlViewer.cpp LayoutViewer.cpp TextViewer.cpp
Log Message:
1. added InsertClickable() in addition to InsertAttachment() to MessageViewer
2. use it in PGP view filter to insert icons showing the PGP status
3. added MCryptoEngineOutputLog
Index: HtmlViewer.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/modules/HtmlViewer.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -b -u -2 -r1.43 -r1.44
--- HtmlViewer.cpp 5 Dec 2002 19:47:32 -0000 1.43
+++ HtmlViewer.cpp 5 Dec 2002 23:14:59 -0000 1.44
@@ -111,4 +111,7 @@
virtual void StartPart();
virtual void InsertAttachment(const wxBitmap& icon, ClickableInfo *ci);
+ virtual void InsertClickable(const wxBitmap& icon,
+ ClickableInfo *ci,
+ const wxColour& col);
virtual void InsertImage(const wxImage& image, ClickableInfo *ci);
virtual void InsertRawContents(const String& data);
@@ -396,5 +399,5 @@
{
ClickableInfo *ci = GetClickable(link->GetHref());
- if ( ci )
+ if ( !ci )
{
// let the base class process it
@@ -854,4 +857,11 @@
m_window->StoreClickable(ci, url);
+}
+
+void HtmlViewer::InsertClickable(const wxBitmap& icon,
+ ClickableInfo *ci,
+ const wxColour& col)
+{
+ InsertAttachment(icon, ci);
}
Index: LayoutViewer.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/modules/LayoutViewer.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -b -u -2 -r1.28 -r1.29
--- LayoutViewer.cpp 5 Dec 2002 19:47:32 -0000 1.28
+++ LayoutViewer.cpp 5 Dec 2002 23:14:59 -0000 1.29
@@ -93,4 +93,7 @@
virtual void StartPart();
virtual void InsertAttachment(const wxBitmap& icon, ClickableInfo *ci);
+ virtual void InsertClickable(const wxBitmap& icon,
+ ClickableInfo *ci,
+ const wxColour& col);
virtual void InsertImage(const wxImage& image, ClickableInfo *ci);
virtual void InsertRawContents(const String& data);
@@ -511,4 +514,11 @@
// be broken:
llist->Insert(" ");
+}
+
+void LayoutViewer::InsertClickable(const wxBitmap& icon,
+ ClickableInfo *ci,
+ const wxColour& col)
+{
+ InsertAttachment(icon, ci);
}
Index: TextViewer.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/modules/TextViewer.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -b -u -2 -r1.39 -r1.40
--- TextViewer.cpp 5 Dec 2002 19:47:32 -0000 1.39
+++ TextViewer.cpp 5 Dec 2002 23:14:59 -0000 1.40
@@ -94,4 +94,7 @@
virtual void StartPart();
virtual void InsertAttachment(const wxBitmap& icon, ClickableInfo *ci);
+ virtual void InsertClickable(const wxBitmap& icon,
+ ClickableInfo *ci,
+ const wxColour& col);
virtual void InsertImage(const wxImage& image, ClickableInfo *ci);
virtual void InsertRawContents(const String& data);
@@ -564,7 +567,18 @@
void TextViewer::InsertAttachment(const wxBitmap& icon, ClickableInfo *ci)
{
- wxString str;
- str << '[' << "Attachment: " << ci->GetLabel() << ']';
+ String str;
+ str << _("[Attachment: ") << ci->GetLabel() << _T(']');
+
m_window->InsertClickable(str, ci, GetOptions().AttCol);
+}
+
+void TextViewer::InsertClickable(const wxBitmap& icon,
+ ClickableInfo *ci,
+ const wxColour& col)
+{
+ String str;
+ str << _T('[') << ci->GetLabel() << _T(']');
+
+ m_window->InsertClickable(str, ci, col);
}
-------------------------------------------------------
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
