summaryrefslogtreecommitdiffstats
path: root/kmail/interfaces
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
commitcc29364f06178f8f6b457384f2ec37a042bd9d43 (patch)
tree7c77a3184c698bbf9d98cef09fb1ba8124daceba /kmail/interfaces
parent4f6c584bacc8c3c694228f36ada3de77a76614a6 (diff)
downloadtdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.tar.gz
tdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.zip
* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch
* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed * Added journal read support to the CalDAV resource * Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmail/interfaces')
-rw-r--r--kmail/interfaces/bodypartformatter.h6
-rw-r--r--kmail/interfaces/urlhandler.h35
2 files changed, 38 insertions, 3 deletions
diff --git a/kmail/interfaces/bodypartformatter.h b/kmail/interfaces/bodypartformatter.h
index b31cb26b7..9bc947f53 100644
--- a/kmail/interfaces/bodypartformatter.h
+++ b/kmail/interfaces/bodypartformatter.h
@@ -35,7 +35,7 @@
#define __KMAIL_INTERFACE_BODYPARTFORMATTER_H__
namespace KMail {
-
+ class Callback;
class HtmlWriter;
namespace Interface {
@@ -47,7 +47,7 @@ namespace KMail {
public:
virtual ~BodyPartFormatter() {}
- /**
+ /**
@li Ok returned when format() generated some HTML
@li NeedContent returned when format() needs the body of the part
@li AsIcon returned when the part should be shown iconified
@@ -61,7 +61,7 @@ namespace KMail {
@return the result code (see above)
*/
- virtual Result format( BodyPart * part, KMail::HtmlWriter * writer ) const = 0;
+ virtual Result format( BodyPart * part, KMail::HtmlWriter * writer, Callback &c ) const = 0;
};
/**
diff --git a/kmail/interfaces/urlhandler.h b/kmail/interfaces/urlhandler.h
index fba673d65..38ada083f 100644
--- a/kmail/interfaces/urlhandler.h
+++ b/kmail/interfaces/urlhandler.h
@@ -57,6 +57,41 @@ namespace KMail {
false otherwise.
*/
virtual bool handleClick( const KURL & url, KMReaderWin * w ) const = 0;
+
+ /**
+ * Called when shift-clicking the link in the reader.
+ * @return true if the click was handled by this URLHandler, false otherwise
+ */
+ virtual bool handleShiftClick( const KURL &url, KMReaderWin *window ) const {
+ Q_UNUSED( url );
+ Q_UNUSED( window );
+ return false;
+ }
+
+ /**
+ * @return should return true if this URLHandler will handle the drag
+ */
+ virtual bool willHandleDrag( const KURL &url, const TQString &imagePath,
+ KMReaderWin *window ) const {
+ Q_UNUSED( url );
+ Q_UNUSED( window );
+ Q_UNUSED( imagePath );
+ return false;
+ }
+
+ /**
+ * Called when starting a drag with the given URL.
+ * If the drag is handled, you should create a drag object.
+ * @return true if the click was handled by this URLHandler, false otherwise
+ */
+ virtual bool handleDrag( const KURL &url, const TQString &imagePath,
+ KMReaderWin *window ) const {
+ Q_UNUSED( url );
+ Q_UNUSED( window );
+ Q_UNUSED( imagePath );
+ return false;
+ }
+
/** Called when RMB-clicking on a link in the reader. Should show
a context menu at the specified point with the specified
widget as parent.