5 files changed, 40 insertions, 7 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index d8f8323..e53127c 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,742 +1,745 @@
 Info about the changes in new versions of KDE-Pim/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.
 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.
 
 ********** 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/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp
index ae67968..9ea9d04 100644
--- a/kabc/addresseedialog.cpp
+++ b/kabc/addresseedialog.cpp
@@ -1,293 +1,293 @@
 /*
    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 <klocale.h>
 #include <kdebug.h>
 #include <kglobalsettings.h>
 #include "stdaddressbook.h"
 #include "addresseedialog.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.realName();
+        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 )
 {
  QWidget *topWidget = plainPage();
  QBoxLayout *topLayout = new QHBoxLayout( topWidget );
  QBoxLayout *listLayout = new QVBoxLayout;
  topLayout->addLayout( listLayout );
  mAddresseeList = new KListView( topWidget );
  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 );
  connect( mAddresseeEdit, SIGNAL( returnPressed() ),
           SLOT( loadAddressBook() ) );
  mAddresseeEdit->setFocus();
 
  listLayout->addWidget( mAddresseeEdit );
  if ( mMultiple ) {
    QBoxLayout *selectedLayout = new QVBoxLayout;
    topLayout->addLayout( selectedLayout );
    topLayout->setSpacing( spacingHint() );
    QGroupBox *selectedGroup = new QGroupBox( 1, Horizontal, i18n("Selected"),
                                              topWidget );
    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();
 }
 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 >= 300
      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/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp
index c6993e9..bd32859 100644
--- a/kaddressbook/addresseeeditorwidget.cpp
+++ b/kaddressbook/addresseeeditorwidget.cpp
@@ -1,1348 +1,1358 @@
 /*                                                                      
    This file is part of KAddressBook.                                  
    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>                   
                                                                        
    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 <qcheckbox.h>
 #include <qhbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlistbox.h>
 #include <qpushbutton.h>
 #include <qtabwidget.h>
 #include <qapplication.h>
 #ifndef KAB_EMBEDDED    
 #include <qtextedit.h>
 #include <kaccelmanager.h>
 #include "keywidget.h"
 #include "soundwidget.h"
 #else //KAB_EMBEDDED    
 #include <qmultilineedit.h>
 #endif //KAB_EMBEDDED    
 #include "keywidget.h"
 #include "geowidget.h"
 #include "imagewidget.h"
 #include "nameeditdialog.h"
 #include "phoneeditwidget.h"
 #include "secrecywidget.h"
 #include <qtoolbutton.h>
 #include <qtooltip.h>
 #include <kapplication.h>
 #include <kconfig.h>
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kseparator.h>
 #include <ksqueezedtextlabel.h>
 #include <libkdepim/categoryeditdialog.h>
 #include <libkdepim/categoryselectdialog.h>
 #include <libkdepim/kdateedit.h>
 #include "addresseditwidget.h"
 #include "emaileditwidget.h"
 #include "kabcore.h"
 #include "kabprefs.h"
 #include "addresseeeditorwidget.h"
 AddresseeEditorWidget::AddresseeEditorWidget( KABCore *core, bool isExtension,
                                              QWidget *parent, const char *name )
  : ExtensionWidget( core, parent, name ), mIsExtension( isExtension ),
    mBlockSignals( false )
 { 
    mAConfig = AddresseeConfig::instance();
    
  mFormattedNameType = NameEditDialog::CustomName;
  initGUI();
  mCategoryDialog = 0;
  mCategoryEditDialog = 0;
  // Load the empty addressee as defaults
  load();
 
  mDirty = false;
 }
 AddresseeEditorWidget::~AddresseeEditorWidget()
 {
  kdDebug(5720) << "~AddresseeEditorWidget()" << endl;
 }  
  
 void AddresseeEditorWidget::contactsSelectionChanged()
 {
  KABC::Addressee::List list = selectedContacts();
  mAddressee = list[ 0 ];
  load();
 }
 void AddresseeEditorWidget::setAddressee( const KABC::Addressee &addr )
 {
  mAddressee = addr;
  load();
 }
 const KABC::Addressee &AddresseeEditorWidget::addressee()
 {
  return mAddressee;
 }
 void AddresseeEditorWidget::textChanged( const QString& )
 {
  emitModified();
 }
  
 void AddresseeEditorWidget::initGUI()
 {
  QVBoxLayout *layout = new QVBoxLayout( this );
  mTabWidget = new QTabWidget( this );
  layout->addWidget( mTabWidget );
  setupTab1();
  setupTab1_1();
  setupTab2();
  setupTab2_1();
  setupTab3();
  setupTab3_1();
  mNameEdit->setFocus();
  
  connect( mTabWidget, SIGNAL( currentChanged(QWidget*) ),
           SLOT( pageChanged(QWidget*) ) );
 }
 void AddresseeEditorWidget::setupTab1()
 {
  // This is the General tab
  QWidget *tab1 = new QWidget( mTabWidget );
 //US  QGridLayout *layout = new QGridLayout( tab1, 11, 7 );
  QGridLayout *layout = new QGridLayout( tab1, 7, 1 );
  layout->setMargin( KDialogBase::marginHintSmall() );
  layout->setSpacing( KDialogBase::spacingHintSmall() );
  
  QLabel *label;
  KSeparator* bar;
  QPushButton *button;
  
  //////////////////////////////////
  // Upper left group (person info)
  
  // Person icon
  /* LR
  label = new QLabel( tab1 );
 //US ambiguous call. Add one more parameter
 //US  label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop ) );
  label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop, 0 ) );
  layout->addMultiCellWidget( label, 0, 1, 0, 0 );
  */
  // First name
  button = new QPushButton( i18n( "Name..." ), tab1 );
 //US  QToolTip::add( button, i18n( "Edit the contact's name" ) );
  mNameEdit = new KLineEdit( tab1, "mNameEdit" );
  connect( mNameEdit, SIGNAL( textChanged( const QString& ) ), 
           SLOT( nameTextChanged( const QString& ) ) );
  connect( button, SIGNAL( clicked() ), SLOT( nameButtonClicked() ) );
  
  mNameLabel = new KSqueezedTextLabel( tab1 );
  mNameLabel->hide();
  
  layout->addWidget( button, 0, 0 );
  layout->addWidget( mNameEdit, 0, 1 );
  layout->addWidget( mNameLabel, 0, 1 );
  
  label = new QLabel( i18n( "Role:" ), tab1 );
  mRoleEdit = new KLineEdit( tab1 );
  connect( mRoleEdit, SIGNAL( textChanged( const QString& ) ),
           SLOT( textChanged( const QString& ) ) );
  label->setBuddy( mRoleEdit );
  layout->addWidget( label, 1, 0 );
  layout->addWidget( mRoleEdit, 1, 1 );
  
  // Organization
  label = new QLabel( i18n( "Organization:" ), tab1 );
  mOrgEdit = new KLineEdit( tab1 );
  label->setBuddy( mOrgEdit );
  connect( mOrgEdit, SIGNAL( textChanged( const QString& ) ), 
           SLOT( textChanged( const QString& ) ) );
  layout->addWidget( label, 2, 0 );
  layout->addWidget( mOrgEdit, 2, 1 );
  
  // File as (formatted name)
  label = new QLabel( i18n( "Formatted name:" ), tab1 );
  mFormattedNameLabel = new KSqueezedTextLabel( tab1 );
  layout->addWidget( label, 3, 0 );
  layout->addWidget( mFormattedNameLabel, 3, 1 );
  /* LR
  // Left hand separator. This separator doesn't go all the way
  // across so the dialog still flows from top to bottom
  bar = new KSeparator( KSeparator::HLine, tab1 );
  layout->addMultiCellWidget( bar, 4, 4, 0, 2 );
  */
  //////////////////////////////////////
  /* LR
  // Phone numbers (upper right)
  label = new QLabel( tab1 );
 //US loadIcon call is ambiguous. Add one more parameter
 //US  label->setPixmap( KGlobal::iconLoader()->loadIcon( "kaddressbook", KIcon::Desktop ) );
  label->setPixmap( KGlobal::iconLoader()->loadIcon( "kaddressbook", KIcon::Desktop, 0 ) );
 //US  layout->addMultiCellWidget( label, 0, 1, 3, 3 );
  layout->addMultiCellWidget( label, 5, 6, 0, 0 );
  */
  mPhoneEditWidget = new PhoneEditWidget( tab1 );
  connect( mPhoneEditWidget, SIGNAL( modified() ), SLOT( emitModified() ) );
 //US  layout->addMultiCellWidget( mPhoneEditWidget, 0, 3, 4, 6 ); 
  int iii;
 #ifndef DESKTOP_VERSION
  iii = 7;
 #else
  iii = 8;
 #endif
  layout->addMultiCellWidget( mPhoneEditWidget, 4, iii, 0, 1 ); 
  ++iii;
  /* LR
  bar = new KSeparator( KSeparator::HLine, tab1 );
 //US  layout->addMultiCellWidget( bar, 4, 4, 3, 6 );
  layout->addMultiCellWidget( bar, 9, 9, 0, 2 );
  */
 /*US  
  //////////////////////////////////////
  // Addresses (lower left)
  label = new QLabel( tab1 );
 //US loadIcon call is ambiguous. Add one more parameter
 //US  label->setPixmap( KGlobal::iconLoader()->loadIcon( "gohome", KIcon::Desktop ) );
  label->setPixmap( KGlobal::iconLoader()->loadIcon( "gohome", KIcon::Desktop, 0 ) );
  layout->addMultiCellWidget( label, 5, 6, 0, 0 );
  
  mAddressEditWidget = new AddressEditWidget( tab1 );
  connect( mAddressEditWidget, SIGNAL( modified() ), SLOT( emitModified() ) );
  layout->addMultiCellWidget( mAddressEditWidget, 5, 9, 1, 2 );
  //////////////////////////////////////
  // Email / Web (lower right)
  label = new QLabel( tab1 );
 //US loadIcon call is ambiguous. Add one more parameter
 //US  label->setPixmap( KGlobal::iconLoader()->loadIcon( "email", KIcon::Desktop) );
  label->setPixmap( KGlobal::iconLoader()->loadIcon( "email", KIcon::Desktop, 0) );
  layout->addMultiCellWidget( label, 5, 6, 3, 3 );
  mEmailWidget = new EmailEditWidget( tab1 );
  connect( mEmailWidget, SIGNAL( modified() ), SLOT( emitModified() ) );
  layout->addMultiCellWidget( mEmailWidget, 5, 6, 4, 6 );
  // add the separator
  bar = new KSeparator( KSeparator::HLine, tab1 );
  layout->addMultiCellWidget( bar, 7, 7, 3, 6 );
  label = new QLabel( tab1 );
 //US loadIcon call is ambiguous. Add one more parameter
 //US  label->setPixmap( KGlobal::iconLoader()->loadIcon( "homepage", KIcon::Desktop) );
  label->setPixmap( KGlobal::iconLoader()->loadIcon( "homepage", KIcon::Desktop, 0) );
  layout->addMultiCellWidget( label, 8, 9, 3, 3 );
  label = new QLabel( i18n( "URL:" ), tab1 );
  mURLEdit = new KLineEdit( tab1 );
  connect( mURLEdit, SIGNAL( textChanged( const QString& ) ), 
           SLOT( textChanged( const QString& ) ) );
  label->setBuddy( mURLEdit );
  layout->addWidget( label, 8, 4 );
  layout->addMultiCellWidget( mURLEdit, 8, 8, 5, 6 );
  label = new QLabel( i18n( "&IM address:" ), tab1 );
  mIMAddressEdit = new KLineEdit( tab1 );
  connect( mIMAddressEdit, SIGNAL( textChanged( const QString& ) ), 
           SLOT( textChanged( const QString& ) ) );
  label->setBuddy( mIMAddressEdit );
  layout->addWidget( label, 9, 4 );
  layout->addMultiCellWidget( mIMAddressEdit, 9, 9, 5, 6 );
  
  layout->addColSpacing( 6, 50 );
  
  bar = new KSeparator( KSeparator::HLine, tab1 );
  layout->addMultiCellWidget( bar, 10, 10, 0, 6 );
 */  
  ///////////////////////////////////////
      QHBox *categoryBox = new QHBox( tab1 ,"cato");
  categoryBox->setSpacing( KDialogBase::spacingHint() );
  categoryBox->setMargin( KDialogBase::marginHintSmall() );
  
  // Categories
  button = new QPushButton( i18n( "Categories" ), categoryBox );
  connect( button, SIGNAL( clicked() ), SLOT( categoryButtonClicked() ) );
  mCategoryEdit = new KLineEdit( categoryBox );
  mCategoryEdit->setReadOnly( true );
  connect( mCategoryEdit, SIGNAL( textChanged( const QString& ) ), 
           SLOT( textChanged( const QString& ) ) );
  mSecrecyWidget = new SecrecyWidget( categoryBox );
  connect( mSecrecyWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
 //US  layout->addMultiCellWidget( categoryBox, 11, 11, 0, 6 );
  layout->addMultiCellWidget( categoryBox, iii, iii, 0, 1 );
  
  // Build the layout and add to the tab widget
  layout->activate(); // required
  mTabWidget->addTab( tab1, i18n( "&General" ) );
 }
 void AddresseeEditorWidget::setupTab1_1()
 {
  // This is the Address tab
  QWidget *tab1_1 = new QWidget( mTabWidget );
 //US  QGridLayout *layout = new QGridLayout( tab1_1, 11, 7 );
  QGridLayout *layout = new QGridLayout( tab1_1, 7, 2 );
  layout->setMargin( KDialogBase::marginHintSmall() );
  layout->setSpacing( KDialogBase::spacingHintSmall() );
  
  QLabel *label;
  KSeparator* bar;
  QPushButton *button;
 /*US    
  //////////////////////////////////
  // Upper left group (person info)
  
  // Person icon
  label = new QLabel( tab1 );
 //US ambiguous call. Add one more parameter
 //US  label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop ) );
  label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop, 0 ) );
  layout->addMultiCellWidget( label, 0, 1, 0, 0 );
  
  // First name
  button = new QPushButton( i18n( "Name..." ), tab1 );
  QToolTip::add( button, i18n( "Edit the contact's name" ) );
  mNameEdit = new KLineEdit( tab1, "mNameEdit" );
  connect( mNameEdit, SIGNAL( textChanged( const QString& ) ), 
           SLOT( nameTextChanged( const QString& ) ) );
  connect( button, SIGNAL( clicked() ), SLOT( nameButtonClicked() ) );
  
 #ifndef KAB_EMBEDDED    
  mNameLabel = new KSqueezedTextLabel( tab1 );
  mNameLabel->hide();
 #else //KAB_EMBEDDED    
 qDebug("AddresseeEditorWidget::setupTab1 has to be changed");
 #endif //KAB_EMBEDDED    
  
  layout->addWidget( button, 0, 1 );
  layout->addWidget( mNameEdit, 0, 2 );
  
 #ifndef KAB_EMBEDDED    
  layout->addWidget( mNameLabel, 0, 2 );
 #else //KAB_EMBEDDED    
 qDebug("AddresseeEditorWidget::setupTab1 has to be changed");
 #endif //KAB_EMBEDDED    
  
  label = new QLabel( i18n( "Role:" ), tab1 );
  mRoleEdit = new KLineEdit( tab1 );
  connect( mRoleEdit, SIGNAL( textChanged( const QString& ) ),
           SLOT( textChanged( const QString& ) ) );
  label->setBuddy( mRoleEdit );
  layout->addWidget( label, 1, 1 );
  layout->addWidget( mRoleEdit, 1, 2 );
  
  // Organization
  label = new QLabel( i18n( "Organization:" ), tab1 );
  mOrgEdit = new KLineEdit( tab1 );
  label->setBuddy( mOrgEdit );
  connect( mOrgEdit, SIGNAL( textChanged( const QString& ) ), 
           SLOT( textChanged( const QString& ) ) );
  layout->addWidget( label, 2, 1 );
  layout->addWidget( mOrgEdit, 2, 2 );
  
  // File as (formatted name)
  label = new QLabel( i18n( "Formatted name:" ), tab1 );
 #ifndef KAB_EMBEDDED    
  mFormattedNameLabel = new KSqueezedTextLabel( tab1 );
 #else //KAB_EMBEDDED    
 qDebug("AddresseeEditorWidget::setupTab1 has to be changed");
 #endif //KAB_EMBEDDED    
  layout->addWidget( label, 3, 1 );
 #ifndef KAB_EMBEDDED    
  layout->addWidget( mFormattedNameLabel, 3, 2 );
 #else //KAB_EMBEDDED    
 qDebug("AddresseeEditorWidget::setupTab1 has to be changed");
 #endif //KAB_EMBEDDED    
  
  // Left hand separator. This separator doesn't go all the way
  // across so the dialog still flows from top to bottom
  bar = new KSeparator( KSeparator::HLine, tab1 );
  layout->addMultiCellWidget( bar, 4, 4, 0, 2 );
  
  //////////////////////////////////////
  // Phone numbers (upper right)
  label = new QLabel( tab1 );
 //US loadIcon call is ambiguous. Add one more parameter
 //US  label->setPixmap( KGlobal::iconLoader()->loadIcon( "kaddressbook", KIcon::Desktop ) );
  label->setPixmap( KGlobal::iconLoader()->loadIcon( "kaddressbook", KIcon::Desktop, 0 ) );
  layout->addMultiCellWidget( label, 0, 1, 3, 3 );
  
  mPhoneEditWidget = new PhoneEditWidget( tab1 );
  connect( mPhoneEditWidget, SIGNAL( modified() ), SLOT( emitModified() ) );
  layout->addMultiCellWidget( mPhoneEditWidget, 0, 3, 4, 6 ); 
  bar = new KSeparator( KSeparator::HLine, tab1 );
  layout->addMultiCellWidget( bar, 4, 4, 3, 6 );
 */  
  //////////////////////////////////////
  // Addresses (lower left)
  /* LR 
  label = new QLabel( tab1_1 );
 //US loadIcon call is ambiguous. Add one more parameter
 //US  label->setPixmap( KGlobal::iconLoader()->loadIcon( "gohome", KIcon::Desktop ) );
  label->setPixmap( KGlobal::iconLoader()->loadIcon( "gohome", KIcon::Desktop, 0 ) );
 //US  layout->addMultiCellWidget( label, 5, 6, 0, 0 );
  layout->addMultiCellWidget( label, 0, 1, 0, 0 );
  */
  
  mAddressEditWidget = new AddressEditWidget( tab1_1 );
  connect( mAddressEditWidget, SIGNAL( modified() ), SLOT( emitModified() ) );
 //US  layout->addMultiCellWidget( mAddressEditWidget, 5, 9, 1, 2 );
  layout->addMultiCellWidget( mAddressEditWidget, 0, 4, 0, 1 );
 //US  
 /* LR
  bar = new KSeparator( KSeparator::HLine, tab1_1 );
  layout->addMultiCellWidget( bar, 5, 5, 0, 3 );
 */
  
  //////////////////////////////////////
  // Email / Web (lower right)
  /* LR
  label = new QLabel( tab1_1 );
 //US loadIcon call is ambiguous. Add one more parameter
 //US  label->setPixmap( KGlobal::iconLoader()->loadIcon( "email", KIcon::Desktop) );
  label->setPixmap( KGlobal::iconLoader()->loadIcon( "email", KIcon::Desktop, 0) );
 //US  layout->addMultiCellWidget( label, 5, 6, 3, 3 );
  layout->addMultiCellWidget( label, 6, 7, 0, 0 );
  */
  mEmailWidget = new EmailEditWidget( tab1_1 );
  connect( mEmailWidget, SIGNAL( modified() ), SLOT( emitModified() ) );
 //US  layout->addMultiCellWidget( mEmailWidget, 5, 6, 4, 6 );
  layout->addMultiCellWidget( mEmailWidget, 5, 6, 0, 1 );
  /* LR
  // add the separator
  bar = new KSeparator( KSeparator::HLine, tab1_1 );
 //US  layout->addMultiCellWidget( bar, 7, 7, 3, 6 );
  layout->addMultiCellWidget( bar, 8, 8, 0, 3 );
  
  label = new QLabel( tab1_1 );
 //US loadIcon call is ambiguous. Add one more parameter
 //US  label->setPixmap( KGlobal::iconLoader()->loadIcon( "homepage", KIcon::Desktop) );
  label->setPixmap( KGlobal::iconLoader()->loadIcon( "homepage", KIcon::Desktop, 0) );
 //US  layout->addMultiCellWidget( label, 8, 9, 3, 3 );
  layout->addMultiCellWidget( label, 9, 10, 0, 0 );
  */
  label = new QLabel( i18n( "URL:" ), tab1_1 );
  mURLEdit = new KLineEdit( tab1_1 );
  connect( mURLEdit, SIGNAL( textChanged( const QString& ) ), 
           SLOT( textChanged( const QString& ) ) );
  label->setBuddy( mURLEdit );
 //US  layout->addWidget( label, 8, 4 );
  layout->addWidget( label, 7,0 );
 //US  layout->addMultiCellWidget( mURLEdit, 8, 8, 5, 6 );
  layout->addWidget( mURLEdit, 7, 1);
  label = new QLabel( i18n( "&IM address:" ), tab1_1 );
  mIMAddressEdit = new KLineEdit( tab1_1 );
  connect( mIMAddressEdit, SIGNAL( textChanged( const QString& ) ), 
           SLOT( textChanged( const QString& ) ) );
  label->setBuddy( mIMAddressEdit );
 //US  layout->addWidget( label, 9, 4 );
  layout->addWidget( label, 8, 0 );
 //US  layout->addMultiCellWidget( mIMAddressEdit, 9, 9, 5, 6 );
  layout->addWidget( mIMAddressEdit, 8,1 );
  
 //US  layout->addColSpacing( 6, 50 );
  
 //US  bar = new KSeparator( KSeparator::HLine, tab1_1 );
 //US  layout->addMultiCellWidget( bar, 10, 10, 0, 6 );
 /*US  
  ///////////////////////////////////////
  QHBox *categoryBox = new QHBox( tab1 );
  categoryBox->setSpacing( KDialogBase::spacingHintSmall() );
  
  // Categories
  button = new QPushButton( i18n( "Categories" ), categoryBox );
  connect( button, SIGNAL( clicked() ), SLOT( categoryButtonClicked() ) );
  mCategoryEdit = new KLineEdit( categoryBox );
  mCategoryEdit->setReadOnly( true );
  connect( mCategoryEdit, SIGNAL( textChanged( const QString& ) ), 
           SLOT( textChanged( const QString& ) ) );
  mSecrecyWidget = new SecrecyWidget( categoryBox );
  connect( mSecrecyWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
  layout->addMultiCellWidget( categoryBox, 11, 11, 0, 6 );
 */  
  // Build the layout and add to the tab widget
  layout->activate(); // required
  mTabWidget->addTab( tab1_1, i18n( "&Address" ) );
 }
 void AddresseeEditorWidget::setupTab2()
 {
  // This is the Details tab
  QWidget *tab2 = new QWidget( mTabWidget );
  QGridLayout *layout = new QGridLayout( tab2, 8, 3 );
  layout->setMargin( KDialogBase::marginHintSmall() );
  layout->setSpacing( KDialogBase::spacingHintSmall() );
  
  QLabel *label;
  KSeparator* bar;
  
  ///////////////////////
  // Office info
  
  // Department
  label = new QLabel( tab2 );
 //US loadIcon call is ambiguous. Add one more parameter
 //US  label->setPixmap( KGlobal::iconLoader()->loadIcon( "folder", KIcon::Desktop ) );
  label->setPixmap( KGlobal::iconLoader()->loadIcon( "folder", KIcon::Desktop, 0 ) );
  layout->addMultiCellWidget( label, 0, 1, 0, 0 );
  
  label = new QLabel( i18n( "Department:" ), tab2 );
  layout->addWidget( label, 0, 1 );
  mDepartmentEdit = new KLineEdit( tab2 );
  connect( mDepartmentEdit, SIGNAL( textChanged( const QString& ) ),
           SLOT( textChanged( const QString& ) ) );
  label->setBuddy( mDepartmentEdit );
  layout->addWidget( mDepartmentEdit, 0, 2 );
  
  label = new QLabel( i18n( "Office:" ), tab2 );
  layout->addWidget( label, 1, 1 );
  mOfficeEdit = new KLineEdit( tab2 );
  connect( mOfficeEdit, SIGNAL( textChanged( const QString& ) ),
           SLOT( textChanged( const QString& ) ) );
  label->setBuddy( mOfficeEdit );
  layout->addWidget( mOfficeEdit, 1, 2 );
  
  label = new QLabel( i18n( "Profession:" ), tab2 );
  layout->addWidget( label, 2, 1 );
  mProfessionEdit = new KLineEdit( tab2 );
  connect( mProfessionEdit, SIGNAL( textChanged( const QString& ) ),
           SLOT( textChanged( const QString& ) ) );
  label->setBuddy( mProfessionEdit );
  layout->addWidget( mProfessionEdit, 2, 2 );
  
  label = new QLabel( i18n( "Manager\'s name:" ), tab2 );
 //US  layout->addWidget( label, 0, 3 );
  layout->addWidget( label, 3, 1 );
  mManagerEdit = new KLineEdit( tab2 );
  connect( mManagerEdit, SIGNAL( textChanged( const QString& ) ),
           SLOT( textChanged( const QString& ) ) );
  label->setBuddy( mManagerEdit );
 //US  layout->addMultiCellWidget( mManagerEdit, 0, 0, 4, 5 );
  layout->addWidget( mManagerEdit, 3, 2 );
  
  label = new QLabel( i18n( "Assistant's name:" ), tab2 );
 //US  layout->addWidget( label, 1, 3 );
  layout->addWidget( label, 4, 1 );
  mAssistantEdit = new KLineEdit( tab2 );
  connect( mAssistantEdit, SIGNAL( textChanged( const QString& ) ),
           SLOT( textChanged( const QString& ) ) );
  label->setBuddy( mAssistantEdit );
 //US  layout->addMultiCellWidget( mAssistantEdit, 1, 1, 4, 5 );
  layout->addWidget( mAssistantEdit, 4, 2 );
  
  bar = new KSeparator( KSeparator::HLine, tab2 );
 //US  layout->addMultiCellWidget( bar, 3, 3, 0, 5 );
  layout->addMultiCellWidget( bar, 5, 5, 0, 2 );
  
  /////////////////////////////////////////////////
  // Personal info
  
  //label = new QLabel( tab2 );
 //US loadIcon call is ambiguous. Add one more parameter
 //US  label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop ) );
      //label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop, 0 ) );
 //US  layout->addMultiCellWidget( label, 4, 5, 0, 0 );
      //layout->addMultiCellWidget( label, 6, 7, 0, 0 );
      int iii = 6;
      if ( QApplication::desktop()->width() == 640 ) {
          QHBox * nbox = new QHBox ( tab2 );
          label = new QLabel( i18n( "Nick name:" )+" ", nbox );
          mNicknameEdit = new KLineEdit(  nbox );
          connect( mNicknameEdit, SIGNAL( textChanged( const QString& ) ),
                   SLOT( textChanged( const QString& ) ) );
          label->setBuddy( mNicknameEdit );
          label = new QLabel( " "+i18n( "Spouse's name:" )+" ",  nbox );
          mSpouseEdit = new KLineEdit(  nbox );
          connect( mSpouseEdit, SIGNAL( textChanged( const QString& ) ),
                   SLOT( textChanged( const QString& ) ) );
          label->setBuddy( mSpouseEdit );
          layout->addMultiCellWidget( nbox, iii, iii, 1, 2 );
          ++iii;
      } else {
          label = new QLabel( i18n( "Nick name:" ), tab2 );
          layout->addWidget( label, iii, 1 );
          mNicknameEdit = new KLineEdit( tab2 );
          connect( mNicknameEdit, SIGNAL( textChanged( const QString& ) ),
                   SLOT( textChanged( const QString& ) ) );
          label->setBuddy( mNicknameEdit );
          layout->addWidget( mNicknameEdit, iii, 2 );
          ++iii;
          label = new QLabel( i18n( "Spouse's name:" ), tab2 );
          layout->addWidget( label, iii, 1 );
          mSpouseEdit = new KLineEdit( tab2 );
          connect( mSpouseEdit, SIGNAL( textChanged( const QString& ) ),
                   SLOT( textChanged( const QString& ) ) );
          label->setBuddy( mSpouseEdit );
          layout->addWidget( mSpouseEdit, iii, 2 );
          ++iii;
      }
      label = new QLabel( i18n( "Children's names:" ), tab2 );
      layout->addWidget( label, iii, 1 );
      mChildEdit = new KLineEdit( tab2 );
      connect( mChildEdit, SIGNAL( textChanged( const QString& ) ),
               SLOT( textChanged( const QString& ) ) );
      label->setBuddy( mChildEdit );
      layout->addWidget( mChildEdit, iii, 2 );
      ++iii;
      if ( QApplication::desktop()->width() == 640 ) {
          QHBox * nbox = new QHBox ( tab2 );
          label = new QLabel( i18n( "Birthday:" )+" ", nbox );
          mBirthdayPicker = new KDateEdit(  nbox  );
          mBirthdayPicker->toggleDateFormat();
          mBirthdayPicker->setHandleInvalid( true );
          connect( mBirthdayPicker, SIGNAL( dateChanged( QDate ) ),
                   SLOT( dateChanged( QDate ) ) );
           
          label->setBuddy( mBirthdayPicker );
  
          label = new QLabel(  " "+i18n( "Anniversary:" )+" ",  nbox  );
          mAnniversaryPicker = new KDateEdit(  nbox  );
          mAnniversaryPicker->setHandleInvalid( true );
          connect( mAnniversaryPicker, SIGNAL( dateChanged( QDate ) ),
                   SLOT( dateChanged( QDate ) ) );
           
          label->setBuddy( mAnniversaryPicker );
          layout->addMultiCellWidget( nbox, iii, iii, 1, 2 );
          ++iii;
      } else {
          label = new QLabel( i18n( "Birthday:" ), tab2 );
          layout->addWidget( label, iii, 1 );
          mBirthdayPicker = new KDateEdit( tab2 );
          mBirthdayPicker->toggleDateFormat();
          mBirthdayPicker->setHandleInvalid( true );
          connect( mBirthdayPicker, SIGNAL( dateChanged( QDate ) ),
                   SLOT( dateChanged( QDate ) ) );
           
          label->setBuddy( mBirthdayPicker );
          layout->addWidget( mBirthdayPicker, iii, 2 );
          ++iii;
  
          label = new QLabel( i18n( "Anniversary:" ), tab2 );
          layout->addWidget( label, iii, 1 );
          mAnniversaryPicker = new KDateEdit( tab2 );
          mAnniversaryPicker->setHandleInvalid( true );
          connect( mAnniversaryPicker, SIGNAL( dateChanged( QDate ) ),
                   SLOT( dateChanged( QDate ) ) );
           
          label->setBuddy( mAnniversaryPicker );
          layout->addWidget( mAnniversaryPicker, iii, 2 );
          ++iii;
      }
      label = new QLabel( i18n( "Gender:" ), tab2 );
      layout->addWidget( label, iii, 1 );
      mGenderBox = new QComboBox ( tab2 );
      mGenderBox->insertItem ( i18n( "ALIEN (gender undefined)" ));
      mGenderBox->insertItem ( i18n( "female" ));
      mGenderBox->insertItem ( i18n( "male" ));
      connect( mGenderBox, SIGNAL(  activated ( const QString & )  ),
                   SLOT( textChanged( const QString& ) ) );
      label->setBuddy( mGenderBox );
      layout->addWidget( mGenderBox, iii, 2 );
      ++iii;
   // Build the layout and add to the tab widget
  layout->activate(); // required
  mTabWidget->addTab( tab2, i18n( "&Details" ) );
 }
 void AddresseeEditorWidget::setupTab2_1()
 {
  // This is the Details tab
  QWidget *tab2_2 = new QWidget( mTabWidget );
  QGridLayout *layout = new QGridLayout( tab2_2, 1, 2 );
  layout->setMargin( KDialogBase::marginHintSmall() );
  layout->setSpacing( KDialogBase::spacingHintSmall() );
  
  QLabel *label;
  KSeparator* bar;
  
 /*US  
  ///////////////////////
  // Office info
  
  // Department
  label = new QLabel( tab2 );
 //US loadIcon call is ambiguous. Add one more parameter
 //US  label->setPixmap( KGlobal::iconLoader()->loadIcon( "folder", KIcon::Desktop ) );
  label->setPixmap( KGlobal::iconLoader()->loadIcon( "folder", KIcon::Desktop, 0 ) );
  layout->addMultiCellWidget( label, 0, 1, 0, 0 );
  
  label = new QLabel( i18n( "Department:" ), tab2 );
  layout->addWidget( label, 0, 1 );
  mDepartmentEdit = new KLineEdit( tab2 );
  connect( mDepartmentEdit, SIGNAL( textChanged( const QString& ) ),
           SLOT( textChanged( const QString& ) ) );
  label->setBuddy( mDepartmentEdit );
  layout->addWidget( mDepartmentEdit, 0, 2 );
  
  label = new QLabel( i18n( "Office:" ), tab2 );
  layout->addWidget( label, 1, 1 );
  mOfficeEdit = new KLineEdit( tab2 );
  connect( mOfficeEdit, SIGNAL( textChanged( const QString& ) ),
           SLOT( textChanged( const QString& ) ) );
  label->setBuddy( mOfficeEdit );
  layout->addWidget( mOfficeEdit, 1, 2 );
  
  label = new QLabel( i18n( "Profession:" ), tab2 );
  layout->addWidget( label, 2, 1 );
  mProfessionEdit = new KLineEdit( tab2 );
  connect( mProfessionEdit, SIGNAL( textChanged( const QString& ) ),
           SLOT( textChanged( const QString& ) ) );
  label->setBuddy( mProfessionEdit );
  layout->addWidget( mProfessionEdit, 2, 2 );
  
  label = new QLabel( i18n( "Manager\'s name:" ), tab2 );
  layout->addWidget( label, 0, 3 );
  mManagerEdit = new KLineEdit( tab2 );
  connect( mManagerEdit, SIGNAL( textChanged( const QString& ) ),
           SLOT( textChanged( const QString& ) ) );
  label->setBuddy( mManagerEdit );
  layout->addMultiCellWidget( mManagerEdit, 0, 0, 4, 5 );
  
  label = new QLabel( i18n( "Assistant's name:" ), tab2 );
  layout->addWidget( label, 1, 3 );
  mAssistantEdit = new KLineEdit( tab2 );
  connect( mAssistantEdit, SIGNAL( textChanged( const QString& ) ),
           SLOT( textChanged( const QString& ) ) );
  label->setBuddy( mAssistantEdit );
  layout->addMultiCellWidget( mAssistantEdit, 1, 1, 4, 5 );
  
  bar = new KSeparator( KSeparator::HLine, tab2 );
  layout->addMultiCellWidget( bar, 3, 3, 0, 5 );
  /////////////////////////////////////////////////
  // Personal info
  
  label = new QLabel( tab2 );
 //US loadIcon call is ambiguous. Add one more parameter
 //US  label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop ) );
  label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop, 0 ) );
  layout->addMultiCellWidget( label, 4, 5, 0, 0 );
  
  label = new QLabel( i18n( "Nick name:" ), tab2 );
  layout->addWidget( label, 4, 1 );
  mNicknameEdit = new KLineEdit( tab2 );
  connect( mNicknameEdit, SIGNAL( textChanged( const QString& ) ),
           SLOT( textChanged( const QString& ) ) );
  label->setBuddy( mNicknameEdit );
  layout->addWidget( mNicknameEdit, 4, 2 );
  label = new QLabel( i18n( "Spouse's name:" ), tab2 );
  layout->addWidget( label, 5, 1 );
  mSpouseEdit = new KLineEdit( tab2 );
  connect( mSpouseEdit, SIGNAL( textChanged( const QString& ) ),
           SLOT( textChanged( const QString& ) ) );
  label->setBuddy( mSpouseEdit );
  layout->addWidget( mSpouseEdit, 5, 2 );
  label = new QLabel( i18n( "Birthday:" ), tab2 );
  layout->addWidget( label, 4, 3 );
  mBirthdayPicker = new KDateEdit( tab2 );
  mBirthdayPicker->setHandleInvalid( true );
  connect( mBirthdayPicker, SIGNAL( dateChanged( QDate ) ),
           SLOT( dateChanged( QDate ) ) );
  connect( mBirthdayPicker, SIGNAL( invalidDateEntered() ),
           SLOT( invalidDate() ) );
  connect( mBirthdayPicker, SIGNAL( textChanged( const QString& ) ),
           SLOT( emitModified() ) );
  label->setBuddy( mBirthdayPicker );
  layout->addWidget( mBirthdayPicker, 4, 4 );
  
  label = new QLabel( i18n( "Anniversary:" ), tab2 );
  layout->addWidget( label, 5, 3 );
  mAnniversaryPicker = new KDateEdit( tab2 );
  mAnniversaryPicker->setHandleInvalid( true );
  connect( mAnniversaryPicker, SIGNAL( dateChanged( QDate ) ),
           SLOT( dateChanged( QDate ) ) );
  connect( mAnniversaryPicker, SIGNAL( invalidDateEntered() ),
           SLOT( invalidDate() ) );
  connect( mAnniversaryPicker, SIGNAL( textChanged( const QString& ) ),
           SLOT( emitModified() ) );
  label->setBuddy( mAnniversaryPicker );
  layout->addWidget( mAnniversaryPicker, 5, 4 );
  
  bar = new KSeparator( KSeparator::HLine, tab2 );
  layout->addMultiCellWidget( bar, 6, 6, 0, 5 );
 */  
   //////////////////////////////////////
  // Notes
  label = new QLabel( i18n( "Note:" ), tab2_2 );
  label->setAlignment( Qt::AlignTop | Qt::AlignLeft );
 //US  layout->addWidget( label, 7, 0 );
  layout->addWidget( label, 0, 0 );
 #ifndef KAB_EMBEDDED    
  mNoteEdit = new QTextEdit( tab2_2 );
  mNoteEdit->setWordWrap( QTextEdit::WidgetWidth );
  mNoteEdit->setMinimumSize( mNoteEdit->sizeHint() );
 #else //KAB_EMBEDDED    
  mNoteEdit = new QMultiLineEdit( tab2_2 );
  mNoteEdit->setWordWrap( QMultiLineEdit::WidgetWidth );
  mNoteEdit->setMinimumSize( mNoteEdit->sizeHint() );
 #endif //KAB_EMBEDDED    
  
  connect( mNoteEdit, SIGNAL( textChanged() ), SLOT( emitModified() ) );
  label->setBuddy( mNoteEdit );
 //US  layout->addMultiCellWidget( mNoteEdit, 7, 7, 1, 5 );
  layout->addWidget( mNoteEdit, 1, 0);
   // Build the layout and add to the tab widget
  layout->activate(); // required
  mTabWidget->addTab( tab2_2, i18n( "&Notes" ) );
 }
 void AddresseeEditorWidget::setupTab3()
 {
  // This is the Misc tab
  QWidget *tab3 = new QWidget( mTabWidget );
  QGridLayout *layout = new QGridLayout( tab3, 1, 1 );
  layout->setMargin( KDialogBase::marginHintSmall() );
  layout->setSpacing( KDialogBase::spacingHintSmall() );
 //US  layout->setColStretch( 2, 1 );
  
  //////////////////////////////////////
  // Geo
  mGeoWidget = new GeoWidget( tab3 );
  // mGeoWidget->setMinimumSize( mGeoWidget->sizeHint() );
  connect( mGeoWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
  layout->addWidget( mGeoWidget, 0, 0 );
 /*US
  //////////////////////////////////////
  // Sound
 #ifndef KAB_EMBEDDED    
  mSoundWidget = new SoundWidget( tab3 );
  mSoundWidget->setMinimumSize( mSoundWidget->sizeHint() );
  connect( mSoundWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
  layout->addWidget( mSoundWidget, 0, 1, Qt::AlignTop );
 #else //KAB_EMBEDDED    
 qDebug("AddresseeEditorWidget::setupTab2 sound part is not supported = has to be changed");
 #endif //KAB_EMBEDDED    
  //////////////////////////////////////
  // Images
  mImageWidget = new ImageWidget( tab3 );
  mImageWidget->setMinimumSize( mImageWidget->sizeHint() );
  connect( mImageWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
  layout->addWidget( mImageWidget, 1, 0, Qt::AlignTop );
 */
 //US  
 /*
  KSeparator* bar = new KSeparator( KSeparator::HLine, tab3 );
  layout->addMultiCellWidget( bar, 1, 1, 0, 0 );
 */ 
  //////////////////////////////////////
  // Keys
  mKeyWidget = new KeyWidget( tab3 );
  //mKeyWidget->setMinimumSize( mKeyWidget->sizeHint() );
  connect( mKeyWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
 //US  layout->addWidget( mKeyWidget, 1, 1, Qt::AlignTop );
  layout->addWidget( mKeyWidget, 1, 0 );
  mTabWidget->addTab( tab3, i18n( "&Misc" ) );
 }
 void AddresseeEditorWidget::setupTab3_1()
 {
  // This is the Misc tab
  QWidget *tab3 = new QWidget( mTabWidget );
 //US  QGridLayout *layout = new QGridLayout( tab3, 2, 3 );
  QGridLayout *layout = new QGridLayout( tab3, 1, 1 );
  layout->setMargin( KDialogBase::marginHint() );
  layout->setSpacing( KDialogBase::spacingHint() );
 //US  layout->setColStretch( 2, 1 );
 /*US  
  //////////////////////////////////////
  // Geo
  mGeoWidget = new GeoWidget( tab3 );
  mGeoWidget->setMinimumSize( mGeoWidget->sizeHint() );
  connect( mGeoWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
  layout->addWidget( mGeoWidget, 0, 0, Qt::AlignTop );
 */
  //////////////////////////////////////
  // Sound
 #ifndef KAB_EMBEDDED    
  mSoundWidget = new SoundWidget( tab3 );
  mSoundWidget->setMinimumSize( mSoundWidget->sizeHint() );
  connect( mSoundWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
  layout->addWidget( mSoundWidget, 0, 1, Qt::AlignTop );
 #else //KAB_EMBEDDED    
 //US qDebug("AddresseeEditorWidget::setupTab2 sound part is not supported = has to be changed");
 #endif //KAB_EMBEDDED    
  //////////////////////////////////////
  // Images
  mImageWidget = new ImageWidget( tab3 );
  mImageWidget->setMinimumSize( mImageWidget->sizeHint() );
  connect( mImageWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
  layout->addWidget( mImageWidget, 0, 0, Qt::AlignTop );
 /*US
  //////////////////////////////////////
  // Keys
  mKeyWidget = new KeyWidget( tab3 );
  mKeyWidget->setMinimumSize( mKeyWidget->sizeHint() );
  connect( mKeyWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
  layout->addWidget( mKeyWidget, 1, 1, Qt::AlignTop );
 */
  mTabWidget->addTab( tab3, i18n( "&Images" ) );
 }
    
 void AddresseeEditorWidget::load()
 {
  // Block signals in case anything tries to emit modified
  // CS: This doesn't seem to work.
  bool block = signalsBlocked();
  blockSignals( true ); 
  mBlockSignals = true; // used for internal signal blocking
  mNameEdit->setText( mAddressee.assembledName() );
  
  if ( mAddressee.formattedName().isEmpty() ) {
 //US    KConfig config( "kaddressbookrc" );
    KConfig config( locateLocal("config", "kabcrc") );
    config.setGroup( "General" );
    mFormattedNameType = config.readNumEntry( "FormattedNameType", 1 );
    mAddressee.setFormattedName( NameEditDialog::formattedName( mAddressee, mFormattedNameType ) );
  } else {;
    if ( mAddressee.formattedName() == NameEditDialog::formattedName( mAddressee, NameEditDialog::SimpleName ) )
      mFormattedNameType = NameEditDialog::SimpleName;
    else if ( mAddressee.formattedName() == NameEditDialog::formattedName( mAddressee, NameEditDialog::FullName ) )
      mFormattedNameType = NameEditDialog::FullName;
    else if ( mAddressee.formattedName() == NameEditDialog::formattedName( mAddressee, NameEditDialog::ReverseName ) )
      mFormattedNameType = NameEditDialog::ReverseName;
    else
      mFormattedNameType = NameEditDialog::CustomName;
  }
  mFormattedNameLabel->setText( mAddressee.formattedName() );
+  mAConfig->setUid( mAddressee.uid() );
+  if ( mAConfig->automaticNameParsing() ) {
+      mNameLabel->hide();
+      mNameEdit->show();
+  } else {
+      mNameEdit->hide();
+      mNameLabel->setText( mNameEdit->text() );
+      mNameLabel->show();
+  }
  mRoleEdit->setText( mAddressee.role() );
  mOrgEdit->setText( mAddressee.organization() );
  
 //US  mURLEdit->setURL( mAddressee.url().url() );
  mURLEdit->setText( mAddressee.url().prettyURL() );
 //US??  mURLEdit->home( false );
  
  // mNoteEdit->setText( mAddressee.note() );
  mNoteEdit->setText( mAddressee.note() );
  mEmailWidget->setEmails( mAddressee.emails() );
  mPhoneEditWidget->setPhoneNumbers( mAddressee.phoneNumbers() );
  mAddressEditWidget->setAddresses( mAddressee, mAddressee.addresses() );
  mBirthdayPicker->setDate( mAddressee.birthday().date() );
 //US  mAnniversaryPicker->setDate( QDate::fromString( mAddressee.custom(
 //US                               "KADDRESSBOOK", "X-Anniversary" ), Qt::ISODate) );
  QDate dt = KGlobal::locale()->readDate( mAddressee.custom("KADDRESSBOOK", "X-Anniversary" ), 
                                                    "%Y-%m-%d");  // = Qt::ISODate
  mAnniversaryPicker->setDate( dt );
                                                              
  mNicknameEdit->setText( mAddressee.nickName() );
  mCategoryEdit->setText( mAddressee.categories().join( "," ) );
  mGeoWidget->setGeo( mAddressee.geo() );
  mImageWidget->setPhoto( mAddressee.photo() );
  mImageWidget->setLogo( mAddressee.logo() );
  mKeyWidget->setKeys( mAddressee.keys() );
  mSecrecyWidget->setSecrecy( mAddressee.secrecy() );
 #ifndef KAB_EMBEDDED    
  mSoundWidget->setSound( mAddressee.sound() );
 #else //KAB_EMBEDDED    
 //US qDebug("AddresseeEditorWidget::load has to be changed 2");
 #endif //KAB_EMBEDDED    
  // Load customs
  mIMAddressEdit->setText( mAddressee.custom( "KADDRESSBOOK", "X-IMAddress" ) );
  mSpouseEdit->setText( mAddressee.custom( "KADDRESSBOOK", "X-SpousesName" ) );
  mChildEdit->setText( mAddressee.custom( "KADDRESSBOOK", "X-Children" ) );
  mManagerEdit->setText( mAddressee.custom( "KADDRESSBOOK", "X-ManagersName" ) );
  mAssistantEdit->setText( mAddressee.custom( "KADDRESSBOOK", "X-AssistantsName" ) );
  mDepartmentEdit->setText( mAddressee.custom( "KADDRESSBOOK", "X-Department" ) );
  mOfficeEdit->setText( mAddressee.custom( "KADDRESSBOOK", "X-Office" ) );
  mProfessionEdit->setText( mAddressee.custom( "KADDRESSBOOK", "X-Profession" ) );
  QString gen = mAddressee.custom( "KADDRESSBOOK", "X-Gender" );
  if ( gen == "female" )
      mGenderBox->setCurrentItem ( 1 ); 
  else if ( gen == "male" )
      mGenderBox->setCurrentItem ( 2 ); 
  else 
      mGenderBox->setCurrentItem ( 0 ); 
  blockSignals( block );
  mBlockSignals = false;
  mDirty = false;
 }
 void AddresseeEditorWidget::save()
 {
    if ( !dirty() ) {
            return;
    }
 
    mAddressee.setRevision( QDateTime::currentDateTime() ); 
 
  mAddressee.setRole( mRoleEdit->text() );
  mAddressee.setOrganization( mOrgEdit->text() );
  mAddressee.setUrl( KURL( mURLEdit->text() ) );
  mAddressee.setNote( mNoteEdit->text() );
  if ( mBirthdayPicker->inputIsValid() ) {
      QDate da = mBirthdayPicker->date();
      if ( da > QDate::currentDate() )
          da.setYMD(da.year()-100, da.month(), da.day() );
      mAddressee.setBirthday( QDateTime( da ) );
      //qDebug("bday %s ",da.toString().latin1());
  }
  else {
    mAddressee.setBirthday( QDateTime() );
    mBirthdayPicker->clear();
  }
  mAddressee.setNickName( mNicknameEdit->text() );
  mAddressee.setCategories( QStringList::split( ",", mCategoryEdit->text() ) );
  mAddressee.setGeo( mGeoWidget->geo() );
  mAddressee.setPhoto( mImageWidget->photo() );
  mAddressee.setLogo( mImageWidget->logo() );
  mAddressee.setKeys( mKeyWidget->keys() );
 #ifndef KAB_EMBEDDED    
  mAddressee.setSound( mSoundWidget->sound() );
 #else //KAB_EMBEDDED    
 //US qDebug("AddresseeEditorWidget::save sound not supported");
 #endif //KAB_EMBEDDED    
  mAddressee.setSecrecy( mSecrecyWidget->secrecy() );
  // save custom fields
  mAddressee.insertCustom( "KADDRESSBOOK", "X-IMAddress", mIMAddressEdit->text() );
  mAddressee.insertCustom( "KADDRESSBOOK", "X-SpousesName", mSpouseEdit->text() );
  mAddressee.insertCustom( "KADDRESSBOOK", "X-Children", mChildEdit->text() );
  mAddressee.insertCustom( "KADDRESSBOOK", "X-ManagersName", mManagerEdit->text() );
  mAddressee.insertCustom( "KADDRESSBOOK", "X-AssistantsName", mAssistantEdit->text() );
  mAddressee.insertCustom( "KADDRESSBOOK", "X-Department", mDepartmentEdit->text() );
  mAddressee.insertCustom( "KADDRESSBOOK", "X-Office", mOfficeEdit->text() );
  mAddressee.insertCustom( "KADDRESSBOOK", "X-Profession", mProfessionEdit->text() );
  if ( mAnniversaryPicker->inputIsValid() ) {
    QString dt = KGlobal::locale()->formatDate(mAnniversaryPicker->date(), true, KLocale::ISODate);
    mAddressee.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt);
  }
  else {
    mAddressee.removeCustom( "KADDRESSBOOK", "X-Anniversary" );
    mAnniversaryPicker->clear();
  }
  int gen = mGenderBox->currentItem ();
  if ( gen == 1 )
    mAddressee.insertCustom( "KADDRESSBOOK", "X-Gender", "female");
  else if ( gen == 2 )
    mAddressee.insertCustom( "KADDRESSBOOK", "X-Gender", "male");
  else 
    mAddressee.removeCustom( "KADDRESSBOOK", "X-Gender" );
                      
  // Save the email addresses
  QStringList emails = mAddressee.emails();
  QStringList::Iterator iter;
  for ( iter = emails.begin(); iter != emails.end(); ++iter )
    mAddressee.removeEmail( *iter );
  
  emails = mEmailWidget->emails();
  bool first = true;
  for ( iter = emails.begin(); iter != emails.end(); ++iter ) {
    mAddressee.insertEmail( *iter, first );
    first = false;
  }
  
  // Save the phone numbers
  KABC::PhoneNumber::List phoneNumbers;
  KABC::PhoneNumber::List::Iterator phoneIter;
  phoneNumbers = mAddressee.phoneNumbers();
  for ( phoneIter = phoneNumbers.begin(); phoneIter != phoneNumbers.end();
        ++phoneIter )
    mAddressee.removePhoneNumber( *phoneIter );
    
  phoneNumbers = mPhoneEditWidget->phoneNumbers();
  for ( phoneIter = phoneNumbers.begin(); phoneIter != phoneNumbers.end();
        ++phoneIter )
    mAddressee.insertPhoneNumber( *phoneIter );
  // Save the addresses
  KABC::Address::List addresses;
  KABC::Address::List::Iterator addressIter;
  addresses = mAddressee.addresses();
  for ( addressIter = addresses.begin(); addressIter != addresses.end();
        ++addressIter )
    mAddressee.removeAddress( *addressIter );
    
  addresses = mAddressEditWidget->addresses();
  for ( addressIter = addresses.begin(); addressIter != addresses.end();
        ++addressIter )
    mAddressee.insertAddress( *addressIter );
  mDirty = false;
 }
 bool AddresseeEditorWidget::dirty()
 {
    if ( ! mDirty ) {
        if ( mBirthdayPicker->inputIsValid() ) {
            QDate da = mBirthdayPicker->date();
            if ( !(da ==  mAddressee.birthday().date()))
                mDirty = true;
        }
        else {
            mBirthdayPicker->clear();
        }
        if ( mAnniversaryPicker->inputIsValid() ) {
            QDate da = mAnniversaryPicker->date();
            if ( da != KGlobal::locale()->readDate( mAddressee.custom("KADDRESSBOOK", "X-Anniversary" ), 
                                                    "%Y-%m-%d"))
                mDirty = true;
        }
        else {
            mAnniversaryPicker->clear();
        }
    }
  return mDirty;
 }
 void AddresseeEditorWidget::nameTextChanged( const QString &text )
 {
    if ( mBlockSignals )
        return;
  // use the addressee class to parse the name for us
    mAConfig->setUid( mAddressee.uid() );
  if ( mAConfig->automaticNameParsing() ) {
    if ( !mAddressee.formattedName().isEmpty() ) {
         QString fn = mAddressee.formattedName();
        mAddressee.setNameFromString( text );
        mAddressee.setFormattedName( fn );
    } else {
      // use extra addressee to avoid a formatted name assignment
      Addressee addr;
      addr.setNameFromString( text );
      mAddressee.setPrefix( addr.prefix() );
      mAddressee.setGivenName( addr.givenName() );
      mAddressee.setAdditionalName( addr.additionalName() );
      mAddressee.setFamilyName( addr.familyName() );
      mAddressee.setSuffix( addr.suffix() );
    }
  }
  nameBoxChanged();
+ 
  emitModified();
 }
 void AddresseeEditorWidget::nameBoxChanged()
 {
  KABC::Addressee addr;
  mAConfig->setUid( mAddressee.uid() );
  if ( mAConfig->automaticNameParsing() ) {
    addr.setNameFromString( mNameEdit->text() );
    mNameLabel->hide();
    mNameEdit->show();
  } else {
    addr = mAddressee;
    mNameEdit->hide();
    mNameLabel->setText( mNameEdit->text() );
    mNameLabel->show();
  }
  if ( mFormattedNameType != NameEditDialog::CustomName ) {
    mFormattedNameLabel->setText( NameEditDialog::formattedName( mAddressee, mFormattedNameType ) );
    mAddressee.setFormattedName( NameEditDialog::formattedName( mAddressee, mFormattedNameType ) );
  }
 }
 void AddresseeEditorWidget::nameButtonClicked()
 {
  // show the name dialog.
  NameEditDialog dialog( mAddressee, mFormattedNameType, this );
  
  if ( KApplication::execDialog( &dialog) ) {
    if ( dialog.changed() ) {
      mAddressee.setFamilyName( dialog.familyName() );
      mAddressee.setGivenName( dialog.givenName() );
      mAddressee.setPrefix( dialog.prefix() );
      mAddressee.setSuffix( dialog.suffix() );
      mAddressee.setAdditionalName( dialog.additionalName() );
      mFormattedNameType = dialog.formattedNameType();
      if ( mFormattedNameType == NameEditDialog::CustomName ) {
        mFormattedNameLabel->setText( dialog.customFormattedName() );
        mAddressee.setFormattedName( dialog.customFormattedName() );
      }
      // Update the name edit.
      bool block = mNameEdit->signalsBlocked();
      mNameEdit->blockSignals( true );
      mNameEdit->setText( mAddressee.assembledName() );
      mNameEdit->blockSignals( block );
      // Update the combo box.
      nameBoxChanged();
    
      emitModified();
    }
  }
 }
 void AddresseeEditorWidget::categoryButtonClicked()
 {
  // Show the category dialog
  if ( mCategoryDialog == 0 ) {
    mCategoryDialog = new KPIM::CategorySelectDialog( KABPrefs::instance(), this );
    connect( mCategoryDialog, SIGNAL( categoriesSelected( const QStringList& ) ),
             SLOT(categoriesSelected( const QStringList& ) ) );
    connect( mCategoryDialog, SIGNAL( editCategories() ), SLOT( editCategories() ) );
  }
  mCategoryDialog->setCategories();
  mCategoryDialog->setSelected( QStringList::split( ",", mCategoryEdit->text() ) );
  mCategoryDialog->show();
  mCategoryDialog->raise();
 }
 void AddresseeEditorWidget::categoriesSelected( const QStringList &list )
 {
  mCategoryEdit->setText( list.join( "," ) );
 }
 void AddresseeEditorWidget::editCategories()
 {
  if ( mCategoryEditDialog == 0 ) {
    mCategoryEditDialog = new KPIM::CategoryEditDialog( KABPrefs::instance(), this );
    connect( mCategoryEditDialog, SIGNAL( categoryConfigChanged() ),
             SLOT( categoryButtonClicked() ) );
  }
  
  mCategoryEditDialog->show();
  mCategoryEditDialog->raise();
 }
 void AddresseeEditorWidget::emitModified()
 {
  mDirty = true;
  KABC::Addressee::List list;
  if ( mIsExtension && !mBlockSignals ) {
    save();
    list.append( mAddressee );
  }
  emit modified( list );
 }
 void AddresseeEditorWidget::dateChanged( QDate )
 {
  emitModified();
 }
 //US invalid dates are handdled by the KDateEdit widget itself
 void AddresseeEditorWidget::invalidDate()
 {
  KMessageBox::sorry( this, i18n( "You must specify a valid date" ) );
 }
 void AddresseeEditorWidget::pageChanged( QWidget *wdg )
 {
 #ifndef KAB_EMBEDDED    
  if ( wdg )
    KAcceleratorManager::manage( wdg );
 #else //KAB_EMBEDDED    
 //US 
 #endif //KAB_EMBEDDED    
    
 }
 QString AddresseeEditorWidget::title() const
 {
  return i18n( "Contact Editor" );
 }
 QString AddresseeEditorWidget::identifier() const
 {
  return i18n( "contact_editor" );
 }
 #ifndef KAB_EMBEDDED    
 #include "addresseeeditorwidget.moc"
 #endif //KAB_EMBEDDED    
diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp
index 48370e3..9ee4eac 100644
--- a/kaddressbook/imagewidget.cpp
+++ b/kaddressbook/imagewidget.cpp
@@ -1,294 +1,312 @@
 /*                                                                      
    This file is part of KAddressBook.                                  
    Copyright (c) 2003 Tobias Koenig <tokoe@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 <kabc/picture.h>
 #ifndef KAB_EMBEDDED
 #include <kaccelmanager.h>
 #include <kio/netaccess.h>
 #include <kimageio.h>
 #endif //KAB_EMBEDDED
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kurlrequester.h>
 #include <kurl.h>
 #include <qcheckbox.h>
 #include <qgroupbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qpixmap.h>
+#include <qpushbutton.h>
 #include <qapplication.h>
 #include "imagewidget.h"
 ImageWidget::ImageWidget( QWidget *parent, const char *name )
  : QWidget( parent, name )
 {
  QGridLayout *topLayout = new QGridLayout( this, 2, 1, KDialog::marginHint(),
                                            KDialog::spacingHint() );
  QGroupBox *photoBox = new QGroupBox( 0, Qt::Vertical, i18n( "Photo" ), this );
-  QGridLayout *boxLayout = new QGridLayout( photoBox->layout(), 3, 2,
+  QGridLayout *boxLayout = new QGridLayout( photoBox->layout(), 4, 2,
                                            KDialog::spacingHint() );
  boxLayout->setRowStretch( 2, 1 );
  mPhotoLabel = new QLabel( photoBox );
  int fac = 9;
  if ( QApplication::desktop()->width() > 320 )
      fac = 6;
  mPhotoLabel->setFixedSize( 50*9/fac, 70*9/fac );
  mPhotoLabel->setScaledContents( true );
  mPhotoLabel->setFrameStyle( QFrame::Panel | QFrame::Sunken );
-  boxLayout->addMultiCellWidget( mPhotoLabel, 0, 2, 0, 0 );
+  boxLayout->addMultiCellWidget( mPhotoLabel, 0, 3, 0, 0 );
  mPhotoUrl = new KURLRequester( photoBox );
 #ifndef KAB_EMBEDDED  
  mPhotoUrl->setFilter( KImageIO::pattern() );
 #else //KAB_EMBEDDED  
 //US  qDebug("ImageWidget::ImageWidget KImageIO not defined. Does this harm ???");
 #endif //KAB_EMBEDDED  
  
  
  boxLayout->addWidget( mPhotoUrl, 0, 1 );
  
  mUsePhotoUrl = new QCheckBox( i18n( "Store as URL" ), photoBox );
  mUsePhotoUrl->setEnabled( false );
  boxLayout->addWidget( mUsePhotoUrl, 1, 1 );
+  QPushButton * pb = new QPushButton( i18n( "Remove" ), photoBox );
+  connect( pb, SIGNAL( clicked() ),this, SLOT( removePhoto() ) );
+  boxLayout->addWidget( pb, 2, 1 );
+  boxLayout->addWidget( new QLabel(  photoBox ), 3, 1 );
  topLayout->addWidget( photoBox, 0, 0 );
  QGroupBox *logoBox = new QGroupBox( 0, Qt::Vertical, i18n( "Logo" ), this );
-  boxLayout = new QGridLayout( logoBox->layout(), 3, 2, KDialog::spacingHint() );
+  boxLayout = new QGridLayout( logoBox->layout(), 4, 2, KDialog::spacingHint() );
  boxLayout->setRowStretch( 2, 1 );
  mLogoLabel = new QLabel( logoBox );
  mLogoLabel->setFixedSize( 50*9/fac, 70*9/fac );
  mLogoLabel->setScaledContents( true );
  mLogoLabel->setFrameStyle( QFrame::Panel | QFrame::Sunken );
-  boxLayout->addMultiCellWidget( mLogoLabel, 0, 2, 0, 0 );
+  boxLayout->addMultiCellWidget( mLogoLabel, 0, 3, 0, 0 );
  mLogoUrl = new KURLRequester( logoBox );
 #ifndef KAB_EMBEDDED  
  mLogoUrl->setFilter( KImageIO::pattern() );
 #else //KAB_EMBEDDED  
 //US  qDebug("ImageWidget::ImageWidget KImageIO not defined 2");
 #endif //KAB_EMBEDDED  
  boxLayout->addWidget( mLogoUrl, 0, 1 );
  
  mUseLogoUrl = new QCheckBox( i18n( "Store as URL" ), logoBox );
  mUseLogoUrl->setEnabled( false );
  boxLayout->addWidget( mUseLogoUrl, 1, 1 );
+   pb = new QPushButton( i18n( "Remove" ), logoBox );
+  connect( pb, SIGNAL( clicked() ),this, SLOT( removeLogo() ) );
+  boxLayout->addWidget( pb, 2, 1 );
+  boxLayout->addWidget( new QLabel(  logoBox ), 3, 1 );
  topLayout->addWidget( logoBox, 1, 0 );
  connect( mPhotoUrl, SIGNAL( textChanged( const QString& ) ),
           SIGNAL( changed() ) );
  connect( mPhotoUrl, SIGNAL( urlSelected( const QString& ) ),
           SLOT( loadPhoto() ) );
  connect( mPhotoUrl, SIGNAL( urlSelected( const QString& ) ),
           SIGNAL( changed() ) );
  connect( mPhotoUrl, SIGNAL( urlSelected( const QString& ) ),
           SLOT( updateGUI() ) );
  connect( mUsePhotoUrl, SIGNAL( toggled( bool ) ),
           SIGNAL( changed() ) );
  connect( mLogoUrl, SIGNAL( textChanged( const QString& ) ),
           SIGNAL( changed() ) );
  connect( mLogoUrl, SIGNAL( urlSelected( const QString& ) ),
           SLOT( loadLogo() ) );
  connect( mLogoUrl, SIGNAL( urlSelected( const QString& ) ),
           SIGNAL( changed() ) );
  connect( mLogoUrl, SIGNAL( urlSelected( const QString& ) ),
           SLOT( updateGUI() ) );
  connect( mUseLogoUrl, SIGNAL( toggled( bool ) ),
           SIGNAL( changed() ) );
 #ifndef KAB_EMBEDDED  
  KAcceleratorManager::manage( this );
 #endif //KAB_EMBEDDED  
 }
 ImageWidget::~ImageWidget()
 {
 }
 void ImageWidget::setPhoto( const KABC::Picture &photo )
 {
  bool blocked = signalsBlocked();
  blockSignals( true );
  if ( photo.isIntern() ) {
 //US   
 //US    mPhotoLabel->setPixmap( photo.data() );
    if (photo.data().isNull() != true)
    {
      QPixmap pm;
      pm.convertFromImage(photo.data()); 
      mPhotoLabel->setPixmap( pm );
    }
    
    mUsePhotoUrl->setChecked( false );
  } else {
    mPhotoUrl->setURL( photo.url() );
    if ( !photo.url().isEmpty() )
      mUsePhotoUrl->setChecked( true );
    loadPhoto();
  }
  
  blockSignals( blocked );
 }
 KABC::Picture ImageWidget::photo() const
 {
  KABC::Picture photo;
  if ( mUsePhotoUrl->isChecked() )
    photo.setUrl( mPhotoUrl->url() );
  else {
    QPixmap *px = mPhotoLabel->pixmap();
    if ( px ) {
 #ifndef KAB_EMBEDDED  
      if ( px->height() > px->width() )
        photo.setData( px->convertToImage().scaleHeight( 140 ) );
      else
        photo.setData( px->convertToImage().scaleWidth( 100 ) );
 #else //KAB_EMBEDDED  
 //US add teh nullcheck      
      if (px->isNull() != true )
        photo.setData( px->convertToImage() );
 #endif //KAB_EMBEDDED  
      photo.setType( "PNG" );
    }
  }
  return photo;
 }
 void ImageWidget::setLogo( const KABC::Picture &logo )
 {
  bool blocked = signalsBlocked();
  blockSignals( true );
  if ( logo.isIntern() ) {
 //US
 //US    mLogoLabel->setPixmap( logo.data() );
    if (logo.data().isNull() != true)
    {
      QPixmap pm;
      pm.convertFromImage(logo.data()); 
      mLogoLabel->setPixmap( pm );
    }
    mUseLogoUrl->setChecked( false );
  } else {
    mLogoUrl->setURL( logo.url() );
    if ( !logo.url().isEmpty() )
      mUseLogoUrl->setChecked( true );
    loadLogo();
  }
  blockSignals( blocked );
 }
 KABC::Picture ImageWidget::logo() const
 {
  KABC::Picture logo;
  if ( mUseLogoUrl->isChecked() )
    logo.setUrl( mLogoUrl->url() );
  else {
    QPixmap *px = mLogoLabel->pixmap();
    if ( px ) {
 #ifndef KAB_EMBEDDED  
      if ( px->height() > px->width() )
        logo.setData( px->convertToImage().scaleHeight( 140 ) );
      else
        logo.setData( px->convertToImage().scaleWidth( 100 ) );
 #else //KAB_EMBEDDED  
      logo.setData( px->convertToImage() );
 #endif //KAB_EMBEDDED  
      logo.setType( "PNG" );
      
    }
  }
  return logo;
 }
+void ImageWidget::removePhoto()
+{
+    setPhoto(KABC::Picture() );
+}
+void ImageWidget::removeLogo()
+{
+    setLogo(KABC::Picture() );
+}
 void ImageWidget::loadPhoto()
 {
  mPhotoLabel->setPixmap( loadPixmap( mPhotoUrl->url() ) );
 }
 void ImageWidget::loadLogo()
 {
  mLogoLabel->setPixmap( loadPixmap( mLogoUrl->url() ) );
 }
 void ImageWidget::updateGUI()
 {
  KURLRequester *ptr = (KURLRequester*)sender();
  if ( ptr == mPhotoUrl )
    mUsePhotoUrl->setEnabled( true );
  else if ( ptr == mLogoUrl )
    mUseLogoUrl->setEnabled( true );
 }
 QPixmap ImageWidget::loadPixmap( const KURL &url )
 {
  QString tempFile;
  QPixmap pixmap;
  if ( url.isEmpty() )
    return pixmap;
  
  if ( url.isLocalFile() )
    pixmap = QPixmap( url.path() );
  else
  {
 #ifndef KAB_EMBEDDED
    if ( KIO::NetAccess::download( url, tempFile ) ) {
      pixmap = QPixmap( tempFile );
    KIO::NetAccess::removeTempFile( tempFile );
    }
 #else //KAB_EMBEDDED
  qDebug("ImageWidget::loadPixmap : only local pixmaps are allowed");
 #endif //KAB_EMBEDDED
    
  }
  return pixmap;
 }
 #ifndef KAB_EMBEDDED
 #include "imagewidget.moc"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/imagewidget.h b/kaddressbook/imagewidget.h
index b3ca0bd..afb9aa7 100644
--- a/kaddressbook/imagewidget.h
+++ b/kaddressbook/imagewidget.h
@@ -1,86 +1,88 @@
 /*                                                                      
    This file is part of KAddressBook.                                  
    Copyright (c) 2003 Tobias Koenig <tokoe@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 IMAGEWIDGET_H
 #define IMAGEWIDGET_H
 #include <qwidget.h>
 #include <kabc/picture.h>
 #include <kdialogbase.h>
 class KURL;
 class KURLRequester;
 class QCheckBox;
 class QLabel;
 class ImageWidget : public QWidget
 {
  Q_OBJECT
  public:
    ImageWidget( QWidget *parent, const char *name = 0 );
    ~ImageWidget();
    /**
      Sets the photo object.
     */
    void setPhoto( const KABC::Picture &photo );
    /**
      Returns a photo object.
     */
    KABC::Picture photo() const;
    /**
      Sets the logo object.
     */
    void setLogo( const KABC::Picture &photo );
    /**
      Returns a logo object.
     */
    KABC::Picture logo() const;
  signals:
    void changed();
  private slots:
    void loadPhoto();
    void loadLogo();
+    void removePhoto();
+    void removeLogo();
    void updateGUI();
  private:
    QPixmap loadPixmap( const KURL &url );
    KURLRequester *mPhotoUrl;
    KURLRequester *mLogoUrl;
    QCheckBox *mUsePhotoUrl;
    QCheckBox *mUseLogoUrl;
    QLabel *mPhotoLabel;
    QLabel *mLogoLabel;
 };
 #endif