9 files changed, 59 insertions, 20 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 86ac9b5..dc22fc6 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,1009 +1,1015 @@
 Info about the changes in new versions of KDE-Pim/Pi
+********** VERSION 2.0.13 ************
+Fixed a problem in the addressee select dialog and made it more user friendly by adding a minimize splitter.
+In the search dialog you can switch now the focus from search line edit to the list view by pressing key "arrow down".  
 ********** VERSION 2.0.12 ************
 KO/Pi:
 Fixed a bug in todo start/due date handling for non recurring todos with a start and due date.
 Fixed some layout problems in the KO/Pi agenda view when there were many conflicting itmes. 
 Fixed several problems of the keyboard focus in the desktop versions when opening the search dialog/event viewer.
 Fixed problem in pi-sync mode when wrong password was sent.
 OM/Pi:
 Fixed a crash when displaying mails with "Show mail as html" was checked in the config.
 Added a check before displaying the mail if the mail is in html format, if "Show mail as html" is enabled.
 ********** VERSION 2.0.11 ************
 Fixed some problems in pi-sync mode
 (e.g. details of events were not synced properly)
 ********** VERSION 2.0.10 ************
 KO/Pi:
 In the desktop versions the context menu in the search dialog was broken after introducing the What'sThis info for the list view.
 This is fixed.
 Changed the search dialog a bit to make it more user friendly.
 (E.g.: Removed message box about "no items found" and set key focus to search line edit after search).
 Added config option to hide the week number in KO/Pi toolbar.
 ********** VERSION 2.0.9 ************
 Made month view icons for multiday events a bit nicer.
 Some minor fixes in KO/Pi
 (e.g. go to today did not work for new week view properly).
 ********** VERSION 2.0.8 ************
 Fixed a problem in dependency info in the ipk files for the Zaurus.
 Added icon for the stealth new week view and made navigation more user friendly in monthview by adding a prev/next week button to the navigator bar.
 Added a "go today" button to the datepicker.
 Added "created" and "last modified" to event/todo viewer (and What'sThis viewer)
 and made it configureable to show these values.
 Fixed a problem for events (from external iCal files) that do have a duration but no end date.
 ********** VERSION 2.0.7 ************
 Added global application font settings 
 (for all KDE-Pim/Pi apps) to the general settings.
 Fixed a problem in OM/Pi when trying to login to some IMAP servers
 (like the IMAP server of Apple: mail.mac.com )
 Added recurring todos to KO/Pi.
 ********** VERSION 2.0.6 ************
 Some bugfixes in the pi-sync mode.
 Added German translation for pi-sync mode.
 KO/Pi:
 Made the todolist using alternate background.
 Other minor fixes in KO/Pi.
 ********** VERSION 2.0.5 ************
 Bugfixes in KO/Pi.
 ********** VERSION 2.0.4 ************
 KO/Pi:
 Fixed problem loading translations for summary/location edit boxes in event/todo editor.
 Added a general "select week number" to the toolbar.
 Fixed some small problem of the new features introduced in version 2.0.3.
 Made it possible to specify one specific category as category color,
 if more than one categories are selected.
 Fixed a bug in saving colors for categories with non-ascii characters.
 (Like, e.g. German Umlauts).
 Propably you have to set your colors again for those categories. 
 ********** VERSION 2.0.3 ************
 KO/Pi:
 Added feature for changing alarm settings for many items at once:
 Open list view (or search dialog), select the desired items and choose in
 the popup menu: Set alarm for selected...
 Added to the event/todo viewer the option to send an email to 
 all attendees or all selected (with RSVP) attendees. 
 Made the week-month mode changing in month view faster.
 Made month view better useable with keyboard.
 Now TAB key jumps to next cell with an event/todo.
 Scroll in cell with coursor keys, scroll in time (next week) with
 Shift/Control + coursorkeys.
 Fixed bug that the todo view flat mode was reset after first view update.
 If a todo is displayed closed in the todo view, 
 it is now displayed in overdue/due today color depending on the subtodos overdue/due today properties.
 Added info about the numbers of years to the caption (title) information about a birthday event.
 Made completion date in todo editor editable.
 Added possibility to save/load templates for journals.
 (Which is just a simple "save text to file" or "insert text from file".
 ********** VERSION 2.0.2 ************
 KO/Pi:
 Fixed the layout problem of the day label buttons 
 of the agenda view introduced in version 2.0.1.
 Added WhatsThis support for the todo view and the list view.
 Added a quite useful feature to the montview.
 Just click on the week numbers on the left.
 And in the top right corner of month view/agenda view 
 there is now a "week number quick selector".
 (Click on the black triangle).
 Made the quite difficult timezone change in KO/Pi easy.
 OM/Pi:
 Fixed too small icons on desktop.
 Fixed non visible icons in mainwindow on Z with fastload enabled.
 Added signature file setting to smtp account config.
 And the signature can be edited and saved in the edit mail dialog.
 That does mean:
 Simply edit the signature for the selected smtp account in the
 edit new mail dialog and press the "save signature" button there.
 Then the signature is saved to the file specified in the smtp account settings.
 If there is no file specified, it is saved automatically to the file
 kdepim/apps/kopiemail/<accountname>.sig.
 ********** VERSION 2.0.1 ************
 Oooops ... I forgot to test on the Zaurus 5500 ...
 Fixed many problems of new (english) strings (and german translations)
 introduced in the latest versions, where the text was not fitting on the 
 240x320 display of the Zaurus 5500.
 KO/Pi:
 Added a popup menu ( press pen and hold to get popup ) to the agenda view
 with many useful items (add event/todo, show next week, two weeks, month, journal).
 Added items to the todolist popup menu for:
 Display all opened, all closed or all todos flat.
 The "flat" view makes is possible to sort all todos after ,e.g., prio or date.
 Made the reparenting of todos on the desktop possible via Drag&Drop.
 Fixed several bugs in setting the completed datetime for todos.
 Added info about completed datetime of todos to the todo viewer.
 Now displaying a completed todo (with completed datetime set) in the agenda view
 at the time of the completion. Such that now it is possible to see in the agenda view
 when what todo was completed.
 Fixed behaviour of automatic setting completion of todos with sub-todos/parent todos.
 Now the behaviour is:
 Setting a parent to complete  sets all (sub)childs to complete. 
 Setting a parent to uncomplete does not change the childs.
 Setting a child to uncomplete sets all parent to uncomplete.
 Setting a child to complete does not change the parents.
 Smart updating and double buffering of the daymatrix.
 Showing holidays in the day matrix.
 Many other small performance updates.
 Made day labels in agenda clickable. By clicking a label, the day is displayed in single day mode.
 Now the translation file usertranslation.txt is supposed to be in utf8 format.
 If you want to translate a language from western europe, just change the germantranslation.txt file. Please read the updated Usertranslation HowTo in KO/Pi Help menu.
 ********** VERSION 2.0.0 ************
 Stable release 2.0.0!
 KO/Pi:
 Fixed problem in edit dialog recreation at startup.
 Made "toggle view*" menu items enabled context sensitive.
 Changed agenda size menu to items 1-10.
 Made it possible to change agenda size quickly by pressing mouse on timelabels in agenda view and move mouse up/down.
 Usebility enhancements in the KO/Pi menus.
 Birthday import now adds year to summary.
 What's Next view shows age in years for birthday.
 OM/Pi:
 Added three info lines to display subject, from and to of selected mails.
 KA/Pi:
 Fixed jump bar behaviour on Zaurus.
 Now KA/Pi search field supports searching for a range of starting characters.
 E.g. to search for all contact beginning with b to n, type 
 b-n
 in the search field.
 ********** VERSION 1.9.20 ************
 KO/Pi:
 Added for the "dislplay one day" agenda mode 
 info in the caption and in the day lables:
 Now it is displayed, if the selected day is from "day before yesterday"
 to "day after tomorrow".
 Made it possible to delete a Todo, which has sub-todos.
 Fixed two small problems in the todo view.
 Added missing German translation for filter edit and print dialog.
 Made search dialog closeable by cancel key.
 Made it possible to select in the date picker the (ligt grey )
 dates of the prev./next month with the mouse.
 OM/Pi:
 "Delete mail" icon in main window now deletes all selected mails.
 Fixed the problem, that the state flag of imap mails was ignored.
 Now mails with "FLAG_SEEN" on the imap server get no icon in the list view
 to indecate that they are already seen.
 Fixed the problem that the body of some mails was not displayed in the
 mail viewer when fetching them from the imap server directly to read them.
 Made it (configurable) possible  to show the "To:" field in the list view.
 Added to the mail viewer the option "View Source" to make it possible to see the raw mail data.
 Added a "Download Mail" button to the mail viewer to quickly download the viewed mail to the
 local storage folder (specified in account settings) of the account of the mail.
 Removed some memory leaks in OM/Pi.
 ********** VERSION 1.9.19 ************
 Added a lot of missing translations to KA/Pi, 
 Added some missing translations to KO/Pi and OM/Pi.
 Fixed some minor problems in KA/Pi + KO/Pi.
 Fixed a crash when closing PwM/Pi.
 Added German translation for PwM/Pi.
 Made view change and Month View update faster in KO/Pi.
 ********** VERSION 1.9.18 ************
 FYI: The VERSION 1.9.17 was a testing release only.
 Please read the changelog of VERSION 1.9.17 as well.
 Cleaned up the syncing config dialog.
 Added sync config options for date range for events.
 Added sync config options for filters on incoming data.
 Added sync config options for filters on outgoing data.
 Please read the updated SyncHowTo about the new filter settings.
 These filter settings make it now possible to sync with shared
 calendars without writing back private or confidential data
 (via the outgoing filters).
 To sync only with particular parts of a shared calendar, 
 the incoming filter settings can be used.
 An example can be found in the SyncHowTo.
 Same for shared addressbooks.
 Added a setting for the global kdepim data storage.
 Usually the data is stored in (yourhomedir/kdepim).
 Now you can set in the Global config dialog TAB, subTAB "Data storage path"
 a directory where all the kdepim data is stored.
 That makes it easy to save all kdepim data on a SD card on the Z, for example.
 KO/Pi:
 The timeedit input has a pulldown list for times.
 If opened, this pulldown list should now has the right time highlighted.
 Added the possibility to exclude events/todos/journals in a filter.
 You should exclude journals, if you do not want them to sync with a  public calendar.
 KA/Pi:
 Added the possibility to in/exclude public/private/confidential contacts to a filter.
 If you have already defined filterrules in KA/Pi you have to adjust them all by setting the "include public/private/confidential" property manually. Sorry for that ...
 Added printing of card view and details view on desktop.
 Printing of list view is not working...
 Added button for removing pictures in contact editor.
 Parsing data fix of KA/Pi version 1.9.17.
 Fixed the "parse name automatically" problem of KA/Pi version 1.9.17.
 Fixed some syncing merging problems.
 ********** VERSION 1.9.17 ************
 KO/Pi:
 Fixed that tooltips were not updated after moving an item in agenda view.
 Fixed a bug in sorting start date for recurring events in list view.
 Changed the left button in todo viewer from "Agenda" to "Set completed".
 This makes it possible to change a todo in the What's Next View quickly to the completed state without leaving the What's Next View.
 Added more info in the todo viewer: Startdate, parent/sub todos.
 
 KA/Pi:
 All fields search does now actually search all the (possible) fields, 
 not only those listed in the contact list.
 Made is possible to inline a picture in a vcard on the Z.
 This was only possible on the desktop, now is it possible on the Z as well.
 Fixed of missing save settings after filter configuration.
 Made saving of addressbook much faster.
 Fixed extension widget layout problem.
 Fixed saving of default formatted name settings.
 Fixed formatted name handling in edit dialog.
 Added an option for changing formatted names of many contacts
 (menu: File - Change - Set formatted name).
 QWhatsThis was not working on the Z ( only black rectangle was shown).
 This is Fixed.
 KDE-Sync:
 Now readonly KDE resources are synced as well.
 (They are not changed in KDE itself, of course).
 
 ********** VERSION 1.9.16 ************
 KO/Pi:
 Fixed search dialog size on Z 6000 (480x640 display).
 Added setting to hide/show time in agenda items.
 Added setting to hide not running todos in todo view.
 Added columns for start date/time in todo view.
 Replaced the solid half-hour lines in agenda view by dot lines.
 Added possibility of printing the What's Next View on the desktop
 (i.e. Windows and Linux).
 Fixed a crash in KO/Pi when starting KO/Pi with What's Next view.
 Added tooltips in month view.(Tooltips only available on desktop)
 Fixed a strange problem in KO/Pi alarm applet.
 Did not find the actual problem, 
 such that now Qtopia reboots again if deinstalling the alarm applet.
 But the alarm applet should work again.
 KA/Pi:
 Fixed the problem, that internal pictures were not saved.
 Fixed a problem in the pi-sync mode by increasing the timeout for data transfer from 20 seconds to 5 minutes.
 Fixed some minor problems. (Like word wrap in help text windows).
 Fixed a compiling problem in microkde/kresources.
 KO/Pi is using zdbat (renamed to db2file) for syncing with Sharp DTM.
 This version now includes zdbat 1.0.0 (old version was zdbat 0.2.9)
 such that now syncing KO/Pi with Sharp DTM should work on the 
 Zaurus C 3000 model.
 ********** VERSION 1.9.15 ************
 Usebilty enhancements in KO/Pi:
 When clicking on the date in a month view cell, the day view is shown.
 Old behaviour was, that the "new event" dialog popped up.
 Added a one step "undo delete" in KO/Pi (Accessable in the "Action" menu). 
 That means, you can restore the latest
 event/todo/journal you have deleted.
 A journal is deleted, if you clear all the text of the journal.
 Fixed the bug of the editor dialogs in KO/Pi of version 1.9.14.
 KA/Pi  starting in 480x640 resolution:
 Hide the filter action in toolbar
 and added icons for undo/delete/redo in toolbar.
 Change in OM/Pi ViewMail dialog:
 When clicking on the "delete" icon the mail is deleted after confirmation as usual. 
 But the edit dialog is not closed as before, now the next mail in the folder is shown automatically (if there is any).
 Fixed a crash when deleting mail-accounts in OM/Pi.
 ********** VERSION 1.9.14 ************
 Fixed some problems with the dialog sizes when switching 
 portrait/landscape mode on 640x480 PDA display.
 Fixed some other small bugs in KA/Pi KO/Pi and OM/Pi and PwM/Pi.
 Fixed an ugly bug in KOpieMail: 
 KOpieMail was not able to write files (mails) to MSDOS file system, 
 like on an usual preformatted SD card. That should work now.
 To save your mail data on the Sd card do the following:
 Create a dir on the SD card:
 mkdir /mnt/card/localmail
 Go to your home dir:
 cd
 Go to kopiemail data storage dir:
 cd kdepim/apps/kopiemail
 Create a symlink to the SD card:
 ls -s /mnt/card/localmail
 Now KOpieMail will store all mails on the SD card.
 KO/Pi Monthview:
 Now "Go to Today" selects the current month from day 1-end,
 not the current date + some days.
 I.e. "Go to Today" shows now always
 the current month with first day of month in the first row. 
 Added missing German translation.
 Fixed icons of executeable on Wintendo.
 Added a "Show next Mail" button to the OM/Pi 
 mail viewer such that the mail below the current mail
 in the mail list view of the current folder
 can be read with a single click.
 ********** VERSION 1.9.13 ************
 Fixed nasty PwM/Pi file reading bug, when
 the used hash algo of file is different then the global 
 hash algo.
 Added KA/Pi support for opie mailit mailapplication.
 Fixed some bugs in OM/Pi.
 Now character conversion tables are available for the Zaurus
 to make OM/Pi working properly.
 To get the character conversion in OM/Pi working, please download
 at the sourceforge project site the package
 sr-character-conversion_SharpROM_arm.ipk.zip
 (or oz-character-conversion_OZ-gcc3xx_arm.ipk.zip for OZ roms)
 from the section "general files for KDE/Pim"
 Instructions how to install this package are in a ReadMe in this file.
 Fixed the orientation change problem in KA/Pi when switching
 portrait/landscape mode.
 French translation available for KA/Pi and OM/Pi.
 Fixed some problems with categories in KO/Pi in DTM sync.
 Added selection dialog for export to phone in KA/Pi.
 If in KO/Pi is an attendee selected to add to a meeting and this
 attendee is already in the list of attendees, this person is not added
 again.
 Some menu cleanup in KA/Pi.
 ********** VERSION 1.9.12 ************
 Fix for the bug in KO/Pi What's Next view of version 1.9.11.
 Bugfix: Licence file is now shown again.
 OM/Pi now supports Unicode (utf8 charset).
 Fixed some bugs in OM/Pi.
 KA/Pi has more German translation.
 ********** VERSION 1.9.11 ************
 Fixed several problems in PWM/Pi, like
 asking the user, if unsaved changed are pending
 when closing the app.
 And PwM/Pi handles now different texts for the
 fields Description, Username, Password, configurable per category.
 Fixed a crash in KO/Pi , when importing/loading vcs files
 which have an entry with an attendee with state:
 NEEDS ACTION
 Fixed some problems in the German translation of OM/Pi,
 which makes some dialogs not fitting on the screen
 of the Z 5500.
 Fixed Qtopia crash, when disabling/deinstalling
 KO/Pi alarm applet.
 Implemented direct KDE<->KA/Pi sync for KA/Pi running 
 on Linux desktop.
 Added feature "remove sync info" to sync menu.
 Tweaked the KO/Pi What's next view a bit, added
 setting to hide events that are done.
 Disabled "beam receive enabled" on startup to 
 avoid problems if Fastload is enabled.
 Please set "beam receive enabled",
 if you want to receive data via IR.
 Fixed bug in  direct KDE<->KO/Pi sync for KO/Pi running 
 on Linux desktop.
 Made in KA/Pi scrolling possible, if details view is selected.
 (The keyboard focus is set automatically to the search line)
 Fixed a bug in DMT sync, that a new entry in DTM was added 
 on every sync to Kx/Pi.
 Fixed missing writing of KA/Pi categories to DMT entries when syncing.
 Fixed a bug in DMT sync with todos created in KO/Pi containing
 non-latin1 characters.
 Rearranged package contents of Sharp-ipks and made all
 packages installable on SD again.
 Fixed the writing of addressbook data in DTM sync.
 Empty fields in KA/Pi were not removed. 
 Added better category handling in KA/Pi:
 Added item 
 Edit Categories and
 Manage new categories
 to the settings menu.
 Possible to configure a view to display categories.
 Added detailed "KDE Sync Howto" and "Multi Sync Howto" to Help menu.
 Fixed displaying of "free" days and time in KO Monthview and Agendaview.
 ... and many other bugfixes.
 ********** VERSION 1.9.10 ************
 Many internal small bugfixes.
 And fix of the "big" bug in KO/Pi, 
 that after Syncing the appointments had an offset by several hours.
 That was a problem with the internal timezone setting,
 introduced by the changed timezone configuration settings.
 German translation for OM/Pi is now available.
 ********** VERSION 1.9.9 ************
 KDE-Pim/Pi has a new Member!
 It is called PWM/Pi (Passwordmanager/platform-independent) 
 and it is available for the Zaurus.
 It is planned, that it will be available later for Windows.
 (And for Linux, of course).
 It is a port of the Passwordmanager of KDE.
 It will need the MicroKDElibs to run.
 Made loading of addressbooks in KA/Pi up to 7 times faster!
 The bigger your addressbook file, the more starting speed 
 will you gain. (relatively)
 The Qtopia addressbook connector is now platform independend
 as well and should work on any platform for importing/exporting
 Qtopia and Opie XML files.
 Added a +30min feature to the timezone settings to make 
 KDE-Pim/Pi useable in Australia and other parts on the 
 world with strange timezones ;-)
 German "Umlaute" should now be sorted correctly on the Z in KA/Pi.
 It is now possible to disable the
 "receive data via infrared" feature, such that syncing with
 Outlook is now possible again with Kx/Pi runing.
 Please disable it, before syncing Sharp DTM with Outlook.
 For your convenience, the "receive data via infrared" feature
 is disabled automatically, if you sync Kx/Pi with DTM.
 You have to enable it again manually after syncing.
 Enabling this feature makes it impossible to start the
 Sharp DTM apps. If this feature is enabled, you will only get the 
 alarm notification from KO/Pi and not from the Sharp calendar.
 This is very useful if you sync KO/Pi with Sharp DTM,
 because after syncing you usually would get notified about
 an alarm by KO/Pi and the Sharp Calendar.
 Together with the Linux desktop version of KO/Pi
 it is now possible to sync KO/Pi on the Zaurus
 with the complete KDE-desktop (3.3 or later)
 calendar data easily.
 That makes it possible to sync the Z with one 
 click of a mouse with the KDE-Desktop.
 This feature it available for all Zaurus platforms KO/Pi
 is running on.
 The only thing needed is a running KO/Pi on Linux and
 a compiled version of the small 
 KDE-Pim/Pi<->KDE-Desktop access command line program, 
 which is in the KDE-Pim/Pi sources available.
 The "KDE-desktop" syncing feature for KA/Pi will follow
 in the next releases.
 Fixed the vcard export bug, which had the version 1.9.8.
 Added missing GERMAN translation to KO/Pi.
 Hi PsionX, could you add the missing french translation?Thx!
 Translation files for KA/Pi are available as well.
 GERMAN translation will be available in the next release.
 PsionX ( yres, you again ;-) ), could you start translating
 KA/Pi? Thx!
 You can download the version 1.9.9 at
 http://sourceforge.net/project/showfiles.php?group_id=104103&package_id=112604
 Note:
 To run the mail program OM/Pi you need libopenssl.
 A link to a download loaction is available at
 ZSI at www.killefiz.de
 ********** VERSION 1.9.8 ************
 Fixed character decoding in OM/Pi.
 (e.g. German "Umlaute" were not displayed properly.)
 Made is possible to reparent todos in KO/Pi.
 Use contextmenu or keys (look at Help-Keys + Colors) for that.
 Added the missing Sync-Howto and WhatsNew to the packages.
 KO/Pi on Linux desktop can now sync with KDE desktop.
 That means: When using KO/Pi on Linux desktop for syncing with
 KDE desktop and the Zaurus, the Zaurus can be synced now
 with all KDE-Calendar resources, not only with one local file.
 (That makes it possible to sync the Zaurus with the 
 calendar data on a Kolab server) 
 KA/Pi syncing with KDE desktop will be available in the next version.
 ********** VERSION 1.9.7 ************
 KO/Pi - KA/Pi on Windows:
 Now a directory can be defined by the user, where the 
 application/config data should be saved.
  Define your desired path in the evironment variable
  MICROKDEHOME
  before starting KO/Pi or KA/Pi.
 An easy Kx/Pi to Kx/Pi syncing is now possible 
 (it is called Pi-Sync) via network.
 Please look at the Sync Howto.
 Exporting of calendar data and contacts to mobile phones is now possible.
 The SyncHowto is updated with information howto
 access/sync mobile phones. 
 Please look at the Sync Howto.
 Now KO/Pi and KA/Pi on the Zaurus can receive data via infrared directly.
 Please disable Fastload for the original contact/calendar applications
 and close them.
 KO/Pi and KA/Pi must be running in order to receive the data.
 (KO/Pi and KA/Pi are always running if Fastload for them is enabled!)
 In the KA/Pi details view are now the preferred tel. numbers displayed on top 
 of the other data ( emails/tel.numbers/addresses)
 Fixed some syncing problems in KA/Pi.
 Added font settings for the KA/Pi details view.
 Added fields "children's name" and "gender" to KA/Pi.
 Made searching in KA/Pi better:
 Now the first item in a view is selected after a search automatically and
 the views can be scrolled up/down when the search input field has the keyboard focus.
 And, of course, fixed a bunch of reported bugs in KO/Pi and KA/Pi.
 ********** VERSION 1.9.6 ************
 Changes in the external application communication on the Zaurus 
 in order to use less RAM when the apps are running.
 First syncing of addressbooks (KA/Pi) is possible.
 ********** VERSION 1.9.5a ************
 Fixed a bug in KO/Pi in the SharpDTM sync of version 1.9.5.
 Fixed some small bugs.
 KA/Pi shows now the birthday in summary view.
 Now OM/Pi and KA/Pi are using the date format defined in KO/Pi
 for displaying dates.
 ********** VERSION 1.9.5 ************
 There is still no Addressbook syncing!
 New in 1.9.5:
 Many bugfixes.
 Better searching in KA/Pi.
 You can configure in KA/Pi if you want to search only after 
 <return> key pressed.
 Better mail downloading in OM/Pi.
 First experimental alpha version of sync of KO/Pi with mobile phones.
 See gammu documentation for supported phones.
 You need to install the package kammu_1.9.5_arm.ipk for sync of KO/Pi with mobile phones. kammu_1.9.5_arm.ipk needs libbluetooth and libsdp.
 Quick hint how to use:
 NOTE: MOBILE PHONE SYNC IS EXPERIMENTAL!
 Install kammu_1.9.5_arm.ipk , libbluetooth and libsdp.
 Create syncprofile - mobile device
 Remove entry for model. (Leave empty ).
 Enable infrared on Zaurus and your Phone.
 Sync.
 To get a more detailed log, start kopi from konsole.
 ********** VERSION 1.9.4 ************
 This is the version 1.9.4 of KDE-Pim/Pi for the Zaurus.
 WARNING:
 PLEASE BACKUP ALL YOUR DATA!
 We have changed a lot and maybe there are some unknown problems.
 SYNC HANDLING HAS CHANGED!
 Such that, if you sync now with an already synded device, you will duplicated entries after the first sync.
 (This change was introduced to make it possible to sync with mobile phones, which will be available later (maybe in 4 weeks).
 You need the kmicrokdelibs_1.9.4_arm.ipk as a base for the other programs.
 If you get the error: "Install only possible in main memory", just try it again to install it on SD card. That worked for me. And it was reported that rebooting Qtopia did help in this case as well. 
 As programs are available:
 KO/Pi (korganizer ipk) - a calendar program.
 KA/Pi (kaddressbook ipk ) - an addressbook
 OM/Pi (kopiemail ipk ) an email program with pop/smtp and IMAP support.
 An alarm notification program ( korganizer-alarm ipk ) for KO/Pi that notifies you about alarms, even if the Zaurus is in suspend mode.
 (If you do not see an icon in the taskbar after installing korganizer-alarm, please restart Qtopia)
 All the applications are installed in a "Pim" TAB.
 If this TAB is new on your system, you can get an icon in this TAB by installing pim_TAB_icon_1.9.4_arm.ipk
 All the application are integrated.
 Such that you can choose in KO/Pi the attendees of a  meeting from the addresses in KA/Pi. When you click in KA/Pi on the email address, OM/Pi is started to write the mail.
 HINT:
 If you install KPhone/Pi 0.9.7, it will be called, if you click in KA/Pi on a phone number.
 What's new?
 SYNC HANDLING HAS CHANGED!
 Such that, if you sync now with an already synded device, you will duplicated entries after the first sync.
 (This change was introduced to make it possible to sync with mobile phones, which will be available later (maybe in 4 weeks).
 New in OM/Pi:
 When copying(i.e. downloading mails) , you can specify, that only mails of a given size should be downloaded. Added mail copy possibility for selected mails.
 New in KO/Pi:
 French is now available for KO/Pi.
 Choose menu:Actions - Configure:TAB locale
 Syncing has changed.
 Phone sync available soon.
 Not much changes, I cannot remember them ...
 New in KA/Pi:
 Beaming possible.
 Sharp DTM readonly access possible( create a new DTM resource );
 Better searching possible.
 Search is performed only after pressing the return key.
 Use wildcard * to specify parts of a name.
 Better name/email selection dialog (called from KO/Pi or OM/Pi). In this dialog, now searching is possible. Like in KA/Pi, use return key and wildcard * .
 A big improvement is the new management of the contact access.
 In version 1.9.3, every application was using their own addressbook access data.
 That means, the addressbook was loaded up to three times in the memory, when accessed by  KA/Pi, KO/Pi and OM/Pi.
 That was wasting of memory, if you had several hundreds of contacts.
 Now only KA/Pi accesses the addressbook.
 If KO/Pi or OM/Pi want to get some name/email data, they request KA/Pi to open the  name/email selection dialog and send it back to them.
 If you click on an attendee in a meeting, its contact data is displayed in KA/Pi directly.
 That means, if KO/Pi or OM/Pi want to access contact data, KA/Pi is started first.
 New in the KO/Pi alarm applet:
 Configure your own timer popup menu!
 (Text and minutes for timer countdown)
 Just edit the file
 (yourhomedir)/.kopialarmtimerrc
 and start/stop a timer to get a new menu with the data of this file.
 ********** VERSION 1.9.3 ************
 1)
 Now KO/Pi on Windows imports directly the calendar data of
 an installed Outlook. Should work with OL version >= 2000.
 
 ********** VERSION 1.9.2 ************
 1)
 KDE-Pim/Pi has got a new member:
 KmicroMail (KM/Pi) is a mail program, 
 which can handle IMAP and POP mail access.
 It is based on Opie-Mail v3.
 All dependencies to the Opie libraries ar removed, 
 such that no additional Opie lib is needed.
 It is already integrated in KO/Pi and KA/Pi.
 It it now available for the Zaurus,probably it 
 will be available for other platforms later.
 Hint:
 Create your own contact (name + email)
 in KA/Pi, select this contact and choose menu:
 Settings - Set Who Am I.
 Now the settings of this contact are used as 
 the sender data in KM/Pi.
 2)
 KDE-Pim/Pi is split up in five different
 packages now precompiled for Sharp Zaurus:
 --kmicrokdelibs_1.9.2_arm.ipk
 The libs are needed for any 
 of the following programs:
 --kaddressbook_1.9.2_arm.ipk
 --kmicromail_1.9.2_arm.ipk
 --korganizer_1.9.2_arm.ipk
 Independ from that, there is the alarm applet
 available for KO/Pi, which also offers
 quick access for a new mail or
 showing the addressbook.:
 --korganizer-alarm_1.9.2_arm.ipk
 Independend means, that the alarm applet
 does not need any of the libs or programs above to run.
 But it would be quite useless without these programs.
 NOTE:
 If you get a
 "This application depends on other programs"
 during installation of 
 --kmicrokdelibs_1.9.2_arm.ipk
 you probably do not have to care about that.
 kmicrokdelibs_1.9.2 will come with some
 resource plugins, which needs additional libraries.
 (E.g. libopie1, if you want to use the 
 opie resource connector in KA/Pi).
 If you do not have this libraries installed,
 you simply cannot use the resource.
 To make it clear:
 If the libraries are missing, the applications
 using kmicrokdelibs will start, 
 because the resources are plugins.
 3)
 KO/Pi and friends are now installable on SD-Card!
 It is recommended to install all libs and apps
 on the SD card or all in the internal storage.
 There may be problems, if this is mixed.
 4)
 Fixed two bugs in the alarm notification on Windows.
 5)
 Great improvement!
 KO/Pi uses now the latest version of libical.
 Libical is the library which actually reads 
 the calendar files and extract the data from it.
 With the old version, there were problems
 (crashes or program hangs) when licical did read
 files, which were not stored from KO/Pi.
 I do not know, if the new libical works perfect,
 but actually it works much better than
 the old version.
 There are no problems with compatibility with 
 old calendar files of KO/Pi, of course!
 6)
 New in KA/Pi:
 Opie addressbook resource connector available!
 You will need libopie1 and the opie addressbook,
 of course.
 With the Opie addressbook resource connector,
 you can access the Opie addressbook readonly in KA/Pi.
 If you want to edit or import the data into KA/Pi,
 do this:
 a) Create an Opie resource.
   (Menu: Settings-Configure Resources).
 After configuration and restarting KA/Pi you should see
 the Opie contacts in KA/Pi.
 b) Select some or all Opie contacts.
 (NOTE: +++++
 To know exactly, what contacts are Opie contacts, 
 do this: Choose menu: 
 View-Modify View - TAB Fields.
 Select in the above list "Resource" and click
 down arrow to add it to the "Selected fields".
 Click OK.
 Now you have a new column "Resource" in your list,
 where you can see, what an Opie resource is.
 ++++ NOTE end.)
 Ok, we do have now some Opie contacts seleted.
 (Use SHIFT or CTRL key in order to multiple select).
 c) Choose menu: Edit-Copy.
 d) Choose menu: Edit-Paste.
 e) Select the resource, you want to add the contacts to.
 Congrats! Now you have read/write access to the copied 
 opie contacts as "real" KA/Pi contacts.
 ********** VERSION 1.9.1 ************
 1)
       +++ IMPORTANT 1 +++
 The storing place of the default calendar 
 file has changed!
 The default calendar file was
 Applications/korganizer/mycalendar.ics 
 on Zaurus and 
 (yourHomeDir)/korganizer/mycalendar.ics 
 on Windows/Linux desktop. Now it is
 (yourHomeDir)/kdepim/korganizer/mycalendar.ics
 on Zaurus, Windows and Linux.
 To load the old file, choose menu
 File-Load calendar backup.
 (It should be loaded automatically
 at startup with a warning message displayed).
 The place of the configuration file has changed too.
 If you want to use your old KO/Pi config,
 copy it to 
 (yourHomeDir)/kdepim/config/korganizerrc
 Please read VERSION 1.9.0 - topic 3) as well!
       +++ IMPORTANT 2 +++
 Because of the new paths, you will need
 a new version of the KO/Pi alarm applet
 for Zaurus.
 Use version >= 1.9.1
 2)
 Now the QWhat'sThis Icon works for items
 in the month view as well.
 (See VERSION 1.7.8 Topic 1) ).
 3)
 You can import birtsdays/anniversaries
 from KA/Pi into KO/Pi.
 Choose menu File-Import birthdays.
 If you import twice, already imported items
 will not be imported again, if they 
 have not been changed in KO/Pi.
 4)
 When syncing with sharp DTM, now a progress 
 is shown, when the data is written back.
 If there is much data in KO/Pi and no data
 in DTM, that can take a long time.
 (But only for the first time ).
 5)
 In the search dialog, you can search 
 now for the name/email of an attendee
 of an event/todo.
 To get more space for displaying
 search results, the buttons
 for "search" and "close" on the 
 bottom are removed in the PDA version. 
 You have to click OK in the top right
 corner to do a search.
 6)
 Now it is possible to disable the displaying
 of todo items in the Allday part of the Agenda.
 Choose Menu Action-Configure,
 TAB Todo View, checkbox
 "Allday Agenda view shows todos"
 7)
 If FastLoad is enabled, now the settings and the 
 calendar data are saved, when KO/Pi is closed.
 (If no Fastload is enabled, KO/Pi saves
 the data as well, of course)
 8)
 The Agenda View has a minimize-splitter now,
 such that the height of the allday part can be
 changed quickly.
 ********** VERSION 1.9.0 ************
 1)
 KO/Pi is now merged with the new microKDE from KA/Pi.
 KO/Pi accesses now KA/Pi as the addressbook.
 The other ddressbook-plugins are not working any longer.
 (It is planned, that later KA/Pi itself uses these plugins)
 New versions of KO/Pi are only available
 together with KA/Pi as the KDE-Pim/Pi package. 
 2)
 If you click on an attendee of a meeting in the
 event viewer, a detailed summary of the 
 attendee is shown.
 3)
 The place of the configuration file has changed.
 If you want to use your old KO/Pi config, copy
 Applications/korganizer/config_korganizerrc
 to
 Applications/korganizer/config/korganizerrc
 ********** VERSION 1.7.8 ************
 1)
 Now the QWhat'sThis ist working.
 Enable the QWhat'sThis icon in the toolbar.
 (You have to restart to reload the changed toolbar config).
 Now click on the QWhat'sThis Icon 
 in the top right corner of KO/Pi.
 Then click on an item in the Agenda View:
 You will get a detailed display of the items content.
 2)
 Some other very minor changes.
 But I have forgotten the details ...
 For that reason I start this log here:
 To document my changes, when I am doing it.
 ********** VERSION 1.7.7 ************
 Stable Version of KO/Pi
