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

diff --git a/korganizer/korgac/alarmdialog.h b/korganizer/korgac/alarmdialog.h
index 4c2162a5..75208f65 100644
--- a/korganizer/korgac/alarmdialog.h
+++ b/korganizer/korgac/alarmdialog.h
@@ -31,36 +31,48 @@
 #include <kdialogbase.h>
 
 #include <libkcal/event.h>
-#include <libkcal/calendarlocal.h>
+#include <libkcal/calendarresources.h>
 
 using namespace KCal;
 
+class AlarmListItem;
 class KOEventViewer;
-class TQSpinBox;
 class KComboBox;
 class KListView;
-class AlarmListItem;
+class TQSpinBox;
+class TQSplitter;
 
 class AlarmDialog : public KDialogBase {
-    Q_OBJECT
+  Q_OBJECT
   public:
-    AlarmDialog( TQWidget *parent = 0, const char *name = 0 );
-    virtual ~AlarmDialog();
+    explicit AlarmDialog( CalendarResources *calendar, TQWidget *parent = 0, const char *name = 0 );
+
+    ~AlarmDialog();
 
-    void addIncidence( Incidence *incidence, const TQDateTime &reminderAt );
+    void addIncidence( Incidence *incidence, const TQDateTime &reminderAt,
+                       const TQString &displayText );
     void eventNotification();
 
   public slots:
-    void slotOk();
-    void slotUser1();
-    void slotUser2();
-    void slotUser3();
+
+    void slotOk();    // suspend
+    void slotUser1(); // edit
+    void slotUser2(); // dismiss all
+    void slotUser3(); // dismiss selected
     void slotSave();
     void wakeUp();
     void show();
+    void edit();
     void suspend();
     void suspendAll();
     void dismissAll();
+    void dismissCurrent();
+
+    /**
+       If an incidence changed, for example in korg, we must update
+       the date and summary shown in the list view.
+    */
+    void slotCalendarChanged();
 
   signals:
     void reminderCount( int count );
@@ -69,16 +81,29 @@ class AlarmDialog : public KDialogBase {
     void updateButtons();
     void showDetails();
 
+  protected:
+    void closeEvent( TQCloseEvent * );
+
   private:
-    bool startKOrganizer();
+
+    static TQDateTime triggerDateForIncidence( Incidence *inc,
+                                              const TQDateTime &reminderAt,
+                                              TQString &displayStr );
+
+    void readLayout();
+    void writeLayout();
+    AlarmListItem *searchByUid( const TQString &uid );
+    bool ensureKorganizerRunning() const;
     void setTimer();
     int activeCount();
     TQValueList<AlarmListItem*> selectedItems() const;
 
+    CalendarResources *mCalendar;
     KListView *mIncidenceListView;
     KOEventViewer *mDetailView;
 
     TQSpinBox *mSuspendSpin;
+    TQSplitter *mSplitter;
     KComboBox *mSuspendUnit;
     TQTimer mSuspendTimer;
 };