Some fixes

4 files changed, 103 insertions, 18 deletions

diff --git a/Makefile b/Makefile
index 467710f..a9ea199 100644
--- a/Makefile
+++ b/Makefile
@@ -223,64 +223,65 @@ clean:
 install:
 
         cd bin/kdepim; make install
         cp -r Pim $(QPEDIR)/apps
         cp db2file/db2file $(QPEDIR)/bin/db2file
         cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
         cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
         cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop
         cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop
     
 dist: 
         @echo Dont forget to do "make install" before "make dist"
         rm -f *arm.ipk
         rm -f *~
         cd ..; tar czf kdepimpi-$(KDEPIM_VERSION).tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia  kdepim
         mkipks kmicrokdelibs.control
         mkipks korganizer.control
         mkipks kaddressbook.control
   ifndef BUILD_NO_MICROMAIL
         mkipks kopiemail.control
   endif
   ifndef BUILD_NO_SHARP_PLUGIN
         mkipks ksharpPIM-DTMaccess.control
   endif
         mkipks korganizer-alarm.control
   ifndef BUILD_NO_GAMMU
         mkipks kmobilephoneaccess.control
   endif
   ifndef BUILD_NO_PWMANAGER
         mkipks pwmanager.control
   endif
         mkipks pimTABicon.control
+        zip kdepim_$(KDEPIM_VERSION)_for_SharpRom.ipk.zip *.ipk
 
 tmake: objects \
        qtcompat/Makefile$(PLATFORM) \
        microkde/Makefile$(PLATFORM) \
        libkcal/Makefile$(PLATFORM) \
        libkdepim/Makefile$(PLATFORM) \
        korganizer/Makefile$(PLATFORM) \
        kalarmd/Makefile$(PLATFORM) \
        libical/src/libical/Makefile$(PLATFORM) \
        libical/src/libicalss/Makefile$(PLATFORM) \
        kabc/Makefile$(PLATFORM) \
        kabc/formats/binary/Makefile$(PLATFORM) \
        kabc/plugins/file/Makefile$(PLATFORM) \
        kabc/plugins/dir/Makefile$(PLATFORM) \
        kabc/plugins/ldap/Makefile$(PLATFORM) \
        kabc/plugins/opie/Makefile$(PLATFORM) \
        kabc/plugins/qtopia/Makefile$(PLATFORM) \
        kabc/plugins/sharpdtm/Makefile$(PLATFORM) \
        kaddressbook/Makefile$(PLATFORM) \
        kmicromail/Makefile$(PLATFORM) \
        kmicromail/libetpan/Makefile$(PLATFORM) \
        kmicromail/libmailwrapper/Makefile$(PLATFORM) \
        gammu/emb/common/Makefile$(PLATFORM) \
        gammu/emb/gammu/Makefile$(PLATFORM) \
        pwmanager/pwmanager/Makefile$(PLATFORM) \
        pwmanager/libcrypt/mpi/Makefile$(PLATFORM) \
        pwmanager/libcrypt/error/Makefile$(PLATFORM) \
        pwmanager/libcrypt/cipher/Makefile$(PLATFORM) \
        pwmanager/libcrypt/zlib/Makefile$(PLATFORM)
 
 qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro
         cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtcompat.pro -o Makefile$(PLATFORM)
diff --git a/Makefile.Embedded b/Makefile.Embedded
index 467710f..a9ea199 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -223,64 +223,65 @@ clean:
 install:
 
         cd bin/kdepim; make install
         cp -r Pim $(QPEDIR)/apps
         cp db2file/db2file $(QPEDIR)/bin/db2file
         cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
         cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
         cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop
         cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop
     
 dist: 
         @echo Dont forget to do "make install" before "make dist"
         rm -f *arm.ipk
         rm -f *~
         cd ..; tar czf kdepimpi-$(KDEPIM_VERSION).tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia  kdepim
         mkipks kmicrokdelibs.control
         mkipks korganizer.control
         mkipks kaddressbook.control
   ifndef BUILD_NO_MICROMAIL
         mkipks kopiemail.control
   endif
   ifndef BUILD_NO_SHARP_PLUGIN
         mkipks ksharpPIM-DTMaccess.control
   endif
         mkipks korganizer-alarm.control
   ifndef BUILD_NO_GAMMU
         mkipks kmobilephoneaccess.control
   endif
   ifndef BUILD_NO_PWMANAGER
         mkipks pwmanager.control
   endif
         mkipks pimTABicon.control
