4 files changed, 33 insertions, 303 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 3c71ab8..b0b5748 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,311 +1,16 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
-********** VERSION 2.2.20 ************
+********** VERSION 2.2.0 ************
 
-********** VERSION 2.1.19 ************
+New stable release!
+Fixed some minor usability problems.
+Added writing of next alarm to a file for usage on pdaXrom.
 
-Fixed a crash in journal view.
-Fixed a crash at setting a todo to stopped if KO/Pi saved the file while "stop todo" dialog was shown.
-Fixed a minor problem with the marcus bains line (whatever that is).
-Fixed a crash when setting a todo to complete from the show dialog which was called from the What's Next View.
 
-********** VERSION 2.1.18 ************
-
-Pi-Sync mode:
-The "Write back file" status dialog was updated too often such that writing back the file on the Z was very slow. Fixed.
-
-KO/Pi:
-Fixed a layout problem on the Z 5500 with the calender box right of the location box in the event/todo editor. Thanks to Andrew, who found, reported and fixed this problem ( I did not get that problem - it was working on my 5500 ).
-
-Fixed a problem when (imported or added from other applications) events or todos did have attachments.
-Fixed a really ugly and hidden problem in the management of the parent/child relationchip of todos.
-
-
-********** VERSION 2.1.17 ************
-
-KO/Pi:
-Added option to display times in What's Next View on two lines.
-(Useful for display on the Zaurus with 240x320 screen)
-Removed "Allday" for allday events of one day duration in What's Next View.
-Added date range for allday events of more than one day duration in What's Next View.
-Fixed two problems in the data importing from Outlook:
-  Fixed the duplicated import if the summary, location or description had whitespaces at the end.
-  Fixed a problem importing certain recurrence rules.  
-
-A journal in an ics file may have no dtStart value (as files from KNotes, which stores its notes in an ics journal file).
-If now a journal has no dtStart value the dtStart value is set to the created value of the journal when loading the file. That makes it possible to view and edit "notes" from KNotes. Simply add another Resource in KO/Pi which is a copy of the ics file from KNotes. You will find the "notes" in KO/Pi as a journal entry on the date you created it.
-
-And some minor fixes in KO/Pi.
-
-Fixed a crash on the desktop when closing KO/Pi after accessing adressbook data (Linux + Windows ).
-
-
-********** VERSION 2.1.16 ************
-
-Fixed a problem with the menu bar in KO/Pi and using the "Menu" hardware key on the Zaurus.
-Added columns for datetime in todo view: Last modified, created and last modified subtodo
-Fixed a bug in agenda view displaying recurring multiday events which are longer than two days.
-Made conflict detection up to 4 times faster.
-
-********** VERSION 2.1.15 ************
-
-Fixed two layout problems on the Z:
-Made the with of the newly added buttons on the Quick-Todo smaller.
-Made listweek layout in 2 columns on the Z760 in portait screen and full menubar visible.
-
-
-********** VERSION 2.1.14 ************
-
-Added some buttons to the KO/Pi Quick-todo line to make it possible to quickly access some todo view layout settings like display all flat/open/close and hide/show running/done.
-Added a button to add a subtodo quickly.
-
-Added a possibility to search for conflicting events. (In the Action menu. Keyboard shortcut "q", shift+q or ctrl +q ).
-Added an option to change the layout of the list week to column mode.
-
-Fixed some usability problems in pi-sync mode by adding some progress information about file transfer.
-
-Fixed pi-sync problems with the new multi calendar feature.
-Now pi-sync behaviour should be:
-1) Local sends file request ( as usual )
-2) Remote sends file which contains data of all enabled ( the calendar where the "eye" column is checked ) calendars.
-3) Local syncs with data, adds new entries to default calendar and sends file back ( as usual ).
-   If the data which local receives contains entries which are on disabled calendars on local this entries are updated and not added as duplicates to the default calendar.
-4) Remote updates the data and adds new entries to default calendar. Readonly entries are not changed on remote.
-   If the data which remote receives contains entries which are on disabled calendars on remote this entries are updated and not added as duplicates to the default calendar.
-
-Summary: 
-No new item ( new created after the last sync ) in a disabled calendar is propagated to the sync partner. Readonly items are synced and added/changed on the sync partner if it is not readonly on the sync partner.
-If you have different calendars on remote and local and some of them disabled you may get some "strange" bahaviour.
-Well, the syncing has become quite complicated ... you should have no problems if you enable all calendars. 
-
-********** VERSION 2.1.13 ************
-
-Fixed a problem in KA/Pi search.
-Fixed some minor problems in KO/Pi.
-Added calendar selection possibility to the todo view popup and to the event/todo/journal editor.
-
-Fixed memory usage problems in KA/Pi:
-When loading data KA/Pi did load the file data twice.
-Example:
-  A 600k file did consume 1200k memory during loading process.
-  This is fixed, it does now consume only  600k during loading process.
-When saving data KA/Pi did consume a lot of memory for the data parsing during the save process.
-This is fixed.
-Example:
-  Before saving a 600k file KA/Pi did consume 21.7 Meg of Ram.
-  When saving  KA/Pi did consume 28.6 Meg of Ram. That causes a crash on the Zaurus because there was no memeory left in the system.
-  Now  KA/Pi is consuming on saving the same data 22.0 Meg of Ram during the save process. 
-Note: The memory usage of KA/Pi after the data is loaded/saved has not changed.
-The saving of data may be a bit slower now.
-
-Fixed memory usage problems in KO/Pi:
-When KO/Pi did save the data to file, it did not release the used buffers after saving.
-The used buffer was released after saving the next time, but there was new buffer space allocated again on that save operation.
-This is fixed.
-Example:
-  When saving a 400k file KO/Pi do now use 400k less memory now.
-
-Optimized memory usage in KO/Pi Agenda view:
-KO/Pi is storing some paint information in extra buffers for faster repainting of the agenda view.
-These buffers were not made smaller (i.e. downsized)  because of performance reasons.
-The handling of these buffers are now much smarter:
-Two (of six) buffers are removed completely.
-The remaing four buffers are now downsized after not using the agenda view for 45 seconds.
-Such that the memory usage of KO/Pi is smaller now in general ( because 2 buffers are removed) and is much smaller when not using the agenda view. That is very important when using fastload for KO/Pi.
-
-Worst case example ( for a maximum size agenda content):
-  When resizing the agenda content to a large scale, KO/Pi did use 17Meg of mem ( and did not use less memory until it was stopped). Now KO/Pi is using on the same operation only 14.3 Meg of mem and after 45 seconds not using the agenda view it uses only 9.4 Meg of mem.
-
-When switching to an unused Agenda view now KO/Pi is upizing the buffers again. This takes less than a second. Such that switching to Agenda view (after not using it for more than 45 seconds) is now a bit slower. 
-
-Summary:
-Many memory wasting problems of KA/Pi and KO/Pi fixed such that it is better to use on the Zaurus.
-
-********** VERSION 2.1.12 ************
-
-KO/Pi:
-Many small usability fixes, e.g. rearranged the popup menus such that they are better to use on the Zaurus.
-Fixed a problem with the month view when file was saved but KO/Pi was not the active window.
-Fixed some problems in the resource config dialog (e.g. added a warning if you set all calendars to read-only).
-Fixed some other small problems.
-
-********** VERSION 2.1.11 ************
-
-KO/Pi:
-Because we can have many calendars now in KO/Pi we can have more than one journal entry per day.
-Added features to handle (and add ) more than one journal entry per day.
-Added option for a journal title.
-
-Added info about the calendar, the item belongs to, to the event/todo/journal viewer. 
-Fixed a problem of the alarm of completed recurring todos.
-Added to the event/todo editor to set quickly the category of an item.
-
-
-Fixed some problems when calling KO/Pi or KA/Pi from the alarm applet.
-
-Added KA/Pi multi sync to the multi sync called from the alarm applet.
- 
-********** VERSION 2.1.10 ************
-
-KO/Pi:
-Importing Birthdays will now create another file resource "Birthdays" and import the birthday data from KA/Pi into that file.
-When a multidayevent is selected in monthview all occurences of this event in the monthview are now hightlighted.
-Fixed a bug in searching for a small timerange, i.e. one day.
-
-KA/Pi:
-Fixed two problems in csv export.
-Fixed problems when calling the contact selection dialog from KO/Pi or OM/Pi.
-
-********** VERSION 2.1.9 ************
-
-KO/Pi:
-Fixed some problems of the new search options in the search dialog.
-Fixed some problems in the new resource config options.
-Changed the recurrence edit of events and todos such that the recurrence edit page now is notified about a change of the start date on the first page.
-Fixed a problem creating new events in the agenda view if at the day/time is already an agenda item shown:
-Now you can click on the bottom/top of an allday agenda item or on the left/right side of an agenda item to get the "new todo/new event" popup.
-
-Fixed a problem in recurrence range in syncing with DTM.
-
-KA/Pi:
-Made it posiible to show in the contact overview the details of all data available for that contact( e.g. office, spouse, children, nickname ...)
-
-PwM/Pi:
-Added "sec" to the timeout config settings to make it clear the timeout values are seconds.
-
-********** VERSION 2.1.8 ************
-
-KO/Pi:
-Added info about the completion state of a todo in the ListView/Searchdialog.
-If in TodoView is selected "do not show compledted todos" then completed todos are not shown in the ListView as well.
-Fixed some updating problems when changing the filter.
-
-KA/Pi:
-In the addressee selection dialog now the formatted name is shown, if not empty.
-Added a column "category" to the addressee selection dialog to make it possible to sort addressees after category.
-Now in the addressee selection dialog a selected contact is remove with a single click from the selected list.
-
-Fixed in the file selector on the Zaurus the problem that symbolic links to files/dirs were ignored.
-Fixed the sorting for size in the file selector on the Z.
-
-Changed the color selection dialog on the Zaurus to a more user friendly version.
-
-********** VERSION 2.1.7 ************
-
-KO/Pi:
-Fixed several problems in the new Resource handling.
-Added more options to the search dialog. 
-Fixed a problem in the Month view.  
-Added more options to the dialog when setting a todo to stopped.     
-
-Fixed two small problems in KO/Pi Alarm applet.
-
-********** VERSION 2.1.6 ************
-
-This release is for testing only.
-
-KO/Pi:
-Added to the list view (the list view is used in search dialog as well) the possibility to print it.
-Added to the list view the possibility to hide entries, if you do not want to print all entries of the list view.
-Added to the list view the possibility to add all subtodos of selected todos to an export/beam.
-Added to the search dialog the possibility to make an additive search such that you can get a better list for export/printout.
-Added to the search dialog the possibility to hide the checkboxes such that there is more space for the list view on the Zaurus.
-Fixed a problem in the AlarmTimer Applet: Now utf8 messages are displayed properly.
-
-Added support for multiple calendar files in KO/Pi. Only local ical (*.ics) files are supported as calendars.
-In the sync profile config it is still missing to specify a particular calendar to sync with this profile. That setting will be added later.
-Now on every sync the set of calendars is synced which are enabled in the resource view. 
-
-A calendar is enabled in the resource view if the "eye" column is checked. 
-You can set a calendar to be the default for new items( "+" column ).
-You can tell KO/Pi to ignore all alarm of a calendar ( "bell" column ) and you can set it readonly.
-To find out how to add a new calendar and how to remove a calendar is left as an exercise to the reader ...
-
-
-********** VERSION 2.1.5 ************
-
-This is the new stable version.
-Bugfix:
-Fixed a problem with agenda popup on the desktop in KO/Pi.
-Fixed a crash when reloading file, e.g. after a passive pi-sync synchronization.
-Added config option to not display completed todos in agenda view.
-Addressee view is now using the formatted name, if defined.
-That makes it possible to display "lastname, firstname" in that view now.
-To set the formatted name for all contacts, please use menu:
-Edit->Change->Set formatted name.
-Fixed the bug in KA/Pi that is was not possible to add images to a contact on Windows.
-
-********** VERSION 2.1.4 ************
-
-Fixed two more bugs in the KA/Pi CSV import dialog:
-Made it possible to read multi-line fields and import it to the "Note" field.
-Fixed a problem in mapping custom fields, whatever a custem field is...
-
-********** VERSION 2.1.3 ************
-
-Changed the menu structure of the alarm applet:
-Moved "Simulate" to " Play Beeps" submenu and re-added "Todo List".
-
-Fixed several problems in the KA/Pi CSV import dialog:
-Added "Category", made codec configureable and made it possible to map many fields to the "Note" field.
-
-
-********** VERSION 2.1.2 ************
-
-Fixed a problem closing the alarm dialog on Zaurus with "OK" button.
-
-Fixed a problem when importing data from Outlook with mutiple categories set.
-
-Changed display of days in datenavigator:
-Birthdays are now blue, not dark green.
-When todo view is shown, no birtdays are shown and days with due todos are shown blue.
-When journal view is shown, only holidays are shown and days with journals are blue. 
-
-Added Backup options to global config:
-You can create now x-daily backups for KO/Pi, KA/Pi (for file resources only, file resource is the standard type) and PwM/Pi ( all files you will open ). 
-It is recommended to use another HDD/Memory card for the backup directory. If (very useful on the Zaurus) the specified backup directory does not exist you are asked if you want to try again to create a backup. That makes it possible to insert your memory card in the Zaurus and then trying again.
-The backup is created when the application wants to save for the first time on a backup-day. You can specify the amount of backups and the day interval of backups.
-
-********** VERSION 2.1.1 ************
-
-Stable release 2.1.1!
-
-KO/Pi:
-Fixed one problem in the layout of the edit dialogs on the Zaurus with 640x480 display.
-
-********** VERSION 2.1.0 ************
-
-Stable release 2.1.0!
-
-Summary of changes/fixes compared to version 2.0.6:
-
-Many bugs of version 2.0.6 fixed.
-Most of them were small bugs, but some of them were important.
-It is recommended to use version 2.1.0 and not version 2.0.6.
-
-Important changes:
-
-Added recurring todos to KO/Pi.
-
-Added global application font settings (for all KDE-Pim/Pi apps) to the general settings.
-
-Made Passwordmanager PwM/Pi more userfriendly: Rearranged some toolbar icons, optimized setting of focus, fixed layout problems and more.
-
-Datenavigator can now display many months. Very useful on the desktop.
-
-KO/Pi alarm applet changed: Made buttons in alarm dialog much bigger and other usebility enhancements.
-
-Made alarm sound working on Linux desktop.
-
-Made KO/Pi and KA/Pi running from a memory stick. Please read storage HowTo for details.
-
-Added timetracking feature in KO/Pi todo view. Please read timetraker HowTo for details.
-
-Many other usebility enhancements.
-Special thanks to Ben for his suggestions!
+*************************************
 
 You can find the complete changelog 
