author | zautrix <zautrix> | 2004-08-29 14:16:05 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-08-29 14:16:05 (UTC) |
commit | 3a5648d8378b44cbe12d66bafa3d557c065f0f6d (patch) (unidiff) | |
tree | 1f143371c48b017ee6cf86862fcbc261727421b4 | |
parent | f7bf415be8c727c887ec01c2d8fb8f1c2f85d096 (diff) | |
download | kdepimpi-3a5648d8378b44cbe12d66bafa3d557c065f0f6d.zip kdepimpi-3a5648d8378b44cbe12d66bafa3d557c065f0f6d.tar.gz kdepimpi-3a5648d8378b44cbe12d66bafa3d557c065f0f6d.tar.bz2 |
Some compilation fixes
-rw-r--r-- | Makefile | 6 | ||||
-rw-r--r-- | kabc/kabc.pro | 2 | ||||
-rw-r--r-- | korganizer/kdatenavigator.cpp | 7 | ||||
-rw-r--r-- | korganizer/koeditorrecurrence.cpp | 2 | ||||
-rw-r--r-- | libkcal/calendar.h | 4 |
5 files changed, 11 insertions, 10 deletions
@@ -1,140 +1,138 @@ | |||
1 | ############################################################################# | 1 | ############################################################################# |
2 | # Makefile for building: kopi-desktop | 2 | # Makefile for building: kopi-desktop |
3 | # Generated by qmake (1.07a) (Qt 3.3.3) on: Thu Aug 19 22:23:29 2004 | 3 | # Generated by qmake (1.07a) (Qt 3.3.1) on: Sun Aug 29 13:39:55 2004 |
4 | # Project: kopi-desktop.pro | 4 | # Project: kopi-desktop.pro |
5 | # Template: subdirs | 5 | # Template: subdirs |
6 | # Command: $(QMAKE) -o Makefile kopi-desktop.pro | 6 | # Command: $(QMAKE) -o Makefile kopi-desktop.pro |
7 | ############################################################################# | 7 | ############################################################################# |
8 | 8 | ||
9 | MAKEFILE =Makefile | 9 | MAKEFILE =Makefile |
10 | QMAKE =qmake | 10 | QMAKE =qmake |
11 | DEL_FILE = rm -f | 11 | DEL_FILE = rm -f |
12 | CHK_DIR_EXISTS= test -d | 12 | CHK_DIR_EXISTS= test -d |
13 | MKDIR = mkdir -p | 13 | MKDIR = mkdir -p |
14 | INSTALL_FILE= | ||
15 | INSTALL_DIR = | ||
16 | SUBTARGETS = \ | 14 | SUBTARGETS = \ |
17 | sub-gammu-emb-common \ | 15 | sub-gammu-emb-common \ |
18 | sub-libical \ | 16 | sub-libical \ |
19 | sub-libkcal \ | 17 | sub-libkcal \ |
20 | sub-microkde \ | 18 | sub-microkde \ |
21 | sub-libkdepim \ | 19 | sub-libkdepim \ |
22 | sub-kabc \ | 20 | sub-kabc \ |
23 | sub-korganizer \ | 21 | sub-korganizer \ |
24 | sub-kaddressbook \ | 22 | sub-kaddressbook \ |
25 | sub-kabc-plugins-file \ | 23 | sub-kabc-plugins-file \ |
26 | sub-kabc-plugins-dir | 24 | sub-kabc-plugins-dir |
27 | 25 | ||
28 | first: all | 26 | first: all |
29 | 27 | ||
30 | all: Makefile $(SUBTARGETS) | 28 | all: Makefile $(SUBTARGETS) |
31 | 29 | ||
32 | gammu/emb/common/$(MAKEFILE): | 30 | gammu/emb/common/$(MAKEFILE): |
33 | @$(CHK_DIR_EXISTS) "gammu/emb/common" || $(MKDIR) "gammu/emb/common" | 31 | @$(CHK_DIR_EXISTS) "gammu/emb/common" || $(MKDIR) "gammu/emb/common" |
34 | cd gammu/emb/common && $(QMAKE) common.pro -o $(MAKEFILE) | 32 | cd gammu/emb/common && $(QMAKE) common.pro -o $(MAKEFILE) |
35 | sub-gammu-emb-common: gammu/emb/common/$(MAKEFILE) FORCE | 33 | sub-gammu-emb-common: gammu/emb/common/$(MAKEFILE) FORCE |
36 | cd gammu/emb/common && $(MAKE) -f $(MAKEFILE) | 34 | cd gammu/emb/common && $(MAKE) -f $(MAKEFILE) |
37 | 35 | ||
38 | libical/$(MAKEFILE): | 36 | libical/$(MAKEFILE): |
39 | @$(CHK_DIR_EXISTS) "libical" || $(MKDIR) "libical" | 37 | @$(CHK_DIR_EXISTS) "libical" || $(MKDIR) "libical" |
40 | cd libical && $(QMAKE) libical.pro -o $(MAKEFILE) | 38 | cd libical && $(QMAKE) libical.pro -o $(MAKEFILE) |
41 | sub-libical: libical/$(MAKEFILE) FORCE | 39 | sub-libical: libical/$(MAKEFILE) FORCE |
42 | cd libical && $(MAKE) -f $(MAKEFILE) | 40 | cd libical && $(MAKE) -f $(MAKEFILE) |
43 | 41 | ||
44 | libkcal/$(MAKEFILE): | 42 | libkcal/$(MAKEFILE): |
45 | @$(CHK_DIR_EXISTS) "libkcal" || $(MKDIR) "libkcal" | 43 | @$(CHK_DIR_EXISTS) "libkcal" || $(MKDIR) "libkcal" |
46 | cd libkcal && $(QMAKE) libkcal.pro -o $(MAKEFILE) | 44 | cd libkcal && $(QMAKE) libkcal.pro -o $(MAKEFILE) |
47 | sub-libkcal: libkcal/$(MAKEFILE) FORCE | 45 | sub-libkcal: libkcal/$(MAKEFILE) FORCE |
48 | cd libkcal && $(MAKE) -f $(MAKEFILE) | 46 | cd libkcal && $(MAKE) -f $(MAKEFILE) |
49 | 47 | ||
50 | microkde/$(MAKEFILE): | 48 | microkde/$(MAKEFILE): |
51 | @$(CHK_DIR_EXISTS) "microkde" || $(MKDIR) "microkde" | 49 | @$(CHK_DIR_EXISTS) "microkde" || $(MKDIR) "microkde" |
52 | cd microkde && $(QMAKE) microkde.pro -o $(MAKEFILE) | 50 | cd microkde && $(QMAKE) microkde.pro -o $(MAKEFILE) |
53 | sub-microkde: microkde/$(MAKEFILE) FORCE | 51 | sub-microkde: microkde/$(MAKEFILE) FORCE |
54 | cd microkde && $(MAKE) -f $(MAKEFILE) | 52 | cd microkde && $(MAKE) -f $(MAKEFILE) |
55 | 53 | ||
56 | libkdepim/$(MAKEFILE): | 54 | libkdepim/$(MAKEFILE): |
57 | @$(CHK_DIR_EXISTS) "libkdepim" || $(MKDIR) "libkdepim" | 55 | @$(CHK_DIR_EXISTS) "libkdepim" || $(MKDIR) "libkdepim" |
58 | cd libkdepim && $(QMAKE) libkdepim.pro -o $(MAKEFILE) | 56 | cd libkdepim && $(QMAKE) libkdepim.pro -o $(MAKEFILE) |
59 | sub-libkdepim: libkdepim/$(MAKEFILE) FORCE | 57 | sub-libkdepim: libkdepim/$(MAKEFILE) FORCE |
60 | cd libkdepim && $(MAKE) -f $(MAKEFILE) | 58 | cd libkdepim && $(MAKE) -f $(MAKEFILE) |
61 | 59 | ||
62 | kabc/$(MAKEFILE): | 60 | kabc/$(MAKEFILE): |
63 | @$(CHK_DIR_EXISTS) "kabc" || $(MKDIR) "kabc" | 61 | @$(CHK_DIR_EXISTS) "kabc" || $(MKDIR) "kabc" |
64 | cd kabc && $(QMAKE) kabc.pro -o $(MAKEFILE) | 62 | cd kabc && $(QMAKE) kabc.pro -o $(MAKEFILE) |
65 | sub-kabc: kabc/$(MAKEFILE) FORCE | 63 | sub-kabc: kabc/$(MAKEFILE) FORCE |
66 | cd kabc && $(MAKE) -f $(MAKEFILE) | 64 | cd kabc && $(MAKE) -f $(MAKEFILE) |
67 | 65 | ||
68 | korganizer/$(MAKEFILE): | 66 | korganizer/$(MAKEFILE): |
69 | @$(CHK_DIR_EXISTS) "korganizer" || $(MKDIR) "korganizer" | 67 | @$(CHK_DIR_EXISTS) "korganizer" || $(MKDIR) "korganizer" |
70 | cd korganizer && $(QMAKE) korganizer.pro -o $(MAKEFILE) | 68 | cd korganizer && $(QMAKE) korganizer.pro -o $(MAKEFILE) |
71 | sub-korganizer: korganizer/$(MAKEFILE) FORCE | 69 | sub-korganizer: korganizer/$(MAKEFILE) FORCE |
72 | cd korganizer && $(MAKE) -f $(MAKEFILE) | 70 | cd korganizer && $(MAKE) -f $(MAKEFILE) |
73 | 71 | ||
74 | kaddressbook/$(MAKEFILE): | 72 | kaddressbook/$(MAKEFILE): |
75 | @$(CHK_DIR_EXISTS) "kaddressbook" || $(MKDIR) "kaddressbook" | 73 | @$(CHK_DIR_EXISTS) "kaddressbook" || $(MKDIR) "kaddressbook" |
76 | cd kaddressbook && $(QMAKE) kaddressbook.pro -o $(MAKEFILE) | 74 | cd kaddressbook && $(QMAKE) kaddressbook.pro -o $(MAKEFILE) |
77 | sub-kaddressbook: kaddressbook/$(MAKEFILE) FORCE | 75 | sub-kaddressbook: kaddressbook/$(MAKEFILE) FORCE |
78 | cd kaddressbook && $(MAKE) -f $(MAKEFILE) | 76 | cd kaddressbook && $(MAKE) -f $(MAKEFILE) |
79 | 77 | ||
80 | kabc/plugins/file/$(MAKEFILE): | 78 | kabc/plugins/file/$(MAKEFILE): |
81 | @$(CHK_DIR_EXISTS) "kabc/plugins/file" || $(MKDIR) "kabc/plugins/file" | 79 | @$(CHK_DIR_EXISTS) "kabc/plugins/file" || $(MKDIR) "kabc/plugins/file" |
82 | cd kabc/plugins/file && $(QMAKE) file.pro -o $(MAKEFILE) | 80 | cd kabc/plugins/file && $(QMAKE) file.pro -o $(MAKEFILE) |
83 | sub-kabc-plugins-file: kabc/plugins/file/$(MAKEFILE) FORCE | 81 | sub-kabc-plugins-file: kabc/plugins/file/$(MAKEFILE) FORCE |
84 | cd kabc/plugins/file && $(MAKE) -f $(MAKEFILE) | 82 | cd kabc/plugins/file && $(MAKE) -f $(MAKEFILE) |
85 | 83 | ||
86 | kabc/plugins/dir/$(MAKEFILE): | 84 | kabc/plugins/dir/$(MAKEFILE): |
87 | @$(CHK_DIR_EXISTS) "kabc/plugins/dir" || $(MKDIR) "kabc/plugins/dir" | 85 | @$(CHK_DIR_EXISTS) "kabc/plugins/dir" || $(MKDIR) "kabc/plugins/dir" |
88 | cd kabc/plugins/dir && $(QMAKE) dir.pro -o $(MAKEFILE) | 86 | cd kabc/plugins/dir && $(QMAKE) dir.pro -o $(MAKEFILE) |
89 | sub-kabc-plugins-dir: kabc/plugins/dir/$(MAKEFILE) FORCE | 87 | sub-kabc-plugins-dir: kabc/plugins/dir/$(MAKEFILE) FORCE |
90 | cd kabc/plugins/dir && $(MAKE) -f $(MAKEFILE) | 88 | cd kabc/plugins/dir && $(MAKE) -f $(MAKEFILE) |
91 | 89 | ||
92 | Makefile: kopi-desktop.pro /usr/local/qtgcc/mkspecs/default/qmake.conf | 90 | Makefile: kopi-desktop.pro /usr/lib/qt3/mkspecs/default/qmake.conf |
93 | $(QMAKE) -o Makefile kopi-desktop.pro | 91 | $(QMAKE) -o Makefile kopi-desktop.pro |
94 | qmake: qmake_all | 92 | qmake: qmake_all |
95 | @$(QMAKE) -o Makefile kopi-desktop.pro | 93 | @$(QMAKE) -o Makefile kopi-desktop.pro |
96 | 94 | ||
97 | all: $(SUBTARGETS) | 95 | all: $(SUBTARGETS) |
98 | qmake_all: gammu/emb/common/$(MAKEFILE) libical/$(MAKEFILE) libkcal/$(MAKEFILE) microkde/$(MAKEFILE) libkdepim/$(MAKEFILE) kabc/$(MAKEFILE) korganizer/$(MAKEFILE) kaddressbook/$(MAKEFILE) kabc/plugins/file/$(MAKEFILE) kabc/plugins/dir/$(MAKEFILE) | 96 | qmake_all: gammu/emb/common/$(MAKEFILE) libical/$(MAKEFILE) libkcal/$(MAKEFILE) microkde/$(MAKEFILE) libkdepim/$(MAKEFILE) kabc/$(MAKEFILE) korganizer/$(MAKEFILE) kaddressbook/$(MAKEFILE) kabc/plugins/file/$(MAKEFILE) kabc/plugins/dir/$(MAKEFILE) |
99 | ( [ -d gammu/emb/common ] && cd gammu/emb/common ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true | 97 | ( [ -d gammu/emb/common ] && cd gammu/emb/common ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
100 | ( [ -d libical ] && cd libical ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true | 98 | ( [ -d libical ] && cd libical ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
101 | ( [ -d libkcal ] && cd libkcal ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true | 99 | ( [ -d libkcal ] && cd libkcal ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
102 | ( [ -d microkde ] && cd microkde ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true | 100 | ( [ -d microkde ] && cd microkde ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
103 | ( [ -d libkdepim ] && cd libkdepim ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true | 101 | ( [ -d libkdepim ] && cd libkdepim ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
104 | ( [ -d kabc ] && cd kabc ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true | 102 | ( [ -d kabc ] && cd kabc ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
105 | ( [ -d korganizer ] && cd korganizer ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true | 103 | ( [ -d korganizer ] && cd korganizer ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
106 | ( [ -d kaddressbook ] && cd kaddressbook ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true | 104 | ( [ -d kaddressbook ] && cd kaddressbook ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
107 | ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true | 105 | ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
108 | ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true | 106 | ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
109 | clean uicables mocables uiclean mocclean lexclean yaccclean : qmake_all FORCE | 107 | clean uicables mocables uiclean mocclean lexclean yaccclean : qmake_all FORCE |
110 | ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; ) || true | 108 | ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
111 | ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; ) || true | 109 | ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
112 | ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; ) || true | 110 | ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
113 | ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; ) || true | 111 | ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
114 | ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; ) || true | 112 | ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
115 | ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; ) || true | 113 | ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
116 | ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; ) || true | 114 | ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
117 | ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; ) || true | 115 | ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
118 | ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; ) || true | 116 | ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
119 | ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; ) || true | 117 | ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
120 | uninstall_subdirs: qmake_all FORCE | 118 | uninstall_subdirs: qmake_all FORCE |
121 | ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true | 119 | ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
122 | ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true | 120 | ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
123 | ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true | 121 | ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
124 | ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true | 122 | ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
125 | ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true | 123 | ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
126 | ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true | 124 | ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
127 | ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true | 125 | ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
128 | ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true | 126 | ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
129 | ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true | 127 | ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
130 | ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true | 128 | ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
131 | install_subdirs: qmake_all FORCE | 129 | install_subdirs: qmake_all FORCE |
132 | ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) install; ) || true | 130 | ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) install; ) || true |
133 | ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) install; ) || true | 131 | ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) install; ) || true |
134 | ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) install; ) || true | 132 | ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) install; ) || true |
135 | ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) install; ) || true | 133 | ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) install; ) || true |
136 | ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) install; ) || true | 134 | ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) install; ) || true |
137 | ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) install; ) || true | 135 | ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) install; ) || true |
138 | ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) install; ) || true | 136 | ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) install; ) || true |
139 | ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) install; ) || true | 137 | ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) install; ) || true |
140 | ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) install; ) || true | 138 | ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) install; ) || true |
diff --git a/kabc/kabc.pro b/kabc/kabc.pro index 95ebd68..417f5b0 100644 --- a/kabc/kabc.pro +++ b/kabc/kabc.pro | |||
@@ -36,152 +36,152 @@ HEADERS = \ | |||
36 | address.h \ | 36 | address.h \ |
37 | addresseelist.h \ | 37 | addresseelist.h \ |
38 | formatfactory.h \ | 38 | formatfactory.h \ |
39 | formatplugin.h \ | 39 | formatplugin.h \ |
40 | phonenumber.h \ | 40 | phonenumber.h \ |
41 | distributionlist.h \ | 41 | distributionlist.h \ |
42 | distributionlistdialog.h \ | 42 | distributionlistdialog.h \ |
43 | distributionlisteditor.h \ | 43 | distributionlisteditor.h \ |
44 | vcardformatplugin.h \ | 44 | vcardformatplugin.h \ |
45 | formats/vcardformatplugin2.h \ | 45 | formats/vcardformatplugin2.h \ |
46 | picture.h \ | 46 | picture.h \ |
47 | secrecy.h \ | 47 | secrecy.h \ |
48 | sound.h \ | 48 | sound.h \ |
49 | addressbook.h \ | 49 | addressbook.h \ |
50 | syncprefwidget.h \ | 50 | syncprefwidget.h \ |
51 | timezone.h \ | 51 | timezone.h \ |
52 | tmpaddressbook.h \ | 52 | tmpaddressbook.h \ |
53 | addressee.h \ | 53 | addressee.h \ |
54 | addresseedialog.h \ | 54 | addresseedialog.h \ |
55 | vcardconverter.h \ | 55 | vcardconverter.h \ |
56 | vcard21parser.h \ | 56 | vcard21parser.h \ |
57 | vcardformatimpl.h \ | 57 | vcardformatimpl.h \ |
58 | plugins/file/resourcefile.h \ | 58 | plugins/file/resourcefile.h \ |
59 | plugins/file/resourcefileconfig.h \ | 59 | plugins/file/resourcefileconfig.h \ |
60 | plugins/dir/resourcedir.h \ | 60 | plugins/dir/resourcedir.h \ |
61 | plugins/dir/resourcedirconfig.h \ | 61 | plugins/dir/resourcedirconfig.h \ |
62 | vcardparser/vcardline.h \ | 62 | vcardparser/vcardline.h \ |
63 | vcardparser/vcard.h \ | 63 | vcardparser/vcard.h \ |
64 | vcardparser/vcardtool.h \ | 64 | vcardparser/vcardtool.h \ |
65 | vcardparser/vcardparser.h \ | 65 | vcardparser/vcardparser.h \ |
66 | vcard/include/VCardAdrParam.h \ | 66 | vcard/include/VCardAdrParam.h \ |
67 | vcard/include/VCardAdrValue.h \ | 67 | vcard/include/VCardAdrValue.h \ |
68 | vcard/include/VCardAgentParam.h \ | 68 | vcard/include/VCardAgentParam.h \ |
69 | vcard/include/VCardContentLine.h \ | 69 | vcard/include/VCardContentLine.h \ |
70 | vcard/include/VCardDateParam.h \ | 70 | vcard/include/VCardDateParam.h \ |
71 | vcard/include/VCardDateValue.h \ | 71 | vcard/include/VCardDateValue.h \ |
72 | vcard/include/VCardEmailParam.h \ | 72 | vcard/include/VCardEmailParam.h \ |
73 | vcard/include/VCardGeoValue.h \ | 73 | vcard/include/VCardGeoValue.h \ |
74 | vcard/include/VCardGroup.h \ | 74 | vcard/include/VCardGroup.h \ |
75 | vcard/include/VCardImageParam.h \ | 75 | vcard/include/VCardImageParam.h \ |
76 | vcard/include/VCardImageValue.h \ | 76 | vcard/include/VCardImageValue.h \ |
77 | vcard/include/VCardLangValue.h \ | 77 | vcard/include/VCardLangValue.h \ |
78 | vcard/include/VCardNValue.h \ | 78 | vcard/include/VCardNValue.h \ |
79 | vcard/include/VCardParam.h \ | 79 | vcard/include/VCardParam.h \ |
80 | vcard/include/VCardPhoneNumberValue.h \ | 80 | vcard/include/VCardPhoneNumberValue.h \ |
81 | vcard/include/VCardSourceParam.h \ | 81 | vcard/include/VCardSourceParam.h \ |
82 | vcard/include/VCardTelParam.h \ | 82 | vcard/include/VCardTelParam.h \ |
83 | vcard/include/VCardTextParam.h \ | 83 | vcard/include/VCardTextParam.h \ |
84 | vcard/include/VCardTextNSParam.h \ | ||
85 | vcard/include/VCardTextValue.h \ | 84 | vcard/include/VCardTextValue.h \ |
86 | vcard/include/VCardTextBinParam.h \ | 85 | vcard/include/VCardTextBinParam.h \ |
87 | vcard/include/VCardURIValue.h \ | 86 | vcard/include/VCardURIValue.h \ |
88 | vcard/include/VCardVCard.h \ | 87 | vcard/include/VCardVCard.h \ |
89 | vcard/include/VCardEntity.h \ | 88 | vcard/include/VCardEntity.h \ |
90 | vcard/include/VCardValue.h \ | 89 | vcard/include/VCardValue.h \ |
91 | vcard/include/VCardSoundValue.h \ | 90 | vcard/include/VCardSoundValue.h \ |
92 | vcard/include/VCardAgentValue.h \ | 91 | vcard/include/VCardAgentValue.h \ |
93 | vcard/include/VCardTelValue.h \ | 92 | vcard/include/VCardTelValue.h \ |
94 | vcard/include/VCardTextBinValue.h \ | 93 | vcard/include/VCardTextBinValue.h \ |
95 | vcard/include/VCardOrgValue.h \ | 94 | vcard/include/VCardOrgValue.h \ |
96 | vcard/include/VCardUTCValue.h \ | 95 | vcard/include/VCardUTCValue.h \ |
97 | vcard/include/VCardClassValue.h \ | 96 | vcard/include/VCardClassValue.h \ |
98 | vcard/include/VCardFloatValue.h \ | 97 | vcard/include/VCardFloatValue.h \ |
99 | vcard/include/VCardTextListValue.h \ | 98 | vcard/include/VCardTextListValue.h \ |
100 | vcard/include/generated/AdrParam-generated.h \ | 99 | vcard/include/generated/AdrParam-generated.h \ |
101 | vcard/include/generated/AdrValue-generated.h \ | 100 | vcard/include/generated/AdrValue-generated.h \ |
102 | vcard/include/generated/AgentParam-generated.h \ | 101 | vcard/include/generated/AgentParam-generated.h \ |
103 | vcard/include/generated/ContentLine-generated.h \ | 102 | vcard/include/generated/ContentLine-generated.h \ |
104 | vcard/include/generated/DateParam-generated.h \ | 103 | vcard/include/generated/DateParam-generated.h \ |
105 | vcard/include/generated/DateValue-generated.h \ | 104 | vcard/include/generated/DateValue-generated.h \ |
106 | vcard/include/generated/EmailParam-generated.h \ | 105 | vcard/include/generated/EmailParam-generated.h \ |
107 | vcard/include/generated/GeoValue-generated.h \ | 106 | vcard/include/generated/GeoValue-generated.h \ |
108 | vcard/include/generated/Group-generated.h \ | 107 | vcard/include/generated/Group-generated.h \ |
109 | vcard/include/generated/ImageParam-generated.h \ | 108 | vcard/include/generated/ImageParam-generated.h \ |
110 | vcard/include/generated/ImageValue-generated.h \ | 109 | vcard/include/generated/ImageValue-generated.h \ |
111 | vcard/include/generated/LangValue-generated.h \ | 110 | vcard/include/generated/LangValue-generated.h \ |
112 | vcard/include/generated/NValue-generated.h \ | 111 | vcard/include/generated/NValue-generated.h \ |
113 | vcard/include/generated/Param-generated.h \ | 112 | vcard/include/generated/Param-generated.h \ |
114 | vcard/include/generated/PhoneNumberValue-generated.h \ | 113 | vcard/include/generated/PhoneNumberValue-generated.h \ |
115 | vcard/include/generated/SourceParam-generated.h \ | 114 | vcard/include/generated/SourceParam-generated.h \ |
116 | vcard/include/generated/TelParam-generated.h \ | 115 | vcard/include/generated/TelParam-generated.h \ |
117 | vcard/include/generated/TextParam-generated.h \ | 116 | vcard/include/generated/TextParam-generated.h \ |
118 | vcard/include/generated/TextNSParam-generated.h \ | 117 | vcard/include/generated/TextNSParam-generated.h \ |
119 | vcard/include/generated/TextValue-generated.h \ | 118 | vcard/include/generated/TextValue-generated.h \ |
120 | vcard/include/generated/TextBinParam-generated.h \ | 119 | vcard/include/generated/TextBinParam-generated.h \ |
121 | vcard/include/generated/URIValue-generated.h \ | 120 | vcard/include/generated/URIValue-generated.h \ |
122 | vcard/include/generated/VCard-generated.h \ | 121 | vcard/include/generated/VCard-generated.h \ |
123 | vcard/include/generated/VCardEntity-generated.h \ | 122 | vcard/include/generated/VCardEntity-generated.h \ |
124 | vcard/include/generated/Value-generated.h \ | 123 | vcard/include/generated/Value-generated.h \ |
125 | vcard/include/generated/SoundValue-generated.h \ | 124 | vcard/include/generated/SoundValue-generated.h \ |
126 | vcard/include/generated/AgentValue-generated.h \ | 125 | vcard/include/generated/AgentValue-generated.h \ |
127 | vcard/include/generated/TelValue-generated.h \ | 126 | vcard/include/generated/TelValue-generated.h \ |
128 | vcard/include/generated/TextBinValue-generated.h \ | 127 | vcard/include/generated/TextBinValue-generated.h \ |
129 | vcard/include/generated/OrgValue-generated.h \ | 128 | vcard/include/generated/OrgValue-generated.h \ |
130 | vcard/include/generated/UTCValue-generated.h \ | 129 | vcard/include/generated/UTCValue-generated.h \ |
131 | vcard/include/generated/ClassValue-generated.h \ | 130 | vcard/include/generated/ClassValue-generated.h \ |
132 | vcard/include/generated/FloatValue-generated.h \ | 131 | vcard/include/generated/FloatValue-generated.h \ |
133 | vcard/include/generated/TextListValue-generated.h | 132 | vcard/include/generated/TextListValue-generated.h |
134 | 133 | ||
135 | 134 | ||
136 | # plugins/ldap/resourceldap.h \ | 135 | # plugins/ldap/resourceldap.h \ |
137 | # plugins/ldap/resourceldapconfig.h \ | 136 | # plugins/ldap/resourceldapconfig.h \ |
138 | #formats/binary/binaryformat.h \ | 137 | #formats/binary/binaryformat.h \ |
139 | 138 | ||
139 | #vcard/include/VCardTextNSParam.h \ | ||
140 | 140 | ||
141 | SOURCES = \ | 141 | SOURCES = \ |
142 | distributionlist.cpp \ | 142 | distributionlist.cpp \ |
143 | distributionlistdialog.cpp \ | 143 | distributionlistdialog.cpp \ |
144 | distributionlisteditor.cpp \ | 144 | distributionlisteditor.cpp \ |
145 | vcardformatplugin.cpp \ | 145 | vcardformatplugin.cpp \ |
146 | formats/vcardformatplugin2.cpp \ | 146 | formats/vcardformatplugin2.cpp \ |
147 | formatfactory.cpp \ | 147 | formatfactory.cpp \ |
148 | resource.cpp \ | 148 | resource.cpp \ |
149 | stdaddressbook.cpp \ | 149 | stdaddressbook.cpp \ |
150 | plugin.cpp \ | 150 | plugin.cpp \ |
151 | agent.cpp \ | 151 | agent.cpp \ |
152 | geo.cpp \ | 152 | geo.cpp \ |
153 | key.cpp \ | 153 | key.cpp \ |
154 | field.cpp \ | 154 | field.cpp \ |
155 | address.cpp \ | 155 | address.cpp \ |
156 | phonenumber.cpp \ | 156 | phonenumber.cpp \ |
157 | picture.cpp \ | 157 | picture.cpp \ |
158 | secrecy.cpp \ | 158 | secrecy.cpp \ |
159 | sound.cpp \ | 159 | sound.cpp \ |
160 | addressbook.cpp \ | 160 | addressbook.cpp \ |
161 | syncprefwidget.cpp \ | 161 | syncprefwidget.cpp \ |
162 | timezone.cpp \ | 162 | timezone.cpp \ |
163 | tmpaddressbook.cpp \ | 163 | tmpaddressbook.cpp \ |
164 | addressee.cpp \ | 164 | addressee.cpp \ |
165 | addresseelist.cpp \ | 165 | addresseelist.cpp \ |
166 | addresseedialog.cpp \ | 166 | addresseedialog.cpp \ |
167 | vcardconverter.cpp \ | 167 | vcardconverter.cpp \ |
168 | vcard21parser.cpp \ | 168 | vcard21parser.cpp \ |
169 | vcardformatimpl.cpp \ | 169 | vcardformatimpl.cpp \ |
170 | plugins/file/resourcefile.cpp \ | 170 | plugins/file/resourcefile.cpp \ |
171 | plugins/file/resourcefileconfig.cpp \ | 171 | plugins/file/resourcefileconfig.cpp \ |
172 | plugins/dir/resourcedir.cpp \ | 172 | plugins/dir/resourcedir.cpp \ |
173 | plugins/dir/resourcedirconfig.cpp \ | 173 | plugins/dir/resourcedirconfig.cpp \ |
174 | vcardparser/vcardline.cpp \ | 174 | vcardparser/vcardline.cpp \ |
175 | vcardparser/vcard.cpp \ | 175 | vcardparser/vcard.cpp \ |
176 | vcardparser/vcardtool.cpp \ | 176 | vcardparser/vcardtool.cpp \ |
177 | vcardparser/vcardparser.cpp \ | 177 | vcardparser/vcardparser.cpp \ |
178 | vcard/AdrParam.cpp \ | 178 | vcard/AdrParam.cpp \ |
179 | vcard/AdrValue.cpp \ | 179 | vcard/AdrValue.cpp \ |
180 | vcard/AgentParam.cpp \ | 180 | vcard/AgentParam.cpp \ |
181 | vcard/ContentLine.cpp \ | 181 | vcard/ContentLine.cpp \ |
182 | vcard/DateParam.cpp \ | 182 | vcard/DateParam.cpp \ |
183 | vcard/DateValue.cpp \ | 183 | vcard/DateValue.cpp \ |
184 | vcard/EmailParam.cpp \ | 184 | vcard/EmailParam.cpp \ |
185 | vcard/Entity.cpp \ | 185 | vcard/Entity.cpp \ |
186 | vcard/Enum.cpp \ | 186 | vcard/Enum.cpp \ |
187 | vcard/GeoValue.cpp \ | 187 | vcard/GeoValue.cpp \ |
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp index 7d0c516..b420351 100644 --- a/korganizer/kdatenavigator.cpp +++ b/korganizer/kdatenavigator.cpp | |||
@@ -204,100 +204,103 @@ void KDateNavigator::updateDates() | |||
204 | QDate dayone( m_MthYr.year(), m_MthYr.month(), m_MthYr.day() ); | 204 | QDate dayone( m_MthYr.year(), m_MthYr.month(), m_MthYr.day() ); |
205 | int d2 = KOGlobals::self()->calendarSystem()->day( dayone ); | 205 | int d2 = KOGlobals::self()->calendarSystem()->day( dayone ); |
206 | //int di = d1 - d2 + 1; | 206 | //int di = d1 - d2 + 1; |
207 | dayone = dayone.addDays( -d2 + 1 ); | 207 | dayone = dayone.addDays( -d2 + 1 ); |
208 | 208 | ||
209 | int m_fstDayOfWkCalsys = KOGlobals::self()->calendarSystem()->dayOfWeek( dayone ); | 209 | int m_fstDayOfWkCalsys = KOGlobals::self()->calendarSystem()->dayOfWeek( dayone ); |
210 | 210 | ||
211 | // If month begins on Monday and Monday is first day of week, | 211 | // If month begins on Monday and Monday is first day of week, |
212 | // month should begin on second line. Sunday doesn't have this problem. | 212 | // month should begin on second line. Sunday doesn't have this problem. |
213 | int nextLine = ( ( m_fstDayOfWkCalsys == 1) && | 213 | int nextLine = ( ( m_fstDayOfWkCalsys == 1) && |
214 | ( KGlobal::locale()->weekStartsMonday() == 1 ) ) ? 7 : 0; | 214 | ( KGlobal::locale()->weekStartsMonday() == 1 ) ) ? 7 : 0; |
215 | 215 | ||
216 | // update the matrix dates | 216 | // update the matrix dates |
217 | int index = (KGlobal::locale()->weekStartsMonday() ? 1 : 0) - m_fstDayOfWkCalsys - nextLine; | 217 | int index = (KGlobal::locale()->weekStartsMonday() ? 1 : 0) - m_fstDayOfWkCalsys - nextLine; |
218 | 218 | ||
219 | 219 | ||
220 | daymatrix->updateView(dayone.addDays(index)); | 220 | daymatrix->updateView(dayone.addDays(index)); |
221 | //each updateDates is followed by an updateView -> repaint is issued there ! | 221 | //each updateDates is followed by an updateView -> repaint is issued there ! |
222 | // daymatrix->repaint(); | 222 | // daymatrix->repaint(); |
223 | } | 223 | } |
224 | 224 | ||
225 | void KDateNavigator::updateDayMatrix() | 225 | void KDateNavigator::updateDayMatrix() |
226 | { | 226 | { |
227 | daymatrix->updateView(); | 227 | daymatrix->updateView(); |
228 | daymatrix->repaint(); | 228 | daymatrix->repaint(); |
229 | } | 229 | } |
230 | 230 | ||
231 | 231 | ||
232 | void KDateNavigator::updateView() | 232 | void KDateNavigator::updateView() |
233 | { | 233 | { |
234 | 234 | ||
235 | setUpdatesEnabled( false ); | 235 | setUpdatesEnabled( false ); |
236 | 236 | ||
237 | int i; | 237 | int i; |
238 | 238 | ||
239 | // kdDebug() << "updateView() -> daymatrix->updateView()" << endl; | 239 | // kdDebug() << "updateView() -> daymatrix->updateView()" << endl; |
240 | daymatrix->updateView(); | 240 | daymatrix->updateView(); |
241 | 241 | ||
242 | // set the week numbers. | 242 | // set the week numbers. |
243 | for(i = 0; i < 6; i++) { | 243 | for(i = 0; i < 6; i++) { |
244 | QString weeknum; | 244 | QString weeknum; |
245 | // remember, according to ISO 8601, the first week of the year is the | 245 | // remember, according to ISO 8601, the first week of the year is the |
246 | // first week that contains a thursday. Thus we must subtract off 4, | 246 | // first week that contains a thursday. Thus we must subtract off 4, |
247 | // not just 1. | 247 | // not just 1. |
248 | 248 | ||
249 | //ET int dayOfYear = buttons[(i + 1) * 7 - 4]->date().dayOfYear(); | 249 | //ET int dayOfYear = buttons[(i + 1) * 7 - 4]->date().dayOfYear(); |
250 | int dayOfYear = KOGlobals::self()->calendarSystem()->dayOfYear((daymatrix->getDate((i+1)*7-4))); | 250 | int dayOfYear = KOGlobals::self()->calendarSystem()->dayOfYear((daymatrix->getDate((i+1)*7-4))); |
251 | 251 | ||
252 | int add = 0; | ||
253 | if ( ! KGlobal::locale()->weekStartsMonday() ) | ||
254 | ++add; | ||
252 | if (dayOfYear % 7 != 0) | 255 | if (dayOfYear % 7 != 0) |
253 | weeknum.setNum(dayOfYear / 7 + 1); | 256 | weeknum.setNum(dayOfYear / 7 + 1+add); |
254 | else | 257 | else |
255 | weeknum.setNum(dayOfYear / 7); | 258 | weeknum.setNum(dayOfYear / 7 +add); |
256 | weeknos[i]->setText(weeknum); | 259 | weeknos[i]->setText(weeknum); |
257 | } | 260 | } |
258 | 261 | ||
259 | setUpdatesEnabled( true ); | 262 | setUpdatesEnabled( true ); |
260 | // kdDebug() << "updateView() -> repaint()" << endl; | 263 | // kdDebug() << "updateView() -> repaint()" << endl; |
261 | repaint(); | 264 | repaint(); |
262 | daymatrix->repaint(); | 265 | daymatrix->repaint(); |
263 | } | 266 | } |
264 | 267 | ||
265 | void KDateNavigator::updateConfig() | 268 | void KDateNavigator::updateConfig() |
266 | { | 269 | { |
267 | int day; | 270 | int day; |
268 | for(int i=0; i<7; i++) { | 271 | for(int i=0; i<7; i++) { |
269 | // take the first letter of the day name to be the abbreviation | 272 | // take the first letter of the day name to be the abbreviation |
270 | if (KGlobal::locale()->weekStartsMonday()) { | 273 | if (KGlobal::locale()->weekStartsMonday()) { |
271 | day = i+1; | 274 | day = i+1; |
272 | } else { | 275 | } else { |
273 | if (i==0) day = 7; | 276 | if (i==0) day = 7; |
274 | else day = i; | 277 | else day = i; |
275 | } | 278 | } |
276 | QString dayName = KOGlobals::self()->calendarSystem()->weekDayName( day, | 279 | QString dayName = KOGlobals::self()->calendarSystem()->weekDayName( day, |
277 | true ); | 280 | true ); |
278 | if ( KOPrefs::instance()->mCompactDialogs ) dayName = dayName.left( 1 ); | 281 | if ( KOPrefs::instance()->mCompactDialogs ) dayName = dayName.left( 1 ); |
279 | headings[i]->setText( dayName ); | 282 | headings[i]->setText( dayName ); |
280 | } | 283 | } |
281 | updateDates(); | 284 | updateDates(); |
282 | updateView(); | 285 | updateView(); |
283 | } | 286 | } |
284 | 287 | ||
285 | void KDateNavigator::setShowWeekNums(bool enabled) | 288 | void KDateNavigator::setShowWeekNums(bool enabled) |
286 | { | 289 | { |
287 | m_bShowWeekNums = enabled; | 290 | m_bShowWeekNums = enabled; |
288 | for(int i=0; i<6; i++) { | 291 | for(int i=0; i<6; i++) { |
289 | if(enabled) | 292 | if(enabled) |
290 | weeknos[i]->show(); | 293 | weeknos[i]->show(); |
291 | else | 294 | else |
292 | weeknos[i]->hide(); | 295 | weeknos[i]->hide(); |
293 | } | 296 | } |
294 | resize(size()); | 297 | resize(size()); |
295 | } | 298 | } |
296 | 299 | ||
297 | void KDateNavigator::selectDates(const DateList& dateList) | 300 | void KDateNavigator::selectDates(const DateList& dateList) |
298 | { | 301 | { |
299 | 302 | ||
300 | if (dateList.count() > 0) { | 303 | if (dateList.count() > 0) { |
301 | mNavigatorBar->selectDates( dateList ); | 304 | mNavigatorBar->selectDates( dateList ); |
302 | mSelectedDates = dateList; | 305 | mSelectedDates = dateList; |
303 | 306 | ||
diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp index 584d1ed..4209e10 100644 --- a/korganizer/koeditorrecurrence.cpp +++ b/korganizer/koeditorrecurrence.cpp | |||
@@ -1007,97 +1007,97 @@ void KOEditorRecurrence::readEvent(Event *event) | |||
1007 | mRecurrenceChooser->setType( recurrenceType ); | 1007 | mRecurrenceChooser->setType( recurrenceType ); |
1008 | showCurrentRule( recurrenceType ); | 1008 | showCurrentRule( recurrenceType ); |
1009 | 1009 | ||
1010 | mRecurrenceRange->setDateTimes( event->dtStart() ); | 1010 | mRecurrenceRange->setDateTimes( event->dtStart() ); |
1011 | 1011 | ||
1012 | if ( r->doesRecur() ) { | 1012 | if ( r->doesRecur() ) { |
1013 | mRecurrenceRange->setDuration( r->duration() ); | 1013 | mRecurrenceRange->setDuration( r->duration() ); |
1014 | if ( r->duration() == 0 ) | 1014 | if ( r->duration() == 0 ) |
1015 | { | 1015 | { |
1016 | if ( r->endDate() < event->dtStart().date() ) | 1016 | if ( r->endDate() < event->dtStart().date() ) |
1017 | mRecurrenceRange->setEndDate( event->dtStart().date() ); | 1017 | mRecurrenceRange->setEndDate( event->dtStart().date() ); |
1018 | else | 1018 | else |
1019 | mRecurrenceRange->setEndDate( r->endDate() ); | 1019 | mRecurrenceRange->setEndDate( r->endDate() ); |
1020 | } else | 1020 | } else |
1021 | mRecurrenceRange->setEndDate( event->dtStart().date() ); | 1021 | mRecurrenceRange->setEndDate( event->dtStart().date() ); |
1022 | } | 1022 | } |
1023 | 1023 | ||
1024 | mExceptions->setDates( event->exDates() ); | 1024 | mExceptions->setDates( event->exDates() ); |
1025 | } | 1025 | } |
1026 | 1026 | ||
1027 | void KOEditorRecurrence::writeEvent( Event *event ) | 1027 | void KOEditorRecurrence::writeEvent( Event *event ) |
1028 | { | 1028 | { |
1029 | Recurrence *r = event->recurrence(); | 1029 | Recurrence *r = event->recurrence(); |
1030 | 1030 | ||
1031 | // clear out any old settings; | 1031 | // clear out any old settings; |
1032 | r->unsetRecurs(); | 1032 | r->unsetRecurs(); |
1033 | 1033 | ||
1034 | if ( mEnabledCheck->isChecked() ) { | 1034 | if ( mEnabledCheck->isChecked() ) { |
1035 | int duration = mRecurrenceRange->duration(); | 1035 | int duration = mRecurrenceRange->duration(); |
1036 | QDate endDate; | 1036 | QDate endDate; |
1037 | if ( duration == 0 ) endDate = mRecurrenceRange->endDate(); | 1037 | if ( duration == 0 ) endDate = mRecurrenceRange->endDate(); |
1038 | 1038 | ||
1039 | int recurrenceType = mRecurrenceChooser->type(); | 1039 | int recurrenceType = mRecurrenceChooser->type(); |
1040 | 1040 | ||
1041 | if ( recurrenceType == RecurrenceChooser::Daily ) { | 1041 | if ( recurrenceType == RecurrenceChooser::Daily ) { |
1042 | int freq = mDaily->frequency(); | 1042 | int freq = mDaily->frequency(); |
1043 | if ( duration != 0 ) r->setDaily( freq, duration ); | 1043 | if ( duration != 0 ) r->setDaily( freq, duration ); |
1044 | else r->setDaily( freq, endDate ); | 1044 | else r->setDaily( freq, endDate ); |
1045 | } else if ( recurrenceType == RecurrenceChooser::Weekly ) { | 1045 | } else if ( recurrenceType == RecurrenceChooser::Weekly ) { |
1046 | int freq = mWeekly->frequency(); | 1046 | int freq = mWeekly->frequency(); |
1047 | QBitArray days = mWeekly->days(); | 1047 | QBitArray days = mWeekly->days(); |
1048 | int j; | 1048 | int j; |
1049 | bool found = false; | 1049 | bool found = false; |
1050 | for (j = 0; j < 7 ; ++j ) { | 1050 | for (j = 0; j < 7 ; ++j ) { |
1051 | found |=days.at(j); | 1051 | found |=days.at(j); |
1052 | } | 1052 | } |
1053 | if ( !found ) { | 1053 | if ( !found ) { |
1054 | days.setBit( event->dtStart().date().dayOfWeek()-1); | 1054 | days.setBit( event->dtStart().date().dayOfWeek()-1); |
1055 | qDebug("bit set %d "); | 1055 | qDebug("bit set %d ", event->dtStart().date().dayOfWeek()-1); |
1056 | } | 1056 | } |
1057 | if ( duration != 0 ) r->setWeekly( freq, days, duration ); | 1057 | if ( duration != 0 ) r->setWeekly( freq, days, duration ); |
1058 | else r->setWeekly( freq, days, endDate ); | 1058 | else r->setWeekly( freq, days, endDate ); |
1059 | } else if ( recurrenceType == RecurrenceChooser::Monthly ) { | 1059 | } else if ( recurrenceType == RecurrenceChooser::Monthly ) { |
1060 | int freq = mMonthly->frequency(); | 1060 | int freq = mMonthly->frequency(); |
1061 | if ( mMonthly->byPos() ) { | 1061 | if ( mMonthly->byPos() ) { |
1062 | int pos = mMonthly->count(); | 1062 | int pos = mMonthly->count(); |
1063 | 1063 | ||
1064 | QBitArray days( 7 ); | 1064 | QBitArray days( 7 ); |
1065 | days.fill( false ); | 1065 | days.fill( false ); |
1066 | 1066 | ||
1067 | days.setBit( mMonthly->weekday() ); | 1067 | days.setBit( mMonthly->weekday() ); |
1068 | if ( duration != 0 ) | 1068 | if ( duration != 0 ) |
1069 | r->setMonthly( Recurrence::rMonthlyPos, freq, duration ); | 1069 | r->setMonthly( Recurrence::rMonthlyPos, freq, duration ); |
1070 | else | 1070 | else |
1071 | r->setMonthly( Recurrence::rMonthlyPos, freq, endDate ); | 1071 | r->setMonthly( Recurrence::rMonthlyPos, freq, endDate ); |
1072 | r->addMonthlyPos( pos, days ); | 1072 | r->addMonthlyPos( pos, days ); |
1073 | } else { | 1073 | } else { |
1074 | // it's by day | 1074 | // it's by day |
1075 | int day = mMonthly->day(); | 1075 | int day = mMonthly->day(); |
1076 | 1076 | ||
1077 | if ( duration != 0 ) { | 1077 | if ( duration != 0 ) { |
1078 | r->setMonthly( Recurrence::rMonthlyDay, freq, duration ); | 1078 | r->setMonthly( Recurrence::rMonthlyDay, freq, duration ); |
1079 | } else { | 1079 | } else { |
1080 | r->setMonthly( Recurrence::rMonthlyDay, freq, endDate ); | 1080 | r->setMonthly( Recurrence::rMonthlyDay, freq, endDate ); |
1081 | } | 1081 | } |
1082 | r->addMonthlyDay( day ); | 1082 | r->addMonthlyDay( day ); |
1083 | } | 1083 | } |
1084 | } else if ( recurrenceType == RecurrenceChooser::Yearly ) { | 1084 | } else if ( recurrenceType == RecurrenceChooser::Yearly ) { |
1085 | qDebug("RecurrenceChooser::Yearly "); | 1085 | qDebug("RecurrenceChooser::Yearly "); |
1086 | int freq = mYearly->frequency(); | 1086 | int freq = mYearly->frequency(); |
1087 | if ( mYearly->byDay() ) { | 1087 | if ( mYearly->byDay() ) { |
1088 | if ( duration != 0 ) { | 1088 | if ( duration != 0 ) { |
1089 | r->setYearly( Recurrence::rYearlyDay, freq, duration ); | 1089 | r->setYearly( Recurrence::rYearlyDay, freq, duration ); |
1090 | } else { | 1090 | } else { |
1091 | r->setYearly( Recurrence::rYearlyDay, freq, endDate ); | 1091 | r->setYearly( Recurrence::rYearlyDay, freq, endDate ); |
1092 | } | 1092 | } |
1093 | r->addYearlyNum( event->dtStart().date().dayOfYear() ); | 1093 | r->addYearlyNum( event->dtStart().date().dayOfYear() ); |
1094 | } else { | 1094 | } else { |
1095 | if ( duration != 0 ) { | 1095 | if ( duration != 0 ) { |
1096 | r->setYearly( Recurrence::rYearlyMonth, freq, duration ); | 1096 | r->setYearly( Recurrence::rYearlyMonth, freq, duration ); |
1097 | } else { | 1097 | } else { |
1098 | r->setYearly( Recurrence::rYearlyMonth, freq, endDate ); | 1098 | r->setYearly( Recurrence::rYearlyMonth, freq, endDate ); |
1099 | } | 1099 | } |
1100 | r->addYearlyNum( mYearly->month() ); | 1100 | r->addYearlyNum( mYearly->month() ); |
1101 | } | 1101 | } |
1102 | 1102 | ||
1103 | } | 1103 | } |
diff --git a/libkcal/calendar.h b/libkcal/calendar.h index 06a911c..c45d81f 100644 --- a/libkcal/calendar.h +++ b/libkcal/calendar.h | |||
@@ -1,90 +1,90 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of libkcal. | 2 | This file is part of libkcal. |
3 | Copyright (c) 1998 Preston Brown | 3 | Copyright (c) 1998 Preston Brown |
4 | Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> | 4 | Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> |
5 | 5 | ||
6 | This library is free software; you can redistribute it and/or | 6 | This library is free software; you can redistribute it and/or |
7 | modify it under the terms of the GNU Library General Public | 7 | modify it under the terms of the GNU Library General Public |
8 | License as published by the Free Software Foundation; either | 8 | License as published by the Free Software Foundation; either |
9 | version 2 of the License, or (at your option) any later version. | 9 | version 2 of the License, or (at your option) any later version. |
10 | 10 | ||
11 | This library is distributed in the hope that it will be useful, | 11 | This library is distributed in the hope that it will be useful, |
12 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
14 | Library General Public License for more details. | 14 | Library General Public License for more details. |
15 | 15 | ||
16 | You should have received a copy of the GNU Library General Public License | 16 | You should have received a copy of the GNU Library General Public License |
17 | along with this library; see the file COPYING.LIB. If not, write to | 17 | along with this library; see the file COPYING.LIB. If not, write to |
18 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 18 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
19 | Boston, MA 02111-1307, USA. | 19 | Boston, MA 02111-1307, USA. |
20 | */ | 20 | */ |
21 | 21 | ||
22 | #ifndef CALENDAR_H | 22 | #ifndef CALENDAR_H |
23 | #define CALENDAR_H | 23 | #define CALENDAR_H |
24 | 24 | ||
25 | #include <qobject.h> | 25 | #include <qobject.h> |
26 | #include <qstring.h> | 26 | #include <qstring.h> |
27 | #include <qdatetime.h> | 27 | #include <qdatetime.h> |
28 | #include <qptrlist.h> | 28 | #include <qptrlist.h> |
29 | #include <qdict.h> | 29 | #include <qdict.h> |
30 | 30 | ||
31 | #include "customproperties.h" | 31 | #include "customproperties.h" |
32 | #include "event.h" | 32 | #include "event.h" |
33 | #include "todo.h" | 33 | #include "todo.h" |
34 | #include "journal.h" | 34 | #include "journal.h" |
35 | #include "calfilter.h" | ||
35 | 36 | ||
36 | #define _TIME_ZONE "-0500" /* hardcoded, overridden in config file. */ | 37 | //#define _TIME_ZONE "-0500" /* hardcoded, overridden in config file. */ |
37 | 38 | ||
38 | class KConfig; | 39 | class KConfig; |
39 | 40 | ||
40 | namespace KCal { | 41 | namespace KCal { |
41 | 42 | ||
42 | class CalFilter; | ||
43 | 43 | ||
44 | /** | 44 | /** |
45 | This is the main "calendar" object class for KOrganizer. It holds | 45 | This is the main "calendar" object class for KOrganizer. It holds |
46 | information like all appointments/events, user information, etc. etc. | 46 | information like all appointments/events, user information, etc. etc. |
47 | one calendar is associated with each CalendarView (@see calendarview.h). | 47 | one calendar is associated with each CalendarView (@see calendarview.h). |
48 | This is an abstract base class defining the interface to a calendar. It is | 48 | This is an abstract base class defining the interface to a calendar. It is |
49 | implemented by subclasses like @see CalendarLocal, which use different | 49 | implemented by subclasses like @see CalendarLocal, which use different |
50 | methods to store and access the data. | 50 | methods to store and access the data. |
51 | 51 | ||
52 | Ownership of events etc. is handled by the following policy: As soon as an | 52 | Ownership of events etc. is handled by the following policy: As soon as an |
53 | event (or any other subclass of IncidenceBase) object is added to the | 53 | event (or any other subclass of IncidenceBase) object is added to the |
54 | Calendar by addEvent() it is owned by the Calendar object. The Calendar takes | 54 | Calendar by addEvent() it is owned by the Calendar object. The Calendar takes |
55 | care of deleting it. All Events returned by the query functions are returned | 55 | care of deleting it. All Events returned by the query functions are returned |
56 | as pointers, that means all changes to the returned events are immediately | 56 | as pointers, that means all changes to the returned events are immediately |
57 | visible in the Calendar. You shouldn't delete any Event object you get from | 57 | visible in the Calendar. You shouldn't delete any Event object you get from |
58 | Calendar. | 58 | Calendar. |
59 | */ | 59 | */ |
60 | class Calendar : public QObject, public CustomProperties, | 60 | class Calendar : public QObject, public CustomProperties, |
61 | public IncidenceBase::Observer | 61 | public IncidenceBase::Observer |
62 | { | 62 | { |
63 | Q_OBJECT | 63 | Q_OBJECT |
64 | public: | 64 | public: |
65 | Calendar(); | 65 | Calendar(); |
66 | Calendar(const QString &timeZoneId); | 66 | Calendar(const QString &timeZoneId); |
67 | virtual ~Calendar(); | 67 | virtual ~Calendar(); |
68 | void deleteIncidence(Incidence *in); | 68 | void deleteIncidence(Incidence *in); |
69 | void resetTempSyncStat(); | 69 | void resetTempSyncStat(); |
70 | /** | 70 | /** |
71 | Clears out the current calendar, freeing all used memory etc. | 71 | Clears out the current calendar, freeing all used memory etc. |
72 | */ | 72 | */ |
73 | virtual void close() = 0; | 73 | virtual void close() = 0; |
74 | 74 | ||
75 | /** | 75 | /** |
76 | Sync changes in memory to persistant storage. | 76 | Sync changes in memory to persistant storage. |
77 | */ | 77 | */ |
78 | virtual void save() = 0; | 78 | virtual void save() = 0; |
79 | virtual QPtrList<Event> getExternLastSyncEvents() = 0; | 79 | virtual QPtrList<Event> getExternLastSyncEvents() = 0; |
80 | virtual bool isSaving() { return false; } | 80 | virtual bool isSaving() { return false; } |
81 | 81 | ||
82 | /** | 82 | /** |
83 | Return the owner of the calendar's full name. | 83 | Return the owner of the calendar's full name. |
84 | */ | 84 | */ |
85 | const QString &getOwner() const; | 85 | const QString &getOwner() const; |
86 | /** | 86 | /** |
87 | Set the owner of the calendar. Should be owner's full name. | 87 | Set the owner of the calendar. Should be owner's full name. |
88 | */ | 88 | */ |
89 | void setOwner( const QString &os ); | 89 | void setOwner( const QString &os ); |
90 | /** | 90 | /** |