* 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, 21 insertions, 9 deletions

diff --git a/korganizer/kolistview.h b/korganizer/kolistview.h
index 6da6988a8..5a5c40d8f 100644
--- a/korganizer/kolistview.h
+++ b/korganizer/kolistview.h
@@ -27,6 +27,7 @@
 #define _KOLISTVIEW_H
 
 #include <tqdict.h>
+#include <tqmap.h>
 #include <tqtooltip.h>
 
 #include <libkcal/incidence.h>
@@ -43,12 +44,13 @@ class KOListView;
 class KOListViewToolTip : public QToolTip
 {
   public:
-    KOListViewToolTip (TQWidget* parent, KListView* lv );
+    KOListViewToolTip ( TQWidget* parent, Calendar *calendar, KListView* lv );
 
   protected:
-    void maybeTip( const TQPoint & pos);
+    void maybeTip( const TQPoint &pos );
 
   private:
+    Calendar *mCalendar;
     KListView* eventlist;
 };
 
@@ -67,26 +69,32 @@ class KOListView : public KOEventView
 {
     Q_OBJECT
   public:
-    KOListView(Calendar *calendar, TQWidget *parent = 0,
-               const char *name = 0);
+   explicit KOListView( Calendar *calendar,
+                        TQWidget *parent = 0,
+                        const char *name = 0,
+                        bool nonInteractive = false );
     ~KOListView();
 
     virtual int maxDatesHint();
     virtual int currentDateCount();
     virtual Incidence::List selectedIncidences();
-    virtual DateList selectedDates();
+    virtual DateList selectedIncidenceDates();
 
-    void showDates(bool show);
+    void showDates( bool show );
+
+    // Shows all incidences of the calendar
+    void showAll();
 
     void readSettings(KConfig *config);
     void writeSettings(KConfig *config);
 
     void clear();
+    TQSize sizeHint() const;
 
   public slots:
     virtual void updateView();
     virtual void showDates( const TQDate &start, const TQDate &end );
-    virtual void showIncidences( const Incidence::List &incidenceList );
+    virtual void showIncidences( const Incidence::List &incidenceList, const TQDate &date );
 
     void clearSelection();
 
@@ -102,8 +110,8 @@ class KOListView : public KOEventView
     void processSelectionChange();
 
   protected:
-    void addIncidences( const Incidence::List & );
-    void addIncidence(Incidence *);
+    void addIncidences(const Incidence::List &, const TQDate &date);
+    void addIncidence(Incidence *,  const TQDate &date);
     KOListViewItem *getItemForIncidence(Incidence *incidence);
 
   private:
@@ -112,7 +120,11 @@ class KOListView : public KOEventView
     KOEventPopupMenu *mPopupMenu;
     KOListViewItem *mActiveItem;
     TQDict<Incidence> mUidDict;
+    TQMap<TQString, TQDate>mDateList;
     DateList mSelectedDates;
+
+    // if it's non interactive we disable context menu, and incidence editing
+    bool mIsNonInteractive;
 };
 
 #endif