-from version 1.7.7 to  2.1.0 
+from version 1.7.7 to  2.2.0 
 in the source package or on 
 
 http://www.pi-sync.net/html/changelog.html
diff --git a/changelog.txt b/changelog.txt
index dec26f6..0f79cd6 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,30 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
+********** VERSION 2.2.0 ************
+
+New stable release!
+Fixed some minor usability problems.
+Added writing of next alarm to a file for usage on pdaXrom.
+
+********** VERSION 2.1.19 ************
+
+Fixed a crash in journal view.
+Fixed a crash at setting a todo to stopped if KO/Pi saved the file while "stop todo" dialog was shown.
+Fixed a minor problem with the marcus bains line (whatever that is).
+Fixed a crash when setting a todo to complete from the show dialog which was called from the What's Next View.
+
+********** VERSION 2.1.18 ************
+
+Pi-Sync mode:
+The "Write back file" status dialog was updated too often such that writing back the file on the Z was very slow. Fixed.
+
+KO/Pi:
+Fixed a layout problem on the Z 5500 with the calender box right of the location box in the event/todo editor. Thanks to Andrew, who found, reported and fixed this problem ( I did not get that problem - it was working on my 5500 ).
+
+Fixed a problem when (imported or added from other applications) events or todos did have attachments.
+Fixed a really ugly and hidden problem in the management of the parent/child relationchip of todos.
+
+
 ********** VERSION 2.1.17 ************
 
 KO/Pi:
diff --git a/desktop/rpm/kdepim_rpm b/desktop/rpm/kdepim_rpm
index f521092..211a563 100644
--- a/desktop/rpm/kdepim_rpm
+++ b/desktop/rpm/kdepim_rpm
@@ -1,6 +1,6 @@
 Summary: A collection of PIM programs
 Name: KDE-Pim-Pi
-Version: 2.2.20
+Version: 2.2.0
 Release: SuSE_9.2
 Copyright:GPL
 Group: Productivity/Pim
diff --git a/version b/version
index e96f484..64fedb6 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-version = "2.1.20";
+version = "2.2.0";