+        zip kdepim_$(KDEPIM_VERSION)_for_SharpRom.ipk.zip *.ipk
 
 tmake: objects \
        qtcompat/Makefile$(PLATFORM) \
        microkde/Makefile$(PLATFORM) \
        libkcal/Makefile$(PLATFORM) \
        libkdepim/Makefile$(PLATFORM) \
        korganizer/Makefile$(PLATFORM) \
        kalarmd/Makefile$(PLATFORM) \
        libical/src/libical/Makefile$(PLATFORM) \
        libical/src/libicalss/Makefile$(PLATFORM) \
        kabc/Makefile$(PLATFORM) \
        kabc/formats/binary/Makefile$(PLATFORM) \
        kabc/plugins/file/Makefile$(PLATFORM) \
        kabc/plugins/dir/Makefile$(PLATFORM) \
        kabc/plugins/ldap/Makefile$(PLATFORM) \
        kabc/plugins/opie/Makefile$(PLATFORM) \
        kabc/plugins/qtopia/Makefile$(PLATFORM) \
        kabc/plugins/sharpdtm/Makefile$(PLATFORM) \
        kaddressbook/Makefile$(PLATFORM) \
        kmicromail/Makefile$(PLATFORM) \
        kmicromail/libetpan/Makefile$(PLATFORM) \
        kmicromail/libmailwrapper/Makefile$(PLATFORM) \
        gammu/emb/common/Makefile$(PLATFORM) \
        gammu/emb/gammu/Makefile$(PLATFORM) \
        pwmanager/pwmanager/Makefile$(PLATFORM) \
        pwmanager/libcrypt/mpi/Makefile$(PLATFORM) \
        pwmanager/libcrypt/error/Makefile$(PLATFORM) \
        pwmanager/libcrypt/cipher/Makefile$(PLATFORM) \
        pwmanager/libcrypt/zlib/Makefile$(PLATFORM)
 
 qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro
         cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtcompat.pro -o 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
@@ -1,59 +1,60 @@
 WARNING:
 YOU MAY GET UNEXPECTED (I.E. WRONG) SYNCHRONIZATION RESULTS, 
 IF YOU CHANGE AN EVENT ON THE FIRST DEVICE AND SYNC IMMEDIATELY FROM
 THE OTHER DEVICE WITH THIS DEVICE, IF THE CLOCKS OF THE TWO DEVICES
 HAVE TOO MUCH DIFFERENCE.
 
 In other words: Please make sure, that the clocks of the devices 
 you want to sync have only a difference of some seconds!
 
 
 CONTENT:
 
 0) How syncing works
 1) Qick overview of settings
 2) Sync settings in sync dialog
 3) Syncing background
 4) Sync preferences
-5) Details about sync profile kinds
+5) How a filter works
+6) Details about sync profile kinds
 
 *************************************************************************
 0) How syncing works
 *************************************************************************
 
 Note:
 The recommended and easiest way to syncronize two devices where 
 KO/Pi, KA/Pi or PWM/Pi is installed, is the profile kind "Pi-Sync".
