summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--Makefile1
-rw-r--r--Makefile.Embedded1
-rw-r--r--bin/kdepim/SyncHowto.txt117
-rw-r--r--version2
4 files changed, 103 insertions, 18 deletions
diff --git a/Makefile b/Makefile
index 467710f..a9ea199 100644
--- a/Makefile
+++ b/Makefile
@@ -252,6 +252,7 @@ dist:
252 mkipks pwmanager.control 252 mkipks pwmanager.control
253 endif 253 endif
254 mkipks pimTABicon.control 254 mkipks pimTABicon.control
255 zip kdepim_$(KDEPIM_VERSION)_for_SharpRom.ipk.zip *.ipk
255 256
256tmake: objects \ 257tmake: objects \
257 qtcompat/Makefile$(PLATFORM) \ 258 qtcompat/Makefile$(PLATFORM) \
diff --git a/Makefile.Embedded b/Makefile.Embedded
index 467710f..a9ea199 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -252,6 +252,7 @@ dist:
252 mkipks pwmanager.control 252 mkipks pwmanager.control
253 endif 253 endif
254 mkipks pimTABicon.control 254 mkipks pimTABicon.control
255 zip kdepim_$(KDEPIM_VERSION)_for_SharpRom.ipk.zip *.ipk
255 256
256tmake: objects \ 257tmake: objects \
257 qtcompat/Makefile$(PLATFORM) \ 258 qtcompat/Makefile$(PLATFORM) \
diff --git a/bin/kdepim/SyncHowto.txt b/bin/kdepim/SyncHowto.txt
index 6c1da16..64f6f14 100644
--- a/bin/kdepim/SyncHowto.txt
+++ b/bin/kdepim/SyncHowto.txt
@@ -15,7 +15,8 @@ CONTENT:
152) Sync settings in sync dialog 152) Sync settings in sync dialog
163) Syncing background 163) Syncing background
174) Sync preferences 174) Sync preferences
185) Details about sync profile kinds 185) How a filter works
196) Details about sync profile kinds
19 20
20************************************************************************* 21*************************************************************************
210) How syncing works 220) How syncing works
@@ -24,7 +25,7 @@ CONTENT:
24Note: 25Note:
25The recommended and easiest way to syncronize two devices where 26The recommended and easiest way to syncronize two devices where
26KO/Pi, KA/Pi or PWM/Pi is installed, is the profile kind "Pi-Sync". 27KO/Pi, KA/Pi or PWM/Pi is installed, is the profile kind "Pi-Sync".
27Details about that in 5) b). 28Details about that in 6) b).
28 29
29In KDE-Pim/Pi you can synchronize ( sync ) your calendar/addressbook/ 30In KDE-Pim/Pi you can synchronize ( sync ) your calendar/addressbook/
30passwordfile with another calendar/addressbook/passwordfile, 31passwordfile with another calendar/addressbook/passwordfile,
@@ -90,7 +91,7 @@ d) Coose the profile kind of your syncing method:
90 (ii) Pi-Sync or 91 (ii) Pi-Sync or
91 (iii) Remote file or 92 (iii) Remote file or
92 (iiii) Mobile Phone. 93 (iiii) Mobile Phone.
93 Detailed explanation in 5) 94 Detailed explanation in 6)
94e) Choose the other profile options. 95e) Choose the other profile options.
95 Detailed explanation in 2) 96 Detailed explanation in 2)
96f) Close sync dialog with OK. 97f) Close sync dialog with OK.
@@ -109,46 +110,94 @@ a) Local device name:
109 -> 1) b) 110 -> 1) b)
110b) Profile: 111b) Profile:
111 -> 1) c) 112 -> 1) c)
112c) Include in multiple sync: 113c) Multiple Sync options: Include in multiple sync:
113 In the Synchronize menu, there is a multiple sync menu entry. 114 In the Synchronize menu, there is a multiple sync menu entry.
114 If you choose this menu entry, all user defined profiles with this 115 If you choose this menu entry, all user defined profiles with this
115 'Include in multiple sync' option enabled will be synced 116 'Include in multiple sync' option enabled will be synced
116 one after another. And this twice. This will take some time. 117 one after another. And this twice. This will take some time.
117 After that sync, on all devices should be the same data. 118 After that sync, on all devices should be the same data.
119
120d)- j) Sync algo options:
121
118d) Ask for preferences before sync: 122d) Ask for preferences before sync:
119 Check this to be asked for sync preferences settings before each sync. 123 Check this to be asked for "Sync preferences" settings before each sync.
120 If the profile kind is "Pi-Sync" you will be asked to confirm 124 If the profile kind is "Pi-Sync" you will be asked to confirm
121 the "Pi-Sync" specific settings (Password,IP address, port number) 125 the "Pi-Sync" specific settings (Password,IP address, port number)
122 as well. That makes it possible to use that profile for a 126 as well. That makes it possible to use that profile for a
123 device that is connected via DHCP to the network and gets different 127 device that is connected via DHCP to the network and gets different
124 IP addresses when connection to the network. 128 IP addresses when connecting to the network.
125e) Sync preferences: 129e) Sync preferences:
126 Choose here your sync preferences. 130 Choose here your sync preferences.
127 Details -> 4) 131 Details -> 4)
128f) Show summary after sync: 132f) Show summary after sync:
129 Check this to get a small summary dialog after sync 133 Check this to get a small summary dialog after sync
130 about number of added/changed/deleted events on local/remote. 134 about number of added/changed/deleted events on local/remote.
135g) Apply filter when adding data to local:
136 What is a filter? You can read this in -> 5)
137 With this option you can specify a filter for events/contacts,
138 which should be added to the local database, because they are
139 in the remote database and not in the local database.
140 (Database = calendar file or addressbook file).
141 Note that the filter is NOT applied to the remote
142 database before syncing. It is only applied to a particular
143 item which should be added to the local database.
144 Well, but what is the difference?
145 The differnce is: If the remote database AND the local database contain
146 an already synced item, which does not match the filter, then this item is synced.
147 If the remote database contains an item which does not match the filter
148 and the local database does not contain this item, then this item is not added
149 to the local database, but it is still in the remote database after syncing.
131g) Write back synced data: 150g) Write back synced data:
132 Uncheck this to update the local calendar only. 151 Uncheck this to update the local calendar only.
133 I.e. your local calendar is synced with the remote calendar 152 I.e. your local calendar is synced with the remote calendar
134 but nothing on the remote calendar is changed. 153 but nothing on the remote calendar is changed.
135 If you uncheck "Write back synced data", the settings 154 If you uncheck "Write back synced data", the settings
136 under h) and i) are ignored, of course. 155 under h) and i) are ignored, of course.
137h) --Write back (on remote) existing entries only: 156
157h) - j) Write back options:
158
159h) Write back (on remote) existing entries only:
138 Check this to update the remote data only. 160 Check this to update the remote data only.
139 I.e. no data from yor local calendar/addressbook is added to the 161 I.e. no data from yor local calendar/addressbook is added to the
140 remote device. You may use this option to 162 remote device. You may use this option to
141 sync against some kind of "public calendar/addressbook" without 163 sync against some kind of "public calendar/addressbook" without
142 writing back your personal data. 164 adding anything of your personal data.
143i) --Write back (calendar) entries in future only: 165 But in this case, you cannot add an item to the remoet device.
144 Check this to write back only calendar entries in future. 166i) Apply filter when adding data to remote:
167 What is a filter? You can read this in -> 5)
168 With this option you can specify a filter for events/contacts,
169 which should be added to the remote database, because they are
170 in the local database and not in the remote database.
171 (Database = calendar file or addressbook file).
172 Note that the filter is NOT applied to the local
173 database before syncing. It is only applied to a particular
174 item of the local database which should be added to the remote database.
175 Well, but what is the difference?
176 The differnce is: If the local database AND the remote database contain
177 an already synced item, which does not match the filter, then this item is synced.
178 If the local database contains an item which does not match the filter
179 and the remote database does not contain this item, then this item is not added
180 to the remote database, but it is still in the local database after syncing.
181 Example:
182 You have specified a calendar filter "only public events".
183 You specify this filter as the outgoing filter for syncing.
184 If there is an event in the local database which is not "public", but "private",
185 this event is not added to the remote database.
186 If there is an event in the local database and in the remote database which is
187 "private" (maybe added by someone else) then this event is synced and
188 it is in the local database and in the remote database after syncing.
189 That means in particular you cannot remove an event from the remote
190 database but setting it to "private".
191 If you want to remove the event you can clone it, set it to private and delete the
192 original event. Then the original event is deleted in the remote database after sync and
193 the cloned event is not added to the remote database, because it is private.
194j) Write back (calendar) entries for time period only:
195 Check this to write back only calendar entries for a given time period.
145 (Useful when syncing with mobile phones.) 196 (Useful when syncing with mobile phones.)
146 You can specify the date range in weeks with 197 You can specify the date range in weeks for the weeks in the past to the weeks in the future.
147 ---- Max. weeks in future. 198
148 Note: The date range starts always 7 days before the actual date! 199k) Profile kind:
149 I.e. the calendar events of the last week are written back always. 200 Details -> 6)
150j) Profile kind:
151 Details -> 5)
152 201
153************************************************************************* 202*************************************************************************
1543) Syncing background 2033) Syncing background
@@ -241,7 +290,41 @@ SYNC PREFERENCES:
241 "Force: Take local entry always" 290 "Force: Take local entry always"
242 291
243************************************************************************* 292*************************************************************************
2445) Details about sync profile kinds 2935) How a filter works
294*************************************************************************
295
296A filter is a rule to decide if a particular item
297(calendar iten item or contact item) belongs to a set of items.
298For example, you can specify a set as:
299Only items, that belongs to that category.
300Or: Only items, that does not belong to that category.
301Or: Only items, that are public.
302
303If you specify a filter in a syncing profile, you can set the
304rules of adding items to the local or remote database.
305
306Example:
307You have a public calendar in your company, which contains all
308company relevant data.
309
310You have different projects in the company and for project specific events
311is always set the project name as a category:
312E.g. all events of the project PRO_ABC do have set the categorie PRO_ABC.
313But you are not interested in events of PRO_ABC, because you are not working on it.
314Then you can specify a filter: All, but not with categoroy PRO_ABC.
315When you specify this filter as an incoming filter for your sync profile,
316all events of the company are synced and added to your local calendar, but not
317the evenst of the project PRO_ABC.
318
319You do not want that your private data can be seen
320in the public calendar of your company.
321Well, set the property to "private" for all your private data
322and specify an outgoing filter: Only " public" and "confidential".
323Then you can sync your personal calendar with the calendar of the company,
324but your private data is not added to the public calendar.
325
326*************************************************************************
3276) Details about sync profile kinds
245************************************************************************* 328*************************************************************************
246 329
247a) Local file 330a) Local file
diff --git a/version b/version
index d8563ed..e1d5bc3 100644
--- a/version
+++ b/version
@@ -1 +1 @@
version = "1.9.17"; version = "1.9.18";