* 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

1 files changed, 13 insertions, 3 deletions

diff --git a/knotes/knoteedit.h b/knotes/knoteedit.h
index 862aa38ba..0e6a6e4b4 100644
--- a/knotes/knoteedit.h
+++ b/knotes/knoteedit.h
@@ -24,7 +24,7 @@
 #include <tqwidget.h>
 
 #include <ktextedit.h>
-
+class KNote;
 class TQFont;
 class TQColor;
 class TQPushButton;
@@ -41,7 +41,9 @@ class KNoteEdit : public KTextEdit
 public:
     KNoteEdit( KActionCollection *actions, TQWidget *parent=0, const char *name=0 );
     ~KNoteEdit();
-
+    void setNote( KNote *_note ) {
+        m_note = _note;
+    }
     void setText( const TQString& text );
     void setTextFont( const TQFont& font );
     void setTextColor( const TQColor& color );
@@ -67,10 +69,12 @@ public slots:
 
     //void textIncreaseIndent();
     //void textDecreaseIndent();
+    void slotCutEnabled( bool );
 
 protected:
     virtual void contentsDragEnterEvent( TQDragEnterEvent *e );
     virtual void contentsDropEvent( TQDropEvent *e );
+    virtual TQPopupMenu *createPopupMenu( const TQPoint &pos );
 
 private slots:
     void slotReturnPressed();
@@ -79,6 +83,10 @@ private slots:
     void colorChanged( const TQColor &c );
     void alignmentChanged( int a );
     void verticalAlignmentChanged( VerticalAlignment a );
+    void slotAllowTab();
+
+    void setEnabledRedo( bool b );
+    void setEnabledUndo( bool b );
 
 private:
     void autoIndent();
@@ -114,8 +122,10 @@ private:
     KAction         *m_textColor;
     KFontAction     *m_textFont;
     KFontSizeAction *m_textSize;
-
+    KAction* undo;
+    KAction* redo;
     bool m_autoIndentMode;
+    KNote           *m_note;
 };
 
 #endif