summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-10-24 13:35:47 (UTC)
committer zautrix <zautrix>2004-10-24 13:35:47 (UTC)
commit42f22a904fb6440a7b4071b2f4f148bee5f71cc0 (patch) (unidiff)
tree547a887b3f9136995c686763ccd30cfbb9f731c2
parenta04e4d7e6495e985879390e24cc0174d8f867dbf (diff)
downloadkdepimpi-42f22a904fb6440a7b4071b2f4f148bee5f71cc0.zip
kdepimpi-42f22a904fb6440a7b4071b2f4f148bee5f71cc0.tar.gz
kdepimpi-42f22a904fb6440a7b4071b2f4f148bee5f71cc0.tar.bz2
desktop changes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile613
-rw-r--r--gammu/emb/gammu/gammu.pro4
-rw-r--r--kaddressbook/kaddressbook.pro2
-rw-r--r--korganizer/korganizer.pro2
-rw-r--r--libkdepim/ksyncmanager.cpp10
-rw-r--r--variables.pri3
6 files changed, 264 insertions, 370 deletions
diff --git a/Makefile b/Makefile
index da5feba..ea5f30d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,362 +1,253 @@
1export KDEPIMDIR = $(shell pwd) 1#############################################################################
2 2# Makefile for building: kdepim-desktop
3export KDEPIM_VERSION=$(shell sed -e 's/.*\"\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/' < version) 3# Generated by qmake (1.07a) (Qt 3.3.1) on: Sun Oct 24 15:00:28 2004
4 4# Project: kdepim-desktop.pro
5ifeq ($(PLATFORM) , zaurus) 5# Template: subdirs
6 BUILD_NO_LDAP_PLUGIN=1 6# Command: $(QMAKE) -o Makefile kdepim-desktop.pro
7endif 7#############################################################################
8 8
9ifneq ($(PLATFORM) , zaurus) 9 MAKEFILE =Makefile
10 BUILD_NO_SHARP_PLUGIN=1 10 QMAKE =qmake
11endif 11DEL_FILE = rm -f
12 12CHK_DIR_EXISTS= test -d
13SUBDIRS_MICROKDE = \ 13MKDIR = mkdir -p
14 libical/src/libical \ 14 SUBTARGETS = \
15 libical/src/libicalss \ 15 sub-gammu-emb-common \
16 qtcompat \ 16 sub-gammu-emb-gammu \
17 microkde \ 17 sub-libical \
18 libkcal \ 18 sub-libkcal \
19 libkdepim \ 19 sub-microkde \
20 kabc \ 20 sub-libkdepim \
21 kabc/formats/binary \ 21 sub-kabc \
22 kabc/plugins/file \ 22 sub-korganizer \
23 kabc/plugins/dir \ 23 sub-kaddressbook \
24 korganizer \ 24 sub-kabc-plugins-file \
25 kalarmd \ 25 sub-kabc-plugins-dir \
26 kaddressbook 26 sub-kabc-plugins-file \
27 27 sub-kabc-plugins-qtopia \
28SUBDIRS_QTOPIA_PLUGIN = \ 28 sub-pwmanager-libcrypt-cipher \
29 kabc/plugins/qtopia 29 sub-pwmanager-libcrypt-error \
30 30 sub-pwmanager-libcrypt-mpi \
31SUBDIRS_OPIE_PLUGIN = \ 31 sub-pwmanager-libcrypt-zlib \
32 kabc/plugins/opie 32 sub-pwmanager-pwmanager
33 33
34SUBDIRS_SHARP_PLUGIN = \ 34first: all
35 kabc/plugins/sharpdtm 35
36 36all: Makefile $(SUBTARGETS)
37SUBDIRS_LDAP_PLUGIN = \ 37
38 kabc/plugins/ldap 38gammu/emb/common/$(MAKEFILE):
39 39 @$(CHK_DIR_EXISTS) "gammu/emb/common" || $(MKDIR) "gammu/emb/common"
40SUBDIRS_MICROMAIL = \ 40 cd gammu/emb/common && $(QMAKE) common.pro -o $(MAKEFILE)
41 kmicromail/libetpan \ 41sub-gammu-emb-common: gammu/emb/common/$(MAKEFILE) FORCE
42 kmicromail/libmailwrapper \ 42 cd gammu/emb/common && $(MAKE) -f $(MAKEFILE)
43 kmicromail 43
44 44gammu/emb/gammu/$(MAKEFILE):
45SUBDIRS_GAMMU = \ 45 @$(CHK_DIR_EXISTS) "gammu/emb/gammu" || $(MKDIR) "gammu/emb/gammu"
46 gammu/emb/common \ 46 cd gammu/emb/gammu && $(QMAKE) gammu.pro -o $(MAKEFILE)
47 gammu/emb/gammu 47sub-gammu-emb-gammu: gammu/emb/gammu/$(MAKEFILE) FORCE
48 48 cd gammu/emb/gammu && $(MAKE) -f $(MAKEFILE)
49SUBDIRS_PWMANAGER = \ 49
50 pwmanager/libcrypt/mpi \ 50libical/$(MAKEFILE):
51 pwmanager/libcrypt/error \ 51 @$(CHK_DIR_EXISTS) "libical" || $(MKDIR) "libical"
52 pwmanager/libcrypt/cipher \ 52 cd libical && $(QMAKE) libical.pro -o $(MAKEFILE)
53 pwmanager/libcrypt/zlib \ 53sub-libical: libical/$(MAKEFILE) FORCE
54 pwmanager/pwmanager 54 cd libical && $(MAKE) -f $(MAKEFILE)
55 55
56SUBDIRS = \ 56libkcal/$(MAKEFILE):
57 $(SUBDIRS_MICROKDE) \ 57 @$(CHK_DIR_EXISTS) "libkcal" || $(MKDIR) "libkcal"
58 $(SUBDIRS_QTOPIA_PLUGIN) \ 58 cd libkcal && $(QMAKE) libkcal.pro -o $(MAKEFILE)
59 $(SUBDIRS_OPIE_PLUGIN) \ 59sub-libkcal: libkcal/$(MAKEFILE) FORCE
60 $(SUBDIRS_SHARP_PLUGIN) \ 60 cd libkcal && $(MAKE) -f $(MAKEFILE)
61 $(SUBDIRS_LDAP_PLUGIN) \ 61
62 $(SUBDIRS_MICROMAIL) \ 62microkde/$(MAKEFILE):
63 $(SUBDIRS_GAMMU) \ 63 @$(CHK_DIR_EXISTS) "microkde" || $(MKDIR) "microkde"
64 $(SUBDIRS_PWMANAGER) 64 cd microkde && $(QMAKE) microkde.pro -o $(MAKEFILE)
65 65sub-microkde: microkde/$(MAKEFILE) FORCE
66 66 cd microkde && $(MAKE) -f $(MAKEFILE)
67all: build_microkde \ 67
68 build_qtopia_plugin \ 68libkdepim/$(MAKEFILE):
69 build_opie_plugin \ 69 @$(CHK_DIR_EXISTS) "libkdepim" || $(MKDIR) "libkdepim"
70 build_sharp_plugin \ 70 cd libkdepim && $(QMAKE) libkdepim.pro -o $(MAKEFILE)
71 build_ldap_plugin \ 71sub-libkdepim: libkdepim/$(MAKEFILE) FORCE
72 build_micromail \ 72 cd libkdepim && $(MAKE) -f $(MAKEFILE)
73 build_gammu \ 73
74 build_pwmanager 74kabc/$(MAKEFILE):
75 75 @$(CHK_DIR_EXISTS) "kabc" || $(MKDIR) "kabc"
76 76 cd kabc && $(QMAKE) kabc.pro -o $(MAKEFILE)
77build_microkde: variable_test tmake 77sub-kabc: kabc/$(MAKEFILE) FORCE
78 for i in $(SUBDIRS_MICROKDE); do pushd $$i; \ 78 cd kabc && $(MAKE) -f $(MAKEFILE)
79 make -f Makefile$(PLATFORM) || exit 1; popd; \ 79
80 done 80korganizer/$(MAKEFILE):
81 81 @$(CHK_DIR_EXISTS) "korganizer" || $(MKDIR) "korganizer"
82build_qtopia_plugin: build_microkde 82 cd korganizer && $(QMAKE) korganizer.pro -o $(MAKEFILE)
83 ifdef BUILD_NO_QTOPIA_PLUGIN 83sub-korganizer: korganizer/$(MAKEFILE) FORCE
84 @echo == qtopia plugin not build. 84 cd korganizer && $(MAKE) -f $(MAKEFILE)
85 else 85
86 for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \ 86kaddressbook/$(MAKEFILE):
87 make -f Makefile$(PLATFORM) || exit 1; popd; \ 87 @$(CHK_DIR_EXISTS) "kaddressbook" || $(MKDIR) "kaddressbook"
88 done 88 cd kaddressbook && $(QMAKE) kaddressbook.pro -o $(MAKEFILE)
89 endif 89sub-kaddressbook: kaddressbook/$(MAKEFILE) FORCE
90 90 cd kaddressbook && $(MAKE) -f $(MAKEFILE)
91build_opie_plugin: build_microkde 91
92 ifdef BUILD_NO_OPIE_PLUGIN 92kabc/plugins/file/$(MAKEFILE):
93 @echo == opie plugin not build. 93 @$(CHK_DIR_EXISTS) "kabc/plugins/file" || $(MKDIR) "kabc/plugins/file"
94 else 94 cd kabc/plugins/file && $(QMAKE) file.pro -o $(MAKEFILE)
95 for i in $(SUBDIRS_OPIE_PLUGIN); do pushd $$i; \ 95sub-kabc-plugins-file: kabc/plugins/file/$(MAKEFILE) FORCE
96 make -f Makefile$(PLATFORM) || exit 1; popd; \ 96 cd kabc/plugins/file && $(MAKE) -f $(MAKEFILE)
97 done 97
98 endif 98kabc/plugins/dir/$(MAKEFILE):
99 99 @$(CHK_DIR_EXISTS) "kabc/plugins/dir" || $(MKDIR) "kabc/plugins/dir"
100build_sharp_plugin: build_microkde 100 cd kabc/plugins/dir && $(QMAKE) dir.pro -o $(MAKEFILE)
101 ifdef BUILD_NO_SHARP_PLUGIN 101sub-kabc-plugins-dir: kabc/plugins/dir/$(MAKEFILE) FORCE
102 @echo == ldap plugin not build. 102 cd kabc/plugins/dir && $(MAKE) -f $(MAKEFILE)
103 else 103
104 for i in $(SUBDIRS_SHARP_PLUGIN); do pushd $$i; \ 104kabc/plugins/file/$(MAKEFILE):
105 make -f Makefile$(PLATFORM) || exit 1; popd; \ 105 @$(CHK_DIR_EXISTS) "kabc/plugins/file" || $(MKDIR) "kabc/plugins/file"
106 done 106 cd kabc/plugins/file && $(QMAKE) file.pro -o $(MAKEFILE)
107 endif 107sub-kabc-plugins-file: kabc/plugins/file/$(MAKEFILE) FORCE
108 108 cd kabc/plugins/file && $(MAKE) -f $(MAKEFILE)
109build_ldap_plugin: build_microkde 109
110 ifdef BUILD_NO_LDAP_PLUGIN 110kabc/plugins/qtopia/$(MAKEFILE):
111 @echo == ldap plugin not build. 111 @$(CHK_DIR_EXISTS) "kabc/plugins/qtopia" || $(MKDIR) "kabc/plugins/qtopia"
112 else 112 cd kabc/plugins/qtopia && $(QMAKE) qtopia.pro -o $(MAKEFILE)
113 for i in $(SUBDIRS_LDAP_PLUGIN); do pushd $$i; \ 113sub-kabc-plugins-qtopia: kabc/plugins/qtopia/$(MAKEFILE) FORCE
114 make -f Makefile$(PLATFORM) || exit 1; popd; \ 114 cd kabc/plugins/qtopia && $(MAKE) -f $(MAKEFILE)
115 done 115
116 endif 116pwmanager/libcrypt/cipher/$(MAKEFILE):
117 117 @$(CHK_DIR_EXISTS) "pwmanager/libcrypt/cipher" || $(MKDIR) "pwmanager/libcrypt/cipher"
118 118 cd pwmanager/libcrypt/cipher && $(QMAKE) cipher.pro -o $(MAKEFILE)
119build_micromail: build_microkde 119sub-pwmanager-libcrypt-cipher: pwmanager/libcrypt/cipher/$(MAKEFILE) FORCE
120 ifdef BUILD_NO_MICROMAIL 120 cd pwmanager/libcrypt/cipher && $(MAKE) -f $(MAKEFILE)
121 @echo == kmicromail not build. 121
122 else 122pwmanager/libcrypt/error/$(MAKEFILE):
123 for i in $(SUBDIRS_MICROMAIL); do pushd $$i; \ 123 @$(CHK_DIR_EXISTS) "pwmanager/libcrypt/error" || $(MKDIR) "pwmanager/libcrypt/error"
124 make -f Makefile$(PLATFORM) || exit 1; popd; \ 124 cd pwmanager/libcrypt/error && $(QMAKE) error.pro -o $(MAKEFILE)
125 done 125sub-pwmanager-libcrypt-error: pwmanager/libcrypt/error/$(MAKEFILE) FORCE
126 endif 126 cd pwmanager/libcrypt/error && $(MAKE) -f $(MAKEFILE)
127 127
128build_gammu: variable_test tmake 128pwmanager/libcrypt/mpi/$(MAKEFILE):
129 ifdef BUILD_NO_GAMMU 129 @$(CHK_DIR_EXISTS) "pwmanager/libcrypt/mpi" || $(MKDIR) "pwmanager/libcrypt/mpi"
130 @echo == gammu not build. 130 cd pwmanager/libcrypt/mpi && $(QMAKE) mpi.pro -o $(MAKEFILE)
131 else 131sub-pwmanager-libcrypt-mpi: pwmanager/libcrypt/mpi/$(MAKEFILE) FORCE
132 for i in $(SUBDIRS_GAMMU); do pushd $$i; \ 132 cd pwmanager/libcrypt/mpi && $(MAKE) -f $(MAKEFILE)
133 make -f Makefile$(PLATFORM) || exit 1; popd; \ 133
134 done 134pwmanager/libcrypt/zlib/$(MAKEFILE):
135 endif 135 @$(CHK_DIR_EXISTS) "pwmanager/libcrypt/zlib" || $(MKDIR) "pwmanager/libcrypt/zlib"
136 136 cd pwmanager/libcrypt/zlib && $(QMAKE) zlib.pro -o $(MAKEFILE)
137build_pwmanager: build_microkde 137sub-pwmanager-libcrypt-zlib: pwmanager/libcrypt/zlib/$(MAKEFILE) FORCE
138 ifdef BUILD_NO_PWMANAGER 138 cd pwmanager/libcrypt/zlib && $(MAKE) -f $(MAKEFILE)
139 @echo == pwmanager not build. 139
140 else 140pwmanager/pwmanager/$(MAKEFILE):
141 for i in $(SUBDIRS_PWMANAGER); do pushd $$i; \ 141 @$(CHK_DIR_EXISTS) "pwmanager/pwmanager" || $(MKDIR) "pwmanager/pwmanager"
142 make -f Makefile$(PLATFORM) || exit 1; popd; \ 142 cd pwmanager/pwmanager && $(QMAKE) pwmanager.pro -o $(MAKEFILE)
143 done 143sub-pwmanager-pwmanager: pwmanager/pwmanager/$(MAKEFILE) FORCE
144 endif 144 cd pwmanager/pwmanager && $(MAKE) -f $(MAKEFILE)
145 145
146 146Makefile: kdepim-desktop.pro /usr/lib/qt3/mkspecs/default/qmake.conf
147variable_info: 147 $(QMAKE) -o Makefile kdepim-desktop.pro
148 @echo -------------------------------------- 148qmake: qmake_all
149 @echo KDEPIM buildsystem, variableinfo... 149 @$(QMAKE) -o Makefile kdepim-desktop.pro
150 @echo KDEPIMDIR=$(KDEPIMDIR) 150
151 @echo QTDIR=$(QTDIR) 151all: $(SUBTARGETS)
152 @echo QPEDIR=$(QPEDIR) 152qmake_all: gammu/emb/common/$(MAKEFILE) gammu/emb/gammu/$(MAKEFILE) libical/$(MAKEFILE) libkcal/$(MAKEFILE) microkde/$(MAKEFILE) libkdepim/$(MAKEFILE) kabc/$(MAKEFILE) korganizer/$(MAKEFILE) kaddressbook/$(MAKEFILE) kabc/plugins/file/$(MAKEFILE) kabc/plugins/dir/$(MAKEFILE) kabc/plugins/file/$(MAKEFILE) kabc/plugins/qtopia/$(MAKEFILE) pwmanager/libcrypt/cipher/$(MAKEFILE) pwmanager/libcrypt/error/$(MAKEFILE) pwmanager/libcrypt/mpi/$(MAKEFILE) pwmanager/libcrypt/zlib/$(MAKEFILE) pwmanager/pwmanager/$(MAKEFILE)
153 @echo OPIEDIR=$(OPIEDIR) 153 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
154 @echo PLATFORM=$(PLATFORM) 154 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
155 @echo RELEASE_DEBUG=$(RELEASE_DEBUG) 155 ( [ -d libical ] && cd libical ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
156 @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL) 156 ( [ -d libkcal ] && cd libkcal ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
157 @echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN) 157 ( [ -d microkde ] && cd microkde ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
158 @echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN) 158 ( [ -d libkdepim ] && cd libkdepim ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
159 @echo BUILD_NO_QTOPIA_PLUGIN=$(BUILD_NO_QTOPIA_PLUGIN) 159 ( [ -d kabc ] && cd kabc ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
160 @echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN) 160 ( [ -d korganizer ] && cd korganizer ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
161 ifndef BUILD_NO_SHARP_PLUGIN 161 ( [ -d kaddressbook ] && cd kaddressbook ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
162 @echo SHARPDTMSDK=$(SHARPDTMSDK) 162 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
163 endif 163 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
164 @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU) 164 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
165 @echo BUILD_NO_PWMANAGER=$(BUILD_NO_PWMANAGER) 165 ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
166 @echo -------------------------------------- 166 ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
167 167 ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
168variable_test: variable_info 168 ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
169 @echo KDEPIM buildsystem, variablecheck... 169 ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
170 ifndef KDEPIMDIR 170 ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
171 @echo KDEPIMDIR is not defined. 171clean uicables mocables uiclean mocclean lexclean yaccclean : qmake_all FORCE
172 $(error KDEPIMDIR is not defined) 172 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; ) || true
173 endif 173 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) $@; ) || true
174 ifndef PLATFORM 174 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; ) || true
175 @echo PLATFORM is not defined. 175 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; ) || true
176 $(error PLATFORM is not defined) 176 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; ) || true
177 endif 177 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; ) || true
178 ifdef BUILD_NO_LDAP_PLUGIN 178 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; ) || true
179 @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN) 179 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; ) || true
180 endif 180 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; ) || true
181 ifdef BUILD_NO_OPIE_PLUGIN 181 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; ) || true
182 @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN) 182 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; ) || true
183 endif 183 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; ) || true
184 ifdef BUILD_NO_QTOPIA_PLUGIN 184 ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) $@; ) || true
185 @echo QTOPIA PLUGIN will not be build, because BUILD_NO__QTOPIA_PLUGIN is set to $(BUILD_NO__QTOPIA_PLUGIN) 185 ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) $@; ) || true
186 endif 186 ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) $@; ) || true
187 ifdef BUILD_NO_MICROMAIL 187 ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) $@; ) || true
188 @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL) 188 ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) $@; ) || true
189 endif 189 ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) $@; ) || true
190 ifdef BUILD_NO_SHARP_PLUGIN 190uninstall_subdirs: qmake_all FORCE
191 @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN) 191 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
192 else 192 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
193 ifndef SHARPDTMSDK 193 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
194 @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK) 194 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
195 $(error SHARPDTMSDK is not defined) 195 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
196 endif 196 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
197 endif 197 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
198 ifdef BUILD_NO_GAMMU 198 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
199 @echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU) 199 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
200 endif 200 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
201 ifdef BUILD_NO_PWMANAGER 201 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
202 @echo PWMANAGER will not be build, because BUILD_NO_PWMANAGER is set to $(BUILD_NO_PWMANAGER) 202 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
203 endif 203 ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
204 @echo -------------------------------------- 204 ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
205 205 ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
206 206 ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
207objects: 207 ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
208 for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done 208 ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
209 for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done 209install_subdirs: qmake_all FORCE
210 mkdir -p libical/lib/$(PLATFORM) 210 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) install; ) || true
211 mkdir -p pwmanager/libcrypt/$(PLATFORM) 211 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) install; ) || true
212 212 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) install; ) || true
213clean: 213 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) install; ) || true
214 rm -rf libical/lib/$(PLATFORM)/*; 214 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) install; ) || true
215 rm -rf pwmanager/libcrypt/$(PLATFORM)/*; 215 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) install; ) || true
216 for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\ 216 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) install; ) || true
217 rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \ 217 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) install; ) || true
218 done 218 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) install; ) || true
219 219 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) install; ) || true
220install: 220 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) install; ) || true
221 221 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) install; ) || true
222 cd bin/kdepim; make install 222 ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) install; ) || true
223 cp -r Pim $(QPEDIR)/apps 223 ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) install; ) || true
224 cp db2file/db2file $(QPEDIR)/bin/db2file 224 ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) install; ) || true
225 cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop 225 ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) install; ) || true
226 cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop 226 ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) install; ) || true
227 cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop 227 ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) install; ) || true
228 cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop 228distclean: qmake_all FORCE
229 229 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
230dist: 230 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
231 @echo Dont forget to do "make install" before "make dist" 231 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
232 rm -f *arm.ipk 232 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
233 rm -f *~ 233 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
234 cd ..; tar czf kdepimpi-$(KDEPIM_VERSION).tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia kdepim 234 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
235 mkipks kmicrokdelibs.control 235 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
236 mkipks korganizer.control 236 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
237 mkipks kaddressbook.control 237 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
238 ifndef BUILD_NO_MICROMAIL 238 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
239 mkipks kopiemail.control 239 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
240 endif 240 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
241 mkipks korganizer-alarm.control 241 ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
242 ifndef BUILD_NO_GAMMU 242 ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
243 mkipks phoneaccess.control 243 ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
244 endif 244 ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
245 ifndef BUILD_NO_PWMANAGER 245 ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
246 mkipks pwmanager.control 246 ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
247 endif 247
248 mkipks pim_TAB_icon.control 248install: install_subdirs
249 249
250tmake: objects \ 250uninstall: uninstall_subdirs
251 qtcompat/Makefile$(PLATFORM) \ 251
252 microkde/Makefile$(PLATFORM) \ 252FORCE:
253 libkcal/Makefile$(PLATFORM) \
254 libkdepim/Makefile$(PLATFORM) \
255 korganizer/Makefile$(PLATFORM) \
256 kalarmd/Makefile$(PLATFORM) \
257 libical/src/libical/Makefile$(PLATFORM) \
258 libical/src/libicalss/Makefile$(PLATFORM) \
259 kabc/Makefile$(PLATFORM) \
260 kabc/formats/binary/Makefile$(PLATFORM) \
261 kabc/plugins/file/Makefile$(PLATFORM) \
262 kabc/plugins/dir/Makefile$(PLATFORM) \
263 kabc/plugins/ldap/Makefile$(PLATFORM) \
264 kabc/plugins/opie/Makefile$(PLATFORM) \
265 kabc/plugins/qtopia/Makefile$(PLATFORM) \
266 kabc/plugins/sharpdtm/Makefile$(PLATFORM) \
267 kaddressbook/Makefile$(PLATFORM) \
268 kmicromail/Makefile$(PLATFORM) \
269 kmicromail/libetpan/Makefile$(PLATFORM) \
270 kmicromail/libmailwrapper/Makefile$(PLATFORM) \
271 gammu/emb/common/Makefile$(PLATFORM) \
272 gammu/emb/gammu/Makefile$(PLATFORM) \
273 pwmanager/pwmanager/Makefile$(PLATFORM) \
274 pwmanager/libcrypt/mpi/Makefile$(PLATFORM) \
275 pwmanager/libcrypt/error/Makefile$(PLATFORM) \
276 pwmanager/libcrypt/cipher/Makefile$(PLATFORM) \
277 pwmanager/libcrypt/zlib/Makefile$(PLATFORM)
278
279qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro
280 cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtcompat.pro -o Makefile$(PLATFORM)
281
282microkde/Makefile$(PLATFORM): microkde/microkdeE.pro
283 cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" microkdeE.pro -o Makefile$(PLATFORM)
284
285libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro
286 cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkcalE.pro -o Makefile$(PLATFORM)
287
288
289libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro
290 cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkdepimE.pro -o Makefile$(PLATFORM)
291
292kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro
293 cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kalarmdE.pro -o Makefile$(PLATFORM)
294
295korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro
296 cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" korganizerE.pro -o Makefile$(PLATFORM)
297
298libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro
299 cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalE.pro -o Makefile$(PLATFORM)
300
301libical/src/libicalss/Makefile$(PLATFORM): libical/src/libicalss/libicalssE.pro
302 cd libical/src/libicalss; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalssE.pro -o Makefile$(PLATFORM)
303
304kabc/Makefile$(PLATFORM): kabc/kabcE.pro
305 cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcE.pro -o Makefile$(PLATFORM)
306
307kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro
308 cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcformat_binaryE.pro -o Makefile$(PLATFORM)
309
310kabc/plugins/file/Makefile$(PLATFORM): kabc/plugins/file/fileE.pro
311 cd kabc/plugins/file; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" fileE.pro -o Makefile$(PLATFORM)
312
313kabc/plugins/dir/Makefile$(PLATFORM): kabc/plugins/dir/dirE.pro
314 cd kabc/plugins/dir; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" dirE.pro -o Makefile$(PLATFORM)
315
316kabc/plugins/ldap/Makefile$(PLATFORM): kabc/plugins/ldap/ldapE.pro
317 cd kabc/plugins/ldap; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" ldapE.pro -o Makefile$(PLATFORM)
318
319kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/opieE.pro
320 cd kabc/plugins/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" opieE.pro -o Makefile$(PLATFORM)
321
322kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro
323 cd kabc/plugins/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtopiaE.pro -o Makefile$(PLATFORM)
324
325kabc/plugins/sharpdtm/Makefile$(PLATFORM): kabc/plugins/sharpdtm/sharpdtmE.pro
326 cd kabc/plugins/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" sharpdtmE.pro -o Makefile$(PLATFORM)
327
328kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro
329 cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kaddressbookE.pro -o Makefile$(PLATFORM)
330
331kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro
332 cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kmicromailE.pro -o Makefile$(PLATFORM)
333
334kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro
335 cd kmicromail/libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libetpanE.pro -o Makefile$(PLATFORM)
336
337kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro
338 cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libmailwrapperE.pro -o Makefile$(PLATFORM)
339
340gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro
341 cd gammu/emb/common; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" commonE.pro -o Makefile$(PLATFORM)
342
343gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro
344 cd gammu/emb/gammu; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" gammuE.pro -o Makefile$(PLATFORM)
345
346pwmanager/pwmanager/Makefile$(PLATFORM): pwmanager/pwmanager/pwmanagerE.pro
347 cd pwmanager/pwmanager; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" pwmanagerE.pro -o Makefile$(PLATFORM)
348
349
350pwmanager/libcrypt/mpi/Makefile$(PLATFORM): pwmanager/libcrypt/mpi/mpi.pro
351 cd pwmanager/libcrypt/mpi;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" mpi.pro -o Makefile$(PLATFORM)
352
353pwmanager/libcrypt/error/Makefile$(PLATFORM): pwmanager/libcrypt/error/error.pro
354 cd pwmanager/libcrypt/error;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" error.pro -o Makefile$(PLATFORM)
355
356pwmanager/libcrypt/cipher/Makefile$(PLATFORM): pwmanager/libcrypt/cipher/cipher.pro
357 cd pwmanager/libcrypt/cipher;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" cipher.pro -o Makefile$(PLATFORM)
358
359pwmanager/libcrypt/zlib/Makefile$(PLATFORM): pwmanager/libcrypt/zlib/zlib.pro
360 cd pwmanager/libcrypt/zlib;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" zlib.pro -o Makefile$(PLATFORM)
361
362 253
diff --git a/gammu/emb/gammu/gammu.pro b/gammu/emb/gammu/gammu.pro
index 22476a1..55bfdec 100644
--- a/gammu/emb/gammu/gammu.pro
+++ b/gammu/emb/gammu/gammu.pro
@@ -1,62 +1,64 @@
1###################################################################### 1######################################################################
2# Automatically generated by qmake (1.07a) Fri Jul 30 22:22:02 2004 2# Automatically generated by qmake (1.07a) Fri Jul 30 22:22:02 2004
3###################################################################### 3######################################################################
4 4
5TEMPLATE = app 5TEMPLATE = app
6DEPENDPATH += msvc06.mak \ 6DEPENDPATH += msvc06.mak \
7 msvc2003.mak \ 7 msvc2003.mak \
8 smsd \ 8 smsd \
9 depend/nokia \ 9 depend/nokia \
10 depend/siemens \ 10 depend/siemens \
11 depend/nokia/dct3trac 11 depend/nokia/dct3trac
12INCLUDEPATH += . smsd depend/nokia depend/nokia/dct3trac depend/siemens 12INCLUDEPATH += . smsd depend/nokia depend/nokia/dct3trac depend/siemens
13 CONFIG = warn_off release console 13 CONFIG = warn_off release console
14# Input 14# Input
15 15
16HEADERS += gammu.h \ 16HEADERS += gammu.h \
17 sniff.h \ 17 sniff.h \
18 smsd/s_files.h \ 18 smsd/s_files.h \
19 smsd/s_mysql.h \ 19 smsd/s_mysql.h \
20 smsd/smsdcore.h \ 20 smsd/smsdcore.h \
21 depend/nokia/dct3.h \ 21 depend/nokia/dct3.h \
22 depend/nokia/dct4.h \ 22 depend/nokia/dct4.h \
23 depend/siemens/chiffre.h \ 23 depend/siemens/chiffre.h \
24 depend/siemens/dsiemens.h \ 24 depend/siemens/dsiemens.h \
25 depend/nokia/dct3trac/type-cc.h \ 25 depend/nokia/dct3trac/type-cc.h \
26 depend/nokia/dct3trac/type-mm.h \ 26 depend/nokia/dct3trac/type-mm.h \
27 depend/nokia/dct3trac/type-rr.h \ 27 depend/nokia/dct3trac/type-rr.h \
28 depend/nokia/dct3trac/type-sms.h \ 28 depend/nokia/dct3trac/type-sms.h \
29 depend/nokia/dct3trac/type-ss.h \ 29 depend/nokia/dct3trac/type-ss.h \
30 depend/nokia/dct3trac/wmx-gsm.h \ 30 depend/nokia/dct3trac/wmx-gsm.h \
31 depend/nokia/dct3trac/wmx-list.h \ 31 depend/nokia/dct3trac/wmx-list.h \
32 depend/nokia/dct3trac/wmx-sim.h \ 32 depend/nokia/dct3trac/wmx-sim.h \
33 depend/nokia/dct3trac/wmx-util.h \ 33 depend/nokia/dct3trac/wmx-util.h \
34 depend/nokia/dct3trac/wmx.h 34 depend/nokia/dct3trac/wmx.h
35SOURCES += gammu.c \ 35SOURCES += gammu.c \
36 sniff.c \ 36 sniff.c \
37 smsd/s_files.c \ 37 smsd/s_files.c \
38 smsd/smsdcore.c \ 38 smsd/smsdcore.c \
39 depend/nokia/dct3.c \ 39 depend/nokia/dct3.c \
40 depend/nokia/dct4.c \ 40 depend/nokia/dct4.c \
41 depend/siemens/chiffre.c \ 41 depend/siemens/chiffre.c \
42 depend/siemens/dsiemens.c \ 42 depend/siemens/dsiemens.c \
43 depend/nokia/dct3trac/wmx-gsm.c \ 43 depend/nokia/dct3trac/wmx-gsm.c \
44 depend/nokia/dct3trac/wmx-list.c \ 44 depend/nokia/dct3trac/wmx-list.c \
45 depend/nokia/dct3trac/wmx-sim.c \ 45 depend/nokia/dct3trac/wmx-sim.c \
46 depend/nokia/dct3trac/wmx-util.c \ 46 depend/nokia/dct3trac/wmx-util.c \
47 depend/nokia/dct3trac/wmx.c 47 depend/nokia/dct3trac/wmx.c
48unix : { 48unix : {
49LIBS += ../../../bin/libmicrogammu.so /usr/lib/libbluetooth.so /usr/lib/libsdp.so /usr/lib/libpthread.so 49LIBS += ../../../bin/libmicrogammu.so /usr/lib/libpthread.so
50# bluetooth disabled for now
51#/usr/lib/libbluetooth.so /usr/lib/libsdp.so
50OBJECTS_DIR = obj/unix 52OBJECTS_DIR = obj/unix
51} 53}
52win32 : { 54win32 : {
53 CONFIG = qt warn_on 55 CONFIG = qt warn_on
54#LIBS += mfc71u.lib 56#LIBS += mfc71u.lib
55LIBS += libc.lib 57LIBS += libc.lib
56#LIBS += msvcrt.lib 58#LIBS += msvcrt.lib
57QMAKE_LINK += /NODEFAULTLIB:msvcrt 59QMAKE_LINK += /NODEFAULTLIB:msvcrt
58LIBS += ../../../bin/microgammu.lib 60LIBS += ../../../bin/microgammu.lib
59OBJECTS_DIR = obj/win 61OBJECTS_DIR = obj/win
60} 62}
61DESTDIR = ../../../bin 63DESTDIR = ../../../bin
62TARGET = kammu 64TARGET = kammu
diff --git a/kaddressbook/kaddressbook.pro b/kaddressbook/kaddressbook.pro
index b57317f..f93bed0 100644
--- a/kaddressbook/kaddressbook.pro
+++ b/kaddressbook/kaddressbook.pro
@@ -1,183 +1,183 @@
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 += -lldap 17#LIBS += -lldap
18OBJECTS_DIR = obj/unix 18OBJECTS_DIR = obj/unix
19MOC_DIR = moc/unix 19MOC_DIR = moc/unix
20} 20}
21win32: { 21win32: {
22DEFINES += _WIN32_ 22DEFINES += _WIN32_
23LIBS += ../bin/microkdepim.lib 23LIBS += ../bin/microkdepim.lib
24LIBS += ../bin/microkcal.lib 24LIBS += ../bin/microkcal.lib
25LIBS += ../bin/microkde.lib 25LIBS += ../bin/microkde.lib
26LIBS += ../bin/microkabc.lib 26LIBS += ../bin/microkabc.lib
27QMAKE_LINK += /NODEFAULTLIB:LIBC 27QMAKE_LINK += /NODEFAULTLIB:LIBC
28OBJECTS_DIR = obj/win 28OBJECTS_DIR = obj/win
29MOC_DIR = moc/win 29MOC_DIR = moc/win
30LIBS += mfc71u.lib 30LIBS += mfc71u.lib
31} 31}
32 32
33 33
34 34
35 35
36 36
37 37
38 38
39 39
40INTERFACES = \ 40INTERFACES = \
41# filteredit_base.ui \ 41# filteredit_base.ui \
42# kofilterview_base.ui \ 42# kofilterview_base.ui \
43 43
44HEADERS = \ 44HEADERS = \
45features/mergewidget.h \ 45features/mergewidget.h \
46features/distributionlistwidget.h \ 46features/distributionlistwidget.h \
47kcmconfigs/addresseewidget.h \ 47kcmconfigs/addresseewidget.h \
48kcmconfigs/extensionconfigdialog.h \ 48kcmconfigs/extensionconfigdialog.h \
49kcmconfigs/kcmkabconfig.h \ 49kcmconfigs/kcmkabconfig.h \
50kcmconfigs/kabconfigwidget.h \ 50kcmconfigs/kabconfigwidget.h \
51addresseeeditordialog.h \ 51addresseeeditordialog.h \
52addresseeeditorwidget.h \ 52addresseeeditorwidget.h \
53addresseditwidget.h \ 53addresseditwidget.h \
54addresseeconfig.h \ 54addresseeconfig.h \
55addresseeutil.h \ 55addresseeutil.h \
56emaileditwidget.h \ 56emaileditwidget.h \
57filtereditdialog.h \ 57filtereditdialog.h \
58kaddressbookmain.h \ 58kaddressbookmain.h \
59kabprefs.h \ 59kabprefs.h \
60kabcore.h \ 60kabcore.h \
61viewmanager.h \ 61viewmanager.h \
62extensionmanager.h \ 62extensionmanager.h \
63extensionwidget.h \ 63extensionwidget.h \
64kaddressbookview.h \ 64kaddressbookview.h \
65geowidget.h \ 65geowidget.h \
66imagewidget.h \ 66imagewidget.h \
67incsearchwidget.h \ 67incsearchwidget.h \
68jumpbuttonbar.h \ 68jumpbuttonbar.h \
69phoneeditwidget.h \ 69phoneeditwidget.h \
70secrecywidget.h \ 70secrecywidget.h \
71keywidget.h \ 71keywidget.h \
72nameeditdialog.h \ 72nameeditdialog.h \
73filter.h \ 73filter.h \
74addviewdialog.h \ 74addviewdialog.h \
75configurewidget.h \ 75configurewidget.h \
76viewconfigurewidget.h \ 76viewconfigurewidget.h \
77viewconfigurefieldspage.h \ 77viewconfigurefieldspage.h \
78viewconfigurefilterpage.h \ 78viewconfigurefilterpage.h \
79typecombo.h \ 79typecombo.h \
80undo.h \ 80undo.h \
81undocmds.h \ 81undocmds.h \
82xxportmanager.h \ 82xxportmanager.h \
83xxportobject.h \ 83xxportobject.h \
84xxportselectdialog.h \ 84xxportselectdialog.h \
85details/detailsviewcontainer.h \ 85details/detailsviewcontainer.h \
86details/look_basic.h \ 86details/look_basic.h \
87details/look_html.h \ 87details/look_html.h \
88views/kaddressbookiconview.h \ 88views/kaddressbookiconview.h \
89views/kaddressbooktableview.h \ 89views/kaddressbooktableview.h \
90views/kaddressbookcardview.h \ 90views/kaddressbookcardview.h \
91views/configuretableviewdialog.h \ 91views/configuretableviewdialog.h \
92views/configurecardviewdialog.h \ 92views/configurecardviewdialog.h \
93views/cardview.h \ 93views/cardview.h \
94views/colorlistbox.h \ 94views/colorlistbox.h \
95views/contactlistview.h \ 95views/contactlistview.h \
96xxport/vcard_xxport.h \ 96xxport/vcard_xxport.h \
97xxport/kde2_xxport.h \ 97xxport/kde2_xxport.h \
98xxport/csv_xxport.h \ 98xxport/csv_xxport.h \
99xxport/csvimportdialog.h \ 99xxport/csvimportdialog.h \
100xxport/opie_xxport.h \ 100xxport/opie_xxport.h \
101xxport/qtopia_xxport.h \ 101xxport/qtopia_xxport.h \
102xxport/sharpdtm_xxport.h \ 102xxport/sharpdtm_xxport.h \
103#details/look_details.h \ 103#details/look_details.h \
104#mainwindoiw.h \ 104#mainwindoiw.h \
105# alarmclient.h \ 105# alarmclient.h \
106# calendarview.h \ 106# calendarview.h \
107# customlistviewitem.h \ 107# customlistviewitem.h \
108# datenavigator.h 108# datenavigator.h
109 109
110SOURCES = \ 110SOURCES = \
111addresseeeditordialog.cpp \ 111addresseeeditordialog.cpp \
112addresseeeditorwidget.cpp \ 112addresseeeditorwidget.cpp \
113addresseditwidget.cpp \ 113addresseditwidget.cpp \
114addresseeconfig.cpp \ 114addresseeconfig.cpp \
115addresseeutil.cpp \ 115addresseeutil.cpp \
116extensionmanager.cpp \ 116extensionmanager.cpp \
117features/mergewidget.cpp \ 117features/mergewidget.cpp \
118features/distributionlistwidget.cpp \ 118features/distributionlistwidget.cpp \
119kcmconfigs/addresseewidget.cpp \ 119kcmconfigs/addresseewidget.cpp \
120kcmconfigs/extensionconfigdialog.cpp \ 120kcmconfigs/extensionconfigdialog.cpp \
121kcmconfigs/kcmkabconfig.cpp \ 121kcmconfigs/kcmkabconfig.cpp \
122kcmconfigs/kabconfigwidget.cpp \ 122kcmconfigs/kabconfigwidget.cpp \
123emaileditwidget.cpp \ 123emaileditwidget.cpp \
124filtereditdialog.cpp \ 124filtereditdialog.cpp \
125mainembedded.cpp \ 125mainembedded.cpp \
126kaddressbookmain.cpp \ 126kaddressbookmain.cpp \
127kabcore.cpp \ 127kabcore.cpp \
128kabprefs.cpp \ 128kabprefs.cpp \
129viewmanager.cpp \ 129viewmanager.cpp \
130kaddressbookview.cpp \ 130kaddressbookview.cpp \
131extensionwidget.cpp \ 131extensionwidget.cpp \
132geowidget.cpp \ 132geowidget.cpp \
133imagewidget.cpp \ 133imagewidget.cpp \
134incsearchwidget.cpp \ 134incsearchwidget.cpp \
135jumpbuttonbar.cpp \ 135jumpbuttonbar.cpp \
136phoneeditwidget.cpp \ 136phoneeditwidget.cpp \
137secrecywidget.cpp \ 137secrecywidget.cpp \
138keywidget.cpp \ 138keywidget.cpp \
139nameeditdialog.cpp \ 139nameeditdialog.cpp \
140filter.cpp \ 140filter.cpp \
141addviewdialog.cpp \ 141addviewdialog.cpp \
142configurewidget.cpp \ 142configurewidget.cpp \
143viewconfigurewidget.cpp \ 143viewconfigurewidget.cpp \
144viewconfigurefieldspage.cpp \ 144viewconfigurefieldspage.cpp \
145viewconfigurefilterpage.cpp \ 145viewconfigurefilterpage.cpp \
146undo.cpp \ 146undo.cpp \
147undocmds.cpp \ 147undocmds.cpp \
148xxportmanager.cpp \ 148xxportmanager.cpp \
149xxportobject.cpp \ 149xxportobject.cpp \
150xxportselectdialog.cpp \ 150xxportselectdialog.cpp \
151details/detailsviewcontainer.cpp \ 151details/detailsviewcontainer.cpp \
152details/look_basic.cpp \ 152details/look_basic.cpp \
153details/look_html.cpp \ 153details/look_html.cpp \
154views/kaddressbookiconview.cpp \ 154views/kaddressbookiconview.cpp \
155views/kaddressbooktableview.cpp \ 155views/kaddressbooktableview.cpp \
156views/kaddressbookcardview.cpp \ 156views/kaddressbookcardview.cpp \
157views/configuretableviewdialog.cpp \ 157views/configuretableviewdialog.cpp \
158views/configurecardviewdialog.cpp \ 158views/configurecardviewdialog.cpp \
159views/cardview.cpp \ 159views/cardview.cpp \
160views/contactlistview.cpp \ 160views/contactlistview.cpp \
161views/colorlistbox.cpp \ 161views/colorlistbox.cpp \
162xxport/vcard_xxport.cpp \ 162xxport/vcard_xxport.cpp \
163xxport/kde2_xxport.cpp \ 163xxport/kde2_xxport.cpp \
164xxport/csv_xxport.cpp \ 164xxport/csv_xxport.cpp \
165xxport/csvimportdialog.cpp \ 165xxport/csvimportdialog.cpp \
166xxport/opie_xxport.cpp \ 166xxport/opie_xxport.cpp \
167xxport/qtopia_xxport.cpp \ 167xxport/qtopia_xxport.cpp \
168xxport/sharpdtm_xxport.cpp \ 168xxport/sharpdtm_xxport.cpp \
169#details/look_details.cpp \ 169#details/look_details.cpp \
170#mainwindow.cpp \ 170#mainwindow.cpp \
171# calendarview.cpp \ 171# calendarview.cpp \
172# timespanview.cpp 172# timespanview.cpp
173 173
174 174
175 175
176win32: { 176win32: {
177HEADERS += ../outport/msoutl9.h \ 177HEADERS += ../outport/msoutl9.h \
178 kaimportoldialog.h 178 kaimportoldialog.h
179 179
180SOURCES += ../outport/msoutl9.cpp \ 180SOURCES += ../outport/msoutl9.cpp \
181 kaimportoldialog.cpp 181 kaimportoldialog.cpp
182} 182}
183 183
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro
index 75caa9c..b17743d 100644
--- a/korganizer/korganizer.pro
+++ b/korganizer/korganizer.pro
@@ -1,192 +1,192 @@
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 ../libkdepim 10INCLUDEPATH += ../microkde ../ interfaces ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../microkde/kio/kio ../libkdepim
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
22#LIBS += -lbluetooth 22#LIBS += -lbluetooth
23#LIBS += -lsdp 23#LIBS += -lsdp
24 24
25LIBS += -lldap 25#LIBS += -lldap
26OBJECTS_DIR = obj/unix 26OBJECTS_DIR = obj/unix
27MOC_DIR = moc/unix 27MOC_DIR = moc/unix
28} 28}
29win32: { 29win32: {
30DEFINES += _WIN32_ 30DEFINES += _WIN32_
31LIBS += ../bin/microkdepim.lib 31LIBS += ../bin/microkdepim.lib
32LIBS += ../bin/microkcal.lib 32LIBS += ../bin/microkcal.lib
33LIBS += ../bin/microkde.lib 33LIBS += ../bin/microkde.lib
34LIBS += ../bin/microkabc.lib 34LIBS += ../bin/microkabc.lib
35LIBS += ../libical/lib/ical.lib 35LIBS += ../libical/lib/ical.lib
36LIBS += ../libical/lib/icalss.lib 36LIBS += ../libical/lib/icalss.lib
37#LIBS += atls.lib 37#LIBS += atls.lib
38LIBS += mfc71u.lib 38LIBS += mfc71u.lib
39QMAKE_LINK += /NODEFAULTLIB:LIBC 39QMAKE_LINK += /NODEFAULTLIB:LIBC
40#QMAKE_LINK += /NODEFAULTLIB:MSVCRT 40#QMAKE_LINK += /NODEFAULTLIB:MSVCRT
41#QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib 41#QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib
42OBJECTS_DIR = obj/win 42OBJECTS_DIR = obj/win
43MOC_DIR = moc/win 43MOC_DIR = moc/win
44} 44}
45 45
46 46
47INTERFACES = kofilterview_base.ui 47INTERFACES = kofilterview_base.ui
48# filteredit_base.ui 48# filteredit_base.ui
49 49
50# kdateedit.h \ 50# kdateedit.h \
51 51
52HEADERS = \ 52HEADERS = \
53 filteredit_base.h \ 53 filteredit_base.h \
54 alarmclient.h \ 54 alarmclient.h \
55 calendarview.h \ 55 calendarview.h \
56 customlistviewitem.h \ 56 customlistviewitem.h \
57 datenavigator.h \ 57 datenavigator.h \
58 docprefs.h \ 58 docprefs.h \
59 filtereditdialog.h \ 59 filtereditdialog.h \
60 incomingdialog.h \ 60 incomingdialog.h \
61 incomingdialog_base.h \ 61 incomingdialog_base.h \
62 interfaces/korganizer/baseview.h \ 62 interfaces/korganizer/baseview.h \
63 interfaces/korganizer/calendarviewbase.h \ 63 interfaces/korganizer/calendarviewbase.h \
64 journalentry.h \ 64 journalentry.h \
65 kdatenavigator.h \ 65 kdatenavigator.h \
66 koagenda.h \ 66 koagenda.h \
67 koagendaitem.h \ 67 koagendaitem.h \
68 koagendaview.h \ 68 koagendaview.h \
69 kocounterdialog.h \ 69 kocounterdialog.h \
70 kodaymatrix.h \ 70 kodaymatrix.h \
71 kodialogmanager.h \ 71 kodialogmanager.h \
72 koeditordetails.h \ 72 koeditordetails.h \
73 koeditorgeneral.h \ 73 koeditorgeneral.h \
74 koeditorgeneralevent.h \ 74 koeditorgeneralevent.h \
75 koeditorgeneraltodo.h \ 75 koeditorgeneraltodo.h \
76 koeditorrecurrence.h \ 76 koeditorrecurrence.h \
77 koeventeditor.h \ 77 koeventeditor.h \
78 koeventpopupmenu.h \ 78 koeventpopupmenu.h \
79 koeventview.h \ 79 koeventview.h \
80 koeventviewer.h \ 80 koeventviewer.h \
81 koeventviewerdialog.h \ 81 koeventviewerdialog.h \
82 kofilterview.h \ 82 kofilterview.h \
83 koglobals.h \ 83 koglobals.h \
84 koincidenceeditor.h \ 84 koincidenceeditor.h \
85 kojournalview.h \ 85 kojournalview.h \
86 kolistview.h \ 86 kolistview.h \
87 kolocationbox.h \ 87 kolocationbox.h \
88 komonthview.h \ 88 komonthview.h \
89 koprefs.h \ 89 koprefs.h \
90 koprefsdialog.h \ 90 koprefsdialog.h \
91 kotimespanview.h \ 91 kotimespanview.h \
92 kotodoeditor.h \ 92 kotodoeditor.h \
93 kotodoview.h \ 93 kotodoview.h \
94 kotodoviewitem.h \ 94 kotodoviewitem.h \
95 koviewmanager.h \ 95 koviewmanager.h \
96 kowhatsnextview.h \ 96 kowhatsnextview.h \
97 ktimeedit.h \ 97 ktimeedit.h \
98 lineview.h \ 98 lineview.h \
99 mainwindow.h \ 99 mainwindow.h \
100 navigatorbar.h \ 100 navigatorbar.h \
101 outgoingdialog.h \ 101 outgoingdialog.h \
102 outgoingdialog_base.h \ 102 outgoingdialog_base.h \
103 publishdialog.h \ 103 publishdialog.h \
104 publishdialog_base.h \ 104 publishdialog_base.h \
105 savetemplatedialog.h \ 105 savetemplatedialog.h \
106 searchdialog.h \ 106 searchdialog.h \
107 simplealarmclient.h \ 107 simplealarmclient.h \
108 statusdialog.h \ 108 statusdialog.h \
109 timeline.h \ 109 timeline.h \
110 timespanview.h \ 110 timespanview.h \
111 version.h \ 111 version.h \
112 ../kalarmd/alarmdialog.h \ 112 ../kalarmd/alarmdialog.h \
113 113
114 114
115SOURCES = \ 115SOURCES = \
116filteredit_base.cpp \ 116filteredit_base.cpp \
117 calendarview.cpp \ 117 calendarview.cpp \
118 datenavigator.cpp \ 118 datenavigator.cpp \
119 docprefs.cpp \ 119 docprefs.cpp \
120 filtereditdialog.cpp \ 120 filtereditdialog.cpp \
121 incomingdialog.cpp \ 121 incomingdialog.cpp \
122 incomingdialog_base.cpp \ 122 incomingdialog_base.cpp \
123 journalentry.cpp \ 123 journalentry.cpp \
124 kdatenavigator.cpp \ 124 kdatenavigator.cpp \
125 koagenda.cpp \ 125 koagenda.cpp \
126 koagendaitem.cpp \ 126 koagendaitem.cpp \
127 koagendaview.cpp \ 127 koagendaview.cpp \
128 kocounterdialog.cpp \ 128 kocounterdialog.cpp \
129 kodaymatrix.cpp \ 129 kodaymatrix.cpp \
130 kodialogmanager.cpp \ 130 kodialogmanager.cpp \
131 koeditordetails.cpp \ 131 koeditordetails.cpp \
132 koeditorgeneral.cpp \ 132 koeditorgeneral.cpp \
133 koeditorgeneralevent.cpp \ 133 koeditorgeneralevent.cpp \
134 koeditorgeneraltodo.cpp \ 134 koeditorgeneraltodo.cpp \
135 koeditorrecurrence.cpp \ 135 koeditorrecurrence.cpp \
136 koeventeditor.cpp \ 136 koeventeditor.cpp \
137 koeventpopupmenu.cpp \ 137 koeventpopupmenu.cpp \
138 koeventview.cpp \ 138 koeventview.cpp \
139 koeventviewer.cpp \ 139 koeventviewer.cpp \
140 koeventviewerdialog.cpp \ 140 koeventviewerdialog.cpp \
141 kofilterview.cpp \ 141 kofilterview.cpp \
142 koglobals.cpp \ 142 koglobals.cpp \
143 koincidenceeditor.cpp \ 143 koincidenceeditor.cpp \
144 kojournalview.cpp \ 144 kojournalview.cpp \
145 kolistview.cpp \ 145 kolistview.cpp \
146 kolocationbox.cpp \ 146 kolocationbox.cpp \
147 komonthview.cpp \ 147 komonthview.cpp \
148 koprefs.cpp \ 148 koprefs.cpp \
149 koprefsdialog.cpp \ 149 koprefsdialog.cpp \
150 kotimespanview.cpp \ 150 kotimespanview.cpp \
151 kotodoeditor.cpp \ 151 kotodoeditor.cpp \
152 kotodoview.cpp \ 152 kotodoview.cpp \
153 kotodoviewitem.cpp \ 153 kotodoviewitem.cpp \
154 koviewmanager.cpp \ 154 koviewmanager.cpp \
155 kowhatsnextview.cpp \ 155 kowhatsnextview.cpp \
156 ktimeedit.cpp \ 156 ktimeedit.cpp \
157 lineview.cpp \ 157 lineview.cpp \
158 main.cpp \ 158 main.cpp \
159 mainwindow.cpp \ 159 mainwindow.cpp \
160 navigatorbar.cpp \ 160 navigatorbar.cpp \
161 outgoingdialog.cpp \ 161 outgoingdialog.cpp \
162 outgoingdialog_base.cpp \ 162 outgoingdialog_base.cpp \
163 publishdialog.cpp \ 163 publishdialog.cpp \
164 publishdialog_base.cpp \ 164 publishdialog_base.cpp \
165 savetemplatedialog.cpp \ 165 savetemplatedialog.cpp \
166 searchdialog.cpp \ 166 searchdialog.cpp \
167 simplealarmclient.cpp \ 167 simplealarmclient.cpp \
168 statusdialog.cpp \ 168 statusdialog.cpp \
169 timeline.cpp \ 169 timeline.cpp \
170 timespanview.cpp \ 170 timespanview.cpp \
171 ../kalarmd/alarmdialog.cpp 171 ../kalarmd/alarmdialog.cpp
172 172
173HEADERS += calprintbase.h calprinter.h calprintplugins.h cellitem.h 173HEADERS += calprintbase.h calprinter.h calprintplugins.h cellitem.h
174INTERFACES += calprintdayconfig_base.ui \ 174INTERFACES += calprintdayconfig_base.ui \
175 calprintmonthconfig_base.ui \ 175 calprintmonthconfig_base.ui \
176 calprinttodoconfig_base.ui \ 176 calprinttodoconfig_base.ui \
177 calprintweekconfig_base.ui 177 calprintweekconfig_base.ui
178SOURCES += calprintbase.cpp calprinter.cpp calprintplugins.cpp cellitem.cpp 178SOURCES += calprintbase.cpp calprinter.cpp calprintplugins.cpp cellitem.cpp
179 179
180 180
181 181
182win32: { 182win32: {
183HEADERS += ../outport/msoutl9.h \ 183HEADERS += ../outport/msoutl9.h \
184 koimportoldialog.h 184 koimportoldialog.h
185 185
186 186
187SOURCES += ../outport/msoutl9.cpp \ 187SOURCES += ../outport/msoutl9.cpp \
188 koimportoldialog.cpp 188 koimportoldialog.cpp
189 189
190 190
191} 191}
192 192
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 554c6e5..4390a06 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -1,509 +1,511 @@
1/* 1/*
2 This file is part of KDE-Pim/Pi. 2 This file is part of KDE-Pim/Pi.
3 Copyright (c) 2004 Ulf Schenk 3 Copyright (c) 2004 Ulf Schenk
4 4
5 This library is free software; you can redistribute it and/or 5 This library is free software; you can redistribute it and/or
6 modify it under the terms of the GNU Library General Public 6 modify it under the terms of the GNU Library General Public
7 License as published by the Free Software Foundation; either 7 License as published by the Free Software Foundation; either
8 version 2 of the License, or (at your option) any later version. 8 version 2 of the License, or (at your option) any later version.
9 9
10 This library is distributed in the hope that it will be useful, 10 This library 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 GNU 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 Library General Public License for more details. 13 Library General Public License for more details.
14 14
15 You should have received a copy of the GNU Library General Public License 15 You should have received a copy of the GNU Library General Public License
16 along with this library; see the file COPYING.LIB. If not, write to 16 along with this library; see the file COPYING.LIB. If not, write to
17 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, 17 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
18 Boston, MA 02111-1307, USA. 18 Boston, MA 02111-1307, USA.
19*/ 19*/
20 20
21// $Id$ 21// $Id$
22 22
23#include "ksyncmanager.h" 23#include "ksyncmanager.h"
24 24
25#include <stdlib.h> 25#include <stdlib.h>
26 26
27#ifndef _WIN32_ 27#ifndef _WIN32_
28#include <unistd.h> 28#include <unistd.h>
29#endif 29#endif
30 30
31 31
32#include "ksyncprofile.h" 32#include "ksyncprofile.h"
33#include "ksyncprefsdialog.h" 33#include "ksyncprefsdialog.h"
34#include "kpimprefs.h" 34#include "kpimprefs.h"
35#include <kmessagebox.h> 35#include <kmessagebox.h>
36 36
37#include <qdir.h> 37#include <qdir.h>
38#include <qprogressbar.h> 38#include <qprogressbar.h>
39#include <qpopupmenu.h> 39#include <qpopupmenu.h>
40#include <qpushbutton.h> 40#include <qpushbutton.h>
41#include <qradiobutton.h> 41#include <qradiobutton.h>
42#include <qbuttongroup.h> 42#include <qbuttongroup.h>
43#include <qtimer.h> 43#include <qtimer.h>
44#include <qmessagebox.h> 44#include <qmessagebox.h>
45#include <qapplication.h> 45#include <qapplication.h>
46#include <qlineedit.h> 46#include <qlineedit.h>
47#include <qdialog.h> 47#include <qdialog.h>
48#include <qlayout.h> 48#include <qlayout.h>
49#include <qtextcodec.h> 49#include <qtextcodec.h>
50#include <qlabel.h> 50#include <qlabel.h>
51#include <qcheckbox.h> 51#include <qcheckbox.h>
52 52
53#include <klocale.h> 53#include <klocale.h>
54#include <kglobal.h> 54#include <kglobal.h>
55#include <kconfig.h> 55#include <kconfig.h>
56#include <kfiledialog.h> 56#include <kfiledialog.h>
57 57
58KSyncManager::KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu) 58KSyncManager::KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu)
59 : QObject(), mParent(parent), mImplementation(implementation), mTargetApp(ta), mPrefs(prefs ),mSyncMenu(syncmenu) 59 : QObject(), mParent(parent), mImplementation(implementation), mTargetApp(ta), mPrefs(prefs ),mSyncMenu(syncmenu)
60{ 60{
61 mServerSocket = 0; 61 mServerSocket = 0;
62 bar = new QProgressBar ( 1, 0 ); 62 bar = new QProgressBar ( 1, 0 );
63 bar->setCaption (""); 63 bar->setCaption ("");
64 64
65 int w = 300; 65 int w = 300;
66 if ( QApplication::desktop()->width() < 320 ) 66 if ( QApplication::desktop()->width() < 320 )
67 w = 220; 67 w = 220;
68 int h = bar->sizeHint().height() ; 68 int h = bar->sizeHint().height() ;
69 int dw = QApplication::desktop()->width(); 69 int dw = QApplication::desktop()->width();
70 int dh = QApplication::desktop()->height(); 70 int dh = QApplication::desktop()->height();
71 bar->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); 71 bar->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
72 if ( mPrefs->mPassiveSyncAutoStart ) 72 if ( mPrefs->mPassiveSyncAutoStart )
73 enableQuick( false ); 73 enableQuick( false );
74 74
75} 75}
76 76
77KSyncManager::~KSyncManager() 77KSyncManager::~KSyncManager()
78{ 78{
79 delete bar; 79 delete bar;
80} 80}
81 81
82 82
83void KSyncManager::fillSyncMenu() 83void KSyncManager::fillSyncMenu()
84{ 84{
85 if ( mSyncMenu->count() ) 85 if ( mSyncMenu->count() )
86 mSyncMenu->clear(); 86 mSyncMenu->clear();
87 87
88 mSyncMenu->insertItem( i18n("Configure..."), 0 ); 88 mSyncMenu->insertItem( i18n("Configure..."), 0 );
89 mSyncMenu->insertSeparator(); 89 mSyncMenu->insertSeparator();
90 if ( mServerSocket == 0 ) { 90 if ( mServerSocket == 0 ) {
91 mSyncMenu->insertItem( i18n("Enable Pi-Sync"), 2 ); 91 mSyncMenu->insertItem( i18n("Enable Pi-Sync"), 2 );
92 } else { 92 } else {
93 mSyncMenu->insertItem( i18n("Disable Pi-Sync"), 3 ); 93 mSyncMenu->insertItem( i18n("Disable Pi-Sync"), 3 );
94 } 94 }
95 mSyncMenu->insertSeparator(); 95 mSyncMenu->insertSeparator();
96 mSyncMenu->insertItem( i18n("Multiple sync"), 1 ); 96 mSyncMenu->insertItem( i18n("Multiple sync"), 1 );
97 mSyncMenu->insertSeparator(); 97 mSyncMenu->insertSeparator();
98 98
99 KConfig config ( locateLocal( "config","ksyncprofilesrc" ) ); 99 KConfig config ( locateLocal( "config","ksyncprofilesrc" ) );
100 config.setGroup("General"); 100 config.setGroup("General");
101 QStringList prof = config.readListEntry("SyncProfileNames"); 101 QStringList prof = config.readListEntry("SyncProfileNames");
102 mLocalMachineName = config.readEntry("LocalMachineName","undefined"); 102 mLocalMachineName = config.readEntry("LocalMachineName","undefined");
103 if ( prof.count() < 2 ) { 103 if ( prof.count() < 2 ) {
104 prof.clear(); 104 prof.clear();
105 QString externalName;
105#ifdef DESKTOP_VERSION 106#ifdef DESKTOP_VERSION
106#ifdef _WIN32_ 107#ifdef _WIN32_
107 prof << i18n("OutLook(not_implemented)"); 108 externalName = "OutLook(not_implemented)";
108#else 109#else
109 prof << i18n("KDE_Desktop"); 110 externalName = "KDE_Desktop";
110#endif 111#endif
111#else 112#else
112 prof << i18n("Sharp_DTM"); 113 externalName = "Sharp_DTM";
113#endif 114#endif
115 prof << externalName;
114 prof << i18n("Local_file"); 116 prof << i18n("Local_file");
115 prof << i18n("Last_file"); 117 prof << i18n("Last_file");
116 KSyncProfile* temp = new KSyncProfile (); 118 KSyncProfile* temp = new KSyncProfile ();
117 temp->setName( prof[0] ); 119 temp->setName( prof[0] );
118 temp->writeConfig(&config); 120 temp->writeConfig(&config);
119 temp->setName( prof[1] ); 121 temp->setName( prof[1] );
120 temp->writeConfig(&config); 122 temp->writeConfig(&config);
121 temp->setName( prof[2] ); 123 temp->setName( prof[2] );
122 temp->writeConfig(&config); 124 temp->writeConfig(&config);
123 config.setGroup("General"); 125 config.setGroup("General");
124 config.writeEntry("SyncProfileNames",prof); 126 config.writeEntry("SyncProfileNames",prof);
125 config.writeEntry("ExternSyncProfiles","Sharp_DTM"); 127 config.writeEntry("ExternSyncProfiles",externalName);
126 config.sync(); 128 config.sync();
127 delete temp; 129 delete temp;
128 } 130 }
129 mExternSyncProfiles = config.readListEntry("ExternSyncProfiles"); 131 mExternSyncProfiles = config.readListEntry("ExternSyncProfiles");
130 mSyncProfileNames = prof; 132 mSyncProfileNames = prof;
131 unsigned int i; 133 unsigned int i;
132 for ( i = 0; i < prof.count(); ++i ) { 134 for ( i = 0; i < prof.count(); ++i ) {
133 mSyncMenu->insertItem( prof[i], 1000+i ); 135 mSyncMenu->insertItem( prof[i], 1000+i );
134 if ( i == 2 ) 136 if ( i == 2 )
135 mSyncMenu->insertSeparator(); 137 mSyncMenu->insertSeparator();
136 } 138 }
137 QDir app_dir; 139 QDir app_dir;
138 //US do not display SharpDTM if app is pwmpi, or no sharpfiles available 140 //US do not display SharpDTM if app is pwmpi, or no sharpfiles available
139 if ( mTargetApp == PWMPI) { 141 if ( mTargetApp == PWMPI) {
140 mSyncMenu->removeItem( 1000 ); 142 mSyncMenu->removeItem( 1000 );
141 } 143 }
142#ifndef DESKTOP_VERSION 144#ifndef DESKTOP_VERSION
143 else if (!app_dir.exists(QDir::homeDirPath()+"/Applications/dtm" ) ) { 145 else if (!app_dir.exists(QDir::homeDirPath()+"/Applications/dtm" ) ) {
144 mSyncMenu->removeItem( 1000 ); 146 mSyncMenu->removeItem( 1000 );
145 } 147 }
146#endif 148#endif
147 mSyncMenu->removeItem( 1002 ); 149 mSyncMenu->removeItem( 1002 );
148} 150}
149 151
150void KSyncManager::slotSyncMenu( int action ) 152void KSyncManager::slotSyncMenu( int action )
151{ 153{
152 qDebug("syncaction %d ", action); 154 qDebug("syncaction %d ", action);
153 if ( action == 0 ) { 155 if ( action == 0 ) {
154 156
155 // seems to be a Qt2 event handling bug 157 // seems to be a Qt2 event handling bug
156 // syncmenu.clear causes a segfault at first time 158 // syncmenu.clear causes a segfault at first time
157 // when we call it after the main event loop, it is ok 159 // when we call it after the main event loop, it is ok
158 // same behaviour when calling OM/Pi via QCOP for the first time 160 // same behaviour when calling OM/Pi via QCOP for the first time
159 QTimer::singleShot ( 1, this, SLOT ( confSync() ) ); 161 QTimer::singleShot ( 1, this, SLOT ( confSync() ) );
160 //confSync(); 162 //confSync();
161 163
162 return; 164 return;
163 } 165 }
164 if ( action == 1 ) { 166 if ( action == 1 ) {
165 multiSync( true ); 167 multiSync( true );
166 return; 168 return;
167 } 169 }
168 if ( action == 2 ) { 170 if ( action == 2 ) {
169 enableQuick(); 171 enableQuick();
170 QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) ); 172 QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) );
171 return; 173 return;
172 } 174 }
173 if ( action == 3 ) { 175 if ( action == 3 ) {
174 delete mServerSocket; 176 delete mServerSocket;
175 mServerSocket = 0; 177 mServerSocket = 0;
176 QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) ); 178 QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) );
177 return; 179 return;
178 } 180 }
179 181
180 if (blockSave()) 182 if (blockSave())
181 return; 183 return;
182 184
183 setBlockSave(true); 185 setBlockSave(true);
184 bool silent = false; 186 bool silent = false;
185 if ( action == 999 ) { 187 if ( action == 999 ) {
186 //special mode for silent syncing 188 //special mode for silent syncing
187 action = 1000; 189 action = 1000;
188 silent = true; 190 silent = true;
189 } 191 }
190 192
191 mCurrentSyncProfile = action - 1000 ; 193 mCurrentSyncProfile = action - 1000 ;
192 mCurrentSyncDevice = mSyncProfileNames[mCurrentSyncProfile] ; 194 mCurrentSyncDevice = mSyncProfileNames[mCurrentSyncProfile] ;
193 mCurrentSyncName = mLocalMachineName ; 195 mCurrentSyncName = mLocalMachineName ;
194 KConfig config ( locateLocal( "config","ksyncprofilesrc" ) ); 196 KConfig config ( locateLocal( "config","ksyncprofilesrc" ) );
195 KSyncProfile* temp = new KSyncProfile (); 197 KSyncProfile* temp = new KSyncProfile ();
196 temp->setName(mSyncProfileNames[mCurrentSyncProfile]); 198 temp->setName(mSyncProfileNames[mCurrentSyncProfile]);
197 temp->readConfig(&config); 199 temp->readConfig(&config);
198 if (silent) { 200 if (silent) {
199 mAskForPreferences = false; 201 mAskForPreferences = false;
200 mShowSyncSummary = false; 202 mShowSyncSummary = false;
201 mWriteBackFile = true; 203 mWriteBackFile = true;
202 mSyncAlgoPrefs = 2;// take newest 204 mSyncAlgoPrefs = 2;// take newest
203 } 205 }
204 else { 206 else {
205 mAskForPreferences = temp->getAskForPreferences(); 207 mAskForPreferences = temp->getAskForPreferences();
206 mShowSyncSummary = temp->getShowSummaryAfterSync(); 208 mShowSyncSummary = temp->getShowSummaryAfterSync();
207 mWriteBackFile = temp->getWriteBackFile(); 209 mWriteBackFile = temp->getWriteBackFile();
208 mSyncAlgoPrefs = temp->getSyncPrefs(); 210 mSyncAlgoPrefs = temp->getSyncPrefs();
209 } 211 }
210 mWriteBackExistingOnly = temp->getWriteBackExisting(); 212 mWriteBackExistingOnly = temp->getWriteBackExisting();
211 mIsKapiFile = temp->getIsKapiFile(); 213 mIsKapiFile = temp->getIsKapiFile();
212 mWriteBackInFuture = 0; 214 mWriteBackInFuture = 0;
213 if ( temp->getWriteBackFuture() ) 215 if ( temp->getWriteBackFuture() )
214 mWriteBackInFuture = temp->getWriteBackFutureWeeks( ); 216 mWriteBackInFuture = temp->getWriteBackFutureWeeks( );
215 217
216 if ( action == 1000 ) { 218 if ( action == 1000 ) {
217#ifdef DESKTOP_VERSION 219#ifdef DESKTOP_VERSION
218 syncKDE(); 220 syncKDE();
219#else 221#else
220 syncSharp(); 222 syncSharp();
221#endif 223#endif
222 224
223 } else if ( action == 1001 ) { 225 } else if ( action == 1001 ) {
224 syncLocalFile(); 226 syncLocalFile();
225 227
226 } else if ( action == 1002 ) { 228 } else if ( action == 1002 ) {
227 mWriteBackFile = false; 229 mWriteBackFile = false;
228 mAskForPreferences = false; 230 mAskForPreferences = false;
229 mShowSyncSummary = false; 231 mShowSyncSummary = false;
230 mSyncAlgoPrefs = 3; 232 mSyncAlgoPrefs = 3;
231 quickSyncLocalFile(); 233 quickSyncLocalFile();
232 234
233 } else if ( action >= 1003 ) { 235 } else if ( action >= 1003 ) {
234 if ( temp->getIsLocalFileSync() ) { 236 if ( temp->getIsLocalFileSync() ) {
235 switch(mTargetApp) 237 switch(mTargetApp)
236 { 238 {
237 case (KAPI): 239 case (KAPI):
238 if ( syncWithFile( temp->getRemoteFileNameAB( ), false ) ) 240 if ( syncWithFile( temp->getRemoteFileNameAB( ), false ) )
239 mPrefs->mLastSyncedLocalFile = temp->getRemoteFileNameAB(); 241 mPrefs->mLastSyncedLocalFile = temp->getRemoteFileNameAB();
240 break; 242 break;
241 case (KOPI): 243 case (KOPI):
242 if ( syncWithFile( temp->getRemoteFileName( ), false ) ) 244 if ( syncWithFile( temp->getRemoteFileName( ), false ) )
243 mPrefs->mLastSyncedLocalFile = temp->getRemoteFileName(); 245 mPrefs->mLastSyncedLocalFile = temp->getRemoteFileName();
244 break; 246 break;
245 case (PWMPI): 247 case (PWMPI):
246 if ( syncWithFile( temp->getRemoteFileNamePWM( ), false ) ) 248 if ( syncWithFile( temp->getRemoteFileNamePWM( ), false ) )
247 mPrefs->mLastSyncedLocalFile = temp->getRemoteFileNamePWM(); 249 mPrefs->mLastSyncedLocalFile = temp->getRemoteFileNamePWM();
248 break; 250 break;
249 default: 251 default:
250 qDebug("KSyncManager::slotSyncMenu: invalid apptype selected"); 252 qDebug("KSyncManager::slotSyncMenu: invalid apptype selected");
251 break; 253 break;
252 254
253 } 255 }
254 } else { 256 } else {
255 if ( temp->getIsPhoneSync() ) { 257 if ( temp->getIsPhoneSync() ) {
256 mPhoneDevice = temp->getPhoneDevice( ) ; 258 mPhoneDevice = temp->getPhoneDevice( ) ;
257 mPhoneConnection = temp->getPhoneConnection( ); 259 mPhoneConnection = temp->getPhoneConnection( );
258 mPhoneModel = temp->getPhoneModel( ); 260 mPhoneModel = temp->getPhoneModel( );
259 syncPhone(); 261 syncPhone();
260 } else if ( temp->getIsPiSync() ) { 262 } else if ( temp->getIsPiSync() ) {
261 if ( mTargetApp == KAPI ) { 263 if ( mTargetApp == KAPI ) {
262 mPassWordPiSync = temp->getRemotePwAB(); 264 mPassWordPiSync = temp->getRemotePwAB();
263 mActiveSyncPort = temp->getRemotePortAB(); 265 mActiveSyncPort = temp->getRemotePortAB();
264 mActiveSyncIP = temp->getRemoteIPAB(); 266 mActiveSyncIP = temp->getRemoteIPAB();
265 } else if ( mTargetApp == KOPI ) { 267 } else if ( mTargetApp == KOPI ) {
266 mPassWordPiSync = temp->getRemotePw(); 268 mPassWordPiSync = temp->getRemotePw();
267 mActiveSyncPort = temp->getRemotePort(); 269 mActiveSyncPort = temp->getRemotePort();
268 mActiveSyncIP = temp->getRemoteIP(); 270 mActiveSyncIP = temp->getRemoteIP();
269 } else { 271 } else {
270 mPassWordPiSync = temp->getRemotePwPWM(); 272 mPassWordPiSync = temp->getRemotePwPWM();
271 mActiveSyncPort = temp->getRemotePortPWM(); 273 mActiveSyncPort = temp->getRemotePortPWM();
272 mActiveSyncIP = temp->getRemoteIPPWM(); 274 mActiveSyncIP = temp->getRemoteIPPWM();
273 } 275 }
274 syncPi(); 276 syncPi();
275 while ( !mPisyncFinished ) { 277 while ( !mPisyncFinished ) {
276 //qDebug("waiting "); 278 //qDebug("waiting ");
277 qApp->processEvents(); 279 qApp->processEvents();
278 } 280 }
279 } else 281 } else
280 syncRemote( temp ); 282 syncRemote( temp );
281 283
282 } 284 }
283 } 285 }
284 delete temp; 286 delete temp;
285 setBlockSave(false); 287 setBlockSave(false);
286} 288}
287 289
288void KSyncManager::enableQuick( bool ask ) 290void KSyncManager::enableQuick( bool ask )
289{ 291{
290 bool autoStart; 292 bool autoStart;
291 bool changed = false; 293 bool changed = false;
292 if ( ask ) { 294 if ( ask ) {
293 QDialog dia ( 0, "input-dialog", true ); 295 QDialog dia ( 0, "input-dialog", true );
294 QLineEdit lab ( &dia ); 296 QLineEdit lab ( &dia );
295 QVBoxLayout lay( &dia ); 297 QVBoxLayout lay( &dia );
296 lab.setText( mPrefs->mPassiveSyncPort ); 298 lab.setText( mPrefs->mPassiveSyncPort );
297 lay.setMargin(7); 299 lay.setMargin(7);
298 lay.setSpacing(7); 300 lay.setSpacing(7);
299 int po = 9197+mTargetApp; 301 int po = 9197+mTargetApp;
300 QLabel label ( i18n("Port number (Default: %1)").arg(po), &dia ); 302 QLabel label ( i18n("Port number (Default: %1)").arg(po), &dia );
301 lay.addWidget( &label); 303 lay.addWidget( &label);
302 lay.addWidget( &lab); 304 lay.addWidget( &lab);
303 305
304 QLineEdit lepw ( &dia ); 306 QLineEdit lepw ( &dia );
305 lepw.setText( mPrefs->mPassiveSyncPw ); 307 lepw.setText( mPrefs->mPassiveSyncPw );
306 QLabel label2 ( i18n("Password to enable\naccess from remote:"), &dia ); 308 QLabel label2 ( i18n("Password to enable\naccess from remote:"), &dia );
307 lay.addWidget( &label2); 309 lay.addWidget( &label2);
308 lay.addWidget( &lepw); 310 lay.addWidget( &lepw);
309 QCheckBox autostart(i18n("Automatically start\nat application startup"), &dia ); 311 QCheckBox autostart(i18n("Automatically start\nat application startup"), &dia );
310 lay.addWidget( &autostart); 312 lay.addWidget( &autostart);
311 autostart.setChecked( mPrefs->mPassiveSyncAutoStart ); 313 autostart.setChecked( mPrefs->mPassiveSyncAutoStart );
312#ifdef DESKTOP_VERSION 314#ifdef DESKTOP_VERSION
313#ifdef _WIN32_ 315#ifdef _WIN32_
314 QCheckBox syncdesktop( i18n("Automatically sync with Outlook\nwhen receiving sync request"),&dia ); 316 QCheckBox syncdesktop( i18n("Automatically sync with Outlook\nwhen receiving sync request"),&dia );
315#else 317#else
316 QCheckBox syncdesktop( i18n("Automatically sync with KDE-Desktop\nwhen receiving sync request"),&dia ); 318 QCheckBox syncdesktop( i18n("Automatically sync with KDE-Desktop\nwhen receiving sync request"),&dia );
317#endif 319#endif
318 lay.addWidget( &syncdesktop); 320 lay.addWidget( &syncdesktop);
319#else 321#else
320 mPrefs->mPassiveSyncWithDesktop = false; 322 mPrefs->mPassiveSyncWithDesktop = false;
321 QCheckBox syncdesktop( i18n("Automatically sync\nwith KDE-Desktop"),&dia ); 323 QCheckBox syncdesktop( i18n("Automatically sync\nwith KDE-Desktop"),&dia );
322 syncdesktop.hide(); 324 syncdesktop.hide();
323#endif 325#endif
324 syncdesktop.setChecked( mPrefs->mPassiveSyncWithDesktop ); 326 syncdesktop.setChecked( mPrefs->mPassiveSyncWithDesktop );
325 327
326 dia.setFixedSize( 230,120 ); 328 dia.setFixedSize( 230,120 );
327 dia.setCaption( i18n("Enter port for Pi-Sync") ); 329 dia.setCaption( i18n("Enter port for Pi-Sync") );
328 QPushButton pb ( "OK", &dia); 330 QPushButton pb ( "OK", &dia);
329 lay.addWidget( &pb ); 331 lay.addWidget( &pb );
330 connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) ); 332 connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) );
331 dia.show(); 333 dia.show();
332 if ( ! dia.exec() ) 334 if ( ! dia.exec() )
333 return; 335 return;
334 dia.hide(); 336 dia.hide();
335 qApp->processEvents(); 337 qApp->processEvents();
336 if ( mPrefs->mPassiveSyncPw != lepw.text() ) { 338 if ( mPrefs->mPassiveSyncPw != lepw.text() ) {
337 changed = true; 339 changed = true;
338 mPrefs->mPassiveSyncPw = lepw.text(); 340 mPrefs->mPassiveSyncPw = lepw.text();
339 } 341 }
340 if ( mPrefs->mPassiveSyncPort != lab.text() ) { 342 if ( mPrefs->mPassiveSyncPort != lab.text() ) {
341 mPrefs->mPassiveSyncPort = lab.text(); 343 mPrefs->mPassiveSyncPort = lab.text();
342 changed = true; 344 changed = true;
343 } 345 }
344 autoStart = autostart.isChecked(); 346 autoStart = autostart.isChecked();
345 if (mPrefs->mPassiveSyncWithDesktop != syncdesktop.isChecked() ) { 347 if (mPrefs->mPassiveSyncWithDesktop != syncdesktop.isChecked() ) {
346 changed = true; 348 changed = true;
347 mPrefs->mPassiveSyncWithDesktop = syncdesktop.isChecked(); 349 mPrefs->mPassiveSyncWithDesktop = syncdesktop.isChecked();
348 } 350 }
349 } 351 }
350 else 352 else
351 autoStart = mPrefs->mPassiveSyncAutoStart; 353 autoStart = mPrefs->mPassiveSyncAutoStart;
352 if ( autoStart != mPrefs->mPassiveSyncAutoStart ) 354 if ( autoStart != mPrefs->mPassiveSyncAutoStart )
353 changed = true; 355 changed = true;
354 bool ok; 356 bool ok;
355 mPrefs->mPassiveSyncAutoStart = false; 357 mPrefs->mPassiveSyncAutoStart = false;
356 Q_UINT16 port = mPrefs->mPassiveSyncPort.toUInt(&ok); 358 Q_UINT16 port = mPrefs->mPassiveSyncPort.toUInt(&ok);
357 if ( ! ok ) { 359 if ( ! ok ) {
358 KMessageBox::information( 0, i18n("No valid port")); 360 KMessageBox::information( 0, i18n("No valid port"));
359 return; 361 return;
360 } 362 }
361 //qDebug("port %d ", port); 363 //qDebug("port %d ", port);
362 mServerSocket = new KServerSocket ( mPrefs->mPassiveSyncPw, port ,1 ); 364 mServerSocket = new KServerSocket ( mPrefs->mPassiveSyncPw, port ,1 );
363 mServerSocket->setFileName( defaultFileName() ); 365 mServerSocket->setFileName( defaultFileName() );
364 //qDebug("connected "); 366 //qDebug("connected ");
365 if ( !mServerSocket->ok() ) { 367 if ( !mServerSocket->ok() ) {
366 KMessageBox::information( 0, i18n("Failed to bind or\nlisten to the port!")); 368 KMessageBox::information( 0, i18n("Failed to bind or\nlisten to the port!"));
367 delete mServerSocket; 369 delete mServerSocket;
368 mServerSocket = 0; 370 mServerSocket = 0;
369 return; 371 return;
370 } 372 }
371 mPrefs->mPassiveSyncAutoStart = autoStart; 373 mPrefs->mPassiveSyncAutoStart = autoStart;
372 if ( changed ) { 374 if ( changed ) {
373 mPrefs->writeConfig(); 375 mPrefs->writeConfig();
374 } 376 }
375 connect( mServerSocket, SIGNAL ( request_file() ),this, SIGNAL ( request_file() ) ); 377 connect( mServerSocket, SIGNAL ( request_file() ),this, SIGNAL ( request_file() ) );
376 connect( mServerSocket, SIGNAL ( file_received( bool ) ), this, SIGNAL ( getFile( bool ) ) ); 378 connect( mServerSocket, SIGNAL ( file_received( bool ) ), this, SIGNAL ( getFile( bool ) ) );
377} 379}
378 380
379void KSyncManager::syncLocalFile() 381void KSyncManager::syncLocalFile()
380{ 382{
381 383
382 QString fn =mPrefs->mLastSyncedLocalFile; 384 QString fn =mPrefs->mLastSyncedLocalFile;
383 QString ext; 385 QString ext;
384 386
385 switch(mTargetApp) 387 switch(mTargetApp)
386 { 388 {
387 case (KAPI): 389 case (KAPI):
388 ext = "(*.vcf)"; 390 ext = "(*.vcf)";
389 break; 391 break;
390 case (KOPI): 392 case (KOPI):
391 ext = "(*.ics/*.vcs)"; 393 ext = "(*.ics/*.vcs)";
392 break; 394 break;
393 case (PWMPI): 395 case (PWMPI):
394 ext = "(*.pwm)"; 396 ext = "(*.pwm)";
395 break; 397 break;
396 default: 398 default:
397 qDebug("KSyncManager::syncLocalFile: invalid apptype selected"); 399 qDebug("KSyncManager::syncLocalFile: invalid apptype selected");
398 break; 400 break;
399 401
400 } 402 }
401 403
402 fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename"+ext), mParent ); 404 fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename"+ext), mParent );
403 if ( fn == "" ) 405 if ( fn == "" )
404 return; 406 return;
405 if ( syncWithFile( fn, false ) ) { 407 if ( syncWithFile( fn, false ) ) {
406 qDebug("syncLocalFile() successful "); 408 qDebug("syncLocalFile() successful ");
407 } 409 }
408 410
409} 411}
410 412
411bool KSyncManager::syncWithFile( QString fn , bool quick ) 413bool KSyncManager::syncWithFile( QString fn , bool quick )
412{ 414{
413 bool ret = false; 415 bool ret = false;
414 QFileInfo info; 416 QFileInfo info;
415 info.setFile( fn ); 417 info.setFile( fn );
416 QString mess; 418 QString mess;
417 bool loadbup = true; 419 bool loadbup = true;
418 if ( !info. exists() ) { 420 if ( !info. exists() ) {
419 mess = i18n( "Sync file \n...%1\ndoes not exist!\nNothing synced!\n").arg(fn.right( 30) ); 421 mess = i18n( "Sync file \n...%1\ndoes not exist!\nNothing synced!\n").arg(fn.right( 30) );
420 int result = QMessageBox::warning( mParent, i18n("Warning!"), 422 int result = QMessageBox::warning( mParent, i18n("Warning!"),
421 mess ); 423 mess );
422 return ret; 424 return ret;
423 } 425 }
424 int result = 0; 426 int result = 0;
425 if ( !quick ) { 427 if ( !quick ) {
426 mess = i18n("Sync with file \n...%1\nfrom:\n%2\n").arg(fn.right( 25)).arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false )); 428 mess = i18n("Sync with file \n...%1\nfrom:\n%2\n").arg(fn.right( 25)).arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false ));
427 result = QMessageBox::warning( mParent, i18n("Warning!"), 429 result = QMessageBox::warning( mParent, i18n("Warning!"),
428 mess, 430 mess,
429 i18n("Sync"), i18n("Cancel"), 0, 431 i18n("Sync"), i18n("Cancel"), 0,
430 0, 1 ); 432 0, 1 );
431 if ( result ) 433 if ( result )
432 return false; 434 return false;
433 } 435 }
434 if ( mAskForPreferences ) 436 if ( mAskForPreferences )
435 if ( !edit_sync_options()) { 437 if ( !edit_sync_options()) {
436 mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") ); 438 mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") );
437 return false; 439 return false;
438 } 440 }
439 if ( result == 0 ) { 441 if ( result == 0 ) {
440 //qDebug("Now sycing ... "); 442 //qDebug("Now sycing ... ");
441 if ( ret = mImplementation->sync( this, fn, mSyncAlgoPrefs ) ) 443 if ( ret = mImplementation->sync( this, fn, mSyncAlgoPrefs ) )
442 mParent->topLevelWidget()->setCaption( i18n("Synchronization successful") ); 444 mParent->topLevelWidget()->setCaption( i18n("Synchronization successful") );
443 else 445 else
444 mParent->topLevelWidget()->setCaption( i18n("Sync cancelled or failed. Nothing synced.") ); 446 mParent->topLevelWidget()->setCaption( i18n("Sync cancelled or failed. Nothing synced.") );
445 if ( ! quick ) 447 if ( ! quick )
446 mPrefs->mLastSyncedLocalFile = fn; 448 mPrefs->mLastSyncedLocalFile = fn;
447 } 449 }
448 return ret; 450 return ret;
449} 451}
450 452
451void KSyncManager::quickSyncLocalFile() 453void KSyncManager::quickSyncLocalFile()
452{ 454{
453 455
454 if ( syncWithFile( mPrefs->mLastSyncedLocalFile, true ) ) { 456 if ( syncWithFile( mPrefs->mLastSyncedLocalFile, true ) ) {
455 qDebug("quick syncLocalFile() successful "); 457 qDebug("quick syncLocalFile() successful ");
456 458
457 } 459 }
458} 460}
459 461
460void KSyncManager::multiSync( bool askforPrefs ) 462void KSyncManager::multiSync( bool askforPrefs )
461{ 463{
462 if (blockSave()) 464 if (blockSave())
463 return; 465 return;
464 setBlockSave(true); 466 setBlockSave(true);
465 QString question = i18n("Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!"); 467 QString question = i18n("Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!");
466 if ( QMessageBox::information( mParent, i18n("KDE-Pim Sync"), 468 if ( QMessageBox::information( mParent, i18n("KDE-Pim Sync"),
467 question, 469 question,
468 i18n("Yes"), i18n("No"), 470 i18n("Yes"), i18n("No"),
469 0, 0 ) != 0 ) { 471 0, 0 ) != 0 ) {
470 setBlockSave(false); 472 setBlockSave(false);
471 mParent->topLevelWidget()->setCaption(i18n("Aborted! Nothing synced!")); 473 mParent->topLevelWidget()->setCaption(i18n("Aborted! Nothing synced!"));
472 return; 474 return;
473 } 475 }
474 mCurrentSyncDevice = i18n("Multiple profiles") ; 476 mCurrentSyncDevice = i18n("Multiple profiles") ;
475 mSyncAlgoPrefs = mPrefs->mRingSyncAlgoPrefs; 477 mSyncAlgoPrefs = mPrefs->mRingSyncAlgoPrefs;
476 if ( askforPrefs ) { 478 if ( askforPrefs ) {
477 if ( !edit_sync_options()) { 479 if ( !edit_sync_options()) {
478 mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") ); 480 mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") );
479 return; 481 return;
480 } 482 }
481 mPrefs->mRingSyncAlgoPrefs = mSyncAlgoPrefs; 483 mPrefs->mRingSyncAlgoPrefs = mSyncAlgoPrefs;
482 } 484 }
483 mParent->topLevelWidget()->setCaption(i18n("Multiple sync started.") ); 485 mParent->topLevelWidget()->setCaption(i18n("Multiple sync started.") );
484 qApp->processEvents(); 486 qApp->processEvents();
485 int num = ringSync() ; 487 int num = ringSync() ;
486 if ( num > 1 ) 488 if ( num > 1 )
487 ringSync(); 489 ringSync();
488 setBlockSave(false); 490 setBlockSave(false);
489 if ( num ) 491 if ( num )
490 emit save(); 492 emit save();
491 if ( num ) 493 if ( num )
492 mParent->topLevelWidget()->setCaption(i18n("%1 profiles synced. Multiple sync complete!").arg(num) ); 494 mParent->topLevelWidget()->setCaption(i18n("%1 profiles synced. Multiple sync complete!").arg(num) );
493 else 495 else
494 mParent->topLevelWidget()->setCaption(i18n("Nothing synced! No profiles defined for multisync!")); 496 mParent->topLevelWidget()->setCaption(i18n("Nothing synced! No profiles defined for multisync!"));
495 return; 497 return;
496} 498}
497 499
498int KSyncManager::ringSync() 500int KSyncManager::ringSync()
499{ 501{
500 int syncedProfiles = 0; 502 int syncedProfiles = 0;
501 unsigned int i; 503 unsigned int i;
502 QTime timer; 504 QTime timer;
503 KConfig config ( locateLocal( "config","ksyncprofilesrc" ) ); 505 KConfig config ( locateLocal( "config","ksyncprofilesrc" ) );
504 QStringList syncProfileNames = mSyncProfileNames; 506 QStringList syncProfileNames = mSyncProfileNames;
505 KSyncProfile* temp = new KSyncProfile (); 507 KSyncProfile* temp = new KSyncProfile ();
506 mAskForPreferences = false; 508 mAskForPreferences = false;
507 for ( i = 0; i < syncProfileNames.count(); ++i ) { 509 for ( i = 0; i < syncProfileNames.count(); ++i ) {
508 mCurrentSyncProfile = i; 510 mCurrentSyncProfile = i;
509 temp->setName(syncProfileNames[mCurrentSyncProfile]); 511 temp->setName(syncProfileNames[mCurrentSyncProfile]);
diff --git a/variables.pri b/variables.pri
index 2b83fb5..08c2a45 100644
--- a/variables.pri
+++ b/variables.pri
@@ -1,11 +1,10 @@
1 1
2# variables settings for compilation for Linux desktop and Qt 3.x.x 2# variables settings for compilation for Linux desktop and Qt 3.x.x
3 3
4unix { 4unix {
5CONFIG += debug 5CONFIG += release
6#release
7} 6}
8win32 { 7win32 {
9CONFIG += release 8CONFIG += release
10 9
11} \ No newline at end of file 10} \ No newline at end of file