* 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, 12 insertions, 3 deletions

diff --git a/korganizer/multiagendaview.h b/korganizer/multiagendaview.h
index d7316698d..ebdfc9005 100644
--- a/korganizer/multiagendaview.h
+++ b/korganizer/multiagendaview.h
@@ -20,6 +20,7 @@
 #define KORG_MULTIAGENDAVIEW_H_H
 
 #include "agendaview.h"
+#include "calendarview.h"
 
 class TQScrollView;
 class TQHBox;
@@ -41,11 +42,14 @@ class MultiAgendaView : public AgendaView
 {
   Q_OBJECT
   public:
-    explicit MultiAgendaView( Calendar* cal, TQWidget *parent = 0, const char *name = 0 );
+    explicit MultiAgendaView( Calendar* cal, CalendarView *calendarView,
+                              TQWidget *parent = 0, const char *name = 0 );
     ~MultiAgendaView();
 
+    KOAgendaView *selectedAgendaView();
+    void deSelectAgendaView() { mSelectedAgendaView = 0; }
     Incidence::List selectedIncidences();
-    DateList selectedDates();
+    DateList selectedIncidenceDates();
     int currentDateCount();
     int maxDatesHint();
 
@@ -55,7 +59,7 @@ class MultiAgendaView : public AgendaView
 
   public slots:
     void showDates( const TQDate &start, const TQDate &end );
-    void showIncidences( const Incidence::List &incidenceList );
+    void showIncidences( const Incidence::List &incidenceList, const TQDate &date );
     void updateView();
     void changeIncidenceDisplay( Incidence *incidence, int mode );
     void updateConfig();
@@ -84,10 +88,13 @@ class MultiAgendaView : public AgendaView
     void slotSelectionChanged();
     void slotClearTimeSpanSelection();
     void resizeSplitters();
+    void resizeSpacers( int );
+    void setupScrollBar();
     void zoomView( const int delta, const TQPoint &pos, const Qt::Orientation ori );
     void slotResizeScrollView();
 
   private:
+    KOAgendaView *mSelectedAgendaView;
     TQValueList<KOAgendaView*> mAgendaViews;
     TQValueList<TQWidget*> mAgendaWidgets;
     TQHBox *mTopBox;
@@ -96,10 +103,12 @@ class MultiAgendaView : public AgendaView
     TQSplitter *mLeftSplitter, *mRightSplitter;
     TQSplitter *mLastMovedSplitter;
     TQScrollBar *mScrollBar;
+    TQWidget *mLeftTopSpacer, *mRightTopSpacer;
     TQWidget *mLeftBottomSpacer, *mRightBottomSpacer;
     TQDate mStartDate, mEndDate;
     bool mUpdateOnShow;
     bool mPendingChanges;
+    CalendarView *mCalendarView;
 };
 
 }