summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-10-16 23:24:31 (UTC)
committer zautrix <zautrix>2004-10-16 23:24:31 (UTC)
commit6564856660d583425a5f5d51bf77bc52c01da444 (patch) (unidiff)
tree223ef7aab1d489113681e3f29d07ca499bb6d1c5
parent4bab2cac8beb6103b982bd2b42eeb7061a18a0d1 (diff)
downloadkdepimpi-6564856660d583425a5f5d51bf77bc52c01da444.zip
kdepimpi-6564856660d583425a5f5d51bf77bc52c01da444.tar.gz
kdepimpi-6564856660d583425a5f5d51bf77bc52c01da444.tar.bz2
added KDE sync
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile507
-rw-r--r--kde2file/caldump/main.cpp4
-rw-r--r--libkdepim/ksyncmanager.cpp44
-rw-r--r--libkdepim/ksyncmanager.h1
4 files changed, 219 insertions, 337 deletions
diff --git a/Makefile b/Makefile
index 6a8521f..93437e6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,338 +1,171 @@
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.3) on: Sat Oct 16 22:32:03 2004
4 4# Project: kdepim-desktop.pro
5ifeq ($(PLATFORM) , zaurus) 5# Template: subdirs
6 BUILD_NO_LDAP_PLUGIN=1 6# Command: $(QMAKE) "CONFIG+=thread" "CONFIG+=debug" -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
13SUBDIRS_MICROKDE = \ 13MKDIR = mkdir -p
14 libical/src/libical \ 14INSTALL_FILE=
15 libical/src/libicalss \ 15INSTALL_DIR =
16 qtcompat \ 16 SUBTARGETS = \
17 microkde \ 17 sub-gammu-emb-common \
18 libkcal \ 18 sub-gammu-emb-gammu \
19 libkdepim \ 19 sub-libical \
20 kabc \ 20 sub-libkcal \
21 kabc/formats/binary \ 21 sub-microkde \
22 kabc/plugins/file \ 22 sub-libkdepim \
23 kabc/plugins/dir \ 23 sub-kabc \
24 korganizer \ 24 sub-korganizer \
25 kalarmd \ 25 sub-kaddressbook \
26 kaddressbook 26 sub-kabc-plugins-file \
27 27 sub-kabc-plugins-dir
28SUBDIRS_QTOPIA_PLUGIN = \ 28
29 kabc/plugins/qtopia 29first: all
30 30
31SUBDIRS_OPIE_PLUGIN = \ 31all: Makefile $(SUBTARGETS)
32 kabc/plugins/opie 32
33 33gammu/emb/common/$(MAKEFILE):
34SUBDIRS_SHARP_PLUGIN = \ 34 @$(CHK_DIR_EXISTS) "gammu/emb/common" || $(MKDIR) "gammu/emb/common"
35 kabc/plugins/sharpdtm 35 cd gammu/emb/common && $(QMAKE) common.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
36 36sub-gammu-emb-common: gammu/emb/common/$(MAKEFILE) FORCE
37SUBDIRS_LDAP_PLUGIN = \ 37 cd gammu/emb/common && $(MAKE) -f $(MAKEFILE)
38 kabc/plugins/ldap 38
39 39gammu/emb/gammu/$(MAKEFILE):
40SUBDIRS_MICROMAIL = \ 40 @$(CHK_DIR_EXISTS) "gammu/emb/gammu" || $(MKDIR) "gammu/emb/gammu"
41 kmicromail/libetpan \ 41 cd gammu/emb/gammu && $(QMAKE) gammu.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
42 kmicromail/libmailwrapper \ 42sub-gammu-emb-gammu: gammu/emb/gammu/$(MAKEFILE) FORCE
43 kmicromail 43 cd gammu/emb/gammu && $(MAKE) -f $(MAKEFILE)
44 44
45SUBDIRS_GAMMU = \ 45libical/$(MAKEFILE):
46 gammu/emb/common \ 46 @$(CHK_DIR_EXISTS) "libical" || $(MKDIR) "libical"
47 gammu/emb/gammu 47 cd libical && $(QMAKE) libical.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
48 48sub-libical: libical/$(MAKEFILE) FORCE
49SUBDIRS_PWMANAGER = \ 49 cd libical && $(MAKE) -f $(MAKEFILE)
50 pwmanager/pwmanager 50
51 51libkcal/$(MAKEFILE):
52SUBDIRS = \ 52 @$(CHK_DIR_EXISTS) "libkcal" || $(MKDIR) "libkcal"
53 $(SUBDIRS_MICROKDE) \ 53 cd libkcal && $(QMAKE) libkcal.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
54 $(SUBDIRS_QTOPIA_PLUGIN) \ 54sub-libkcal: libkcal/$(MAKEFILE) FORCE
55 $(SUBDIRS_OPIE_PLUGIN) \ 55 cd libkcal && $(MAKE) -f $(MAKEFILE)
56 $(SUBDIRS_SHARP_PLUGIN) \ 56
57 $(SUBDIRS_LDAP_PLUGIN) \ 57microkde/$(MAKEFILE):
58 $(SUBDIRS_MICROMAIL) \ 58 @$(CHK_DIR_EXISTS) "microkde" || $(MKDIR) "microkde"
59 $(SUBDIRS_GAMMU) \ 59 cd microkde && $(QMAKE) microkde.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
60 $(SUBDIRS_PWMANAGER) 60sub-microkde: microkde/$(MAKEFILE) FORCE
61 61 cd microkde && $(MAKE) -f $(MAKEFILE)
62 62
63all: build_microkde \ 63libkdepim/$(MAKEFILE):
64 build_qtopia_plugin \ 64 @$(CHK_DIR_EXISTS) "libkdepim" || $(MKDIR) "libkdepim"
65 build_opie_plugin \ 65 cd libkdepim && $(QMAKE) libkdepim.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
66 build_sharp_plugin \ 66sub-libkdepim: libkdepim/$(MAKEFILE) FORCE
67 build_ldap_plugin \ 67 cd libkdepim && $(MAKE) -f $(MAKEFILE)
68 build_micromail \ 68
69 build_gammu \ 69kabc/$(MAKEFILE):
70 build_pwmanager 70 @$(CHK_DIR_EXISTS) "kabc" || $(MKDIR) "kabc"
71 71 cd kabc && $(QMAKE) kabc.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
72 72sub-kabc: kabc/$(MAKEFILE) FORCE
73build_microkde: variable_test tmake 73 cd kabc && $(MAKE) -f $(MAKEFILE)
74 for i in $(SUBDIRS_MICROKDE); do pushd $$i; \ 74
75 make -f Makefile$(PLATFORM) || exit 1; popd; \ 75korganizer/$(MAKEFILE):
76 done 76 @$(CHK_DIR_EXISTS) "korganizer" || $(MKDIR) "korganizer"
77 77 cd korganizer && $(QMAKE) korganizer.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
78build_qtopia_plugin: build_microkde 78sub-korganizer: korganizer/$(MAKEFILE) FORCE
79 ifdef BUILD_NO_QTOPIA_PLUGIN 79 cd korganizer && $(MAKE) -f $(MAKEFILE)
80 @echo == qtopia plugin not build. 80
81 else 81kaddressbook/$(MAKEFILE):
82 for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \ 82 @$(CHK_DIR_EXISTS) "kaddressbook" || $(MKDIR) "kaddressbook"
83 make -f Makefile$(PLATFORM) || exit 1; popd; \ 83 cd kaddressbook && $(QMAKE) kaddressbook.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
84 done 84sub-kaddressbook: kaddressbook/$(MAKEFILE) FORCE
85 endif 85 cd kaddressbook && $(MAKE) -f $(MAKEFILE)
86 86
87build_opie_plugin: build_microkde 87kabc/plugins/file/$(MAKEFILE):
88 ifdef BUILD_NO_OPIE_PLUGIN 88 @$(CHK_DIR_EXISTS) "kabc/plugins/file" || $(MKDIR) "kabc/plugins/file"
89 @echo == opie plugin not build. 89 cd kabc/plugins/file && $(QMAKE) file.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
90 else 90sub-kabc-plugins-file: kabc/plugins/file/$(MAKEFILE) FORCE
91 for i in $(SUBDIRS_OPIE_PLUGIN); do pushd $$i; \ 91 cd kabc/plugins/file && $(MAKE) -f $(MAKEFILE)
92 make -f Makefile$(PLATFORM) || exit 1; popd; \ 92
93 done 93kabc/plugins/dir/$(MAKEFILE):
94 endif 94 @$(CHK_DIR_EXISTS) "kabc/plugins/dir" || $(MKDIR) "kabc/plugins/dir"
95 95 cd kabc/plugins/dir && $(QMAKE) dir.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
96build_sharp_plugin: build_microkde 96sub-kabc-plugins-dir: kabc/plugins/dir/$(MAKEFILE) FORCE
97 ifdef BUILD_NO_SHARP_PLUGIN 97 cd kabc/plugins/dir && $(MAKE) -f $(MAKEFILE)
98 @echo == ldap plugin not build. 98
99 else 99Makefile: kdepim-desktop.pro /usr/local/qtgcc/mkspecs/default/qmake.conf
100 for i in $(SUBDIRS_SHARP_PLUGIN); do pushd $$i; \ 100 $(QMAKE) "CONFIG+=thread" "CONFIG+=debug" -o Makefile kdepim-desktop.pro
101 make -f Makefile$(PLATFORM) || exit 1; popd; \ 101qmake: qmake_all
102 done 102 @$(QMAKE) "CONFIG+=thread" "CONFIG+=debug" -o Makefile kdepim-desktop.pro
103 endif 103
104 104all: $(SUBTARGETS)
105build_ldap_plugin: build_microkde 105qmake_all: gammu/emb/common/$(MAKEFILE) gammu/emb/gammu/$(MAKEFILE) libical/$(MAKEFILE) libkcal/$(MAKEFILE) microkde/$(MAKEFILE) libkdepim/$(MAKEFILE) kabc/$(MAKEFILE) korganizer/$(MAKEFILE) kaddressbook/$(MAKEFILE) kabc/plugins/file/$(MAKEFILE) kabc/plugins/dir/$(MAKEFILE)
106 ifdef BUILD_NO_LDAP_PLUGIN 106 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
107 @echo == ldap plugin not build. 107 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
108 else 108 ( [ -d libical ] && cd libical ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
109 for i in $(SUBDIRS_LDAP_PLUGIN); do pushd $$i; \ 109 ( [ -d libkcal ] && cd libkcal ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
110 make -f Makefile$(PLATFORM) || exit 1; popd; \ 110 ( [ -d microkde ] && cd microkde ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
111 done 111 ( [ -d libkdepim ] && cd libkdepim ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
112 endif 112 ( [ -d kabc ] && cd kabc ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
113 113 ( [ -d korganizer ] && cd korganizer ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
114 114 ( [ -d kaddressbook ] && cd kaddressbook ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
115build_micromail: build_microkde 115 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
116 ifdef BUILD_NO_MICROMAIL 116 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
117 @echo == kmicromail not build. 117clean uicables mocables uiclean mocclean lexclean yaccclean : qmake_all FORCE
118 else 118 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; ) || true
119 for i in $(SUBDIRS_MICROMAIL); do pushd $$i; \ 119 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) $@; ) || true
120 make -f Makefile$(PLATFORM) || exit 1; popd; \ 120 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; ) || true
121 done 121 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; ) || true
122 endif 122 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; ) || true
123 123 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; ) || true
124build_gammu: variable_test tmake 124 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; ) || true
125 ifdef BUILD_NO_GAMMU 125 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; ) || true
126 @echo == gammu not build. 126 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; ) || true
127 else 127 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; ) || true
128 for i in $(SUBDIRS_GAMMU); do pushd $$i; \ 128 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; ) || true
129 make -f Makefile$(PLATFORM) || exit 1; popd; \ 129uninstall_subdirs: qmake_all FORCE
130 done 130 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
131 endif 131 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
132 132 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
133build_pwmanager: build_microkde 133 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
134 ifdef BUILD_NO_PWMANAGER 134 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
135 @echo == pwmanager not build. 135 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
136 else 136 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
137 for i in $(SUBDIRS_PWMANAGER); do pushd $$i; \ 137 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
138 make -f Makefile$(PLATFORM) || exit 1; popd; \ 138 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
139 done 139 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
140 endif 140 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
141 141install_subdirs: qmake_all FORCE
142 142 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) install; ) || true
143variable_info: 143 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) install; ) || true
144 @echo -------------------------------------- 144 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) install; ) || true
145 @echo KDEPIM buildsystem, variableinfo... 145 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) install; ) || true
146 @echo KDEPIMDIR=$(KDEPIMDIR) 146 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) install; ) || true
147 @echo QTDIR=$(QTDIR) 147 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) install; ) || true
148 @echo QPEDIR=$(QPEDIR) 148 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) install; ) || true
149 @echo OPIEDIR=$(OPIEDIR) 149 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) install; ) || true
150 @echo PLATFORM=$(PLATFORM) 150 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) install; ) || true
151 @echo RELEASE_DEBUG=$(RELEASE_DEBUG) 151 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) install; ) || true
152 @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL) 152 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) install; ) || true
153 @echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN) 153distclean: qmake_all FORCE
154 @echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN) 154 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
155 @echo BUILD_NO_QTOPIA_PLUGIN=$(BUILD_NO_QTOPIA_PLUGIN) 155 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
156 @echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN) 156 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
157 ifndef BUILD_NO_SHARP_PLUGIN 157 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
158 @echo SHARPDTMSDK=$(SHARPDTMSDK) 158 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
159 endif 159 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
160 @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU) 160 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
161 @echo BUILD_NO_PWMANAGER=$(BUILD_NO_PWMANAGER) 161 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
162 @echo -------------------------------------- 162 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
163 163 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
164variable_test: variable_info 164 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
165 @echo KDEPIM buildsystem, variablecheck... 165
166 ifndef KDEPIMDIR 166install: install_subdirs
167 @echo KDEPIMDIR is not defined. 167
168 $(error KDEPIMDIR is not defined) 168uninstall: uninstall_subdirs
169 endif 169
170 ifndef PLATFORM 170FORCE:
171 @echo PLATFORM is not defined.
172 $(error PLATFORM is not defined)
173 endif
174 ifdef BUILD_NO_LDAP_PLUGIN
175 @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN)
176 endif
177 ifdef BUILD_NO_OPIE_PLUGIN
178 @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN)
179 endif
180 ifdef BUILD_NO_QTOPIA_PLUGIN
181 @echo QTOPIA PLUGIN will not be build, because BUILD_NO__QTOPIA_PLUGIN is set to $(BUILD_NO__QTOPIA_PLUGIN)
182 endif
183 ifdef BUILD_NO_MICROMAIL
184 @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL)
185 endif
186 ifdef BUILD_NO_SHARP_PLUGIN
187 @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN)
188 else
189 ifndef SHARPDTMSDK
190 @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK)
191 $(error SHARPDTMSDK is not defined)
192 endif
193 endif
194 ifdef BUILD_NO_GAMMU
195 @echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU)
196 endif
197 ifdef BUILD_NO_PWMANAGER
198 @echo PWMANAGER will not be build, because BUILD_NO_PWMANAGER is set to $(BUILD_NO_PWMANAGER)
199 endif
200 @echo --------------------------------------
201
202
203objects:
204 for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done
205 for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
206 mkdir -p libical/lib/$(PLATFORM)
207
208clean:
209 rm -rf libical/lib/$(PLATFORM)/*;
210 for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\
211 rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
212 done
213
214install:
215
216 cd bin/kdepim; make install
217 cp -r Pim $(QPEDIR)/apps
218 cp db2file/db2file $(QPEDIR)/bin/db2file
219 cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
220 cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
221 cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop
222 cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop
223
224dist:
225 @echo Dont forget to do "make install" before "make dist"
226 rm -f *arm.ipk
227 rm -f *~
228 cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia kdepim
229 ./mkipks kmicrokdelibs.control
230 ./mkipks korganizer.control
231 ./mkipks kaddressbook.control
232 ifndef BUILD_NO_MICROMAIL
233 ./mkipks kopiemail.control
234 endif
235 ./mkipks korganizer-alarm.control
236 ifndef BUILD_NO_GAMMU
237 ./mkipks phoneaccess.control
238 endif
239 ifndef BUILD_NO_PWMANAGER
240 ./mkipks pwmanager.control
241 endif
242 ./mkipks pim_TAB_icon.control
243
244tmake: objects \
245 qtcompat/Makefile$(PLATFORM) \
246 microkde/Makefile$(PLATFORM) \
247 libkcal/Makefile$(PLATFORM) \
248 libkdepim/Makefile$(PLATFORM) \
249 korganizer/Makefile$(PLATFORM) \
250 kalarmd/Makefile$(PLATFORM) \
251 libical/src/libical/Makefile$(PLATFORM) \
252 libical/src/libicalss/Makefile$(PLATFORM) \
253 kabc/Makefile$(PLATFORM) \
254 kabc/formats/binary/Makefile$(PLATFORM) \
255 kabc/plugins/file/Makefile$(PLATFORM) \
256 kabc/plugins/dir/Makefile$(PLATFORM) \
257 kabc/plugins/ldap/Makefile$(PLATFORM) \
258 kabc/plugins/opie/Makefile$(PLATFORM) \
259 kabc/plugins/qtopia/Makefile$(PLATFORM) \
260 kabc/plugins/sharpdtm/Makefile$(PLATFORM) \
261 kaddressbook/Makefile$(PLATFORM) \
262 kmicromail/Makefile$(PLATFORM) \
263 kmicromail/libetpan/Makefile$(PLATFORM) \
264 kmicromail/libmailwrapper/Makefile$(PLATFORM) \
265 gammu/emb/common/Makefile$(PLATFORM) \
266 gammu/emb/gammu/Makefile$(PLATFORM) \
267 pwmanager/pwmanager/Makefile$(PLATFORM) \
268
269qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro
270 cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtcompat.pro -o Makefile$(PLATFORM)
271
272microkde/Makefile$(PLATFORM): microkde/microkdeE.pro
273 cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" microkdeE.pro -o Makefile$(PLATFORM)
274
275libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro
276 cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkcalE.pro -o Makefile$(PLATFORM)
277
278
279libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro
280 cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkdepimE.pro -o Makefile$(PLATFORM)
281
282kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro
283 cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kalarmdE.pro -o Makefile$(PLATFORM)
284
285korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro
286 cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" korganizerE.pro -o Makefile$(PLATFORM)
287
288libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro
289 cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalE.pro -o Makefile$(PLATFORM)
290
291libical/src/libicalss/Makefile$(PLATFORM): libical/src/libicalss/libicalssE.pro
292 cd libical/src/libicalss; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalssE.pro -o Makefile$(PLATFORM)
293
294kabc/Makefile$(PLATFORM): kabc/kabcE.pro
295 cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcE.pro -o Makefile$(PLATFORM)
296
297kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro
298 cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcformat_binaryE.pro -o Makefile$(PLATFORM)
299
300kabc/plugins/file/Makefile$(PLATFORM): kabc/plugins/file/fileE.pro
301 cd kabc/plugins/file; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" fileE.pro -o Makefile$(PLATFORM)
302
303kabc/plugins/dir/Makefile$(PLATFORM): kabc/plugins/dir/dirE.pro
304 cd kabc/plugins/dir; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" dirE.pro -o Makefile$(PLATFORM)
305
306kabc/plugins/ldap/Makefile$(PLATFORM): kabc/plugins/ldap/ldapE.pro
307 cd kabc/plugins/ldap; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" ldapE.pro -o Makefile$(PLATFORM)
308
309kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/opieE.pro
310 cd kabc/plugins/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" opieE.pro -o Makefile$(PLATFORM)
311
312kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro
313 cd kabc/plugins/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtopiaE.pro -o Makefile$(PLATFORM)
314
315kabc/plugins/sharpdtm/Makefile$(PLATFORM): kabc/plugins/sharpdtm/sharpdtmE.pro
316 cd kabc/plugins/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" sharpdtmE.pro -o Makefile$(PLATFORM)
317
318kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro
319 cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kaddressbookE.pro -o Makefile$(PLATFORM)
320
321kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro
322 cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kmicromailE.pro -o Makefile$(PLATFORM)
323
324kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro
325 cd kmicromail/libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libetpanE.pro -o Makefile$(PLATFORM)
326
327kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro
328 cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libmailwrapperE.pro -o Makefile$(PLATFORM)
329
330gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro
331 cd gammu/emb/common; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" commonE.pro -o Makefile$(PLATFORM)
332
333gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro
334 cd gammu/emb/gammu; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" gammuE.pro -o Makefile$(PLATFORM)
335
336pwmanager/pwmanager/Makefile$(PLATFORM): pwmanager/pwmanager/pwmanagerE.pro
337 cd pwmanager/pwmanager; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" pwmanagerE.pro -o Makefile$(PLATFORM)
338 171
diff --git a/kde2file/caldump/main.cpp b/kde2file/caldump/main.cpp
index 95ae29e..76bfad3 100644
--- a/kde2file/caldump/main.cpp
+++ b/kde2file/caldump/main.cpp
@@ -98,107 +98,111 @@ int main( int argc, char *argv[] )
98 98
99 KInstance ins ( progName ); 99 KInstance ins ( progName );
100 100
101 KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); 101 KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
102 102
103 bool read = false; 103 bool read = false;
104 if ( args->isSet( "read" ) ) { 104 if ( args->isSet( "read" ) ) {
105 read = true; 105 read = true;
106 qDebug("read "); 106 qDebug("read ");
107 } 107 }
108 CalendarResources *calendarResource = 0; 108 CalendarResources *calendarResource = 0;
109 CalendarLocal *localCalendar = 0; 109 CalendarLocal *localCalendar = 0;
110 110
111 calendarResource = new CalendarResources( "" ); 111 calendarResource = new CalendarResources( "" );
112 calendarResource->readConfig(); 112 calendarResource->readConfig();
113 calendarResource->load(); 113 calendarResource->load();
114 qDebug("************************************* "); 114 qDebug("************************************* ");
115 qDebug("************************************* "); 115 qDebug("************************************* ");
116 qDebug("************************************* "); 116 qDebug("************************************* ");
117 qDebug("Using timezone id: %s", calendarResource->timeZoneId().latin1()); 117 qDebug("Using timezone id: %s", calendarResource->timeZoneId().latin1());
118 118
119 if ( !read ) { 119 if ( !read ) {
120 localCalendar = new CalendarLocal(); 120 localCalendar = new CalendarLocal();
121 localCalendar->setTimeZoneId( calendarResource->timeZoneId()); 121 localCalendar->setTimeZoneId( calendarResource->timeZoneId());
122 KCal::Incidence::List allInc = calendarResource->rawIncidences(); 122 KCal::Incidence::List allInc = calendarResource->rawIncidences();
123 Incidence::List::ConstIterator it; 123 Incidence::List::ConstIterator it;
124 int num = 0; 124 int num = 0;
125 for( it = allInc.begin(); it != allInc.end(); ++it ) { 125 for( it = allInc.begin(); it != allInc.end(); ++it ) {
126 ResourceCalendar * re = calendarResource->resource( (*it) ); 126 ResourceCalendar * re = calendarResource->resource( (*it) );
127 if ( re && !re->readOnly() ) { 127 if ( re && !re->readOnly() ) {
128 ++num; 128 ++num;
129 Incidence* cl = (*it)->clone(); 129 Incidence* cl = (*it)->clone();
130 cl->setLastModified( (*it)->lastModified() );
130 if ( cl->type() == "Journal" ) 131 if ( cl->type() == "Journal" )
131 localCalendar->addJournal( (Journal *) cl ); 132 localCalendar->addJournal( (Journal *) cl );
132 else if ( cl->type() == "Todo" ) 133 else if ( cl->type() == "Todo" )
133 localCalendar->addTodo( (Todo *) cl ); 134 localCalendar->addTodo( (Todo *) cl );
134 else if ( cl->type() == "Event" ) 135 else if ( cl->type() == "Event" )
135 localCalendar->addEvent( (Event *) cl ); 136 localCalendar->addEvent( (Event *) cl );
136 } 137 }
137 } 138 }
138 139
139 FileStorage* storage = new FileStorage( calendarResource ); 140 FileStorage* storage = new FileStorage( calendarResource );
140 storage->setFileName( "/tmp/kdedumpall.ics" ); 141 storage->setFileName( "/tmp/kdedumpall.ics" );
141 storage->setSaveFormat( new ICalFormat() ); 142 storage->setSaveFormat( new ICalFormat() );
142 storage->save(); 143 storage->save();
143 delete storage; 144 delete storage;
144 qDebug("************************************* "); 145 qDebug("************************************* ");
145 qDebug("************************************* "); 146 qDebug("************************************* ");
146 qDebug("************************************* "); 147 qDebug("************************************* ");
147 qDebug("%d calendar entries dumped to file /tmp/kdedumpall.ics", num); 148 qDebug("%d calendar entries dumped to file /tmp/kdedumpall.ics", num);
148 149
149 } else { 150 } else {
150 localCalendar = new CalendarLocal(); 151 localCalendar = new CalendarLocal();
151 localCalendar->setTimeZoneId( calendarResource->timeZoneId()); 152 localCalendar->setTimeZoneId( calendarResource->timeZoneId());
152 FileStorage* storage = new FileStorage( localCalendar ); 153 FileStorage* storage = new FileStorage( localCalendar );
153 storage->setFileName( "/tmp/kdedumpall.ics" ); 154 storage->setFileName( "/tmp/kdedumpall.ics" );
154 int num = 0; 155 int num = 0;
155 int del = 0; 156 int del = 0;
156 if ( storage->load() ) { 157 if ( storage->load() ) {
157 KCal::Incidence::List allInc = calendarResource->rawIncidences(); 158 KCal::Incidence::List allInc = calendarResource->rawIncidences();
158 KCal::Incidence::List newInc = localCalendar->rawIncidences(); 159 KCal::Incidence::List newInc = localCalendar->rawIncidences();
159 Incidence::List::ConstIterator it; 160 Incidence::List::ConstIterator it;
160 for( it = allInc.begin(); it != allInc.end(); ++it ) { 161 for( it = allInc.begin(); it != allInc.end(); ++it ) {
161 ResourceCalendar * re = calendarResource->resource( (*it) ); 162 ResourceCalendar * re = calendarResource->resource( (*it) );
162 if ( re && !re->readOnly() ) { 163 if ( re && !re->readOnly() ) {
163 Incidence* cl = localCalendar->incidence( (*it)->uid() ); 164 Incidence* cl = localCalendar->incidence( (*it)->uid() );
164 if ( cl ) { 165 if ( cl ) {
166 QDateTime lm = cl->lastModified();
165 cl->setResources( (*it)->resources() ); 167 cl->setResources( (*it)->resources() );
168 cl->setLastModified(lm);
166 } 169 }
167 ++del; 170 ++del;
168 cl = (*it); 171 cl = (*it);
169 if ( cl->type() == "Journal" ) 172 if ( cl->type() == "Journal" )
170 calendarResource->deleteJournal( (Journal *) cl ); 173 calendarResource->deleteJournal( (Journal *) cl );
171 else if ( cl->type() == "Todo" ) 174 else if ( cl->type() == "Todo" )
172 calendarResource->deleteTodo( (Todo *) cl ); 175 calendarResource->deleteTodo( (Todo *) cl );
173 else if ( cl->type() == "Event" ) 176 else if ( cl->type() == "Event" )
174 calendarResource->deleteEvent( (Event *) cl ); 177 calendarResource->deleteEvent( (Event *) cl );
175 } 178 }
176 } 179 }
177 for( it = newInc.begin(); it != newInc.end(); ++it ) { 180 for( it = newInc.begin(); it != newInc.end(); ++it ) {
178 Incidence* cl = (*it)->clone(); 181 Incidence* cl = (*it)->clone();
179 ++num; 182 ++num;
180 calendarResource->addIncidence( cl ); 183 calendarResource->addIncidence( cl );
184 //cl->setLastModified( (*it)->lastModified() );
181 } 185 }
182 calendarResource->save(); 186 calendarResource->save();
183 qDebug("************************************* "); 187 qDebug("************************************* ");
184 qDebug("************************************* "); 188 qDebug("************************************* ");
185 qDebug("************************************* "); 189 qDebug("************************************* ");
186 qDebug("%d calendar entries deleted/ %d added from file /tmp/kdedumpall.ics", del, num); 190 qDebug("%d calendar entries deleted/ %d added from file /tmp/kdedumpall.ics", del, num);
187 191
188 } else 192 } else
189 qDebug("error loading file /tmp/kdedumpall.ics"); 193 qDebug("error loading file /tmp/kdedumpall.ics");
190 194
191 } 195 }
192 196
193 if ( localCalendar ) { 197 if ( localCalendar ) {
194 localCalendar->close(); 198 localCalendar->close();
195 delete localCalendar; 199 delete localCalendar;
196 } 200 }
197 if ( calendarResource ) { 201 if ( calendarResource ) {
198 calendarResource->close(); 202 calendarResource->close();
199 delete calendarResource; 203 delete calendarResource;
200 } 204 }
201 205
202 qDebug("ente "); 206 qDebug("ente ");
203 return 0; 207 return 0;
204} 208}
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 5175f94..7ee56e4 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -70,152 +70,166 @@ KSyncManager::KSyncManager(QWidget* parent, KSyncInterface* implementation, Targ
70 bar->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); 70 bar->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
71 71
72} 72}
73 73
74KSyncManager::~KSyncManager() 74KSyncManager::~KSyncManager()
75{ 75{
76 delete bar; 76 delete bar;
77} 77}
78 78
79 79
80void KSyncManager::fillSyncMenu() 80void KSyncManager::fillSyncMenu()
81{ 81{
82 if ( mSyncMenu->count() ) 82 if ( mSyncMenu->count() )
83 mSyncMenu->clear(); 83 mSyncMenu->clear();
84 84
85 mSyncMenu->insertItem( i18n("Configure..."), 0 ); 85 mSyncMenu->insertItem( i18n("Configure..."), 0 );
86 mSyncMenu->insertSeparator(); 86 mSyncMenu->insertSeparator();
87 if ( mServerSocket == 0 ) { 87 if ( mServerSocket == 0 ) {
88 mSyncMenu->insertItem( i18n("Enable Pi-Sync"), 2 ); 88 mSyncMenu->insertItem( i18n("Enable Pi-Sync"), 2 );
89 } else { 89 } else {
90 mSyncMenu->insertItem( i18n("Disable Pi-Sync"), 3 ); 90 mSyncMenu->insertItem( i18n("Disable Pi-Sync"), 3 );
91 } 91 }
92 mSyncMenu->insertSeparator(); 92 mSyncMenu->insertSeparator();
93 mSyncMenu->insertItem( i18n("Multiple sync"), 1 ); 93 mSyncMenu->insertItem( i18n("Multiple sync"), 1 );
94 mSyncMenu->insertSeparator(); 94 mSyncMenu->insertSeparator();
95 95
96 KConfig config ( locateLocal( "config","ksyncprofilesrc" ) ); 96 KConfig config ( locateLocal( "config","ksyncprofilesrc" ) );
97 config.setGroup("General"); 97 config.setGroup("General");
98 QStringList prof = config.readListEntry("SyncProfileNames"); 98 QStringList prof = config.readListEntry("SyncProfileNames");
99 mLocalMachineName = config.readEntry("LocalMachineName","undefined"); 99 mLocalMachineName = config.readEntry("LocalMachineName","undefined");
100 if ( prof.count() < 2 ) { 100 if ( prof.count() < 2 ) {
101 prof.clear(); 101 prof.clear();
102#ifdef DESKTOP_VERSION
103#ifdef _WIN32_
104 prof << i18n("OutLook(not_implemented)");
105#else
106 prof << i18n("KDE_Desktop");
107#endif
108#else
102 prof << i18n("Sharp_DTM"); 109 prof << i18n("Sharp_DTM");
110#endif
103 prof << i18n("Local_file"); 111 prof << i18n("Local_file");
104 prof << i18n("Last_file"); 112 prof << i18n("Last_file");
105 KSyncProfile* temp = new KSyncProfile (); 113 KSyncProfile* temp = new KSyncProfile ();
106 temp->setName( prof[0] ); 114 temp->setName( prof[0] );
107 temp->writeConfig(&config); 115 temp->writeConfig(&config);
108 temp->setName( prof[1] ); 116 temp->setName( prof[1] );
109 temp->writeConfig(&config); 117 temp->writeConfig(&config);
110 temp->setName( prof[2] ); 118 temp->setName( prof[2] );
111 temp->writeConfig(&config); 119 temp->writeConfig(&config);
112 config.setGroup("General"); 120 config.setGroup("General");
113 config.writeEntry("SyncProfileNames",prof); 121 config.writeEntry("SyncProfileNames",prof);
114 config.writeEntry("ExternSyncProfiles","Sharp_DTM"); 122 config.writeEntry("ExternSyncProfiles","Sharp_DTM");
115 config.sync(); 123 config.sync();
116 delete temp; 124 delete temp;
117 } 125 }
118 mExternSyncProfiles = config.readListEntry("ExternSyncProfiles"); 126 mExternSyncProfiles = config.readListEntry("ExternSyncProfiles");
119 mSyncProfileNames = prof; 127 mSyncProfileNames = prof;
120 unsigned int i; 128 unsigned int i;
121 for ( i = 0; i < prof.count(); ++i ) { 129 for ( i = 0; i < prof.count(); ++i ) {
122 mSyncMenu->insertItem( prof[i], 1000+i ); 130 mSyncMenu->insertItem( prof[i], 1000+i );
123 if ( i == 2 ) 131 if ( i == 2 )
124 mSyncMenu->insertSeparator(); 132 mSyncMenu->insertSeparator();
125 } 133 }
126 QDir app_dir; 134 QDir app_dir;
127 //US do not display SharpDTM if app is pwmpi, or no sharpfiles available 135 //US do not display SharpDTM if app is pwmpi, or no sharpfiles available
128 if ( mTargetApp == PWMPI) { 136 if ( mTargetApp == PWMPI) {
129 mSyncMenu->removeItem( 1000 ); 137 mSyncMenu->removeItem( 1000 );
130 } 138 }
139#ifndef DESKTOP_VERSION
131 else if (!app_dir.exists(QDir::homeDirPath()+"/Applications/dtm" ) ) { 140 else if (!app_dir.exists(QDir::homeDirPath()+"/Applications/dtm" ) ) {
132 mSyncMenu->removeItem( 1000 ); 141 mSyncMenu->removeItem( 1000 );
133 } 142 }
143#endif
134 mSyncMenu->removeItem( 1002 ); 144 mSyncMenu->removeItem( 1002 );
135} 145}
136 146
137void KSyncManager::slotSyncMenu( int action ) 147void KSyncManager::slotSyncMenu( int action )
138{ 148{
139 //qDebug("syncaction %d ", action); 149 //qDebug("syncaction %d ", action);
140 if ( action == 0 ) { 150 if ( action == 0 ) {
141 151
142 // seems to be a Qt2 event handling bug 152 // seems to be a Qt2 event handling bug
143 // syncmenu.clear causes a segfault at first time 153 // syncmenu.clear causes a segfault at first time
144 // when we call it after the main event loop, it is ok 154 // when we call it after the main event loop, it is ok
145 // same behaviour when calling OM/Pi via QCOP for the first time 155 // same behaviour when calling OM/Pi via QCOP for the first time
146 QTimer::singleShot ( 1, this, SLOT ( confSync() ) ); 156 QTimer::singleShot ( 1, this, SLOT ( confSync() ) );
147 //confSync(); 157 //confSync();
148 158
149 return; 159 return;
150 } 160 }
151 if ( action == 1 ) { 161 if ( action == 1 ) {
152 multiSync( true ); 162 multiSync( true );
153 return; 163 return;
154 } 164 }
155 if ( action == 2 ) { 165 if ( action == 2 ) {
156 enableQuick(); 166 enableQuick();
157 QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) ); 167 QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) );
158 return; 168 return;
159 } 169 }
160 if ( action == 3 ) { 170 if ( action == 3 ) {
161 delete mServerSocket; 171 delete mServerSocket;
162 mServerSocket = 0; 172 mServerSocket = 0;
163 QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) ); 173 QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) );
164 return; 174 return;
165 } 175 }
166 176
167 if (blockSave()) 177 if (blockSave())
168 return; 178 return;
169 179
170 setBlockSave(true); 180 setBlockSave(true);
171 181
172 mCurrentSyncProfile = action - 1000 ; 182 mCurrentSyncProfile = action - 1000 ;
173 mCurrentSyncDevice = mSyncProfileNames[mCurrentSyncProfile] ; 183 mCurrentSyncDevice = mSyncProfileNames[mCurrentSyncProfile] ;
174 mCurrentSyncName = mLocalMachineName ; 184 mCurrentSyncName = mLocalMachineName ;
175 KConfig config ( locateLocal( "config","ksyncprofilesrc" ) ); 185 KConfig config ( locateLocal( "config","ksyncprofilesrc" ) );
176 KSyncProfile* temp = new KSyncProfile (); 186 KSyncProfile* temp = new KSyncProfile ();
177 temp->setName(mSyncProfileNames[mCurrentSyncProfile]); 187 temp->setName(mSyncProfileNames[mCurrentSyncProfile]);
178 temp->readConfig(&config); 188 temp->readConfig(&config);
179 mAskForPreferences = temp->getAskForPreferences(); 189 mAskForPreferences = temp->getAskForPreferences();
180 mSyncAlgoPrefs = temp->getSyncPrefs(); 190 mSyncAlgoPrefs = temp->getSyncPrefs();
181 mWriteBackFile = temp->getWriteBackFile(); 191 mWriteBackFile = temp->getWriteBackFile();
182 mWriteBackExistingOnly = temp->getWriteBackExisting(); 192 mWriteBackExistingOnly = temp->getWriteBackExisting();
183 mIsKapiFile = temp->getIsKapiFile(); 193 mIsKapiFile = temp->getIsKapiFile();
184 mWriteBackInFuture = 0; 194 mWriteBackInFuture = 0;
185 if ( temp->getWriteBackFuture() ) 195 if ( temp->getWriteBackFuture() )
186 mWriteBackInFuture = temp->getWriteBackFutureWeeks( ); 196 mWriteBackInFuture = temp->getWriteBackFutureWeeks( );
187 mShowSyncSummary = temp->getShowSummaryAfterSync(); 197 mShowSyncSummary = temp->getShowSummaryAfterSync();
188 if ( action == 1000 ) { 198 if ( action == 1000 ) {
199#ifdef DESKTOP_VERSION
200 syncKDE();
201#else
189 syncSharp(); 202 syncSharp();
203#endif
190 204
191 } else if ( action == 1001 ) { 205 } else if ( action == 1001 ) {
192 syncLocalFile(); 206 syncLocalFile();
193 207
194 } else if ( action == 1002 ) { 208 } else if ( action == 1002 ) {
195 mWriteBackFile = false; 209 mWriteBackFile = false;
196 mAskForPreferences = false; 210 mAskForPreferences = false;
197 mShowSyncSummary = false; 211 mShowSyncSummary = false;
198 mSyncAlgoPrefs = 3; 212 mSyncAlgoPrefs = 3;
199 quickSyncLocalFile(); 213 quickSyncLocalFile();
200 214
201 } else if ( action >= 1003 ) { 215 } else if ( action >= 1003 ) {
202 if ( temp->getIsLocalFileSync() ) { 216 if ( temp->getIsLocalFileSync() ) {
203 switch(mTargetApp) 217 switch(mTargetApp)
204 { 218 {
205 case (KAPI): 219 case (KAPI):
206 if ( syncWithFile( temp->getRemoteFileNameAB( ), false ) ) 220 if ( syncWithFile( temp->getRemoteFileNameAB( ), false ) )
207 mPrefs->mLastSyncedLocalFile = temp->getRemoteFileNameAB(); 221 mPrefs->mLastSyncedLocalFile = temp->getRemoteFileNameAB();
208 break; 222 break;
209 case (KOPI): 223 case (KOPI):
210 if ( syncWithFile( temp->getRemoteFileName( ), false ) ) 224 if ( syncWithFile( temp->getRemoteFileName( ), false ) )
211 mPrefs->mLastSyncedLocalFile = temp->getRemoteFileName(); 225 mPrefs->mLastSyncedLocalFile = temp->getRemoteFileName();
212 break; 226 break;
213 case (PWMPI): 227 case (PWMPI):
214 if ( syncWithFile( temp->getRemoteFileNamePWM( ), false ) ) 228 if ( syncWithFile( temp->getRemoteFileNamePWM( ), false ) )
215 mPrefs->mLastSyncedLocalFile = temp->getRemoteFileNamePWM(); 229 mPrefs->mLastSyncedLocalFile = temp->getRemoteFileNamePWM();
216 break; 230 break;
217 default: 231 default:
218 qDebug("KSyncManager::slotSyncMenu: invalid apptype selected"); 232 qDebug("KSyncManager::slotSyncMenu: invalid apptype selected");
219 break; 233 break;
220 234
221 } 235 }
@@ -712,64 +726,94 @@ QString KSyncManager::getPassword( )
712 dia.setCaption( i18n("Enter password") ); 726 dia.setCaption( i18n("Enter password") );
713 QPushButton pb ( "OK", &dia); 727 QPushButton pb ( "OK", &dia);
714 lay.addWidget( &pb ); 728 lay.addWidget( &pb );
715 connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) ); 729 connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) );
716 dia.show(); 730 dia.show();
717 int res = dia.exec(); 731 int res = dia.exec();
718 if ( res ) 732 if ( res )
719 retfile = lab.text(); 733 retfile = lab.text();
720 dia.hide(); 734 dia.hide();
721 qApp->processEvents(); 735 qApp->processEvents();
722 return retfile; 736 return retfile;
723 737
724} 738}
725 739
726 740
727void KSyncManager::confSync() 741void KSyncManager::confSync()
728{ 742{
729 static KSyncPrefsDialog* sp = 0; 743 static KSyncPrefsDialog* sp = 0;
730 if ( ! sp ) { 744 if ( ! sp ) {
731 sp = new KSyncPrefsDialog( mParent, "syncprefs", true ); 745 sp = new KSyncPrefsDialog( mParent, "syncprefs", true );
732 } 746 }
733 sp->usrReadConfig(); 747 sp->usrReadConfig();
734#ifndef DESKTOP_VERSION 748#ifndef DESKTOP_VERSION
735 sp->showMaximized(); 749 sp->showMaximized();
736#else 750#else
737 sp->show(); 751 sp->show();
738#endif 752#endif
739 sp->exec(); 753 sp->exec();
740 mSyncProfileNames = sp->getSyncProfileNames(); 754 mSyncProfileNames = sp->getSyncProfileNames();
741 mLocalMachineName = sp->getLocalMachineName (); 755 mLocalMachineName = sp->getLocalMachineName ();
742 QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) ); 756 QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) );
743} 757}
758void KSyncManager::syncKDE()
759{
760 emit save();
761 switch(mTargetApp)
762 {
763 case (KAPI):
764
765 break;
766 case (KOPI):
767 {
768 QString command ="./kdecaldump";
769 system ( command.latin1());
770 if ( syncWithFile( "/tmp/kdedumpall.ics",true ) ) {
771 if ( mWriteBackFile ) {
772 command += " --read";
773 system ( command.latin1());
774 }
775 }
776
777 }
778 break;
779 case (PWMPI):
780
781 break;
782 default:
783 qDebug("KSyncManager::slotSyncMenu: invalid apptype selected");
784 break;
785
786 }
787}
744 788
745void KSyncManager::syncSharp() 789void KSyncManager::syncSharp()
746{ 790{
747 791
748 if ( ! syncExternalApplication("sharp") ) 792 if ( ! syncExternalApplication("sharp") )
749 qDebug("ERROR sync sharp "); 793 qDebug("ERROR sync sharp ");
750} 794}
751 795
752bool KSyncManager::syncExternalApplication(QString resource) 796bool KSyncManager::syncExternalApplication(QString resource)
753{ 797{
754 798
755 emit save(); 799 emit save();
756 800
757 if ( mAskForPreferences ) 801 if ( mAskForPreferences )
758 edit_sync_options(); 802 edit_sync_options();
759 803
760 qDebug("Sync extern %s", resource.latin1()); 804 qDebug("Sync extern %s", resource.latin1());
761 805
762 bool syncOK = mImplementation->syncExternal(this, resource); 806 bool syncOK = mImplementation->syncExternal(this, resource);
763 807
764 return syncOK; 808 return syncOK;
765 809
766} 810}
767 811
768void KSyncManager::syncPhone() 812void KSyncManager::syncPhone()
769{ 813{
770 814
771 syncExternalApplication("phone"); 815 syncExternalApplication("phone");
772 816
773} 817}
774 818
775void KSyncManager::showProgressBar(int percentage, QString caption, int total) 819void KSyncManager::showProgressBar(int percentage, QString caption, int total)
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h
index 9094aac..7d5b05e 100644
--- a/libkdepim/ksyncmanager.h
+++ b/libkdepim/ksyncmanager.h
@@ -141,64 +141,65 @@ class KSyncManager : public QObject
141 int mWriteBackInFuture; 141 int mWriteBackInFuture;
142 QString mPhoneDevice; 142 QString mPhoneDevice;
143 QString mPhoneConnection; 143 QString mPhoneConnection;
144 QString mPhoneModel; 144 QString mPhoneModel;
145 QString mPassWordPiSync; 145 QString mPassWordPiSync;
146 QString mActiveSyncPort; 146 QString mActiveSyncPort;
147 QString mActiveSyncIP ; 147 QString mActiveSyncIP ;
148 148
149 signals: 149 signals:
150 void save(); 150 void save();
151 void request_file(); 151 void request_file();
152 void getFile( bool ); 152 void getFile( bool );
153 153
154 public slots: 154 public slots:
155 void slotSyncMenu( int ); 155 void slotSyncMenu( int );
156 void deleteCommandSocket(KCommandSocket*s, int state); 156 void deleteCommandSocket(KCommandSocket*s, int state);
157 void readFileFromSocket(); 157 void readFileFromSocket();
158 void fillSyncMenu(); 158 void fillSyncMenu();
159 159
160 private: 160 private:
161 void syncPi(); 161 void syncPi();
162 KServerSocket * mServerSocket; 162 KServerSocket * mServerSocket;
163 void enableQuick(); 163 void enableQuick();
164 KPimPrefs* mPrefs; 164 KPimPrefs* mPrefs;
165 QString mDefFileName; 165 QString mDefFileName;
166 QString mCurrentSyncDevice; 166 QString mCurrentSyncDevice;
167 QString mCurrentSyncName; 167 QString mCurrentSyncName;
168 void quickSyncLocalFile(); 168 void quickSyncLocalFile();
169 bool syncWithFile( QString fn , bool quick ); 169 bool syncWithFile( QString fn , bool quick );
170 void syncLocalFile(); 170 void syncLocalFile();
171 void syncPhone(); 171 void syncPhone();
172 void syncSharp(); 172 void syncSharp();
173 void syncKDE();
173 bool syncExternalApplication(QString); 174 bool syncExternalApplication(QString);
174 int mCurrentSyncProfile ; 175 int mCurrentSyncProfile ;
175 void syncRemote( KSyncProfile* prof, bool ask = true); 176 void syncRemote( KSyncProfile* prof, bool ask = true);
176 void edit_sync_options(); 177 void edit_sync_options();
177 void edit_pisync_options(); 178 void edit_pisync_options();
178 int ringSync(); 179 int ringSync();
179 QString getPassword( ); 180 QString getPassword( );
180 181
181 private slots: 182 private slots:
182 void confSync(); 183 void confSync();
183 private: 184 private:
184 bool mBlockSaveFlag; 185 bool mBlockSaveFlag;
185 QWidget* mParent; 186 QWidget* mParent;
186 KSyncInterface* mImplementation; 187 KSyncInterface* mImplementation;
187 TargetApp mTargetApp; 188 TargetApp mTargetApp;
188 QPopupMenu* mSyncMenu; 189 QPopupMenu* mSyncMenu;
189 QProgressBar* bar; 190 QProgressBar* bar;
190 191
191}; 192};
192 193
193 194
194class KSyncInterface 195class KSyncInterface
195{ 196{
196 public : 197 public :
197 virtual bool sync(KSyncManager* manager, QString filename, int mode) = 0; 198 virtual bool sync(KSyncManager* manager, QString filename, int mode) = 0;
198 virtual bool syncExternal(KSyncManager* manager, QString resource) 199 virtual bool syncExternal(KSyncManager* manager, QString resource)
199 { 200 {
200 // empty implementation, because some syncable applications do not 201 // empty implementation, because some syncable applications do not
201 // have an external(sharpdtm) syncmode, like pwmanager. 202 // have an external(sharpdtm) syncmode, like pwmanager.
202 return false; 203 return false;
203 } 204 }
204 205