summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile662
-rw-r--r--korganizer/koagendaview.cpp4
2 files changed, 386 insertions, 280 deletions
diff --git a/Makefile b/Makefile
index 4d42c35..594d47d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,279 +1,385 @@
1############################################################################# 1export KDEPIMDIR = $(shell pwd)
2# Makefile for building: kdepim-desktop 2
3# Generated by qmake (1.07a) (Qt 3.3.4) on: Sat Apr 9 15:21:46 2005 3export KDEPIM_VERSION=$(shell sed -e 's/.*\"\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/' < version)
4# Project: kdepim-desktop.pro 4
5# Template: subdirs 5ifeq ($(PLATFORM) , zaurus)
6# Command: $(QMAKE) -o Makefile kdepim-desktop.pro 6 BUILD_NO_LDAP_PLUGIN=1
7############################################################################# 7endif
8 8
9 MAKEFILE =Makefile 9ifneq ($(PLATFORM) , zaurus)
10 QMAKE =qmake 10 BUILD_NO_SHARP_PLUGIN=1
11DEL_FILE = rm -f 11endif
12CHK_DIR_EXISTS= test -d 12
13MKDIR = mkdir -p 13#opie plugin is deprecated. The qtopia plugin handles the task from now on.
14INSTALL_FILE= 14BUILD_NO_OPIE_PLUGIN=1
15INSTALL_DIR = 15
16 SUBTARGETS = \ 16SUBDIRS_MICROKDE = \
17 sub-kabc-plugins-file \ 17 libical/src/libical \
18 sub-kabc-plugins-dir \ 18 libical/src/libicalss \
19 sub-kabc-plugins-qtopia \ 19 qtcompat \
20 sub-libical \ 20 microkde \
21 sub-libkcal \ 21 libkcal \
22 sub-kabc \ 22 libkdepim \
23 sub-libkdepim \ 23 kabc \
24 sub-microkde \ 24 kabc/formats/binary \
25 sub-korganizer \ 25 kabc/plugins/file \
26 sub-kaddressbook \ 26 kabc/plugins/dir \
27 sub-gammu-emb-common \ 27 korganizer \
28 sub-gammu-emb-gammu \ 28 kalarmd \
29 sub-libetpan \ 29 kaddressbook
30 sub-kmicromail-libmailwrapper \ 30
31 sub-kmicromail \ 31SUBDIRS_QTOPIA_PLUGIN = \
32 sub-pwmanager-libcrypt-cipher \ 32 kabc/plugins/qtopia
33 sub-pwmanager-libcrypt-error \ 33
34 sub-pwmanager-libcrypt-mpi \ 34SUBDIRS_OPIE_PLUGIN = \
35 sub-pwmanager-libcrypt-zlib \ 35 kabc/plugins/opie
36 sub-pwmanager-pwmanager 36
37 37SUBDIRS_SHARP_PLUGIN = \
38first: all 38 kabc/plugins/sharpdtm
39 39
40all: Makefile $(SUBTARGETS) 40SUBDIRS_LDAP_PLUGIN = \
41 41 kabc/plugins/ldap
42kabc/plugins/file/$(MAKEFILE): 42
43 @$(CHK_DIR_EXISTS) "kabc/plugins/file" || $(MKDIR) "kabc/plugins/file" 43SUBDIRS_MICROMAIL = \
44 cd kabc/plugins/file && $(QMAKE) file.pro -o $(MAKEFILE) 44 libetpan \
45sub-kabc-plugins-file: kabc/plugins/file/$(MAKEFILE) FORCE 45 kmicromail/libmailwrapper \
46 cd kabc/plugins/file && $(MAKE) -f $(MAKEFILE) 46 kmicromail
47 47
48kabc/plugins/dir/$(MAKEFILE): 48SUBDIRS_GAMMU = \
49 @$(CHK_DIR_EXISTS) "kabc/plugins/dir" || $(MKDIR) "kabc/plugins/dir" 49 gammu/emb/common \
50 cd kabc/plugins/dir && $(QMAKE) dir.pro -o $(MAKEFILE) 50 gammu/emb/gammu
51sub-kabc-plugins-dir: kabc/plugins/dir/$(MAKEFILE) FORCE 51
52 cd kabc/plugins/dir && $(MAKE) -f $(MAKEFILE) 52SUBDIRS_PWMANAGER = \
53 53 pwmanager/libcrypt/mpi \
54kabc/plugins/qtopia/$(MAKEFILE): 54 pwmanager/libcrypt/error \
55 @$(CHK_DIR_EXISTS) "kabc/plugins/qtopia" || $(MKDIR) "kabc/plugins/qtopia" 55 pwmanager/libcrypt/cipher \
56 cd kabc/plugins/qtopia && $(QMAKE) qtopia.pro -o $(MAKEFILE) 56 pwmanager/libcrypt/zlib \
57sub-kabc-plugins-qtopia: kabc/plugins/qtopia/$(MAKEFILE) FORCE 57 pwmanager/pwmanager
58 cd kabc/plugins/qtopia && $(MAKE) -f $(MAKEFILE) 58
59 59SUBDIRS = \
60libical/$(MAKEFILE): 60 $(SUBDIRS_MICROKDE) \
61 @$(CHK_DIR_EXISTS) "libical" || $(MKDIR) "libical" 61 $(SUBDIRS_QTOPIA_PLUGIN) \
62 cd libical && $(QMAKE) libical.pro -o $(MAKEFILE) 62 $(SUBDIRS_OPIE_PLUGIN) \
63sub-libical: libical/$(MAKEFILE) FORCE 63 $(SUBDIRS_SHARP_PLUGIN) \
64 cd libical && $(MAKE) -f $(MAKEFILE) 64 $(SUBDIRS_LDAP_PLUGIN) \
65 65 $(SUBDIRS_MICROMAIL) \
66libkcal/$(MAKEFILE): 66 $(SUBDIRS_GAMMU) \
67 @$(CHK_DIR_EXISTS) "libkcal" || $(MKDIR) "libkcal" 67 $(SUBDIRS_PWMANAGER)
68 cd libkcal && $(QMAKE) libkcal.pro -o $(MAKEFILE) 68
69sub-libkcal: libkcal/$(MAKEFILE) FORCE 69
70 cd libkcal && $(MAKE) -f $(MAKEFILE) 70all: build_microkde \
71 71 build_qtopia_plugin \
72kabc/$(MAKEFILE): 72 build_opie_plugin \
73 @$(CHK_DIR_EXISTS) "kabc" || $(MKDIR) "kabc" 73 build_sharp_plugin \
74 cd kabc && $(QMAKE) kabc.pro -o $(MAKEFILE) 74 build_ldap_plugin \
75sub-kabc: kabc/$(MAKEFILE) FORCE 75 build_micromail \
76 cd kabc && $(MAKE) -f $(MAKEFILE) 76 build_gammu \
77 77 build_pwmanager
78libkdepim/$(MAKEFILE): 78
79 @$(CHK_DIR_EXISTS) "libkdepim" || $(MKDIR) "libkdepim" 79
80 cd libkdepim && $(QMAKE) libkdepim.pro -o $(MAKEFILE) 80build_microkde: variable_test tmake
81sub-libkdepim: libkdepim/$(MAKEFILE) FORCE 81 for i in $(SUBDIRS_MICROKDE); do pushd $$i; \
82 cd libkdepim && $(MAKE) -f $(MAKEFILE) 82 make -f Makefile$(PLATFORM) || exit 1; popd; \
83 83 done
84microkde/$(MAKEFILE): 84
85 @$(CHK_DIR_EXISTS) "microkde" || $(MKDIR) "microkde" 85build_qtopia_plugin: build_microkde
86 cd microkde && $(QMAKE) microkde.pro -o $(MAKEFILE) 86 ifdef BUILD_NO_QTOPIA_PLUGIN
87sub-microkde: microkde/$(MAKEFILE) FORCE 87 @echo == qtopia plugin not build.
88 cd microkde && $(MAKE) -f $(MAKEFILE) 88 else
89 89 for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \
90korganizer/$(MAKEFILE): 90 make -f Makefile$(PLATFORM) || exit 1; popd; \
91 @$(CHK_DIR_EXISTS) "korganizer" || $(MKDIR) "korganizer" 91 done
92 cd korganizer && $(QMAKE) korganizer.pro -o $(MAKEFILE) 92 endif
93sub-korganizer: korganizer/$(MAKEFILE) FORCE 93
94 cd korganizer && $(MAKE) -f $(MAKEFILE) 94build_opie_plugin: build_microkde
95 95 ifdef BUILD_NO_OPIE_PLUGIN
96kaddressbook/$(MAKEFILE): 96 @echo == opie plugin not build.
97 @$(CHK_DIR_EXISTS) "kaddressbook" || $(MKDIR) "kaddressbook" 97 else
98 cd kaddressbook && $(QMAKE) kaddressbook.pro -o $(MAKEFILE) 98 for i in $(SUBDIRS_OPIE_PLUGIN); do pushd $$i; \
99sub-kaddressbook: kaddressbook/$(MAKEFILE) FORCE 99 make -f Makefile$(PLATFORM) || exit 1; popd; \
100 cd kaddressbook && $(MAKE) -f $(MAKEFILE) 100 done
101 101 endif
102gammu/emb/common/$(MAKEFILE): 102
103 @$(CHK_DIR_EXISTS) "gammu/emb/common" || $(MKDIR) "gammu/emb/common" 103build_sharp_plugin: build_microkde
104 cd gammu/emb/common && $(QMAKE) common.pro -o $(MAKEFILE) 104 ifdef BUILD_NO_SHARP_PLUGIN
105sub-gammu-emb-common: gammu/emb/common/$(MAKEFILE) FORCE 105 @echo == ldap plugin not build.
106 cd gammu/emb/common && $(MAKE) -f $(MAKEFILE) 106 else
107 107 for i in $(SUBDIRS_SHARP_PLUGIN); do pushd $$i; \
108gammu/emb/gammu/$(MAKEFILE): 108 make -f Makefile$(PLATFORM) || exit 1; popd; \
109 @$(CHK_DIR_EXISTS) "gammu/emb/gammu" || $(MKDIR) "gammu/emb/gammu" 109 done
110 cd gammu/emb/gammu && $(QMAKE) gammu.pro -o $(MAKEFILE) 110 endif
111sub-gammu-emb-gammu: gammu/emb/gammu/$(MAKEFILE) FORCE 111
112 cd gammu/emb/gammu && $(MAKE) -f $(MAKEFILE) 112build_ldap_plugin: build_microkde
113 113 ifdef BUILD_NO_LDAP_PLUGIN
114libetpan/$(MAKEFILE): 114 @echo == ldap plugin not build.
115 @$(CHK_DIR_EXISTS) "libetpan" || $(MKDIR) "libetpan" 115 else
116 cd libetpan && $(QMAKE) libetpan.pro -o $(MAKEFILE) 116 for i in $(SUBDIRS_LDAP_PLUGIN); do pushd $$i; \
117sub-libetpan: libetpan/$(MAKEFILE) FORCE 117 make -f Makefile$(PLATFORM) || exit 1; popd; \
118 cd libetpan && $(MAKE) -f $(MAKEFILE) 118 done
119 119 endif
120kmicromail/libmailwrapper/$(MAKEFILE): 120
121 @$(CHK_DIR_EXISTS) "kmicromail/libmailwrapper" || $(MKDIR) "kmicromail/libmailwrapper" 121
122 cd kmicromail/libmailwrapper && $(QMAKE) libmailwrapper.pro -o $(MAKEFILE) 122build_micromail: build_microkde
123sub-kmicromail-libmailwrapper: kmicromail/libmailwrapper/$(MAKEFILE) FORCE 123 ifdef BUILD_NO_MICROMAIL
124 cd kmicromail/libmailwrapper && $(MAKE) -f $(MAKEFILE) 124 @echo == kmicromail not build.
125 125 else
126kmicromail/$(MAKEFILE): 126 for i in $(SUBDIRS_MICROMAIL); do pushd $$i; \
127 @$(CHK_DIR_EXISTS) "kmicromail" || $(MKDIR) "kmicromail" 127 make -f Makefile$(PLATFORM) || exit 1; popd; \
128 cd kmicromail && $(QMAKE) kmicromail.pro -o $(MAKEFILE) 128 done
129sub-kmicromail: kmicromail/$(MAKEFILE) FORCE 129 endif
130 cd kmicromail && $(MAKE) -f $(MAKEFILE) 130
131 131build_gammu: variable_test tmake
132pwmanager/libcrypt/cipher/$(MAKEFILE): 132 ifdef BUILD_NO_GAMMU
133 @$(CHK_DIR_EXISTS) "pwmanager/libcrypt/cipher" || $(MKDIR) "pwmanager/libcrypt/cipher" 133 @echo == gammu not build.
134 cd pwmanager/libcrypt/cipher && $(QMAKE) cipher.pro -o $(MAKEFILE) 134 else
135sub-pwmanager-libcrypt-cipher: pwmanager/libcrypt/cipher/$(MAKEFILE) FORCE 135 for i in $(SUBDIRS_GAMMU); do pushd $$i; \
136 cd pwmanager/libcrypt/cipher && $(MAKE) -f $(MAKEFILE) 136 make -f Makefile$(PLATFORM) || exit 1; popd; \
137 137 done
138pwmanager/libcrypt/error/$(MAKEFILE): 138 endif
139 @$(CHK_DIR_EXISTS) "pwmanager/libcrypt/error" || $(MKDIR) "pwmanager/libcrypt/error" 139
140 cd pwmanager/libcrypt/error && $(QMAKE) error.pro -o $(MAKEFILE) 140build_pwmanager: build_microkde
141sub-pwmanager-libcrypt-error: pwmanager/libcrypt/error/$(MAKEFILE) FORCE 141 ifdef BUILD_NO_PWMANAGER
142 cd pwmanager/libcrypt/error && $(MAKE) -f $(MAKEFILE) 142 @echo == pwmanager not build.
143 143 else
144pwmanager/libcrypt/mpi/$(MAKEFILE): 144 for i in $(SUBDIRS_PWMANAGER); do pushd $$i; \
145 @$(CHK_DIR_EXISTS) "pwmanager/libcrypt/mpi" || $(MKDIR) "pwmanager/libcrypt/mpi" 145 make -f Makefile$(PLATFORM) || exit 1; popd; \
146 cd pwmanager/libcrypt/mpi && $(QMAKE) mpi.pro -o $(MAKEFILE) 146 done
147sub-pwmanager-libcrypt-mpi: pwmanager/libcrypt/mpi/$(MAKEFILE) FORCE 147 endif
148 cd pwmanager/libcrypt/mpi && $(MAKE) -f $(MAKEFILE) 148
149 149
150pwmanager/libcrypt/zlib/$(MAKEFILE): 150variable_info:
151 @$(CHK_DIR_EXISTS) "pwmanager/libcrypt/zlib" || $(MKDIR) "pwmanager/libcrypt/zlib" 151 @echo --------------------------------------
152 cd pwmanager/libcrypt/zlib && $(QMAKE) zlib.pro -o $(MAKEFILE) 152 @echo KDEPIM buildsystem, variableinfo...
153sub-pwmanager-libcrypt-zlib: pwmanager/libcrypt/zlib/$(MAKEFILE) FORCE 153 @echo KDEPIMDIR=$(KDEPIMDIR)
154 cd pwmanager/libcrypt/zlib && $(MAKE) -f $(MAKEFILE) 154 @echo QTDIR=$(QTDIR)
155 155 @echo QPEDIR=$(QPEDIR)
156pwmanager/pwmanager/$(MAKEFILE): 156 @echo OPIEDIR=$(OPIEDIR)
157 @$(CHK_DIR_EXISTS) "pwmanager/pwmanager" || $(MKDIR) "pwmanager/pwmanager" 157 @echo PLATFORM=$(PLATFORM)
158 cd pwmanager/pwmanager && $(QMAKE) pwmanager.pro -o $(MAKEFILE) 158 @echo RELEASE_DEBUG=$(RELEASE_DEBUG)
159sub-pwmanager-pwmanager: pwmanager/pwmanager/$(MAKEFILE) FORCE 159 @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL)
160 cd pwmanager/pwmanager && $(MAKE) -f $(MAKEFILE) 160 @echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN)
161 161 @echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN)
162Makefile: kdepim-desktop.pro /usr/lib/qt3/mkspecs/default/qmake.conf variables.pri 162 @echo BUILD_NO_QTOPIA_PLUGIN=$(BUILD_NO_QTOPIA_PLUGIN)
163 $(QMAKE) -o Makefile kdepim-desktop.pro 163 @echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN)
164qmake: qmake_all 164 ifndef BUILD_NO_SHARP_PLUGIN
165 @$(QMAKE) -o Makefile kdepim-desktop.pro 165 @echo SHARPDTMSDK=$(SHARPDTMSDK)
166 166 endif
167all: $(SUBTARGETS) 167 @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU)
168qmake_all: kabc/plugins/file/$(MAKEFILE) kabc/plugins/dir/$(MAKEFILE) kabc/plugins/qtopia/$(MAKEFILE) libical/$(MAKEFILE) libkcal/$(MAKEFILE) kabc/$(MAKEFILE) libkdepim/$(MAKEFILE) microkde/$(MAKEFILE) korganizer/$(MAKEFILE) kaddressbook/$(MAKEFILE) gammu/emb/common/$(MAKEFILE) gammu/emb/gammu/$(MAKEFILE) libetpan/$(MAKEFILE) kmicromail/libmailwrapper/$(MAKEFILE) kmicromail/$(MAKEFILE) pwmanager/libcrypt/cipher/$(MAKEFILE) pwmanager/libcrypt/error/$(MAKEFILE) pwmanager/libcrypt/mpi/$(MAKEFILE) pwmanager/libcrypt/zlib/$(MAKEFILE) pwmanager/pwmanager/$(MAKEFILE) 168 @echo BUILD_NO_PWMANAGER=$(BUILD_NO_PWMANAGER)
169 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 169 @echo --------------------------------------
170 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 170
171 ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 171variable_test: variable_info
172 ( [ -d libical ] && cd libical ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 172 @echo KDEPIM buildsystem, variablecheck...
173 ( [ -d libkcal ] && cd libkcal ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 173 ifndef KDEPIMDIR
174 ( [ -d kabc ] && cd kabc ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 174 @echo KDEPIMDIR is not defined.
175 ( [ -d libkdepim ] && cd libkdepim ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 175 $(error KDEPIMDIR is not defined)
176 ( [ -d microkde ] && cd microkde ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 176 endif
177 ( [ -d korganizer ] && cd korganizer ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 177 ifndef PLATFORM
178 ( [ -d kaddressbook ] && cd kaddressbook ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 178 @echo PLATFORM is not defined.
179 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 179 $(error PLATFORM is not defined)
180 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 180 endif
181 ( [ -d libetpan ] && cd libetpan ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 181 ifdef BUILD_NO_LDAP_PLUGIN
182 ( [ -d kmicromail/libmailwrapper ] && cd kmicromail/libmailwrapper ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 182 @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN)
183 ( [ -d kmicromail ] && cd kmicromail ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 183 endif
184 ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 184 ifdef BUILD_NO_OPIE_PLUGIN
185 ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 185 @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN)
186 ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 186 endif
187 ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 187 ifdef BUILD_NO_QTOPIA_PLUGIN
188 ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 188 @echo QTOPIA PLUGIN will not be build, because BUILD_NO__QTOPIA_PLUGIN is set to $(BUILD_NO__QTOPIA_PLUGIN)
189clean uicables mocables uiclean mocclean lexclean yaccclean : qmake_all FORCE 189 endif
190 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; ) || true 190 ifdef BUILD_NO_MICROMAIL
191 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; ) || true 191 @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL)
192 ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) $@; ) || true 192 endif
193 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; ) || true 193 ifdef BUILD_NO_SHARP_PLUGIN
194 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; ) || true 194 @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN)
195 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; ) || true 195 else
196 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; ) || true 196 ifndef SHARPDTMSDK
197 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; ) || true 197 @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK)
198 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; ) || true 198 $(error SHARPDTMSDK is not defined)
199 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; ) || true 199 endif
200 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; ) || true 200 endif
201 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) $@; ) || true 201 ifdef BUILD_NO_GAMMU
202 ( [ -d libetpan ] && cd libetpan ; $(MAKE) -f $(MAKEFILE) $@; ) || true 202 @echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU)
203 ( [ -d kmicromail/libmailwrapper ] && cd kmicromail/libmailwrapper ; $(MAKE) -f $(MAKEFILE) $@; ) || true 203 endif
204 ( [ -d kmicromail ] && cd kmicromail ; $(MAKE) -f $(MAKEFILE) $@; ) || true 204 ifdef BUILD_NO_PWMANAGER
205 ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) $@; ) || true 205 @echo PWMANAGER will not be build, because BUILD_NO_PWMANAGER is set to $(BUILD_NO_PWMANAGER)
206 ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) $@; ) || true 206 endif
207 ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) $@; ) || true 207 @echo --------------------------------------
208 ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) $@; ) || true 208
209 ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) $@; ) || true 209
210uninstall_subdirs: qmake_all FORCE 210objects:
211 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true 211 for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done
212 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true 212 for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
213 ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true 213 mkdir -p libical/lib/$(PLATFORM)
214 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true 214 mkdir -p dest
215 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true 215 mkdir -p dest$(LIBICAL_PATH)
216 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true 216 mkdir -p pwmanager/libcrypt/$(PLATFORM)
217 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true 217
218 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true 218clean:
219 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true 219 rm -rf libical/lib/$(PLATFORM)/*;
220 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true 220 rm -rf pwmanager/libcrypt/$(PLATFORM)/*;
221 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true 221 for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\
222 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true 222 rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
223 ( [ -d libetpan ] && cd libetpan ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true 223 done
224 ( [ -d kmicromail/libmailwrapper ] && cd kmicromail/libmailwrapper ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true 224
225 ( [ -d kmicromail ] && cd kmicromail ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true 225pac:
226 ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true 226 rm -f $(QPEDIR)/lib/libmicro*
227 ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true 227 rm -f $(QPEDIR)/plugins/applets/libkopi*
228 ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true 228 make
229 ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true 229 make install
230 ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true 230 make dist
231install_subdirs: qmake_all FORCE 231install:
232 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) install; ) || true 232
233 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) install; ) || true 233 cd bin/kdepim; make install
234 ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) install; ) || true 234 cp -r Pim $(QPEDIR)/apps
235 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) install; ) || true 235 cp db2file/db2file $(QPEDIR)/bin/db2file
236 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) install; ) || true 236 chmod ugo+x $(QPEDIR)/bin/db2file
237 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) install; ) || true 237 cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
238 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) install; ) || true 238 cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
239 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) install; ) || true 239 cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop
240 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) install; ) || true 240 cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop
241 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) install; ) || true 241
242 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) install; ) || true 242dist:
243 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) install; ) || true 243 @echo Dont forget to do "make install" before "make dist"
244 ( [ -d libetpan ] && cd libetpan ; $(MAKE) -f $(MAKEFILE) install; ) || true 244 rm -f *arm.ipk
245 ( [ -d kmicromail/libmailwrapper ] && cd kmicromail/libmailwrapper ; $(MAKE) -f $(MAKEFILE) install; ) || true 245 rm -f *ipk.zip
246 ( [ -d kmicromail ] && cd kmicromail ; $(MAKE) -f $(MAKEFILE) install; ) || true 246 rm -rf ../kdepimpi_$(KDEPIM_VERSION)/*
247 ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) install; ) || true 247 rm -f *~
248 ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) install; ) || true 248 cd ..;mkdir -p kdepimpi_$(KDEPIM_VERSION)
249 ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) install; ) || true 249 cd ../kdepimpi_$(KDEPIM_VERSION);mkdir -p ipk
250 ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) install; ) || true 250 cd ..; tar czf kdepimpi-$(KDEPIM_VERSION).tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia kdepim
251 ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) install; ) || true 251 mkipks kmicrokdelibs.control
252distclean: qmake_all FORCE 252 mkipks korganizer.control
253 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true 253 mkipks kaddressbook.control
254 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true 254 ifndef BUILD_NO_MICROMAIL
255 ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true 255 mkipks kopiemail.control
256 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true 256 endif
257 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true 257 ifndef BUILD_NO_SHARP_PLUGIN
258 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true 258 mkipks ksharpPIM-DTMaccess.control
259 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true 259 endif
260 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true 260 mkipks korganizer-alarm.control
261 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true 261 ifndef BUILD_NO_GAMMU
262 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true 262 mkipks kmobilephoneaccess.control
263 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true 263 endif
264 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true 264 ifndef BUILD_NO_PWMANAGER
265 ( [ -d libetpan ] && cd libetpan ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true 265 mkipks pwmanager.control
266 ( [ -d kmicromail/libmailwrapper ] && cd kmicromail/libmailwrapper ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true 266 endif
267 ( [ -d kmicromail ] && cd kmicromail ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true 267 mkipks pimTABicon.control
268 ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true 268 zip kdepim_$(KDEPIM_VERSION)_for_SharpRom.ipk.zip *.ipk ReleaseNotes.txt
269 ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true 269 mv *.ipk ../kdepimpi_$(KDEPIM_VERSION)/ipk/
270 ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true 270 mv *for_SharpRom.ipk.zip ../kdepimpi_$(KDEPIM_VERSION)/
271 ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true 271 mv ../kdepimpi-$(KDEPIM_VERSION).tar.gz ../kdepimpi_$(KDEPIM_VERSION)/
272 ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true 272
273 273tmake: objects \
274install: install_subdirs 274 qtcompat/Makefile$(PLATFORM) \
275 275 microkde/Makefile$(PLATFORM) \
276uninstall: uninstall_subdirs 276 libkcal/Makefile$(PLATFORM) \
277 277 libkdepim/Makefile$(PLATFORM) \
278FORCE: 278 korganizer/Makefile$(PLATFORM) \
279 kalarmd/Makefile$(PLATFORM) \
280 libical/src/libical/Makefile$(PLATFORM) \
281 libical/src/libicalss/Makefile$(PLATFORM) \
282 kabc/Makefile$(PLATFORM) \
283 kabc/formats/binary/Makefile$(PLATFORM) \
284 kabc/plugins/file/Makefile$(PLATFORM) \
285 kabc/plugins/dir/Makefile$(PLATFORM) \
286 kabc/plugins/ldap/Makefile$(PLATFORM) \
287 kabc/plugins/opie/Makefile$(PLATFORM) \
288 kabc/plugins/qtopia/Makefile$(PLATFORM) \
289 kabc/plugins/sharpdtm/Makefile$(PLATFORM) \
290 kaddressbook/Makefile$(PLATFORM) \
291 kmicromail/Makefile$(PLATFORM) \
292 libetpan/Makefile$(PLATFORM) \
293 kmicromail/libmailwrapper/Makefile$(PLATFORM) \
294 gammu/emb/common/Makefile$(PLATFORM) \
295 gammu/emb/gammu/Makefile$(PLATFORM) \
296 pwmanager/pwmanager/Makefile$(PLATFORM) \
297 pwmanager/libcrypt/mpi/Makefile$(PLATFORM) \
298 pwmanager/libcrypt/error/Makefile$(PLATFORM) \
299 pwmanager/libcrypt/cipher/Makefile$(PLATFORM) \
300 pwmanager/libcrypt/zlib/Makefile$(PLATFORM)
301
302qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro
303 cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtcompat.pro -o Makefile$(PLATFORM)
304
305microkde/Makefile$(PLATFORM): microkde/microkdeE.pro
306 cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" microkdeE.pro -o Makefile$(PLATFORM)
307
308libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro
309 cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkcalE.pro -o Makefile$(PLATFORM)
310
311
312libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro
313 cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkdepimE.pro -o Makefile$(PLATFORM)
314
315kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro
316 cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kalarmdE.pro -o Makefile$(PLATFORM)
317
318korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro
319 cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" korganizerE.pro -o Makefile$(PLATFORM)
320
321libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro
322 cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalE.pro -o Makefile$(PLATFORM)
323
324libical/src/libicalss/Makefile$(PLATFORM): libical/src/libicalss/libicalssE.pro
325 cd libical/src/libicalss; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalssE.pro -o Makefile$(PLATFORM)
326
327kabc/Makefile$(PLATFORM): kabc/kabcE.pro
328 cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcE.pro -o Makefile$(PLATFORM)
329
330kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro
331 cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcformat_binaryE.pro -o Makefile$(PLATFORM)
332
333kabc/plugins/file/Makefile$(PLATFORM): kabc/plugins/file/fileE.pro
334 cd kabc/plugins/file; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" fileE.pro -o Makefile$(PLATFORM)
335
336kabc/plugins/dir/Makefile$(PLATFORM): kabc/plugins/dir/dirE.pro
337 cd kabc/plugins/dir; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" dirE.pro -o Makefile$(PLATFORM)
338
339kabc/plugins/ldap/Makefile$(PLATFORM): kabc/plugins/ldap/ldapE.pro
340 cd kabc/plugins/ldap; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" ldapE.pro -o Makefile$(PLATFORM)
341
342kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/opieE.pro
343 cd kabc/plugins/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" opieE.pro -o Makefile$(PLATFORM)
344
345kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro
346 cd kabc/plugins/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtopiaE.pro -o Makefile$(PLATFORM)
347
348kabc/plugins/sharpdtm/Makefile$(PLATFORM): kabc/plugins/sharpdtm/sharpdtmE.pro
349 cd kabc/plugins/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" sharpdtmE.pro -o Makefile$(PLATFORM)
350
351kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro
352 cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kaddressbookE.pro -o Makefile$(PLATFORM)
353
354kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro
355 cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kmicromailE.pro -o Makefile$(PLATFORM)
356
357libetpan/Makefile$(PLATFORM): libetpan/libetpanE.pro
358 cd libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libetpanE.pro -o Makefile$(PLATFORM)
359
360kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro
361 cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libmailwrapperE.pro -o Makefile$(PLATFORM)
362
363gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro
364 cd gammu/emb/common; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" commonE.pro -o Makefile$(PLATFORM)
365
366gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro
367 cd gammu/emb/gammu; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" gammuE.pro -o Makefile$(PLATFORM)
368
369pwmanager/pwmanager/Makefile$(PLATFORM): pwmanager/pwmanager/pwmanagerE.pro
370 cd pwmanager/pwmanager; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" pwmanagerE.pro -o Makefile$(PLATFORM)
371
372
373pwmanager/libcrypt/mpi/Makefile$(PLATFORM): pwmanager/libcrypt/mpi/mpi.pro
374 cd pwmanager/libcrypt/mpi;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" mpi.pro -o Makefile$(PLATFORM)
375
376pwmanager/libcrypt/error/Makefile$(PLATFORM): pwmanager/libcrypt/error/error.pro
377 cd pwmanager/libcrypt/error;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" error.pro -o Makefile$(PLATFORM)
378
379pwmanager/libcrypt/cipher/Makefile$(PLATFORM): pwmanager/libcrypt/cipher/cipher.pro
380 cd pwmanager/libcrypt/cipher;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" cipher.pro -o Makefile$(PLATFORM)
381
382pwmanager/libcrypt/zlib/Makefile$(PLATFORM): pwmanager/libcrypt/zlib/zlib.pro
383 cd pwmanager/libcrypt/zlib;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" zlib.pro -o Makefile$(PLATFORM)
384
279 385
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index f53e5d5..17f791d 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -978,388 +978,388 @@ void KOAgendaView::updateEventDates(KOAgendaItem *item, int type)
978 978
979 // emit incidenceItemChanged( item->incidence(), KOGlobals::EVENTEDITED ); 979 // emit incidenceItemChanged( item->incidence(), KOGlobals::EVENTEDITED );
980 980
981 if ( item->incidence()->type()=="Todo" && item->mLastMoveXPos > 0 ) { 981 if ( item->incidence()->type()=="Todo" && item->mLastMoveXPos > 0 ) {
982 startDate = mSelectedDates[item->mLastMoveXPos]; 982 startDate = mSelectedDates[item->mLastMoveXPos];
983 } else { 983 } else {
984 if (item->cellX() < 0) { 984 if (item->cellX() < 0) {
985 startDate = (mSelectedDates.first()).addDays(item->cellX()); 985 startDate = (mSelectedDates.first()).addDays(item->cellX());
986 } else { 986 } else {
987 startDate = mSelectedDates[item->cellX()]; 987 startDate = mSelectedDates[item->cellX()];
988 } 988 }
989 } 989 }
990 startDt.setDate(startDate); 990 startDt.setDate(startDate);
991 991
992 if (item->incidence()->doesFloat()) { 992 if (item->incidence()->doesFloat()) {
993 endDt.setDate(startDate.addDays(item->cellWidth() - 1)); 993 endDt.setDate(startDate.addDays(item->cellWidth() - 1));
994 } else { 994 } else {
995 if ( type == KOAgenda::RESIZETOP || type == KOAgenda::MOVE ) 995 if ( type == KOAgenda::RESIZETOP || type == KOAgenda::MOVE )
996 startDt.setTime(mAgenda->gyToTime(item->cellYTop())); 996 startDt.setTime(mAgenda->gyToTime(item->cellYTop()));
997 if ( item->incidence()->type() == "Event" ) { 997 if ( item->incidence()->type() == "Event" ) {
998 if ( type == KOAgenda::MOVE ) { 998 if ( type == KOAgenda::MOVE ) {
999 endDt = startDt.addSecs(lenInSecs); 999 endDt = startDt.addSecs(lenInSecs);
1000 1000
1001 } else if ( type == KOAgenda::RESIZEBOTTOM ) { 1001 } else if ( type == KOAgenda::RESIZEBOTTOM ) {
1002 if (item->lastMultiItem()) { 1002 if (item->lastMultiItem()) {
1003 endDt.setTime(mAgenda->gyToTime(item->lastMultiItem()->cellYBottom()+1)); 1003 endDt.setTime(mAgenda->gyToTime(item->lastMultiItem()->cellYBottom()+1));
1004 endDt.setDate(startDate. 1004 endDt.setDate(startDate.
1005 addDays(item->lastMultiItem()->cellX() - item->cellX())); 1005 addDays(item->lastMultiItem()->cellX() - item->cellX()));
1006 } else { 1006 } else {
1007 endDt.setTime(mAgenda->gyToTime(item->cellYBottom()+1)); 1007 endDt.setTime(mAgenda->gyToTime(item->cellYBottom()+1));
1008 endDt.setDate(startDate); 1008 endDt.setDate(startDate);
1009 } 1009 }
1010 } 1010 }
1011 } else { 1011 } else {
1012 // todo 1012 // todo
1013 if (item->lastMultiItem()) { 1013 if (item->lastMultiItem()) {
1014 endDt.setTime(mAgenda->gyToTime(item->lastMultiItem()->cellYBottom()+1)); 1014 endDt.setTime(mAgenda->gyToTime(item->lastMultiItem()->cellYBottom()+1));
1015 endDt.setDate(startDate. 1015 endDt.setDate(startDate.
1016 addDays(item->lastMultiItem()->cellX() - item->cellX())); 1016 addDays(item->lastMultiItem()->cellX() - item->cellX()));
1017 } else { 1017 } else {
1018 //qDebug("tem->cellYBottom() %d",item->cellYBottom() ); 1018 //qDebug("tem->cellYBottom() %d",item->cellYBottom() );
1019 if ( item->cellYBottom() > 0 ) 1019 if ( item->cellYBottom() > 0 )
1020 endDt.setTime(mAgenda->gyToTime(item->cellYBottom()+1)); 1020 endDt.setTime(mAgenda->gyToTime(item->cellYBottom()+1));
1021 else 1021 else
1022 endDt.setTime((static_cast<Todo*>(item->incidence()))->dtDue().time()); 1022 endDt.setTime((static_cast<Todo*>(item->incidence()))->dtDue().time());
1023 endDt.setDate(startDate); 1023 endDt.setDate(startDate);
1024 } 1024 }
1025 } 1025 }
1026 } 1026 }
1027 if ( item->incidence()->type() == "Event" ) { 1027 if ( item->incidence()->type() == "Event" ) {
1028 item->incidence()->setDtStart(startDt); 1028 item->incidence()->setDtStart(startDt);
1029 (static_cast<Event*>(item->incidence()))->setDtEnd(endDt); 1029 (static_cast<Event*>(item->incidence()))->setDtEnd(endDt);
1030 } else if ( item->incidence()->type() == "Todo" ) { 1030 } else if ( item->incidence()->type() == "Todo" ) {
1031 Todo* to = static_cast<Todo*>(item->incidence()); 1031 Todo* to = static_cast<Todo*>(item->incidence());
1032 1032
1033 to->setDtDue(endDt); 1033 to->setDtDue(endDt);
1034 if ( to->hasStartDate() ) { 1034 if ( to->hasStartDate() ) {
1035 if (to->dtStart() >= to->dtDue() ) 1035 if (to->dtStart() >= to->dtDue() )
1036 to->setDtStart(to->dtDue().addDays( -2 )); 1036 to->setDtStart(to->dtDue().addDays( -2 ));
1037 } 1037 }
1038 1038
1039 } 1039 }
1040 //qDebug("KOAgendaView::updateEventDates stsart %s end %s ", startDt.toString().latin1(), endDt.toString().latin1() ); 1040 //qDebug("KOAgendaView::updateEventDates stsart %s end %s ", startDt.toString().latin1(), endDt.toString().latin1() );
1041 item->incidence()->setRevision(item->incidence()->revision()+1); 1041 item->incidence()->setRevision(item->incidence()->revision()+1);
1042 item->setItemDate(startDt.date()); 1042 item->setItemDate(startDt.date());
1043 //item->updateItem(); 1043 //item->updateItem();
1044 if ( item->incidence()->type() == "Todo" ) { 1044 if ( item->incidence()->type() == "Todo" ) {
1045 emit todoMoved((Todo*)item->incidence(), KOGlobals::EVENTEDITED ); 1045 emit todoMoved((Todo*)item->incidence(), KOGlobals::EVENTEDITED );
1046 1046
1047 } 1047 }
1048 else 1048 else
1049 emit incidenceChanged(item->incidence(), KOGlobals::EVENTEDITED); 1049 emit incidenceChanged(item->incidence(), KOGlobals::EVENTEDITED);
1050 item->updateItem(); 1050 item->updateItem();
1051} 1051}
1052 1052
1053void KOAgendaView::showDates( const QDate &start, const QDate &end ) 1053void KOAgendaView::showDates( const QDate &start, const QDate &end )
1054{ 1054{
1055 // kdDebug() << "KOAgendaView::selectDates" << endl; 1055 // kdDebug() << "KOAgendaView::selectDates" << endl;
1056 1056
1057 mSelectedDates.clear(); 1057 mSelectedDates.clear();
1058 // qDebug("KOAgendaView::showDates "); 1058 // qDebug("KOAgendaView::showDates ");
1059 QDate d = start; 1059 QDate d = start;
1060 while (d <= end) { 1060 while (d <= end) {
1061 mSelectedDates.append(d); 1061 mSelectedDates.append(d);
1062 d = d.addDays( 1 ); 1062 d = d.addDays( 1 );
1063 } 1063 }
1064 1064
1065 // and update the view 1065 // and update the view
1066 fillAgenda(); 1066 fillAgenda();
1067} 1067}
1068 1068
1069 1069
1070void KOAgendaView::showEvents(QPtrList<Event>) 1070void KOAgendaView::showEvents(QPtrList<Event>)
1071{ 1071{
1072 kdDebug() << "KOAgendaView::showEvents() is not yet implemented" << endl; 1072 kdDebug() << "KOAgendaView::showEvents() is not yet implemented" << endl;
1073} 1073}
1074 1074
1075void KOAgendaView::changeEventDisplay(Event *, int) 1075void KOAgendaView::changeEventDisplay(Event *, int)
1076{ 1076{
1077 // qDebug("KOAgendaView::changeEventDisplay "); 1077 // qDebug("KOAgendaView::changeEventDisplay ");
1078 // kdDebug() << "KOAgendaView::changeEventDisplay" << endl; 1078 // kdDebug() << "KOAgendaView::changeEventDisplay" << endl;
1079 // this should be re-written to be MUCH smarter. Right now we 1079 // this should be re-written to be MUCH smarter. Right now we
1080 // are just playing dumb. 1080 // are just playing dumb.
1081 fillAgenda(); 1081 fillAgenda();
1082} 1082}
1083 1083
1084void KOAgendaView::fillAgenda(const QDate &) 1084void KOAgendaView::fillAgenda(const QDate &)
1085{ 1085{
1086 // qDebug("KOAgendaView::fillAgenda "); 1086 // qDebug("KOAgendaView::fillAgenda ");
1087 fillAgenda(); 1087 fillAgenda();
1088} 1088}
1089 1089
1090void KOAgendaView::fillAgenda() 1090void KOAgendaView::fillAgenda()
1091{ 1091{
1092 if ( globalFlagBlockStartup ) 1092 if ( globalFlagBlockStartup )
1093 return; 1093 return;
1094 if ( globalFlagBlockAgenda == 1 ) 1094 if ( globalFlagBlockAgenda == 1 )
1095 return; 1095 return;
1096 static bool onlyOne = false; 1096 static bool onlyOne = false;
1097 if ( onlyOne ) 1097 if ( onlyOne )
1098 return; 1098 return;
1099 onlyOne = true; 1099 onlyOne = true;
1100 //if ( globalFlagBlockAgenda == 2 ) 1100 //if ( globalFlagBlockAgenda == 2 )
1101 //globalFlagBlockAgenda = 0; 1101 //globalFlagBlockAgenda = 0;
1102 // globalFlagBlockPainting = false; 1102 // globalFlagBlockPainting = false;
1103 if ( globalFlagBlockAgenda == 0 ) 1103 if ( globalFlagBlockAgenda == 0 )
1104 globalFlagBlockAgenda = 1; 1104 globalFlagBlockAgenda = 1;
1105 // clearView(); 1105 // clearView();
1106 //qDebug("fillAgenda()++++ "); 1106 //qDebug("fillAgenda()++++ ");
1107 globalFlagBlockAgendaItemPaint = 1; 1107 globalFlagBlockAgendaItemPaint = 1;
1108 1108
1109 mAllDayAgenda->changeColumns(mSelectedDates.count()); 1109 mAllDayAgenda->changeColumns(mSelectedDates.count());
1110 mAgenda->changeColumns(mSelectedDates.count()); 1110 mAgenda->changeColumns(mSelectedDates.count());
1111 qApp->processEvents(); 1111 qApp->processEvents();
1112 mEventIndicatorTop->changeColumns(mSelectedDates.count()); 1112 mEventIndicatorTop->changeColumns(mSelectedDates.count());
1113 mEventIndicatorBottom->changeColumns(mSelectedDates.count()); 1113 mEventIndicatorBottom->changeColumns(mSelectedDates.count());
1114 setHolidayMasks(); 1114 setHolidayMasks();
1115 1115
1116 //mAgenda->hideUnused(); 1116 //mAgenda->hideUnused();
1117 //mAllDayAgenda->hideUnused(); 1117 //mAllDayAgenda->hideUnused();
1118 1118
1119 // mAgenda->blockNextRepaint( false ); 1119 // mAgenda->blockNextRepaint( false );
1120 // mAgenda->viewport()->repaint(); 1120 // mAgenda->viewport()->repaint();
1121 // mAgenda->blockNextRepaint( true ); 1121 // mAgenda->blockNextRepaint( true );
1122 mMinY.resize(mSelectedDates.count()); 1122 mMinY.resize(mSelectedDates.count());
1123 mMaxY.resize(mSelectedDates.count()); 1123 mMaxY.resize(mSelectedDates.count());
1124 1124
1125 QPtrList<Event> dayEvents; 1125 QPtrList<Event> dayEvents;
1126 1126
1127 // ToDo items shall be displayed for the day they are due, but only showed today if they are already overdue. 1127 // ToDo items shall be displayed for the day they are due, but only showed today if they are already overdue.
1128 // Therefore, gtodoset all of them. 1128 // Therefore, gtodoset all of them.
1129 QPtrList<Todo> todos = calendar()->todos(); 1129 QPtrList<Todo> todos = calendar()->todos();
1130 1130
1131 mAgenda->setDateList(mSelectedDates); 1131 mAgenda->setDateList(mSelectedDates);
1132 1132
1133 QDate today = QDate::currentDate(); 1133 QDate today = QDate::currentDate();
1134 1134
1135 DateList::ConstIterator dit; 1135 DateList::ConstIterator dit;
1136 int curCol = 0; 1136 int curCol = 0;
1137 for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) { 1137 for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) {
1138 QDate currentDate = *dit; 1138 QDate currentDate = *dit;
1139 // kdDebug() << "KOAgendaView::fillAgenda(): " << currentDate.toString() 1139 // kdDebug() << "KOAgendaView::fillAgenda(): " << currentDate.toString()
1140 // << endl; 1140 // << endl;
1141 1141
1142 dayEvents = calendar()->events(currentDate,true); 1142 dayEvents = calendar()->events(currentDate,true);
1143 1143
1144 // Default values, which can never be reached 1144 // Default values, which can never be reached
1145 mMinY[curCol] = mAgenda->timeToY(QTime(23,59)) + 1; 1145 mMinY[curCol] = mAgenda->timeToY(QTime(23,59)) + 1;
1146 mMaxY[curCol] = mAgenda->timeToY(QTime(0,0)) - 1; 1146 mMaxY[curCol] = mAgenda->timeToY(QTime(0,0)) - 1;
1147 1147
1148 unsigned int numEvent; 1148 unsigned int numEvent;
1149 for(numEvent=0;numEvent<dayEvents.count();++numEvent) { 1149 for(numEvent=0;numEvent<dayEvents.count();++numEvent) {
1150 Event *event = dayEvents.at(numEvent); 1150 Event *event = dayEvents.at(numEvent);
1151 if ( !KOPrefs::instance()->mShowSyncEvents && event->uid().left(2) == QString("la") ) 1151 if ( !KOPrefs::instance()->mShowSyncEvents && event->uid().left(2) == QString("la") )
1152 if ( event->uid().left(15) == QString("last-syncEvent-") ) 1152 if ( event->uid().left(15) == QString("last-syncEvent-") )
1153 continue; 1153 continue;
1154 // kdDebug() << " Event: " << event->summary() << endl; 1154 // kdDebug() << " Event: " << event->summary() << endl;
1155 1155
1156 int beginX = currentDate.daysTo(event->dtStart().date()) + curCol; 1156 int beginX = currentDate.daysTo(event->dtStart().date()) + curCol;
1157 int endX = currentDate.daysTo(event->dtEnd().date()) + curCol; 1157 int endX = currentDate.daysTo(event->dtEnd().date()) + curCol;
1158 1158
1159 // kdDebug() << " beginX: " << beginX << " endX: " << endX << endl; 1159 // kdDebug() << " beginX: " << beginX << " endX: " << endX << endl;
1160 1160
1161 if (event->doesFloat()) { 1161 if (event->doesFloat()) {
1162 if (event->recurrence()->doesRecur()) { 1162 if (event->recurrence()->doesRecur()) {
1163 if (event->isMultiDay() ) { 1163 if (event->isMultiDay() ) {
1164 endX = endX - beginX;// endX is now number of days 1164 endX = endX - beginX;// endX is now number of days
1165 if ( event->recursOn( currentDate ) ) { 1165 if ( event->recursOn( currentDate ) ) {
1166 endX += curCol; 1166 endX += curCol;
1167 beginX = curCol; 1167 beginX = curCol;
1168 mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX); 1168 mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX);
1169 } else { 1169 } else {
1170 //qDebug("days %d %s",endX , currentDate.toString().latin1()); 1170 qDebug("days %d %s",endX , currentDate.toString().latin1());
1171 QDate dateit = currentDate.addDays( -endX ); 1171 QDate dateit = currentDate.addDays( -endX );
1172 if ( event->recursOn( dateit ) ) { 1172 if ( event->recursOn( dateit ) ) {
1173 //qDebug("found %d %d %d %s", endX,curCol, curCol-endX ,dateit.toString().latin1() ); 1173 qDebug("found %d %d %d %s", endX,curCol, curCol-endX ,dateit.toString().latin1() );
1174 if ( curCol-endX < 0 ) { 1174 if ( curCol-endX < 0 ) {
1175 mAllDayAgenda->insertAllDayItem(event,currentDate,0,curCol); 1175 mAllDayAgenda->insertAllDayItem(event,currentDate,0,curCol);
1176 } 1176 }
1177 } 1177 }
1178 } 1178 }
1179 } else { 1179 } else {
1180 mAllDayAgenda->insertAllDayItem(event,currentDate,curCol,curCol); 1180 mAllDayAgenda->insertAllDayItem(event,currentDate,curCol,curCol);
1181 } 1181 }
1182#if 0 1182#if 0
1183 if (beginX <= 0 && curCol == 0) { 1183 if (beginX <= 0 && curCol == 0) {
1184 mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX); 1184 mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX);
1185 } else if (beginX == curCol) { 1185 } else if (beginX == curCol) {
1186 mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX); 1186 mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX);
1187 } else { 1187 } else {
1188 qDebug("skipped %d %d %d ",beginX , endX, curCol); 1188 qDebug("skipped %d %d %d ",beginX , endX, curCol);
1189 } 1189 }
1190#endif 1190#endif
1191 //mAllDayAgenda->insertAllDayItem(event,currentDate,curCol,curCol); 1191 //mAllDayAgenda->insertAllDayItem(event,currentDate,curCol,curCol);
1192 } else { 1192 } else {
1193 if (beginX <= 0 && curCol == 0) { 1193 if (beginX <= 0 && curCol == 0) {
1194 mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX); 1194 mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX);
1195 } else if (beginX == curCol) { 1195 } else if (beginX == curCol) {
1196 mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX); 1196 mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX);
1197 } 1197 }
1198 } 1198 }
1199 } else if (event->isMultiDay()) { 1199 } else if (event->isMultiDay()) {
1200 if ( event->doesRecur () ) { 1200 if ( event->doesRecur () ) {
1201 QDate dateit = currentDate; 1201 QDate dateit = currentDate;
1202 int count = 0; 1202 int count = 0;
1203 int max = event->dtStart().daysTo( event->dtEnd() ) +2; 1203 int max = event->dtStart().daysTo( event->dtEnd() ) +2;
1204 while (! event->recursOn( dateit ) && count <= max ) { 1204 while (! event->recursOn( dateit ) && count <= max ) {
1205 ++count; 1205 ++count;
1206 dateit = dateit.addDays( -1 ); 1206 dateit = dateit.addDays( -1 );
1207 } 1207 }
1208 bool ok; 1208 bool ok;
1209 QDateTime nextOcstart = event->getNextOccurence( QDateTime(dateit) ,&ok ); 1209 QDateTime nextOcstart = event->getNextOccurence( QDateTime(dateit) ,&ok );
1210 if ( ok ) 1210 if ( ok )
1211 { 1211 {
1212 int secs = event->dtStart().secsTo( event->dtEnd() ); 1212 int secs = event->dtStart().secsTo( event->dtEnd() );
1213 QDateTime nextOcend =nextOcstart.addSecs( secs ); ; 1213 QDateTime nextOcend =nextOcstart.addSecs( secs ); ;
1214 beginX = currentDate.daysTo(nextOcstart.date()) + curCol; 1214 beginX = currentDate.daysTo(nextOcstart.date()) + curCol;
1215 endX = currentDate.daysTo(nextOcend.date()) + curCol; 1215 endX = currentDate.daysTo(nextOcend.date()) + curCol;
1216 1216
1217 } 1217 }
1218 } 1218 }
1219 int startY = mAgenda->timeToY(event->dtStart().time()); 1219 int startY = mAgenda->timeToY(event->dtStart().time());
1220 int endY = mAgenda->timeToY(event->dtEnd().time()) - 1; 1220 int endY = mAgenda->timeToY(event->dtEnd().time()) - 1;
1221 //qDebug("insert %d %d %d %d %d ",beginX,endX,startY,endY , curCol ); 1221 //qDebug("insert %d %d %d %d %d ",beginX,endX,startY,endY , curCol );
1222 if ((beginX <= 0 && curCol == 0) || beginX == curCol) { 1222 if ((beginX <= 0 && curCol == 0) || beginX == curCol) {
1223 //qDebug("insert!!! "); 1223 //qDebug("insert!!! ");
1224 mAgenda->insertMultiItem(event,currentDate,beginX,endX,startY,endY); 1224 mAgenda->insertMultiItem(event,currentDate,beginX,endX,startY,endY);
1225 } 1225 }
1226 if (beginX == curCol) { 1226 if (beginX == curCol) {
1227 mMaxY[curCol] = mAgenda->timeToY(QTime(23,59)); 1227 mMaxY[curCol] = mAgenda->timeToY(QTime(23,59));
1228 if (startY < mMinY[curCol]) mMinY[curCol] = startY; 1228 if (startY < mMinY[curCol]) mMinY[curCol] = startY;
1229 } else if (endX == curCol) { 1229 } else if (endX == curCol) {
1230 mMinY[curCol] = mAgenda->timeToY(QTime(0,0)); 1230 mMinY[curCol] = mAgenda->timeToY(QTime(0,0));
1231 if (endY > mMaxY[curCol]) mMaxY[curCol] = endY; 1231 if (endY > mMaxY[curCol]) mMaxY[curCol] = endY;
1232 } else { 1232 } else {
1233 mMinY[curCol] = mAgenda->timeToY(QTime(0,0)); 1233 mMinY[curCol] = mAgenda->timeToY(QTime(0,0));
1234 mMaxY[curCol] = mAgenda->timeToY(QTime(23,59)); 1234 mMaxY[curCol] = mAgenda->timeToY(QTime(23,59));
1235 } 1235 }
1236 } else { 1236 } else {
1237 int startY = mAgenda->timeToY(event->dtStart().time()); 1237 int startY = mAgenda->timeToY(event->dtStart().time());
1238 int endY = mAgenda->timeToY(event->dtEnd().time()) - 1; 1238 int endY = mAgenda->timeToY(event->dtEnd().time()) - 1;
1239 if (endY < startY) endY = startY; 1239 if (endY < startY) endY = startY;
1240 mAgenda->insertItem(event,currentDate,curCol,startY,endY); 1240 mAgenda->insertItem(event,currentDate,curCol,startY,endY);
1241 if (startY < mMinY[curCol]) mMinY[curCol] = startY; 1241 if (startY < mMinY[curCol]) mMinY[curCol] = startY;
1242 if (endY > mMaxY[curCol]) mMaxY[curCol] = endY; 1242 if (endY > mMaxY[curCol]) mMaxY[curCol] = endY;
1243 } 1243 }
1244 } 1244 }
1245 // ---------- [display Todos -------------- 1245 // ---------- [display Todos --------------
1246 unsigned int numTodo; 1246 unsigned int numTodo;
1247 for (numTodo = 0; numTodo < todos.count(); ++numTodo) { 1247 for (numTodo = 0; numTodo < todos.count(); ++numTodo) {
1248 Todo *todo = todos.at(numTodo); 1248 Todo *todo = todos.at(numTodo);
1249 1249
1250 if ( ! todo->hasDueDate() && !todo->hasCompletedDate()) continue; // todo shall not be displayed if it has no date 1250 if ( ! todo->hasDueDate() && !todo->hasCompletedDate()) continue; // todo shall not be displayed if it has no date
1251 1251
1252 // ToDo items shall be displayed for the day they are due, but only showed today if they are already overdue. 1252 // ToDo items shall be displayed for the day they are due, but only showed today if they are already overdue.
1253 // Already completed items can be displayed on their original due date 1253 // Already completed items can be displayed on their original due date
1254 //if not KOPrefs::instance()->mShowTodoInAgenda, show overdue in agenda 1254 //if not KOPrefs::instance()->mShowTodoInAgenda, show overdue in agenda
1255 bool overdue = (!todo->isCompleted()) && (todo->dtDue() < today) && KOPrefs::instance()->mShowTodoInAgenda; 1255 bool overdue = (!todo->isCompleted()) && (todo->dtDue() < today) && KOPrefs::instance()->mShowTodoInAgenda;
1256 bool fillIn = false; 1256 bool fillIn = false;
1257 if ( todo->hasCompletedDate() && todo->completed().date() == currentDate ) 1257 if ( todo->hasCompletedDate() && todo->completed().date() == currentDate )
1258 fillIn = true; 1258 fillIn = true;
1259 if ( ! fillIn && !todo->hasCompletedDate() ) 1259 if ( ! fillIn && !todo->hasCompletedDate() )
1260 fillIn = ((todo->dtDue().date() == currentDate) && !overdue) || ((currentDate == today) && overdue); 1260 fillIn = ((todo->dtDue().date() == currentDate) && !overdue) || ((currentDate == today) && overdue);
1261 if ( fillIn ) { 1261 if ( fillIn ) {
1262 if ( (todo->doesFloat() || overdue ) && !todo->hasCompletedDate() ) { // Todo has no due-time set or is already overdue 1262 if ( (todo->doesFloat() || overdue ) && !todo->hasCompletedDate() ) { // Todo has no due-time set or is already overdue
1263 if ( KOPrefs::instance()->mShowTodoInAgenda ) 1263 if ( KOPrefs::instance()->mShowTodoInAgenda )
1264 mAllDayAgenda->insertAllDayItem(todo, currentDate, curCol, curCol); 1264 mAllDayAgenda->insertAllDayItem(todo, currentDate, curCol, curCol);
1265 } 1265 }
1266 else { 1266 else {
1267 QDateTime dt; 1267 QDateTime dt;
1268 if ( todo->hasCompletedDate() ) 1268 if ( todo->hasCompletedDate() )
1269 dt = todo->completed(); 1269 dt = todo->completed();
1270 else 1270 else
1271 dt = todo->dtDue();; 1271 dt = todo->dtDue();;
1272 1272
1273 1273
1274 int endY = mAgenda->timeToY(dt.time()) - 1; 1274 int endY = mAgenda->timeToY(dt.time()) - 1;
1275 int hi = (18/KOPrefs::instance()->mHourSize); 1275 int hi = (18/KOPrefs::instance()->mHourSize);
1276 //qDebug("hei %d ",KOPrefs::instance()->mHourSize); 1276 //qDebug("hei %d ",KOPrefs::instance()->mHourSize);
1277 int startY = endY -hi; 1277 int startY = endY -hi;
1278 1278
1279 mAgenda->insertItem(todo,currentDate,curCol,startY,endY); 1279 mAgenda->insertItem(todo,currentDate,curCol,startY,endY);
1280 1280
1281 if (startY < mMinY[curCol]) mMinY[curCol] = startY; 1281 if (startY < mMinY[curCol]) mMinY[curCol] = startY;
1282 if (endY > mMaxY[curCol]) mMaxY[curCol] = endY; 1282 if (endY > mMaxY[curCol]) mMaxY[curCol] = endY;
1283 } 1283 }
1284 } 1284 }
1285 } 1285 }
1286 // ---------- display Todos] -------------- 1286 // ---------- display Todos] --------------
1287 1287
1288 ++curCol; 1288 ++curCol;
1289 } 1289 }
1290 mAgenda->hideUnused(); 1290 mAgenda->hideUnused();
1291 mAllDayAgenda->hideUnused(); 1291 mAllDayAgenda->hideUnused();
1292 mAgenda->checkScrollBoundaries(); 1292 mAgenda->checkScrollBoundaries();
1293 1293
1294 deleteSelectedDateTime(); 1294 deleteSelectedDateTime();
1295 1295
1296 createDayLabels(); 1296 createDayLabels();
1297 emit incidenceSelected( 0 ); 1297 emit incidenceSelected( 0 );
1298 1298
1299 if ( globalFlagBlockAgenda == 2 ) { 1299 if ( globalFlagBlockAgenda == 2 ) {
1300 if ( KOPrefs::instance()->mSetTimeToDayStartAt ) 1300 if ( KOPrefs::instance()->mSetTimeToDayStartAt )
1301 setStartHour( KOPrefs::instance()->mDayBegins ); 1301 setStartHour( KOPrefs::instance()->mDayBegins );
1302 else if ( KOPrefs::instance()->mCenterOnCurrentTime ) 1302 else if ( KOPrefs::instance()->mCenterOnCurrentTime )
1303 setStartHour( QTime::currentTime ().hour() ); 1303 setStartHour( QTime::currentTime ().hour() );
1304 // qApp->processEvents(); 1304 // qApp->processEvents();
1305 } 1305 }
1306 qApp->processEvents(); 1306 qApp->processEvents();
1307 //qDebug("qApp->processEvents(); END "); 1307 //qDebug("qApp->processEvents(); END ");
1308 globalFlagBlockAgenda = 0; 1308 globalFlagBlockAgenda = 0;
1309 1309
1310 // mAgenda->hideUnused(); 1310 // mAgenda->hideUnused();
1311 //mAllDayAgenda->hideUnused(); 1311 //mAllDayAgenda->hideUnused();
1312 mAllDayAgenda->drawContentsToPainter(); 1312 mAllDayAgenda->drawContentsToPainter();
1313 mAgenda->drawContentsToPainter(); 1313 mAgenda->drawContentsToPainter();
1314 repaintAgenda(); 1314 repaintAgenda();
1315 onlyOne = false; 1315 onlyOne = false;
1316 // mAgenda->finishUpdate(); 1316 // mAgenda->finishUpdate();
1317 //mAllDayAgenda->finishUpdate(); 1317 //mAllDayAgenda->finishUpdate();
1318 1318
1319 // repaintAgenda(); 1319 // repaintAgenda();
1320 //qApp->processEvents(); 1320 //qApp->processEvents();
1321 // globalFlagBlockAgenda = 0; 1321 // globalFlagBlockAgenda = 0;
1322} 1322}
1323void KOAgendaView::repaintAgenda() 1323void KOAgendaView::repaintAgenda()
1324{ 1324{
1325 // mAllDayAgenda->drawContentsToPainter(); 1325 // mAllDayAgenda->drawContentsToPainter();
1326// mAllDayAgenda->viewport()->repaint( false ); 1326// mAllDayAgenda->viewport()->repaint( false );
1327// mAgenda->drawContentsToPainter(); 1327// mAgenda->drawContentsToPainter();
1328// mAgenda->viewport()->repaint( false ); 1328// mAgenda->viewport()->repaint( false );
1329// qApp->processEvents(); 1329// qApp->processEvents();
1330 1330
1331 //qDebug("KOAgendaView::repaintAgenda() "); 1331 //qDebug("KOAgendaView::repaintAgenda() ");
1332 //qApp->processEvents(); 1332 //qApp->processEvents();
1333 mAgenda->viewport()->repaint( false ); 1333 mAgenda->viewport()->repaint( false );
1334 mAllDayAgenda->viewport()->repaint( false ); 1334 mAllDayAgenda->viewport()->repaint( false );
1335 mAgenda->finishUpdate(); 1335 mAgenda->finishUpdate();
1336 mAllDayAgenda->finishUpdate(); 1336 mAllDayAgenda->finishUpdate();
1337} 1337}
1338 1338
1339 1339
1340void KOAgendaView::clearView() 1340void KOAgendaView::clearView()
1341{ 1341{
1342 // kdDebug() << "ClearView" << endl; 1342 // kdDebug() << "ClearView" << endl;
1343 mAllDayAgenda->clear(); 1343 mAllDayAgenda->clear();
1344 mAgenda->clear(); 1344 mAgenda->clear();
1345} 1345}
1346 1346
1347void KOAgendaView::printPreview(CalPrinter *calPrinter, const QDate &fd, 1347void KOAgendaView::printPreview(CalPrinter *calPrinter, const QDate &fd,
1348 const QDate &td) 1348 const QDate &td)
1349{ 1349{
1350#ifndef KORG_NOPRINTER 1350#ifndef KORG_NOPRINTER
1351 if (fd == td) 1351 if (fd == td)
1352 calPrinter->preview(CalPrinter::Day, fd, td); 1352 calPrinter->preview(CalPrinter::Day, fd, td);
1353 else 1353 else
1354 calPrinter->preview(CalPrinter::Week, fd, td); 1354 calPrinter->preview(CalPrinter::Week, fd, td);
1355#endif 1355#endif
1356} 1356}
1357 1357
1358// void KOAgendaView::updateMovedTodo() 1358// void KOAgendaView::updateMovedTodo()
1359// { 1359// {
1360// // updateConfig(); 1360// // updateConfig();
1361// // emit updateTodoViews(); 1361// // emit updateTodoViews();
1362// } 1362// }
1363 1363
1364void KOAgendaView::slotShowDateView( int mode , int d ) 1364void KOAgendaView::slotShowDateView( int mode , int d )
1365{ 1365{