-Details about that in 5) b).
+Details about that in 6) b).
 
 In KDE-Pim/Pi you can synchronize ( sync ) your calendar/addressbook/ 
 passwordfile with another calendar/addressbook/passwordfile,
 by syncing  your (local) calendar/addressbook/passwordfile 
 with a (remote) file. 
 This remote file may on your local filesystem
 or on another (remote) device.
 
 If you want to sync with another remote device, you have to create
 a sync profile.
 You have two choices for choosing the profil kind:
 I)  You can choose profile kind "Remote file" and specify a 
     command line download/upload command ( like scp, ftp, ...) to 
     a) download the remote file to your local machine to a temp file
     b) sync with this temp file
     c) upload the synced file to the remote device
 II) If you want to sync with a device, where KO/Pi( or KA/Pi, PWM/Pi) is
     installed, you can easily get the remote file via network 
     with the build in file transfer feature:
     Choose profile kind "Pi-Sync" and
     a) Start KO/Pi,KA/Pi or PWM/Pi on remote device and
        enable "Pi-Sync" on remote device with password and port.
     b) Specify password, port and IP address in your profile.
 
 
 You can sync with your mobile phone as well.
 Everything is explained in more details below.
 
 NOTE:
 If you do not use profile kind "Pi-Sync",
 it is recommended to close 
 a running KO/Pi (KA/Pi, PWM/Pi) on the remote device.
@@ -61,123 +62,171 @@ a running KO/Pi (KA/Pi, PWM/Pi) on the remote device.
 FastLoad enabled will never be closed!)
 After syncing with a running KO/Pi on the remote device,
 a "save" on the remote device will tell you that it needs to merge (sync).
 After merging (just a syncing with the changed file) 
 you will get the new data showing in remote KO/Pi. 
 
 *************************************************************************
 1) Qick overview of settings
 *************************************************************************
 
 a) Open sync settings dialog (Menu Synchronize - Configure...)
 b) Give your device a unique name.
    (unique in the set of all devices you want to sync with).
    If you have already configured another devive and created 
    there a sync profile to sync with this device, give your device
    the same name as this sync profile! The same name is important, 
    because it makes it possible to sync first A->B 
    (A local device, that performs the sync, B remote device) 
    and then B->A. Such that the B->A sync knows about the 
    already performed A->B sync.
    That means: It is unimportant if you sync A->B or B->A,
    the devices A and B will be synced properly. 
 c) Create a new sync profile and give it a unique name.
    (unique in the set of all sync profiles on this device).
    If you want to sync with a device, where KO/Pi is already installed
    and which has a given unique device name, use this device name as
    your profile name ( refer to b) ).
 d) Coose the profile kind of your syncing method:
       (i) Local file or
      (ii) Pi-Sync or
     (iii) Remote file or
    (iiii) Mobile Phone.
-   Detailed explanation in 5) 
+   Detailed explanation in 6) 
 e) Choose the other profile options.
    Detailed explanation in 2) 
 f) Close sync dialog with OK.
 g) Sync.
 
 NOTE:
 AFTER SYNCING THERE ARE "SYNC EVENTS" CREATED 
 (OR UPDATED, IF IT ALREADY EXITS) FOR EACH SYNC PROFILE.
 YOU MAY NOT DELETE OR CHANGE THESE EVENTS. 
 
 *************************************************************************
 2) Sync settings in sync dialog
 *************************************************************************
 
 a) Local device name:
    -> 1) b)
 b) Profile:
    -> 1) c)
-c) Include in multiple sync:
+c) Multiple Sync options: Include in multiple sync:
    In the Synchronize menu, there is a multiple sync menu entry.
    If you choose this menu entry, all user defined profiles with this
    'Include in multiple sync' option enabled will be  synced 
    one after another. And this twice. This will take some time.
    After that sync, on all devices should be the same data.
+
+d)- j) Sync algo options:
+
 d) Ask for preferences before sync:
-   Check this to be asked for sync preferences settings before each sync.
+   Check this to be asked for "Sync preferences" settings before each sync.
    If the profile kind is "Pi-Sync" you will be asked to confirm
    the "Pi-Sync" specific settings (Password,IP address, port number)
    as well. That makes it possible to use that profile for a
    device that is connected via DHCP to the network and gets different
-   IP addresses when connection to the network.
+   IP addresses when connecting to the network.
 e) Sync preferences:
    Choose here your sync preferences.
    Details -> 4)
 f) Show summary after sync:
    Check this to get a small summary dialog after sync 
    about number of added/changed/deleted events on local/remote.
