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

diff --git a/korganizer/korgac/testalarmdlg.cpp b/korganizer/korgac/testalarmdlg.cpp
index 84fa51ed6..5a3ba5a18 100644
--- a/korganizer/korgac/testalarmdlg.cpp
+++ b/korganizer/korgac/testalarmdlg.cpp
@@ -29,6 +29,8 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kcmdlineargs.h>
+#include <kconfig.h>
+#include <kstandarddirs.h>
 
 #include "alarmdialog.h"
 
@@ -39,6 +41,11 @@ int main(int argc,char **argv)
 
   KApplication app;
 
+  KConfig c( locate( "config", "korganizerrc" ) );
+  c.setGroup( "Time & Date" );
+  TQString tz = c.readEntry( "TimeZoneId" );
+  CalendarResources *mCalendar = new CalendarResources( tz );
+
   Event *e1 = new Event;
   e1->setSummary( "This is a summary." );
   TQDateTime now = TQDateTime::currentDateTime();
@@ -46,24 +53,64 @@ int main(int argc,char **argv)
   e1->setDtEnd( now.addDays( 1 ) );
   Alarm *a = e1->newAlarm();
 //  a->setProcedureAlarm( "/usr/X11R6/bin/xeyes" );
-  a->setAudioAlarm( "/opt/kde/share/apps/korganizer/sounds/spinout.wav" );
+  a->setAudioAlarm( "/data/kde/share/apps/korganizer/sounds/spinout.wav" );
+  mCalendar->addEvent( e1 );
 
   Todo *t1 = new Todo;
   t1->setSummary( "To-do A" );
   t1->setDtDue( now );
   t1->newAlarm();
+  mCalendar->addTodo( t1 );
 
   Event *e2 = new Event;
   e2->setSummary( "This is another summary." );
-  e2->setDtStart( now );
-  e2->setDtEnd( now.addDays( 1 ) );
+  e2->setDtStart( now.addDays( 1 ) );
+  e2->setDtEnd( now.addDays( 2 ) );
   e2->newAlarm();
+  mCalendar->addEvent( e2 );
+
+  Event *e3 = new Event;
+  e3->setSummary( "Meet with Fred" );
+  e3->setDtStart( now.addDays( 2 ) );
+  e3->setDtEnd( now.addDays( 3 ) );
+  e3->newAlarm();
+  mCalendar->addEvent( e3 );
+
+  Todo *t2 = new Todo;
+  t2->setSummary( "Something big is due today" );
+  t2->setDtDue( now );
+  t2->newAlarm();
+  mCalendar->addTodo( t2 );
+
+  Todo *t3 = new Todo;
+  t3->setSummary( "Be lazy" );
+  t3->setDtDue( now );
+  t3->newAlarm();
+  mCalendar->addTodo( t3 );
+
+  Event *e4 = new Event;
+  e4->setSummary( "Watch TV" );
+  e4->setDtStart( now.addSecs( 120 ) );
+  e4->setDtEnd( now.addSecs( 180 ) );
+  e4->newAlarm();
+  mCalendar->addEvent( e4 );
 
-  AlarmDialog dlg;
+  AlarmDialog dlg( mCalendar, 0 );
   app.setMainWidget( &dlg );
-  dlg.addIncidence( e1, TQDateTime::currentDateTime() );
-  dlg.addIncidence( t1, TQDateTime::currentDateTime() );
-  dlg.addIncidence( e2, TQDateTime::currentDateTime() );
+  dlg.addIncidence( e2, TQDateTime::currentDateTime().addSecs( 60 ),
+                    TQString() );
+  dlg.addIncidence( t1, TQDateTime::currentDateTime().addSecs( 300 ),
+                    TQString( "THIS IS DISPLAY TEXT" ) );
+  dlg.addIncidence( e4, TQDateTime::currentDateTime().addSecs( 120 ),
+                    TQString( "Fred and Barney get cloned" ) );
+  dlg.addIncidence( e3, TQDateTime::currentDateTime().addSecs( 240 ),
+                    TQString() );
+  dlg.addIncidence( e1, TQDateTime::currentDateTime().addSecs( 180 ),
+                    TQString() );
+  dlg.addIncidence( t2, TQDateTime::currentDateTime().addSecs( 600 ),
+                    TQString( "THIS IS DISPLAY TEXT" ) );
+  dlg.addIncidence( t3, TQDateTime::currentDateTime().addSecs( 360 ),
+                    TQString() );
   dlg.show();
   dlg.eventNotification();