summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-04-09 15:18:54 (UTC)
committer zautrix <zautrix>2005-04-09 15:18:54 (UTC)
commit329ecb2c6b4153c51415513a28f2dc0576f4ddca (patch) (unidiff)
treef96a8be84d1386c5d10a9d18cf2c59c8727046b2
parent16546abfab89df8dcf3168eaa7c0c346b8e400b4 (diff)
downloadkdepimpi-329ecb2c6b4153c51415513a28f2dc0576f4ddca.zip
kdepimpi-329ecb2c6b4153c51415513a28f2dc0576f4ddca.tar.gz
kdepimpi-329ecb2c6b4153c51415513a28f2dc0576f4ddca.tar.bz2
agenda fix
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile662
-rw-r--r--korganizer/koagenda.cpp51
2 files changed, 329 insertions, 384 deletions
diff --git a/Makefile b/Makefile
index 594d47d..4d42c35 100644
--- a/Makefile
+++ b/Makefile
@@ -1,385 +1,279 @@
1export KDEPIMDIR = $(shell pwd) 1#############################################################################
2 2# Makefile for building: kdepim-desktop
3export KDEPIM_VERSION=$(shell sed -e 's/.*\"\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/' < version) 3# Generated by qmake (1.07a) (Qt 3.3.4) on: Sat Apr 9 15:21:46 2005
4 4# Project: kdepim-desktop.pro
5ifeq ($(PLATFORM) , zaurus) 5# Template: subdirs
6 BUILD_NO_LDAP_PLUGIN=1 6# Command: $(QMAKE) -o Makefile kdepim-desktop.pro
7endif 7#############################################################################
8 8
9ifneq ($(PLATFORM) , zaurus) 9 MAKEFILE =Makefile
10 BUILD_NO_SHARP_PLUGIN=1 10 QMAKE =qmake
11endif 11DEL_FILE = rm -f
12 12CHK_DIR_EXISTS= test -d
13#opie plugin is deprecated. The qtopia plugin handles the task from now on. 13MKDIR = mkdir -p
14BUILD_NO_OPIE_PLUGIN=1 14INSTALL_FILE=
15 15INSTALL_DIR =
16SUBDIRS_MICROKDE = \ 16 SUBTARGETS = \
17 libical/src/libical \ 17 sub-kabc-plugins-file \
18 libical/src/libicalss \ 18 sub-kabc-plugins-dir \
19 qtcompat \ 19 sub-kabc-plugins-qtopia \
20 microkde \ 20 sub-libical \
21 libkcal \ 21 sub-libkcal \
22 libkdepim \ 22 sub-kabc \
23 kabc \ 23 sub-libkdepim \
24 kabc/formats/binary \ 24 sub-microkde \
25 kabc/plugins/file \ 25 sub-korganizer \
26 kabc/plugins/dir \ 26 sub-kaddressbook \
27 korganizer \ 27 sub-gammu-emb-common \
28 kalarmd \ 28 sub-gammu-emb-gammu \
29 kaddressbook 29 sub-libetpan \
30 30 sub-kmicromail-libmailwrapper \
31SUBDIRS_QTOPIA_PLUGIN = \ 31 sub-kmicromail \
32 kabc/plugins/qtopia 32 sub-pwmanager-libcrypt-cipher \
33 33 sub-pwmanager-libcrypt-error \
34SUBDIRS_OPIE_PLUGIN = \ 34 sub-pwmanager-libcrypt-mpi \
35 kabc/plugins/opie 35 sub-pwmanager-libcrypt-zlib \
36 36 sub-pwmanager-pwmanager
37SUBDIRS_SHARP_PLUGIN = \ 37
38 kabc/plugins/sharpdtm 38first: all
39 39
40SUBDIRS_LDAP_PLUGIN = \ 40all: Makefile $(SUBTARGETS)
41 kabc/plugins/ldap 41
42 42kabc/plugins/file/$(MAKEFILE):
43SUBDIRS_MICROMAIL = \ 43 @$(CHK_DIR_EXISTS) "kabc/plugins/file" || $(MKDIR) "kabc/plugins/file"
44 libetpan \ 44 cd kabc/plugins/file && $(QMAKE) file.pro -o $(MAKEFILE)
45 kmicromail/libmailwrapper \ 45sub-kabc-plugins-file: kabc/plugins/file/$(MAKEFILE) FORCE
46 kmicromail 46 cd kabc/plugins/file && $(MAKE) -f $(MAKEFILE)
47 47
48SUBDIRS_GAMMU = \ 48kabc/plugins/dir/$(MAKEFILE):
49 gammu/emb/common \ 49 @$(CHK_DIR_EXISTS) "kabc/plugins/dir" || $(MKDIR) "kabc/plugins/dir"
50 gammu/emb/gammu 50 cd kabc/plugins/dir && $(QMAKE) dir.pro -o $(MAKEFILE)
51 51sub-kabc-plugins-dir: kabc/plugins/dir/$(MAKEFILE) FORCE
52SUBDIRS_PWMANAGER = \ 52 cd kabc/plugins/dir && $(MAKE) -f $(MAKEFILE)
53 pwmanager/libcrypt/mpi \ 53
54 pwmanager/libcrypt/error \ 54kabc/plugins/qtopia/$(MAKEFILE):
55 pwmanager/libcrypt/cipher \ 55 @$(CHK_DIR_EXISTS) "kabc/plugins/qtopia" || $(MKDIR) "kabc/plugins/qtopia"
56 pwmanager/libcrypt/zlib \ 56 cd kabc/plugins/qtopia && $(QMAKE) qtopia.pro -o $(MAKEFILE)
57 pwmanager/pwmanager 57sub-kabc-plugins-qtopia: kabc/plugins/qtopia/$(MAKEFILE) FORCE
58 58 cd kabc/plugins/qtopia && $(MAKE) -f $(MAKEFILE)
59SUBDIRS = \ 59
60 $(SUBDIRS_MICROKDE) \ 60libical/$(MAKEFILE):
61 $(SUBDIRS_QTOPIA_PLUGIN) \ 61 @$(CHK_DIR_EXISTS) "libical" || $(MKDIR) "libical"
62 $(SUBDIRS_OPIE_PLUGIN) \ 62 cd libical && $(QMAKE) libical.pro -o $(MAKEFILE)
63 $(SUBDIRS_SHARP_PLUGIN) \ 63sub-libical: libical/$(MAKEFILE) FORCE
64 $(SUBDIRS_LDAP_PLUGIN) \ 64 cd libical && $(MAKE) -f $(MAKEFILE)
65 $(SUBDIRS_MICROMAIL) \ 65
66 $(SUBDIRS_GAMMU) \ 66libkcal/$(MAKEFILE):
67 $(SUBDIRS_PWMANAGER) 67 @$(CHK_DIR_EXISTS) "libkcal" || $(MKDIR) "libkcal"
68 68 cd libkcal && $(QMAKE) libkcal.pro -o $(MAKEFILE)
69 69sub-libkcal: libkcal/$(MAKEFILE) FORCE
70all: build_microkde \ 70 cd libkcal && $(MAKE) -f $(MAKEFILE)
71 build_qtopia_plugin \ 71
72 build_opie_plugin \ 72kabc/$(MAKEFILE):
73 build_sharp_plugin \ 73 @$(CHK_DIR_EXISTS) "kabc" || $(MKDIR) "kabc"
74 build_ldap_plugin \ 74 cd kabc && $(QMAKE) kabc.pro -o $(MAKEFILE)
75 build_micromail \ 75sub-kabc: kabc/$(MAKEFILE) FORCE
76 build_gammu \ 76 cd kabc && $(MAKE) -f $(MAKEFILE)
77 build_pwmanager 77
78 78libkdepim/$(MAKEFILE):
79 79 @$(CHK_DIR_EXISTS) "libkdepim" || $(MKDIR) "libkdepim"
80build_microkde: variable_test tmake 80 cd libkdepim && $(QMAKE) libkdepim.pro -o $(MAKEFILE)
81 for i in $(SUBDIRS_MICROKDE); do pushd $$i; \ 81sub-libkdepim: libkdepim/$(MAKEFILE) FORCE
82 make -f Makefile$(PLATFORM) || exit 1; popd; \ 82 cd libkdepim && $(MAKE) -f $(MAKEFILE)
83 done 83
84 84microkde/$(MAKEFILE):
85build_qtopia_plugin: build_microkde 85 @$(CHK_DIR_EXISTS) "microkde" || $(MKDIR) "microkde"
86 ifdef BUILD_NO_QTOPIA_PLUGIN 86 cd microkde && $(QMAKE) microkde.pro -o $(MAKEFILE)
87 @echo == qtopia plugin not build. 87sub-microkde: microkde/$(MAKEFILE) FORCE
88 else 88 cd microkde && $(MAKE) -f $(MAKEFILE)
89 for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \ 89
90 make -f Makefile$(PLATFORM) || exit 1; popd; \ 90korganizer/$(MAKEFILE):
91 done 91 @$(CHK_DIR_EXISTS) "korganizer" || $(MKDIR) "korganizer"
92 endif 92 cd korganizer && $(QMAKE) korganizer.pro -o $(MAKEFILE)
93 93sub-korganizer: korganizer/$(MAKEFILE) FORCE
94build_opie_plugin: build_microkde 94 cd korganizer && $(MAKE) -f $(MAKEFILE)
95 ifdef BUILD_NO_OPIE_PLUGIN 95
96 @echo == opie plugin not build. 96kaddressbook/$(MAKEFILE):
97 else 97 @$(CHK_DIR_EXISTS) "kaddressbook" || $(MKDIR) "kaddressbook"
98 for i in $(SUBDIRS_OPIE_PLUGIN); do pushd $$i; \ 98 cd kaddressbook && $(QMAKE) kaddressbook.pro -o $(MAKEFILE)
99 make -f Makefile$(PLATFORM) || exit 1; popd; \ 99sub-kaddressbook: kaddressbook/$(MAKEFILE) FORCE
100 done 100 cd kaddressbook && $(MAKE) -f $(MAKEFILE)
101 endif 101
102 102gammu/emb/common/$(MAKEFILE):
103build_sharp_plugin: build_microkde 103 @$(CHK_DIR_EXISTS) "gammu/emb/common" || $(MKDIR) "gammu/emb/common"
104 ifdef BUILD_NO_SHARP_PLUGIN 104 cd gammu/emb/common && $(QMAKE) common.pro -o $(MAKEFILE)
105 @echo == ldap plugin not build. 105sub-gammu-emb-common: gammu/emb/common/$(MAKEFILE) FORCE
106 else 106 cd gammu/emb/common && $(MAKE) -f $(MAKEFILE)
107 for i in $(SUBDIRS_SHARP_PLUGIN); do pushd $$i; \ 107
108 make -f Makefile$(PLATFORM) || exit 1; popd; \ 108gammu/emb/gammu/$(MAKEFILE):
109 done 109 @$(CHK_DIR_EXISTS) "gammu/emb/gammu" || $(MKDIR) "gammu/emb/gammu"
110 endif 110 cd gammu/emb/gammu && $(QMAKE) gammu.pro -o $(MAKEFILE)
111 111sub-gammu-emb-gammu: gammu/emb/gammu/$(MAKEFILE) FORCE
112build_ldap_plugin: build_microkde 112 cd gammu/emb/gammu && $(MAKE) -f $(MAKEFILE)
113 ifdef BUILD_NO_LDAP_PLUGIN 113
114 @echo == ldap plugin not build. 114libetpan/$(MAKEFILE):
115 else 115 @$(CHK_DIR_EXISTS) "libetpan" || $(MKDIR) "libetpan"
116 for i in $(SUBDIRS_LDAP_PLUGIN); do pushd $$i; \ 116 cd libetpan && $(QMAKE) libetpan.pro -o $(MAKEFILE)
117 make -f Makefile$(PLATFORM) || exit 1; popd; \ 117sub-libetpan: libetpan/$(MAKEFILE) FORCE
118 done 118 cd libetpan && $(MAKE) -f $(MAKEFILE)
119 endif 119
120 120kmicromail/libmailwrapper/$(MAKEFILE):
121 121 @$(CHK_DIR_EXISTS) "kmicromail/libmailwrapper" || $(MKDIR) "kmicromail/libmailwrapper"
122build_micromail: build_microkde 122 cd kmicromail/libmailwrapper && $(QMAKE) libmailwrapper.pro -o $(MAKEFILE)
123 ifdef BUILD_NO_MICROMAIL 123sub-kmicromail-libmailwrapper: kmicromail/libmailwrapper/$(MAKEFILE) FORCE
124 @echo == kmicromail not build. 124 cd kmicromail/libmailwrapper && $(MAKE) -f $(MAKEFILE)
125 else 125
126 for i in $(SUBDIRS_MICROMAIL); do pushd $$i; \ 126kmicromail/$(MAKEFILE):
127 make -f Makefile$(PLATFORM) || exit 1; popd; \ 127 @$(CHK_DIR_EXISTS) "kmicromail" || $(MKDIR) "kmicromail"
128 done 128 cd kmicromail && $(QMAKE) kmicromail.pro -o $(MAKEFILE)
129 endif 129sub-kmicromail: kmicromail/$(MAKEFILE) FORCE
130 130 cd kmicromail && $(MAKE) -f $(MAKEFILE)
131build_gammu: variable_test tmake 131
132 ifdef BUILD_NO_GAMMU 132pwmanager/libcrypt/cipher/$(MAKEFILE):
133 @echo == gammu not build. 133 @$(CHK_DIR_EXISTS) "pwmanager/libcrypt/cipher" || $(MKDIR) "pwmanager/libcrypt/cipher"
134 else 134 cd pwmanager/libcrypt/cipher && $(QMAKE) cipher.pro -o $(MAKEFILE)
135 for i in $(SUBDIRS_GAMMU); do pushd $$i; \ 135sub-pwmanager-libcrypt-cipher: pwmanager/libcrypt/cipher/$(MAKEFILE) FORCE
136 make -f Makefile$(PLATFORM) || exit 1; popd; \ 136 cd pwmanager/libcrypt/cipher && $(MAKE) -f $(MAKEFILE)
137 done 137
138 endif 138pwmanager/libcrypt/error/$(MAKEFILE):
139 139 @$(CHK_DIR_EXISTS) "pwmanager/libcrypt/error" || $(MKDIR) "pwmanager/libcrypt/error"
140build_pwmanager: build_microkde 140 cd pwmanager/libcrypt/error && $(QMAKE) error.pro -o $(MAKEFILE)
141 ifdef BUILD_NO_PWMANAGER 141sub-pwmanager-libcrypt-error: pwmanager/libcrypt/error/$(MAKEFILE) FORCE
142 @echo == pwmanager not build. 142 cd pwmanager/libcrypt/error && $(MAKE) -f $(MAKEFILE)
143 else 143
144 for i in $(SUBDIRS_PWMANAGER); do pushd $$i; \ 144pwmanager/libcrypt/mpi/$(MAKEFILE):
145 make -f Makefile$(PLATFORM) || exit 1; popd; \ 145 @$(CHK_DIR_EXISTS) "pwmanager/libcrypt/mpi" || $(MKDIR) "pwmanager/libcrypt/mpi"
146 done 146 cd pwmanager/libcrypt/mpi && $(QMAKE) mpi.pro -o $(MAKEFILE)
147 endif 147sub-pwmanager-libcrypt-mpi: pwmanager/libcrypt/mpi/$(MAKEFILE) FORCE
148 148 cd pwmanager/libcrypt/mpi && $(MAKE) -f $(MAKEFILE)
149 149
150variable_info: 150pwmanager/libcrypt/zlib/$(MAKEFILE):
151 @echo -------------------------------------- 151 @$(CHK_DIR_EXISTS) "pwmanager/libcrypt/zlib" || $(MKDIR) "pwmanager/libcrypt/zlib"
152 @echo KDEPIM buildsystem, variableinfo... 152 cd pwmanager/libcrypt/zlib && $(QMAKE) zlib.pro -o $(MAKEFILE)
153 @echo KDEPIMDIR=$(KDEPIMDIR) 153sub-pwmanager-libcrypt-zlib: pwmanager/libcrypt/zlib/$(MAKEFILE) FORCE
154 @echo QTDIR=$(QTDIR) 154 cd pwmanager/libcrypt/zlib && $(MAKE) -f $(MAKEFILE)
155 @echo QPEDIR=$(QPEDIR) 155
156 @echo OPIEDIR=$(OPIEDIR) 156pwmanager/pwmanager/$(MAKEFILE):
157 @echo PLATFORM=$(PLATFORM) 157 @$(CHK_DIR_EXISTS) "pwmanager/pwmanager" || $(MKDIR) "pwmanager/pwmanager"
158 @echo RELEASE_DEBUG=$(RELEASE_DEBUG) 158 cd pwmanager/pwmanager && $(QMAKE) pwmanager.pro -o $(MAKEFILE)
159 @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL) 159sub-pwmanager-pwmanager: pwmanager/pwmanager/$(MAKEFILE) FORCE
160 @echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN) 160 cd pwmanager/pwmanager && $(MAKE) -f $(MAKEFILE)
161 @echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN) 161
162 @echo BUILD_NO_QTOPIA_PLUGIN=$(BUILD_NO_QTOPIA_PLUGIN) 162Makefile: kdepim-desktop.pro /usr/lib/qt3/mkspecs/default/qmake.conf variables.pri
163 @echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN) 163 $(QMAKE) -o Makefile kdepim-desktop.pro
164 ifndef BUILD_NO_SHARP_PLUGIN 164qmake: qmake_all
165 @echo SHARPDTMSDK=$(SHARPDTMSDK) 165 @$(QMAKE) -o Makefile kdepim-desktop.pro
166 endif 166
167 @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU) 167all: $(SUBTARGETS)
168 @echo BUILD_NO_PWMANAGER=$(BUILD_NO_PWMANAGER) 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)
169 @echo -------------------------------------- 169 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
170 170 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
171variable_test: variable_info 171 ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
172 @echo KDEPIM buildsystem, variablecheck... 172 ( [ -d libical ] && cd libical ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
173 ifndef KDEPIMDIR 173 ( [ -d libkcal ] && cd libkcal ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
174 @echo KDEPIMDIR is not defined. 174 ( [ -d kabc ] && cd kabc ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
175 $(error KDEPIMDIR is not defined) 175 ( [ -d libkdepim ] && cd libkdepim ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
176 endif 176 ( [ -d microkde ] && cd microkde ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
177 ifndef PLATFORM 177 ( [ -d korganizer ] && cd korganizer ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
178 @echo PLATFORM is not defined. 178 ( [ -d kaddressbook ] && cd kaddressbook ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
179 $(error PLATFORM is not defined) 179 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
180 endif 180 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
181 ifdef BUILD_NO_LDAP_PLUGIN 181 ( [ -d libetpan ] && cd libetpan ; 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) 182 ( [ -d kmicromail/libmailwrapper ] && cd kmicromail/libmailwrapper ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
183 endif 183 ( [ -d kmicromail ] && cd kmicromail ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
184 ifdef BUILD_NO_OPIE_PLUGIN 184 ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; 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) 185 ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
186 endif 186 ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
187 ifdef BUILD_NO_QTOPIA_PLUGIN 187 ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; 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) 188 ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
189 endif 189clean uicables mocables uiclean mocclean lexclean yaccclean : qmake_all FORCE
190 ifdef BUILD_NO_MICROMAIL 190 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; ) || true
191 @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL) 191 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; ) || true
192 endif 192 ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) $@; ) || true
193 ifdef BUILD_NO_SHARP_PLUGIN 193 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; ) || true
194 @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN) 194 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; ) || true
195 else 195 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; ) || true
196 ifndef SHARPDTMSDK 196 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; ) || true
197 @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK) 197 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; ) || true
198 $(error SHARPDTMSDK is not defined) 198 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; ) || true
199 endif 199 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; ) || true
200 endif 200 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; ) || true
201 ifdef BUILD_NO_GAMMU 201 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) $@; ) || true
202 @echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU) 202 ( [ -d libetpan ] && cd libetpan ; $(MAKE) -f $(MAKEFILE) $@; ) || true
203 endif 203 ( [ -d kmicromail/libmailwrapper ] && cd kmicromail/libmailwrapper ; $(MAKE) -f $(MAKEFILE) $@; ) || true
204 ifdef BUILD_NO_PWMANAGER 204 ( [ -d kmicromail ] && cd kmicromail ; $(MAKE) -f $(MAKEFILE) $@; ) || true
205 @echo PWMANAGER will not be build, because BUILD_NO_PWMANAGER is set to $(BUILD_NO_PWMANAGER) 205 ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) $@; ) || true
206 endif 206 ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) $@; ) || true
207 @echo -------------------------------------- 207 ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) $@; ) || true
208 208 ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) $@; ) || true
209 209 ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) $@; ) || true
210objects: 210uninstall_subdirs: qmake_all FORCE
211 for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done 211 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
212 for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done 212 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
213 mkdir -p libical/lib/$(PLATFORM) 213 ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
214 mkdir -p dest 214 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
215 mkdir -p dest$(LIBICAL_PATH) 215 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
216 mkdir -p pwmanager/libcrypt/$(PLATFORM) 216 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
217 217 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
218clean: 218 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
219 rm -rf libical/lib/$(PLATFORM)/*; 219 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
220 rm -rf pwmanager/libcrypt/$(PLATFORM)/*; 220 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
221 for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\ 221 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
222 rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \ 222 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
223 done 223 ( [ -d libetpan ] && cd libetpan ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
224 224 ( [ -d kmicromail/libmailwrapper ] && cd kmicromail/libmailwrapper ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
225pac: 225 ( [ -d kmicromail ] && cd kmicromail ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
226 rm -f $(QPEDIR)/lib/libmicro* 226 ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
227 rm -f $(QPEDIR)/plugins/applets/libkopi* 227 ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
228 make 228 ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
229 make install 229 ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
230 make dist 230 ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
231install: 231install_subdirs: qmake_all FORCE
232 232 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) install; ) || true
233 cd bin/kdepim; make install 233 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) install; ) || true
234 cp -r Pim $(QPEDIR)/apps 234 ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) install; ) || true
235 cp db2file/db2file $(QPEDIR)/bin/db2file 235 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) install; ) || true
236 chmod ugo+x $(QPEDIR)/bin/db2file 236 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) install; ) || true
237 cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop 237 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) install; ) || true
238 cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop 238 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) install; ) || true
239 cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop 239 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) install; ) || true
240 cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop 240 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) install; ) || true
241 241 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) install; ) || true
242dist: 242 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) install; ) || true
243 @echo Dont forget to do "make install" before "make dist" 243 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) install; ) || true
244 rm -f *arm.ipk 244 ( [ -d libetpan ] && cd libetpan ; $(MAKE) -f $(MAKEFILE) install; ) || true
245 rm -f *ipk.zip 245 ( [ -d kmicromail/libmailwrapper ] && cd kmicromail/libmailwrapper ; $(MAKE) -f $(MAKEFILE) install; ) || true
246 rm -rf ../kdepimpi_$(KDEPIM_VERSION)/* 246 ( [ -d kmicromail ] && cd kmicromail ; $(MAKE) -f $(MAKEFILE) install; ) || true
247 rm -f *~ 247 ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) install; ) || true
248 cd ..;mkdir -p kdepimpi_$(KDEPIM_VERSION) 248 ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) install; ) || true
249 cd ../kdepimpi_$(KDEPIM_VERSION);mkdir -p ipk 249 ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(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 250 ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) install; ) || true
251 mkipks kmicrokdelibs.control 251 ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) install; ) || true
252 mkipks korganizer.control 252distclean: qmake_all FORCE
253 mkipks kaddressbook.control 253 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
254 ifndef BUILD_NO_MICROMAIL 254 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
255 mkipks kopiemail.control 255 ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
256 endif 256 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
257 ifndef BUILD_NO_SHARP_PLUGIN 257 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
258 mkipks ksharpPIM-DTMaccess.control 258 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
259 endif 259 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
260 mkipks korganizer-alarm.control 260 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
261 ifndef BUILD_NO_GAMMU 261 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
262 mkipks kmobilephoneaccess.control 262 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
263 endif 263 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
264 ifndef BUILD_NO_PWMANAGER 264 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
265 mkipks pwmanager.control 265 ( [ -d libetpan ] && cd libetpan ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
266 endif 266 ( [ -d kmicromail/libmailwrapper ] && cd kmicromail/libmailwrapper ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
267 mkipks pimTABicon.control 267 ( [ -d kmicromail ] && cd kmicromail ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
268 zip kdepim_$(KDEPIM_VERSION)_for_SharpRom.ipk.zip *.ipk ReleaseNotes.txt 268 ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
269 mv *.ipk ../kdepimpi_$(KDEPIM_VERSION)/ipk/ 269 ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
270 mv *for_SharpRom.ipk.zip ../kdepimpi_$(KDEPIM_VERSION)/ 270 ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
271 mv ../kdepimpi-$(KDEPIM_VERSION).tar.gz ../kdepimpi_$(KDEPIM_VERSION)/ 271 ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
272 272 ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
273tmake: objects \ 273
274 qtcompat/Makefile$(PLATFORM) \ 274install: install_subdirs
275 microkde/Makefile$(PLATFORM) \ 275
276 libkcal/Makefile$(PLATFORM) \ 276uninstall: uninstall_subdirs
277 libkdepim/Makefile$(PLATFORM) \ 277
278 korganizer/Makefile$(PLATFORM) \ 278FORCE:
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
385 279
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index b5d52d2..148d914 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -1185,399 +1185,450 @@ void KOAgenda::endItemAction()
1185 1185
1186 } 1186 }
1187 1187
1188 } 1188 }
1189 1189
1190 mScrollUpTimer.stop(); 1190 mScrollUpTimer.stop();
1191 mScrollDownTimer.stop(); 1191 mScrollDownTimer.stop();
1192 setCursor( arrowCursor ); 1192 setCursor( arrowCursor );
1193 mActionItem = 0; 1193 mActionItem = 0;
1194 mActionType = NOP; 1194 mActionType = NOP;
1195 mItemMoved = 0; 1195 mItemMoved = 0;
1196 1196
1197} 1197}
1198 1198
1199void KOAgenda::setNoActionCursor(KOAgendaItem *moveItem,QPoint viewportPos) 1199void KOAgenda::setNoActionCursor(KOAgendaItem *moveItem,QPoint viewportPos)
1200{ 1200{
1201// kdDebug() << "viewportPos: " << viewportPos.x() << "," << viewportPos.y() << endl; 1201// kdDebug() << "viewportPos: " << viewportPos.x() << "," << viewportPos.y() << endl;
1202// QPoint point = viewport()->mapToGlobal(viewportPos); 1202// QPoint point = viewport()->mapToGlobal(viewportPos);
1203// kdDebug() << "Global: " << point.x() << "," << point.y() << endl; 1203// kdDebug() << "Global: " << point.x() << "," << point.y() << endl;
1204// point = clipper()->mapFromGlobal(point); 1204// point = clipper()->mapFromGlobal(point);
1205// kdDebug() << "clipper: " << point.x() << "," << point.y() << endl; 1205// kdDebug() << "clipper: " << point.x() << "," << point.y() << endl;
1206 1206
1207 int x,y; 1207 int x,y;
1208 viewportToContents(viewportPos.x(),viewportPos.y(),x,y); 1208 viewportToContents(viewportPos.x(),viewportPos.y(),x,y);
1209// kdDebug() << "contents: " << x << "," << y << "\n" << endl; 1209// kdDebug() << "contents: " << x << "," << y << "\n" << endl;
1210 int gx,gy; 1210 int gx,gy;
1211 contentsToGrid(x,y,gx,gy); 1211 contentsToGrid(x,y,gx,gy);
1212 1212
1213 // Change cursor to resize cursor if appropriate 1213 // Change cursor to resize cursor if appropriate
1214 if (mAllDayMode) { 1214 if (mAllDayMode) {
1215 int gridDistanceX = (x - gx * mGridSpacingX); 1215 int gridDistanceX = (x - gx * mGridSpacingX);
1216 if (gridDistanceX < mResizeBorderWidth && 1216 if (gridDistanceX < mResizeBorderWidth &&
1217 moveItem->cellX() == gx) { 1217 moveItem->cellX() == gx) {
1218 setCursor(sizeHorCursor); 1218 setCursor(sizeHorCursor);
1219 } else if ((mGridSpacingX - gridDistanceX) < mResizeBorderWidth && 1219 } else if ((mGridSpacingX - gridDistanceX) < mResizeBorderWidth &&
1220 moveItem->cellXWidth() == gx) { 1220 moveItem->cellXWidth() == gx) {
1221 setCursor(sizeHorCursor); 1221 setCursor(sizeHorCursor);
1222 } else { 1222 } else {
1223 setCursor(arrowCursor); 1223 setCursor(arrowCursor);
1224 } 1224 }
1225 } else { 1225 } else {
1226 int gridDistanceY = (y - gy * mGridSpacingY); 1226 int gridDistanceY = (y - gy * mGridSpacingY);
1227 if (gridDistanceY < mResizeBorderWidth && 1227 if (gridDistanceY < mResizeBorderWidth &&
1228 moveItem->cellYTop() == gy && 1228 moveItem->cellYTop() == gy &&
1229 !moveItem->firstMultiItem()) { 1229 !moveItem->firstMultiItem()) {
1230 setCursor(sizeVerCursor); 1230 setCursor(sizeVerCursor);
1231 } else if ((mGridSpacingY - gridDistanceY) < mResizeBorderWidth && 1231 } else if ((mGridSpacingY - gridDistanceY) < mResizeBorderWidth &&
1232 moveItem->cellYBottom() == gy && 1232 moveItem->cellYBottom() == gy &&
1233 !moveItem->lastMultiItem()) { 1233 !moveItem->lastMultiItem()) {
1234 setCursor(sizeVerCursor); 1234 setCursor(sizeVerCursor);
1235 } else { 1235 } else {
1236 setCursor(arrowCursor); 1236 setCursor(arrowCursor);
1237 } 1237 }
1238 } 1238 }
1239} 1239}
1240 1240
1241 1241
1242/* 1242/*
1243 Place item in cell and take care that multiple items using the same cell do 1243 Place item in cell and take care that multiple items using the same cell do
1244 not overlap. This method is not yet optimal. It doesn´t use the maximum space 1244 not overlap. This method is not yet optimal. It doesn´t use the maximum space
1245 it can get in all cases. 1245 it can get in all cases.
1246 At the moment the method has a bug: When an item is placed only the sub cell 1246 At the moment the method has a bug: When an item is placed only the sub cell
1247 widths of the items are changed, which are within the Y region the item to 1247 widths of the items are changed, which are within the Y region the item to
1248 place spans. When the sub cell width change of one of this items affects a 1248 place spans. When the sub cell width change of one of this items affects a
1249 cell, where other items are, which do not overlap in Y with the item to place, 1249 cell, where other items are, which do not overlap in Y with the item to place,
1250 the display gets corrupted, although the corruption looks quite nice. 1250 the display gets corrupted, although the corruption looks quite nice.
1251*/ 1251*/
1252void KOAgenda::placeSubCells(KOAgendaItem *placeItem) 1252void KOAgenda::placeSubCells(KOAgendaItem *placeItem)
1253{ 1253{
1254 1254
1255 QPtrList<KOAgendaItem> conflictItems; 1255 QPtrList<KOAgendaItem> conflictItems;
1256 int maxSubCells = 0; 1256 int maxSubCells = 0;
1257 QIntDict<KOAgendaItem> subCellDict(5); 1257 QIntDict<KOAgendaItem> subCellDict(5);
1258 1258
1259 KOAgendaItem *item; 1259 KOAgendaItem *item;
1260 for ( item=mItems.first(); item != 0; item=mItems.next() ) { 1260 for ( item=mItems.first(); item != 0; item=mItems.next() ) {
1261 if (item != placeItem) { 1261 if (item != placeItem) {
1262 if (placeItem->cellX() <= item->cellXWidth() && 1262 if (placeItem->cellX() <= item->cellXWidth() &&
1263 placeItem->cellXWidth() >= item->cellX()) { 1263 placeItem->cellXWidth() >= item->cellX()) {
1264 if ((placeItem->cellYTop() <= item->cellYBottom()) && 1264 if ((placeItem->cellYTop() <= item->cellYBottom()) &&
1265 (placeItem->cellYBottom() >= item->cellYTop())) { 1265 (placeItem->cellYBottom() >= item->cellYTop())) {
1266 conflictItems.append(item); 1266 conflictItems.append(item);
1267 if (item->subCells() > maxSubCells) 1267 if (item->subCells() > maxSubCells)
1268 maxSubCells = item->subCells(); 1268 maxSubCells = item->subCells();
1269 subCellDict.insert(item->subCell(),item); 1269 subCellDict.insert(item->subCell(),item);
1270 } 1270 }
1271 } 1271 }
1272 } 1272 }
1273 } 1273 }
1274 1274
1275 if (conflictItems.count() > 0) { 1275 if (conflictItems.count() > 0) {
1276 // Look for unused sub cell and insert item 1276 // Look for unused sub cell and insert item
1277 int i; 1277 int i;
1278 for(i=0;i<maxSubCells;++i) { 1278 for(i=0;i<maxSubCells;++i) {
1279 if (!subCellDict.find(i)) { 1279 if (!subCellDict.find(i)) {
1280 placeItem->setSubCell(i); 1280 placeItem->setSubCell(i);
1281 break; 1281 break;
1282 } 1282 }
1283 } 1283 }
1284 if (i == maxSubCells) { 1284 if (i == maxSubCells) {
1285 placeItem->setSubCell(maxSubCells); 1285 placeItem->setSubCell(maxSubCells);
1286 maxSubCells++; // add new item to number of sub cells 1286 maxSubCells++; // add new item to number of sub cells
1287 } 1287 }
1288 1288
1289 // Prepare for sub cell geometry adjustment 1289 // Prepare for sub cell geometry adjustment
1290 int newSubCellWidth; 1290 int newSubCellWidth;
1291 if (mAllDayMode) newSubCellWidth = mGridSpacingY / maxSubCells; 1291 if (mAllDayMode) newSubCellWidth = mGridSpacingY / maxSubCells;
1292 else newSubCellWidth = mGridSpacingX / maxSubCells; 1292 else newSubCellWidth = mGridSpacingX / maxSubCells;
1293 conflictItems.append(placeItem); 1293 conflictItems.append(placeItem);
1294 1294
1295 1295
1296 // Adjust sub cell geometry of all direct conflict items 1296 // Adjust sub cell geometry of all direct conflict items
1297 for ( item=conflictItems.first(); item != 0; 1297 for ( item=conflictItems.first(); item != 0;
1298 item=conflictItems.next() ) { 1298 item=conflictItems.next() ) {
1299 item->setSubCells(maxSubCells); 1299 item->setSubCells(maxSubCells);
1300 if (mAllDayMode) { 1300 if (mAllDayMode) {
1301 item->resize(item->cellWidth() * mGridSpacingX, newSubCellWidth); 1301 item->resize(item->cellWidth() * mGridSpacingX, newSubCellWidth);
1302 } else { 1302 } else {
1303 item->resize(newSubCellWidth, item->cellHeight() * mGridSpacingY); 1303 item->resize(newSubCellWidth, item->cellHeight() * mGridSpacingY);
1304 } 1304 }
1305 int x,y; 1305 int x,y;
1306 gridToContents(item->cellX(),item->cellYTop(),x,y); 1306 gridToContents(item->cellX(),item->cellYTop(),x,y);
1307 if (mAllDayMode) { 1307 if (mAllDayMode) {
1308 y += item->subCell() * newSubCellWidth; 1308 y += item->subCell() * newSubCellWidth;
1309 } else { 1309 } else {
1310 x += item->subCell() * newSubCellWidth; 1310 x += item->subCell() * newSubCellWidth;
1311 } 1311 }
1312 moveChild(item,x,y); 1312 moveChild(item,x,y);
1313 // qDebug("moveChild %s %d %d ", item->incidence()->summary().latin1() ,x,y); 1313 // qDebug("moveChild %s %d %d ", item->incidence()->summary().latin1() ,x,y);
1314 //item->updateItem(); 1314 //item->updateItem();
1315 } 1315 }
1316 // Adjust sub cell geometry of all conflict items of all conflict items 1316 // Adjust sub cell geometry of all conflict items of all conflict items
1317 for ( item=conflictItems.first(); item != 0; 1317 for ( item=conflictItems.first(); item != 0;
1318 item=conflictItems.next() ) { 1318 item=conflictItems.next() ) {
1319 if ( placeItem != item ) { 1319 if ( placeItem != item ) {
1320 KOAgendaItem *item2; 1320 KOAgendaItem *item2;
1321 QPtrList<KOAgendaItem> conflictItems2 = item->conflictItems(); 1321 QPtrList<KOAgendaItem> conflictItems2 = item->conflictItems();
1322 for ( item2=conflictItems2.first(); item2 != 0; 1322 for ( item2=conflictItems2.first(); item2 != 0;
1323 item2=conflictItems2.next() ) { 1323 item2=conflictItems2.next() ) {
1324 if ( item2->subCells() != maxSubCells) { 1324 if ( item2->subCells() != maxSubCells) {
1325 item2->setSubCells(maxSubCells); 1325 item2->setSubCells(maxSubCells);
1326 if (mAllDayMode) { 1326 if (mAllDayMode) {
1327 item2->resize(item2->cellWidth() * mGridSpacingX, newSubCellWidth); 1327 item2->resize(item2->cellWidth() * mGridSpacingX, newSubCellWidth);
1328 } else { 1328 } else {
1329 item2->resize(newSubCellWidth, item2->cellHeight() * mGridSpacingY); 1329 item2->resize(newSubCellWidth, item2->cellHeight() * mGridSpacingY);
1330 } 1330 }
1331 int x,y; 1331 int x,y;
1332 gridToContents(item2->cellX(),item2->cellYTop(),x,y); 1332 gridToContents(item2->cellX(),item2->cellYTop(),x,y);
1333 if (mAllDayMode) { 1333 if (mAllDayMode) {
1334 y += item2->subCell() * newSubCellWidth; 1334 y += item2->subCell() * newSubCellWidth;
1335 } else { 1335 } else {
1336 x += item2->subCell() * newSubCellWidth; 1336 x += item2->subCell() * newSubCellWidth;
1337 } 1337 }
1338 moveChild(item2,x,y); 1338 moveChild(item2,x,y);
1339 //qDebug("setttttt %d %s",maxSubCells, item2->text().latin1() ); 1339 //qDebug("setttttt %d %s",maxSubCells, item2->text().latin1() );
1340 } 1340 }
1341 } 1341 }
1342 } 1342 }
1343 } 1343 }
1344 } else { 1344 } else {
1345 placeItem->setSubCell(0); 1345 placeItem->setSubCell(0);
1346 placeItem->setSubCells(1); 1346 placeItem->setSubCells(1);
1347 if (mAllDayMode) placeItem->resize(placeItem->width(),mGridSpacingY); 1347 if (mAllDayMode) placeItem->resize(placeItem->width(),mGridSpacingY);
1348 else placeItem->resize(mGridSpacingX,placeItem->height()); 1348 else placeItem->resize(mGridSpacingX,placeItem->height());
1349 int x,y; 1349 int x,y;
1350 gridToContents(placeItem->cellX(),placeItem->cellYTop(),x,y); 1350 gridToContents(placeItem->cellX(),placeItem->cellYTop(),x,y);
1351 moveChild(placeItem,x,y); 1351 moveChild(placeItem,x,y);
1352 } 1352 }
1353 placeItem->setConflictItems(conflictItems); 1353 placeItem->setConflictItems(conflictItems);
1354 // for ( item=conflictItems.first(); item != 0; 1354 // for ( item=conflictItems.first(); item != 0;
1355// item=conflictItems.next() ) { 1355// item=conflictItems.next() ) {
1356// //item->updateItem(); 1356// //item->updateItem();
1357// //qDebug("xxx item->updateItem() %s %d %d", item->incidence()->summary().latin1(),item->x(), item->y() ); 1357// //qDebug("xxx item->updateItem() %s %d %d", item->incidence()->summary().latin1(),item->x(), item->y() );
1358// } 1358// }
1359// placeItem->updateItem(); 1359// placeItem->updateItem();
1360} 1360}
1361 1361
1362void KOAgenda::drawContents(QPainter* p, int cx, int cy, int cw, int ch) 1362void KOAgenda::drawContents(QPainter* p, int cx, int cy, int cw, int ch)
1363{ 1363{
1364 if ( globalFlagBlockAgenda ) 1364 if ( globalFlagBlockAgenda )
1365 return; 1365 return;
1366 //qDebug("KOAgenda::drawContents "); 1366 //qDebug("KOAgenda::drawContents ");
1367 if ( mCurPixWid != contentsWidth() || mCurPixHei != contentsHeight() ) 1367 if ( mCurPixWid != contentsWidth() || mCurPixHei != contentsHeight() )
1368 ;//drawContentsToPainter(); 1368 ;//drawContentsToPainter();
1369 1369
1370 QPaintDevice* pd = p->device(); 1370 QPaintDevice* pd = p->device();
1371 p->end(); 1371 p->end();
1372 int vx, vy; 1372 int vx, vy;
1373 int selectionX = KOGlobals::self()->reverseLayout() ? 1373 int selectionX = KOGlobals::self()->reverseLayout() ?
1374 (mColumns - 1 - mSelectionCellX) * mGridSpacingX : 1374 (mColumns - 1 - mSelectionCellX) * mGridSpacingX :
1375 mSelectionCellX * mGridSpacingX; 1375 mSelectionCellX * mGridSpacingX;
1376 contentsToViewport ( cx, cy, vx,vy); 1376 contentsToViewport ( cx, cy, vx,vy);
1377 //qDebug(" %d %d %d %d %d", cx, cy, cw,ch,mGridSpacingX-1) ;
1378
1379 if ( !(selectionX == cx && cy == mSelectionYTop && cw ==mGridSpacingX && ch == mSelectionHeight ) ) {
1380 if ( mGridSpacingX == cw && mSelectionHeight > 0 && ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) &&
1381 ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) ) {
1382
1383 int vxSel, vySel;
1384 contentsToViewport ( selectionX, mSelectionYTop, vxSel,vySel);
1385 int off = mSelectionHeight;
1386 if ( vySel < 0 )
1387 off += vySel;
1388 //qDebug("OFF %d %d %d", off,vySel, vy );
1389 bitBlt ( pd, vx, vy+off, &mPaintPixmap, cx, cy+off, cw , ch-off ,CopyROP);
1390 } else {
1391 bitBlt ( pd, vx, vy, &mPaintPixmap, cx, cy, cw, ch ,CopyROP);
1392 }
1393 }
1394 if ( mSelectionHeight > 0 ) {
1395 //qDebug("---- %d %d %d %d ", selectionX, mSelectionYTop, mGridSpacingX, mSelectionHeight );
1396 if ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) &&
1397 ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) {
1398 contentsToViewport ( selectionX, mSelectionYTop, vx,vy);
1399 bitBlt ( pd, vx+1, vy, &mHighlightPixmap, 0, mSelectionYTop, mGridSpacingX-1, mSelectionHeight ,CopyROP);
1400 }
1401 }
1402 //qDebug("btbl ");
1403 p->begin( pd );
1404 //qDebug("end ");
1405#if 0
1406
1407 if ( globalFlagBlockAgenda )
1408 return;
1409 //qDebug("KOAgenda::drawContents ");
1410 if ( mCurPixWid != contentsWidth() || mCurPixHei != contentsHeight() )
1411 ;//drawContentsToPainter();
1412
1413 QPaintDevice* pd = p->device();
1414 p->end();
1415 int vx, vy;
1416 int selectionX = KOGlobals::self()->reverseLayout() ?
1417 (mColumns - 1 - mSelectionCellX) * mGridSpacingX :
1418 mSelectionCellX * mGridSpacingX;
1419 contentsToViewport ( cx, cy, vx,vy);
1377 // qDebug(" %d %d %d %d ", cx, cy, cw,ch) ; 1420 // qDebug(" %d %d %d %d ", cx, cy, cw,ch) ;
1378 if ( !(selectionX == cx && cy == mSelectionYTop && cw ==mGridSpacingX && ch == mSelectionHeight ) ) 1421 if ( !(selectionX == cx && cy == mSelectionYTop && cw ==mGridSpacingX && ch == mSelectionHeight ) )
1379 bitBlt ( pd, vx, vy, &mPaintPixmap, cx, cy, cw, ch ,CopyROP); 1422 bitBlt ( pd, vx, vy, &mPaintPixmap, cx, cy, cw, ch ,CopyROP);
1380 1423
1381 if ( mSelectionHeight > 0 ) { 1424 if ( mSelectionHeight > 0 ) {
1382 //qDebug("---- %d %d %d %d ", selectionX, mSelectionYTop, mGridSpacingX, mSelectionHeight ); 1425 //qDebug("---- %d %d %d %d ", selectionX, mSelectionYTop, mGridSpacingX, mSelectionHeight );
1383 if ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) && 1426 if ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) &&
1384 ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) { 1427 ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) {
1385 contentsToViewport ( selectionX, mSelectionYTop, vx,vy); 1428 contentsToViewport ( selectionX, mSelectionYTop, vx,vy);
1386 bitBlt ( pd, vx+1, vy, &mHighlightPixmap, 0, mSelectionYTop, mGridSpacingX-1, mSelectionHeight ,CopyROP); 1429 bitBlt ( pd, vx+1, vy, &mHighlightPixmap, 0, mSelectionYTop, mGridSpacingX-1, mSelectionHeight ,CopyROP);
1387 } 1430 }
1388 } 1431 }
1389 //qDebug("btbl "); 1432 //qDebug("btbl ");
1390 p->begin( pd ); 1433 p->begin( pd );
1391 //qDebug("end "); 1434 //qDebug("end ");
1435
1436
1437
1438
1439
1440
1441
1442#endif
1392} 1443}
1393 1444
1394void KOAgenda::finishUpdate() 1445void KOAgenda::finishUpdate()
1395{ 1446{
1396 1447
1397 KOAgendaItem *item; 1448 KOAgendaItem *item;
1398 globalFlagBlockAgendaItemPaint = 1; 1449 globalFlagBlockAgendaItemPaint = 1;
1399 // Adjust sub cell geometry of all conflict items of all conflict items of all conflict items ... of the conflict item with the max number of conflictitems 1450 // Adjust sub cell geometry of all conflict items of all conflict items of all conflict items ... of the conflict item with the max number of conflictitems
1400 for ( item=mItems.first(); item != 0; item=mItems.next() ) { 1451 for ( item=mItems.first(); item != 0; item=mItems.next() ) {
1401 if ( !item->checkLayout() ) { 1452 if ( !item->checkLayout() ) {
1402 //qDebug(" conflictitem found "); 1453 //qDebug(" conflictitem found ");
1403 int newSubCellWidth; 1454 int newSubCellWidth;
1404 if (mAllDayMode) newSubCellWidth = mGridSpacingY / item->subCells(); 1455 if (mAllDayMode) newSubCellWidth = mGridSpacingY / item->subCells();
1405 else newSubCellWidth = mGridSpacingX / item->subCells(); 1456 else newSubCellWidth = mGridSpacingX / item->subCells();
1406 1457
1407 if (mAllDayMode) { 1458 if (mAllDayMode) {
1408 item->resize(item->cellWidth() * mGridSpacingX, newSubCellWidth); 1459 item->resize(item->cellWidth() * mGridSpacingX, newSubCellWidth);
1409 } else { 1460 } else {
1410 item->resize(newSubCellWidth, item->cellHeight() * mGridSpacingY); 1461 item->resize(newSubCellWidth, item->cellHeight() * mGridSpacingY);
1411 } 1462 }
1412 int x,y; 1463 int x,y;
1413 gridToContents(item->cellX(),item->cellYTop(),x,y); 1464 gridToContents(item->cellX(),item->cellYTop(),x,y);
1414 if (mAllDayMode) { 1465 if (mAllDayMode) {
1415 y += item->subCell() * newSubCellWidth; 1466 y += item->subCell() * newSubCellWidth;
1416 } else { 1467 } else {
1417 x += item->subCell() * newSubCellWidth; 1468 x += item->subCell() * newSubCellWidth;
1418 } 1469 }
1419 moveChild(item,x,y); 1470 moveChild(item,x,y);
1420 } 1471 }
1421 } 1472 }
1422 for ( item=mItems.first(); item != 0; item=mItems.next() ) { 1473 for ( item=mItems.first(); item != 0; item=mItems.next() ) {
1423 if ( !item->isVisible() ) 1474 if ( !item->isVisible() )
1424 item->show(); 1475 item->show();
1425 1476
1426 } 1477 }
1427 globalFlagBlockAgendaItemUpdate = 0; 1478 globalFlagBlockAgendaItemUpdate = 0;
1428 for ( item=mItems.first(); item != 0; item=mItems.next() ) { 1479 for ( item=mItems.first(); item != 0; item=mItems.next() ) {
1429 item->repaintMe( ); 1480 item->repaintMe( );
1430 } 1481 }
1431 globalFlagBlockAgendaItemUpdate = 1; 1482 globalFlagBlockAgendaItemUpdate = 1;
1432 qApp->processEvents(); 1483 qApp->processEvents();
1433 globalFlagBlockAgendaItemPaint = 0; 1484 globalFlagBlockAgendaItemPaint = 0;
1434 for ( item=mItems.first(); item != 0; item=mItems.next() ) { 1485 for ( item=mItems.first(); item != 0; item=mItems.next() ) {
1435 item->repaint( false ); 1486 item->repaint( false );
1436 } 1487 }
1437 1488
1438} 1489}
1439 1490
1440/* 1491/*
1441 Draw grid in the background of the agenda. 1492 Draw grid in the background of the agenda.
1442*/ 1493*/
1443void KOAgenda::drawContentsToPainter( QPainter* paint, bool backgroundOnly )// int cx, int cy, int cw, int ch) 1494void KOAgenda::drawContentsToPainter( QPainter* paint, bool backgroundOnly )// int cx, int cy, int cw, int ch)
1444{ 1495{
1445 1496
1446 1497
1447 if ( ! mGridSpacingX || ! mGridSpacingY ||! mHolidayMask ) 1498 if ( ! mGridSpacingX || ! mGridSpacingY ||! mHolidayMask )
1448 return; 1499 return;
1449 if ( globalFlagBlockAgenda > 1 && globalFlagBlockAgenda < 4 ) 1500 if ( globalFlagBlockAgenda > 1 && globalFlagBlockAgenda < 4 )
1450 return; 1501 return;
1451 int cx = 0, cy = 0, cw = contentsWidth(), ch = contentsHeight(); 1502 int cx = 0, cy = 0, cw = contentsWidth(), ch = contentsHeight();
1452 if ( ch < 1 ) 1503 if ( ch < 1 )
1453 ch = 1; 1504 ch = 1;
1454 if ( mPaintPixmap.width() < contentsWidth()+42 || mPaintPixmap.height() < ch ) { 1505 if ( mPaintPixmap.width() < contentsWidth()+42 || mPaintPixmap.height() < ch ) {
1455 mPaintPixmap.resize( contentsWidth()+42, ch ); 1506 mPaintPixmap.resize( contentsWidth()+42, ch );
1456 } 1507 }
1457 mCurPixWid = contentsWidth(); 1508 mCurPixWid = contentsWidth();
1458 mCurPixHei = ch; 1509 mCurPixHei = ch;
1459 if ( mHighlightPixmap.width() < mGridSpacingX-1 || mHighlightPixmap.height() < ch ) { 1510 if ( mHighlightPixmap.width() < mGridSpacingX-1 || mHighlightPixmap.height() < ch ) {
1460 mHighlightPixmap.resize( mGridSpacingX-1, ch ); 1511 mHighlightPixmap.resize( mGridSpacingX-1, ch );
1461 mHighlightPixmap.fill ( KOPrefs::instance()->mHighlightColor ); 1512 mHighlightPixmap.fill ( KOPrefs::instance()->mHighlightColor );
1462 } 1513 }
1463 mPixPainter.begin( &mPaintPixmap) ; 1514 mPixPainter.begin( &mPaintPixmap) ;
1464 //qDebug("wid %d hei %d ",mPaintPixmap.width(),mPaintPixmap.height() ); 1515 //qDebug("wid %d hei %d ",mPaintPixmap.width(),mPaintPixmap.height() );
1465 QPainter * p ; 1516 QPainter * p ;
1466 if (paint == 0) { 1517 if (paint == 0) {
1467 mPaintPixmap.fill(KOPrefs::instance()->mAgendaBgColor); 1518 mPaintPixmap.fill(KOPrefs::instance()->mAgendaBgColor);
1468 p = &mPixPainter; 1519 p = &mPixPainter;
1469 } 1520 }
1470 else 1521 else
1471 p = paint ; 1522 p = paint ;
1472 // qDebug("++++++KOAgenda::drawContentsTo Painter %d %d %d %d ", cx, cy, cw, ch); 1523 // qDebug("++++++KOAgenda::drawContentsTo Painter %d %d %d %d ", cx, cy, cw, ch);
1473 1524
1474 //--cx;++cw; 1525 //--cx;++cw;
1475 int lGridSpacingY = mGridSpacingY*2; 1526 int lGridSpacingY = mGridSpacingY*2;
1476 int selDay; 1527 int selDay;
1477 if ( !backgroundOnly ) 1528 if ( !backgroundOnly )
1478 for ( selDay = 0; selDay < mSelectedDates.count(); ++selDay) 1529 for ( selDay = 0; selDay < mSelectedDates.count(); ++selDay)
1479 { 1530 {
1480 if ( mSelectedDates[selDay] == QDateTime::currentDateTime ().date() && KOPrefs::instance()->mHighlightCurrentDay) { 1531 if ( mSelectedDates[selDay] == QDateTime::currentDateTime ().date() && KOPrefs::instance()->mHighlightCurrentDay) {
1481 int x1 = cx; 1532 int x1 = cx;
1482 int y1 = 0; 1533 int y1 = 0;
1483 if (y1 < cy) y1 = cy; 1534 if (y1 < cy) y1 = cy;
1484 int x2 = cx+cw-1; 1535 int x2 = cx+cw-1;
1485 int y2 = contentsHeight(); 1536 int y2 = contentsHeight();
1486 if (y2 > cy+ch-1) y2=cy+ch-1; 1537 if (y2 > cy+ch-1) y2=cy+ch-1;
1487 if (x2 >= x1 && y2 >= y1) { 1538 if (x2 >= x1 && y2 >= y1) {
1488 int gxStart = selDay; 1539 int gxStart = selDay;
1489 int gxEnd = gxStart ; 1540 int gxEnd = gxStart ;
1490 int xStart = KOGlobals::self()->reverseLayout() ? 1541 int xStart = KOGlobals::self()->reverseLayout() ?
1491 (mColumns - 1 - gxStart)*mGridSpacingX : 1542 (mColumns - 1 - gxStart)*mGridSpacingX :
1492 gxStart*mGridSpacingX; 1543 gxStart*mGridSpacingX;
1493 if (xStart < x1) xStart = x1; 1544 if (xStart < x1) xStart = x1;
1494 int xEnd = KOGlobals::self()->reverseLayout() ? 1545 int xEnd = KOGlobals::self()->reverseLayout() ?
1495 (mColumns - gxStart)*mGridSpacingX-1 : 1546 (mColumns - gxStart)*mGridSpacingX-1 :
1496 (gxStart+1)*mGridSpacingX-1; 1547 (gxStart+1)*mGridSpacingX-1;
1497 if (xEnd > x2) xEnd = x2; 1548 if (xEnd > x2) xEnd = x2;
1498 if ( KOPrefs::instance()->mUseHighlightLightColor ) 1549 if ( KOPrefs::instance()->mUseHighlightLightColor )
1499 p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1, 1550 p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1,
1500 KOPrefs::instance()->mAgendaBgColor.light()); 1551 KOPrefs::instance()->mAgendaBgColor.light());
1501 else 1552 else
1502 p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1, 1553 p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1,
1503 KOPrefs::instance()->mAgendaBgColor.dark()); 1554 KOPrefs::instance()->mAgendaBgColor.dark());
1504 1555
1505 } 1556 }
1506 } 1557 }
1507 } 1558 }
1508 // Highlight working hours 1559 // Highlight working hours
1509 1560
1510 if ( !backgroundOnly ) 1561 if ( !backgroundOnly )
1511 if (mWorkingHoursEnable) { 1562 if (mWorkingHoursEnable) {
1512 int x1 = cx; 1563 int x1 = cx;
1513 int y1 = mWorkingHoursYTop; 1564 int y1 = mWorkingHoursYTop;
1514 if (y1 < cy) y1 = cy; 1565 if (y1 < cy) y1 = cy;
1515 int x2 = cx+cw-1; 1566 int x2 = cx+cw-1;
1516 // int x2 = mGridSpacingX * 5 - 1; 1567 // int x2 = mGridSpacingX * 5 - 1;
1517 // if (x2 > cx+cw-1) x2 = cx + cw - 1; 1568 // if (x2 > cx+cw-1) x2 = cx + cw - 1;
1518 int y2 = mWorkingHoursYBottom; 1569 int y2 = mWorkingHoursYBottom;
1519 if (y2 > cy+ch-1) y2=cy+ch-1; 1570 if (y2 > cy+ch-1) y2=cy+ch-1;
1520 1571
1521 if (x2 >= x1 && y2 >= y1) { 1572 if (x2 >= x1 && y2 >= y1) {
1522 // qDebug("x1 %d mGridSpacingX %d ", x1, mGridSpacingX ); 1573 // qDebug("x1 %d mGridSpacingX %d ", x1, mGridSpacingX );
1523 int gxStart = x1/mGridSpacingX; 1574 int gxStart = x1/mGridSpacingX;
1524 int gxEnd = x2/mGridSpacingX; 1575 int gxEnd = x2/mGridSpacingX;
1525 while(gxStart <= gxEnd) { 1576 while(gxStart <= gxEnd) {
1526 if (gxStart < int(mHolidayMask->count()) && 1577 if (gxStart < int(mHolidayMask->count()) &&
1527 !mHolidayMask->at(gxStart)) { 1578 !mHolidayMask->at(gxStart)) {
1528 int xStart = KOGlobals::self()->reverseLayout() ? 1579 int xStart = KOGlobals::self()->reverseLayout() ?
1529 (mColumns - 1 - gxStart)*mGridSpacingX : 1580 (mColumns - 1 - gxStart)*mGridSpacingX :
1530 gxStart*mGridSpacingX; 1581 gxStart*mGridSpacingX;
1531 if (xStart < x1) xStart = x1; 1582 if (xStart < x1) xStart = x1;
1532 int xEnd = KOGlobals::self()->reverseLayout() ? 1583 int xEnd = KOGlobals::self()->reverseLayout() ?
1533 (mColumns - gxStart)*mGridSpacingX-1 : 1584 (mColumns - gxStart)*mGridSpacingX-1 :
1534 (gxStart+1)*mGridSpacingX-1; 1585 (gxStart+1)*mGridSpacingX-1;
1535 if (xEnd > x2) xEnd = x2; 1586 if (xEnd > x2) xEnd = x2;
1536 if ( mSelectedDates[gxStart] == QDateTime::currentDateTime ().date()&& KOPrefs::instance()->mHighlightCurrentDay ) { 1587 if ( mSelectedDates[gxStart] == QDateTime::currentDateTime ().date()&& KOPrefs::instance()->mHighlightCurrentDay ) {
1537 if ( KOPrefs::instance()->mUseHighlightLightColor ) 1588 if ( KOPrefs::instance()->mUseHighlightLightColor )
1538 p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1, 1589 p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1,
1539 KOPrefs::instance()->mWorkingHoursColor.light()); 1590 KOPrefs::instance()->mWorkingHoursColor.light());
1540 else 1591 else
1541 p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1, 1592 p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1,
1542 KOPrefs::instance()->mWorkingHoursColor.dark()); 1593 KOPrefs::instance()->mWorkingHoursColor.dark());
1543 } else { 1594 } else {
1544 p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1, 1595 p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1,
1545 KOPrefs::instance()->mWorkingHoursColor); 1596 KOPrefs::instance()->mWorkingHoursColor);
1546 } 1597 }
1547 } 1598 }
1548 ++gxStart; 1599 ++gxStart;
1549 } 1600 }
1550 } 1601 }
1551 } 1602 }
1552 /* 1603 /*
1553 int selectionX = KOGlobals::self()->reverseLayout() ? 1604 int selectionX = KOGlobals::self()->reverseLayout() ?
1554 (mColumns - 1 - mSelectionCellX) * mGridSpacingX : 1605 (mColumns - 1 - mSelectionCellX) * mGridSpacingX :
1555 mSelectionCellX * mGridSpacingX; 1606 mSelectionCellX * mGridSpacingX;
1556 1607
1557 // Draw selection 1608 // Draw selection
1558 if ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) && 1609 if ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) &&
1559 ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) { 1610 ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) {
1560 // TODO: paint only part within cx,cy,cw,ch 1611 // TODO: paint only part within cx,cy,cw,ch
1561 p->fillRect( selectionX, mSelectionYTop, mGridSpacingX, 1612 p->fillRect( selectionX, mSelectionYTop, mGridSpacingX,
1562 mSelectionHeight, KOPrefs::instance()->mHighlightColor ); 1613 mSelectionHeight, KOPrefs::instance()->mHighlightColor );
1563 } 1614 }
1564 */ 1615 */
1565 // Draw vertical lines of grid 1616 // Draw vertical lines of grid
1566 1617
1567 int x = ((int)(cx/mGridSpacingX))*mGridSpacingX; 1618 int x = ((int)(cx/mGridSpacingX))*mGridSpacingX;
1568 if ( mGridSpacingX > 0 ) { 1619 if ( mGridSpacingX > 0 ) {
1569 while (x < cx + cw) { 1620 while (x < cx + cw) {
1570 p->drawLine(x,cy,x,cy+ch); 1621 p->drawLine(x,cy,x,cy+ch);
1571 x+=mGridSpacingX; 1622 x+=mGridSpacingX;
1572 } 1623 }
1573 } 1624 }
1574 // Draw horizontal lines of grid 1625 // Draw horizontal lines of grid
1575 int y = ((int)(cy/lGridSpacingY))*lGridSpacingY; 1626 int y = ((int)(cy/lGridSpacingY))*lGridSpacingY;
1576 if ( lGridSpacingY > 0 ) { 1627 if ( lGridSpacingY > 0 ) {
1577 while (y < cy + ch) { 1628 while (y < cy + ch) {
1578 p->setPen( SolidLine ); 1629 p->setPen( SolidLine );
1579 p->drawLine(cx,y,cx+cw,y); 1630 p->drawLine(cx,y,cx+cw,y);
1580 y+=lGridSpacingY; 1631 y+=lGridSpacingY;
1581 p->setPen( DotLine ); 1632 p->setPen( DotLine );
1582 p->drawLine(cx,y,cx+cw,y); 1633 p->drawLine(cx,y,cx+cw,y);
1583 y+=lGridSpacingY; 1634 y+=lGridSpacingY;