+g) Apply filter when adding data to local:
+   What is a filter? You can read this in -> 5)
+   With this option you can specify a filter for events/contacts, 
+   which should be added to the local database, because they are
+   in the remote database and not in the local database.
+   (Database = calendar file or addressbook file).
+   Note that the filter is NOT applied to the remote
+   database before syncing. It is only applied to a particular
+   item which should be added to the local database.
+   Well, but what is the difference?
+   The differnce is: If the remote database AND the local database contain
+   an already synced item, which does not match the filter, then this item is synced.
+   If the remote database contains an item which does not match the filter
+   and the local database does not contain this item, then this item is not added
+   to the local database, but it is still in the remote database after syncing.
 g) Write back synced data:
    Uncheck this to update the local calendar only.
    I.e. your local calendar is synced with the remote calendar
    but nothing on the remote calendar is changed.
    If you uncheck "Write back synced data", the settings
    under h) and i) are ignored, of course.
-h) --Write back (on remote) existing entries only:
+
+h) - j) Write back options:
+
+h) Write back (on remote) existing entries only:
    Check this to update the remote data only.
    I.e. no data from yor local calendar/addressbook is added to the
    remote device. You may use this option to 
    sync against some kind of "public calendar/addressbook" without 
-   writing back your personal data.
-i) --Write back (calendar) entries in future only:
-   Check this to write back only calendar entries in future.
+   adding anything of your personal data.
+   But in this case, you cannot add an item to the remoet device.
+i) Apply filter when adding data to remote:
+   What is a filter? You can read this in -> 5)
+   With this option you can specify a filter for events/contacts, 
+   which should be added to the remote database, because they are
+   in the local database and not in the remote database.
+   (Database = calendar file or addressbook file).
+   Note that the filter is NOT applied to the local
+   database before syncing. It is only applied to a particular
+   item of the local database which should be added to the remote database.
+   Well, but what is the difference?
+   The differnce is: If the local database AND the remote database contain
+   an already synced item, which does not match the filter, then this item is synced.
+   If the local database contains an item which does not match the filter
+   and the remote database does not contain this item, then this item is not added
+   to the remote database, but it is still in the local database after syncing.
+   Example:
+     You have specified a calendar filter "only public events".
+     You specify this filter as the outgoing filter for syncing.
+     If there is an event in the local database which is not "public", but "private",
+     this event is not added to the remote database.
+     If there is an event in the local database and in the remote database which is
+     "private" (maybe added by someone else) then this event is synced and 
+     it is in the local database and in the remote database after syncing.
+     That means in particular you cannot remove an event from the remote
+     database but setting it to "private". 
+     If you want to remove the event you can clone it, set it to private and delete the
+     original event. Then the original event is deleted in the remote database after sync and
+     the cloned event is not added to the remote database, because it is private.
+j) Write back (calendar) entries for time period only:
+   Check this to write back only calendar entries for a given time period.
    (Useful when syncing with mobile phones.)
-   You can specify the date range in weeks with
-   ---- Max. weeks in future.
-   Note: The date range starts always 7 days before the actual date!
-   I.e. the calendar events of the last week are written back always.
-j) Profile kind:
-   Details -> 5)
+   You can specify the date range in weeks for the weeks in the past to the weeks in the future.
+
+k) Profile kind:
+   Details -> 6)
 
 *************************************************************************
 3) Syncing background
 *************************************************************************
 
 The same mentioned for calendars is valid for addressbooks as well.
 
 Synchronizing calendars ( i.e. files ) means, 
 to merge two calendars in a useful way.
 If the two calendars are completely different, 
 there is no problem, the resulting calendar contains 
 all data from the local and from the remote calendar.
 
 Problems will occur, if you have edited items 
 from the local calendar on the remote machine. 
 Then it could be, that items are in conflict. 
 Two items are "in conflict", if they have the 
 same unique ID (which get an item at time of 
 creation and owns it until it is deleted )
 and they both are modified after the last 
 synchronization.
 
 At first sync of two calendars there is no item deleted. 
 If the calendars are synced before and there is an item, 
 which is not edited after the last sync and is only 
 available in one calendar, then this item is deleted 
 in this calendar.
 
 But when was the last synchronization between two calendars?
 
 To know that, KO/Pi creates at first syncing 
 of two files an unique event "<profile name> - sync Event" 
