-rw-r--r-- | Makefile | 529 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 8 | ||||
-rw-r--r-- | libkdepim/ksyncmanager.cpp | 63 | ||||
-rw-r--r-- | libkdepim/ksyncmanager.h | 4 |
4 files changed, 223 insertions, 381 deletions
@@ -1,362 +1,169 @@ | |||
1 | export KDEPIMDIR = $(shell pwd) | 1 | ############################################################################# |
2 | 2 | # Makefile for building: kdepim-desktop | |
3 | export 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: Wed Oct 20 16:51:16 2004 |
4 | 4 | # Project: kdepim-desktop.pro | |
5 | ifeq ($(PLATFORM) , zaurus) | 5 | # Template: subdirs |
6 | BUILD_NO_LDAP_PLUGIN=1 | 6 | # Command: $(QMAKE) -o Makefile kdepim-desktop.pro |
7 | endif | 7 | ############################################################################# |
8 | 8 | ||
9 | ifneq ($(PLATFORM) , zaurus) | 9 | MAKEFILE =Makefile |
10 | BUILD_NO_SHARP_PLUGIN=1 | 10 | QMAKE =qmake |
11 | endif | 11 | DEL_FILE = rm -f |
12 | 12 | CHK_DIR_EXISTS= test -d | |
13 | SUBDIRS_MICROKDE = \ | 13 | MKDIR = 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 | |
27 | 27 | first: all | |
28 | SUBDIRS_QTOPIA_PLUGIN = \ | 28 | |
29 | kabc/plugins/qtopia | 29 | all: Makefile $(SUBTARGETS) |
30 | 30 | ||
31 | SUBDIRS_OPIE_PLUGIN = \ | 31 | gammu/emb/common/$(MAKEFILE): |
32 | kabc/plugins/opie | 32 | @$(CHK_DIR_EXISTS) "gammu/emb/common" || $(MKDIR) "gammu/emb/common" |
33 | 33 | cd gammu/emb/common && $(QMAKE) common.pro -o $(MAKEFILE) | |
34 | SUBDIRS_SHARP_PLUGIN = \ | 34 | sub-gammu-emb-common: gammu/emb/common/$(MAKEFILE) FORCE |
35 | kabc/plugins/sharpdtm | 35 | cd gammu/emb/common && $(MAKE) -f $(MAKEFILE) |
36 | 36 | ||
37 | SUBDIRS_LDAP_PLUGIN = \ | 37 | gammu/emb/gammu/$(MAKEFILE): |
38 | kabc/plugins/ldap | 38 | @$(CHK_DIR_EXISTS) "gammu/emb/gammu" || $(MKDIR) "gammu/emb/gammu" |
39 | 39 | cd gammu/emb/gammu && $(QMAKE) gammu.pro -o $(MAKEFILE) | |
40 | SUBDIRS_MICROMAIL = \ | 40 | sub-gammu-emb-gammu: gammu/emb/gammu/$(MAKEFILE) FORCE |
41 | kmicromail/libetpan \ | 41 | cd gammu/emb/gammu && $(MAKE) -f $(MAKEFILE) |
42 | kmicromail/libmailwrapper \ | 42 | |
43 | kmicromail | 43 | libical/$(MAKEFILE): |
44 | 44 | @$(CHK_DIR_EXISTS) "libical" || $(MKDIR) "libical" | |
45 | SUBDIRS_GAMMU = \ | 45 | cd libical && $(QMAKE) libical.pro -o $(MAKEFILE) |
46 | gammu/emb/common \ | 46 | sub-libical: libical/$(MAKEFILE) FORCE |
47 | gammu/emb/gammu | 47 | cd libical && $(MAKE) -f $(MAKEFILE) |
48 | 48 | ||
49 | SUBDIRS_PWMANAGER = \ | 49 | libkcal/$(MAKEFILE): |
50 | pwmanager/libcrypt/mpi \ | 50 | @$(CHK_DIR_EXISTS) "libkcal" || $(MKDIR) "libkcal" |
51 | pwmanager/libcrypt/error \ | 51 | cd libkcal && $(QMAKE) libkcal.pro -o $(MAKEFILE) |
52 | pwmanager/libcrypt/cipher \ | 52 | sub-libkcal: libkcal/$(MAKEFILE) FORCE |
53 | pwmanager/libcrypt/zlib \ | 53 | cd libkcal && $(MAKE) -f $(MAKEFILE) |
54 | pwmanager/pwmanager | 54 | |
55 | 55 | microkde/$(MAKEFILE): | |
56 | SUBDIRS = \ | 56 | @$(CHK_DIR_EXISTS) "microkde" || $(MKDIR) "microkde" |
57 | $(SUBDIRS_MICROKDE) \ | 57 | cd microkde && $(QMAKE) microkde.pro -o $(MAKEFILE) |
58 | $(SUBDIRS_QTOPIA_PLUGIN) \ | 58 | sub-microkde: microkde/$(MAKEFILE) FORCE |
59 | $(SUBDIRS_OPIE_PLUGIN) \ | 59 | cd microkde && $(MAKE) -f $(MAKEFILE) |
60 | $(SUBDIRS_SHARP_PLUGIN) \ | 60 | |
61 | $(SUBDIRS_LDAP_PLUGIN) \ | 61 | libkdepim/$(MAKEFILE): |
62 | $(SUBDIRS_MICROMAIL) \ | 62 | @$(CHK_DIR_EXISTS) "libkdepim" || $(MKDIR) "libkdepim" |
63 | $(SUBDIRS_GAMMU) \ | 63 | cd libkdepim && $(QMAKE) libkdepim.pro -o $(MAKEFILE) |
64 | $(SUBDIRS_PWMANAGER) | 64 | sub-libkdepim: libkdepim/$(MAKEFILE) FORCE |
65 | 65 | cd libkdepim && $(MAKE) -f $(MAKEFILE) | |
66 | 66 | ||
67 | all: build_microkde \ | 67 | kabc/$(MAKEFILE): |
68 | build_qtopia_plugin \ | 68 | @$(CHK_DIR_EXISTS) "kabc" || $(MKDIR) "kabc" |
69 | build_opie_plugin \ | 69 | cd kabc && $(QMAKE) kabc.pro -o $(MAKEFILE) |
70 | build_sharp_plugin \ | 70 | sub-kabc: kabc/$(MAKEFILE) FORCE |
71 | build_ldap_plugin \ | 71 | cd kabc && $(MAKE) -f $(MAKEFILE) |
72 | build_micromail \ | 72 | |
73 | build_gammu \ | 73 | korganizer/$(MAKEFILE): |
74 | build_pwmanager | 74 | @$(CHK_DIR_EXISTS) "korganizer" || $(MKDIR) "korganizer" |
75 | 75 | cd korganizer && $(QMAKE) korganizer.pro -o $(MAKEFILE) | |
76 | 76 | sub-korganizer: korganizer/$(MAKEFILE) FORCE | |
77 | build_microkde: variable_test tmake | 77 | cd korganizer && $(MAKE) -f $(MAKEFILE) |
78 | for i in $(SUBDIRS_MICROKDE); do pushd $$i; \ | 78 | |
79 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 79 | kaddressbook/$(MAKEFILE): |
80 | done | 80 | @$(CHK_DIR_EXISTS) "kaddressbook" || $(MKDIR) "kaddressbook" |
81 | 81 | cd kaddressbook && $(QMAKE) kaddressbook.pro -o $(MAKEFILE) | |
82 | build_qtopia_plugin: build_microkde | 82 | sub-kaddressbook: kaddressbook/$(MAKEFILE) FORCE |
83 | ifdef BUILD_NO_QTOPIA_PLUGIN | 83 | cd kaddressbook && $(MAKE) -f $(MAKEFILE) |
84 | @echo == qtopia plugin not build. | 84 | |
85 | else | 85 | kabc/plugins/file/$(MAKEFILE): |
86 | for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \ | 86 | @$(CHK_DIR_EXISTS) "kabc/plugins/file" || $(MKDIR) "kabc/plugins/file" |
87 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 87 | cd kabc/plugins/file && $(QMAKE) file.pro -o $(MAKEFILE) |
88 | done | 88 | sub-kabc-plugins-file: kabc/plugins/file/$(MAKEFILE) FORCE |
89 | endif | 89 | cd kabc/plugins/file && $(MAKE) -f $(MAKEFILE) |
90 | 90 | ||
91 | build_opie_plugin: build_microkde | 91 | kabc/plugins/dir/$(MAKEFILE): |
92 | ifdef BUILD_NO_OPIE_PLUGIN | 92 | @$(CHK_DIR_EXISTS) "kabc/plugins/dir" || $(MKDIR) "kabc/plugins/dir" |
93 | @echo == opie plugin not build. | 93 | cd kabc/plugins/dir && $(QMAKE) dir.pro -o $(MAKEFILE) |
94 | else | 94 | sub-kabc-plugins-dir: kabc/plugins/dir/$(MAKEFILE) FORCE |
95 | for i in $(SUBDIRS_OPIE_PLUGIN); do pushd $$i; \ | 95 | cd kabc/plugins/dir && $(MAKE) -f $(MAKEFILE) |
96 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 96 | |
97 | done | 97 | Makefile: kdepim-desktop.pro /usr/lib/qt3/mkspecs/default/qmake.conf |
98 | endif | 98 | $(QMAKE) -o Makefile kdepim-desktop.pro |
99 | 99 | qmake: qmake_all | |
100 | build_sharp_plugin: build_microkde | 100 | @$(QMAKE) -o Makefile kdepim-desktop.pro |
101 | ifdef BUILD_NO_SHARP_PLUGIN | 101 | |
102 | @echo == ldap plugin not build. | 102 | all: $(SUBTARGETS) |
103 | else | 103 | qmake_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) |
104 | for i in $(SUBDIRS_SHARP_PLUGIN); do pushd $$i; \ | 104 | ( [ -d gammu/emb/common ] && cd gammu/emb/common ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
105 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 105 | ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
106 | done | 106 | ( [ -d libical ] && cd libical ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
107 | endif | 107 | ( [ -d libkcal ] && cd libkcal ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
108 | 108 | ( [ -d microkde ] && cd microkde ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true | |
109 | build_ldap_plugin: build_microkde | 109 | ( [ -d libkdepim ] && cd libkdepim ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
110 | ifdef BUILD_NO_LDAP_PLUGIN | 110 | ( [ -d kabc ] && cd kabc ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
111 | @echo == ldap plugin not build. | 111 | ( [ -d korganizer ] && cd korganizer ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
112 | else | 112 | ( [ -d kaddressbook ] && cd kaddressbook ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
113 | for i in $(SUBDIRS_LDAP_PLUGIN); do pushd $$i; \ | 113 | ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
114 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 114 | ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
115 | done | 115 | clean uicables mocables uiclean mocclean lexclean yaccclean : qmake_all FORCE |
116 | endif | 116 | ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
117 | 117 | ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) $@; ) || true | |
118 | 118 | ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; ) || true | |
119 | build_micromail: build_microkde | 119 | ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
120 | ifdef BUILD_NO_MICROMAIL | 120 | ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
121 | @echo == kmicromail not build. | 121 | ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
122 | else | 122 | ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
123 | for i in $(SUBDIRS_MICROMAIL); do pushd $$i; \ | 123 | ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
124 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 124 | ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
125 | done | 125 | ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
126 | endif | 126 | ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
127 | 127 | uninstall_subdirs: qmake_all FORCE | |
128 | build_gammu: variable_test tmake | 128 | ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
129 | ifdef BUILD_NO_GAMMU | 129 | ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
130 | @echo == gammu not build. | 130 | ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
131 | else | 131 | ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
132 | for i in $(SUBDIRS_GAMMU); do pushd $$i; \ | 132 | ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
133 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 133 | ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
134 | done | 134 | ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
135 | endif | 135 | ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
136 | 136 | ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true | |
137 | build_pwmanager: build_microkde | 137 | ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
138 | ifdef BUILD_NO_PWMANAGER | 138 | ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
139 | @echo == pwmanager not build. | 139 | install_subdirs: qmake_all FORCE |
140 | else | 140 | ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) install; ) || true |
141 | for i in $(SUBDIRS_PWMANAGER); do pushd $$i; \ | 141 | ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) install; ) || true |
142 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 142 | ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) install; ) || true |
143 | done | 143 | ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) install; ) || true |
144 | endif | 144 | ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) install; ) || true |
145 | 145 | ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) install; ) || true | |
146 | 146 | ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) install; ) || true | |
147 | variable_info: | 147 | ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) install; ) || true |
148 | @echo -------------------------------------- | 148 | ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) install; ) || true |
149 | @echo KDEPIM buildsystem, variableinfo... | 149 | ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) install; ) || true |
150 | @echo KDEPIMDIR=$(KDEPIMDIR) | 150 | ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) install; ) || true |
151 | @echo QTDIR=$(QTDIR) | 151 | distclean: qmake_all FORCE |
152 | @echo QPEDIR=$(QPEDIR) | 152 | ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
153 | @echo OPIEDIR=$(OPIEDIR) | 153 | ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
154 | @echo PLATFORM=$(PLATFORM) | 154 | ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
155 | @echo RELEASE_DEBUG=$(RELEASE_DEBUG) | 155 | ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
156 | @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL) | 156 | ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
157 | @echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN) | 157 | ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
158 | @echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN) | 158 | ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
159 | @echo BUILD_NO_QTOPIA_PLUGIN=$(BUILD_NO_QTOPIA_PLUGIN) | 159 | ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
160 | @echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN) | 160 | ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
161 | ifndef BUILD_NO_SHARP_PLUGIN | 161 | ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
162 | @echo SHARPDTMSDK=$(SHARPDTMSDK) | 162 | ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
163 | endif | 163 | |
164 | @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU) | 164 | install: install_subdirs |
165 | @echo BUILD_NO_PWMANAGER=$(BUILD_NO_PWMANAGER) | 165 | |
166 | @echo -------------------------------------- | 166 | uninstall: uninstall_subdirs |
167 | 167 | ||
168 | variable_test: variable_info | 168 | FORCE: |
169 | @echo KDEPIM buildsystem, variablecheck... | ||
170 | ifndef KDEPIMDIR | ||
171 | @echo KDEPIMDIR is not defined. | ||
172 | $(error KDEPIMDIR is not defined) | ||
173 | endif | ||
174 | ifndef PLATFORM | ||
175 | @echo PLATFORM is not defined. | ||
176 | $(error PLATFORM is not defined) | ||
177 | endif | ||
178 | ifdef BUILD_NO_LDAP_PLUGIN | ||
179 | @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN) | ||
180 | endif | ||
181 | ifdef BUILD_NO_OPIE_PLUGIN | ||
182 | @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN) | ||
183 | endif | ||
184 | ifdef BUILD_NO_QTOPIA_PLUGIN | ||
185 | @echo QTOPIA PLUGIN will not be build, because BUILD_NO__QTOPIA_PLUGIN is set to $(BUILD_NO__QTOPIA_PLUGIN) | ||
186 | endif | ||
187 | ifdef BUILD_NO_MICROMAIL | ||
188 | @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL) | ||
189 | endif | ||
190 | ifdef BUILD_NO_SHARP_PLUGIN | ||
191 | @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN) | ||
192 | else | ||
193 | ifndef SHARPDTMSDK | ||
194 | @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK) | ||
195 | $(error SHARPDTMSDK is not defined) | ||
196 | endif | ||
197 | endif | ||
198 | ifdef BUILD_NO_GAMMU | ||
199 | @echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU) | ||
200 | endif | ||
201 | ifdef BUILD_NO_PWMANAGER | ||
202 | @echo PWMANAGER will not be build, because BUILD_NO_PWMANAGER is set to $(BUILD_NO_PWMANAGER) | ||
203 | endif | ||
204 | @echo -------------------------------------- | ||
205 | |||
206 | |||
207 | objects: | ||
208 | for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done | ||
209 | for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done | ||
210 | mkdir -p libical/lib/$(PLATFORM) | ||
211 | mkdir -p pwmanager/libcrypt/$(PLATFORM) | ||
212 | |||
213 | clean: | ||
214 | rm -rf libical/lib/$(PLATFORM)/*; | ||
215 | rm -rf pwmanager/libcrypt/$(PLATFORM)/*; | ||
216 | for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\ | ||
217 | rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \ | ||
218 | done | ||
219 | |||
220 | install: | ||
221 | |||
222 | cd bin/kdepim; make install | ||
223 | cp -r Pim $(QPEDIR)/apps | ||
224 | cp db2file/db2file $(QPEDIR)/bin/db2file | ||
225 | cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop | ||
226 | cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop | ||
227 | cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop | ||
228 | cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop | ||
229 | |||
230 | dist: | ||
231 | @echo Dont forget to do "make install" before "make dist" | ||
232 | rm -f *arm.ipk | ||
233 | rm -f *~ | ||
234 | cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia kdepim | ||
235 | mkipks kmicrokdelibs.control | ||
236 | mkipks korganizer.control | ||
237 | mkipks kaddressbook.control | ||
238 | ifndef BUILD_NO_MICROMAIL | ||
239 | mkipks kopiemail.control | ||
240 | endif | ||
241 | mkipks korganizer-alarm.control | ||
242 | ifndef BUILD_NO_GAMMU | ||
243 | mkipks phoneaccess.control | ||
244 | endif | ||
245 | ifndef BUILD_NO_PWMANAGER | ||
246 | mkipks pwmanager.control | ||
247 | endif | ||
248 | mkipks pim_TAB_icon.control | ||
249 | |||
250 | tmake: objects \ | ||
251 | qtcompat/Makefile$(PLATFORM) \ | ||
252 | microkde/Makefile$(PLATFORM) \ | ||
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 | |||
279 | qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro | ||
280 | cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtcompat.pro -o Makefile$(PLATFORM) | ||
281 | |||
282 | microkde/Makefile$(PLATFORM): microkde/microkdeE.pro | ||
283 | cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" microkdeE.pro -o Makefile$(PLATFORM) | ||
284 | |||
285 | libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro | ||
286 | cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkcalE.pro -o Makefile$(PLATFORM) | ||
287 | |||
288 | |||
289 | libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro | ||
290 | cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkdepimE.pro -o Makefile$(PLATFORM) | ||
291 | |||
292 | kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro | ||
293 | cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kalarmdE.pro -o Makefile$(PLATFORM) | ||
294 | |||
295 | korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro | ||
296 | cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" korganizerE.pro -o Makefile$(PLATFORM) | ||
297 | |||
298 | libical/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 | |||
301 | libical/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 | |||
304 | kabc/Makefile$(PLATFORM): kabc/kabcE.pro | ||
305 | cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcE.pro -o Makefile$(PLATFORM) | ||
306 | |||
307 | kabc/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 | |||
310 | kabc/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 | |||
313 | kabc/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 | |||
316 | kabc/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 | |||
319 | kabc/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 | |||
322 | kabc/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 | |||
325 | kabc/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 | |||
328 | kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro | ||
329 | cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kaddressbookE.pro -o Makefile$(PLATFORM) | ||
330 | |||
331 | kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro | ||
332 | cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kmicromailE.pro -o Makefile$(PLATFORM) | ||
333 | |||
334 | kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro | ||
335 | cd kmicromail/libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libetpanE.pro -o Makefile$(PLATFORM) | ||
336 | |||
337 | kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro | ||
338 | cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libmailwrapperE.pro -o Makefile$(PLATFORM) | ||
339 | |||
340 | gammu/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 | |||
343 | gammu/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 | |||
346 | pwmanager/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 | |||
350 | pwmanager/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 | |||
353 | pwmanager/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 | |||
356 | pwmanager/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 | |||
359 | pwmanager/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 | 169 | ||
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 63484d6..e3dad94 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -1863,17 +1863,23 @@ void MainWindow::exportVCalendar() | |||
1863 | } | 1863 | } |
1864 | 1864 | ||
1865 | void MainWindow::syncFileRequest() | 1865 | void MainWindow::syncFileRequest() |
1866 | { | 1866 | { |
1867 | if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) { | ||
1868 | mSyncManager->slotSyncMenu( 999 ); | ||
1869 | } | ||
1867 | save(); | 1870 | save(); |
1868 | } | 1871 | } |
1869 | void MainWindow::getFile( bool success ) | 1872 | void MainWindow::getFile( bool success ) |
1870 | { | 1873 | { |
1871 | if ( ! success ) { | 1874 | if ( ! success ) { |
1872 | setCaption( i18n("Error receiving file. Nothing changed!") ); | 1875 | setCaption( i18n("Error receiving file. Nothing changed!") ); |
1873 | return; | 1876 | return; |
1874 | } | 1877 | } |
1875 | mView->openCalendar( defaultFileName() ); | 1878 | mView->openCalendar( defaultFileName() ); |
1879 | if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) { | ||
1880 | mSyncManager->slotSyncMenu( 999 ); | ||
1881 | } | ||
1876 | setCaption( i18n("Pi-Sync successful!") ); | 1882 | setCaption( i18n("Pi-Sync successful!") ); |
1877 | } | 1883 | } |
1878 | 1884 | ||
1879 | void MainWindow::printSel( ) | 1885 | void MainWindow::printSel( ) |
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index 7ca3ee0..554c6e5 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp | |||
@@ -180,25 +180,40 @@ void KSyncManager::slotSyncMenu( int action ) | |||
180 | if (blockSave()) | 180 | if (blockSave()) |
181 | return; | 181 | return; |
182 | 182 | ||
183 | setBlockSave(true); | 183 | setBlockSave(true); |
184 | bool silent = false; | ||
185 | if ( action == 999 ) { | ||
186 | //special mode for silent syncing | ||
187 | action = 1000; | ||
188 | silent = true; | ||
189 | } | ||
184 | 190 | ||
185 | mCurrentSyncProfile = action - 1000 ; | 191 | mCurrentSyncProfile = action - 1000 ; |
186 | mCurrentSyncDevice = mSyncProfileNames[mCurrentSyncProfile] ; | 192 | mCurrentSyncDevice = mSyncProfileNames[mCurrentSyncProfile] ; |
187 | mCurrentSyncName = mLocalMachineName ; | 193 | mCurrentSyncName = mLocalMachineName ; |
188 | KConfig config ( locateLocal( "config","ksyncprofilesrc" ) ); | 194 | KConfig config ( locateLocal( "config","ksyncprofilesrc" ) ); |
189 | KSyncProfile* temp = new KSyncProfile (); | 195 | KSyncProfile* temp = new KSyncProfile (); |
190 | temp->setName(mSyncProfileNames[mCurrentSyncProfile]); | 196 | temp->setName(mSyncProfileNames[mCurrentSyncProfile]); |
191 | temp->readConfig(&config); | 197 | temp->readConfig(&config); |
192 | mAskForPreferences = temp->getAskForPreferences(); | 198 | if (silent) { |
193 | mSyncAlgoPrefs = temp->getSyncPrefs(); | 199 | mAskForPreferences = false; |
194 | mWriteBackFile = temp->getWriteBackFile(); | 200 | mShowSyncSummary = false; |
201 | mWriteBackFile = true; | ||
202 | mSyncAlgoPrefs = 2;// take newest | ||
203 | } | ||
204 | else { | ||
205 | mAskForPreferences = temp->getAskForPreferences(); | ||
206 | mShowSyncSummary = temp->getShowSummaryAfterSync(); | ||
207 | mWriteBackFile = temp->getWriteBackFile(); | ||
208 | mSyncAlgoPrefs = temp->getSyncPrefs(); | ||
209 | } | ||
195 | mWriteBackExistingOnly = temp->getWriteBackExisting(); | 210 | mWriteBackExistingOnly = temp->getWriteBackExisting(); |
196 | mIsKapiFile = temp->getIsKapiFile(); | 211 | mIsKapiFile = temp->getIsKapiFile(); |
197 | mWriteBackInFuture = 0; | 212 | mWriteBackInFuture = 0; |
198 | if ( temp->getWriteBackFuture() ) | 213 | if ( temp->getWriteBackFuture() ) |
199 | mWriteBackInFuture = temp->getWriteBackFutureWeeks( ); | 214 | mWriteBackInFuture = temp->getWriteBackFutureWeeks( ); |
200 | mShowSyncSummary = temp->getShowSummaryAfterSync(); | 215 | |
201 | if ( action == 1000 ) { | 216 | if ( action == 1000 ) { |
202 | #ifdef DESKTOP_VERSION | 217 | #ifdef DESKTOP_VERSION |
203 | syncKDE(); | 218 | syncKDE(); |
204 | #else | 219 | #else |
@@ -301,8 +316,9 @@ void KSyncManager::enableQuick( bool ask ) | |||
301 | QCheckBox syncdesktop( i18n("Automatically sync with KDE-Desktop\nwhen receiving sync request"),&dia ); | 316 | QCheckBox syncdesktop( i18n("Automatically sync with KDE-Desktop\nwhen receiving sync request"),&dia ); |
302 | #endif | 317 | #endif |
303 | lay.addWidget( &syncdesktop); | 318 | lay.addWidget( &syncdesktop); |
304 | #else | 319 | #else |
320 | mPrefs->mPassiveSyncWithDesktop = false; | ||
305 | QCheckBox syncdesktop( i18n("Automatically sync\nwith KDE-Desktop"),&dia ); | 321 | QCheckBox syncdesktop( i18n("Automatically sync\nwith KDE-Desktop"),&dia ); |
306 | syncdesktop.hide(); | 322 | syncdesktop.hide(); |
307 | #endif | 323 | #endif |
308 | syncdesktop.setChecked( mPrefs->mPassiveSyncWithDesktop ); | 324 | syncdesktop.setChecked( mPrefs->mPassiveSyncWithDesktop ); |
@@ -415,9 +431,12 @@ bool KSyncManager::syncWithFile( QString fn , bool quick ) | |||
415 | if ( result ) | 431 | if ( result ) |
416 | return false; | 432 | return false; |
417 | } | 433 | } |
418 | if ( mAskForPreferences ) | 434 | if ( mAskForPreferences ) |
419 | edit_sync_options(); | 435 | if ( !edit_sync_options()) { |
436 | mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") ); | ||
437 | return false; | ||
438 | } | ||
420 | if ( result == 0 ) { | 439 | if ( result == 0 ) { |
421 | //qDebug("Now sycing ... "); | 440 | //qDebug("Now sycing ... "); |
422 | if ( ret = mImplementation->sync( this, fn, mSyncAlgoPrefs ) ) | 441 | if ( ret = mImplementation->sync( this, fn, mSyncAlgoPrefs ) ) |
423 | mParent->topLevelWidget()->setCaption( i18n("Synchronization successful") ); | 442 | mParent->topLevelWidget()->setCaption( i18n("Synchronization successful") ); |
@@ -454,9 +473,12 @@ void KSyncManager::multiSync( bool askforPrefs ) | |||
454 | } | 473 | } |
455 | mCurrentSyncDevice = i18n("Multiple profiles") ; | 474 | mCurrentSyncDevice = i18n("Multiple profiles") ; |
456 | mSyncAlgoPrefs = mPrefs->mRingSyncAlgoPrefs; | 475 | mSyncAlgoPrefs = mPrefs->mRingSyncAlgoPrefs; |
457 | if ( askforPrefs ) { | 476 | if ( askforPrefs ) { |
458 | edit_sync_options(); | 477 | if ( !edit_sync_options()) { |
478 | mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") ); | ||
479 | return; | ||
480 | } | ||
459 | mPrefs->mRingSyncAlgoPrefs = mSyncAlgoPrefs; | 481 | mPrefs->mRingSyncAlgoPrefs = mSyncAlgoPrefs; |
460 | } | 482 | } |
461 | mParent->topLevelWidget()->setCaption(i18n("Multiple sync started.") ); | 483 | mParent->topLevelWidget()->setCaption(i18n("Multiple sync started.") ); |
462 | qApp->processEvents(); | 484 | qApp->processEvents(); |
@@ -686,9 +708,9 @@ void KSyncManager::syncRemote( KSyncProfile* prof, bool ask) | |||
686 | } | 708 | } |
687 | } | 709 | } |
688 | return; | 710 | return; |
689 | } | 711 | } |
690 | void KSyncManager::edit_pisync_options() | 712 | bool KSyncManager::edit_pisync_options() |
691 | { | 713 | { |
692 | QDialog dia( mParent, "dia", true ); | 714 | QDialog dia( mParent, "dia", true ); |
693 | dia.setCaption( i18n("Pi-Sync options for device: " ) +mCurrentSyncDevice ); | 715 | dia.setCaption( i18n("Pi-Sync options for device: " ) +mCurrentSyncDevice ); |
694 | QVBoxLayout lay ( &dia ); | 716 | QVBoxLayout lay ( &dia ); |
@@ -715,12 +737,13 @@ void KSyncManager::edit_pisync_options() | |||
715 | if ( dia.exec() ) { | 737 | if ( dia.exec() ) { |
716 | mPassWordPiSync = le1.text(); | 738 | mPassWordPiSync = le1.text(); |
717 | mActiveSyncPort = le3.text(); | 739 | mActiveSyncPort = le3.text(); |
718 | mActiveSyncIP = le2.text(); | 740 | mActiveSyncIP = le2.text(); |
741 | return true; | ||
719 | } | 742 | } |
720 | 743 | return false; | |
721 | } | 744 | } |
722 | void KSyncManager::edit_sync_options() | 745 | bool KSyncManager::edit_sync_options() |
723 | { | 746 | { |
724 | 747 | ||
725 | QDialog dia( mParent, "dia", true ); | 748 | QDialog dia( mParent, "dia", true ); |
726 | dia.setCaption( i18n("Device: " ) +mCurrentSyncDevice ); | 749 | dia.setCaption( i18n("Device: " ) +mCurrentSyncDevice ); |
@@ -765,11 +788,11 @@ void KSyncManager::edit_sync_options() | |||
765 | break; | 788 | break; |
766 | } | 789 | } |
767 | if ( dia.exec() ) { | 790 | if ( dia.exec() ) { |
768 | mSyncAlgoPrefs = rem.isChecked()*1+newest.isChecked()*2+ ask.isChecked()*3+ f_loc.isChecked()*4+ f_rem.isChecked()*5;//+ both.isChecked()*6 ; | 791 | mSyncAlgoPrefs = rem.isChecked()*1+newest.isChecked()*2+ ask.isChecked()*3+ f_loc.isChecked()*4+ f_rem.isChecked()*5;//+ both.isChecked()*6 ; |
792 | return true; | ||
769 | } | 793 | } |
770 | 794 | return false; | |
771 | |||
772 | } | 795 | } |
773 | 796 | ||
774 | QString KSyncManager::getPassword( ) | 797 | QString KSyncManager::getPassword( ) |
775 | { | 798 | { |
@@ -863,10 +886,13 @@ bool KSyncManager::syncExternalApplication(QString resource) | |||
863 | { | 886 | { |
864 | 887 | ||
865 | emit save(); | 888 | emit save(); |
866 | 889 | ||
867 | if ( mAskForPreferences ) | 890 | if ( mAskForPreferences ) |
868 | edit_sync_options(); | 891 | if ( !edit_sync_options()) { |
892 | mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") ); | ||
893 | return false; | ||
894 | } | ||
869 | 895 | ||
870 | qDebug("Sync extern %s", resource.latin1()); | 896 | qDebug("Sync extern %s", resource.latin1()); |
871 | 897 | ||
872 | bool syncOK = mImplementation->syncExternal(this, resource); | 898 | bool syncOK = mImplementation->syncExternal(this, resource); |
@@ -934,9 +960,12 @@ void KSyncManager::syncPi() | |||
934 | { | 960 | { |
935 | mPisyncFinished = false; | 961 | mPisyncFinished = false; |
936 | qApp->processEvents(); | 962 | qApp->processEvents(); |
937 | if ( mAskForPreferences ) | 963 | if ( mAskForPreferences ) |
938 | edit_pisync_options(); | 964 | if ( !edit_pisync_options()) { |
965 | mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") ); | ||
966 | return; | ||
967 | } | ||
939 | bool ok; | 968 | bool ok; |
940 | Q_UINT16 port = mActiveSyncPort.toUInt(&ok); | 969 | Q_UINT16 port = mActiveSyncPort.toUInt(&ok); |
941 | if ( ! ok ) { | 970 | if ( ! ok ) { |
942 | mParent->topLevelWidget()->setCaption( i18n("Sorry, no valid port.Syncing cancelled.") ); | 971 | mParent->topLevelWidget()->setCaption( i18n("Sorry, no valid port.Syncing cancelled.") ); |
@@ -1165,13 +1194,13 @@ void KServerSocket::readBackFileFromSocket() | |||
1165 | mSocket->close(); | 1194 | mSocket->close(); |
1166 | if ( mSocket->state() == QSocket::Idle ) | 1195 | if ( mSocket->state() == QSocket::Idle ) |
1167 | QTimer::singleShot( 10, this , SLOT ( discardClient())); | 1196 | QTimer::singleShot( 10, this , SLOT ( discardClient())); |
1168 | file.close(); | 1197 | file.close(); |
1198 | piFileString = ""; | ||
1199 | emit file_received( true ); | ||
1169 | delete mSyncActionDialog; | 1200 | delete mSyncActionDialog; |
1170 | mSyncActionDialog = 0; | 1201 | mSyncActionDialog = 0; |
1171 | piFileString = ""; | ||
1172 | blockRC = false; | 1202 | blockRC = false; |
1173 | emit file_received( true ); | ||
1174 | 1203 | ||
1175 | } | 1204 | } |
1176 | 1205 | ||
1177 | KCommandSocket::KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent, const char * name ): QObject( parent, name ) | 1206 | KCommandSocket::KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent, const char * name ): QObject( parent, name ) |
@@ -1198,9 +1227,9 @@ void KCommandSocket::readFile( QString fn ) | |||
1198 | mSocket->connectToHost( mHost, mPort ); | 1227 | mSocket->connectToHost( mHost, mPort ); |
1199 | QTextStream os( mSocket ); | 1228 | QTextStream os( mSocket ); |
1200 | os.setEncoding( QTextStream::Latin1 ); | 1229 | os.setEncoding( QTextStream::Latin1 ); |
1201 | os << "GET " << mPassWord << "\r\n"; | 1230 | os << "GET " << mPassWord << "\r\n"; |
1202 | mTimerSocket->start( 10000 ); | 1231 | mTimerSocket->start( 20000 ); |
1203 | } | 1232 | } |
1204 | 1233 | ||
1205 | void KCommandSocket::writeFile( QString fileName ) | 1234 | void KCommandSocket::writeFile( QString fileName ) |
1206 | { | 1235 | { |
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h index 7b9c499..4a610fa 100644 --- a/libkdepim/ksyncmanager.h +++ b/libkdepim/ksyncmanager.h | |||
@@ -173,10 +173,10 @@ class KSyncManager : public QObject | |||
173 | void syncKDE(); | 173 | void syncKDE(); |
174 | bool syncExternalApplication(QString); | 174 | bool syncExternalApplication(QString); |
175 | int mCurrentSyncProfile ; | 175 | int mCurrentSyncProfile ; |
176 | void syncRemote( KSyncProfile* prof, bool ask = true); | 176 | void syncRemote( KSyncProfile* prof, bool ask = true); |
177 | void edit_sync_options(); | 177 | bool edit_sync_options(); |
178 | void edit_pisync_options(); | 178 | bool edit_pisync_options(); |
179 | int ringSync(); | 179 | int ringSync(); |
180 | QString getPassword( ); | 180 | QString getPassword( ); |
181 | bool mPisyncFinished; | 181 | bool mPisyncFinished; |
182 | bool mBlockSaveFlag; | 182 | bool mBlockSaveFlag; |