diff --git a/desktop/rpm/kdepim_rpm b/desktop/rpm/kdepim_rpm
index 0d4c9d6..ff9f2dc 100644
--- a/desktop/rpm/kdepim_rpm
+++ b/desktop/rpm/kdepim_rpm
@@ -1,84 +1,84 @@
 Summary: A collection of PIM programs
 Name: KDE-Pim-Pi
-Version: 2.0.12
+Version: 2.0.13
 Release: SuSE_9.2
 Copyright:GPL
 Group: Productivity/Pim
 Source:http://sourceforge.net/projects/kdepimpi/
 URL:http://sourceforge.net/projects/kdepimpi/
 Packager: zautrix
 %description
 This package contains the platform-independent PIM programs from
 www.pi-sync.net, compiled for SuSE 9.2:
 KTimeTacker/Pi
 KPhone/Pi
 KAddressbook/Pi
 KOrganizer/Pi
 PasswordManager/Pi
 KOPieMail/Pi
 These applications do not need anything from the KDE-desktop
 at all to run on Linux. However, there is a dependency from
 two KDE libs, because a small command line program is included
 to make it possible to sync with the KDE-desktop applications.
 These applications are independent from the KDE-desktop
 environment. That means, nothing of your existing
 KDE-desktop setup will be changed, or any data 
 (calendar-addressbook) used by the KDE-desktop
 applications will be changed or accessed.
 These applications stores their data and config in
 $HOME/kdepim/
 However, because the same file format is used,
 an easy exchange of data with the KDE-desktop
 is possible.
 A small command line program is included
 to make it possible to sync with the KDE-desktop applications.
 You do not need to call this program from the commandline,
 it is called from the KDE-Pim/Pi apps when you choose there:
 Sync with KDE_Desktop.
 If something is going wrong, please start the
 KDE-Pim/Pi program itself from the console to get detailed output.
 After installation, you should have a 
 PIM-pi
 folder in your KDE start menu, where you can
 start the applications from.
 These programs makes it possible to sync your Zaurus easily
 (with the KDE-Pim/Pi programs running on the Zaurus)
 with the KDE-desktop calendar/addressbook data.
 If you want to use that, you have to update your 
 KDE-desktop to version 3.3.0 or higher.
 SuSE 9.2 contains KDE 3.3.0 such that no update is needed.
 Actually - after the (non difficult) configuration is set up -
 with two mouseklicks on the Zaurus,
 the Zaurus syncs with the corresponding  KDE-Pim/Pi 
 program on the Linux Desktop which syncs automatically
 with the KDE-desktop data.
 If you want to use the KDE-desktop calendar/addressbook applications,
 just install these apps in this package and use them as a syncing tool for the
 Zaurus <-> KDE-desktop sync.
 The sync requires a network connection from your Zaurus to
 the PC. A detailed Sync HowTo is available in the
 Help menu of the applications.
 These applications makes it also possible, that you can sync
 (or just export the data to) your mobile phone with your 
 data of the KDE-desktop calendar/addressbook applications.
 This is tested and working for Nokia mobile phones,
 it may work with others as well.
 (More info about that: -> Sync HowTo)
 NOTE:
 When using SuSE 9.1 you have to update your KDE to 3.3.x
 and you have to make an online update in SuSE 9.1 to make it
 possible to get the infrared connection working, such that
 you can sync your (Nokia) mobile phone via infrared.
 %files
 /opt/kde3/share/applnk/PIM-pi/
 /opt/kdepimpi/
 /usr/lib/libmicro*
diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp
index 34f4160..b3429e3 100644
--- a/kabc/addresseedialog.cpp
+++ b/kabc/addresseedialog.cpp
@@ -1,293 +1,309 @@
 /*
    This file is part of libkabc.
    Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include <qgroupbox.h>
 #include <qapplication.h>
 #include <qregexp.h>
+#include <qvbox.h>
+#include <qlabel.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kglobalsettings.h>
 #include "stdaddressbook.h"
 #include "addresseedialog.h"
+#include "KDGanttMinimizeSplitter.h"
 //#include "addresseedialog.moc"
 using namespace KABC;
 AddresseeItem::AddresseeItem( QListView *parent, const Addressee &addressee ) :
  QListViewItem( parent ),
  mAddressee( addressee )
 {
    QString name = addressee.familyName()+", "+ addressee.givenName();
    if ( name.length() == 2 )
        name = addressee.organization();
    setText( Name,name);
    setText( Email, addressee.preferredEmail() );
 }
 QString AddresseeItem::key( int column, bool ) const
 {
  if (column == Email) {
    QString value = text(Email);
    int val = value.findRev("@");
    return value.mid( val) + value.left( val );
  }
  return text(column).lower();
 }
 AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
  KDialogBase( KDialogBase::Plain, i18n("Select Addressee"),
-               Ok|Cancel, Ok, parent ), mMultiple( multiple )
+               Ok|Cancel, No, parent ), mMultiple( multiple )
 {
  QWidget *topWidget = plainPage();
  QBoxLayout *topLayout = new QHBoxLayout( topWidget );
-  QBoxLayout *listLayout = new QVBoxLayout;
-  topLayout->addLayout( listLayout );
-  mAddresseeList = new KListView( topWidget );
+  KDGanttMinimizeSplitter* mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, topWidget);
+  mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right );
+  topLayout->addWidget(mMiniSplitter );
+  QWidget *listWidget = new QWidget( mMiniSplitter );
+  QBoxLayout *listLayout = new QVBoxLayout (listWidget) ;
+  //topLayout->addLayout( listLayout );
+  mAddresseeList = new KListView( listWidget );
  mAddresseeList->addColumn( i18n("Name") );
  mAddresseeList->addColumn( i18n("Email") );
  mAddresseeList->setAllColumnsShowFocus( true );
  mAddresseeList->setFullWidth( true );
  listLayout->addWidget( mAddresseeList );
  connect( mAddresseeList, SIGNAL( doubleClicked( QListViewItem * ) ),
           SLOT( slotOk() ) );
-  mAddresseeEdit = new QLineEdit( topWidget );
+  mAddresseeEdit = new QLineEdit( listWidget );
  connect( mAddresseeEdit, SIGNAL( returnPressed() ),
           SLOT( loadAddressBook() ) );
  mAddresseeEdit->setFocus();
 
  listLayout->addWidget( mAddresseeEdit );
  if ( mMultiple ) {
-    QBoxLayout *selectedLayout = new QVBoxLayout;
+      //QBoxLayout *selectedLayout = new QVBoxLayout;
-    topLayout->addLayout( selectedLayout );
+      //topLayout->addLayout( selectedLayout );
-    topLayout->setSpacing( spacingHint() );
+      //topLayout->setSpacing( spacingHint() );
-    QGroupBox *selectedGroup = new QGroupBox( 1, Horizontal, i18n("Selected"),
+    QVBox *selectedGroup = new QVBox( mMiniSplitter );
-                                              topWidget );
+    new QLabel ( i18n("Selected:"), selectedGroup );
-    selectedLayout->addWidget( selectedGroup );
+    //selectedLayout->addWidget( selectedGroup );
    mSelectedList = new KListView( selectedGroup );
    mSelectedList->addColumn( i18n("Name") );
    mSelectedList->addColumn( i18n("Email") );
    mSelectedList->setAllColumnsShowFocus( true );
    mSelectedList->setFullWidth( true );
    connect( mSelectedList, SIGNAL( doubleClicked( QListViewItem * ) ),
             SLOT( removeSelected() ) );
    QPushButton *unselectButton = new QPushButton( i18n("Unselect"), selectedGroup ); 
    connect ( unselectButton, SIGNAL( clicked() ), SLOT( removeSelected() ) );
    connect( mAddresseeList, SIGNAL( clicked( QListViewItem * ) ),
             SLOT( addSelected( QListViewItem * ) ) );
    connect( mAddresseeList, SIGNAL( returnPressed( QListViewItem * ) ),
             SLOT( selectNextItem( QListViewItem * ) ) );
  }
  mAddressBook = StdAddressBook::self( true );
  connect( mAddressBook, SIGNAL( addressBookChanged( AddressBook* ) ),
           SLOT( addressBookChanged() ) );
  connect( mAddressBook, SIGNAL( loadingFinished( Resource* ) ),
           SLOT( addressBookChanged() ) );
-  loadAddressBook();
+  loadAddressBook();  
+  QValueList<int> splitterSize; 
+  splitterSize.append( ( width() / 5 ) * 3 );
+  splitterSize.append( ( width() / 5 ) *2 );
+  mMiniSplitter->setSizes( splitterSize );
 }
 AddresseeDialog::~AddresseeDialog()
 {
 }
 void AddresseeDialog::loadAddressBook()
 {
  mAddresseeList->clear();
  mItemDict.clear();
  if ( mAddresseeEdit->text().isEmpty() ) {
      AddressBook::Iterator it;
      for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) {
      if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
            continue; 
          new AddresseeItem( mAddresseeList, (*it) );
      }
      return;
  }
  //mAddresseeEdit->completionObject()->clear();
  QRegExp re;
  re.setWildcard(true); // most people understand these better.
  re.setCaseSensitive(false);
  re.setPattern( "*"+ mAddresseeEdit->text() + "*");
  AddressBook::Iterator it;
  for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { 
      if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
            continue; 
      QString name = (*it).familyName()+", "+ (*it).givenName();
      if ( name.length() == 2 )
          name = (*it).realName();
      name += (*it).preferredEmail();
 #if QT_VERSION >= 0x030000
      if (re.search(name) != -1)
 #else
      if (re.match(name) != -1)
 #endif
          AddresseeItem *item = new AddresseeItem( mAddresseeList, (*it) );
  }
 }
 void AddresseeDialog::addCompletionItem( const QString &str, QListViewItem *item )
 {
  if ( str.isEmpty() ) return;
  mItemDict.insert( str, item );
  //mAddresseeEdit->completionObject()->addItem( str );
 }
 void AddresseeDialog::selectItem( const QString &str )
 {
  if ( str.isEmpty() ) return;
  QListViewItem *item = mItemDict.find( str );
  if ( item ) {
    mAddresseeList->blockSignals( true );
    mAddresseeList->setSelected( item, true );
    mAddresseeList->ensureItemVisible( item );
    mAddresseeList->blockSignals( false );
  }
 }
 void AddresseeDialog::updateEdit( QListViewItem *item )
 {
  mAddresseeEdit->setText( item->text( 0 ) );
  mAddresseeEdit->setSelection( 0, item->text( 0 ).length() );
 }
 void AddresseeDialog::selectNextItem( QListViewItem *item )
 {
    addSelected( item );
    QListViewItem *next = item->nextSibling();
    if ( next ) {
        next->setSelected( true );
        item->setSelected( false );
        mAddresseeList->setCurrentItem( next );
    }
 }
 void AddresseeDialog::addSelected( QListViewItem *item )
 {
    AddresseeItem *addrItem = (AddresseeItem *)( item );
  if ( !addrItem ) return;
  Addressee a = addrItem->addressee();
  QListViewItem *selectedItem = mSelectedDict.find( a.uid() );
  if ( !selectedItem ) {
    selectedItem = new AddresseeItem( mSelectedList, a );
    mSelectedDict.insert( a.uid(), selectedItem );
  }
 
 }
 void AddresseeDialog::removeSelected()
 {
  QListViewItem *item = mSelectedList->selectedItem();
  AddresseeItem *addrItem = (AddresseeItem *)( item );
  if ( !addrItem ) return;
  QListViewItem *next =  item->nextSibling();
  mSelectedDict.remove( addrItem->addressee().uid() );
  delete addrItem;
  if ( next )
      next->setSelected( true );
 }
 Addressee AddresseeDialog::addressee()
 {
  AddresseeItem *aItem = 0;
  
  if ( mMultiple )
      aItem = (AddresseeItem *)( mSelectedList->firstChild() );
  else
      aItem = (AddresseeItem *)( mAddresseeList->selectedItem() );
 
  if (aItem) return aItem->addressee();
  return Addressee();
 }
 Addressee::List AddresseeDialog::addressees()
 {
  Addressee::List al;
  AddresseeItem *aItem = 0;
  if ( mMultiple ) {
    QListViewItem *item = mSelectedList->firstChild();
    while( item ) {
        aItem = (AddresseeItem *)( item );
      if ( aItem ) al.append( aItem->addressee() );
      item = item->nextSibling();
    }
  }
  else
  {
      aItem = (AddresseeItem *)( mAddresseeList->selectedItem() );
    if (aItem) al.append( aItem->addressee() );
  }
  return al;
 }
 Addressee AddresseeDialog::getAddressee( QWidget *parent )
 {
  AddresseeDialog *dlg = new AddresseeDialog( parent );
  Addressee addressee;
  int result = dlg->exec();
  if ( result == QDialog::Accepted ) {
    addressee =  dlg->addressee();
  }
  delete dlg;
  return addressee;
 }
 Addressee::List AddresseeDialog::getAddressees( QWidget *parent )
 {
  AddresseeDialog *dlg = new AddresseeDialog( parent, true );
  Addressee::List addressees;
  if ( QApplication::desktop()->width() <= 640 )
      dlg->showMaximized();
  int result = dlg->exec();
  if ( result == QDialog::Accepted ) {
    addressees =  dlg->addressees();
  }
  delete dlg;
  return addressees;
 }
 void AddresseeDialog::addressBookChanged()
 {
  loadAddressBook();
 }
diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp
index e2c8e6e..f606124 100644
--- a/korganizer/koeventviewerdialog.cpp
+++ b/korganizer/koeventviewerdialog.cpp
@@ -1,292 +1,298 @@
 /*
    This file is part of KOrganizer.
    Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 #include <klocale.h>
 #include <libkcal/event.h>
 #include <qtimer.h>
 #include <qpushbutton.h>
 #include "koeventviewer.h"
 #include "koprefs.h"
 #include <libkcal/todo.h>
 #include "qapp.h"
 #include "koeventviewerdialog.h"
 extern int globalFlagBlockAgenda;
 KOEventViewerDialog::KOEventViewerDialog(QWidget *parent,const char *name)
  : KDialogBase(parent,name,
 #ifndef DESKTOP_VERSION
                true ,
 #else
                false,
 #endif
                i18n("Event Viewer"),Ok|User1|Close,Close, false,  i18n("Agenda"))
 {
    sendSignalViewerClosed = true;
  mEventViewer = new KOEventViewer(this);
  mEventViewer->setFont( KOPrefs::instance()->mEventViewFont );
  setMainWidget(mEventViewer);
  setButtonText(Ok, i18n("Edit") );
 QObject::connect(findButton( Ok ),SIGNAL(clicked()),
                   SLOT(editIncidence())); 
 QObject::connect(this,SIGNAL(user1Clicked()),
                   SLOT(showIncidence())); 
 mIncidence = 0;
  // TODO: Set a sensible size (based on the content?).
  //showMaximized();
  //qDebug("++++++++++++KOEventViewerDialog() ");
 //  if ( KOPrefs::instance()->mCompactDialogs ) {
 //     setFixedSize( 240,284 );
 //     move( 0, 15 );
 //   } else {
 //     setMinimumSize(300,200);
 //     resize(320,300);
 //   }
 mSyncMode = false;
 mSyncResult = 0;
 }
 KOEventViewerDialog::~KOEventViewerDialog()
 {
    //qDebug("-------~KOEventViewerDialog() ");
 }
 void KOEventViewerDialog::showMe()
 {
 
 #ifdef DESKTOP_VERSION
    int x,y,w,h;
    x = geometry().x();
    y = geometry().y();
    w = width();
    h = height();
    show();
    setGeometry(x,y,w,h);
 #else
    showMaximized();
 #endif
    raise();
    setActiveWindow();
    mEventViewer->setFocus(); 
 }
 void KOEventViewerDialog::setSyncMode( bool b )
 {
  mSyncMode = b;
  //qDebug("KOEventViewerDialog::setSyncMode %d ",mSyncMode );
  if ( mSyncMode ) {
    findButton( Close )->setText( i18n("Cancel Sync"));
    findButton( Ok )->setText( i18n("Remote"));
    findButton( User1 )->setText( i18n("Local"));
  } else {
    findButton( Close )->setText( i18n("Close"));
    findButton( Ok )->setText( i18n("Edit"));
    findButton( User1 )->setText( i18n("Agenda"));
  }
  mEventViewer->setSyncMode( b );
 }
 void KOEventViewerDialog::setColorMode( int m )
 {
    mEventViewer->setColorMode( m );
 }
 int KOEventViewerDialog::executeS( bool local )
 {
    mSyncResult = 3; 
    if ( local ) 
        findButton( User1 )->setFocus();
    else 
        findButton( Ok )->setFocus();
    exec();
    return mSyncResult;
 }
 void KOEventViewerDialog::updateConfig()
 {
  mEventViewer->setFont( KOPrefs::instance()->mEventViewFont );
 }
 void KOEventViewerDialog::setEvent(Event *event)
 {
  mEventViewer->setEvent(event);
  mIncidence = event; 
  mEventViewer->setFocus(); 
  //findButton( Close )->setFocus();
  if ( !mSyncMode ) {
    findButton( User1 )->setText( i18n("Agenda"));
  }
 }
 void KOEventViewerDialog::setIncidence(Incidence *in )
 {
    if ( in->type() == "Event" )
        setEvent( (Event*) in );
    else if ( in->type() =="Todo" )
        setTodo( (Todo*) in );
    else if ( in->type() =="Journal" )
        setJournal( (Journal*) in );
 }
 void KOEventViewerDialog::addIncidence(Incidence *in)
 {
    if ( in->type() == "Event" )
        addEvent( (Event*) in );
    else if ( in->type() =="Todo" )
         mEventViewer->setTodo( (Todo*) in, false );
    else if ( in->type() =="Journal" )
         mEventViewer->setJournal( (Journal*) in, false );
  if ( mSyncMode ) {
      findButton( User1 )->setFocus();
      setCaption(i18n("Conflict! Please choose entry"));
  }   
 }
 void KOEventViewerDialog::addEvent(Event *event)
 { 
  mEventViewer->addEvent(event);
  mIncidence = event; 
  mEventViewer->setFocus(); 
  //findButton( Close )->setFocus(); 
  if ( !mSyncMode ) {
    findButton( User1 )->setText( i18n("Agenda"));
  }
 }
 void KOEventViewerDialog::setTodo(Todo *event)
 {
  mEventViewer->setTodo(event);
  mIncidence = (Incidence*)event; 
  mEventViewer->setFocus(); 
  //findButton( Close )->setFocus(); 
  if ( !mSyncMode ) {
    findButton( User1 )->setText( i18n("Set complete"));
  }
 }
 void KOEventViewerDialog::setJournal(Journal *j)
 {
  mEventViewer->setJournal(j);
  mIncidence = (Incidence*)j; 
  mEventViewer->setFocus(); 
  //findButton( Close )->setFocus();
  if ( !mSyncMode ) {
    findButton( User1 )->setText( i18n("Agenda"));
  }
 }
 void KOEventViewerDialog::addText(QString text)
 {
  mEventViewer->addText(text); 
  mEventViewer->setFocus(); 
  //findButton( Close )->setFocus();
 }
 void KOEventViewerDialog::editIncidence()
 {   
    sendSignalViewerClosed = false;
    if ( mSyncMode ) {
        mSyncResult = 2;
        accept();
        return;
    }
    if ( mIncidence ){
 #ifndef DESKTOP_VERSION
        hide();
 #endif
        emit editIncidence( mIncidence );
    }
 }
 void KOEventViewerDialog::showIncidence()
 {
    sendSignalViewerClosed = false;
    if ( mSyncMode ) {
        mSyncResult = 1;
        accept();
        return;
    }
    if ( mIncidence ){
 #ifndef DESKTOP_VERSION
        hide();
 #endif
        QDate date;
        if ( mIncidence->type() == "Todo" ) {
            /*
            if ( ((Todo*)mIncidence)->hasDueDate() )
                date = ((Todo*)mIncidence)->dtDue().date();
            else {
                globalFlagBlockAgenda = 2;
                emit showAgendaView( false );
                return;
            }
            */
            ((Todo*)mIncidence)->setCompleted( true );
            ((Todo*)mIncidence)->setCompleted(QDateTime::currentDateTime()  );
            hide();
            emit todoCompleted(((Todo*)mIncidence));
            return;
        
        } else
            date = mIncidence->dtStart().date();
        globalFlagBlockAgenda = 1;
        emit showAgendaView( false );
        globalFlagBlockAgenda = 2;
        emit jumpToTime( date );
    }
 }
 void KOEventViewerDialog::keyPressEvent ( QKeyEvent * e ) 
 {
    switch ( e->key() ) {
   
    case Qt::Key_A :
    case Qt::Key_L :
        showIncidence();
        break;
    case Qt::Key_E :
    case Qt::Key_R :
        editIncidence();
        break;
    case Qt::Key_C:
    case Qt::Key_Escape:
+        sendSignalViewerClosed = true;
        close();
        break; 
    case Qt::Key_I:
+#ifndef DESKTOP_VERSION
+        sendSignalViewerClosed = true;
+        close();
+#else
        sendSignalViewerClosed = true;
        slotViewerClosed();
        //accept();
+#endif
        break; 
    default:
        KDialogBase::keyPressEvent ( e );
        break; 
    }
    
 }
 void KOEventViewerDialog::hideEvent ( QHideEvent * e )
 { 
    KDialogBase::hideEvent ( e );
    QTimer::singleShot( 1, this, SLOT (slotViewerClosed() ) );
 }
 void KOEventViewerDialog::slotViewerClosed()
 {
    if ( sendSignalViewerClosed  ) {
        //qDebug("KOEventViewerDialog::hideEvent ");
        emit signalViewerClosed(); 
    }
    sendSignalViewerClosed = true;
 }
        
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 6acee75..710a9f9 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -62,1129 +62,1129 @@
 #include "koprefs.h"
 #include "kfiledialog.h"
 #include "kolistview.h"
 class KOListViewWhatsThis :public QWhatsThis
 {
 public:
  KOListViewWhatsThis( QWidget *wid, KOListView* view ) : QWhatsThis( wid ), _wid(wid),_view (view) { };
 protected:
  virtual QString text( const QPoint& p)
  {
    return _view->getWhatsThisText(p) ;
  }
 private:
  QWidget* _wid;
  KOListView * _view;
 };
 ListItemVisitor::ListItemVisitor(KOListViewItem *item, QDate date )
 {
    mItem = item;
    mDate = date;
 }
 ListItemVisitor::~ListItemVisitor()
 {
 }
 bool ListItemVisitor::visit(Event *e)
 {
    
    bool ok = false;
    QString start, end;
    QDate ds, de;
    if ( e->doesRecur() ) {
        ds = e->getNextOccurence( QDateTime( mDate, QTime(0,0,0)), &ok ).date();
        if ( ok ) {
            int days = e->dtStart().date().daysTo(e->dtEnd().date() );
            start = KGlobal::locale()->formatDate(ds,true);
            de = ds.addDays( days);
            end = KGlobal::locale()->formatDate(de,true);
        }
    } 
    if ( ! ok ) {
        start =e->dtStartDateStr();
        end = e->dtEndDateStr();
        ds = e->dtStart().date();
        de = e->dtEnd().date();
    }
    mItem->setText(0,e->summary());
    mItem->setText(1,start);
    mItem->setText(2,e->dtStartTimeStr());
    mItem->setText(3,end);
    mItem->setText(4,e->dtEndTimeStr());
    mItem->setText(5,e->isAlarmEnabled() ? i18n("Yes") : i18n("No"));
    mItem->setText(6, e->recurrence()->recurrenceText());
    mItem->setText(7,"---");
    mItem->setText(8,"---");
    mItem->setText(9, e->cancelled() ? i18n("Yes") : i18n("No"));
    mItem->setText(10,e->categoriesStr());
    QString key;
    QTime t = e->doesFloat() ? QTime(0,0) : e->dtStart().time();
    key.sprintf("%04d%02d%02d%02d%02d",ds.year(),ds.month(),ds.day(),t.hour(),t.minute());
    mItem->setSortKey(1,key);
    t = e->doesFloat() ? QTime(0,0) : e->dtEnd().time();
    key.sprintf("%04d%02d%02d%02d%02d",de.year(),de.month(),de.day(),t.hour(),t.minute());
    mItem->setSortKey(3,key);
    return true;
 }
 bool ListItemVisitor::visit(Todo *t)
 {
    mItem->setText(0,i18n("Todo: %1").arg(t->summary()));
    if (t->hasStartDate()) {
        mItem->setText(1,t->dtStartDateStr());
        if (t->doesFloat()) {
            mItem->setText(2,"---");
        } else {
            mItem->setText(2,t->dtStartTimeStr());
        }
    } else {
        mItem->setText(1,"---");
        mItem->setText(2,"---");
    }
    mItem->setText(3,"---");
    mItem->setText(4,"---");
    mItem->setText(5,t->isAlarmEnabled() ? i18n("Yes") : i18n("No"));
    mItem->setText(6, t->recurrence()->recurrenceText());
    if (t->hasDueDate()) {
        mItem->setText(7,t->dtDueDateStr());
        if (t->doesFloat()) {
            mItem->setText(8,"---");
        } else {
            mItem->setText(8,t->dtDueTimeStr());
        }
    } else {
        mItem->setText(7,"---");
        mItem->setText(8,"---");
    }
    mItem->setText(9, t->cancelled() ? i18n("Yes") : i18n("No"));
    mItem->setText(10,t->categoriesStr());
    QString key;
    QDate d;
    if (t->hasDueDate()) {
        d = t->dtDue().date();
        QTime tm = t->doesFloat() ? QTime(0,0) : t->dtDue().time();
        key.sprintf("%04d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute());
        mItem->setSortKey(7,key);
    }
    if ( t->hasStartDate() ) {
        d = t->dtStart().date();
        QTime tm = t->doesFloat() ? QTime(0,0) : t->dtStart().time();
        key.sprintf("%04d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute());
        mItem->setSortKey(1,key);
    }
    return true;
 }
 bool ListItemVisitor::visit(Journal * j)
 { 
    QString des = j->description().left(30);
    des = des.simplifyWhiteSpace ();
    des.replace (QRegExp ("\\n"),"" );
    des.replace (QRegExp ("\\r"),"" );
    mItem->setText(0,i18n("Journal: ")+des.left(25));
    mItem->setText(1,j->dtStartDateStr());
    mItem->setText(2,"---");
    mItem->setText(3,"---");
    mItem->setText(4,"---");
    mItem->setText(5,"---");
    mItem->setText(6,"---");
    mItem->setText(7,j->dtStartDateStr());
    mItem->setText(8,"---");
    mItem->setText(9,"---");
    mItem->setText(10,i18n("Last Modified: ")+  KGlobal::locale()->formatDateTime( j->lastModified() , true) );
    QString key;
    QDate d = j->dtStart().date();
    key.sprintf("%04d%02d%02d",d.year(),d.month(),d.day());
    mItem->setSortKey(1,key);
    mItem->setSortKey(7,key);
    return true;
 }
 KOListView::KOListView(Calendar *calendar, QWidget *parent,
                       const char *name)
    : KOEventView(calendar, parent, name)
 {
    mActiveItem = 0;
    mListView = new KOListViewListView(this);
    mListView->addColumn(i18n("Summary"));
    mListView->addColumn(i18n("Start Date"));
    mListView->addColumn(i18n("Start Time"));
    mListView->addColumn(i18n("End Date"));
    mListView->addColumn(i18n("End Time"));
    mListView->addColumn(i18n("Alarm")); // alarm set?
    mListView->addColumn(i18n("Recurs")); // recurs?
    mListView->addColumn(i18n("Due Date"));
    mListView->addColumn(i18n("Due Time"));
    mListView->addColumn(i18n("Cancelled"));
    mListView->addColumn(i18n("Categories"));
    mListView->setColumnAlignment(0,AlignLeft);
    mListView->setColumnAlignment(1,AlignLeft);
    mListView->setColumnAlignment(2,AlignHCenter);
    mListView->setColumnAlignment(3,AlignLeft);
    mListView->setColumnAlignment(4,AlignHCenter);
    mListView->setColumnAlignment(5,AlignLeft);
    mListView->setColumnAlignment(6,AlignLeft);
    mListView->setColumnAlignment(7,AlignLeft);
    mListView->setColumnAlignment(8,AlignLeft);
    mListView->setColumnAlignment(9,AlignLeft);
    mListView->setColumnAlignment(10,AlignLeft);
    mListView->setColumnWidthMode(10, QListView::Manual);
    new KOListViewWhatsThis(mListView->viewport(),this);
    int iii = 0;
    for ( iii = 0; iii< 10 ; ++iii )
        mListView->setColumnWidthMode( iii, QListView::Manual );
    QBoxLayout *layoutTop = new QVBoxLayout(this);
    layoutTop->addWidget(mListView);
    mListView->setFont ( KOPrefs::instance()->mListViewFont );
    mPopupMenu = eventPopup();
    mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
                                  i18n("Select all"),this,
                                  SLOT(allSelection()),true);
    mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
                                  i18n("Deselect all"),this,
                                  SLOT(clearSelection()),true);
    mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
                                  i18n("Delete all selected"),this,
                                  SLOT(deleteAll()),true);
    mPopupMenu->insertSeparator();
    mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
                                  i18n("Save selected to file..."),this,
                                  SLOT(saveToFile()),true);
    mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
                                  i18n("Save Journal/Description..."),this,
                                  SLOT(saveDescriptionToFile()),true);
    // mPopupMenu->insertSeparator();
    mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
                                  i18n("Add Categ. to selected..."),this,
                                  SLOT(addCat()),true);
    mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
                                  i18n("Set Categ. for selected..."),this,
                                  SLOT(setCat()),true);
    //mPopupMenu->insertSeparator();
    mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
                                  i18n("Set alarm for selected..."),this,
                                  SLOT(setAlarm()),true);
 #ifndef DESKTOP_VERSION
    mPopupMenu->insertSeparator();
    mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
                                  i18n("Beam selected via IR"),this,
                                  SLOT(beamSelected()),true);
 #endif
    /*
      mPopupMenu = new QPopupMenu;
      mPopupMenu->insertItem(i18n("Edit Event"), this,
      SLOT (editEvent()));
      mPopupMenu->insertItem(SmallIcon("delete"), i18n("Delete Event"), this,
      SLOT (deleteEvent()));
      mPopupMenu->insertSeparator();
      mPopupMenu->insertItem(i18n("Show Dates"), this,
      SLOT(showDates()));
      mPopupMenu->insertItem(i18n("Hide Dates"), this,
      SLOT(hideDates()));
    */
    QObject::connect(mListView,SIGNAL( newEvent()),
                     this,SIGNAL(signalNewEvent()));
    QObject::connect(mListView,SIGNAL(doubleClicked(QListViewItem *)),
                     this,SLOT(defaultItemAction(QListViewItem *)));
    QObject::connect(mListView,SIGNAL(rightButtonClicked ( QListViewItem *,
                                                           const QPoint &, int )),
                     this,SLOT(popupMenu(QListViewItem *,const QPoint &,int)));
    QObject::connect(mListView,SIGNAL(currentChanged(QListViewItem *)),
                     SLOT(processSelectionChange(QListViewItem *)));
    QObject::connect(mListView,SIGNAL(showIncidence(Incidence *)),
                     SIGNAL(showIncidenceSignal(Incidence *)) );
    readSettings(KOGlobals::config(),"KOListView Layout");
 }
 KOListView::~KOListView()
 {
    delete mPopupMenu;
 }
 QString KOListView::getWhatsThisText(QPoint p)
 {
    KOListViewItem* item = ( KOListViewItem* ) mListView->itemAt( p );
    if ( item )
        return KIncidenceFormatter::instance()->getFormattedText( item->data(),
                                                                  KOPrefs::instance()->mWTshowDetails,
                                                                  KOPrefs::instance()->mWTshowCreated,
                                                                  KOPrefs::instance()->mWTshowChanged);
    return i18n("That is the list view" );
 }
 void KOListView::updateList()
 {
    // qDebug(" KOListView::updateList() ");
 }
 void KOListView::addCat( )
 {
    setCategories( false );
 }
 void KOListView::setCat()
 {
    setCategories( true );
 }
 void  KOListView::setAlarm()
 {
    KOAlarmPrefs kap( this);
    if ( !kap.exec() )
        return;
    QStringList itemList;
    QPtrList<KOListViewItem> sel ;
    QListViewItem *qitem  = mListView->firstChild ();
    while ( qitem ) {
        if ( qitem->isSelected() ) {
            Incidence* inc = ((KOListViewItem *) qitem)->data();
            if ( inc->type() != "Journal" ) {
                if ( inc->type() == "Todo" ) {
                    if ( ((Todo*)inc)->hasDueDate() )
                      sel.append(((KOListViewItem *)qitem));
                } else
                      sel.append(((KOListViewItem *)qitem));
            }
        }
        qitem = qitem->nextSibling();
    }
    int count = 0;
    KOListViewItem * item, *temp;
    item = sel.first();
    Incidence* inc;
    while ( item ) {
        inc = item->data();
            ++count;
            if (kap.mAlarmButton->isChecked()) {
                if (inc->alarms().count() == 0) 
                    inc->newAlarm();
                QPtrList<Alarm> alarms = inc->alarms();
                Alarm *alarm;
                for (alarm = alarms.first(); alarm; alarm = alarms.next() ) {
                    alarm->setEnabled(true);
                    int j = kap.mAlarmTimeEdit->value()* -60;
                    if (kap.mAlarmIncrCombo->currentItem() == 1)
                        j = j * 60;
                    else if (kap.mAlarmIncrCombo->currentItem() == 2)
                        j = j * (60 * 24);
                    alarm->setStartOffset( j );
                    if (!kap.mAlarmProgram.isEmpty() && kap.mAlarmProgramButton->isOn()) {
                        alarm->setProcedureAlarm(kap.mAlarmProgram);
                    }
                    else if (!kap.mAlarmSound.isEmpty() && kap.mAlarmSoundButton->isOn())
                        alarm->setAudioAlarm(kap.mAlarmSound);
                    else
                        alarm->setType(Alarm::Invalid);
                    //alarm->setAudioAlarm("default");
                    // TODO: Deal with multiple alarms
                    break; // For now, stop after the first alarm
                }
            } else {
                Alarm* alarm = inc->alarms().first();
                if ( alarm ) {
                    alarm->setEnabled(false);
                    alarm->setType(Alarm::Invalid);
                }
            }
        temp = item;
        item = sel.next();
        mUidDict.remove( inc->uid() ); 
        delete temp;;
        addIncidence( inc );
    }
    topLevelWidget()->setCaption( i18n("Canged alarm for %1 items").arg( count )  );
    qDebug("KO: Set alarm for %d items", count);
    calendar()->reInitAlarmSettings();
 }
 void KOListView::setCategories( bool removeOld )
 {
   
    KPIM::CategorySelectDialog* csd = new KPIM::CategorySelectDialog( KOPrefs::instance(), 0 );
    if (! csd->exec()) { 
        delete csd;
        return;
    }
    QStringList catList = csd->selectedCategories();
    delete csd;
    // if ( catList.count() == 0 )
    //   return;
    catList.sort();
    QString categoriesStr = catList.join(",");
    int i;
    QStringList itemList;
    QPtrList<KOListViewItem> sel ;
    QListViewItem *qitem  = mListView->firstChild ();
    while ( qitem ) {
        if ( qitem->isSelected() ) {
            sel.append(((KOListViewItem *)qitem));
        }
        qitem = qitem->nextSibling();
    }
    KOListViewItem * item, *temp;
    item = sel.first();
    Incidence* inc;
    while ( item ) {
        inc = item->data();
        if ( removeOld ) {
            inc->setCategories( categoriesStr );
        } else {
            itemList = QStringList::split (",", inc->categoriesStr() );
            for( i = 0; i<   catList.count(); ++i ) {
                if (  !itemList.contains (catList[i]))
                    itemList.append( catList[i] );
            }
            itemList.sort();
            inc->setCategories( itemList.join(",") );
        }
        temp = item;
        item = sel.next();
        mUidDict.remove( inc->uid() ); 
        delete temp;;
        addIncidence( inc );
    }
 }
 void KOListView::beamSelected()
 {
    int icount = 0;
    QPtrList<Incidence> delSel ;
    QListViewItem *item  = mListView->firstChild ();
    while ( item ) {
        if ( item->isSelected() ) {
            delSel.append(((KOListViewItem *)item)->data());
            ++icount;
        }
        
        item = item->nextSibling();
    }
    if ( icount ) {
        emit beamIncidenceList( delSel );
        return;
        QString fn ;
        fn = QDir::homeDirPath()+"/kopitempbeamfile.vcs";
        QString mes;
        bool createbup = true;
        if ( createbup ) {
            QString description = "\n";
            CalendarLocal* cal = new CalendarLocal();
            cal->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId);
            Incidence *incidence = delSel.first();
            while ( incidence ) {
                Incidence *in = incidence->clone();
                description += in->summary() + "\n";
                cal->addIncidence( in );
                incidence = delSel.next();
            }
            FileStorage storage( cal, fn, new VCalFormat );
            storage.save();
            delete cal;
            mes = i18n("KO/Pi: Ready for beaming");
            topLevelWidget()->setCaption(mes); 
 #ifndef DESKTOP_VERSION
            Ir *ir = new Ir( this ); 
            connect( ir, SIGNAL( done( Ir * ) ), this, SLOT( beamDone( Ir * ) ) );
            ir->send( fn, description, "text/x-vCalendar" );
 #endif
        }
    }
 }
 void KOListView::beamDone( Ir *ir )
 {
 #ifndef DESKTOP_VERSION
    delete ir;
 #endif
    topLevelWidget()->setCaption(i18n("KO/Pi:Beaming done")); 
 }
 void KOListView::saveDescriptionToFile()
 {
    int result = QMessageBox::warning( this, i18n("KO/Pi: Information!"),
                                       i18n("This saves the text/details of selected\nJournals and Events/Todos\nto a text file."),
                                       i18n("Continue"), i18n("Cancel"), 0,
                                       0, 1 );
    if ( result != 0 ) {
        return;
    }
  int icount = 0;
    QPtrList<Incidence> delSel ;
    QListViewItem *item  = mListView->firstChild ();
    while ( item ) {
        if ( item->isSelected() ) {
            delSel.append(((KOListViewItem *)item)->data());
            ++icount;
        }
        
        item = item->nextSibling();
    }
    if ( icount ) {
        QString fn =  KOPrefs::instance()->mLastSaveFile;
        fn =  KFileDialog::getSaveFileName( fn, i18n("Save filename"), this );
    
        if ( fn == "" )
            return;
        QFileInfo info;
        info.setFile( fn );
        QString mes;
        bool createbup = true;
        if ( info. exists() ) { 
            mes =  i18n("File already exists!\nOld file from:\n%1\nOverwrite?\n").arg (KGlobal::locale()->formatDateTime(info.lastModified (), true, false )  );
            int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mes,
                                               i18n("Overwrite!"), i18n("Cancel"), 0,
                                               0, 1 );
            if ( result != 0 ) {
                createbup = false;
            }
        }
        if ( createbup ) {
            QString text = i18n("KO/Pi Description/Journal save file.\nSave date: ") + 
                KGlobal::locale()->formatDateTime(QDateTime::currentDateTime(), false);
            Incidence *incidence = delSel.first();
            icount = 0;
            while ( incidence ) {
                if ( incidence->type()  == "Journal" ) {
                    text += "\n************************************\n";
                    text += i18n("Journal from: ") +incidence->dtStartDateStr( false );
                    text +="\n" +  i18n("Last modified: ") +KGlobal::locale()->formatDateTime(incidence->lastModified(), false);
                    text +="\n" +  i18n("Description: ") + "\n"+ incidence->description();
                    ++icount;
                } else {
                    if ( !incidence->description().isEmpty() ) {
                        text += "\n************************************\n";
                        if ( incidence->type()  == "Todo" )
                            text += i18n("To-Do: ");
                        text += incidence->summary();
                        if ( incidence->hasStartDate() )
                            text +="\n"+ i18n("Start Date: ") + incidence->dtStartStr( false );
                        text +="\n"+ i18n("Last modified: ") +KGlobal::locale()->formatDateTime(incidence->lastModified(), false);
                        if ( !incidence->location().isEmpty() )
                            text += "\n" +i18n("Location: ") + incidence->location();
                        text += "\n" + i18n("Description: ") + "\n" + incidence->description();
                        ++icount;
                    }
                }
                incidence = delSel.next();
            }
            QFile file( fn );
            if (!file.open( IO_WriteOnly ) ) {
                topLevelWidget()->setCaption(i18n("File open error - nothing saved!") ); 
                return;
            }  
            QTextStream ts( &file );
            ts << text;
            file.close();
            //qDebug("%s ", text.latin1());
            mes = i18n("KO/Pi:Saved %1 descriptions/journals").arg(icount );
            KOPrefs::instance()->mLastSaveFile = fn;
            topLevelWidget()->setCaption(mes); 
        }
    }
 }
 void KOListView::saveToFile()
 {
    int icount = 0;
    QPtrList<Incidence> delSel ;
    QListViewItem *item  = mListView->firstChild ();
    while ( item ) {
        if ( item->isSelected() ) {
            delSel.append(((KOListViewItem *)item)->data());
            ++icount;
        }
        
        item = item->nextSibling();
    }
    if ( icount ) {
        QString fn =  KOPrefs::instance()->mLastSaveFile;
        fn =  KFileDialog::getSaveFileName( fn, i18n("Save filename"), this );
    
        if ( fn == "" )
            return;
        QFileInfo info;
        info.setFile( fn );
        QString mes;
        bool createbup = true;
        if ( info. exists() ) { 
            mes =  i18n("File already exists!\nOld file from:\n%1\nOverwrite?\n").arg (KGlobal::locale()->formatDateTime(info.lastModified (), true, false )  );
            int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mes,
                                               i18n("Overwrite!"), i18n("Cancel"), 0,
                                               0, 1 );
            if ( result != 0 ) {
                createbup = false;
            }
        }
        if ( createbup ) {
            CalendarLocal cal;
            cal.setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId);
            Incidence *incidence = delSel.first();
            while ( incidence ) {
                cal.addIncidence( incidence->clone() );
                incidence = delSel.next();
            }
            ICalFormat format;
            format.save( &cal, fn );
            mes = i18n("KO/Pi:Saved %1").arg(fn );
            KOPrefs::instance()->mLastSaveFile = fn;
            topLevelWidget()->setCaption(mes); 
        }
    }
 }
 void KOListView::deleteAll()
 {
    int icount = 0;
    QPtrList<Incidence> delSel ;
    QListViewItem *item  = mListView->firstChild ();
    while ( item ) {
        if ( item->isSelected() ) {
            delSel.append(((KOListViewItem *)item)->data());
            ++icount;
        }
        
        item = item->nextSibling();
    }
    if ( icount ) {
        Incidence *incidence = delSel.first();
        Incidence *toDelete;   
        KOPrefs *p = KOPrefs::instance();
        bool confirm = p->mConfirm;
        QString mess;
        mess = mess.sprintf( i18n("You have %d item(s) selected.\n"), icount );
        if ( KMessageBox::Continue == KMessageBox::warningContinueCancel(this, mess + i18n("All selected items will be\npermanently deleted.\n(Deleting items will take\nsome time on a PDA)\n"), i18n("KO/Pi Confirmation"),i18n("Delete")) ) {
            p->mConfirm = false;
            int delCounter = 0;
            QDialog dia ( this, "p-dialog", true ); 
            QLabel lab (i18n("Close dialog to abort deletion!"), &dia ); 
            QVBoxLayout lay( &dia );
            lay.setMargin(7); 
            lay.setSpacing(7); 
            lay.addWidget( &lab);
            QProgressBar bar( icount, &dia );
            lay.addWidget( &bar);
            int w = 220;
            int h = 50;
            int dw = QApplication::desktop()->width();
            int dh = QApplication::desktop()->height();
            dia.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
            //dia.resize( 240,50 );
            dia.show();
            
            while ( incidence ) {
                bar.setProgress( delCounter );
                mess = mess.sprintf( i18n("Deleting item %d ..."), ++delCounter );
                dia.setCaption( mess );
                qApp->processEvents();
                toDelete =  (incidence);
                incidence = delSel.next();
                emit deleteIncidenceSignal(toDelete ); 
                if (  dia.result() != 0 )
                    break;
               
            }
            mess = mess.sprintf( i18n("%d items remaining in list."), count() );
            topLevelWidget ()->setCaption( mess );
            p->mConfirm = confirm;
        }    
    }  
        
 }
 int KOListView::maxDatesHint()
 {
    return 0;
 }
 int KOListView::currentDateCount()
 {
    return 0;
 }
 QPtrList<Incidence> KOListView::selectedIncidences()
 {
    QPtrList<Incidence> eventList;
    QListViewItem *item  = mListView->firstChild ();
    while ( item ) {
        if ( item->isSelected() ) {
            eventList.append(((KOListViewItem *)item)->data());
        }
        item = item->nextSibling();
    }
    //  // QListViewItem *item = mListView->selectedItem();
    //if (item) eventList.append(((KOListViewItem *)item)->data());
    return eventList;
 }
 DateList KOListView::selectedDates()
 {
    DateList eventList;
    return eventList;
 }
 void KOListView::showDates(bool show)
 {
    // Shouldn't we set it to a value greater 0? When showDates is called with
    // show == true at first, then the columnwidths are set to zero.
    static int oldColWidth1 = 0;
    static int oldColWidth3 = 0;
    if (!show) {
        oldColWidth1 = mListView->columnWidth(1);
        oldColWidth3 = mListView->columnWidth(3);
        mListView->setColumnWidth(1, 0);
        mListView->setColumnWidth(3, 0);
    } else {
        mListView->setColumnWidth(1, oldColWidth1);
        mListView->setColumnWidth(3, oldColWidth3);
    }
    mListView->repaint();
 }
 void KOListView::printPreview(CalPrinter *calPrinter, const QDate &fd,
                              const QDate &td)
 {
 #ifndef KORG_NOPRINTER
    calPrinter->preview(CalPrinter::Day, fd, td);
 #endif
 }
 void KOListView::showDates()
 {
    showDates(true);
 }
 void KOListView::hideDates()
 {
    showDates(false);
 }
 void KOListView::resetFocus()
 {
    mListView->setFocus();
 }
 void KOListView::updateView()
 {
    mListView->setFocus();
    if ( mListView->firstChild () )
        mListView->setCurrentItem( mListView->firstChild () );
 }
 void KOListView::updateConfig()
 {
    mListView->setFont ( KOPrefs::instance()->mListViewFont );
    updateView();
 }
 void KOListView::setStartDate(const QDate &start)
 {
    mStartDate = start;
 }
 void KOListView::showDates(const QDate &start, const QDate &end)
 {
    clear();
    mStartDate = start;
    QDate date = start;
    QPtrList<Journal> j_list;
    while( date <= end ) {
        addEvents(calendar()->events(date));
        addTodos(calendar()->todos(date));
        Journal* jo = calendar()->journal(date);
        if ( jo )
            j_list.append( jo );
        date = date.addDays( 1 );
    }
    addJournals(j_list);
    emit incidenceSelected( 0 );
    updateView();
  
 }
 void KOListView::addEvents(QPtrList<Event> eventList)
 {
    Event *ev;
    for(ev = eventList.first(); ev; ev = eventList.next()) {
        addIncidence(ev);
    }
    if ( !mListView->currentItem() ){
        updateView();
    }
 }
 void KOListView::addTodos(QPtrList<Todo> eventList)
 {
    Todo *ev;
    for(ev = eventList.first(); ev; ev = eventList.next()) {
        addIncidence(ev);
    }
    if ( !mListView->currentItem() ){
        updateView();
    }
 }
 void KOListView::addJournals(QPtrList<Journal> eventList)
 {
    Journal *ev;
    for(ev = eventList.first(); ev; ev = eventList.next()) {
        addIncidence(ev);
    }  
    if ( !mListView->currentItem() ){
        updateView();
    }
 }
 void KOListView::addIncidence(Incidence *incidence)
 {
    if ( mUidDict.find( incidence->uid() ) ) return;
  
    // mListView->setFont ( KOPrefs::instance()->mListViewFont );
    mUidDict.insert( incidence->uid(), incidence );
    KOListViewItem *item = new KOListViewItem( incidence, mListView ); 
    ListItemVisitor v(item, mStartDate );
    if (incidence->accept(v)) return;
    else delete item;
    //qDebug("delete item ");
 }
 void KOListView::showEvents(QPtrList<Event> eventList)
 {
    clear();
    addEvents(eventList);
    // After new creation of list view no events are selected.
    emit incidenceSelected( 0 );
 }
 int KOListView::count()
 {
    return mListView->childCount();
 }
 void KOListView::changeEventDisplay(Event *event, int action)
 {
    KOListViewItem *item;
    switch(action) {
    case KOGlobals::EVENTADDED:
        addIncidence( event );
        break;
    case KOGlobals::EVENTEDITED:
        item = getItemForEvent(event);
        if (item) { 
            mUidDict.remove( event->uid() ); 
            delete item;
            addIncidence( event );
        }
        break;
    case KOGlobals::EVENTDELETED:
        item = getItemForEvent(event);
        if (item) {
            mUidDict.remove( event->uid() ); 
            delete item;
        }
        break;
    default:
        ;
    }
 }
 KOListViewItem *KOListView::getItemForEvent(Event *event)
 {
    KOListViewItem *item = (KOListViewItem *)mListView->firstChild();
    while (item) {
        if (item->data() == event) return item;
        item = (KOListViewItem *)item->nextSibling();
    }
    return 0;
 }
 void KOListView::defaultItemAction(QListViewItem *i)
 {
    KOListViewItem *item = static_cast<KOListViewItem *>( i );
    if ( item ) defaultAction( item->data() );
      
 }
 void KOListView::popupMenu(QListViewItem *item,const QPoint &,int)
 {
    mActiveItem = (KOListViewItem *)item;
    if (mActiveItem) {
        Incidence *incidence = mActiveItem->data();
        mPopupMenu->showIncidencePopup(incidence);
        /*
          if ( incidence && incidence->type() == "Event" ) {
          Event *event = static_cast<Event *>( incidence );
          mPopupMenu->showEventPopup(event);
          }
        */
    }
 }
 void KOListView::readSettings(KConfig *config, QString setting)
 {
    //  qDebug("KOListView::readSettings ");
    mListView->restoreLayout(config,setting);
 }
 void KOListView::writeSettings(KConfig *config, QString setting)
 {
    // qDebug("KOListView::writeSettings ");
    mListView->saveLayout(config, setting);
 }
 void KOListView::processSelectionChange(QListViewItem *)
 {
  
    KOListViewItem *item =
        static_cast<KOListViewItem *>( mListView->currentItem() );
    if ( !item ) {
        emit incidenceSelected( 0 );
    } else {
        emit incidenceSelected( item->data() );
    }
 }
 void KOListView::clearSelection()
 {
    mListView->selectAll( false );
 }
 void KOListView::allSelection()
 {
    mListView->selectAll( true );
 }
 void KOListView::clear()
 {
    mListView->clear();
    mUidDict.clear();
 }
 Incidence* KOListView::currentItem()
 {
    if ( mListView->currentItem()  )
        return ((KOListViewItem*) mListView->currentItem())->data();
    return 0;
 }
 void KOListView::keyPressEvent ( QKeyEvent *e) 
 {
   
    if (  e->key() == Qt::Key_Delete || e->key() == Qt::Key_Backspace ) {
        deleteAll();
        return;
    }
   
    e->ignore();
 }
 void KOListViewListView::keyPressEvent ( QKeyEvent *e) 
 {
  
    switch ( e->key() ) {
    case Qt::Key_Down:
        if ( e->state() == ShiftButton ) {
            QListViewItem* cn = currentItem();
            if ( !cn ) 
                cn = firstChild();
            if ( !cn ) 
                return;
            while (  cn->nextSibling() )
                cn = cn->nextSibling();
            setCurrentItem ( cn );
            ensureItemVisible ( cn );
        
            e->accept();
            return;
        }
        if ( e->state() == ControlButton ) {
            int count = childCount ();
            int jump = count / 5;
            QListViewItem* cn;
            cn = currentItem();
            if ( ! cn )
                return;
            if ( jump  == 0 )
                jump = 1;
            while ( jump && cn->nextSibling() ) {
                cn = cn->nextSibling();
                --jump;
            }
            setCurrentItem ( cn );
            ensureItemVisible ( cn );
            
        } else
            QListView::keyPressEvent ( e ) ;
        e->accept();
        break;
              
    case Qt::Key_Up:
        if ( e->state() == ShiftButton ) {
            QListViewItem* cn = firstChild();
            if ( cn ) {
                setCurrentItem ( cn );
                ensureItemVisible ( cn );
            }
            e->accept();
            return;
        }
        if ( e->state() == ControlButton ) {
            int count = childCount ();
            int jump = count / 5;
            QListViewItem* cn;
            cn = currentItem();
            if ( ! cn )
                return;
            if ( jump  == 0 )
                jump = 1;
            while ( jump && cn->itemAbove ()) {
                cn = cn->itemAbove ();
                --jump;
            }
            setCurrentItem ( cn );
            ensureItemVisible ( cn );
        } else
            QListView::keyPressEvent ( e ) ;
        e->accept();
        break;   
    case Qt::Key_I: {
        QListViewItem* cn;
        cn = currentItem();
        if ( cn ) {
            KOListViewItem* ci = (KOListViewItem*)( cn ); 
            if ( ci ){
                //emit showIncidence( ci->data());
                cn = cn->nextSibling();
                if ( cn ) {
                    setCurrentItem ( cn );
                    ensureItemVisible ( cn );
-                emit showIncidence( ci->data());
                }
+                emit showIncidence( ci->data());
            }
        }
        e->accept();
    }
        break;          
    case Qt::Key_Return:
    case Qt::Key_Enter:
        {
            QListViewItem* cn;
            cn = currentItem();
            if ( cn ) {
                KOListViewItem* ci = (KOListViewItem*)( cn ); 
                if ( ci ){ 
                    if ( e->state() == ShiftButton )
                        ci->setSelected( false );
                    else
                        ci->setSelected( true );
                    cn = cn->nextSibling();
                    if ( cn ) {
                        setCurrentItem ( cn );
                        ensureItemVisible ( cn );
                    }
                }
            }
            e->accept();
        }
    break;             
    default:
        e->ignore();
    }
 }
 KOListViewListView::KOListViewListView(KOListView * lv ) 
    : KListView( lv )
 {
 #ifndef DESKTOP_VERSION
    QPEApplication::setStylusOperation(viewport(), QPEApplication::RightOnHold );
 #endif
    mYMousePos = -1000;
    setSelectionMode( QListView::Multi );   
    setMultiSelection( true);
    mAllowPopupMenu = true;
    mMouseDown = false;
    
 }
 void KOListViewListView::contentsMouseDoubleClickEvent(QMouseEvent *e)
 {
    if (!e) return;
    QPoint vp = contentsToViewport(e->pos());
    QListViewItem *item = itemAt(vp);
    if (!item) {
        emit newEvent();
        return;
    }
    KListView::contentsMouseDoubleClickEvent(e);
 }
 void KOListViewListView::contentsMousePressEvent(QMouseEvent *e)
 {
    //qDebug("contentsMousePressEvent++++ ");
    if (! mMouseDown ) {
        mAllowPopupMenu = true;
        mYMousePos = mapToGlobal( (e->pos())).y();
    }
    if (  e->button() == RightButton &&  mMouseDown   )
        return;
    if (  e->button() == LeftButton )
        mMouseDown = true;
    KListView::contentsMousePressEvent( e );
 }
 void KOListViewListView::contentsMouseReleaseEvent(QMouseEvent *e)
 {
    //qDebug("contentsMouseReleaseEv---- ");
    if ( ! mMouseDown  ) {
        if (  e->button() == RightButton && ! mAllowPopupMenu   )
            return;
        QListViewItem* ci = currentItem(); 
        if ( ci ) 
            ci->setSelected( true );
        KListView::contentsMouseReleaseEvent(e);
        return;
    }
    if (  e->button() == LeftButton )
        mMouseDown = false;   
    if (  e->button() == RightButton && ! mAllowPopupMenu   )
        return;
    if (  e->button() == RightButton ) {
        QListViewItem* ci = currentItem(); 
        if ( ci ) 
            ci->setSelected( true );
    }
    KListView::contentsMouseReleaseEvent(e);
 }
 void KOListViewListView::contentsMouseMoveEvent(QMouseEvent *e)
 {
    // qDebug("contentsMouseMoveEv....... ");
    //  qDebug("start: %d  current %d ",mYMousePos , mapToGlobal( (e->pos())).y()   );
    int diff = mYMousePos - mapToGlobal( (e->pos())).y();
    if ( diff < 0 ) diff = -diff;
    if ( diff > 20 )
        mAllowPopupMenu = false;
    KListView::contentsMouseMoveEvent(e);
 }
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index cef59a2..678e1bd 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -1,405 +1,412 @@
 /*
    This file is part of KOrganizer.
    Copyright (c) 1998 Preston Brown
    Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 #include <qlayout.h>
 #include <qcheckbox.h>
 #include <qgroupbox.h>
 #include <qlabel.h>
+#include <qlistview.h>
 #include <qwhatsthis.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <libkdepim/kdateedit.h>
 #include "koglobals.h"
 #include "koprefs.h"
+#include "klineedit.h"
 #include "calendarview.h"
 #include "koviewmanager.h"
 #include "searchdialog.h"
 SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
    : QVBox( 0  )
 {
    mCalendar = calendar;
    QFrame *topFrame = new QFrame( this ) ;//plainPage();
    QVBoxLayout *layout = new QVBoxLayout(topFrame,KDialog::marginHint(),KDialog::spacingHint());
    // Search expression
    QHBoxLayout *subLayout = new QHBoxLayout();
    layout->addLayout(subLayout);
    searchLabel = new QLabel(topFrame);
    searchLabel->setText(i18n("Search for:"));
    subLayout->addWidget(searchLabel);
-    searchEdit = new QLineEdit(topFrame);
+    searchEdit = new KLineEdit(topFrame);
    subLayout->addWidget(searchEdit);
    QPushButton *OkButton = new QPushButton(  i18n("&Find"), topFrame );
    //OkButton->setDefault( true );
    connect(OkButton,SIGNAL(clicked()),SLOT(doSearch()));
    subLayout->addWidget(OkButton);
    searchEdit->setText("*"); // Find all events by default
    searchEdit->setFocus();
    connect(searchEdit, SIGNAL(textChanged ( const QString & )),this,SLOT(searchTextChanged( const QString & )));
    connect(searchEdit, SIGNAL( returnPressed () ),this,SLOT(doSearch()));
    // Subjects to search
    // QGroupBox *subjectGroup = new QGroupBox(1,Vertical,i18n("Search In"),
    //                                        topFrame);
    QHBox *incidenceGroup = new QHBox( topFrame );
    layout->addWidget(incidenceGroup);
    mSearchEvent = new QCheckBox(i18n("Events"),incidenceGroup);
    mSearchEvent->setChecked(true);
    mSearchTodo = new QCheckBox(i18n("Todos"),incidenceGroup);
    mSearchJournal = new QCheckBox(i18n("Journals"),incidenceGroup);
    QHBox *subjectGroup = new QHBox( topFrame );
    layout->addWidget(subjectGroup);
    mSummaryCheck = new QCheckBox(i18n("Summary/Loc."),subjectGroup);
    mSummaryCheck->setChecked(true);
    mDescriptionCheck = new QCheckBox(i18n("Details"),subjectGroup);
    mCategoryCheck = new QCheckBox(i18n("Categories"),subjectGroup);
    QHBox *attendeeGroup = new QHBox( topFrame );
    layout->addWidget(attendeeGroup );
    new QLabel( i18n("Attendee:"),attendeeGroup );
    mSearchAName = new QCheckBox(i18n("Name"),attendeeGroup  );
    mSearchAEmail = new QCheckBox(i18n("Email"), attendeeGroup );
    // Date range
    // QGroupBox *rangeGroup = new QGroupBox(1,Horizontal,i18n("Date Range"),
    //                                    topFrame);
    // layout->addWidget(rangeGroup);
    QWidget *rangeWidget = new QWidget(topFrame);
    QHBoxLayout *rangeLayout = new QHBoxLayout(rangeWidget,0,KDialog::spacingHint());
    rangeLayout->addWidget(new QLabel(i18n("From:"),rangeWidget));
    mStartDate = new KDateEdit(rangeWidget);
    rangeLayout->addWidget(mStartDate);
    rangeLayout->addWidget(new QLabel(i18n("To:"),rangeWidget));
    mEndDate = new KDateEdit(rangeWidget);
    mEndDate->setDate(QDate::currentDate().addDays(365));
    rangeLayout->addWidget(mEndDate);
    QToolButton *wt = QWhatsThis::whatsThisButton (  rangeWidget );
    rangeLayout->addWidget( (QWidget*)wt );
    layout->addWidget(rangeWidget);
    // Results list view
    listView = new KOListView(mCalendar,topFrame);
    layout->addWidget(listView);
    listView->readSettings(KOGlobals::config(),"SearchListView Layout");
+    connect(searchEdit,SIGNAL(scrollDOWN()),SLOT(setFocusToList()));
    setCaption( i18n("KO/Pi Find: "));
 #ifdef DESKTOP_VERSION
    OkButton = new QPushButton(  i18n("Close"), this  );
    connect(OkButton,SIGNAL(clicked()),SLOT(hide()));
 #endif
 }
 SearchDialog::~SearchDialog()
 {
  
 }
+void SearchDialog::setFocusToList()
+{
+    listView->resetFocus();
+}
 void SearchDialog::accept()
 {
    doSearch();
 }
 void SearchDialog::updateList()
 {
    //listView->updateList();
    if ( isVisible() ) {
        updateView();
        //qDebug("SearchDialog::updated ");
    }
    else {
        listView->clear();
        //qDebug("SearchDialog::cleared ");
    }
 }
 void SearchDialog::searchTextChanged( const QString &_text )
 {
 #if 0
    enableButton( KDialogBase::User1, !_text.isEmpty() );
 #endif
 }
 void SearchDialog::doSearch()
 {
    QRegExp re;
    re.setWildcard(true); // most people understand these better.
    re.setCaseSensitive(false);
    re.setPattern(searchEdit->text());
    if (!re.isValid() ) {
        KMessageBox::sorry(this,
                           i18n("Invalid search expression,\ncannot perform "
                                "the search.\nPlease enter a search expression\n"
                                "using the wildcard characters\n '*' and '?'"
                                "where needed."));
        return;
    }
    search(re);
    listView->setStartDate( mStartDate->date() );
    listView->showEvents(mMatchedEvents);
    listView->addTodos(mMatchedTodos);
    listView->addJournals(mMatchedJournals);
    if (mMatchedEvents.count() + mMatchedJournals.count() + mMatchedTodos.count() == 0) {
        setCaption(i18n("No items found. Use '*' and '?' where needed."));
    } else {
        QString mess; 
        mess = mess.sprintf( i18n("%d item(s) found."), mMatchedEvents.count()+ mMatchedJournals.count() + mMatchedTodos.count() );
        setCaption( i18n("KO/Pi Find: ") + mess);
    }
    searchEdit->setFocus();
 }
 void SearchDialog::updateConfig()
 {
    listView->updateConfig();
 }
 void SearchDialog::updateView()
 {
 
    QRegExp re;
    re.setWildcard(true); // most people understand these better.
    re.setCaseSensitive(false);
    re.setPattern(searchEdit->text());
    if (re.isValid()) {
        search(re);
    } else {
        mMatchedEvents.clear();
        mMatchedTodos.clear();
        mMatchedJournals.clear();
    }
    listView->setStartDate( mStartDate->date() );
    listView->showEvents(mMatchedEvents);
    listView->addTodos(mMatchedTodos);
    listView->addJournals(mMatchedJournals);
 }
 void SearchDialog::search(const QRegExp &re)
 {
    QPtrList<Event> events = mCalendar->events( mStartDate->date(),
                                                mEndDate->date(),
                                                false /*mInclusiveCheck->isChecked()*/ );
    mMatchedEvents.clear();
    if ( mSearchEvent->isChecked() ) {
        Event *ev;
        for(ev=events.first();ev;ev=events.next()) {
            if (mSummaryCheck->isChecked()) {
 #if QT_VERSION >= 0x030000
                if (re.search(ev->summary()) != -1) 
 #else
                    if (re.match(ev->summary()) != -1) 
 #endif
                        {
                            mMatchedEvents.append(ev);
                            continue;
                        }
 #if QT_VERSION >= 0x030000
                if (re.search(ev->location()) != -1) 
 #else
                    if (re.match(ev->location()) != -1) 
 #endif
                        {
                            mMatchedEvents.append(ev);
                            continue;
                        }
            }
            if (mDescriptionCheck->isChecked()) {
 #if QT_VERSION >= 0x030000
                if (re.search(ev->description()) != -1) 
 #else
                    if (re.match(ev->description()) != -1) 
 #endif
                        {    
                            mMatchedEvents.append(ev);
                            continue;
                        }
            }
            if (mCategoryCheck->isChecked()) {
 #if QT_VERSION >= 0x030000
                if (re.search(ev->categoriesStr()) != -1) 
 #else
                    if (re.match(ev->categoriesStr()) != -1) 
 #endif
                        {
                            mMatchedEvents.append(ev);
                            continue;
                        }
            }
            if ( mSearchAName->isChecked() || mSearchAEmail->isChecked() ) {
                QPtrList<Attendee> tmpAList = ev->attendees();
                Attendee *a;
                for (a = tmpAList.first(); a; a = tmpAList.next()) {
                    if (mSearchAName->isChecked()) {
 #if QT_VERSION >= 0x030000
                        if (re.search(a->name()) != -1) 
 #else
                            if (re.match(a->name()) != -1) 
 #endif
                                {    
                                    mMatchedEvents.append(ev);
                                    break;
                                }
                    }
                    if (mSearchAEmail->isChecked()) {
 #if QT_VERSION >= 0x030000
                        if (re.search(a->email()) != -1) 
 #else
                            if (re.match(a->email()) != -1) 
 #endif
                                {    
                                    mMatchedEvents.append(ev);
                                    break;
                                }
                    }
                }
            }
        }
    }
    QPtrList<Todo> todos = mCalendar->todos( );
    mMatchedTodos.clear();
    if ( mSearchTodo->isChecked() ) {
        Todo *tod;
        for(tod=todos.first();tod;tod=todos.next()) {
            if (mSummaryCheck->isChecked()) {
 #if QT_VERSION >= 0x030000
                if (re.search(tod->summary()) != -1) 
 #else
                    if (re.match(tod->summary()) != -1) 
 #endif
                        {
                            mMatchedTodos.append(tod);
                            continue;
                        }
            }
            if (mDescriptionCheck->isChecked()) {
 #if QT_VERSION >= 0x030000
                if (re.search(tod->description()) != -1) 
 #else
                    if (re.match(tod->description()) != -1) 
 #endif
                        {
                            mMatchedTodos.append(tod);
                            continue;
                        }
            }
            if (mCategoryCheck->isChecked()) {
 #if QT_VERSION >= 0x030000
                if (re.search(tod->categoriesStr()) != -1) 
 #else
                    if (re.match(tod->categoriesStr()) != -1) 
 #endif
                        {                                 
                            mMatchedTodos.append(tod);
                            continue;
                        }
            }
            if ( mSearchAName->isChecked() || mSearchAEmail->isChecked() ) {
                QPtrList<Attendee> tmpAList = tod->attendees();
                Attendee *a;
                for (a = tmpAList.first(); a; a = tmpAList.next()) {
                    if (mSearchAName->isChecked()) {
 #if QT_VERSION >= 0x030000
                        if (re.search(a->name()) != -1) 
 #else
                            if (re.match(a->name()) != -1) 
 #endif
                                {    
                                    mMatchedTodos.append(tod);
                                    break;
                                }
                    }
                    if (mSearchAEmail->isChecked()) {
 #if QT_VERSION >= 0x030000
                        if (re.search(a->email()) != -1) 
 #else
                            if (re.match(a->email()) != -1) 
 #endif
                                {    
                                    mMatchedTodos.append(tod);
                                    break;
                                }
                    }
                }
            }
        }
    }
    mMatchedJournals.clear();
    if (mSearchJournal->isChecked() ) {
        QPtrList<Journal> journals = mCalendar->journals( );
        Journal* journ;
        
        for(journ=journals.first();journ;journ=journals.next()) {
            if ( journ->dtStart().date() <= mEndDate->date() 
                 &&journ->dtStart().date() >= mStartDate->date()) {
 #if QT_VERSION >= 0x030000
                if (re.search(journ->description()) != -1) 
 #else
                    if (re.match(journ->description()) != -1) 
 #endif
                        {
                            mMatchedJournals.append(journ);
                            continue;
                        }
            }
        }
    }
 }
 void SearchDialog::keyPressEvent ( QKeyEvent *e) 
 {
    switch ( e->key() ) {
    case Qt::Key_Escape:
        hide();
        break;
    case Qt::Key_F:
        if ( e->state() == Qt::ControlButton ) {
            qDebug("full ");
        }
        break;
    case Qt::Key_Return:
    case Qt::Key_Enter:
        doSearch();
        break;
   
    default:
        e->ignore();
    }
 }
 //mMatchedJournals;