@@ -212,65 +261,99 @@ SYNC PREFERENCES:
   "Ask for every entry" 
   is chosen automatically, 
   if this is selected.
 
  -Take remote entry on conflict:
   Takes the remote entry on conflict. 
   If it is the first sync, 
   "Ask for every entry" 
   is chosen automatically, 
   if this is selected.
 
  -Take newest entry on conflict:
   This takes the newest entry on conflict. 
   May be the most useful syncing mode.
 
  -Ask for every entry on conflict:
   Pops up an event viewer dialog and 
   shows the two conflicting entries there. 
   The user can chose, which entry he would like to take.
   The button for the newest entry 
   is automatically set as default button.
   The color for the newest entry is green.
 
  -Force: Take local entry always:
   Even if the calendars are already synced
   there is no item deleted on local. 
 
  -Force: Take remote entry always:
   Analogous to  
   "Force: Take local entry always"
 
 *************************************************************************
-5) Details about sync profile kinds
+5) How a filter works
+*************************************************************************
+
+A filter is a rule to decide if a particular item
+(calendar iten item or contact item) belongs to a set of items.
+For example, you can specify a set as:
+Only items, that belongs to that category.
+Or: Only items, that does not belong to that category.
+Or: Only items, that are public.
+
+If you specify a filter in a syncing profile, you can set the
+rules of adding items to the local or remote database.
+
+Example:
+You have a public calendar in your company, which contains all
+company relevant data.
+
+You have different projects in the company and for project specific events
+is always set the project name as a category: 
+E.g. all events of the project PRO_ABC do have set the categorie PRO_ABC.
+But you are not interested in events of PRO_ABC, because you are not working on it.
+Then you can specify a filter: All, but not with categoroy PRO_ABC.
+When you specify this filter as an incoming filter for your sync profile,
+all events of the company are synced and added to your local calendar, but not
+the evenst of the project PRO_ABC.
+
+You do not want that your private data can be seen 
+in the public calendar of your company.
+Well, set the property to "private" for all your private data 
+and specify an outgoing filter: Only " public" and "confidential".
+Then you can sync your personal calendar with the calendar of the company,
+but your private data is not added to the public calendar. 
+ 
+*************************************************************************
+6) Details about sync profile kinds
 *************************************************************************
 
 a) Local file
    Please specify a local file you want to sync with.
    Note:  If you are syncing a file, which is used by KA/Pi, please check the
           "Addressbook file (*.vcf) is used by KA/Pi".
           If you are syncing with a file from KAddressbook or another program, 
           please uncheck "Addressbook file (*.vcf) is used by KA/Pi".
           To set this properly is important! KA/Pi uses a "last modified" property, 
           which is not supported by KAddressbook.
 
 b) Pi-Sync (direct Kx/Pi to Kx/Pi sync)
    We mention here only KO/Pi, but the same is valid for KA/Pi.
    If you want to sync with a device, where KO/Pi is
    installed, you can easily get the remote file via network 
    with the build in file transfer feature "Pi-Sync":
    You have first to enable file transfer on the remote device:
    - Start KO/Pi on the remote device.
    - Choose Menu Synchronize-Enable Pi-Sync.
    - Choose a port number, where KO/Pi should listen for 
      file sending requests. Valid port numbers are numbers
      between 1 and 65565. Do not specify port numbers, that are
      used by other applications. A port number between 9000 and 9999
      is most likely not used by another application.
      The default port number is 9197 for KO/Pi.
      If you specify a port number, which is already in use,
      you will get an error message when closing this dialog.
    - Choose a password.
    - Click OK.
      Now KO/Pi will send the calendar data via the network, 
      if some other device is sending a "please send calendar"
      request on the given port using the given password.
diff --git a/version b/version
index d8563ed..e1d5bc3 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-version = "1.9.17";
+version = "1.9.18";