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

diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp
index a51e5bccb..d88aa31c2 100644
--- a/korganizer/koeventviewerdialog.cpp
+++ b/korganizer/koeventviewerdialog.cpp
@@ -28,21 +28,20 @@
 
 #include <klocale.h>
 
-KOEventViewerDialog::KOEventViewerDialog( TQWidget *parent, const char *name,
-                                          bool compact )
+KOEventViewerDialog::KOEventViewerDialog( Calendar *calendar, TQWidget *parent,
+                                          const char *name, bool compact )
   : KDialogBase( parent, name, false, i18n("Event Viewer"), Ok, Ok, false,
                  i18n("Edit") )
 {
-  mEventViewer = new KOEventViewer( this );
+  mEventViewer = new KOEventViewer( calendar, this );
   setMainWidget( mEventViewer );
 
-  // FIXME: Set a sensible size (based on the content?).
   if ( compact ) {
     setFixedSize( 240,284 );
     move( 0, 15 );
   } else {
-    setMinimumSize( 300, 200 );
-    resize( 320, 300 );
+    setMinimumSize( 500, 500 );
+    resize( 520, 500 );
   }
   connect( this, TQT_SIGNAL(finished()), this, TQT_SLOT(delayedDestruct()) );
 }
@@ -51,9 +50,14 @@ KOEventViewerDialog::~KOEventViewerDialog()
 {
 }
 
+void KOEventViewerDialog::setCalendar( Calendar *calendar )
+{
+  mEventViewer->setCalendar( calendar );
+}
+
 void KOEventViewerDialog::addText( const TQString &text )
 {
-  mEventViewer->addText(text);
+  mEventViewer->addText( text );
 }
 
 #include "koeventviewerdialog.moc"