diff --git a/korganizer/searchdialog.h b/korganizer/searchdialog.h
index f4aad9e..b730ed5 100644
--- a/korganizer/searchdialog.h
+++ b/korganizer/searchdialog.h
@@ -1,92 +1,94 @@
 /*
    This file is part of KOrganizer.
    Copyright (c) 1998 Preston Brown
    Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 #ifndef SEARCHDIALOG_H
 #define SEARCHDIALOG_H
 #include <qregexp.h>
 #include <kdialogbase.h>
 #include <qvbox.h>
 #include <libkcal/calendar.h>
 #include "kolistview.h"
 class KDateEdit;
 class QCheckBox;
 class QLineEdit;
+class KLineEdit;
 class QLabel;
 class CalendarView;
 using namespace KCal;
 class SearchDialog : public  QVBox 
 {
    Q_OBJECT
  public:
    SearchDialog(Calendar *calendar,CalendarView *parent=0);
    virtual ~SearchDialog();
    KOListView *listview(){ return listView;}
    void updateView();
  public slots:
    void changeEventDisplay(Event *, int) { updateView(); } 
  void updateConfig();
  void updateList();
  protected slots:
+  void setFocusToList();
    void  accept();
    void doSearch();
            void searchTextChanged( const QString &_text );
  signals:
    void showEventSignal(Event *);
    void editEventSignal(Event *);
    void deleteEventSignal(Event *);
  private:
    void search(const QRegExp &);
    Calendar *mCalendar;
    
    QPtrList<Event> mMatchedEvents;
    QPtrList<Todo> mMatchedTodos;
    QPtrList<Journal> mMatchedJournals;
    
    QLabel *searchLabel;
-    QLineEdit *searchEdit;
+    KLineEdit *searchEdit;
    KOListView *listView;
    
    KDateEdit *mStartDate;
    KDateEdit *mEndDate;
    QCheckBox *mSummaryCheck;
    QCheckBox *mDescriptionCheck;
    QCheckBox *mCategoryCheck;
    QCheckBox *mSearchEvent;
    QCheckBox *mSearchTodo;
    QCheckBox *mSearchJournal;
    QCheckBox *mSearchAName;
    QCheckBox *mSearchAEmail;
    void keyPressEvent ( QKeyEvent *e) ;
 };
 #endif
diff --git a/microkde/kdialogbase.cpp b/microkde/kdialogbase.cpp
index 801094a..f453331 100644
--- a/microkde/kdialogbase.cpp
+++ b/microkde/kdialogbase.cpp
@@ -1,292 +1,294 @@
 #include <qtabwidget.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qframe.h>
 #include "klocale.h"
 #include "kdebug.h"
 #include "kdialogbase.h"
 KDialogBase::KDialogBase()
 {
 }
 KDialogBase::KDialogBase( QWidget *parent, const char *name, bool modal,
             const QString &caption,
             int buttonMask, ButtonCode defaultButton,
             bool separator,
             const QString &user1,
             const QString &user2,
             const QString &user3) :
    KDialog( parent, name, modal )
 {
  init( caption, buttonMask, user1, user2 );
  if (findButton( defaultButton ) ) {
      (findButton( defaultButton ) )->setFocus();
      (findButton( defaultButton ) )->setDefault( true );
  }
 }
 KDialogBase::KDialogBase( int dialogFace, const QString &caption,
             int buttonMask, ButtonCode defaultButton,
             QWidget *parent, const char *name, bool modal,
             bool separator,
             const QString &user1,
             const QString &user2,
             const QString &user3) :
    KDialog( parent, name, modal )
 {
    init( caption, buttonMask, user1, user2 );
-  if (findButton( defaultButton ) )
+    if (findButton( defaultButton ) ) {
-  (findButton( defaultButton ) )->setFocus();
+        (findButton( defaultButton ) )->setFocus();
+        (findButton( defaultButton ) )->setDefault( true );
+    }
 }
 KDialogBase::~KDialogBase()
 {
 }
 void KDialogBase::init( const QString &caption, int buttonMask,
                        const QString &user1 ,const QString &user2 )
 {
  mMainWidget = 0;
  mTabWidget = 0;
  mPlainPage = 0;
  mTopLayout = 0;
  if ( !caption.isEmpty() ) {
    setCaption( caption );
  }
  if ( buttonMask & User1 ) {
    mUser1Button = new QPushButton( user1, this );
    connect( mUser1Button, SIGNAL( clicked() ), SLOT( slotUser1() ) );
  } else {
    mUser1Button = 0;
  }
  if ( buttonMask & User2 ) {
    mUser2Button = new QPushButton( user2, this );
    connect( mUser2Button, SIGNAL( clicked() ), SLOT( slotUser2() ) );
  } else {
    mUser2Button = 0;
  }
  if ( buttonMask & Ok ) {
    mOkButton = new QPushButton( i18n("Ok"), this );
    connect( mOkButton, SIGNAL( clicked() ), SLOT( slotOk() ) );
-    mOkButton->setDefault( true );
+    //mOkButton->setDefault( true );
  } else {
    mOkButton = 0;
  }
  if ( buttonMask & Default ) {
    mDefaultButton = new QPushButton( i18n("Default"), this );
    connect( mDefaultButton, SIGNAL( clicked() ), SIGNAL( defaultClicked() ) );
  } else {
    mDefaultButton = 0;
  }
  if ( buttonMask & Apply ) {
    mApplyButton = new QPushButton( i18n("Apply"), this );
    connect( mApplyButton, SIGNAL( clicked() ), SLOT( slotApply() ) );
  } else {
    mApplyButton = 0;
  }
  if ( buttonMask & Cancel ) {
    mCancelButton = new QPushButton( i18n("Cancel"), this );
    connect( mCancelButton, SIGNAL( clicked() ), SLOT( slotCancel() ) );
  } else {
    mCancelButton = 0;
  }
  if ( buttonMask & Close ) {
    mCloseButton = new QPushButton( i18n("Close"), this );
    connect( mCloseButton, SIGNAL( clicked() ), SLOT( slotClose() ) );
  } else {
    mCloseButton = 0;
  }
 }
 QTabWidget *KDialogBase::tabWidget()
 {
  if ( !mTabWidget ) {
    mTabWidget = new QTabWidget( this );
    setMainWidget( mTabWidget );
  }
  return mTabWidget;
 }
 void KDialogBase::hideButtons()
 {
    if ( mUser1Button ) mUser1Button->hide() ;
    if ( mUser2Button ) mUser2Button->hide() ;
    if ( mOkButton ) mOkButton->hide()  ;
    if ( mApplyButton )  mApplyButton->hide()  ;
    if ( mDefaultButton ) mDefaultButton->hide();
    if ( mCancelButton ) mCancelButton->hide()  ;
    if ( mCloseButton ) mCloseButton->hide()  ;
 }
 void KDialogBase::initLayout()
 {
  delete mTopLayout;
  mTopLayout = new QVBoxLayout( this );
  mTopLayout->setMargin( marginHint() );
  mTopLayout->setSpacing( spacingHint() );
  mTopLayout->addWidget( mMainWidget );
  QBoxLayout *buttonLayout = new QHBoxLayout;
  mTopLayout->addLayout( buttonLayout );
  if ( mUser1Button ) buttonLayout->addWidget( mUser1Button );
  if ( mUser2Button ) buttonLayout->addWidget( mUser2Button );
  if ( mOkButton ) buttonLayout->addWidget( mOkButton );
  if ( mApplyButton ) buttonLayout->addWidget( mApplyButton );
  if ( mDefaultButton ) buttonLayout->addWidget( mDefaultButton );
  if ( mCancelButton ) buttonLayout->addWidget( mCancelButton );
  if ( mCloseButton ) buttonLayout->addWidget( mCloseButton );
 }
 QFrame *KDialogBase::addPage( const QString &name )
 {
 //  kdDebug() << "KDialogBase::addPage(): " << name << endl;
  QFrame *frame = new QFrame( tabWidget() );
  tabWidget()->addTab( frame, name );
  return frame;
 }
 QFrame *KDialogBase::addPage( const QString &name, int, const QPixmap & )
 {
  return addPage( name );
 }
 void KDialogBase::setMainWidget( QWidget *widget )
 {
  kdDebug() << "KDialogBase::setMainWidget()" << endl;
  mMainWidget = widget;
  initLayout();
 }
 void KDialogBase::setButtonText( ButtonCode id, const QString &text )
 {
  QPushButton *button = findButton( id );
  if ( button ) {
    button->setText( text );
  }
 }
 void KDialogBase::enableButton( ButtonCode id, bool state )
 {
  QPushButton *button = findButton( id );
  if ( button ) {
    button->setEnabled( state );
  }
 }
 QPushButton *KDialogBase::findButton( ButtonCode id )
 {
  QPushButton *button = 0;
  switch ( id ) {
    case Ok:
      button = mOkButton;
      break;
    case Apply:
      button = mApplyButton;
      break;
    case User1:
      button = mUser1Button;
      break;
    case User2:
      button = mUser2Button;
      break;
    case Cancel:
      button = mCancelButton;
      break;
    case Default:
      button = mDefaultButton;
      break;
    case Close:
      button = mCloseButton;
      break;
    default:
      break;
  }
  return button;
 }
 void KDialogBase::enableButtonOK( bool state )
 {
  enableButton( Ok, state );
 }
 void KDialogBase::enableButtonApply( bool state )
 {
  enableButton( Apply, state );
 }
 void KDialogBase::showButton( ButtonCode id, bool show )
 {
  QPushButton *button = findButton( id );
  if ( button ) {
    if ( show ) button->show();
    else button->hide();
  }
 }
 int KDialogBase::pageIndex( QWidget *widget ) const
 {
  return 0;
 }
 bool KDialogBase::showPage( int index )
 {
    tabWidget()->setCurrentPage( index );return false;
 }
 QFrame *KDialogBase::plainPage()
 {
  if ( !mPlainPage ) {
    mPlainPage = new QFrame( this );
    setMainWidget( mPlainPage );
  }
  return mPlainPage;
 }
 void KDialogBase::slotOk()
 {
  emit okClicked();
  accept();
 }
 void KDialogBase::slotApply()
 {
  emit applyClicked();
 }
 void KDialogBase::slotCancel()
 {
  emit cancelClicked();
  reject();
 }
 void KDialogBase::slotClose()
 {
  emit closeClicked();
  reject();
 }
 void KDialogBase::slotUser1()
 {
  emit user1Clicked();
 }
 void KDialogBase::slotUser2()
 {
  emit user2Clicked();
 }
diff --git a/version b/version
index e90e80d..0ec83d8 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-version = "2.0.12";
+version = "2.0.13";