summaryrefslogtreecommitdiffstats
path: root/korganizer/koglobals.h
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
commitcc29364f06178f8f6b457384f2ec37a042bd9d43 (patch)
tree7c77a3184c698bbf9d98cef09fb1ba8124daceba /korganizer/koglobals.h
parent4f6c584bacc8c3c694228f36ada3de77a76614a6 (diff)
downloadtdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.tar.gz
tdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.zip
* 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
Diffstat (limited to 'korganizer/koglobals.h')
-rw-r--r--korganizer/koglobals.h41
1 files changed, 36 insertions, 5 deletions
diff --git a/korganizer/koglobals.h b/korganizer/koglobals.h
index 771588101..119eb6c1d 100644
--- a/korganizer/koglobals.h
+++ b/korganizer/koglobals.h
@@ -24,7 +24,9 @@
#define KORG_GLOBALS_H
#include <kdepimmacros.h>
+#include <tqwidget.h>
+class TQDate;
class TQPixmap;
class TQIconSet;
class KCalendarSystem;
@@ -39,11 +41,40 @@ class KDE_EXPORT KOGlobals
public:
static KOGlobals *self();
- enum { INCIDENCEADDED, INCIDENCEEDITED, INCIDENCEDELETED };
- enum { PRIORITY_MODIFIED, COMPLETION_MODIFIED, CATEGORY_MODIFIED,
- DATE_MODIFIED, RELATION_MODIFIED, ALARM_MODIFIED,
- DESCRIPTION_MODIFIED, SUMMARY_MODIFIED,
- COMPLETION_MODIFIED_WITH_RECURRENCE, UNKNOWN_MODIFIED };
+ enum HowChanged {
+ INCIDENCEADDED,
+ INCIDENCEEDITED,
+ INCIDENCEDELETED,
+ NOCHANGE
+ };
+ enum WhatChanged {
+ PRIORITY_MODIFIED,
+ COMPLETION_MODIFIED,
+ CATEGORY_MODIFIED,
+ DATE_MODIFIED,
+ RELATION_MODIFIED,
+ ALARM_MODIFIED,
+ DESCRIPTION_MODIFIED,
+ SUMMARY_MODIFIED,
+ COMPLETION_MODIFIED_WITH_RECURRENCE,
+ RECURRENCE_MODIFIED_ONE_ONLY,
+ RECURRENCE_MODIFIED_ALL_FUTURE,
+ UNKNOWN_MODIFIED,
+ NOTHING_MODIFIED
+ };
+
+ enum WhichOccurrences {
+ NONE,
+ ONLY_THIS_ONE,
+ ONLY_FUTURE,
+ ALL
+ };
+
+ enum OccurrenceAction {
+ CUT,
+ COPY,
+ EDIT
+ };
static void fitDialogToScreen( TQWidget *widget, bool force=false );
KConfig *config() const;