-rw-r--r-- | Makefile | 1 | ||||
-rw-r--r-- | Makefile.Embedded | 1 | ||||
-rw-r--r-- | bin/kdepim/SyncHowto.txt | 117 | ||||
-rw-r--r-- | version | 2 |
4 files changed, 103 insertions, 18 deletions
@@ -247,16 +247,17 @@ dist: | |||
247 | mkipks korganizer-alarm.control | 247 | mkipks korganizer-alarm.control |
248 | ifndef BUILD_NO_GAMMU | 248 | ifndef BUILD_NO_GAMMU |
249 | mkipks kmobilephoneaccess.control | 249 | mkipks kmobilephoneaccess.control |
250 | endif | 250 | endif |
251 | ifndef BUILD_NO_PWMANAGER | 251 | ifndef BUILD_NO_PWMANAGER |
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 | ||
256 | tmake: objects \ | 257 | tmake: objects \ |
257 | qtcompat/Makefile$(PLATFORM) \ | 258 | qtcompat/Makefile$(PLATFORM) \ |
258 | microkde/Makefile$(PLATFORM) \ | 259 | microkde/Makefile$(PLATFORM) \ |
259 | libkcal/Makefile$(PLATFORM) \ | 260 | libkcal/Makefile$(PLATFORM) \ |
260 | libkdepim/Makefile$(PLATFORM) \ | 261 | libkdepim/Makefile$(PLATFORM) \ |
261 | korganizer/Makefile$(PLATFORM) \ | 262 | korganizer/Makefile$(PLATFORM) \ |
262 | kalarmd/Makefile$(PLATFORM) \ | 263 | kalarmd/Makefile$(PLATFORM) \ |
diff --git a/Makefile.Embedded b/Makefile.Embedded index 467710f..a9ea199 100644 --- a/Makefile.Embedded +++ b/Makefile.Embedded | |||
@@ -247,16 +247,17 @@ dist: | |||
247 | mkipks korganizer-alarm.control | 247 | mkipks korganizer-alarm.control |
248 | ifndef BUILD_NO_GAMMU | 248 | ifndef BUILD_NO_GAMMU |
249 | mkipks kmobilephoneaccess.control | 249 | mkipks kmobilephoneaccess.control |
250 | endif | 250 | endif |
251 | ifndef BUILD_NO_PWMANAGER | 251 | ifndef BUILD_NO_PWMANAGER |
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 | ||
256 | tmake: objects \ | 257 | tmake: objects \ |
257 | qtcompat/Makefile$(PLATFORM) \ | 258 | qtcompat/Makefile$(PLATFORM) \ |
258 | microkde/Makefile$(PLATFORM) \ | 259 | microkde/Makefile$(PLATFORM) \ |
259 | libkcal/Makefile$(PLATFORM) \ | 260 | libkcal/Makefile$(PLATFORM) \ |
260 | libkdepim/Makefile$(PLATFORM) \ | 261 | libkdepim/Makefile$(PLATFORM) \ |
261 | korganizer/Makefile$(PLATFORM) \ | 262 | korganizer/Makefile$(PLATFORM) \ |
262 | kalarmd/Makefile$(PLATFORM) \ | 263 | kalarmd/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 | |||
@@ -10,26 +10,27 @@ you want to sync have only a difference of some seconds! | |||
10 | 10 | ||
11 | CONTENT: | 11 | CONTENT: |
12 | 12 | ||
13 | 0) How syncing works | 13 | 0) How syncing works |
14 | 1) Qick overview of settings | 14 | 1) Qick overview of settings |
15 | 2) Sync settings in sync dialog | 15 | 2) Sync settings in sync dialog |
16 | 3) Syncing background | 16 | 3) Syncing background |
17 | 4) Sync preferences | 17 | 4) Sync preferences |
18 | 5) Details about sync profile kinds | 18 | 5) How a filter works |
19 | 6) Details about sync profile kinds | ||
19 | 20 | ||
20 | ************************************************************************* | 21 | ************************************************************************* |
21 | 0) How syncing works | 22 | 0) How syncing works |
22 | ************************************************************************* | 23 | ************************************************************************* |
23 | 24 | ||
24 | Note: | 25 | Note: |
25 | The recommended and easiest way to syncronize two devices where | 26 | The recommended and easiest way to syncronize two devices where |
26 | KO/Pi, KA/Pi or PWM/Pi is installed, is the profile kind "Pi-Sync". | 27 | KO/Pi, KA/Pi or PWM/Pi is installed, is the profile kind "Pi-Sync". |
27 | Details about that in 5) b). | 28 | Details about that in 6) b). |
28 | 29 | ||
29 | In KDE-Pim/Pi you can synchronize ( sync ) your calendar/addressbook/ | 30 | In KDE-Pim/Pi you can synchronize ( sync ) your calendar/addressbook/ |
30 | passwordfile with another calendar/addressbook/passwordfile, | 31 | passwordfile with another calendar/addressbook/passwordfile, |
31 | by syncing your (local) calendar/addressbook/passwordfile | 32 | by syncing your (local) calendar/addressbook/passwordfile |
32 | with a (remote) file. | 33 | with a (remote) file. |
33 | This remote file may on your local filesystem | 34 | This remote file may on your local filesystem |
34 | or on another (remote) device. | 35 | or on another (remote) device. |
35 | 36 | ||
@@ -85,17 +86,17 @@ c) Create a new sync profile and give it a unique name. | |||
85 | If you want to sync with a device, where KO/Pi is already installed | 86 | If you want to sync with a device, where KO/Pi is already installed |
86 | and which has a given unique device name, use this device name as | 87 | and which has a given unique device name, use this device name as |
87 | your profile name ( refer to b) ). | 88 | your profile name ( refer to b) ). |
88 | d) Coose the profile kind of your syncing method: | 89 | d) Coose the profile kind of your syncing method: |
89 | (i) Local file or | 90 | (i) Local file or |
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) |
94 | e) Choose the other profile options. | 95 | e) Choose the other profile options. |
95 | Detailed explanation in 2) | 96 | Detailed explanation in 2) |
96 | f) Close sync dialog with OK. | 97 | f) Close sync dialog with OK. |
97 | g) Sync. | 98 | g) Sync. |
98 | 99 | ||
99 | NOTE: | 100 | NOTE: |
100 | AFTER SYNCING THERE ARE "SYNC EVENTS" CREATED | 101 | AFTER SYNCING THERE ARE "SYNC EVENTS" CREATED |
101 | (OR UPDATED, IF IT ALREADY EXITS) FOR EACH SYNC PROFILE. | 102 | (OR UPDATED, IF IT ALREADY EXITS) FOR EACH SYNC PROFILE. |
@@ -104,56 +105,104 @@ YOU MAY NOT DELETE OR CHANGE THESE EVENTS. | |||
104 | ************************************************************************* | 105 | ************************************************************************* |
105 | 2) Sync settings in sync dialog | 106 | 2) Sync settings in sync dialog |
106 | ************************************************************************* | 107 | ************************************************************************* |
107 | 108 | ||
108 | a) Local device name: | 109 | a) Local device name: |
109 | -> 1) b) | 110 | -> 1) b) |
110 | b) Profile: | 111 | b) Profile: |
111 | -> 1) c) | 112 | -> 1) c) |
112 | c) Include in multiple sync: | 113 | c) 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 | |||
120 | d)- j) Sync algo options: | ||
121 | |||
118 | d) Ask for preferences before sync: | 122 | d) 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. |
125 | e) Sync preferences: | 129 | e) Sync preferences: |
126 | Choose here your sync preferences. | 130 | Choose here your sync preferences. |
127 | Details -> 4) | 131 | Details -> 4) |
128 | f) Show summary after sync: | 132 | f) 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. |
135 | g) 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. | ||
131 | g) Write back synced data: | 150 | g) 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. |
137 | h) --Write back (on remote) existing entries only: | 156 | |
157 | h) - j) Write back options: | ||
158 | |||
159 | h) 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. |
143 | i) --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. | 166 | i) 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. | ||
194 | j) 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! | 199 | k) Profile kind: |
149 | I.e. the calendar events of the last week are written back always. | 200 | Details -> 6) |
150 | j) Profile kind: | ||
151 | Details -> 5) | ||
152 | 201 | ||
153 | ************************************************************************* | 202 | ************************************************************************* |
154 | 3) Syncing background | 203 | 3) Syncing background |
155 | ************************************************************************* | 204 | ************************************************************************* |
156 | 205 | ||
157 | The same mentioned for calendars is valid for addressbooks as well. | 206 | The same mentioned for calendars is valid for addressbooks as well. |
158 | 207 | ||
159 | Synchronizing calendars ( i.e. files ) means, | 208 | Synchronizing calendars ( i.e. files ) means, |
@@ -236,17 +285,51 @@ SYNC PREFERENCES: | |||
236 | Even if the calendars are already synced | 285 | Even if the calendars are already synced |
237 | there is no item deleted on local. | 286 | there is no item deleted on local. |
238 | 287 | ||
239 | -Force: Take remote entry always: | 288 | -Force: Take remote entry always: |
240 | Analogous to | 289 | Analogous to |
241 | "Force: Take local entry always" | 290 | "Force: Take local entry always" |
242 | 291 | ||
243 | ************************************************************************* | 292 | ************************************************************************* |
244 | 5) Details about sync profile kinds | 293 | 5) How a filter works |
294 | ************************************************************************* | ||
295 | |||
296 | A filter is a rule to decide if a particular item | ||
297 | (calendar iten item or contact item) belongs to a set of items. | ||
298 | For example, you can specify a set as: | ||
299 | Only items, that belongs to that category. | ||
300 | Or: Only items, that does not belong to that category. | ||
301 | Or: Only items, that are public. | ||
302 | |||
303 | If you specify a filter in a syncing profile, you can set the | ||
304 | rules of adding items to the local or remote database. | ||
305 | |||
306 | Example: | ||
307 | You have a public calendar in your company, which contains all | ||
308 | company relevant data. | ||
309 | |||
310 | You have different projects in the company and for project specific events | ||
311 | is always set the project name as a category: | ||
312 | E.g. all events of the project PRO_ABC do have set the categorie PRO_ABC. | ||
313 | But you are not interested in events of PRO_ABC, because you are not working on it. | ||
314 | Then you can specify a filter: All, but not with categoroy PRO_ABC. | ||
315 | When you specify this filter as an incoming filter for your sync profile, | ||
316 | all events of the company are synced and added to your local calendar, but not | ||
317 | the evenst of the project PRO_ABC. | ||
318 | |||
319 | You do not want that your private data can be seen | ||
320 | in the public calendar of your company. | ||
321 | Well, set the property to "private" for all your private data | ||
322 | and specify an outgoing filter: Only " public" and "confidential". | ||
323 | Then you can sync your personal calendar with the calendar of the company, | ||
324 | but your private data is not added to the public calendar. | ||
325 | |||
326 | ************************************************************************* | ||
327 | 6) Details about sync profile kinds | ||
245 | ************************************************************************* | 328 | ************************************************************************* |
246 | 329 | ||
247 | a) Local file | 330 | a) Local file |
248 | Please specify a local file you want to sync with. | 331 | Please specify a local file you want to sync with. |
249 | Note: If you are syncing a file, which is used by KA/Pi, please check the | 332 | Note: If you are syncing a file, which is used by KA/Pi, please check the |
250 | "Addressbook file (*.vcf) is used by KA/Pi". | 333 | "Addressbook file (*.vcf) is used by KA/Pi". |
251 | If you are syncing with a file from KAddressbook or another program, | 334 | If you are syncing with a file from KAddressbook or another program, |
252 | please uncheck "Addressbook file (*.vcf) is used by KA/Pi". | 335 | please uncheck "Addressbook file (*.vcf) is used by KA/Pi". |
@@ -1 +1 @@ | |||
version = "1.9.17"; | version = "1.9.18"; | ||