summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-08-08 11:01:52 (UTC)
committer zautrix <zautrix>2004-08-08 11:01:52 (UTC)
commit7c4e0075810cf95ab2b1ecda2d971264e9a9b60c (patch) (unidiff)
tree2900efa863dd70b7131b3c07ef7f522ac7da845f
parent71eba6589af91448b84bfd409439115972203e9e (diff)
downloadkdepimpi-7c4e0075810cf95ab2b1ecda2d971264e9a9b60c.zip
kdepimpi-7c4e0075810cf95ab2b1ecda2d971264e9a9b60c.tar.gz
kdepimpi-7c4e0075810cf95ab2b1ecda2d971264e9a9b60c.tar.bz2
Made it compileable on desktop
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile424
-rw-r--r--gammu/emb/common/common.pro6
-rw-r--r--gammu/emb/common/commonE.pro179
-rw-r--r--kabc/kabc.pro4
-rw-r--r--kaddressbook/kabcore.cpp4
-rw-r--r--kaddressbook/kaddressbook.pro3
-rw-r--r--kopi-desktop.pro2
-rw-r--r--korganizer/koprefs.cpp1
-rw-r--r--korganizer/korganizer.pro4
-rw-r--r--libkcal/libkcal.pro4
-rw-r--r--microkde/microkde.pro10
11 files changed, 366 insertions, 275 deletions
diff --git a/Makefile b/Makefile
index 38fd000..cfaec5a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,267 +1,159 @@
1DISTPATH = $(shell pwd) 1#############################################################################
2DISTDIR = $(shell basename $(DISTPATH)) 2# Makefile for building: kopi-desktop
3# Generated by qmake (1.07a) (Qt 3.3.2) on: Sun Aug 8 12:23:00 2004
4# Project: kopi-desktop.pro
5# Template: subdirs
6# Command: $(QMAKE) "CONFIG+=thread" "CONFIG+=debug" -o Makefile kopi-desktop.pro
7#############################################################################
8
9 MAKEFILE =Makefile
10 QMAKE =qmake
11DEL_FILE = rm -f
12CHK_DIR_EXISTS= test -d
13MKDIR = mkdir -p
14INSTALL_FILE=
15INSTALL_DIR =
16 SUBTARGETS = \
17 sub-gammu-emb-common \
18 sub-libical \
19 sub-libkcal \
20 sub-microkde \
21 sub-libkdepim \
22 sub-kabc \
23 sub-korganizer \
24 sub-kaddressbook \
25 sub-kabc-plugins-file \
26 sub-kabc-plugins-dir
27
28first: all
29
30all: Makefile $(SUBTARGETS)
31
32gammu/emb/common/$(MAKEFILE):
33 @$(CHK_DIR_EXISTS) "gammu/emb/common" || $(MKDIR) "gammu/emb/common"
34 cd gammu/emb/common && $(QMAKE) common.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
35sub-gammu-emb-common: gammu/emb/common/$(MAKEFILE) FORCE
36 cd gammu/emb/common && $(MAKE) -f $(MAKEFILE)
37
38libical/$(MAKEFILE):
39 @$(CHK_DIR_EXISTS) "libical" || $(MKDIR) "libical"
40 cd libical && $(QMAKE) libical.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
41sub-libical: libical/$(MAKEFILE) FORCE
42 cd libical && $(MAKE) -f $(MAKEFILE)
43
44libkcal/$(MAKEFILE):
45 @$(CHK_DIR_EXISTS) "libkcal" || $(MKDIR) "libkcal"
46 cd libkcal && $(QMAKE) libkcal.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
47sub-libkcal: libkcal/$(MAKEFILE) FORCE
48 cd libkcal && $(MAKE) -f $(MAKEFILE)
49
50microkde/$(MAKEFILE):
51 @$(CHK_DIR_EXISTS) "microkde" || $(MKDIR) "microkde"
52 cd microkde && $(QMAKE) microkde.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
53sub-microkde: microkde/$(MAKEFILE) FORCE
54 cd microkde && $(MAKE) -f $(MAKEFILE)
55
56libkdepim/$(MAKEFILE):
57 @$(CHK_DIR_EXISTS) "libkdepim" || $(MKDIR) "libkdepim"
58 cd libkdepim && $(QMAKE) libkdepim.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
59sub-libkdepim: libkdepim/$(MAKEFILE) FORCE
60 cd libkdepim && $(MAKE) -f $(MAKEFILE)
61
62kabc/$(MAKEFILE):
63 @$(CHK_DIR_EXISTS) "kabc" || $(MKDIR) "kabc"
64 cd kabc && $(QMAKE) kabc.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
65sub-kabc: kabc/$(MAKEFILE) FORCE
66 cd kabc && $(MAKE) -f $(MAKEFILE)
67
68korganizer/$(MAKEFILE):
69 @$(CHK_DIR_EXISTS) "korganizer" || $(MKDIR) "korganizer"
70 cd korganizer && $(QMAKE) korganizer.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
71sub-korganizer: korganizer/$(MAKEFILE) FORCE
72 cd korganizer && $(MAKE) -f $(MAKEFILE)
73
74kaddressbook/$(MAKEFILE):
75 @$(CHK_DIR_EXISTS) "kaddressbook" || $(MKDIR) "kaddressbook"
76 cd kaddressbook && $(QMAKE) kaddressbook.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
77sub-kaddressbook: kaddressbook/$(MAKEFILE) FORCE
78 cd kaddressbook && $(MAKE) -f $(MAKEFILE)
79
80kabc/plugins/file/$(MAKEFILE):
81 @$(CHK_DIR_EXISTS) "kabc/plugins/file" || $(MKDIR) "kabc/plugins/file"
82 cd kabc/plugins/file && $(QMAKE) file.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
83sub-kabc-plugins-file: kabc/plugins/file/$(MAKEFILE) FORCE
84 cd kabc/plugins/file && $(MAKE) -f $(MAKEFILE)
85
86kabc/plugins/dir/$(MAKEFILE):
87 @$(CHK_DIR_EXISTS) "kabc/plugins/dir" || $(MKDIR) "kabc/plugins/dir"
88 cd kabc/plugins/dir && $(QMAKE) dir.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
89sub-kabc-plugins-dir: kabc/plugins/dir/$(MAKEFILE) FORCE
90 cd kabc/plugins/dir && $(MAKE) -f $(MAKEFILE)
91
92Makefile: kopi-desktop.pro /usr/local/qtgcc/mkspecs/default/qmake.conf
93 $(QMAKE) "CONFIG+=thread" "CONFIG+=debug" -o Makefile kopi-desktop.pro
94qmake: qmake_all
95 @$(QMAKE) "CONFIG+=thread" "CONFIG+=debug" -o Makefile kopi-desktop.pro
96
97all: $(SUBTARGETS)
98qmake_all: gammu/emb/common/$(MAKEFILE) libical/$(MAKEFILE) libkcal/$(MAKEFILE) microkde/$(MAKEFILE) libkdepim/$(MAKEFILE) kabc/$(MAKEFILE) korganizer/$(MAKEFILE) kaddressbook/$(MAKEFILE) kabc/plugins/file/$(MAKEFILE) kabc/plugins/dir/$(MAKEFILE)
99 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
100 ( [ -d libical ] && cd libical ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
101 ( [ -d libkcal ] && cd libkcal ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
102 ( [ -d microkde ] && cd microkde ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
103 ( [ -d libkdepim ] && cd libkdepim ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
104 ( [ -d kabc ] && cd kabc ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
105 ( [ -d korganizer ] && cd korganizer ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
106 ( [ -d kaddressbook ] && cd kaddressbook ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
107 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
108 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
109clean uicables mocables uiclean mocclean lexclean yaccclean : qmake_all FORCE
110 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; ) || true
111 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; ) || true
112 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; ) || true
113 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; ) || true
114 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; ) || true
115 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; ) || true
116 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; ) || true
117 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; ) || true
118 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; ) || true
119 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; ) || true
120uninstall_subdirs: qmake_all FORCE
121 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
122 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
123 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
124 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
125 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
126 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
127 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
128 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
129 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
130 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
131install_subdirs: qmake_all FORCE
132 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) install; ) || true
133 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) install; ) || true
134 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) install; ) || true
135 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) install; ) || true
136 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) install; ) || true
137 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) install; ) || true
138 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) install; ) || true
139 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) install; ) || true
140 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) install; ) || true
141 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) install; ) || true
142distclean: qmake_all FORCE
143 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
144 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
145 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
146 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
147 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
148 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
149 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
150 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
151 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
152 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
153
154install: install_subdirs
155
156uninstall: uninstall_subdirs
157
158FORCE:
3 159
4
5ifeq ($(PLATFORM) , zaurus)
6 BUILD_NO_LDAP_PLUGIN=1
7endif
8
9ifneq ($(PLATFORM) , zaurus)
10 BUILD_NO_SHARP_PLUGIN=1
11endif
12
13SUBDIRS_MICROKDE = \
14 libical/src/libical \
15 libical/src/libicalss \
16 qtcompat \
17 microkde \
18 libkcal \
19 libkdepim \
20 kabc \
21 kabc/formats/binary \
22 kabc/plugins/file \
23 kabc/plugins/dir \
24 korganizer \
25 kalarmd \
26 kaddressbook
27
28SUBDIRS_QTOPIA_PLUGIN = \
29 kabc/plugins/qtopia
30
31SUBDIRS_OPIE_PLUGIN = \
32 kabc/plugins/opie
33
34SUBDIRS_SHARP_PLUGIN = \
35 kabc/plugins/sharpdtm
36
37SUBDIRS_LDAP_PLUGIN = \
38 kabc/plugins/ldap
39
40SUBDIRS_MICROMAIL = \
41 kmicromail/libetpan \
42 kmicromail/libmailwrapper \
43 kmicromail
44
45SUBDIRS = \
46 $(SUBDIRS_MICROKDE) \
47 $(SUBDIRS_QTOPIA_PLUGIN) \
48 $(SUBDIRS_OPIE_PLUGIN) \
49 $(SUBDIRS_SHARP_PLUGIN) \
50 $(SUBDIRS_LDAP_PLUGIN) \
51 $(SUBDIRS_MICROMAIL)
52
53
54all: build_microkde \
55 build_qtopia_plugin \
56 build_opie_plugin \
57 build_sharp_plugin \
58 build_ldap_plugin \
59 build_micromail
60
61
62build_microkde: variable_test tmake
63 for i in $(SUBDIRS_MICROKDE); do pushd $$i; \
64 make -f Makefile$(PLATFORM) || exit 1; popd; \
65 done
66
67build_qtopia_plugin: build_microkde
68 for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \
69 make -f Makefile$(PLATFORM) || exit 1; popd; \
70 done
71
72build_opie_plugin: build_microkde
73 ifdef BUILD_NO_OPIE_PLUGIN
74 @echo ---> opie plugin not build.
75 else
76 for i in $(SUBDIRS_OPIE_PLUGIN); do pushd $$i; \
77 make -f Makefile$(PLATFORM) || exit 1; popd; \
78 done
79 endif
80
81build_sharp_plugin: build_microkde
82 ifdef BUILD_NO_SHARP_PLUGIN
83 @echo ---> ldap plugin not build.
84 else
85 for i in $(SUBDIRS_SHARP_PLUGIN); do pushd $$i; \
86 make -f Makefile$(PLATFORM) || exit 1; popd; \
87 done
88 endif
89
90build_ldap_plugin: build_microkde
91 ifdef BUILD_NO_LDAP_PLUGIN
92 @echo ---> ldap plugin not build.
93 else
94 for i in $(SUBDIRS_LDAP_PLUGIN); do pushd $$i; \
95 make -f Makefile$(PLATFORM) || exit 1; popd; \
96 done
97 endif
98
99
100build_micromail: build_microkde
101 ifdef BUILD_NO_MICROMAIL
102 @echo ---> micromail not build.
103 else
104 for i in $(SUBDIRS_MICROMAIL); do pushd $$i; \
105 make -f Makefile$(PLATFORM) || exit 1; popd; \
106 done
107 endif
108
109
110variable_info:
111 @echo --------------------------------------
112 @echo KDEPIM buildsystem, variableinfo...
113 @echo QTDIR=$(QTDIR)
114 @echo QPEDIR=$(QPEDIR)
115 @echo OPIEDIR=$(OPIEDIR)
116 @echo PLATFORM=$(PLATFORM)
117 @echo RELEASE_DEBUG=$(RELEASE_DEBUG)
118 @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL)
119 @echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN)
120 @echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN)
121 @echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN)
122 ifndef BUILD_NO_SHARP_PLUGIN
123 @echo SHARPDTMSDK=$(SHARPDTMSDK)
124 endif
125 @echo --------------------------------------
126
127variable_test: variable_info
128 @echo KDEPIM buildsystem, variablecheck...
129 ifndef PLATFORM
130 @echo PLATFORM is not defined.
131 $(error PLATFORM is not defined)
132 endif
133 ifdef BUILD_NO_LDAP_PLUGIN
134 @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN)
135 endif
136 ifdef BUILD_NO_OPIE_PLUGIN
137 @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN)
138 endif
139 ifdef BUILD_NO_MICROMAIL
140 @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL)
141 endif
142 ifdef BUILD_NO_SHARP_PLUGIN
143 @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN)
144 else
145 ifndef SHARPDTMSDK
146 @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK)
147 $(error SHARPDTMSDK is not defined)
148 endif
149 endif
150 @echo --------------------------------------
151
152
153objects:
154 for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done
155 for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
156 mkdir -p libical/lib/$(PLATFORM)
157
158clean:
159 rm -f libical/lib/$(PLATFORM)/*;
160 for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\
161 rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
162 done
163install:
164 cd bin/kdepim; make install
165 cp db2file/db2file $(QPEDIR)/bin/db2file
166 cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
167 cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
168 cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kmicromail.desktop
169
170dist:
171 @echo Dont forget to do "make install" before "make dist"
172 rm -f *arm.ipk
173 rm -f *~
174 cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc kdepim
175 ./mkipks kmicrokdelibs.control
176 ./mkipks korganizer.control
177 ./mkipks kaddressbook.control
178 ifndef BUILD_NO_MICROMAIL
179 ./mkipks kopiemail.control
180 endif
181 ./mkipks korganizer-alarm.control
182
183tmake: objects \
184 qtcompat/Makefile$(PLATFORM) \
185 microkde/Makefile$(PLATFORM) \
186 libkcal/Makefile$(PLATFORM) \
187 libkdepim/Makefile$(PLATFORM) \
188 korganizer/Makefile$(PLATFORM) \
189 kalarmd/Makefile$(PLATFORM) \
190 libical/src/libical/Makefile$(PLATFORM) \
191 libical/src/libicalss/Makefile$(PLATFORM) \
192 kabc/Makefile$(PLATFORM) \
193 kabc/formats/binary/Makefile$(PLATFORM) \
194 kabc/plugins/file/Makefile$(PLATFORM) \
195 kabc/plugins/dir/Makefile$(PLATFORM) \
196 kabc/plugins/ldap/Makefile$(PLATFORM) \
197 kabc/plugins/opie/Makefile$(PLATFORM) \
198 kabc/plugins/qtopia/Makefile$(PLATFORM) \
199 kabc/plugins/sharpdtm/Makefile$(PLATFORM) \
200 kaddressbook/Makefile$(PLATFORM) \
201 kmicromail/Makefile$(PLATFORM) \
202 kmicromail/libetpan/Makefile$(PLATFORM) \
203 kmicromail/libmailwrapper/Makefile$(PLATFORM)
204
205
206
207
208qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro
209 cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" qtcompat.pro -o Makefile$(PLATFORM)
210
211microkde/Makefile$(PLATFORM): microkde/microkdeE.pro
212 cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" microkdeE.pro -o Makefile$(PLATFORM)
213
214libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro
215 cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" libkcalE.pro -o Makefile$(PLATFORM)
216
217
218libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro
219 cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" libkdepimE.pro -o Makefile$(PLATFORM)
220
221kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro
222 cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" kalarmdE.pro -o Makefile$(PLATFORM)
223
224korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro
225 cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" korganizerE.pro -o Makefile$(PLATFORM)
226
227libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro
228 cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" libicalE.pro -o Makefile$(PLATFORM)
229
230libical/src/libicalss/Makefile$(PLATFORM): libical/src/libicalss/libicalssE.pro
231 cd libical/src/libicalss; tmake "CONFIG+=$(RELEASE_DEBUG)" libicalssE.pro -o Makefile$(PLATFORM)
232
233kabc/Makefile$(PLATFORM): kabc/kabcE.pro
234 cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" kabcE.pro -o Makefile$(PLATFORM)
235
236kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro
237 cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" kabcformat_binaryE.pro -o Makefile$(PLATFORM)
238
239kabc/plugins/file/Makefile$(PLATFORM): kabc/plugins/file/fileE.pro
240 cd kabc/plugins/file; tmake "CONFIG+=$(RELEASE_DEBUG)" fileE.pro -o Makefile$(PLATFORM)
241
242kabc/plugins/dir/Makefile$(PLATFORM): kabc/plugins/dir/dirE.pro
243 cd kabc/plugins/dir; tmake "CONFIG+=$(RELEASE_DEBUG)" dirE.pro -o Makefile$(PLATFORM)
244
245kabc/plugins/ldap/Makefile$(PLATFORM): kabc/plugins/ldap/ldapE.pro
246 cd kabc/plugins/ldap; tmake "CONFIG+=$(RELEASE_DEBUG)" ldapE.pro -o Makefile$(PLATFORM)
247
248kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/opieE.pro
249 cd kabc/plugins/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieE.pro -o Makefile$(PLATFORM)
250
251kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro
252 cd kabc/plugins/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" qtopiaE.pro -o Makefile$(PLATFORM)
253
254kabc/plugins/sharpdtm/Makefile$(PLATFORM): kabc/plugins/sharpdtm/sharpdtmE.pro
255 cd kabc/plugins/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" sharpdtmE.pro -o Makefile$(PLATFORM)
256
257kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro
258 cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" kaddressbookE.pro -o Makefile$(PLATFORM)
259
260kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro
261 cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" kmicromailE.pro -o Makefile$(PLATFORM)
262
263kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro
264 cd kmicromail/libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" libetpanE.pro -o Makefile$(PLATFORM)
265
266kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro
267 cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" libmailwrapperE.pro -o Makefile$(PLATFORM)
diff --git a/gammu/emb/common/common.pro b/gammu/emb/common/common.pro
index 49fecc6..7cbcb17 100644
--- a/gammu/emb/common/common.pro
+++ b/gammu/emb/common/common.pro
@@ -49,131 +49,131 @@ INCLUDEPATH += . \
49 service/sms \ 49 service/sms \
50 service/backup \ 50 service/backup \
51 phone/nokia \ 51 phone/nokia \
52 phone 52 phone
53 53
54# Input 54# Input
55HEADERS += config.h \ 55HEADERS += config.h \
56 gammu.h \ 56 gammu.h \
57 gsmcomon.h \ 57 gsmcomon.h \
58 gsmstate.h \ 58 gsmstate.h \
59 device/devfunc.h \ 59 device/devfunc.h \
60 misc/cfg.h \ 60 misc/cfg.h \
61 misc/misc.h \ 61 misc/misc.h \
62 phone/pfunc.h \ 62 phone/pfunc.h \
63 protocol/protocol.h \ 63 protocol/protocol.h \
64 service/gsmcal.h \ 64 service/gsmcal.h \
65 service/gsmcall.h \ 65 service/gsmcall.h \
66 service/gsmdata.h \ 66 service/gsmdata.h \
67 service/gsmlogo.h \ 67 service/gsmlogo.h \
68 service/gsmmisc.h \ 68 service/gsmmisc.h \
69 service/gsmnet.h \ 69 service/gsmnet.h \
70 service/gsmpbk.h \ 70 service/gsmpbk.h \
71 service/gsmprof.h \ 71 service/gsmprof.h \
72 service/gsmring.h \ 72 service/gsmring.h \
73 device/bluetoth/affix.h \ 73 device/bluetoth/affix.h \
74 device/bluetoth/blue_w32.h \ 74 device/bluetoth/blue_w32.h \
75 device/bluetoth/bluetoth.h \ 75 device/bluetoth/bluetoth.h \
76 device/bluetoth/bluez.h \ 76 device/bluetoth/bluez.h \
77 device/irda/irda.h \ 77 device/irda/irda.h \
78 device/irda/irda_unx.h \ 78 device/irda/irda_unx.h \
79 device/irda/irda_w32.h \ 79 device/irda/irda_w32.h \
80 device/serial/ser_djg.h \ 80 device/serial/ser_djg.h \
81 device/serial/ser_unx.h \ 81 device/serial/ser_unx.h \
82 device/serial/ser_w32.h \ 82 device/serial/ser_w32.h \
83 misc/coding/coding.h \ 83 misc/coding/coding.h \
84 misc/coding/md5.h \ 84 misc/coding/md5.h \
85 phone/alcatel/alcatel.h \ 85 phone/alcatel/alcatel.h \
86 phone/at/atgen.h \ 86 phone/at/atgen.h \
87 phone/nokia/ncommon.h \ 87 phone/nokia/ncommon.h \
88 phone/nokia/nfunc.h \ 88 phone/nokia/nfunc.h \
89 phone/nokia/nfuncold.h \ 89 phone/nokia/nfuncold.h \
90 phone/obex/obexgen.h \ 90 phone/obex/obexgen.h \
91 phone/symbian/mroutgen.h \ 91 phone/symbian/mroutgen.h \
92 protocol/alcatel/alcabus.h \ 92 protocol/alcatel/alcabus.h \
93 protocol/at/at.h \ 93 protocol/at/at.h \
94 protocol/nokia/fbus2.h \ 94 protocol/nokia/fbus2.h \
95 protocol/nokia/mbus2.h \ 95 protocol/nokia/mbus2.h \
96 protocol/nokia/phonet.h \ 96 protocol/nokia/phonet.h \
97 protocol/obex/obex.h \ 97 protocol/obex/obex.h \
98 protocol/symbian/mrouter.h \ 98 protocol/symbian/mrouter.h \
99 service/backup/backgen.h \ 99 service/backup/backgen.h \
100 service/backup/backics.h \ 100 service/backup/backics.h \
101 service/backup/backldif.h \ 101 service/backup/backldif.h \
102 service/backup/backlmb.h \ 102 service/backup/backlmb.h \
103 service/backup/backtext.h \ 103 service/backup/backtext.h \
104 service/backup/backvcf.h \ 104 service/backup/backvcf.h \
105 service/backup/backvcs.h \ 105 service/backup/backvcs.h \
106 service/backup/gsmback.h \ 106 service/backup/gsmback.h \
107 service/sms/gsmems.h \ 107 service/sms/gsmems.h \
108 service/sms/gsmmulti.h \ 108 service/sms/gsmmulti.h \
109 service/sms/gsmsms.h \ 109 service/sms/gsmsms.h \
110 phone/nokia/dct3/dct3comm.h \ 110 phone/nokia/dct3/dct3comm.h \
111 phone/nokia/dct3/dct3func.h \ 111 phone/nokia/dct3/dct3func.h \
112 phone/nokia/dct3/n6110.h \ 112 phone/nokia/dct3/n6110.h \
113 phone/nokia/dct3/n7110.h \ 113 phone/nokia/dct3/n7110.h \
114 phone/nokia/dct3/n9210.h \ 114 phone/nokia/dct3/n9210.h \
115 phone/nokia/dct4/dct4func.h \ 115 phone/nokia/dct4/dct4func.h \
116 phone/nokia/dct4/n3320.h \ 116 phone/nokia/dct4/n3320.h \
117 phone/nokia/dct4/n3650.h \ 117 phone/nokia/dct4/n3650.h \
118 phone/nokia/dct4/n6510.h 118 phone/nokia/dct4/n6510.h
119SOURCES +=gsmcomon.c \ 119SOURCES +=gsmcomon.c \
120gsmstate.c \ 120gsmstate.c \
121misc/misc.c \ 121misc/misc.c \
122misc/cfg.c \ 122misc/cfg.c \
123misc/coding/coding.c \ 123misc/coding/coding.c \
124misc/coding/md5.c \ 124misc/coding/md5.c \
125service/sms/gsmsms.c \ 125service/sms/gsmsms.c \
126service/sms/gsmems.c \ 126service/sms/gsmems.c \
127service/sms/gsmmulti.c \ 127service/sms/gsmmulti.c \
128service/gsmcal.c \ 128service/gsmcal.c \
129service/gsmdata.c \ 129service/gsmdata.c \
130service/gsmpbk.c \ 130service/gsmpbk.c \
131service/gsmring.c \ 131service/gsmring.c \
132service/gsmlogo.c \ 132service/gsmlogo.c \
133service/gsmmisc.c \ 133service/gsmmisc.c \
134service/gsmnet.c \ 134service/gsmnet.c \
135service/backup/gsmback.c \ 135service/backup/gsmback.c \
136service/backup/backldif.c \ 136service/backup/backldif.c \
137service/backup/backlmb.c \ 137service/backup/backlmb.c \
138service/backup/backtext.c \ 138service/backup/backtext.c \
139service/backup/backvcs.c \ 139service/backup/backvcs.c \
140service/backup/backvcf.c \ 140service/backup/backvcf.c \
141service/backup/backics.c \ 141service/backup/backics.c \
142device/bluetoth/affix.c \ 142device/bluetoth/affix.c \
143device/bluetoth/bluez.c \ 143device/bluetoth/bluez.c \
144device/bluetoth/blue_w32.c \ 144device/bluetoth/blue_w32.c \
145device/bluetoth/bluetoth.c \ 145device/bluetoth/bluetoth.c \
146device/serial/ser_unx.c \ 146device/serial/ser_unx.c \
147device/serial/ser_djg.c \ 147device/serial/ser_djg.c \
148device/irda/irda.c \ 148device/irda/irda.c \
149device/devfunc.c \ 149device/devfunc.c \
150protocol/at/at.c \ 150protocol/at/at.c \
151protocol/alcatel/alcabus.c \ 151protocol/alcatel/alcabus.c \
152protocol/nokia/mbus2.c \ 152protocol/nokia/mbus2.c \
153protocol/nokia/fbus2.c \ 153protocol/nokia/fbus2.c \
154protocol/nokia/phonet.c \ 154protocol/nokia/phonet.c \
155protocol/obex/obex.c \ 155protocol/obex/obex.c \
156protocol/symbian/mrouter.c \ 156protocol/symbian/mrouter.c \
157phone/pfunc.c \ 157phone/pfunc.c \
158phone/at/atgen.c \ 158phone/at/atgen.c \
159phone/at/siemens.c \ 159phone/at/siemens.c \
160phone/at/sonyeric.c \ 160phone/at/sonyeric.c \
161phone/alcatel/alcatel.c \ 161phone/alcatel/alcatel.c \
162phone/nokia/dct3/n6110.c \ 162phone/nokia/dct3/n6110.c \
163phone/nokia/dct3/n7110.c \ 163phone/nokia/dct3/n7110.c \
164phone/nokia/dct3/n9210.c \ 164phone/nokia/dct3/n9210.c \
165phone/nokia/dct3/dct3func.c \ 165phone/nokia/dct3/dct3func.c \
166phone/nokia/dct4/n3320.c \ 166phone/nokia/dct4/n3320.c \
167phone/nokia/dct4/n3650.c \ 167phone/nokia/dct4/n3650.c \
168phone/nokia/dct4/n6510.c \ 168phone/nokia/dct4/n6510.c \
169phone/nokia/dct4/dct4func.c \ 169phone/nokia/dct4/dct4func.c \
170phone/nokia/nauto.c \ 170phone/nokia/nauto.c \
171phone/nokia/nfunc.c \ 171phone/nokia/nfunc.c \
172phone/nokia/nfuncold.c \ 172phone/nokia/nfuncold.c \
173phone/obex/obexgen.c \ 173phone/obex/obexgen.c \
174phone/symbian/mroutgen.c 174phone/symbian/mroutgen.c
175 175
176TARGET = microgammu 176TARGET = microgammu
177DESTDIR = $(QPEDIR)/lib 177DESTDIR = ../../../bin
178OBJECTS_DIR = obj/$(PLATFORM) 178OBJECTS_DIR = obj/unix
179MOC_DIR = moc/$(PLATFORM) 179MOC_DIR = moc/unix
diff --git a/gammu/emb/common/commonE.pro b/gammu/emb/common/commonE.pro
new file mode 100644
index 0000000..49fecc6
--- a/dev/null
+++ b/gammu/emb/common/commonE.pro
@@ -0,0 +1,179 @@
1######################################################################
2# Automatically generated by qmake (1.07a) Fri Jul 30 22:13:34 2004
3######################################################################
4
5TEMPLATE = lib
6DEPENDPATH += device \
7 misc \
8 phone \
9 protocol \
10 service \
11 device/bluetoth \
12 device/irda \
13 device/serial \
14 misc/coding \
15 phone/alcatel \
16 phone/at \
17 phone/nokia \
18 phone/obex \
19 phone/symbian \
20 protocol/alcatel \
21 protocol/at \
22 protocol/nokia \
23 protocol/obex \
24 protocol/symbian \
25 service/backup \
26 service/sms \
27 phone/nokia/dct3 \
28 phone/nokia/dct4
29INCLUDEPATH += . \
30 misc/coding \
31 misc \
32 device \
33 phone/nokia/dct4 \
34 phone/nokia/dct3 \
35 phone/at \
36 phone/alcatel \
37 phone/obex \
38 phone/symbian \
39 protocol \
40 protocol/nokia \
41 protocol/at \
42 protocol/alcatel \
43 protocol/obex \
44 protocol/symbian \
45 device/serial \
46 device/irda \
47 device/bluetoth \
48 service \
49 service/sms \
50 service/backup \
51 phone/nokia \
52 phone
53
54# Input
55HEADERS += config.h \
56 gammu.h \
57 gsmcomon.h \
58 gsmstate.h \
59 device/devfunc.h \
60 misc/cfg.h \
61 misc/misc.h \
62 phone/pfunc.h \
63 protocol/protocol.h \
64 service/gsmcal.h \
65 service/gsmcall.h \
66 service/gsmdata.h \
67 service/gsmlogo.h \
68 service/gsmmisc.h \
69 service/gsmnet.h \
70 service/gsmpbk.h \
71 service/gsmprof.h \
72 service/gsmring.h \
73 device/bluetoth/affix.h \
74 device/bluetoth/blue_w32.h \
75 device/bluetoth/bluetoth.h \
76 device/bluetoth/bluez.h \
77 device/irda/irda.h \
78 device/irda/irda_unx.h \
79 device/irda/irda_w32.h \
80 device/serial/ser_djg.h \
81 device/serial/ser_unx.h \
82 device/serial/ser_w32.h \
83 misc/coding/coding.h \
84 misc/coding/md5.h \
85 phone/alcatel/alcatel.h \
86 phone/at/atgen.h \
87 phone/nokia/ncommon.h \
88 phone/nokia/nfunc.h \
89 phone/nokia/nfuncold.h \
90 phone/obex/obexgen.h \
91 phone/symbian/mroutgen.h \
92 protocol/alcatel/alcabus.h \
93 protocol/at/at.h \
94 protocol/nokia/fbus2.h \
95 protocol/nokia/mbus2.h \
96 protocol/nokia/phonet.h \
97 protocol/obex/obex.h \
98 protocol/symbian/mrouter.h \
99 service/backup/backgen.h \
100 service/backup/backics.h \
101 service/backup/backldif.h \
102 service/backup/backlmb.h \
103 service/backup/backtext.h \
104 service/backup/backvcf.h \
105 service/backup/backvcs.h \
106 service/backup/gsmback.h \
107 service/sms/gsmems.h \
108 service/sms/gsmmulti.h \
109 service/sms/gsmsms.h \
110 phone/nokia/dct3/dct3comm.h \
111 phone/nokia/dct3/dct3func.h \
112 phone/nokia/dct3/n6110.h \
113 phone/nokia/dct3/n7110.h \
114 phone/nokia/dct3/n9210.h \
115 phone/nokia/dct4/dct4func.h \
116 phone/nokia/dct4/n3320.h \
117 phone/nokia/dct4/n3650.h \
118 phone/nokia/dct4/n6510.h
119SOURCES +=gsmcomon.c \
120gsmstate.c \
121misc/misc.c \
122misc/cfg.c \
123misc/coding/coding.c \
124misc/coding/md5.c \
125service/sms/gsmsms.c \
126service/sms/gsmems.c \
127service/sms/gsmmulti.c \
128service/gsmcal.c \
129service/gsmdata.c \
130service/gsmpbk.c \
131service/gsmring.c \
132service/gsmlogo.c \
133service/gsmmisc.c \
134service/gsmnet.c \
135service/backup/gsmback.c \
136service/backup/backldif.c \
137service/backup/backlmb.c \
138service/backup/backtext.c \
139service/backup/backvcs.c \
140service/backup/backvcf.c \
141service/backup/backics.c \
142device/bluetoth/affix.c \
143device/bluetoth/bluez.c \
144device/bluetoth/blue_w32.c \
145device/bluetoth/bluetoth.c \
146device/serial/ser_unx.c \
147device/serial/ser_djg.c \
148device/irda/irda.c \
149device/devfunc.c \
150protocol/at/at.c \
151protocol/alcatel/alcabus.c \
152protocol/nokia/mbus2.c \
153protocol/nokia/fbus2.c \
154protocol/nokia/phonet.c \
155protocol/obex/obex.c \
156protocol/symbian/mrouter.c \
157phone/pfunc.c \
158phone/at/atgen.c \
159phone/at/siemens.c \
160phone/at/sonyeric.c \
161phone/alcatel/alcatel.c \
162phone/nokia/dct3/n6110.c \
163phone/nokia/dct3/n7110.c \
164phone/nokia/dct3/n9210.c \
165phone/nokia/dct3/dct3func.c \
166phone/nokia/dct4/n3320.c \
167phone/nokia/dct4/n3650.c \
168phone/nokia/dct4/n6510.c \
169phone/nokia/dct4/dct4func.c \
170phone/nokia/nauto.c \
171phone/nokia/nfunc.c \
172phone/nokia/nfuncold.c \
173phone/obex/obexgen.c \
174phone/symbian/mroutgen.c
175
176TARGET = microgammu
177DESTDIR = $(QPEDIR)/lib
178OBJECTS_DIR = obj/$(PLATFORM)
179MOC_DIR = moc/$(PLATFORM)
diff --git a/kabc/kabc.pro b/kabc/kabc.pro
index 10b092c..95ebd68 100644
--- a/kabc/kabc.pro
+++ b/kabc/kabc.pro
@@ -1,216 +1,218 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2CONFIG += qt warn_on 2CONFIG += qt warn_on
3#release debug 3#release debug
4DESTDIR=../bin 4DESTDIR=../bin
5 5
6TARGET = microkabc 6TARGET = microkabc
7 7
8include( ../variables.pri ) 8include( ../variables.pri )
9 9
10INCLUDEPATH += . ./vcard/include ./vcard/include/generated ../microkde ../microkde/kdecore ../microkde/kio/kfile ../microkde/kio/kio ../libkdepim ../qtcompat ../microkde/kdeui 10INCLUDEPATH += . ./vcard/include ./vcard/include/generated ../microkde ../microkde/kdecore ../microkde/kio/kfile ../microkde/kio/kio ../libkdepim ../qtcompat ../microkde/kdeui ..
11 11
12#LIBS += -lmicrokde -lldap 12#LIBS += -lmicrokde -lldap
13LIBS += -L$(QPEDIR)/lib 13LIBS += -L$(QPEDIR)/lib
14DEFINES += KAB_EMBEDDED DESKTOP_VERSION 14DEFINES += KAB_EMBEDDED DESKTOP_VERSION
15unix : { 15unix : {
16 16
17OBJECTS_DIR = obj/unix 17OBJECTS_DIR = obj/unix
18MOC_DIR = moc/unix 18MOC_DIR = moc/unix
19} 19}
20win32: { 20win32: {
21DEFINES += _WIN32_ 21DEFINES += _WIN32_
22OBJECTS_DIR = obj/win 22OBJECTS_DIR = obj/win
23MOC_DIR = moc/win 23MOC_DIR = moc/win
24} 24}
25INTERFACES = \ 25INTERFACES = \
26 26
27 27
28HEADERS = \ 28HEADERS = \
29 resource.h \ 29 resource.h \
30 stdaddressbook.h \ 30 stdaddressbook.h \
31 agent.h \ 31 agent.h \
32 geo.h \ 32 geo.h \
33 key.h \ 33 key.h \
34 field.h \ 34 field.h \
35 plugin.h \ 35 plugin.h \
36 address.h \ 36 address.h \
37 addresseelist.h \ 37 addresseelist.h \
38formatfactory.h \ 38formatfactory.h \
39 formatplugin.h \ 39 formatplugin.h \
40 phonenumber.h \ 40 phonenumber.h \
41distributionlist.h \ 41distributionlist.h \
42distributionlistdialog.h \ 42distributionlistdialog.h \
43distributionlisteditor.h \ 43distributionlisteditor.h \
44vcardformatplugin.h \ 44vcardformatplugin.h \
45formats/vcardformatplugin2.h \ 45formats/vcardformatplugin2.h \
46 picture.h \ 46 picture.h \
47 secrecy.h \ 47 secrecy.h \
48 sound.h \ 48 sound.h \
49 addressbook.h \ 49 addressbook.h \
50 syncprefwidget.h \
50 timezone.h \ 51 timezone.h \
51 tmpaddressbook.h \ 52 tmpaddressbook.h \
52 addressee.h \ 53 addressee.h \
53 addresseedialog.h \ 54 addresseedialog.h \
54 vcardconverter.h \ 55 vcardconverter.h \
55 vcard21parser.h \ 56 vcard21parser.h \
56 vcardformatimpl.h \ 57 vcardformatimpl.h \
57 plugins/file/resourcefile.h \ 58 plugins/file/resourcefile.h \
58 plugins/file/resourcefileconfig.h \ 59 plugins/file/resourcefileconfig.h \
59 plugins/dir/resourcedir.h \ 60 plugins/dir/resourcedir.h \
60 plugins/dir/resourcedirconfig.h \ 61 plugins/dir/resourcedirconfig.h \
61 vcardparser/vcardline.h \ 62 vcardparser/vcardline.h \
62 vcardparser/vcard.h \ 63 vcardparser/vcard.h \
63 vcardparser/vcardtool.h \ 64 vcardparser/vcardtool.h \
64 vcardparser/vcardparser.h \ 65 vcardparser/vcardparser.h \
65vcard/include/VCardAdrParam.h \ 66vcard/include/VCardAdrParam.h \
66vcard/include/VCardAdrValue.h \ 67vcard/include/VCardAdrValue.h \
67vcard/include/VCardAgentParam.h \ 68vcard/include/VCardAgentParam.h \
68vcard/include/VCardContentLine.h \ 69vcard/include/VCardContentLine.h \
69vcard/include/VCardDateParam.h \ 70vcard/include/VCardDateParam.h \
70vcard/include/VCardDateValue.h \ 71vcard/include/VCardDateValue.h \
71vcard/include/VCardEmailParam.h \ 72vcard/include/VCardEmailParam.h \
72vcard/include/VCardGeoValue.h \ 73vcard/include/VCardGeoValue.h \
73vcard/include/VCardGroup.h \ 74vcard/include/VCardGroup.h \
74vcard/include/VCardImageParam.h \ 75vcard/include/VCardImageParam.h \
75vcard/include/VCardImageValue.h \ 76vcard/include/VCardImageValue.h \
76vcard/include/VCardLangValue.h \ 77vcard/include/VCardLangValue.h \
77vcard/include/VCardNValue.h \ 78vcard/include/VCardNValue.h \
78vcard/include/VCardParam.h \ 79vcard/include/VCardParam.h \
79vcard/include/VCardPhoneNumberValue.h \ 80vcard/include/VCardPhoneNumberValue.h \
80vcard/include/VCardSourceParam.h \ 81vcard/include/VCardSourceParam.h \
81vcard/include/VCardTelParam.h \ 82vcard/include/VCardTelParam.h \
82vcard/include/VCardTextParam.h \ 83vcard/include/VCardTextParam.h \
83vcard/include/VCardTextNSParam.h \ 84vcard/include/VCardTextNSParam.h \
84vcard/include/VCardTextValue.h \ 85vcard/include/VCardTextValue.h \
85vcard/include/VCardTextBinParam.h \ 86vcard/include/VCardTextBinParam.h \
86vcard/include/VCardURIValue.h \ 87vcard/include/VCardURIValue.h \
87vcard/include/VCardVCard.h \ 88vcard/include/VCardVCard.h \
88vcard/include/VCardEntity.h \ 89vcard/include/VCardEntity.h \
89vcard/include/VCardValue.h \ 90vcard/include/VCardValue.h \
90vcard/include/VCardSoundValue.h \ 91vcard/include/VCardSoundValue.h \
91vcard/include/VCardAgentValue.h \ 92vcard/include/VCardAgentValue.h \
92vcard/include/VCardTelValue.h \ 93vcard/include/VCardTelValue.h \
93vcard/include/VCardTextBinValue.h \ 94vcard/include/VCardTextBinValue.h \
94vcard/include/VCardOrgValue.h \ 95vcard/include/VCardOrgValue.h \
95vcard/include/VCardUTCValue.h \ 96vcard/include/VCardUTCValue.h \
96vcard/include/VCardClassValue.h \ 97vcard/include/VCardClassValue.h \
97vcard/include/VCardFloatValue.h \ 98vcard/include/VCardFloatValue.h \
98vcard/include/VCardTextListValue.h \ 99vcard/include/VCardTextListValue.h \
99vcard/include/generated/AdrParam-generated.h \ 100vcard/include/generated/AdrParam-generated.h \
100vcard/include/generated/AdrValue-generated.h \ 101vcard/include/generated/AdrValue-generated.h \
101vcard/include/generated/AgentParam-generated.h \ 102vcard/include/generated/AgentParam-generated.h \
102vcard/include/generated/ContentLine-generated.h \ 103vcard/include/generated/ContentLine-generated.h \
103vcard/include/generated/DateParam-generated.h \ 104vcard/include/generated/DateParam-generated.h \
104vcard/include/generated/DateValue-generated.h \ 105vcard/include/generated/DateValue-generated.h \
105vcard/include/generated/EmailParam-generated.h \ 106vcard/include/generated/EmailParam-generated.h \
106vcard/include/generated/GeoValue-generated.h \ 107vcard/include/generated/GeoValue-generated.h \
107vcard/include/generated/Group-generated.h \ 108vcard/include/generated/Group-generated.h \
108vcard/include/generated/ImageParam-generated.h \ 109vcard/include/generated/ImageParam-generated.h \
109vcard/include/generated/ImageValue-generated.h \ 110vcard/include/generated/ImageValue-generated.h \
110vcard/include/generated/LangValue-generated.h \ 111vcard/include/generated/LangValue-generated.h \
111vcard/include/generated/NValue-generated.h \ 112vcard/include/generated/NValue-generated.h \
112vcard/include/generated/Param-generated.h \ 113vcard/include/generated/Param-generated.h \
113vcard/include/generated/PhoneNumberValue-generated.h \ 114vcard/include/generated/PhoneNumberValue-generated.h \
114vcard/include/generated/SourceParam-generated.h \ 115vcard/include/generated/SourceParam-generated.h \
115vcard/include/generated/TelParam-generated.h \ 116vcard/include/generated/TelParam-generated.h \
116vcard/include/generated/TextParam-generated.h \ 117vcard/include/generated/TextParam-generated.h \
117vcard/include/generated/TextNSParam-generated.h \ 118vcard/include/generated/TextNSParam-generated.h \
118vcard/include/generated/TextValue-generated.h \ 119vcard/include/generated/TextValue-generated.h \
119vcard/include/generated/TextBinParam-generated.h \ 120vcard/include/generated/TextBinParam-generated.h \
120vcard/include/generated/URIValue-generated.h \ 121vcard/include/generated/URIValue-generated.h \
121vcard/include/generated/VCard-generated.h \ 122vcard/include/generated/VCard-generated.h \
122vcard/include/generated/VCardEntity-generated.h \ 123vcard/include/generated/VCardEntity-generated.h \
123vcard/include/generated/Value-generated.h \ 124vcard/include/generated/Value-generated.h \
124vcard/include/generated/SoundValue-generated.h \ 125vcard/include/generated/SoundValue-generated.h \
125vcard/include/generated/AgentValue-generated.h \ 126vcard/include/generated/AgentValue-generated.h \
126vcard/include/generated/TelValue-generated.h \ 127vcard/include/generated/TelValue-generated.h \
127vcard/include/generated/TextBinValue-generated.h \ 128vcard/include/generated/TextBinValue-generated.h \
128vcard/include/generated/OrgValue-generated.h \ 129vcard/include/generated/OrgValue-generated.h \
129vcard/include/generated/UTCValue-generated.h \ 130vcard/include/generated/UTCValue-generated.h \
130vcard/include/generated/ClassValue-generated.h \ 131vcard/include/generated/ClassValue-generated.h \
131vcard/include/generated/FloatValue-generated.h \ 132vcard/include/generated/FloatValue-generated.h \
132vcard/include/generated/TextListValue-generated.h 133vcard/include/generated/TextListValue-generated.h
133 134
134 135
135# plugins/ldap/resourceldap.h \ 136# plugins/ldap/resourceldap.h \
136# plugins/ldap/resourceldapconfig.h \ 137# plugins/ldap/resourceldapconfig.h \
137#formats/binary/binaryformat.h \ 138#formats/binary/binaryformat.h \
138 139
139 140
140SOURCES = \ 141SOURCES = \
141distributionlist.cpp \ 142distributionlist.cpp \
142distributionlistdialog.cpp \ 143distributionlistdialog.cpp \
143distributionlisteditor.cpp \ 144distributionlisteditor.cpp \
144vcardformatplugin.cpp \ 145vcardformatplugin.cpp \
145formats/vcardformatplugin2.cpp \ 146formats/vcardformatplugin2.cpp \
146formatfactory.cpp \ 147formatfactory.cpp \
147 resource.cpp \ 148 resource.cpp \
148 stdaddressbook.cpp \ 149 stdaddressbook.cpp \
149 plugin.cpp \ 150 plugin.cpp \
150 agent.cpp \ 151 agent.cpp \
151 geo.cpp \ 152 geo.cpp \
152 key.cpp \ 153 key.cpp \
153 field.cpp \ 154 field.cpp \
154 address.cpp \ 155 address.cpp \
155 phonenumber.cpp \ 156 phonenumber.cpp \
156 picture.cpp \ 157 picture.cpp \
157 secrecy.cpp \ 158 secrecy.cpp \
158 sound.cpp \ 159 sound.cpp \
159 addressbook.cpp \ 160 addressbook.cpp \
161 syncprefwidget.cpp \
160 timezone.cpp \ 162 timezone.cpp \
161 tmpaddressbook.cpp \ 163 tmpaddressbook.cpp \
162 addressee.cpp \ 164 addressee.cpp \
163 addresseelist.cpp \ 165 addresseelist.cpp \
164 addresseedialog.cpp \ 166 addresseedialog.cpp \
165 vcardconverter.cpp \ 167 vcardconverter.cpp \
166 vcard21parser.cpp \ 168 vcard21parser.cpp \
167 vcardformatimpl.cpp \ 169 vcardformatimpl.cpp \
168 plugins/file/resourcefile.cpp \ 170 plugins/file/resourcefile.cpp \
169 plugins/file/resourcefileconfig.cpp \ 171 plugins/file/resourcefileconfig.cpp \
170 plugins/dir/resourcedir.cpp \ 172 plugins/dir/resourcedir.cpp \
171 plugins/dir/resourcedirconfig.cpp \ 173 plugins/dir/resourcedirconfig.cpp \
172 vcardparser/vcardline.cpp \ 174 vcardparser/vcardline.cpp \
173 vcardparser/vcard.cpp \ 175 vcardparser/vcard.cpp \
174 vcardparser/vcardtool.cpp \ 176 vcardparser/vcardtool.cpp \
175 vcardparser/vcardparser.cpp \ 177 vcardparser/vcardparser.cpp \
176vcard/AdrParam.cpp \ 178vcard/AdrParam.cpp \
177vcard/AdrValue.cpp \ 179vcard/AdrValue.cpp \
178vcard/AgentParam.cpp \ 180vcard/AgentParam.cpp \
179vcard/ContentLine.cpp \ 181vcard/ContentLine.cpp \
180vcard/DateParam.cpp \ 182vcard/DateParam.cpp \
181vcard/DateValue.cpp \ 183vcard/DateValue.cpp \
182vcard/EmailParam.cpp \ 184vcard/EmailParam.cpp \
183vcard/Entity.cpp \ 185vcard/Entity.cpp \
184vcard/Enum.cpp \ 186vcard/Enum.cpp \
185vcard/GeoValue.cpp \ 187vcard/GeoValue.cpp \
186vcard/ImageParam.cpp \ 188vcard/ImageParam.cpp \
187vcard/ImageValue.cpp \ 189vcard/ImageValue.cpp \
188vcard/LangValue.cpp \ 190vcard/LangValue.cpp \
189vcard/NValue.cpp \ 191vcard/NValue.cpp \
190vcard/Param.cpp \ 192vcard/Param.cpp \
191vcard/PhoneNumberValue.cpp \ 193vcard/PhoneNumberValue.cpp \
192vcard/RToken.cpp \ 194vcard/RToken.cpp \
193vcard/SourceParam.cpp \ 195vcard/SourceParam.cpp \
194vcard/TelParam.cpp \ 196vcard/TelParam.cpp \
195vcard/TextParam.cpp \ 197vcard/TextParam.cpp \
196vcard/TextValue.cpp \ 198vcard/TextValue.cpp \
197vcard/TextBinParam.cpp \ 199vcard/TextBinParam.cpp \
198vcard/URIValue.cpp \ 200vcard/URIValue.cpp \
199vcard/VCardv.cpp \ 201vcard/VCardv.cpp \
200vcard/VCardEntity.cpp \ 202vcard/VCardEntity.cpp \
201vcard/Value.cpp \ 203vcard/Value.cpp \
202vcard/SoundValue.cpp \ 204vcard/SoundValue.cpp \
203vcard/AgentValue.cpp \ 205vcard/AgentValue.cpp \
204vcard/TelValue.cpp \ 206vcard/TelValue.cpp \
205vcard/TextBinValue.cpp \ 207vcard/TextBinValue.cpp \
206vcard/OrgValue.cpp \ 208vcard/OrgValue.cpp \
207vcard/UTCValue.cpp \ 209vcard/UTCValue.cpp \
208vcard/ClassValue.cpp \ 210vcard/ClassValue.cpp \
209vcard/FloatValue.cpp \ 211vcard/FloatValue.cpp \
210vcard/TextListValue.cpp 212vcard/TextListValue.cpp
211 213
212 214
213# plugins/ldap/resourceldap.cpp \ 215# plugins/ldap/resourceldap.cpp \
214# plugins/ldap/resourceldapconfig.cpp \ 216# plugins/ldap/resourceldapconfig.cpp \
215 217
216#formats/binary/binaryformat.cpp \ 218#formats/binary/binaryformat.cpp \
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 1667400..4303cab 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1,215 +1,215 @@
1/* 1/*
2 This file is part of KAddressbook. 2 This file is part of KAddressbook.
3 Copyright (c) 2003 Tobias Koenig <tokoe@kde.org> 3 Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
4 4
5 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or 7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 8 (at your option) any later version.
9 9
10 This program is distributed in the hope that it will be useful, 10 This program is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details. 13 GNU General Public License for more details.
14 14
15 You should have received a copy of the GNU General Public License 15 You should have received a copy of the GNU General Public License
16 along with this program; if not, write to the Free Software 16 along with this program; if not, write to the Free Software
17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
18 18
19 As a special exception, permission is given to link this program 19 As a special exception, permission is given to link this program
20 with any edition of Qt, and distribute the resulting executable, 20 with any edition of Qt, and distribute the resulting executable,
21 without including the source code for Qt in the source distribution. 21 without including the source code for Qt in the source distribution.
22*/ 22*/
23 23
24#include "kabcore.h" 24#include "kabcore.h"
25 25
26#include <stdaddressbook.h> 26#include <stdaddressbook.h>
27#include <klocale.h> 27#include <klocale.h>
28 28
29#ifndef KAB_EMBEDDED 29#ifndef KAB_EMBEDDED
30#include <qclipboard.h> 30#include <qclipboard.h>
31#include <qdir.h> 31#include <qdir.h>
32#include <qfile.h> 32#include <qfile.h>
33#include <qapplicaton.h> 33#include <qapplicaton.h>
34#include <qlayout.h> 34#include <qlayout.h>
35#include <qregexp.h> 35#include <qregexp.h>
36#include <qvbox.h> 36#include <qvbox.h>
37#include <kabc/addresseelist.h> 37#include <kabc/addresseelist.h>
38#include <kabc/errorhandler.h> 38#include <kabc/errorhandler.h>
39#include <kabc/resource.h> 39#include <kabc/resource.h>
40#include <kabc/vcardconverter.h> 40#include <kabc/vcardconverter.h>
41#include <kapplication.h> 41#include <kapplication.h>
42#include <kactionclasses.h> 42#include <kactionclasses.h>
43#include <kcmultidialog.h> 43#include <kcmultidialog.h>
44#include <kdebug.h> 44#include <kdebug.h>
45#include <kdeversion.h> 45#include <kdeversion.h>
46#include <kkeydialog.h> 46#include <kkeydialog.h>
47#include <kmessagebox.h> 47#include <kmessagebox.h>
48#include <kprinter.h> 48#include <kprinter.h>
49#include <kprotocolinfo.h> 49#include <kprotocolinfo.h>
50#include <kresources/selectdialog.h> 50#include <kresources/selectdialog.h>
51#include <kstandarddirs.h> 51#include <kstandarddirs.h>
52#include <ktempfile.h> 52#include <ktempfile.h>
53#include <kxmlguiclient.h> 53#include <kxmlguiclient.h>
54#include <kaboutdata.h> 54#include <kaboutdata.h>
55#include <libkdepim/categoryselectdialog.h> 55#include <libkdepim/categoryselectdialog.h>
56 56
57#include "addresseeutil.h" 57#include "addresseeutil.h"
58#include "addresseeeditordialog.h" 58#include "addresseeeditordialog.h"
59#include "extensionmanager.h" 59#include "extensionmanager.h"
60#include "kstdaction.h" 60#include "kstdaction.h"
61#include "kaddressbookservice.h" 61#include "kaddressbookservice.h"
62#include "ldapsearchdialog.h" 62#include "ldapsearchdialog.h"
63#include "printing/printingwizard.h" 63#include "printing/printingwizard.h"
64#else // KAB_EMBEDDED 64#else // KAB_EMBEDDED
65 65
66#include <kapplication.h> 66#include <kapplication.h>
67#include "KDGanttMinimizeSplitter.h" 67#include "KDGanttMinimizeSplitter.h"
68#include "kaddressbookmain.h" 68#include "kaddressbookmain.h"
69#include "kactioncollection.h" 69#include "kactioncollection.h"
70#include <qapp.h> 70#include <qapp.h>
71#include <qmenubar.h> 71#include <qmenubar.h>
72//#include <qtoolbar.h> 72//#include <qtoolbar.h>
73#include <qmessagebox.h> 73#include <qmessagebox.h>
74#include <kdebug.h> 74#include <kdebug.h>
75#include <kiconloader.h> // needed for SmallIcon 75#include <kiconloader.h> // needed for SmallIcon
76#include <kresources/kcmkresources.h> 76#include <kresources/kcmkresources.h>
77#include <ktoolbar.h> 77#include <ktoolbar.h>
78 78
79 79
80//#include <qlabel.h> 80//#include <qlabel.h>
81 81
82 82
83#ifdef Q_WS_QWS 83#ifndef DESKTOP_VERSION
84#include <qtopia/services.h> 84#include <qtopia/services.h>
85#include <qtopia/qcopenvelope_qws.h> 85#include <qtopia/qcopenvelope_qws.h>
86#endif
87#include <qpe/ir.h> 86#include <qpe/ir.h>
87#endif
88 88
89#endif // KAB_EMBEDDED 89#endif // KAB_EMBEDDED
90#include "kcmconfigs/kcmkabconfig.h" 90#include "kcmconfigs/kcmkabconfig.h"
91#include "kcmconfigs/kcmkdepimconfig.h" 91#include "kcmconfigs/kcmkdepimconfig.h"
92 92
93 93
94#include <kresources/selectdialog.h> 94#include <kresources/selectdialog.h>
95#include <kmessagebox.h> 95#include <kmessagebox.h>
96 96
97#include <picture.h> 97#include <picture.h>
98#include <resource.h> 98#include <resource.h>
99 99
100//US#include <qsplitter.h> 100//US#include <qsplitter.h>
101#include <qmap.h> 101#include <qmap.h>
102#include <qdir.h> 102#include <qdir.h>
103#include <qfile.h> 103#include <qfile.h>
104#include <qvbox.h> 104#include <qvbox.h>
105#include <qlayout.h> 105#include <qlayout.h>
106#include <qclipboard.h> 106#include <qclipboard.h>
107#include <qtextstream.h> 107#include <qtextstream.h>
108 108
109#include <libkdepim/categoryselectdialog.h> 109#include <libkdepim/categoryselectdialog.h>
110#include <kabc/vcardconverter.h> 110#include <kabc/vcardconverter.h>
111 111
112 112
113#include "addresseeutil.h" 113#include "addresseeutil.h"
114#include "undocmds.h" 114#include "undocmds.h"
115#include "addresseeeditordialog.h" 115#include "addresseeeditordialog.h"
116#include "viewmanager.h" 116#include "viewmanager.h"
117#include "details/detailsviewcontainer.h" 117#include "details/detailsviewcontainer.h"
118#include "kabprefs.h" 118#include "kabprefs.h"
119#include "xxportmanager.h" 119#include "xxportmanager.h"
120#include "incsearchwidget.h" 120#include "incsearchwidget.h"
121#include "jumpbuttonbar.h" 121#include "jumpbuttonbar.h"
122#include "extensionmanager.h" 122#include "extensionmanager.h"
123#include "addresseeconfig.h" 123#include "addresseeconfig.h"
124#include <kcmultidialog.h> 124#include <kcmultidialog.h>
125 125
126#ifdef _WIN32_ 126#ifdef _WIN32_
127 127
128#include "kaimportoldialog.h" 128#include "kaimportoldialog.h"
129#endif 129#endif
130 130
131bool pasteWithNewUid = true; 131bool pasteWithNewUid = true;
132 132
133#ifdef KAB_EMBEDDED 133#ifdef KAB_EMBEDDED
134KABCore::KABCore( KAddressBookMain *client, bool readWrite, QWidget *parent, const char *name ) 134KABCore::KABCore( KAddressBookMain *client, bool readWrite, QWidget *parent, const char *name )
135 : QWidget( parent, name ), mGUIClient( client ), mViewManager( 0 ), 135 : QWidget( parent, name ), mGUIClient( client ), mViewManager( 0 ),
136 mExtensionManager( 0 ),mConfigureDialog( 0 ),/*US mLdapSearchDialog( 0 ),*/ 136 mExtensionManager( 0 ),mConfigureDialog( 0 ),/*US mLdapSearchDialog( 0 ),*/
137 mReadWrite( readWrite ), mModified( false ), mMainWindow(client) 137 mReadWrite( readWrite ), mModified( false ), mMainWindow(client)
138#else //KAB_EMBEDDED 138#else //KAB_EMBEDDED
139KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const char *name ) 139KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const char *name )
140 : QWidget( parent, name ), mGUIClient( client ), mViewManager( 0 ), 140 : QWidget( parent, name ), mGUIClient( client ), mViewManager( 0 ),
141 mExtensionManager( 0 ), mConfigureDialog( 0 ), mLdapSearchDialog( 0 ), 141 mExtensionManager( 0 ), mConfigureDialog( 0 ), mLdapSearchDialog( 0 ),
142 mReadWrite( readWrite ), mModified( false ) 142 mReadWrite( readWrite ), mModified( false )
143#endif //KAB_EMBEDDED 143#endif //KAB_EMBEDDED
144{ 144{
145 145
146 mExtensionBarSplitter = 0; 146 mExtensionBarSplitter = 0;
147 mIsPart = !parent->inherits( "KAddressBookMain" ); 147 mIsPart = !parent->inherits( "KAddressBookMain" );
148 148
149 mAddressBook = KABC::StdAddressBook::self(); 149 mAddressBook = KABC::StdAddressBook::self();
150 KABC::StdAddressBook::setAutomaticSave( false ); 150 KABC::StdAddressBook::setAutomaticSave( false );
151 151
152#ifndef KAB_EMBEDDED 152#ifndef KAB_EMBEDDED
153 mAddressBook->setErrorHandler( new KABC::GUIErrorHandler ); 153 mAddressBook->setErrorHandler( new KABC::GUIErrorHandler );
154#endif //KAB_EMBEDDED 154#endif //KAB_EMBEDDED
155 155
156 connect( mAddressBook, SIGNAL( addressBookChanged( AddressBook * ) ), 156 connect( mAddressBook, SIGNAL( addressBookChanged( AddressBook * ) ),
157 SLOT( addressBookChanged() ) ); 157 SLOT( addressBookChanged() ) );
158 158
159 mAddressBook->addCustomField( i18n( "Department" ), KABC::Field::Organization, 159 mAddressBook->addCustomField( i18n( "Department" ), KABC::Field::Organization,
160 "X-Department", "KADDRESSBOOK" ); 160 "X-Department", "KADDRESSBOOK" );
161 mAddressBook->addCustomField( i18n( "Profession" ), KABC::Field::Organization, 161 mAddressBook->addCustomField( i18n( "Profession" ), KABC::Field::Organization,
162 "X-Profession", "KADDRESSBOOK" ); 162 "X-Profession", "KADDRESSBOOK" );
163 mAddressBook->addCustomField( i18n( "Assistant's Name" ), KABC::Field::Organization, 163 mAddressBook->addCustomField( i18n( "Assistant's Name" ), KABC::Field::Organization,
164 "X-AssistantsName", "KADDRESSBOOK" ); 164 "X-AssistantsName", "KADDRESSBOOK" );
165 mAddressBook->addCustomField( i18n( "Manager's Name" ), KABC::Field::Organization, 165 mAddressBook->addCustomField( i18n( "Manager's Name" ), KABC::Field::Organization,
166 "X-ManagersName", "KADDRESSBOOK" ); 166 "X-ManagersName", "KADDRESSBOOK" );
167 mAddressBook->addCustomField( i18n( "Spouse's Name" ), KABC::Field::Personal, 167 mAddressBook->addCustomField( i18n( "Spouse's Name" ), KABC::Field::Personal,
168 "X-SpousesName", "KADDRESSBOOK" ); 168 "X-SpousesName", "KADDRESSBOOK" );
169 mAddressBook->addCustomField( i18n( "Office" ), KABC::Field::Personal, 169 mAddressBook->addCustomField( i18n( "Office" ), KABC::Field::Personal,
170 "X-Office", "KADDRESSBOOK" ); 170 "X-Office", "KADDRESSBOOK" );
171 mAddressBook->addCustomField( i18n( "IM Address" ), KABC::Field::Personal, 171 mAddressBook->addCustomField( i18n( "IM Address" ), KABC::Field::Personal,
172 "X-IMAddress", "KADDRESSBOOK" ); 172 "X-IMAddress", "KADDRESSBOOK" );
173 mAddressBook->addCustomField( i18n( "Anniversary" ), KABC::Field::Personal, 173 mAddressBook->addCustomField( i18n( "Anniversary" ), KABC::Field::Personal,
174 "X-Anniversary", "KADDRESSBOOK" ); 174 "X-Anniversary", "KADDRESSBOOK" );
175 175
176 //US added this field to become compatible with Opie/qtopia addressbook 176 //US added this field to become compatible with Opie/qtopia addressbook
177 // values can be "female" or "male" or "". An empty field represents undefined. 177 // values can be "female" or "male" or "". An empty field represents undefined.
178 mAddressBook->addCustomField( i18n( "Gender" ), KABC::Field::Personal, 178 mAddressBook->addCustomField( i18n( "Gender" ), KABC::Field::Personal,
179 "X-Gender", "KADDRESSBOOK" ); 179 "X-Gender", "KADDRESSBOOK" );
180 mAddressBook->addCustomField( i18n( "Children" ), KABC::Field::Personal, 180 mAddressBook->addCustomField( i18n( "Children" ), KABC::Field::Personal,
181 "X-Children", "KADDRESSBOOK" ); 181 "X-Children", "KADDRESSBOOK" );
182 mAddressBook->addCustomField( i18n( "FreeBusyUrl" ), KABC::Field::Personal, 182 mAddressBook->addCustomField( i18n( "FreeBusyUrl" ), KABC::Field::Personal,
183 "X-FreeBusyUrl", "KADDRESSBOOK" ); 183 "X-FreeBusyUrl", "KADDRESSBOOK" );
184 184
185 initGUI(); 185 initGUI();
186 186
187 mIncSearchWidget->setFocus(); 187 mIncSearchWidget->setFocus();
188 188
189 189
190 connect( mViewManager, SIGNAL( selected( const QString& ) ), 190 connect( mViewManager, SIGNAL( selected( const QString& ) ),
191 SLOT( setContactSelected( const QString& ) ) ); 191 SLOT( setContactSelected( const QString& ) ) );
192 connect( mViewManager, SIGNAL( executed( const QString& ) ), 192 connect( mViewManager, SIGNAL( executed( const QString& ) ),
193 SLOT( editContact( const QString& ) ) ); 193 SLOT( editContact( const QString& ) ) );
194 connect( mViewManager, SIGNAL( deleteRequest( ) ), 194 connect( mViewManager, SIGNAL( deleteRequest( ) ),
195 SLOT( deleteContacts( ) ) ); 195 SLOT( deleteContacts( ) ) );
196 connect( mViewManager, SIGNAL( modified() ), 196 connect( mViewManager, SIGNAL( modified() ),
197 SLOT( setModified() ) ); 197 SLOT( setModified() ) );
198 198
199 connect( mExtensionManager, SIGNAL( modified( const KABC::Addressee::List& ) ), this, SLOT( extensionModified( const KABC::Addressee::List& ) ) ); 199 connect( mExtensionManager, SIGNAL( modified( const KABC::Addressee::List& ) ), this, SLOT( extensionModified( const KABC::Addressee::List& ) ) );
200 200
201 connect( mXXPortManager, SIGNAL( modified() ), 201 connect( mXXPortManager, SIGNAL( modified() ),
202 SLOT( setModified() ) ); 202 SLOT( setModified() ) );
203 203
204 connect( mJumpButtonBar, SIGNAL( jumpToLetter( const QString& ) ), 204 connect( mJumpButtonBar, SIGNAL( jumpToLetter( const QString& ) ),
205 SLOT( incrementalSearch( const QString& ) ) ); 205 SLOT( incrementalSearch( const QString& ) ) );
206 connect( mIncSearchWidget, SIGNAL( fieldChanged() ), 206 connect( mIncSearchWidget, SIGNAL( fieldChanged() ),
207 mJumpButtonBar, SLOT( recreateButtons() ) ); 207 mJumpButtonBar, SLOT( recreateButtons() ) );
208 208
209 connect( mDetails, SIGNAL( sendEmail( const QString& ) ), 209 connect( mDetails, SIGNAL( sendEmail( const QString& ) ),
210 SLOT( sendMail( const QString& ) ) ); 210 SLOT( sendMail( const QString& ) ) );
211 211
212#ifndef KAB_EMBEDDED 212#ifndef KAB_EMBEDDED
213 connect( mViewManager, SIGNAL( urlDropped( const KURL& ) ), 213 connect( mViewManager, SIGNAL( urlDropped( const KURL& ) ),
214 mXXPortManager, SLOT( importVCard( const KURL& ) ) ); 214 mXXPortManager, SLOT( importVCard( const KURL& ) ) );
215 215
diff --git a/kaddressbook/kaddressbook.pro b/kaddressbook/kaddressbook.pro
index b57317f..fec2341 100644
--- a/kaddressbook/kaddressbook.pro
+++ b/kaddressbook/kaddressbook.pro
@@ -1,144 +1,147 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG = qt warn_on 2 CONFIG = qt warn_on
3 TARGET = kapi 3 TARGET = kapi
4DESTDIR= ../bin 4DESTDIR= ../bin
5 5
6include( ../variables.pri ) 6include( ../variables.pri )
7 7
8 8
9INCLUDEPATH += . ./details ./features ./xxport ../libkdepim ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../microkde/kresources ../kabc ../ interfaces 9INCLUDEPATH += . ./details ./features ./xxport ../libkdepim ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../microkde/kresources ../kabc ../ interfaces
10DEFINES += KAB_EMBEDDED KAB_NOSPLITTER DESKTOP_VERSION 10DEFINES += KAB_EMBEDDED KAB_NOSPLITTER DESKTOP_VERSION
11 11
12unix : { 12unix : {
13LIBS += ../bin/libmicrokdepim.so 13LIBS += ../bin/libmicrokdepim.so
14LIBS += ../bin/libmicrokde.so 14LIBS += ../bin/libmicrokde.so
15LIBS += ../bin/libmicrokabc.so 15LIBS += ../bin/libmicrokabc.so
16LIBS += ../bin/libmicrokcal.so 16LIBS += ../bin/libmicrokcal.so
17LIBS += ../bin/libmicrogammu.so
18LIBS += -lbluetooth
19LIBS += -lsdp
17LIBS += -lldap 20LIBS += -lldap
18OBJECTS_DIR = obj/unix 21OBJECTS_DIR = obj/unix
19MOC_DIR = moc/unix 22MOC_DIR = moc/unix
20} 23}
21win32: { 24win32: {
22DEFINES += _WIN32_ 25DEFINES += _WIN32_
23LIBS += ../bin/microkdepim.lib 26LIBS += ../bin/microkdepim.lib
24LIBS += ../bin/microkcal.lib 27LIBS += ../bin/microkcal.lib
25LIBS += ../bin/microkde.lib 28LIBS += ../bin/microkde.lib
26LIBS += ../bin/microkabc.lib 29LIBS += ../bin/microkabc.lib
27QMAKE_LINK += /NODEFAULTLIB:LIBC 30QMAKE_LINK += /NODEFAULTLIB:LIBC
28OBJECTS_DIR = obj/win 31OBJECTS_DIR = obj/win
29MOC_DIR = moc/win 32MOC_DIR = moc/win
30LIBS += mfc71u.lib 33LIBS += mfc71u.lib
31} 34}
32 35
33 36
34 37
35 38
36 39
37 40
38 41
39 42
40INTERFACES = \ 43INTERFACES = \
41# filteredit_base.ui \ 44# filteredit_base.ui \
42# kofilterview_base.ui \ 45# kofilterview_base.ui \
43 46
44HEADERS = \ 47HEADERS = \
45features/mergewidget.h \ 48features/mergewidget.h \
46features/distributionlistwidget.h \ 49features/distributionlistwidget.h \
47kcmconfigs/addresseewidget.h \ 50kcmconfigs/addresseewidget.h \
48kcmconfigs/extensionconfigdialog.h \ 51kcmconfigs/extensionconfigdialog.h \
49kcmconfigs/kcmkabconfig.h \ 52kcmconfigs/kcmkabconfig.h \
50kcmconfigs/kabconfigwidget.h \ 53kcmconfigs/kabconfigwidget.h \
51addresseeeditordialog.h \ 54addresseeeditordialog.h \
52addresseeeditorwidget.h \ 55addresseeeditorwidget.h \
53addresseditwidget.h \ 56addresseditwidget.h \
54addresseeconfig.h \ 57addresseeconfig.h \
55addresseeutil.h \ 58addresseeutil.h \
56emaileditwidget.h \ 59emaileditwidget.h \
57filtereditdialog.h \ 60filtereditdialog.h \
58kaddressbookmain.h \ 61kaddressbookmain.h \
59kabprefs.h \ 62kabprefs.h \
60kabcore.h \ 63kabcore.h \
61viewmanager.h \ 64viewmanager.h \
62extensionmanager.h \ 65extensionmanager.h \
63extensionwidget.h \ 66extensionwidget.h \
64kaddressbookview.h \ 67kaddressbookview.h \
65geowidget.h \ 68geowidget.h \
66imagewidget.h \ 69imagewidget.h \
67incsearchwidget.h \ 70incsearchwidget.h \
68jumpbuttonbar.h \ 71jumpbuttonbar.h \
69phoneeditwidget.h \ 72phoneeditwidget.h \
70secrecywidget.h \ 73secrecywidget.h \
71keywidget.h \ 74keywidget.h \
72nameeditdialog.h \ 75nameeditdialog.h \
73filter.h \ 76filter.h \
74addviewdialog.h \ 77addviewdialog.h \
75configurewidget.h \ 78configurewidget.h \
76viewconfigurewidget.h \ 79viewconfigurewidget.h \
77viewconfigurefieldspage.h \ 80viewconfigurefieldspage.h \
78viewconfigurefilterpage.h \ 81viewconfigurefilterpage.h \
79typecombo.h \ 82typecombo.h \
80undo.h \ 83undo.h \
81undocmds.h \ 84undocmds.h \
82xxportmanager.h \ 85xxportmanager.h \
83xxportobject.h \ 86xxportobject.h \
84xxportselectdialog.h \ 87xxportselectdialog.h \
85details/detailsviewcontainer.h \ 88details/detailsviewcontainer.h \
86details/look_basic.h \ 89details/look_basic.h \
87details/look_html.h \ 90details/look_html.h \
88views/kaddressbookiconview.h \ 91views/kaddressbookiconview.h \
89views/kaddressbooktableview.h \ 92views/kaddressbooktableview.h \
90views/kaddressbookcardview.h \ 93views/kaddressbookcardview.h \
91views/configuretableviewdialog.h \ 94views/configuretableviewdialog.h \
92views/configurecardviewdialog.h \ 95views/configurecardviewdialog.h \
93views/cardview.h \ 96views/cardview.h \
94views/colorlistbox.h \ 97views/colorlistbox.h \
95views/contactlistview.h \ 98views/contactlistview.h \
96xxport/vcard_xxport.h \ 99xxport/vcard_xxport.h \
97xxport/kde2_xxport.h \ 100xxport/kde2_xxport.h \
98xxport/csv_xxport.h \ 101xxport/csv_xxport.h \
99xxport/csvimportdialog.h \ 102xxport/csvimportdialog.h \
100xxport/opie_xxport.h \ 103xxport/opie_xxport.h \
101xxport/qtopia_xxport.h \ 104xxport/qtopia_xxport.h \
102xxport/sharpdtm_xxport.h \ 105xxport/sharpdtm_xxport.h \
103#details/look_details.h \ 106#details/look_details.h \
104#mainwindoiw.h \ 107#mainwindoiw.h \
105# alarmclient.h \ 108# alarmclient.h \
106# calendarview.h \ 109# calendarview.h \
107# customlistviewitem.h \ 110# customlistviewitem.h \
108# datenavigator.h 111# datenavigator.h
109 112
110SOURCES = \ 113SOURCES = \
111addresseeeditordialog.cpp \ 114addresseeeditordialog.cpp \
112addresseeeditorwidget.cpp \ 115addresseeeditorwidget.cpp \
113addresseditwidget.cpp \ 116addresseditwidget.cpp \
114addresseeconfig.cpp \ 117addresseeconfig.cpp \
115addresseeutil.cpp \ 118addresseeutil.cpp \
116extensionmanager.cpp \ 119extensionmanager.cpp \
117features/mergewidget.cpp \ 120features/mergewidget.cpp \
118features/distributionlistwidget.cpp \ 121features/distributionlistwidget.cpp \
119kcmconfigs/addresseewidget.cpp \ 122kcmconfigs/addresseewidget.cpp \
120kcmconfigs/extensionconfigdialog.cpp \ 123kcmconfigs/extensionconfigdialog.cpp \
121kcmconfigs/kcmkabconfig.cpp \ 124kcmconfigs/kcmkabconfig.cpp \
122kcmconfigs/kabconfigwidget.cpp \ 125kcmconfigs/kabconfigwidget.cpp \
123emaileditwidget.cpp \ 126emaileditwidget.cpp \
124filtereditdialog.cpp \ 127filtereditdialog.cpp \
125mainembedded.cpp \ 128mainembedded.cpp \
126kaddressbookmain.cpp \ 129kaddressbookmain.cpp \
127kabcore.cpp \ 130kabcore.cpp \
128kabprefs.cpp \ 131kabprefs.cpp \
129viewmanager.cpp \ 132viewmanager.cpp \
130kaddressbookview.cpp \ 133kaddressbookview.cpp \
131extensionwidget.cpp \ 134extensionwidget.cpp \
132geowidget.cpp \ 135geowidget.cpp \
133imagewidget.cpp \ 136imagewidget.cpp \
134incsearchwidget.cpp \ 137incsearchwidget.cpp \
135jumpbuttonbar.cpp \ 138jumpbuttonbar.cpp \
136phoneeditwidget.cpp \ 139phoneeditwidget.cpp \
137secrecywidget.cpp \ 140secrecywidget.cpp \
138keywidget.cpp \ 141keywidget.cpp \
139nameeditdialog.cpp \ 142nameeditdialog.cpp \
140filter.cpp \ 143filter.cpp \
141addviewdialog.cpp \ 144addviewdialog.cpp \
142configurewidget.cpp \ 145configurewidget.cpp \
143viewconfigurewidget.cpp \ 146viewconfigurewidget.cpp \
144viewconfigurefieldspage.cpp \ 147viewconfigurefieldspage.cpp \
diff --git a/kopi-desktop.pro b/kopi-desktop.pro
index b255756..69c874f 100644
--- a/kopi-desktop.pro
+++ b/kopi-desktop.pro
@@ -1,6 +1,6 @@
1 1
2 2
3TEMPLATE = subdirs 3TEMPLATE = subdirs
4SUBDIRS = libical libkcal microkde libkdepim kabc korganizer kaddressbook kabc/plugins/file kabc/plugins/dir 4SUBDIRS = gammu/emb/common libical libkcal microkde libkdepim kabc korganizer kaddressbook kabc/plugins/file kabc/plugins/dir
5#kalarmd 5#kalarmd
6 6
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 042046e..0db8e6d 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -1,159 +1,160 @@
1/* 1/*
2 This file is part of KOrganizer. 2 This file is part of KOrganizer.
3 Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> 3 Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
4 4
5 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or 7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 8 (at your option) any later version.
9 9
10 This program is distributed in the hope that it will be useful, 10 This program is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details. 13 GNU General Public License for more details.
14 14
15 You should have received a copy of the GNU General Public License 15 You should have received a copy of the GNU General Public License
16 along with this program; if not, write to the Free Software 16 along with this program; if not, write to the Free Software
17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
18 18
19 As a special exception, permission is given to link this program 19 As a special exception, permission is given to link this program
20 with any edition of Qt, and distribute the resulting executable, 20 with any edition of Qt, and distribute the resulting executable,
21 without including the source code for Qt in the source distribution. 21 without including the source code for Qt in the source distribution.
22*/ 22*/
23 23
24#include <time.h> 24#include <time.h>
25#ifndef _WIN32_ 25#ifndef _WIN32_
26#include <unistd.h> 26#include <unistd.h>
27#endif 27#endif
28#include <qdir.h> 28#include <qdir.h>
29#include <qtextstream.h> 29#include <qtextstream.h>
30#include <qtextcodec.h> 30#include <qtextcodec.h>
31#include <qstring.h> 31#include <qstring.h>
32#include <qregexp.h>
32#include <qfont.h> 33#include <qfont.h>
33#include <qcolor.h> 34#include <qcolor.h>
34#include <qstringlist.h> 35#include <qstringlist.h>
35#include <stdlib.h> 36#include <stdlib.h>
36 37
37#include <kglobal.h> 38#include <kglobal.h>
38#include <kconfig.h> 39#include <kconfig.h>
39#include <klocale.h> 40#include <klocale.h>
40#include <kdebug.h> 41#include <kdebug.h>
41#include <kemailsettings.h> 42#include <kemailsettings.h>
42#include <kstaticdeleter.h> 43#include <kstaticdeleter.h>
43 44
44#include "koprefs.h" 45#include "koprefs.h"
45#include "mainwindow.h" 46#include "mainwindow.h"
46 47
47const char *germanwords[][2] = { 48const char *germanwords[][2] = {
48#include "wordsgerman.h" 49#include "wordsgerman.h"
49 "", "" 50 "", ""
50}; 51};
51 52
52KOPrefs *KOPrefs::mInstance = 0; 53KOPrefs *KOPrefs::mInstance = 0;
53static KStaticDeleter<KOPrefs> insd; 54static KStaticDeleter<KOPrefs> insd;
54 55
55KOPrefs::KOPrefs() : 56KOPrefs::KOPrefs() :
56 KPimPrefs("korganizerrc") 57 KPimPrefs("korganizerrc")
57{ 58{
58 mCategoryColors.setAutoDelete(true); 59 mCategoryColors.setAutoDelete(true);
59 mLocaleDict = 0; 60 mLocaleDict = 0;
60 fillMailDefaults(); 61 fillMailDefaults();
61 mDefaultCategoryColor = QColor(175,210,255);//196,196,196); 62 mDefaultCategoryColor = QColor(175,210,255);//196,196,196);
62 QColor defaultHolidayColor = QColor(255,0,0); 63 QColor defaultHolidayColor = QColor(255,0,0);
63 QColor defaultHighlightColor = QColor(129,112,255);//64,64,255); 64 QColor defaultHighlightColor = QColor(129,112,255);//64,64,255);
64 QColor defaultAgendaBgColor = QColor(239,241,169);//128,128,128); 65 QColor defaultAgendaBgColor = QColor(239,241,169);//128,128,128);
65 QColor defaultWorkingHoursColor = QColor(170,223,150);//160,160,160); 66 QColor defaultWorkingHoursColor = QColor(170,223,150);//160,160,160);
66 QColor defaultTodoDueTodayColor = QColor(255,220,100); 67 QColor defaultTodoDueTodayColor = QColor(255,220,100);
67 QColor defaultTodoOverdueColor = QColor(255,153,125); 68 QColor defaultTodoOverdueColor = QColor(255,153,125);
68 69
69 mTimeBarFont = QFont("helvetica",10);//,QFont::Bold); 70 mTimeBarFont = QFont("helvetica",10);//,QFont::Bold);
70 mDefaultViewFont = QFont("helvetica",10); 71 mDefaultViewFont = QFont("helvetica",10);
71 mDefaultMonthViewFont = QFont("helvetica",8); 72 mDefaultMonthViewFont = QFont("helvetica",8);
72 mMarcusBainsFont= QFont("helvetica",10); 73 mMarcusBainsFont= QFont("helvetica",10);
73 mDateNavigatorFont= QFont("helvetica",10, QFont::Bold); 74 mDateNavigatorFont= QFont("helvetica",10, QFont::Bold);
74 mEditBoxFont = QFont("helvetica",12); 75 mEditBoxFont = QFont("helvetica",12);
75 mJornalViewFont = QFont("helvetica",12); 76 mJornalViewFont = QFont("helvetica",12);
76 77
77 KPrefs::setCurrentGroup("General"); 78 KPrefs::setCurrentGroup("General");
78 addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false); 79 addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false);
79 80
80 addItemBool("ShowIconNewTodo",&mShowIconNewTodo,true); 81 addItemBool("ShowIconNewTodo",&mShowIconNewTodo,true);
81 addItemBool("ShowIconNewEvent",&mShowIconNewEvent,true); 82 addItemBool("ShowIconNewEvent",&mShowIconNewEvent,true);
82 addItemBool("ShowIconSearch",&mShowIconSearch,true); 83 addItemBool("ShowIconSearch",&mShowIconSearch,true);
83 addItemBool("ShowIconList",&mShowIconList,true); 84 addItemBool("ShowIconList",&mShowIconList,true);
84 addItemBool("ShowIconDay1",&mShowIconDay1,true); 85 addItemBool("ShowIconDay1",&mShowIconDay1,true);
85 addItemBool("ShowIconDay5",&mShowIconDay5,true); 86 addItemBool("ShowIconDay5",&mShowIconDay5,true);
86 addItemBool("ShowIconDay7",&mShowIconDay7,true); 87 addItemBool("ShowIconDay7",&mShowIconDay7,true);
87 addItemBool("ShowIconMonth",&mShowIconMonth,true); 88 addItemBool("ShowIconMonth",&mShowIconMonth,true);
88 addItemBool("ShowIconTodoview",&mShowIconTodoview,true); 89 addItemBool("ShowIconTodoview",&mShowIconTodoview,true);
89 addItemBool("ShowIconBackFast",&mShowIconBackFast,true); 90 addItemBool("ShowIconBackFast",&mShowIconBackFast,true);
90 addItemBool("ShowIconBack",&mShowIconBack,true); 91 addItemBool("ShowIconBack",&mShowIconBack,true);
91 addItemBool("ShowIconToday",&mShowIconToday,true); 92 addItemBool("ShowIconToday",&mShowIconToday,true);
92 addItemBool("ShowIconForward",&mShowIconForward,true); 93 addItemBool("ShowIconForward",&mShowIconForward,true);
93 addItemBool("ShowIconForwardFast",&mShowIconForwardFast,true); 94 addItemBool("ShowIconForwardFast",&mShowIconForwardFast,true);
94 addItemBool("ShowIconWhatsThis",&mShowIconWhatsThis,false); 95 addItemBool("ShowIconWhatsThis",&mShowIconWhatsThis,false);
95 addItemBool("ShowIconNextDays",&mShowIconNextDays,true); 96 addItemBool("ShowIconNextDays",&mShowIconNextDays,true);
96 addItemBool("ShowIconNext",&mShowIconNext,true); 97 addItemBool("ShowIconNext",&mShowIconNext,true);
97 addItemBool("ShowIconJournal",&mShowIconJournal,true); 98 addItemBool("ShowIconJournal",&mShowIconJournal,true);
98 addItemBool("ShowIconStretch",&mShowIconStretch,true); 99 addItemBool("ShowIconStretch",&mShowIconStretch,true);
99 addItemBool("LanguageChanged",&mLanguageChanged,false); 100 addItemBool("LanguageChanged",&mLanguageChanged,false);
100 101
101 addItemBool("AskForQuit",&mAskForQuit,false); 102 addItemBool("AskForQuit",&mAskForQuit,false);
102 103
103#ifndef DESKTOP_VERSION 104#ifndef DESKTOP_VERSION
104 addItemBool("ShowFullMenu",&mShowFullMenu,false); 105 addItemBool("ShowFullMenu",&mShowFullMenu,false);
105#else 106#else
106 addItemBool("ShowFullMenu",&mShowFullMenu,true); 107 addItemBool("ShowFullMenu",&mShowFullMenu,true);
107#endif 108#endif
108 addItemBool("ToolBarHor",&mToolBarHor, true ); 109 addItemBool("ToolBarHor",&mToolBarHor, true );
109 addItemBool("ToolBarUp",&mToolBarUp, false ); 110 addItemBool("ToolBarUp",&mToolBarUp, false );
110 addItemBool("ToolBarMiniIcons",&mToolBarMiniIcons, false ); 111 addItemBool("ToolBarMiniIcons",&mToolBarMiniIcons, false );
111 addItemInt("Whats Next Days",&mWhatsNextDays,3); 112 addItemInt("Whats Next Days",&mWhatsNextDays,3);
112 addItemInt("Whats Next Prios",&mWhatsNextPrios,1); 113 addItemInt("Whats Next Prios",&mWhatsNextPrios,1);
113 114
114 addItemBool("ShowTodoInAgenda",&mShowTodoInAgenda,true); 115 addItemBool("ShowTodoInAgenda",&mShowTodoInAgenda,true);
115 addItemBool("ShowCompletedTodo",&mShowCompletedTodo,true); 116 addItemBool("ShowCompletedTodo",&mShowCompletedTodo,true);
116 addItemInt("AllDay Size",&mAllDaySize,28); 117 addItemInt("AllDay Size",&mAllDaySize,28);
117 QString defAlarm = KGlobal::iconLoader()->iconPath()+"koalarm.wav"; 118 QString defAlarm = KGlobal::iconLoader()->iconPath()+"koalarm.wav";
118 addItemString("DefaultAlarmFile",&mDefaultAlarmFile,defAlarm ); 119 addItemString("DefaultAlarmFile",&mDefaultAlarmFile,defAlarm );
119 120
120 addItemStringList("LocationDefaults",&mLocationDefaults ); 121 addItemStringList("LocationDefaults",&mLocationDefaults );
121 addItemStringList("EventSummary User",&mEventSummaryUser); 122 addItemStringList("EventSummary User",&mEventSummaryUser);
122 addItemStringList("TodoSummary User",&mTodoSummaryUser); 123 addItemStringList("TodoSummary User",&mTodoSummaryUser);
123 124
124 addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false); 125 addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false);
125 addItemBool("Enable Project View",&mEnableProjectView,false); 126 addItemBool("Enable Project View",&mEnableProjectView,false);
126 addItemBool("Auto Save",&mAutoSave,false); 127 addItemBool("Auto Save",&mAutoSave,false);
127 addItemInt("Auto Save Interval",&mAutoSaveInterval,3); 128 addItemInt("Auto Save Interval",&mAutoSaveInterval,3);
128 addItemBool("Confirm Deletes",&mConfirm,true); 129 addItemBool("Confirm Deletes",&mConfirm,true);
129 addItemString("Archive File",&mArchiveFile); 130 addItemString("Archive File",&mArchiveFile);
130 addItemString("Html Export File",&mHtmlExportFile, 131 addItemString("Html Export File",&mHtmlExportFile,
131 QDir::homeDirPath() + "/" + i18n("Default export file", "calendar.html")); 132 QDir::homeDirPath() + "/" + i18n("Default export file", "calendar.html"));
132 addItemBool("Html With Save",&mHtmlWithSave,false); 133 addItemBool("Html With Save",&mHtmlWithSave,false);
133 134
134 KPrefs::setCurrentGroup("Personal Settings"); 135 KPrefs::setCurrentGroup("Personal Settings");
135 136
136 addItemInt("Mail Client",&mMailClient,MailClientKMail); 137 addItemInt("Mail Client",&mMailClient,MailClientKMail);
137 addItemBool("Use Control Center Email",&mEmailControlCenter,false); 138 addItemBool("Use Control Center Email",&mEmailControlCenter,false);
138 addItemBool("Bcc",&mBcc,false); 139 addItemBool("Bcc",&mBcc,false);
139 140
140 KPrefs::setCurrentGroup("Time & Date"); 141 KPrefs::setCurrentGroup("Time & Date");
141 142
142 // addItemString("Time Zone",&mTimeZone,"+0100"); 143 // addItemString("Time Zone",&mTimeZone,"+0100");
143 addItemString("TimeZoneName",&mTimeZoneId,i18n ("+01:00 Europe/Oslo(CET)") ); 144 addItemString("TimeZoneName",&mTimeZoneId,i18n ("+01:00 Europe/Oslo(CET)") );
144 // addItemInt("TimeZoneOffset",&mTimeZoneOffset,60); 145 // addItemInt("TimeZoneOffset",&mTimeZoneOffset,60);
145 addItemBool("UseDaylightsaving",&mUseDaylightsaving,true); 146 addItemBool("UseDaylightsaving",&mUseDaylightsaving,true);
146 addItemInt("DaylightsavingStart",&mDaylightsavingStart,90); 147 addItemInt("DaylightsavingStart",&mDaylightsavingStart,90);
147 addItemInt("DaylightsavingEnd",&mDaylightsavingEnd,304); 148 addItemInt("DaylightsavingEnd",&mDaylightsavingEnd,304);
148 149
149 150
150 addItemInt("Default Start Time",&mStartTime,10); 151 addItemInt("Default Start Time",&mStartTime,10);
151 addItemInt("Default Duration",&mDefaultDuration,2); 152 addItemInt("Default Duration",&mDefaultDuration,2);
152 addItemInt("Default Alarm Time",&mAlarmTime,3); 153 addItemInt("Default Alarm Time",&mAlarmTime,3);
153 addItemInt("Daylight Savings",&mDaylightSavings,0); 154 addItemInt("Daylight Savings",&mDaylightSavings,0);
154 KPrefs::setCurrentGroup("AlarmSettings"); 155 KPrefs::setCurrentGroup("AlarmSettings");
155 addItemInt("AlarmPlayBeeps",&mAlarmPlayBeeps,20); 156 addItemInt("AlarmPlayBeeps",&mAlarmPlayBeeps,20);
156 addItemInt("AlarmSuspendTime",&mAlarmSuspendTime,7); 157 addItemInt("AlarmSuspendTime",&mAlarmSuspendTime,7);
157 addItemInt("AlarmSuspendCount",&mAlarmSuspendCount,5); 158 addItemInt("AlarmSuspendCount",&mAlarmSuspendCount,5);
158 addItemInt("AlarmBeepInterval",&mAlarmBeepInterval,3); 159 addItemInt("AlarmBeepInterval",&mAlarmBeepInterval,3);
159 160
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro
index 02e608c..e501d88 100644
--- a/korganizer/korganizer.pro
+++ b/korganizer/korganizer.pro
@@ -1,149 +1,153 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG = qt warn_on 2 CONFIG = qt warn_on
3 TARGET = kopi 3 TARGET = kopi
4OBJECTS_DIR = _obj/ 4OBJECTS_DIR = _obj/
5MOC_DIR = _moc 5MOC_DIR = _moc
6DESTDIR= ../bin 6DESTDIR= ../bin
7 7
8include( ../variables.pri ) 8include( ../variables.pri )
9 9
10INCLUDEPATH += ../microkde ../ interfaces ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../microkde/kio/kio 10INCLUDEPATH += ../microkde ../ interfaces ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../microkde/kio/kio
11#../qtcompat 11#../qtcompat
12DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL 12DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL
13DEFINES += KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER 13DEFINES += KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER
14#KORG_NOPRINTER KORG_NOKABC 14#KORG_NOPRINTER KORG_NOKABC
15DEFINES += KORG_NOLVALTERNATION 15DEFINES += KORG_NOLVALTERNATION
16DEFINES += DESKTOP_VERSION 16DEFINES += DESKTOP_VERSION
17unix : { 17unix : {
18LIBS += ../bin/libmicrokdepim.so 18LIBS += ../bin/libmicrokdepim.so
19LIBS += ../bin/libmicrokcal.so 19LIBS += ../bin/libmicrokcal.so
20LIBS += ../bin/libmicrokde.so 20LIBS += ../bin/libmicrokde.so
21LIBS += ../bin/libmicrokabc.so 21LIBS += ../bin/libmicrokabc.so
22LIBS += ../bin/libmicrogammu.so
23LIBS += -lbluetooth
24LIBS += -lsdp
25
22LIBS += -lldap 26LIBS += -lldap
23OBJECTS_DIR = obj/unix 27OBJECTS_DIR = obj/unix
24MOC_DIR = moc/unix 28MOC_DIR = moc/unix
25} 29}
26win32: { 30win32: {
27DEFINES += _WIN32_ 31DEFINES += _WIN32_
28LIBS += ../bin/microkdepim.lib 32LIBS += ../bin/microkdepim.lib
29LIBS += ../bin/microkcal.lib 33LIBS += ../bin/microkcal.lib
30LIBS += ../bin/microkde.lib 34LIBS += ../bin/microkde.lib
31LIBS += ../bin/microkabc.lib 35LIBS += ../bin/microkabc.lib
32LIBS += ../libical/lib/ical.lib 36LIBS += ../libical/lib/ical.lib
33LIBS += ../libical/lib/icalss.lib 37LIBS += ../libical/lib/icalss.lib
34#LIBS += atls.lib 38#LIBS += atls.lib
35LIBS += mfc71u.lib 39LIBS += mfc71u.lib
36QMAKE_LINK += /NODEFAULTLIB:LIBC 40QMAKE_LINK += /NODEFAULTLIB:LIBC
37#QMAKE_LINK += /NODEFAULTLIB:MSVCRT 41#QMAKE_LINK += /NODEFAULTLIB:MSVCRT
38#QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib 42#QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib
39OBJECTS_DIR = obj/win 43OBJECTS_DIR = obj/win
40MOC_DIR = moc/win 44MOC_DIR = moc/win
41} 45}
42 46
43 47
44INTERFACES = kofilterview_base.ui 48INTERFACES = kofilterview_base.ui
45# filteredit_base.ui 49# filteredit_base.ui
46 50
47# kdateedit.h \ 51# kdateedit.h \
48 52
49HEADERS = \ 53HEADERS = \
50 filteredit_base.h \ 54 filteredit_base.h \
51 alarmclient.h \ 55 alarmclient.h \
52 calendarview.h \ 56 calendarview.h \
53 customlistviewitem.h \ 57 customlistviewitem.h \
54 datenavigator.h \ 58 datenavigator.h \
55 docprefs.h \ 59 docprefs.h \
56 filtereditdialog.h \ 60 filtereditdialog.h \
57 incomingdialog.h \ 61 incomingdialog.h \
58 incomingdialog_base.h \ 62 incomingdialog_base.h \
59 interfaces/korganizer/baseview.h \ 63 interfaces/korganizer/baseview.h \
60 interfaces/korganizer/calendarviewbase.h \ 64 interfaces/korganizer/calendarviewbase.h \
61 journalentry.h \ 65 journalentry.h \
62 kdatenavigator.h \ 66 kdatenavigator.h \
63 koagenda.h \ 67 koagenda.h \
64 koagendaitem.h \ 68 koagendaitem.h \
65 koagendaview.h \ 69 koagendaview.h \
66 kocounterdialog.h \ 70 kocounterdialog.h \
67 kodaymatrix.h \ 71 kodaymatrix.h \
68 kodialogmanager.h \ 72 kodialogmanager.h \
69 koeditordetails.h \ 73 koeditordetails.h \
70 koeditorgeneral.h \ 74 koeditorgeneral.h \
71 koeditorgeneralevent.h \ 75 koeditorgeneralevent.h \
72 koeditorgeneraltodo.h \ 76 koeditorgeneraltodo.h \
73 koeditorrecurrence.h \ 77 koeditorrecurrence.h \
74 koeventeditor.h \ 78 koeventeditor.h \
75 koeventpopupmenu.h \ 79 koeventpopupmenu.h \
76 koeventview.h \ 80 koeventview.h \
77 koeventviewer.h \ 81 koeventviewer.h \
78 koeventviewerdialog.h \ 82 koeventviewerdialog.h \
79 kofilterview.h \ 83 kofilterview.h \
80 koglobals.h \ 84 koglobals.h \
81 koincidenceeditor.h \ 85 koincidenceeditor.h \
82 kojournalview.h \ 86 kojournalview.h \
83 kolistview.h \ 87 kolistview.h \
84 kolocationbox.h \ 88 kolocationbox.h \
85 komonthview.h \ 89 komonthview.h \
86 koprefs.h \ 90 koprefs.h \
87 koprefsdialog.h \ 91 koprefsdialog.h \
88 kotimespanview.h \ 92 kotimespanview.h \
89 kotodoeditor.h \ 93 kotodoeditor.h \
90 kotodoview.h \ 94 kotodoview.h \
91 kotodoviewitem.h \ 95 kotodoviewitem.h \
92 koviewmanager.h \ 96 koviewmanager.h \
93 kowhatsnextview.h \ 97 kowhatsnextview.h \
94 ktimeedit.h \ 98 ktimeedit.h \
95 lineview.h \ 99 lineview.h \
96 mainwindow.h \ 100 mainwindow.h \
97 navigatorbar.h \ 101 navigatorbar.h \
98 outgoingdialog.h \ 102 outgoingdialog.h \
99 outgoingdialog_base.h \ 103 outgoingdialog_base.h \
100 publishdialog.h \ 104 publishdialog.h \
101 publishdialog_base.h \ 105 publishdialog_base.h \
102 savetemplatedialog.h \ 106 savetemplatedialog.h \
103 searchdialog.h \ 107 searchdialog.h \
104 simplealarmclient.h \ 108 simplealarmclient.h \
105 statusdialog.h \ 109 statusdialog.h \
106 timeline.h \ 110 timeline.h \
107 timespanview.h \ 111 timespanview.h \
108 version.h \ 112 version.h \
109 ../kalarmd/alarmdialog.h \ 113 ../kalarmd/alarmdialog.h \
110 114
111 115
112SOURCES = \ 116SOURCES = \
113filteredit_base.cpp \ 117filteredit_base.cpp \
114 calendarview.cpp \ 118 calendarview.cpp \
115 datenavigator.cpp \ 119 datenavigator.cpp \
116 docprefs.cpp \ 120 docprefs.cpp \
117 filtereditdialog.cpp \ 121 filtereditdialog.cpp \
118 incomingdialog.cpp \ 122 incomingdialog.cpp \
119 incomingdialog_base.cpp \ 123 incomingdialog_base.cpp \
120 journalentry.cpp \ 124 journalentry.cpp \
121 kdatenavigator.cpp \ 125 kdatenavigator.cpp \
122 koagenda.cpp \ 126 koagenda.cpp \
123 koagendaitem.cpp \ 127 koagendaitem.cpp \
124 koagendaview.cpp \ 128 koagendaview.cpp \
125 kocounterdialog.cpp \ 129 kocounterdialog.cpp \
126 kodaymatrix.cpp \ 130 kodaymatrix.cpp \
127 kodialogmanager.cpp \ 131 kodialogmanager.cpp \
128 koeditordetails.cpp \ 132 koeditordetails.cpp \
129 koeditorgeneral.cpp \ 133 koeditorgeneral.cpp \
130 koeditorgeneralevent.cpp \ 134 koeditorgeneralevent.cpp \
131 koeditorgeneraltodo.cpp \ 135 koeditorgeneraltodo.cpp \
132 koeditorrecurrence.cpp \ 136 koeditorrecurrence.cpp \
133 koeventeditor.cpp \ 137 koeventeditor.cpp \
134 koeventpopupmenu.cpp \ 138 koeventpopupmenu.cpp \
135 koeventview.cpp \ 139 koeventview.cpp \
136 koeventviewer.cpp \ 140 koeventviewer.cpp \
137 koeventviewerdialog.cpp \ 141 koeventviewerdialog.cpp \
138 kofilterview.cpp \ 142 kofilterview.cpp \
139 koglobals.cpp \ 143 koglobals.cpp \
140 koincidenceeditor.cpp \ 144 koincidenceeditor.cpp \
141 kojournalview.cpp \ 145 kojournalview.cpp \
142 kolistview.cpp \ 146 kolistview.cpp \
143 kolocationbox.cpp \ 147 kolocationbox.cpp \
144 komonthview.cpp \ 148 komonthview.cpp \
145 koprefs.cpp \ 149 koprefs.cpp \
146 koprefsdialog.cpp \ 150 koprefsdialog.cpp \
147 kotimespanview.cpp \ 151 kotimespanview.cpp \
148 kotodoeditor.cpp \ 152 kotodoeditor.cpp \
149 kotodoview.cpp \ 153 kotodoview.cpp \
diff --git a/libkcal/libkcal.pro b/libkcal/libkcal.pro
index 49aa24b..d02f080 100644
--- a/libkcal/libkcal.pro
+++ b/libkcal/libkcal.pro
@@ -1,100 +1,104 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt warn_on 2 CONFIG += qt warn_on
3 TARGET = microkcal 3 TARGET = microkcal
4 4
5include( ../variables.pri ) 5include( ../variables.pri )
6 6
7INCLUDEPATH += ../microkde versit ../microkde/kdecore 7INCLUDEPATH += ../microkde versit ../microkde/kdecore
8#../qtcompat 8#../qtcompat
9INCLUDEPATH += ../libical/src/libical 9INCLUDEPATH += ../libical/src/libical
10INCLUDEPATH += ../libical/src/libicalss 10INCLUDEPATH += ../libical/src/libicalss
11DESTDIR = ../bin 11DESTDIR = ../bin
12DEFINES += DESKTOP_VERSION 12DEFINES += DESKTOP_VERSION
13unix: { 13unix: {
14LIBS += ../libical/lib/libical.a 14LIBS += ../libical/lib/libical.a
15LIBS += ../libical/lib/libicalss.a 15LIBS += ../libical/lib/libicalss.a
16OBJECTS_DIR = obj/unix 16OBJECTS_DIR = obj/unix
17MOC_DIR = moc/unix 17MOC_DIR = moc/unix
18} 18}
19win32: { 19win32: {
20DEFINES += _WIN32_ 20DEFINES += _WIN32_
21 21
22LIBS += ../libical/lib/ical.lib 22LIBS += ../libical/lib/ical.lib
23LIBS += ../libical/lib/icalss.lib 23LIBS += ../libical/lib/icalss.lib
24OBJECTS_DIR = obj/win 24OBJECTS_DIR = obj/win
25MOC_DIR = moc/win 25MOC_DIR = moc/win
26 26
27} 27}
28 28
29INTERFACES = \ 29INTERFACES = \
30 30
31HEADERS = \ 31HEADERS = \
32 alarm.h \ 32 alarm.h \
33 attachment.h \ 33 attachment.h \
34 attendee.h \ 34 attendee.h \
35 calendar.h \ 35 calendar.h \
36 calendarlocal.h \ 36 calendarlocal.h \
37 calfilter.h \ 37 calfilter.h \
38 calformat.h \ 38 calformat.h \
39 calstorage.h \ 39 calstorage.h \
40 compat.h \ 40 compat.h \
41 customproperties.h \ 41 customproperties.h \
42 dummyscheduler.h \ 42 dummyscheduler.h \
43 duration.h \ 43 duration.h \
44 event.h \ 44 event.h \
45 exceptions.h \ 45 exceptions.h \
46 filestorage.h \ 46 filestorage.h \
47 freebusy.h \ 47 freebusy.h \
48 icaldrag.h \ 48 icaldrag.h \
49 icalformat.h \ 49 icalformat.h \
50 icalformatimpl.h \ 50 icalformatimpl.h \
51 imipscheduler.h \ 51 imipscheduler.h \
52 incidence.h \ 52 incidence.h \
53 incidencebase.h \ 53 incidencebase.h \
54 journal.h \ 54 journal.h \
55 period.h \ 55 period.h \
56 person.h \ 56 person.h \
57 qtopiaformat.h \ 57 qtopiaformat.h \
58 recurrence.h \ 58 recurrence.h \
59 scheduler.h \ 59 scheduler.h \
60 todo.h \ 60 todo.h \
61 vcaldrag.h \ 61 vcaldrag.h \
62 vcalformat.h \ 62 vcalformat.h \
63 versit/port.h \ 63 versit/port.h \
64 versit/vcc.h \ 64 versit/vcc.h \
65 versit/vobject.h \ 65 versit/vobject.h \
66 phoneformat.h \
67
68
66 69
67SOURCES = \ 70SOURCES = \
68 alarm.cpp \ 71 alarm.cpp \
69 attachment.cpp \ 72 attachment.cpp \
70 attendee.cpp \ 73 attendee.cpp \
71 calendar.cpp \ 74 calendar.cpp \
72 calendarlocal.cpp \ 75 calendarlocal.cpp \
73 calfilter.cpp \ 76 calfilter.cpp \
74 calformat.cpp \ 77 calformat.cpp \
75 compat.cpp \ 78 compat.cpp \
76 customproperties.cpp \ 79 customproperties.cpp \
77 dummyscheduler.cpp \ 80 dummyscheduler.cpp \
78 duration.cpp \ 81 duration.cpp \
79 event.cpp \ 82 event.cpp \
80 exceptions.cpp \ 83 exceptions.cpp \
81 filestorage.cpp \ 84 filestorage.cpp \
82 freebusy.cpp \ 85 freebusy.cpp \
83 icaldrag.cpp \ 86 icaldrag.cpp \
84 icalformat.cpp \ 87 icalformat.cpp \
85 icalformatimpl.cpp \ 88 icalformatimpl.cpp \
86 imipscheduler.cpp \ 89 imipscheduler.cpp \
87 incidence.cpp \ 90 incidence.cpp \
88 incidencebase.cpp \ 91 incidencebase.cpp \
89 journal.cpp \ 92 journal.cpp \
90 period.cpp \ 93 period.cpp \
91 person.cpp \ 94 person.cpp \
92 qtopiaformat.cpp \ 95 qtopiaformat.cpp \
93 recurrence.cpp \ 96 recurrence.cpp \
94 scheduler.cpp \ 97 scheduler.cpp \
95 todo.cpp \ 98 todo.cpp \
96 vcaldrag.cpp \ 99 vcaldrag.cpp \
97 vcalformat.cpp \ 100 vcalformat.cpp \
98 versit/vcc.c \ 101 versit/vcc.c \
99 versit/vobject.c \ 102 versit/vobject.c \
103 phoneformat.cpp \
100 104
diff --git a/microkde/microkde.pro b/microkde/microkde.pro
index 4ebf53c..f9adfb1 100644
--- a/microkde/microkde.pro
+++ b/microkde/microkde.pro
@@ -1,171 +1,177 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt warn_on 2 CONFIG += qt warn_on
3#INCLUDEPATH += $(QTDIR)/include . 3#INCLUDEPATH += $(QTDIR)/include .
4#DEPENDPATH += $(QTDIR)/include 4#DEPENDPATH += $(QTDIR)/include
5INCLUDEPATH += . ../ ../kabc ./kdecore ./kdeui ./kio/kfile ./kio/kio 5INCLUDEPATH += . ../ ../kabc ./kdecore ./kdeui ./kio/kfile ./kio/kio
6#LIBS += -lqtcompat 6#LIBS += -lqtcompat
7 7
8 TARGET = microkde 8 TARGET = microkde
9DESTDIR= ../bin 9DESTDIR= ../bin
10DEFINES += DESKTOP_VERSION KDE_QT_ONLY 10DEFINES += DESKTOP_VERSION KDE_QT_ONLY
11unix : { 11unix : {
12OBJECTS_DIR = obj/unix 12OBJECTS_DIR = obj/unix
13MOC_DIR = moc/unix 13MOC_DIR = moc/unix
14} 14}
15win32: { 15win32: {
16DEFINES += _WIN32_ 16DEFINES += _WIN32_
17OBJECTS_DIR = obj/win 17OBJECTS_DIR = obj/win
18MOC_DIR = moc/win 18MOC_DIR = moc/win
19} 19}
20include( ../variables.pri ) 20include( ../variables.pri )
21 21
22 22
23 23
24HEADERS = \ 24HEADERS = \
25qlayoutengine_p.h \ 25qlayoutengine_p.h \
26KDGanttMinimizeSplitter.h \ 26KDGanttMinimizeSplitter.h \
27 kapplication.h \ 27 kapplication.h \
28 kaudioplayer.h \ 28 kaudioplayer.h \
29 kcalendarsystem.h \ 29 kcalendarsystem.h \
30 kcalendarsystemgregorian.h \ 30 kcalendarsystemgregorian.h \
31 kcolorbutton.h \ 31 kcolorbutton.h \
32 kcolordialog.h \ 32 kcolordialog.h \
33 kcombobox.h \ 33 kcombobox.h \
34 kconfig.h \ 34 kconfig.h \
35 kdatetbl.h \ 35 kdatetbl.h \
36 kdebug.h \ 36 kdebug.h \
37 kdialog.h \ 37 kdialog.h \
38 kdialogbase.h \ 38 kdialogbase.h \
39 kdirwatch.h \ 39 kdirwatch.h \
40 keditlistbox.h \ 40 keditlistbox.h \
41 kemailsettings.h \ 41 kemailsettings.h \
42 kfiledialog.h \ 42 kfiledialog.h \
43 kfontdialog.h \ 43 kfontdialog.h \
44 kglobal.h \ 44 kglobal.h \
45 kglobalsettings.h \ 45 kglobalsettings.h \
46 kiconloader.h \ 46 kiconloader.h \
47 klineedit.h \ 47 klineedit.h \
48 klineeditdlg.h \ 48 klineeditdlg.h \
49 kmessagebox.h \ 49 kmessagebox.h \
50 knotifyclient.h \ 50 knotifyclient.h \
51 kprinter.h \ 51 kprinter.h \
52 kprocess.h \ 52 kprocess.h \
53 krestrictedline.h \ 53 krestrictedline.h \
54 krun.h \ 54 krun.h \
55 ksimpleconfig.h \ 55 ksimpleconfig.h \
56 kstaticdeleter.h \ 56 kstaticdeleter.h \
57 ksystemtray.h \ 57 ksystemtray.h \
58 ktempfile.h \ 58 ktempfile.h \
59 ktextedit.h \ 59 ktextedit.h \
60 kunload.h \ 60 kunload.h \
61 kurl.h \ 61 kurl.h \
62 kdeui/kguiitem.h \ 62 kdeui/kguiitem.h \
63 kdeui/kcmodule.h \ 63 kdeui/kcmodule.h \
64 kdeui/kbuttonbox.h \ 64 kdeui/kbuttonbox.h \
65 kdeui/klistbox.h \ 65 kdeui/klistbox.h \
66 kdeui/klistview.h \ 66 kdeui/klistview.h \
67 kdeui/kjanuswidget.h \ 67 kdeui/kjanuswidget.h \
68 kdeui/kseparator.h \ 68 kdeui/kseparator.h \
69 kdeui/knuminput.h \ 69 kdeui/knuminput.h \
70 kdeui/knumvalidator.h \ 70 kdeui/knumvalidator.h \
71 kdeui/ksqueezedtextlabel.h \ 71 kdeui/ksqueezedtextlabel.h \
72 kio/job.h \ 72 kio/job.h \
73 kio/kio/kdirwatch.h \ 73 kio/kio/kdirwatch.h \
74 kio/kio/kdirwatch_p.h \ 74 kio/kio/kdirwatch_p.h \
75 kio/kfile/kurlrequester.h \ 75 kio/kfile/kurlrequester.h \
76 kresources/resource.h \ 76 kresources/resource.h \
77 kresources/factory.h \ 77 kresources/factory.h \
78 kresources/managerimpl.h \ 78 kresources/managerimpl.h \
79 kresources/manager.h \ 79 kresources/manager.h \
80 kresources/selectdialog.h \ 80 kresources/selectdialog.h \
81 kresources/configpage.h \ 81 kresources/configpage.h \
82 kresources/configwidget.h \ 82 kresources/configwidget.h \
83 kresources/configdialog.h \ 83 kresources/configdialog.h \
84 kresources/kcmkresources.h \ 84 kresources/kcmkresources.h \
85 kresources/syncwidget.h \
85 kdecore/kmdcodec.h \ 86 kdecore/kmdcodec.h \
86 kdecore/kconfigbase.h \ 87 kdecore/kconfigbase.h \
87 kdecore/klocale.h \ 88 kdecore/klocale.h \
88 kdecore/kcatalogue.h \ 89 kdecore/kcatalogue.h \
89 kdecore/ksharedptr.h \ 90 kdecore/ksharedptr.h \
90 kdecore/kshell.h \ 91 kdecore/kshell.h \
91 kdecore/kstandarddirs.h \ 92 kdecore/kstandarddirs.h \
92 kdecore/kstringhandler.h \ 93 kdecore/kstringhandler.h \
93 kdecore/kshortcut.h \ 94 kdecore/kshortcut.h \
94 kutils/kcmultidialog.h \ 95 kutils/kcmultidialog.h \
95 kdeui/kxmlguiclient.h \ 96 kdeui/kxmlguiclient.h \
96 kdeui/kstdaction.h \ 97 kdeui/kstdaction.h \
97 kdeui/kmainwindow.h \ 98 kdeui/kmainwindow.h \
98 kdeui/ktoolbar.h \ 99 kdeui/ktoolbar.h \
99 kdeui/ktoolbarbutton.h \ 100 kdeui/ktoolbarbutton.h \
100 kdeui/ktoolbarhandler.h \ 101 kdeui/ktoolbarhandler.h \
101 kdeui/kaction.h \ 102 kdeui/kaction.h \
102 kdeui/kactionclasses.h \ 103 kdeui/kactionclasses.h \
103 kdeui/kactioncollection.h \ 104 kdeui/kactioncollection.h \
104 kdecore/klibloader.h 105 kdecore/kprefs.h \
106 kdecore/klibloader.h \
107 kidmanager.h
105 108
106 109
107# kdecore/klibloader.h \ 110# kdecore/klibloader.h \
108 111
109 112
110SOURCES = \ 113SOURCES = \
111KDGanttMinimizeSplitter.cpp \ 114KDGanttMinimizeSplitter.cpp \
112 kapplication.cpp \ 115 kapplication.cpp \
113 kcalendarsystem.cpp \ 116 kcalendarsystem.cpp \
114 kcalendarsystemgregorian.cpp \ 117 kcalendarsystemgregorian.cpp \
115 kcolorbutton.cpp \ 118 kcolorbutton.cpp \
116 kcolordialog.cpp \ 119 kcolordialog.cpp \
117 kconfig.cpp \ 120 kconfig.cpp \
118 kdatetbl.cpp \ 121 kdatetbl.cpp \
119 kdialog.cpp \ 122 kdialog.cpp \
120 kdialogbase.cpp \ 123 kdialogbase.cpp \
121 keditlistbox.cpp \ 124 keditlistbox.cpp \
122 kemailsettings.cpp \ 125 kemailsettings.cpp \
123 kfontdialog.cpp \ 126 kfontdialog.cpp \
124 kfiledialog.cpp \ 127 kfiledialog.cpp \
125 kglobal.cpp \ 128 kglobal.cpp \
126 kglobalsettings.cpp \ 129 kglobalsettings.cpp \
127 kiconloader.cpp \ 130 kiconloader.cpp \
128 kmessagebox.cpp \ 131 kmessagebox.cpp \
129 ktextedit.cpp \ 132 ktextedit.cpp \
130 kprocess.cpp \ 133 kprocess.cpp \
131 krun.cpp \ 134 krun.cpp \
132 ksystemtray.cpp \ 135 ksystemtray.cpp \
133 ktempfile.cpp \ 136 ktempfile.cpp \
134 kurl.cpp \ 137 kurl.cpp \
135 kdecore/kcatalogue.cpp \ 138 kdecore/kcatalogue.cpp \
136 kdecore/klocale.cpp \ 139 kdecore/klocale.cpp \
137 kdecore/kmdcodec.cpp \ 140 kdecore/kmdcodec.cpp \
138 kdecore/kshell.cpp \ 141 kdecore/kshell.cpp \
139 kdecore/kstandarddirs.cpp \ 142 kdecore/kstandarddirs.cpp \
140 kdecore/kstringhandler.cpp \ 143 kdecore/kstringhandler.cpp \
141 kdeui/kbuttonbox.cpp \ 144 kdeui/kbuttonbox.cpp \
142 kdeui/kcmodule.cpp \ 145 kdeui/kcmodule.cpp \
143 kdeui/kguiitem.cpp \ 146 kdeui/kguiitem.cpp \
144 kdeui/kjanuswidget.cpp \ 147 kdeui/kjanuswidget.cpp \
145 kdeui/klistbox.cpp \ 148 kdeui/klistbox.cpp \
146 kdeui/klistview.cpp \ 149 kdeui/klistview.cpp \
147 kdeui/knuminput.cpp \ 150 kdeui/knuminput.cpp \
148 kdeui/knumvalidator.cpp \ 151 kdeui/knumvalidator.cpp \
149 kdeui/kseparator.cpp \ 152 kdeui/kseparator.cpp \
150 kdeui/ksqueezedtextlabel.cpp \ 153 kdeui/ksqueezedtextlabel.cpp \
151 kio/kio/kdirwatch.cpp \ 154 kio/kio/kdirwatch.cpp \
152 kio/kfile/kurlrequester.cpp \ 155 kio/kfile/kurlrequester.cpp \
153 kresources/configpage.cpp \ 156 kresources/configpage.cpp \
154 kresources/configdialog.cpp \ 157 kresources/configdialog.cpp \
155 kresources/configwidget.cpp \ 158 kresources/configwidget.cpp \
156 kresources/factory.cpp \ 159 kresources/factory.cpp \
157 kresources/kcmkresources.cpp \ 160 kresources/kcmkresources.cpp \
158 kresources/managerimpl.cpp \ 161 kresources/managerimpl.cpp \
159 kresources/resource.cpp \ 162 kresources/resource.cpp \
160 kresources/selectdialog.cpp \ 163 kresources/selectdialog.cpp \
164 kresources/syncwidget.cpp \
161 kutils/kcmultidialog.cpp \ 165 kutils/kcmultidialog.cpp \
162 kdeui/kaction.cpp \ 166 kdeui/kaction.cpp \
163 kdeui/kactionclasses.cpp \ 167 kdeui/kactionclasses.cpp \
164 kdeui/kactioncollection.cpp \ 168 kdeui/kactioncollection.cpp \
165 kdeui/kmainwindow.cpp \ 169 kdeui/kmainwindow.cpp \
166 kdeui/ktoolbar.cpp \ 170 kdeui/ktoolbar.cpp \
167 kdeui/ktoolbarbutton.cpp \ 171 kdeui/ktoolbarbutton.cpp \
168 kdeui/ktoolbarhandler.cpp \ 172 kdeui/ktoolbarhandler.cpp \
169 kdeui/kstdaction.cpp \ 173 kdeui/kstdaction.cpp \
170 kdeui/kxmlguiclient.cpp \ 174 kdeui/kxmlguiclient.cpp \
171 kdecore/klibloader.cpp 175 kdecore/kprefs.cpp \
176 kdecore/klibloader.cpp \
177 kidmanager.cpp