made kapi saving faster

15 files changed, 133 insertions, 88 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 2fd63e7..ff87423 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,266 +1,280 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
 ********** 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.
 
 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.
+
+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
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index 3ce733d..568dfc4 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -1430,575 +1430,577 @@ void Addressee::setNameFromString( const QString &str )
 }
 
 QString Addressee::realName() const
 {
   if ( !formattedName().isEmpty() )
     return formattedName();
 
   QString n = assembledName();
 
   if ( n.isEmpty() )
     n = name();
 
   return n;
 }
 
 QString Addressee::assembledName() const
 {
   QString name = prefix() + " " + givenName() + " " + additionalName() + " " +
               familyName() + " " + suffix();
 
   return name.simplifyWhiteSpace();
 }
 
 QString Addressee::fullEmail( const QString &email ) const
 {
   QString e;
   if ( email.isNull() ) {
     e = preferredEmail();
   } else {
     e = email;
   }
   if ( e.isEmpty() ) return QString::null;
 
   QString text;
   if ( realName().isEmpty() )
     text = e;
   else
     text = assembledName() + " <" + e + ">";
 
   return text;
 }
 
 void Addressee::insertEmail( const QString &email, bool preferred )
 {
   detach();
 
   QStringList::Iterator it = mData->emails.find( email );
 
   if ( it != mData->emails.end() ) {
     if ( !preferred || it == mData->emails.begin() ) return;
     mData->emails.remove( it );
     mData->emails.prepend( email );
   } else {
     if ( preferred ) {
       mData->emails.prepend( email );
     } else {
       mData->emails.append( email );
     }
   }
 }
 
 void Addressee::removeEmail( const QString &email )
 {
   detach();
 
   QStringList::Iterator it = mData->emails.find( email );
   if ( it == mData->emails.end() ) return;
 
   mData->emails.remove( it );
 }
 
 QString Addressee::preferredEmail() const
 {
   if ( mData->emails.count() == 0 ) return QString::null;
   else return mData->emails.first();
 }
 
 QStringList Addressee::emails() const
 {
   return mData->emails;
 }
 void Addressee::setEmails( const QStringList& emails ) {
     detach();
     mData->emails = emails;
 }
 void Addressee::insertPhoneNumber( const PhoneNumber &phoneNumber )
 {
   detach();
   mData->empty = false;
 
   PhoneNumber::List::Iterator it;
   for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
     if ( (*it).id() == phoneNumber.id() ) {
       *it = phoneNumber;
       return;
     }
   }
   mData->phoneNumbers.append( phoneNumber );
 }
 
 void Addressee::removePhoneNumber( const PhoneNumber &phoneNumber )
 {
   detach();
 
   PhoneNumber::List::Iterator it;
   for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
     if ( (*it).id() == phoneNumber.id() ) {
       mData->phoneNumbers.remove( it );
       return;
     }
   }
 }
 
 PhoneNumber Addressee::phoneNumber( int type ) const
 {
   PhoneNumber phoneNumber( "", type );
   PhoneNumber::List::ConstIterator it;
   for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
     if ( matchBinaryPatternP( (*it).type(), type ) ) {
       if ( (*it).type() & PhoneNumber::Pref )
         return (*it);
       else if ( phoneNumber.number().isEmpty() )
         phoneNumber = (*it);
     }
   }
 
   return phoneNumber;
 }
 
 PhoneNumber::List Addressee::phoneNumbers() const
 {
   return mData->phoneNumbers;
 }
 
 PhoneNumber::List Addressee::phoneNumbers( int type ) const
 {
   PhoneNumber::List list;
 
   PhoneNumber::List::ConstIterator it;
   for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
     if ( matchBinaryPattern( (*it).type(), type ) ) {
       list.append( *it );
     }
   }
   return list;
 }
 
 PhoneNumber Addressee::findPhoneNumber( const QString &id ) const
 {
   PhoneNumber::List::ConstIterator it;
   for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
     if ( (*it).id() == id ) {
       return *it;
     }
   }
   return PhoneNumber();
 }
 
 void Addressee::insertKey( const Key &key )
 {
   detach();
   mData->empty = false;
 
   Key::List::Iterator it;
   for( it = mData->keys.begin(); it != mData->keys.end(); ++it ) {
     if ( (*it).id() == key.id() ) {
       *it = key;
       return;
     }
   }
   mData->keys.append( key );
 }
 
 void Addressee::removeKey( const Key &key )
 {
   detach();
 
   Key::List::Iterator it;
   for( it = mData->keys.begin(); it != mData->keys.end(); ++it ) {
     if ( (*it).id() == key.id() ) {
       mData->keys.remove( key );
       return;
     }
   }
 }
 
 Key Addressee::key( int type, QString customTypeString ) const
 {
   Key::List::ConstIterator it;
   for( it = mData->keys.begin(); it != mData->keys.end(); ++it ) {
     if ( (*it).type() == type ) {
       if ( type == Key::Custom ) {
         if ( customTypeString.isEmpty() ) {
           return *it;
         } else {
           if ( (*it).customTypeString() == customTypeString )
             return (*it);
         }
       } else {
         return *it;
       }
     }
   }
   return Key( QString(), type );
 }
 void Addressee::setKeys( const Key::List& list ) {
     detach();
     mData->keys = list;
 }
 
 Key::List Addressee::keys() const
 {
   return mData->keys;
 }
 
 Key::List Addressee::keys( int type, QString customTypeString ) const
 {
   Key::List list;
 
   Key::List::ConstIterator it;
   for( it = mData->keys.begin(); it != mData->keys.end(); ++it ) {
     if ( (*it).type() == type ) {
       if ( type == Key::Custom ) {
         if ( customTypeString.isEmpty() ) {
           list.append(*it);
         } else {
           if ( (*it).customTypeString() == customTypeString )
             list.append(*it);
         }
       } else {
         list.append(*it);
       }
     }
   }
   return list;
 }
 
 Key Addressee::findKey( const QString &id ) const
 {
   Key::List::ConstIterator it;
   for( it = mData->keys.begin(); it != mData->keys.end(); ++it ) {
     if ( (*it).id() == id ) {
       return *it;
     }
   }
   return Key();
 }
 
 QString Addressee::asString() const
 {
   return "Smith, agent Smith...";
 }
 
 void Addressee::dump() const
 {
     return;
+#if 0 
   kdDebug(5700) << "Addressee {" << endl;
 
   kdDebug(5700) << "  Uid: '" << uid() << "'" << endl;
 
   kdDebug(5700) << "  Name: '" << name() << "'" << endl;
   kdDebug(5700) << "  FormattedName: '" << formattedName() << "'" << endl;
   kdDebug(5700) << "  FamilyName: '" << familyName() << "'" << endl;
   kdDebug(5700) << "  GivenName: '" << givenName() << "'" << endl;
   kdDebug(5700) << "  AdditionalName: '" << additionalName() << "'" << endl;
   kdDebug(5700) << "  Prefix: '" << prefix() << "'" << endl;
   kdDebug(5700) << "  Suffix: '" << suffix() << "'" << endl;
   kdDebug(5700) << "  NickName: '" << nickName() << "'" << endl;
   kdDebug(5700) << "  Birthday: '" << birthday().toString() << "'" << endl;
   kdDebug(5700) << "  Mailer: '" << mailer() << "'" << endl;
   kdDebug(5700) << "  TimeZone: '" << timeZone().asString() << "'" << endl;
   kdDebug(5700) << "  Geo: '" << geo().asString() << "'" << endl;
   kdDebug(5700) << "  Title: '" << title() << "'" << endl;
   kdDebug(5700) << "  Role: '" << role() << "'" << endl;
   kdDebug(5700) << "  Organization: '" << organization() << "'" << endl;
   kdDebug(5700) << "  Note: '" << note() << "'" << endl;
   kdDebug(5700) << "  ProductId: '" << productId() << "'" << endl;
   kdDebug(5700) << "  Revision: '" << revision().toString() << "'" << endl;
   kdDebug(5700) << "  SortString: '" << sortString() << "'" << endl;
   kdDebug(5700) << "  Url: '" << url().url() << "'" << endl;
   kdDebug(5700) << "  Secrecy: '" << secrecy().asString() << "'" << endl;
   kdDebug(5700) << "  Logo: '" << logo().asString() << "'" << endl;
   kdDebug(5700) << "  Photo: '" << photo().asString() << "'" << endl;
   kdDebug(5700) << "  Sound: '" << sound().asString() << "'" << endl;
   kdDebug(5700) << "  Agent: '" << agent().asString() << "'" << endl;
 
   kdDebug(5700) << "  Emails {" << endl;
   QStringList e = emails();
   QStringList::ConstIterator it;
   for( it = e.begin(); it != e.end(); ++it ) {
     kdDebug(5700) << "    " << (*it) << endl;
   }
   kdDebug(5700) << "  }" << endl;
 
   kdDebug(5700) << "  PhoneNumbers {" << endl;
   PhoneNumber::List p = phoneNumbers();
   PhoneNumber::List::ConstIterator it2;
   for( it2 = p.begin(); it2 != p.end(); ++it2 ) {
     kdDebug(5700) << "    Type: " << int((*it2).type()) << " Number: " << (*it2).number() << endl;
   }
   kdDebug(5700) << "  }" << endl;
 
   Address::List a = addresses();
   Address::List::ConstIterator it3;
   for( it3 = a.begin(); it3 != a.end(); ++it3 ) {
     (*it3).dump();
   }
 
   kdDebug(5700) << "  Keys {" << endl;
   Key::List k = keys();
   Key::List::ConstIterator it4;
   for( it4 = k.begin(); it4 != k.end(); ++it4 ) {
     kdDebug(5700) << "    Type: " << int((*it4).type()) <<
                      " Key: " << (*it4).textData() <<
                      " CustomString: " << (*it4).customTypeString() << endl;
   }
   kdDebug(5700) << "  }" << endl;
 
   kdDebug(5700) << "}" << endl;
+#endif 
 }
 
 
 void Addressee::insertAddress( const Address &address )
 {
   detach();
   mData->empty = false;
 
   Address::List::Iterator it;
   for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) {
     if ( (*it).id() == address.id() ) {
       *it = address;
       return;
     }
   }
   mData->addresses.append( address );
 }
 
 void Addressee::removeAddress( const Address &address )
 {
   detach();
 
   Address::List::Iterator it;
   for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) {
     if ( (*it).id() == address.id() ) {
       mData->addresses.remove( it );
       return;
     }
   }
 }
 
 Address Addressee::address( int type ) const
 {
   Address address( type );
   Address::List::ConstIterator it;
   for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) {
     if ( matchBinaryPatternA( (*it).type(), type ) ) {
       if ( (*it).type() & Address::Pref )
         return (*it);
       else if ( address.isEmpty() )
         address = (*it);
     }
   }
 
   return address;
 }
 
 Address::List Addressee::addresses() const
 {
   return mData->addresses;
 }
 
 Address::List Addressee::addresses( int type ) const
 {
   Address::List list;
 
   Address::List::ConstIterator it;
   for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) {
     if ( matchBinaryPattern( (*it).type(), type ) ) {
       list.append( *it );
     }
   }
 
   return list;
 }
 
 Address Addressee::findAddress( const QString &id ) const
 {
   Address::List::ConstIterator it;
   for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) {
     if ( (*it).id() == id ) {
       return *it;
     }
   }
   return Address();
 }
 
 void Addressee::insertCategory( const QString &c )
 {
   detach();
   mData->empty = false;
 
   if ( mData->categories.contains( c ) ) return;
 
   mData->categories.append( c );
 }
 
 void Addressee::removeCategory( const QString &c )
 {
   detach();
 
   QStringList::Iterator it = mData->categories.find( c );
   if ( it == mData->categories.end() ) return;
 
   mData->categories.remove( it );
 }
 
 bool Addressee::hasCategory( const QString &c ) const
 {
   return ( mData->categories.contains( c ) );
 }
 
 void Addressee::setCategories( const QStringList &c )
 {
   detach();
   mData->empty = false;
 
   mData->categories = c;
 }
 
 QStringList Addressee::categories() const
 {
   return mData->categories;
 }
 
 void Addressee::insertCustom( const QString &app, const QString &name,
                               const QString &value )
 {
   if ( value.isNull() || name.isEmpty() || app.isEmpty() ) return;
 
   detach();
   mData->empty = false;
 
   QString qualifiedName = app + "-" + name + ":";
 
   QStringList::Iterator it;
   for( it = mData->custom.begin(); it != mData->custom.end(); ++it ) {
     if ( (*it).startsWith( qualifiedName ) ) {
       (*it) = qualifiedName + value; 
       return;
     }
   }
   mData->custom.append( qualifiedName + value );
 }
 
 void Addressee::removeCustom( const QString &app, const QString &name)
 {
   detach();
 
   QString qualifiedName = app + "-" + name + ":";
 
   QStringList::Iterator it;
   for( it = mData->custom.begin(); it != mData->custom.end(); ++it ) {
     if ( (*it).startsWith( qualifiedName ) ) {
       mData->custom.remove( it );
       return;
     }
   }
 }
 
 QString Addressee::custom( const QString &app, const QString &name ) const
 {
   QString qualifiedName = app + "-" + name + ":";
   QString value;
 
   QStringList::ConstIterator it;
   for( it = mData->custom.begin(); it != mData->custom.end(); ++it ) {
     if ( (*it).startsWith( qualifiedName ) ) {
       value = (*it).mid( (*it).find( ":" ) + 1 );
       break;
     }
   }
 
   return value;
 }
 
 void Addressee::setCustoms( const QStringList &l )
 {
   detach();
   mData->empty = false;
 
   mData->custom = l;
 }
 
 QStringList Addressee::customs() const
 {
   return mData->custom;
 }
 
 void Addressee::parseEmailAddress( const QString &rawEmail, QString &fullName,
                                    QString &email)
 {
   int startPos, endPos, len;
   QString partA, partB, result;
   char endCh = '>';
 
   startPos = rawEmail.find('<');
   if (startPos < 0)
   {
     startPos = rawEmail.find('(');
     endCh = ')';
   }
   if (startPos < 0)
   {
     // We couldn't find any separators, so we assume the whole string
     // is the email address
     email = rawEmail;
     fullName = "";
   }
   else
   {
     // We have a start position, try to find an end
     endPos = rawEmail.find(endCh, startPos+1);
 
     if (endPos < 0)
     {
       // We couldn't find the end of the email address. We can only
       // assume the entire string is the email address.
       email = rawEmail;
       fullName = "";
     }
     else
     {
       // We have a start and end to the email address
 
       // Grab the name part
       fullName = rawEmail.left(startPos).stripWhiteSpace();
 
       // grab the email part
       email = rawEmail.mid(startPos+1, endPos-startPos-1).stripWhiteSpace();
 
       // Check that we do not have any extra characters on the end of the
       // strings
       len = fullName.length();
       if (fullName[0]=='"' && fullName[len-1]=='"')
         fullName = fullName.mid(1, len-2);
       else if (fullName[0]=='<' && fullName[len-1]=='>')
         fullName = fullName.mid(1, len-2);
       else if (fullName[0]=='(' && fullName[len-1]==')')
         fullName = fullName.mid(1, len-2);
     }
   }
 }
 
 void Addressee::setResource( Resource *resource )
 {
     detach();
     mData->resource = resource;
 }
 
 Resource *Addressee::resource() const
 {
     return mData->resource;
 }
 
 //US
 QString Addressee::resourceLabel()
 {
   return i18n("Resource");
 }
 QString Addressee::categoryLabel()
 {
   return i18n("Category");
 }
 
 void Addressee::setChanged( bool value )
diff --git a/kabc/picture.cpp b/kabc/picture.cpp
index 6a34b98..57aa297 100644
--- a/kabc/picture.cpp
+++ b/kabc/picture.cpp
@@ -1,141 +1,167 @@
 /*
     This file is part of libkabc.
     Copyright (c) 2002 Tobias Koenig <tokoe@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.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include "picture.h"
 
 using namespace KABC;
 
 Picture::Picture()
   : mIntern( false )
 {
   mUndefined = true;
 }
 
 Picture::Picture( const QString &url )
   : mUrl( url ), mIntern( false )
 {
   mUndefined = false;
 }
 
 Picture::Picture( const QImage &data )
   : mData( data ), mIntern( true )
 {
   mUndefined = false;
 }
 
 Picture::~Picture()
 {
 }
 
 bool Picture::operator==( const Picture &p ) const
 {
-  if ( mIntern != p.mIntern ) return false;
-
+    //qDebug("compare PIC ");
+    if ( mUndefined && p.mUndefined ) {
+        //qDebug("compare PIC true 1 ");
+        return true;
+    }
+    if ( mUndefined || p.mUndefined ) {
+        //qDebug("compare PIC false 1");
+         return false;
+    }
+    // now we should deal with two defined pics!
+    if ( mIntern != p.mIntern ) {
+        //qDebug("compare PIC false 2");
+        return false;
+    }
   if ( mIntern ) {
-    if ( mData != p.mData )
+      //qDebug("mIntern ");
+      if ( mData.isNull() && p.mData.isNull() ) {
+          //qDebug("compare PIC true 2 ");
+          return true;
+      }
+      if ( mData.isNull() || p.mData.isNull() ){
+          //qDebug("compare PIC false 3-1");
+
+          return false;
+      }
+      if ( mData != p.mData ) {
+          //qDebug("compare PIC false 3");
       return false;
+      }
   } else {
-    if ( mUrl != p.mUrl )
-      return false;
+      if ( mUrl != p.mUrl ) {
+          //qDebug("compare PIC false 4");
+          return false;
+      }
   }
-
+  //qDebug("compare PIC true ");
   return true;
 }
 
 bool Picture::operator!=( const Picture &p ) const
 {
   return !( p == *this );
 }
 
 void Picture::setUrl( const QString &url )
 {
   mUrl = url;
   mIntern = false;
   mUndefined = false;
 }
 
 void Picture::setData( const QImage &data )
 {
   mData = data;
   mIntern = true;
   mUndefined = false;
 }
 
 void Picture::setType( const QString &type )
 {
   mType = type;
 }
 
 bool Picture::isIntern() const
 {
   return mIntern;
 }
 
 QString Picture::url() const
 {
   return mUrl;
 }
 
 QImage Picture::data() const
 {
   return mData;
 }
 QPixmap Picture::pixmap() const
 {
     QPixmap p;
     p.convertFromImage ( mData );
     return p;
 }
 
 QString Picture::type() const
 {
   return mType;
 }
 bool Picture::undefined() const
 {
   return mUndefined;
 }
  
 
 QString Picture::asString() const
 {
   if ( mIntern )
     return "intern picture";
   else
     return mUrl;
 }
 
 QDataStream &KABC::operator<<( QDataStream &s, const Picture &picture )
 {
   return s << picture.mIntern << picture.mUrl << picture.mType << picture.mData;
 }
 
 QDataStream &KABC::operator>>( QDataStream &s, Picture &picture )
 {
   s >> picture.mIntern >> picture.mUrl >> picture.mType >> picture.mData;
   return s;
 }
diff --git a/kabc/vcard/ContentLine.cpp b/kabc/vcard/ContentLine.cpp
index c368172..2f88cde 100644
--- a/kabc/vcard/ContentLine.cpp
+++ b/kabc/vcard/ContentLine.cpp
@@ -20,302 +20,330 @@
   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include <qcstring.h>
 #include <qstrlist.h>
 #include <qregexp.h>
 
 #include <kdebug.h>
 
 #include <VCardAdrParam.h>
 #include <VCardAgentParam.h>
 #include <VCardDateParam.h>
 #include <VCardEmailParam.h>
 #include <VCardImageParam.h>
 #include <VCardSourceParam.h>
 #include <VCardTelParam.h>
 #include <VCardTextBinParam.h>
 #include <VCardTextParam.h>
 
 #include <VCardAdrValue.h>
 #include <VCardAgentValue.h>
 #include <VCardDateValue.h>
 #include <VCardImageValue.h>
 #include <VCardTextValue.h>
 #include <VCardTextBinValue.h>
 #include <VCardLangValue.h>
 #include <VCardNValue.h>
 #include <VCardURIValue.h>
 #include <VCardSoundValue.h>
 #include <VCardClassValue.h>
 #include <VCardFloatValue.h>
 #include <VCardOrgValue.h>
 #include <VCardTelValue.h>
 #include <VCardTextListValue.h>
 #include <VCardUTCValue.h>
 #include <VCardGeoValue.h>
 
 #include <VCardRToken.h>
 #include <VCardContentLine.h>
 
 #include <VCardEntity.h>
 #include <VCardEnum.h>
 #include <VCardDefines.h>
 
 using namespace VCARD;
 
 ContentLine::ContentLine()
                 :Entity(),
                 value_(0),
                 paramType_( ParamUnknown ),
                 valueType_( ValueUnknown ),
                 entityType_( EntityUnknown )
 {
   paramList_.setAutoDelete( TRUE );
 }
 
 ContentLine::ContentLine(const ContentLine & x)
                 :Entity(x),
                 group_ (x.group_),
                 name_ (x.name_),
         /*US    paramList_(x.paramList_),*/
                 value_(x.value_->clone()),
                 paramType_(x.paramType_),
                 valueType_(x.valueType_),
                 entityType_(x.entityType_)
 {
   paramList_.setAutoDelete( TRUE );
 
 
   ParamListIterator it(x.paramList_);
   for (; it.current(); ++it)
   {
     Param *p = new Param;
         p->setName( it.current()->name() );
         p->setValue( it.current()->value() );
     paramList_.append(p);
   }
 
 }
 
 ContentLine::ContentLine(const QCString & s)
                 :Entity(s),
                 value_(0),
                 paramType_( ParamUnknown ),
                 valueType_( ValueUnknown ),
                 entityType_( EntityUnknown )
 {
   paramList_.setAutoDelete( TRUE );
 }
 
         ContentLine &
 ContentLine::operator = (ContentLine & x)
 {
         if (*this == x) return *this;
 
     ParamListIterator it(x.paramList_);
     for (; it.current(); ++it)
     {
       Param *p = new Param;
       p->setName( it.current()->name() );
       p->setValue( it.current()->value() );
       paramList_.append(p);
     }
 
         value_ = x.value_->clone();
 
         Entity::operator = (x);
         return *this;
 }
 
         ContentLine &
 ContentLine::operator = (const QCString & s)
 {
         Entity::operator = (s);
         delete value_;
         value_ = 0;
         return *this;
 }
 
         bool
 ContentLine::operator == (ContentLine & x)
 {
         x.parse();
 
         QPtrListIterator<Param> it(x.paramList());
 
         if (!paramList_.find(it.current()))
                 return false;
 
         return true;
 }
 
 ContentLine::~ContentLine()
 {
         delete value_;
         value_ = 0;
 }
 
         void
 ContentLine::_parse()
 {
         vDebug("parse");
 
         // Unqote newlines
         strRep_ = strRep_.replace( QRegExp( "\\\\n" ), "\n" );
 
         int split = strRep_.find(':');
 
         if (split == -1) { // invalid content line
                 vDebug("No ':'");
                 return;
         }
 
         QCString firstPart(strRep_.left(split));
         QCString valuePart(strRep_.mid(split + 1));
 
         split = firstPart.find('.');
 
         if (split != -1) {
                         group_  = firstPart.left(split);
                         firstPart= firstPart.mid(split + 1);
         }
 
         vDebug("Group == " + group_);
         vDebug("firstPart == " + firstPart);
         vDebug("valuePart == " + valuePart);
 
         // Now we have the group, the name and param list together and the value.
 
         QStrList l;
 
         RTokenise(firstPart, ";", l);
 
         if (l.count() == 0) {// invalid - no name !
                 vDebug("No name for this content line !");
                 return;
         }
 
         name_ = l.at(0);
 
         // Now we have the name, so the rest of 'l' is the params.
         // Remove the name part.
         l.remove(0u);
 
                 entityType_= EntityNameToEntityType(name_);
                 paramType_= EntityTypeToParamType(entityType_);
 
         unsigned int i = 0;
 
         // For each parameter, create a new parameter of the correct type.
 
         QStrListIterator it(l);
 
         for (; it.current(); ++it, i++) {
 
                 QCString str = *it;
 
                 split = str.find("=");
                 if (split < 0 ) {
                         vDebug("No '=' in paramter.");
                         continue;
                 }
 
                 QCString paraName = str.left(split);
                 QCString paraValue = str.mid(split + 1);
 
                 QStrList paraValues;
                 RTokenise(paraValue, ",", paraValues);
 
                 QStrListIterator it2( paraValues );
 
                 for(; it2.current(); ++it2) {
 
                         Param *p = new Param;
                         p->setName( paraName );
                         p->setValue( *it2 );
 
                         paramList_.append(p);
                 }
         }
 
         // Create a new value of the correct type.
 
         valueType_ = EntityTypeToValueType(entityType_);
 
         //kdDebug(5710) << "valueType: " << valueType_ << endl;
 
         switch (valueType_) {
 
                         case ValueSound:        value_ = new SoundValue;break;
                         case ValueAgent:        value_ = new AgentValue;break;
                         case ValueAddress:      value_ = new AdrValue;  break;
                         case ValueTel:          value_ = new TelValue;  break;
                         case ValueTextBin:      value_ = new TextBinValue;break;
                         case ValueOrg:          value_ = new OrgValue;  break;
                         case ValueN:            value_ = new NValue;    break;
                         case ValueUTC:          value_ = new UTCValue;  break;
                         case ValueURI:          value_ = new URIValue;  break;
                         case ValueClass:        value_ = new ClassValue;break;
                         case ValueFloat:        value_ = new FloatValue;break;
                         case ValueImage:        value_ = new ImageValue;break;
                         case ValueDate:                 value_ = new DateValue;         break;
                         case ValueTextList:     value_ = new TextListValue;break;
                         case ValueGeo:          value_ = new GeoValue;  break;
                 case ValueText:
                 case ValueUnknown:
                         default:                value_ = new TextValue;         break;
         }
 
         *value_ = valuePart;
 }
 
         void
 ContentLine::_assemble()
 {
+        //strRep_.truncate(0);
+        QString line;
+        if (!group_.isEmpty())
+                line = group_ + '.';
+        line += name_;
+        ParamListIterator it(paramList_);
+        for (; it.current(); ++it)
+                line += ";" + it.current()->asString();
+
+        if (value_ != 0)
+                line += ":" + value_->asString();
+
+        line = line.replace( QRegExp( "\n" ), "\\n" );
+
+        // Fold lines longer than 72 chars
+        const int maxLen = 72;
+        uint cursor = 0;
+    QString cut;
+        while( line.length() > ( cursor + 1 ) * maxLen ) {
+                cut += line.mid( cursor * maxLen, maxLen );
+                cut += "\r\n ";
+                ++cursor;
+        }
+        cut += line.mid( cursor * maxLen );
+    strRep_ = cut.latin1();
+    //qDebug("ContentLine::_assemble()\n%s*****", strRep_.data());
+#if 0
         vDebug("Assemble (argl) - my name is \"" + name_ + "\"");
         strRep_.truncate(0);
 
         QCString line;
 
         if (!group_.isEmpty())
                 line += group_ + '.';
 
         line += name_;
 
         vDebug("Adding parameters");
         ParamListIterator it(paramList_);
 
         for (; it.current(); ++it)
                 line += ";" + it.current()->asString();
 
         vDebug("Adding value");
         if (value_ != 0)
                 line += ":" + value_->asString();
         else
                 vDebug("No value");
 
         // Quote newlines
         line = line.replace( QRegExp( "\n" ), "\\n" );
 
         // Fold lines longer than 72 chars
         const int maxLen = 72;
         uint cursor = 0;
         while( line.length() > ( cursor + 1 ) * maxLen ) {
                 strRep_ += line.mid( cursor * maxLen, maxLen );
                 strRep_ += "\r\n ";
                 ++cursor;
         }
         strRep_ += line.mid( cursor * maxLen );
-    //qDebug("ContentLine::_assemble()\n%s*****", strRep_.data());
+    qDebug("ContentLine::_assemble()\n%s*****", strRep_.data());
+#endif
 }
 
         void
 ContentLine::clear()
 {
         group_.truncate(0);
         name_.truncate(0);
         paramList_.clear();
         delete value_;
         value_ = 0;
 }
diff --git a/kabc/vcard/VCardv.cpp b/kabc/vcard/VCardv.cpp
index bc80707..49bfe43 100644
--- a/kabc/vcard/VCardv.cpp
+++ b/kabc/vcard/VCardv.cpp
@@ -1,299 +1,294 @@
 /*
         libvcard - vCard parsing library for vCard version 3.0
 
         Copyright (C) 1998 Rik Hemsley rik@kde.org
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to
   deal in the Software without restriction, including without limitation the
   rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
   sell copies of the Software, and to permit persons to whom the Software is
   furnished to do so, subject to the following conditions:
 
   The above copyright notice and this permission notice shall be included in
   all copies or substantial portions of the Software.
 
   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
   AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include <qcstring.h>
 #include <qstrlist.h>
+#include <qstringlist.h>
+#include <qstring.h>
+#include <qvaluelist.h>
 
 #include <VCardEntity.h>
 #include <VCardVCard.h>
 #include <VCardContentLine.h>
 #include <VCardRToken.h>
 
 #include <VCardDefines.h>
 
 using namespace VCARD;
 
 VCard::VCard()
                 :Entity()
 {
   contentLineList_.setAutoDelete( TRUE );
 }
 
 VCard::VCard(const VCard & x)
                 :Entity(x),
                 group_(x.group_)
 {
   contentLineList_.setAutoDelete( TRUE );
 
   QPtrListIterator<ContentLine> it(x.contentLineList_);
   for (; it.current(); ++it) {
     ContentLine * c = new ContentLine(*it.current());
     contentLineList_.append(c);
   }
 
 }
 
 VCard::VCard(const QCString & s)
                 :Entity(s)
 {
   contentLineList_.setAutoDelete( TRUE );
 }
 
         VCard &
 VCard::operator = (VCard & x)
 {
         if (*this == x) return *this;
 
                 group_                  = x.group();
     QPtrListIterator<ContentLine> it(x.contentLineList_);
     for (; it.current(); ++it) {
       ContentLine * c = new ContentLine(*it.current());
       contentLineList_.append(c);
     }
 
         Entity::operator = (x);
         return *this;
 }
 
         VCard &
 VCard::operator = (const QCString & s)
 {
         Entity::operator = (s);
         return *this;
 }
 
         bool
 VCard::operator == (VCard & x)
 {
         x.parse();
         return false;
 }
 
 VCard::~VCard()
 {
 }
 
         void
 VCard::_parse()
 {
-        vDebug("parse() called");
-        QStrList l;
+        
+        QStringList l;
+        QStrList sl;
 
-        RTokenise(strRep_, "\r\n", l);
+        RTokenise(strRep_, "\r\n", sl);
 
-        if (l.count() < 3) { // Invalid VCARD !
-                vDebug("Invalid vcard");
+        if (sl.count() < 3) { // Invalid VCARD !
+        //qDebug("invalid vcard ");
                 return;
         }
-
+    l = QStringList::fromStrList( sl );
         // Get the first line
-        QCString beginLine = QCString(l.at(0)).stripWhiteSpace();
-
-        vDebug("Begin line == \"" + beginLine + "\"");
+        QString beginLine = l[0].stripWhiteSpace();
 
         // Remove extra blank lines
-        while (QCString(l.last()).isEmpty())
+        while (l.last().isEmpty())
                 l.remove(l.last());
 
         // Now we know this is the last line
-        QCString endLine = l.last();
+        QString endLine = l.last();
 
         // Trash the first and last lines as we have seen them.
-        l.remove(0u);
+        l.remove(l.first());
         l.remove(l.last());
 
         ///////////////////////////////////////////////////////////////
         // FIRST LINE
 
         int split = beginLine.find(':');
 
         if (split == -1) { // invalid, no BEGIN
                 vDebug("No split");
                 return;
         }
 
-        QCString firstPart(beginLine.left(split));
-        QCString valuePart(beginLine.mid(split + 1));
+        QString firstPart(beginLine.left(split));
+        QString valuePart(beginLine.mid(split + 1));
 
         split = firstPart.find('.');
 
         if (split != -1) {
                         group_  = firstPart.left(split);
                         firstPart= firstPart.right(firstPart.length() - split - 1);
         }
 
-        if (qstrnicmp(firstPart, "BEGIN", 5) != 0) { // No BEGIN !
-                vDebug("No BEGIN");
+        if (firstPart.left(5) != "BEGIN" ) { // No BEGIN !
+                qDebug("no BEGIN in vcard ");
                 return;
         }
 
-        if (qstrnicmp(valuePart, "VCARD", 5) != 0) { // Not a vcard !
-                vDebug("No VCARD");
+        if (valuePart.left(5) != "VCARD") { // Not a vcard !
+                qDebug("not a VCARD  ");
                 return;
         }
 
         ///////////////////////////////////////////////////////////////
         // CONTENT LINES
         //
         vDebug("Content lines");
 
         // Handle folded lines.
 
-        QStrList refolded;
-
-        QStrListIterator it(l);
+        QStringList refolded;
 
-        QCString cur;
 
-        for (; it.current(); ++it) {
+    QStringList::Iterator it =  l.begin(); 
 
-                cur = it.current();
+        QString cur;
 
+        for (; it != l.end(); ++it) {
+                cur = (*it);
                 ++it;
-
-                while (
-                                it.current()    &&
-                                it.current()[0] == ' '&&
-                        strlen(it.current()) != 1)
-                {
-                        cur += it.current() + 1;
+                        while ( it!= l.end() && (*it).at(0) == ' '&& (*it).length()!= 1) {
+                        cur += (*it) ;
                         ++it;
                 }
-
                 --it;
-
                 refolded.append(cur);
         }
-
-        QStrListIterator it2(refolded);
-
-        for (; it2.current(); ++it2) {
-          vDebug("New contentline using \"" + QCString(it2.current()) + "\"");
-                ContentLine * cl = new ContentLine(it2.current());
-
+    QStringList::Iterator it2 = refolded.begin();
+        for (; it2 != refolded.end(); ++it2) {
+                ContentLine * cl = new ContentLine(QCString((*it2).latin1()));
                 cl->parse();
                 if (cl->value() == 0)
                 {
-                    qDebug("Content line could not be parsed. Discarded: %s", it2.current());
+                    qDebug("Content line could not be parsed. Discarded: %s", (*it2).latin1());
                     delete cl;
                 }
                 else
                   contentLineList_.append(cl);
         }
 
         ///////////////////////////////////////////////////////////////
         // LAST LINE
 
+
+        // LR: sorry, but the remaining code in this method makes no sense
+
+#if 0
         split = endLine.find(':');
 
         if (split == -1) // invalid, no END
                 return;
 
         firstPart = endLine.left(split);
         valuePart = endLine.right(firstPart.length() - split - 1);
 
         split = firstPart.find('.');
 
         if (split != -1) {
                         group_  = firstPart.left(split);
                         firstPart= firstPart.right(firstPart.length() - split - 1);
         }
 
         if (qstricmp(firstPart, "END") != 0) // No END !
                 return;
 
         if (qstricmp(valuePart, "VCARD") != 0) // Not a vcard !
                 return;
+#endif
 }
 
         void
 VCard::_assemble()
 {
         vDebug("Assembling vcard");
         strRep_ = "BEGIN:VCARD\r\n";
         strRep_ += "VERSION:3.0\r\n";
 
         QPtrListIterator<ContentLine> it(contentLineList_);
 
         for (; it.current(); ++it)
                 strRep_ += it.current()->asString() + "\r\n";
 
         strRep_ += "END:VCARD\r\n";
 }
 
         bool
 VCard::has(EntityType t)
 {
         parse();
         return contentLine(t) == 0 ? false : true;
 }
 
         bool
 VCard::has(const QCString & s)
 {
         parse();
         return contentLine(s) == 0 ? false : true;
 }
 
         void
 VCard::add(const ContentLine & cl)
 {
         parse();
         ContentLine * c = new ContentLine(cl);
         contentLineList_.append(c);
 }
 
         void
 VCard::add(const QCString & s)
 {
         parse();
         ContentLine * c = new ContentLine(s);
         contentLineList_.append(c);
 }
 
         ContentLine *
 VCard::contentLine(EntityType t)
 {
         parse();
         QPtrListIterator<ContentLine> it(contentLineList_);
 
         for (; it.current(); ++it)
                 if (it.current()->entityType() == t)
                         return it.current();
 
         return 0;
 }
 
         ContentLine *
 VCard::contentLine(const QCString & s)
 {
         parse();
         QPtrListIterator<ContentLine> it(contentLineList_);
 
         for (; it.current(); ++it)
                 if (it.current()->entityType() == EntityNameToEntityType(s))
                         return it.current();
 
         return 0;
 }
 
diff --git a/kaddressbook/details/detailsviewcontainer.cpp b/kaddressbook/details/detailsviewcontainer.cpp
index ceffc77..229cce0 100644
--- a/kaddressbook/details/detailsviewcontainer.cpp
+++ b/kaddressbook/details/detailsviewcontainer.cpp
@@ -1,169 +1,160 @@
 /*                                                                      
     This file is part of KAddressBook.
     Copyright (c) 1996-2002 Mirko Boehm <mirko@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 <qcombobox.h>
 #include <qframe.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qwidgetstack.h>
 
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>
 
 #include "look_basic.h"
 //#include "look_details.h"
 #include "look_html.h"
 
 #ifdef KAB_EMBEDDED
 #include "kabprefs.h"
 #endif //KAB_EMBEDDED
 
 
 #include "detailsviewcontainer.h"
 
 ViewContainer::ViewContainer( QWidget *parent, const char* name )
   : QWidget( parent, name ), mCurrentLook( 0 )
 {
   QBoxLayout *topLayout = new QVBoxLayout( this );
   //topLayout->setMargin( KDialog::marginHint() );
   //topLayout->setSpacing( KDialog::spacingHint() );
   topLayout->setMargin( 0 );
   topLayout->setSpacing( 0 );
 
   QBoxLayout *styleLayout = new QHBoxLayout( topLayout );    
 
   QLabel *label = new QLabel( i18n("Style:"), this );
   styleLayout->addWidget( label );
 
   mStyleCombo = new QComboBox( this );
   styleLayout->addWidget( mStyleCombo );
 
   QFrame *frameRuler = new QFrame( this );
 //US  frameRuler->setFrameShape( QFrame::HLine );
 //US  frameRuler->setFrameShadow( QFrame::Sunken );
 //US  topLayout->addWidget( frameRuler );
 
   mDetailsStack = new QWidgetStack( this );
   topLayout->addWidget( mDetailsStack, 1 );
 
   registerLooks();
 
 #if 1
     // Hide detailed view selection combo box, because we currently have
     // only one. Reenable it when there are more detailed views.
     label->hide();
     mStyleCombo->hide();
     frameRuler->hide();
 #endif
 }
 
 KABBasicLook *ViewContainer::currentLook()
 {
   return mCurrentLook;
 }
 
 void ViewContainer::registerLooks()
 {
   mLookFactories.append( new KABHtmlViewFactory( mDetailsStack ) );
 //  mLookFactories.append( new KABDetailedViewFactory( mDetailsStack ) );
   mStyleCombo->clear();
 
   for ( uint i = 0; i < mLookFactories.count(); ++i )
     mStyleCombo->insertItem( mLookFactories.at( i )->description() );
 
   if ( !mLookFactories.isEmpty() )
     slotStyleSelected( 0 );
 }
 
 void ViewContainer::slotStyleSelected( int index )
 {
 #ifndef KAB_EMBEDDED
   KConfig *config = kapp->config();
 #else //KAB_EMBEDDED
   //US I hope I got the same config object as above expected.
   KConfig *config = KABPrefs::instance()->getConfig();
 #endif //KAB_EMBEDDED
   KABC::Addressee addr;
 
   if ( index >= 0 && index < mStyleCombo->count() ) {
     if ( mCurrentLook != 0 ) {
       mCurrentLook->saveSettings( config );
       addr = mCurrentLook->addressee();
 
       delete mCurrentLook;
       mCurrentLook = 0;
     }
 
     KABLookFactory *factory = mLookFactories.at( index );
 
     mCurrentLook = factory->create();
     mDetailsStack->raiseWidget( mCurrentLook );
 
     connect( mCurrentLook, SIGNAL( sendEmail( const QString& ) ), this,
              SIGNAL( sendEmail( const QString& ) ) );
     connect( mCurrentLook, SIGNAL( browse( const QString& ) ), this,
              SIGNAL( browse( const QString& ) ) );
   }
 
   mCurrentLook->restoreSettings( config );
   mCurrentLook->setAddressee( addr );
 }
-void ViewContainer::refreshView()
-{
-    if ( mCurrentLook  ) {
-        mCurrentLook->setAddressee( mCurrentAddressee );
-    }
-}
 
 void ViewContainer::setAddressee( const KABC::Addressee& addressee )
 {
   if ( mCurrentLook != 0 ) {
-    if ( addressee == mCurrentAddressee )
-      return;
-    else {
       mCurrentAddressee = addressee;
       mCurrentLook->setAddressee( mCurrentAddressee );
-    }
+    
   }
 }
 
 KABC::Addressee ViewContainer::addressee()
 {
   static KABC::Addressee empty; // do not use!
 
   if ( !mCurrentLook )
     return empty;
   else
     return mCurrentLook->addressee();
 }
 
 void ViewContainer::setReadOnly( bool state )
 {
   if ( mCurrentLook )
     mCurrentLook->setReadOnly( state );
 }
 
 #ifndef KAB_EMBEDDED
 #include "detailsviewcontainer.moc"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/details/detailsviewcontainer.h b/kaddressbook/details/detailsviewcontainer.h
index b561d12..667f0cb 100644
--- a/kaddressbook/details/detailsviewcontainer.h
+++ b/kaddressbook/details/detailsviewcontainer.h
@@ -1,103 +1,102 @@
 /*                                                                      
     This file is part of KAddressBook.
     Copyright (c) 1996-2002 Mirko Boehm <mirko@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 DETAILSVIEWCONTAINER_H
 #define DETAILSVIEWCONTAINER_H
 
 #include <qptrlist.h>
 
 #include "look_basic.h"
 
 class QComboBox;
 class QWidgetStack;
 
 class ViewContainer : public QWidget
 {
   Q_OBJECT
 
   public:
     ViewContainer( QWidget *parent = 0, const char* name = 0 );
 
     /**
       Return the look currently selected. If there is none, it
       returns zero. Do not use this pointer to store a reference
       to a look, the user might select another one (e.g., create
       a new object) at any time.
      */
     KABBasicLook *currentLook();
-    void refreshView();
     /**
       Return the contact currently displayed.
      */
     KABC::Addressee addressee();
 
   public slots:
     /**
       Set the contact currently displayed.
      */
     void setAddressee( const KABC::Addressee& addressee );
 
     /**
       Set read-write state.
      */
     void setReadOnly( bool state );
 
   signals:
     /**
       The contact has been changed.
      */
     void addresseeChanged();
 
     /**
       The user acticated the email address displayed. This may happen
       by, for example, clicking on the displayed mailto-URL.
      */
     void sendEmail( const QString& );
 
     /**
       The user activated one of the displayed HTTP URLs. For example
       by clicking on the displayed homepage address.
      */
     void browse( const QString& );
 
   protected:
     /**
       A style has been selected. Overloaded from base class.
      */
     void slotStyleSelected( int );
 
     /**
       Register the available looks.
      */
     void registerLooks();
 
   private:
     KABC::Addressee mCurrentAddressee;
     KABBasicLook *mCurrentLook;
     QPtrList<KABLookFactory> mLookFactories;
 
     QComboBox *mStyleCombo;
     QWidgetStack *mDetailsStack;
 };
 
 #endif
diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp
index 49d456b..48370e3 100644
--- a/kaddressbook/imagewidget.cpp
+++ b/kaddressbook/imagewidget.cpp
@@ -1,299 +1,294 @@
 /*                                                                      
     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 <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,
                                             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 );
 
   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 );
 
   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->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 );
 
   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 );
 
   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  
 
-#ifndef DESKTOP_VERSION
-    mUsePhotoUrl->setChecked( true );
-    mUseLogoUrl->setChecked( true );
-#endif
 }
 
 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::loadPhoto()
 {
   mPhotoLabel->setPixmap( loadPixmap( mPhotoUrl->url() ) );
 }
 
 void ImageWidget::loadLogo()
 {
   mLogoLabel->setPixmap( loadPixmap( mLogoUrl->url() ) );
 }
 
 void ImageWidget::updateGUI()
 {
   KURLRequester *ptr = (KURLRequester*)sender();
 
-#ifdef DESKTOP_VERSION
+
   if ( ptr == mPhotoUrl )
     mUsePhotoUrl->setEnabled( true );
   else if ( ptr == mLogoUrl )
     mUseLogoUrl->setEnabled( true );
-#endif
 }
 
 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/kabcore.cpp b/kaddressbook/kabcore.cpp
index f6bdda4..e14e579 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -873,1020 +873,1016 @@ void KABCore::beamVCard()
     QStringList uids;
     XXPortSelectDialog dlg( this, false, this );
     if ( dlg.exec() )
         uids = dlg.uids();
     else
         return;
     if ( uids.isEmpty() )
         return;
     beamVCard( uids );
 }
 
 
 void KABCore::beamVCard(const QStringList& uids)
 {
 
     // LR: we should use the /tmp dir on the Zaurus,
     //  because: /tmp = RAM, (HOME)/kdepim = flash memory
    
 #ifdef DESKTOP_VERSION
   QString fileName = locateLocal("tmp", "kapibeamfile.vcf");
 #else
   QString fileName = "/tmp/kapibeamfile.vcf";
 #endif
 
   KABC::VCardConverter converter;
   QString description;
   QString datastream;
   for( QStringList::ConstIterator it = uids.begin(); it != uids.end(); ++it ) {
       KABC::Addressee a = mAddressBook->findByUid( *it );
 
       if ( a.isEmpty() )
           continue;
 
       if (description.isEmpty())
           description = a.formattedName();
 
       QString vcard;
       converter.addresseeToVCard( a, vcard );
       int start = 0;
       int next;
       while ( (next = vcard.find("TYPE=", start) )>= 0 ) {
           int semi = vcard.find(";", next);
           int dopp = vcard.find(":", next);
           int sep;
           if ( semi < dopp && semi >= 0 )
               sep = semi ;
           else
               sep = dopp;
           datastream +=vcard.mid( start, next - start);
           datastream +=vcard.mid( next+5,sep -next -5 ).upper();
           start = sep;
       }
       datastream += vcard.mid( start,vcard.length() );
   }
 #ifndef DESKTOP_VERSION
   QFile outFile(fileName);
   if ( outFile.open(IO_WriteOnly) ) { 
       datastream.replace ( QRegExp("VERSION:3.0") , "VERSION:2.1" );
       QTextStream t( &outFile );  // use a text stream
       //t.setEncoding( QTextStream::UnicodeUTF8 );
       t.setEncoding( QTextStream::Latin1 );
       t <<datastream.latin1();
       outFile.close();
       Ir *ir = new Ir( this );
       connect( ir, SIGNAL( done(Ir*) ), this, SLOT( beamDone(Ir*) ) );
       ir->send( fileName, description, "text/x-vCard" );
   } else {
       qDebug("Error open temp  beam file ");
       return;
   }
 #endif
 
 }
 
 void KABCore::beamDone( Ir *ir )
 {
 #ifndef DESKTOP_VERSION
   delete ir;
 #endif
   topLevelWidget()->raise();
   message( i18n("Beaming finished!") );
 }
 
 
 void KABCore::browse( const QString& url )
 {
 #ifndef KAB_EMBEDDED
   kapp->invokeBrowser( url );
 #else //KAB_EMBEDDED
   qDebug("KABCore::browse must be fixed");
 #endif //KAB_EMBEDDED
 }
 
 void KABCore::selectAllContacts()
 {
   mViewManager->setSelected( QString::null, true );
 }
 
 void KABCore::deleteContacts()
 {
   QStringList uidList = mViewManager->selectedUids();
   deleteContacts( uidList );
 }
 
 void KABCore::deleteContacts( const QStringList &uids )
 {
   if ( uids.count() > 0 ) {
     PwDeleteCommand *command = new PwDeleteCommand( mAddressBook, uids );
     UndoStack::instance()->push( command );
     RedoStack::instance()->clear();
 
     // now if we deleted anything, refresh
     setContactSelected( QString::null );
     setModified( true );
   }
 }
 
 void KABCore::copyContacts()
 {
   KABC::Addressee::List addrList = mViewManager->selectedAddressees();
 
   QString clipText = AddresseeUtil::addresseesToClipboard( addrList );
 
   kdDebug(5720) << "KABCore::copyContacts: " << clipText << endl;
 
   QClipboard *cb = QApplication::clipboard();
   cb->setText( clipText );
 }
 
 void KABCore::cutContacts()
 {
   QStringList uidList = mViewManager->selectedUids();
 
 //US  if ( uidList.size() > 0 ) {
   if ( uidList.count() > 0 ) {
     PwCutCommand *command = new PwCutCommand( mAddressBook, uidList );
     UndoStack::instance()->push( command );
     RedoStack::instance()->clear();
 
     setModified( true );
   }
 }
 
 void KABCore::pasteContacts()
 {
   QClipboard *cb = QApplication::clipboard();
 
   KABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( cb->text() );
 
   pasteContacts( list );
 }
 
 void KABCore::pasteContacts( KABC::Addressee::List &list  )
 {
   KABC::Resource *resource = requestResource( this );
   KABC::Addressee::List::Iterator it;
   for ( it = list.begin(); it != list.end(); ++it )
     (*it).setResource( resource );
 
   PwPasteCommand *command = new PwPasteCommand( this, list );
   UndoStack::instance()->push( command );
   RedoStack::instance()->clear();
 
   setModified( true );
 }
 
 void KABCore::setWhoAmI()
 {
   KABC::Addressee::List addrList = mViewManager->selectedAddressees();
 
   if ( addrList.count() > 1 ) {
     KMessageBox::sorry( this, i18n( "Please select only one contact." ) );
     return;
   }
 
   QString text( i18n( "<qt>Do you really want to use <b>%1</b> as your new personal contact?</qt>" ) );
   if ( KMessageBox::questionYesNo( this, text.arg( addrList[ 0 ].assembledName() ) ) == KMessageBox::Yes )
     static_cast<KABC::StdAddressBook*>( KABC::StdAddressBook::self() )->setWhoAmI( addrList[ 0 ] );
 }
 void KABCore::editCategories()
 { 
     KPIM::CategoryEditDialog dlg ( KABPrefs::instance(), this, "", true );
     dlg.exec();
 }
 void KABCore::setCategories()
 {
 
     QStringList uids;
     XXPortSelectDialog dlgx( this, false, this );
     if ( dlgx.exec() )
         uids = dlgx.uids();
     else
         return;
     if ( uids.isEmpty() )
         return;
     // qDebug("count %d ", uids.count());
 
 
   KPIM::CategorySelectDialog dlg( KABPrefs::instance(), this, "", true );
   if ( !dlg.exec() ) {
       message( i18n("Setting categories cancelled") );
       return;
   }
   bool merge = false;
   QString msg = i18n( "Merge with existing categories?" );
   if ( KMessageBox::questionYesNo( this, msg ) == KMessageBox::Yes )
     merge = true;
 
   message( i18n("Setting categories ... please wait!") );
   QStringList categories = dlg.selectedCategories();
 
   //QStringList uids = mViewManager->selectedUids();
   QStringList::Iterator it;
   for ( it = uids.begin(); it != uids.end(); ++it ) {
     KABC::Addressee addr = mAddressBook->findByUid( *it );
     if ( !addr.isEmpty() ) {
       if ( !merge )
         addr.setCategories( categories );
       else {
         QStringList addrCategories = addr.categories();
         QStringList::Iterator catIt;
         for ( catIt = categories.begin(); catIt != categories.end(); ++catIt ) {
           if ( !addrCategories.contains( *catIt ) )
             addrCategories.append( *catIt );
         }
         addr.setCategories( addrCategories );
       }
       mAddressBook->insertAddressee( addr );
     }
   }
 
   if ( uids.count() > 0 )
     setModified( true );
   message( i18n("Setting categories completed!") );
 }
 
 void KABCore::setSearchFields( const KABC::Field::List &fields )
 {
   mIncSearchWidget->setFields( fields );
 }
 
 void KABCore::incrementalSearch( const QString& text )
 {
     mViewManager->doSearch( text, mIncSearchWidget->currentField() );
 }
 
 void KABCore::setModified()
 {
   setModified( true );
 }
 
 void KABCore::setModifiedWOrefresh()
 {
     // qDebug("KABCore::setModifiedWOrefresh() ");
     mModified = true;
     mActionSave->setEnabled( mModified );
-#ifdef DESKTOP_VERSION
-  mDetails->refreshView();
-#endif
+
 
 }
 void KABCore::setModified( bool modified )
 {
   mModified = modified;
   mActionSave->setEnabled( mModified );
 
   if ( modified )
     mJumpButtonBar->recreateButtons();
 
   mViewManager->refreshView();
-  mDetails->refreshView();
 
 }
 
 bool KABCore::modified() const
 {
   return mModified;
 }
 
 void KABCore::contactModified( const KABC::Addressee &addr )
 {
 
   Command *command = 0;
   QString uid;
 
   // check if it exists already
   KABC::Addressee origAddr = mAddressBook->findByUid( addr.uid() );
   if ( origAddr.isEmpty() )
     command = new PwNewCommand( mAddressBook, addr );
   else {
     command = new PwEditCommand( mAddressBook, origAddr, addr );
     uid = addr.uid();
   }
 
   UndoStack::instance()->push( command );
   RedoStack::instance()->clear();
-
+  mDetails->setAddressee( addr );
   setModified( true );
 }
 
 void KABCore::newContact()
 {
 
 
   QPtrList<KABC::Resource> kabcResources = mAddressBook->resources();
 
   QPtrList<KRES::Resource> kresResources;
   QPtrListIterator<KABC::Resource> it( kabcResources );
   KABC::Resource *resource;
   while ( ( resource = it.current() ) != 0 ) {
     ++it;
     if ( !resource->readOnly() ) {
       KRES::Resource *res = static_cast<KRES::Resource*>( resource );
       if ( res )
         kresResources.append( res );
     }
   }
 
   KRES::Resource *res = KRES::SelectDialog::getResource( kresResources, this );
   resource = static_cast<KABC::Resource*>( res );
 
   if ( resource ) {
     KABC::Addressee addr;
     addr.setResource( resource );
     mEditorDialog->setAddressee( addr );
     KApplication::execDialog ( mEditorDialog );
 
   } else
     return;
 
   // mEditorDict.insert( dialog->addressee().uid(), dialog );
 
 
 }
 
 void KABCore::addEmail( QString aStr )
 {
 #ifndef KAB_EMBEDDED
   QString fullName, email;
 
   KABC::Addressee::parseEmailAddress( aStr, fullName, email );
 
   // Try to lookup the addressee matching the email address
   bool found = false;
   QStringList emailList;
   KABC::AddressBook::Iterator it;
   for ( it = mAddressBook->begin(); !found && (it != mAddressBook->end()); ++it ) {
     emailList = (*it).emails();
     if ( emailList.contains( email ) > 0 ) {
       found = true;
       (*it).setNameFromString( fullName );
       editContact( (*it).uid() );
     }
   }
 
   if ( !found ) {
     KABC::Addressee addr;
     addr.setNameFromString( fullName );
     addr.insertEmail( email, true );
 
     mAddressBook->insertAddressee( addr );
     mViewManager->refreshView( addr.uid() );
     editContact( addr.uid() );
   }
 #else //KAB_EMBEDDED
   qDebug("KABCore::addEmail finsih method");
 #endif //KAB_EMBEDDED
 }
 
 void KABCore::importVCard( const KURL &url, bool showPreview )
 {
   mXXPortManager->importVCard( url, showPreview );
 }
 void KABCore::importFromOL()
 {
 #ifdef _WIN32_
   KAImportOLdialog* idgl = new KAImportOLdialog( i18n("Import Contacts from OL"),  mAddressBook, this );
   idgl->exec();
   KABC::Addressee::List list = idgl->getAddressList();
   if ( list.count() > 0 ) {
     KABC::Addressee::List listNew;
     KABC::Addressee::List listExisting;
     KABC::Addressee::List::Iterator it;
     KABC::AddressBook::Iterator iter;
     for ( it = list.begin(); it != list.end(); ++it ) {
       if ( mAddressBook->findByUid((*it).uid() ).isEmpty())
         listNew.append( (*it) );
       else
         listExisting.append( (*it) );
     }
     if ( listExisting.count()  > 0 )
       KMessageBox::information( this, i18n("%1 contacts not added to addressbook\nbecause they were already in the addressbook!").arg( listExisting.count() ));
     if ( listNew.count() > 0 ) {
       pasteWithNewUid = false;
       pasteContacts( listNew );
       pasteWithNewUid = true;
     }
   }
   delete idgl;
 #endif
 }
 
 void KABCore::importVCard( const QString &vCard, bool showPreview )
 {
   mXXPortManager->importVCard( vCard, showPreview );
 }
 
 //US added a second method without defaultparameter
 void KABCore::editContact2() {
   editContact( QString::null );
 }
 
 void KABCore::editContact( const QString &uid )
 {
 
   if ( mExtensionManager->isQuickEditVisible() )
     return;
 
   // First, locate the contact entry
   QString localUID = uid;
   if ( localUID.isNull() ) {
     QStringList uidList = mViewManager->selectedUids();
     if ( uidList.count() > 0 )
       localUID = *( uidList.at( 0 ) );
   }
 
   KABC::Addressee addr = mAddressBook->findByUid( localUID );
   if ( !addr.isEmpty() ) {
       mEditorDialog->setAddressee( addr );
       KApplication::execDialog ( mEditorDialog );
   }
 }
 
 /**
   Shows or edits the detail view for the given uid. If the uid is QString::null,
   the method will try to find a selected addressee in the view.
  */
 void KABCore::executeContact( const QString &uid /*US = QString::null*/ )
 {
   if ( mMultipleViewsAtOnce )
   {
     editContact( uid );
   }
   else
   {
     setDetailsVisible( true );
     mActionDetails->setChecked(true);
   }
 
 }
 
 void KABCore::save()
 {
      if (syncManager->blockSave())
         return;
     if ( !mModified )
         return;
 
     syncManager->setBlockSave(true);
    QString text = i18n( "There was an error while attempting to save\n the "
     "address book. Please check that some \nother application is "
     "not using it. " );
    message(i18n("Saving addressbook ... "));
 #ifndef KAB_EMBEDDED
   KABC::StdAddressBook *b = dynamic_cast<KABC::StdAddressBook*>( mAddressBook );
   if ( !b || !b->save() ) {
     KMessageBox::error( this, text, i18n( "Unable to Save" ) );
   }
 #else //KAB_EMBEDDED
   KABC::StdAddressBook *b = (KABC::StdAddressBook*)( mAddressBook );
   if ( !b || !b->save() ) {
     QMessageBox::critical( this, i18n( "Unable to Save" ), text,  i18n("Ok"));
   }
 #endif //KAB_EMBEDDED
 
   message(i18n("Addressbook saved!"));
   setModified( false );
   syncManager->setBlockSave(false);
 }
 
 
 void KABCore::undo()
 {
   UndoStack::instance()->undo();
 
   // Refresh the view
   mViewManager->refreshView();
 }
 
 void KABCore::redo()
 {
   RedoStack::instance()->redo();
 
   // Refresh the view
   mViewManager->refreshView();
 }
 
 void KABCore::setJumpButtonBarVisible( bool visible )
 {
   if (mMultipleViewsAtOnce)
   {
     if ( visible )
       mJumpButtonBar->show();
     else
       mJumpButtonBar->hide();
   }
   else
   {
         // show the jumpbar only if "the details are hidden" == "viewmanager are shown"
     if (mViewManager->isVisible())
     {
       if ( visible )
         mJumpButtonBar->show();
       else
         mJumpButtonBar->hide();
         }
         else
         {
       mJumpButtonBar->hide();
         }
   }
 }
 
 
 void KABCore::setDetailsToState()
 {
     setDetailsVisible(  mActionDetails->isChecked() );
 }
 void KABCore::setDetailsToggle()
 {
     mActionDetails->setChecked( !mActionDetails->isChecked() );
     setDetailsToState();
 }
 
 
 
 void KABCore::setDetailsVisible( bool visible )
 {
   if (visible && mDetails->isHidden())
   {
     KABC::Addressee::List addrList = mViewManager->selectedAddressees();
     if ( addrList.count() > 0 )
       mDetails->setAddressee( addrList[ 0 ] );
   }
 
   // mMultipleViewsAtOnce=false: mDetails is always visible. But we switch between
   // the listview and the detailview. We do that by changing the splitbar size.
   if (mMultipleViewsAtOnce)
   {
     if ( visible )
       mDetails->show();
     else
       mDetails->hide();
   }
   else
   {
     if ( visible ) {
       mViewManager->hide();
       mDetails->show();
       mIncSearchWidget->setFocus();
     }
     else {
       mViewManager->show();
       mDetails->hide();
       mViewManager->setFocusAV();
     }
     setJumpButtonBarVisible( !visible );
   }
 
 }
 
 void KABCore::extensionChanged( int id )
 {
   //change the details view only for non desktop systems
 #ifndef DESKTOP_VERSION
 
   if (id == 0)
   {
     //the user disabled the extension.
 
     if (mMultipleViewsAtOnce)
     { // enable detailsview again
       setDetailsVisible( true );
       mActionDetails->setChecked( true );
     }
     else
     {  //go back to the listview
       setDetailsVisible( false );
       mActionDetails->setChecked( false );
       mActionDetails->setEnabled(true);
         }
 
   }
   else
   {
     //the user enabled the extension.
     setDetailsVisible( false );
     mActionDetails->setChecked( false );
 
     if (!mMultipleViewsAtOnce)
     {
       mActionDetails->setEnabled(false);
         }
 
     mExtensionManager->setSelectionChanged();
 
   }
 
 #endif// DESKTOP_VERSION
 
 }
 
 
 void KABCore::extensionModified( const KABC::Addressee::List &list )
 {
 
   if ( list.count() != 0 ) {
     KABC::Addressee::List::ConstIterator it;
     for ( it = list.begin(); it != list.end(); ++it )
       mAddressBook->insertAddressee( *it );
     if ( list.count() > 1 )
         setModified();
     else
         setModifiedWOrefresh();
   }
   if ( list.count() == 0 )
     mViewManager->refreshView();
   else
      mViewManager->refreshView( list[ 0 ].uid() );
 
 
 
 }
 
 QString KABCore::getNameByPhone( const QString &phone )
 {
 #ifndef KAB_EMBEDDED
   QRegExp r( "[/*/-/ ]" );
   QString localPhone( phone );
 
   bool found = false;
   QString ownerName = "";
   KABC::AddressBook::Iterator iter;
   KABC::PhoneNumber::List::Iterator phoneIter;
   KABC::PhoneNumber::List phoneList;
   for ( iter = mAddressBook->begin(); !found && ( iter != mAddressBook->end() ); ++iter ) {
     phoneList = (*iter).phoneNumbers();
     for ( phoneIter = phoneList.begin(); !found && ( phoneIter != phoneList.end() );
           ++phoneIter) {
       // Get rid of separator chars so just the numbers are compared.
       if ( (*phoneIter).number().replace( r, "" ) == localPhone.replace( r, "" ) ) {
         ownerName = (*iter).formattedName();
         found = true;
       }
     }
   }
 
   return ownerName;
 #else //KAB_EMBEDDED
   qDebug("KABCore::getNameByPhone finsih method");
   return "";
 #endif //KAB_EMBEDDED
 
 }
 
 void KABCore::openConfigDialog()
 {
     KCMultiDialog*  ConfigureDialog = new KCMultiDialog( "PIM", this ,"kabconfigdialog", true );
     KCMKabConfig* kabcfg = new KCMKabConfig( ConfigureDialog->getNewVBoxPage(i18n( "Addressbook")) , "KCMKabConfig" );
     ConfigureDialog->addModule(kabcfg );
     KCMKdePimConfig* kdelibcfg = new KCMKdePimConfig( ConfigureDialog->getNewVBoxPage(i18n( "Global")) , "KCMKdeLibConfig" );
     ConfigureDialog->addModule(kdelibcfg );
 
     connect( ConfigureDialog, SIGNAL( applyClicked() ),
              this, SLOT( configurationChanged() ) );
     connect( ConfigureDialog, SIGNAL( okClicked() ),
              this, SLOT( configurationChanged() ) );
     saveSettings();
 #ifndef DESKTOP_VERSION
     ConfigureDialog->showMaximized();
 #endif
     if ( ConfigureDialog->exec() )
         KMessageBox::information( this,  i18n("Some changes are only\neffective after a restart!\n") );
     delete ConfigureDialog;
 }
 
 void KABCore::openLDAPDialog()
 {
 #ifndef KAB_EMBEDDED
   if ( !mLdapSearchDialog ) {
     mLdapSearchDialog = new LDAPSearchDialog( mAddressBook, this );
     connect( mLdapSearchDialog, SIGNAL( addresseesAdded() ), mViewManager,
             SLOT( refreshView() ) );
     connect( mLdapSearchDialog, SIGNAL( addresseesAdded() ), this,
             SLOT( setModified() ) );
   } else
     mLdapSearchDialog->restoreSettings();
 
   if ( mLdapSearchDialog->isOK() )
     mLdapSearchDialog->exec();
 #else //KAB_EMBEDDED
   qDebug("KABCore::openLDAPDialog() finsih method");
 #endif //KAB_EMBEDDED
 }
 
 void KABCore::print()
 {
 #ifndef KAB_EMBEDDED
   KPrinter printer;
   if ( !printer.setup( this ) )
     return;
 
   KABPrinting::PrintingWizard wizard( &printer, mAddressBook,
                                       mViewManager->selectedUids(), this );
 
   wizard.exec();
 #else //KAB_EMBEDDED
   qDebug("KABCore::print() finsih method");
 #endif //KAB_EMBEDDED
 
 }
 
 
 void KABCore::addGUIClient( KXMLGUIClient *client )
 {
   if ( mGUIClient )
     mGUIClient->insertChildClient( client );
   else
     KMessageBox::error( this, "no KXMLGUICLient");
 }
 
 
 void KABCore::configurationChanged()
 {
   mExtensionManager->reconfigure();
 }
 
 void KABCore::addressBookChanged()
 {
 /*US
   QDictIterator<AddresseeEditorDialog> it( mEditorDict );
   while ( it.current() ) {
     if ( it.current()->dirty() ) {
       QString text = i18n( "Data has been changed externally. Unsaved "
                            "changes will be lost." );
       KMessageBox::information( this, text );
     }
     it.current()->setAddressee( mAddressBook->findByUid( it.currentKey() ) );
     ++it;
   }
 */
   if (mEditorDialog)
   {
     if (mEditorDialog->dirty())
     {
       QString text = i18n( "Data has been changed externally. Unsaved "
                            "changes will be lost." );
       KMessageBox::information( this, text );
     }
     QString currentuid = mEditorDialog->addressee().uid();
     mEditorDialog->setAddressee( mAddressBook->findByUid( currentuid ) );
   }
   mViewManager->refreshView();
-//  mDetails->refreshView();
 
 
 }
 
 AddresseeEditorDialog *KABCore::createAddresseeEditorDialog( QWidget *parent,
                                                              const char *name )
 {
 
     if ( mEditorDialog == 0 ) {
   mEditorDialog = new AddresseeEditorDialog( this, parent,
                                                  name ? name : "editorDialog" );
 
 
   connect( mEditorDialog, SIGNAL( contactModified( const KABC::Addressee& ) ),
            SLOT( contactModified( const KABC::Addressee& ) ) );
   //connect( mEditorDialog, SIGNAL( editorDestroyed( const QString& ) ),
   //       SLOT( slotEditorDestroyed( const QString& ) ) ;
     }
 
   return mEditorDialog;
 }
 
 void KABCore::slotEditorDestroyed( const QString &uid )
 {
     //mEditorDict.remove( uid );
 }
 
 void KABCore::initGUI()
 {
 #ifndef KAB_EMBEDDED
   QHBoxLayout *topLayout = new QHBoxLayout( this );
   topLayout->setSpacing( KDialogBase::spacingHint() );
 
   mExtensionBarSplitter = new QSplitter( this );
   mExtensionBarSplitter->setOrientation( Qt::Vertical );
 
   mDetailsSplitter = new QSplitter( mExtensionBarSplitter );
 
   QVBox *viewSpace = new QVBox( mDetailsSplitter );
   mIncSearchWidget = new IncSearchWidget( viewSpace );
   connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ),
            SLOT( incrementalSearch( const QString& ) ) );
 
   mViewManager = new ViewManager( this, viewSpace );
   viewSpace->setStretchFactor( mViewManager, 1 );
 
   mDetails = new ViewContainer( mDetailsSplitter );
 
   mJumpButtonBar = new JumpButtonBar( this, this );
 
   mExtensionManager = new ExtensionManager( this, mExtensionBarSplitter );
 
   topLayout->addWidget( mExtensionBarSplitter );
   topLayout->setStretchFactor( mExtensionBarSplitter, 100 );
   topLayout->addWidget( mJumpButtonBar );
   topLayout->setStretchFactor( mJumpButtonBar, 1 );
 
   mXXPortManager = new XXPortManager( this, this );
 
 #else //KAB_EMBEDDED
   //US initialize viewMenu before settingup viewmanager.
   //  Viewmanager needs this menu to plugin submenues.
   viewMenu = new QPopupMenu( this );
   settingsMenu = new QPopupMenu( this );
   //filterMenu = new QPopupMenu( this );
   ImportMenu = new QPopupMenu( this );
   ExportMenu = new QPopupMenu( this );
   syncMenu = new QPopupMenu( this );
   changeMenu= new QPopupMenu( this );
   beamMenu= new QPopupMenu( this );
 
 //US since we have no splitter for the embedded system, setup
 // a layout with two frames. One left and one right.
 
   QBoxLayout *topLayout;
 
   // = new QHBoxLayout( this );
 //  QBoxLayout *topLayout = (QBoxLayout*)layout();
 
 //  QWidget *mainBox = new QWidget( this );
 //  QBoxLayout * mainBoxLayout  = new QHBoxLayout(mainBox);
 
 #ifdef DESKTOP_VERSION
   topLayout = new QHBoxLayout( this );
 
 
   mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this);
   mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right );
 
   topLayout->addWidget(mMiniSplitter );
 
   mExtensionBarSplitter = new KDGanttMinimizeSplitter( Qt::Vertical,mMiniSplitter );
   mExtensionBarSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down );
   mViewManager = new ViewManager( this, mExtensionBarSplitter  );
   mDetails = new ViewContainer( mMiniSplitter );
   mExtensionManager = new ExtensionManager( this, mExtensionBarSplitter );
 #else
   if ( QApplication::desktop()->width() > 480 ) {
       topLayout = new QHBoxLayout( this );
       mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this);
       mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right );
   } else {
 
       topLayout = new QHBoxLayout( this );
       mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Vertical, this);
       mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down );
   }
 
   topLayout->addWidget(mMiniSplitter );
   mViewManager = new ViewManager( this,  mMiniSplitter );
   mDetails = new ViewContainer( mMiniSplitter );
 
 
    mExtensionManager = new ExtensionManager( this, mMiniSplitter );
 #endif
    //eh->hide();
   // topLayout->addWidget(mExtensionManager );
 
 
 /*US
 #ifndef KAB_NOSPLITTER
   QHBoxLayout *topLayout = new QHBoxLayout( this );
 //US  topLayout->setSpacing( KDialogBase::spacingHint() );
   topLayout->setSpacing( 10 );
 
   mDetailsSplitter = new QSplitter( this );
 
   QVBox *viewSpace = new QVBox( mDetailsSplitter );
 
   mViewManager = new ViewManager( this, viewSpace );
   viewSpace->setStretchFactor( mViewManager, 1 );
 
   mDetails = new ViewContainer( mDetailsSplitter );
 
   topLayout->addWidget( mDetailsSplitter );
   topLayout->setStretchFactor( mDetailsSplitter, 100 );
 #else //KAB_NOSPLITTER
   QHBoxLayout *topLayout = new QHBoxLayout( this );
 //US  topLayout->setSpacing( KDialogBase::spacingHint() );
   topLayout->setSpacing( 10 );
 
 //  mDetailsSplitter = new QSplitter( this );
 
   QVBox *viewSpace = new QVBox( this );
 
   mViewManager = new ViewManager( this, viewSpace );
   viewSpace->setStretchFactor( mViewManager, 1 );
 
   mDetails = new ViewContainer( this );
 
   topLayout->addWidget( viewSpace );
 //  topLayout->setStretchFactor( mDetailsSplitter, 100 );
   topLayout->addWidget( mDetails );
 #endif //KAB_NOSPLITTER
 */
 
   syncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)this, KSyncManager::KAPI, KABPrefs::instance(), syncMenu);
   syncManager->setBlockSave(false);
 
     connect(syncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) );
     connect(syncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) );
     QString sync_file = sentSyncFile();
     qDebug("KABCore::initGUI()::setting tmp sync file to:%s ",sync_file.latin1());
     syncManager->setDefaultFileName( sync_file );
     //connect(syncManager , SIGNAL( ), this, SLOT( ) );
 
 #endif //KAB_EMBEDDED
   initActions();
 
 #ifdef KAB_EMBEDDED
   addActionsManually();
   //US make sure the export and import menues are initialized before creating the xxPortManager.
   mXXPortManager = new XXPortManager( this, this );
 
   // LR mIncSearchWidget = new IncSearchWidget( mMainWindow->getIconToolBar() );
   //mMainWindow->toolBar()->insertWidget(-1, 4, mIncSearchWidget);
   // mActionQuit->plug ( mMainWindow->toolBar());
   //mIncSearchWidget = new IncSearchWidget( mMainWindow->toolBar() );
   //mMainWindow->toolBar()->insertWidget(-1, 0, mIncSearchWidget);
   // mIncSearchWidget->hide();
   connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ),
            SLOT( incrementalSearch( const QString& ) ) );
   connect( mIncSearchWidget, SIGNAL( scrollUP() ),mViewManager, SLOT( scrollUP() ) );
   connect( mIncSearchWidget, SIGNAL( scrollDOWN() ),mViewManager, SLOT( scrollDOWN() ) );
 
   mJumpButtonBar = new JumpButtonBar( this, this );
 
   topLayout->addWidget( mJumpButtonBar );
 //US  topLayout->setStretchFactor( mJumpButtonBar, 10 );
 
 // mMainWindow->getIconToolBar()->raise();
 
 #endif //KAB_EMBEDDED
 
 }
 void KABCore::initActions()
 {
 //US  qDebug("KABCore::initActions(): mIsPart %i", mIsPart);
 
 #ifndef KAB_EMBEDDED
   connect( QApplication::clipboard(), SIGNAL( dataChanged() ),
            SLOT( clipboardDataChanged() ) );
 #endif //KAB_EMBEDDED
 
   // file menu
   if ( mIsPart ) {
     mActionMail = new KAction( i18n( "&Mail" ), "mail_generic", 0, this,
                                SLOT( sendMail() ), actionCollection(),
                                "kaddressbook_mail" );
     mActionPrint = new KAction( i18n( "&Print" ), "fileprint", CTRL + Key_P, this,
                  SLOT( print() ), actionCollection(), "kaddressbook_print" );
 
   } else {
     mActionMail = KStdAction::mail( this, SLOT( sendMail() ), actionCollection() );
     mActionPrint = KStdAction::print( this, SLOT( print() ), actionCollection() );
   }
 
 
   mActionSave = new KAction( i18n( "&Save" ), "filesave", CTRL+Key_S, this,
                              SLOT( save() ), actionCollection(), "file_sync" );
 
   mActionNewContact = new KAction( i18n( "&New Contact..." ), "filenew", CTRL+Key_N, this,
                              SLOT( newContact() ), actionCollection(), "file_new_contact" );
 
   mActionMailVCard = new KAction(i18n("Mail &vCard..."), "mail_post_to", 0,
                                  this, SLOT( mailVCard() ),
                                  actionCollection(), "file_mail_vcard");
 
   mActionExport2phone = new KAction( i18n( "Export to phone" ), "ex2phone", 0, this,
                                SLOT( export2phone() ), actionCollection(),
                                "kaddressbook_ex2phone" );
 
   mActionBeamVCard = 0;
  mActionBeam = 0;
 
 #ifndef DESKTOP_VERSION
   if ( Ir::supported() ) {
     mActionBeamVCard = new KAction( i18n( "Beam v&Card(s)..." ), "beam", 0, this,
                                SLOT( beamVCard() ), actionCollection(),
                                "kaddressbook_beam_vcard" );
 
     mActionBeam = new KAction( i18n( "&Beam personal vCard" ), "beam", 0, this,
                                SLOT( beamMySelf() ), actionCollection(),
                                "kaddressbook_beam_myself" );
   }
 #endif
 
   mActionEditAddressee = new KAction( i18n( "&Edit Contact..." ), "edit", 0,
                                       this, SLOT( editContact2() ),
                                       actionCollection(), "file_properties" );
 
 #ifdef KAB_EMBEDDED
   // mActionQuit = KStdAction::quit( mMainWindow, SLOT( exit() ), actionCollection() );
   mActionQuit = new KAction( i18n( "&Exit" ), "exit", 0,
                                       mMainWindow, SLOT( exit() ),
                                       actionCollection(), "quit" );
@@ -2036,513 +2032,512 @@ void KABCore::initActions()
 
   clipboardDataChanged();
   connect( UndoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) );
   connect( RedoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) );
 }
 
 //US we need this function, to plug all actions into the correct menues.
 // KDE uses a XML format to plug the actions, but we work her without this overhead.
 void KABCore::addActionsManually()
 {
 //US  qDebug("KABCore::initActions(): mIsPart %i", mIsPart);
 
 #ifdef KAB_EMBEDDED
   QPopupMenu *fileMenu = new QPopupMenu( this );
   QPopupMenu *editMenu = new QPopupMenu( this );
   QPopupMenu *helpMenu = new QPopupMenu( this );
 
   KToolBar* tb =  mMainWindow->toolBar();
 
 #ifndef DESKTOP_VERSION
   if ( KABPrefs::instance()->mFullMenuBarVisible ) {
 #endif
       QMenuBar* mb = mMainWindow->menuBar();
 
       //US setup menubar.
       //Disable the following block if you do not want to have a menubar.
       mb->insertItem( i18n("&File"), fileMenu );
       mb->insertItem( i18n("&Edit"), editMenu );
       mb->insertItem( i18n("&View"), viewMenu );
       mb->insertItem( i18n("&Settings"), settingsMenu );
       mb->insertItem( i18n("Synchronize"), syncMenu );
       //mb->insertItem( i18n("&Change"), changeMenu );
       mb->insertItem( i18n("&Help"), helpMenu );
       mIncSearchWidget = new IncSearchWidget( tb );
       // tb->insertWidget(-1, 0, mIncSearchWidget);
 #ifndef DESKTOP_VERSION
   } else  {
       //US setup toolbar
       QPEMenuBar   *menuBarTB = new QPEMenuBar( tb );
       QPopupMenu *popupBarTB = new QPopupMenu( this );
       menuBarTB->insertItem( "ME", popupBarTB);
       tb->insertWidget(-1, 0, menuBarTB);
       mIncSearchWidget = new IncSearchWidget( tb );
 
       tb->enableMoving(false);
       popupBarTB->insertItem( i18n("&File"), fileMenu );
       popupBarTB->insertItem( i18n("&Edit"), editMenu );
       popupBarTB->insertItem( i18n("&View"), viewMenu );
       popupBarTB->insertItem( i18n("&Settings"), settingsMenu );
       popupBarTB->insertItem( i18n("Synchronize"), syncMenu );
       mViewManager->getFilterAction()->plug ( popupBarTB);
       //popupBarTB->insertItem( i18n("&Change selected"), changeMenu );
       popupBarTB->insertItem( i18n("&Help"), helpMenu );
       if (QApplication::desktop()->width() > 320 ) {
           // mViewManager->getFilterAction()->plug ( tb);
       }
   }
 #endif
   // mActionQuit->plug ( mMainWindow->toolBar());
 
 
 
   //US Now connect the actions with the menue entries.
   mActionPrint->plug( fileMenu );
   mActionMail->plug( fileMenu );
   fileMenu->insertSeparator();
 
   mActionNewContact->plug( fileMenu );
   mActionNewContact->plug( tb );
 
   mActionEditAddressee->plug( fileMenu );
   // if ((KGlobal::getDesktopSize() > KGlobal::Small ) ||
   //  (!KABPrefs::instance()->mMultipleViewsAtOnce ))
     mActionEditAddressee->plug( tb );
 
   fileMenu->insertSeparator();
   mActionSave->plug( fileMenu );
   fileMenu->insertItem( "&Import", ImportMenu );
   fileMenu->insertItem( "&Export", ExportMenu );
   fileMenu->insertItem( i18n("&Change"), changeMenu );
 #ifndef DESKTOP_VERSION
   if ( Ir::supported() )  fileMenu->insertItem( i18n("&Beam"), beamMenu );
 #endif
 
   fileMenu->insertSeparator();
   mActionMailVCard->plug( fileMenu );
 #ifndef DESKTOP_VERSION
   if ( Ir::supported() ) mActionBR->plug( beamMenu );
   if ( Ir::supported() ) mActionBeamVCard->plug( beamMenu );
   if ( Ir::supported() ) mActionBeam->plug( beamMenu );
 #endif
   fileMenu->insertSeparator();
   mActionQuit->plug( fileMenu );
 #ifdef _WIN32_
   mActionImportOL->plug( ImportMenu  );
 #endif
   // edit menu
   mActionUndo->plug( editMenu );
   mActionRedo->plug( editMenu );
   editMenu->insertSeparator();
   mActionCut->plug( editMenu );
   mActionCopy->plug( editMenu );
   mActionPaste->plug( editMenu );
   mActionDelete->plug( editMenu );
   editMenu->insertSeparator();
   mActionSelectAll->plug( editMenu );
 
   mActionRemoveVoice->plug( changeMenu );
   // settings menu
 //US special menuentry to configure the addressbook resources. On KDE
 // you do that through the control center !!!
   mActionConfigResources->plug( settingsMenu );
   settingsMenu->insertSeparator();
 
   mActionConfigKAddressbook->plug( settingsMenu );
 
   if ( mIsPart ) {
     //US not implemented yet
     //mActionConfigShortcuts->plug( settingsMenu );
     //mActionConfigureToolbars->plug( settingsMenu );
 
   } else {
     //US not implemented yet
     //mActionKeyBindings->plug( settingsMenu );
   }
 
   settingsMenu->insertSeparator();
 
   mActionJumpBar->plug( settingsMenu );
   mActionDetails->plug( settingsMenu );
   //if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop  )
   mActionDetails->plug( tb );
   settingsMenu->insertSeparator();
 #ifndef DESKTOP_VERSION
   if ( Ir::supported() ) mActionBR->plug(settingsMenu );
 #endif
   settingsMenu->insertSeparator();
 
   mActionWhoAmI->plug( settingsMenu );
   mActionEditCategories->plug( settingsMenu );
   mActionEditCategories->plug( changeMenu );
   mActionCategories->plug( changeMenu );
   mActionManageCategories->plug( changeMenu );
 
   mActionCategories->plug( settingsMenu );
   mActionManageCategories->plug( settingsMenu );
 
      
   mActionWN->plug( helpMenu );
   mActionSyncHowto->plug( helpMenu );
   mActionKdeSyncHowto->plug( helpMenu );
   mActionMultiSyncHowto->plug( helpMenu );
   mActionFaq->plug( helpMenu );
   mActionLicence->plug( helpMenu );
   mActionAboutKAddressbook->plug( helpMenu );
 
   if (KGlobal::getDesktopSize() > KGlobal::Small ) {
 
       mActionSave->plug( tb );
       mViewManager->getFilterAction()->plug ( tb);
       //LR hide filteraction on started in 480x640
       if (QApplication::desktop()->width() == 480 ) {
           mViewManager->getFilterAction()->setComboWidth( 0 );
       }
       mActionUndo->plug( tb );
       mActionDelete->plug( tb );
       mActionRedo->plug( tb );
   } else {
       mActionSave->plug( tb );
       tb->enableMoving(false);
   }
   //mActionQuit->plug ( tb );
   // tb->insertWidget(-1, 0, mIncSearchWidget, 6);
 
   //US link the searchwidget first to this.
   // The real linkage to the toolbar happens later.
 //US  mIncSearchWidget->reparent(tb, 0, QPoint(50,0), TRUE);
 //US  tb->insertItem( mIncSearchWidget );
 /*US
   mIncSearchWidget = new IncSearchWidget( tb );
   connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ),
            SLOT( incrementalSearch( const QString& ) ) );
 
   mJumpButtonBar = new JumpButtonBar( this, this );
 
 //US topLayout->addWidget( mJumpButtonBar );
  this->layout()->add( mJumpButtonBar );
 */
 
 #endif //KAB_EMBEDDED
 
   mActionExport2phone->plug( ExportMenu );
  connect ( syncMenu, SIGNAL( activated ( int )  ), syncManager, SLOT (slotSyncMenu( int ) ) );
  syncManager->fillSyncMenu();
 
 }
 void KABCore::showLicence()
 {
     KApplication::showLicence();
 }
 
 void KABCore::manageCategories( )
 {
     KABCatPrefs* cp = new KABCatPrefs(); 
     cp->show();
     int w =cp->sizeHint().width() ;
     int h = cp->sizeHint().height() ;
     int dw = QApplication::desktop()->width();
     int dh = QApplication::desktop()->height();
     cp->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
     if ( !cp->exec() ) {
         delete cp;
         return;
     }
     int count = 0;
     message( i18n("Please wait, processing categories..."));
     if ( cp->addCat() ) {
         KABC::AddressBook::Iterator it;
         QStringList catList = KABPrefs::instance()->mCustomCategories;
         for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { 
             QStringList catIncList = (*it).categories();
             int i;
             for( i = 0; i<   catIncList.count(); ++i ) {
                 if ( !catList.contains (catIncList[i])) {
                     catList.append( catIncList[i] );
                     //qDebug("add cat %s ",  catIncList[i].latin1());
                     ++count;
                 }
             }
         }
         catList.sort();
         KABPrefs::instance()->mCustomCategories = catList;
         KABPrefs::instance()->writeConfig();
         message(QString::number( count )+ i18n(" categories added to list! "));
     } else {
         QStringList catList = KABPrefs::instance()->mCustomCategories;
         QStringList catIncList;
         QStringList newCatList;
         KABC::AddressBook::Iterator it;
         for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { 
             QStringList catIncList = (*it).categories();
             int i;
             if ( catIncList.count() ) {
                 newCatList.clear();
                 for( i = 0; i<   catIncList.count(); ++i ) {
                     if ( catList.contains (catIncList[i])) {
                         newCatList.append( catIncList[i] );
                     }
                 }
                 newCatList.sort();
                 (*it).setCategories( newCatList );
                 mAddressBook->insertAddressee( (*it) );
             }
         } 
         setModified( true );
         mViewManager->refreshView();
-        mDetails->refreshView();
         message( i18n("Removing categories done!"));
     }
     delete cp;
 }
 void KABCore::removeVoice()
 {
     if ( KMessageBox::questionYesNo( this, i18n("After importing, phone numbers\nmay have two or more types.\n(E.g. work+voice)\nThese numbers are shown as \"other\".\nClick Yes to remove the voice type\nfrom numbers with more than one type.\n\nRemove voice type?") ) == KMessageBox::No )
         return;
     KABC::Addressee::List list;
     XXPortSelectDialog dlg( this, false, this );
     if ( dlg.exec() )
         list = dlg.contacts();
     else
         return;
     KABC::Addressee::List::Iterator it;
     for ( it = list.begin(); it != list.end(); ++it ) {
         if ( (*it).removeVoice() )
             contactModified((*it) );
     }
 }
 
 
 
 void KABCore::clipboardDataChanged()
 {
 
   if ( mReadWrite )
     mActionPaste->setEnabled( !QApplication::clipboard()->text().isEmpty() );
 
 }
 
 void KABCore::updateActionMenu()
 {
   UndoStack *undo = UndoStack::instance();
   RedoStack *redo = RedoStack::instance();
 
   if ( undo->isEmpty() )
     mActionUndo->setText( i18n( "Undo" ) );
   else
     mActionUndo->setText( i18n( "Undo %1" ).arg( undo->top()->name() ) );
 
   mActionUndo->setEnabled( !undo->isEmpty() );
 
   if ( !redo->top() )
     mActionRedo->setText( i18n( "Redo" ) );
   else
     mActionRedo->setText( i18n( "Redo %1" ).arg( redo->top()->name() ) );
 
   mActionRedo->setEnabled( !redo->isEmpty() );
 }
 
 void KABCore::configureKeyBindings()
 {
 #ifndef KAB_EMBEDDED
   KKeyDialog::configure( actionCollection(), true );
 #else //KAB_EMBEDDED
   qDebug("KABCore::configureKeyBindings() not implemented");
 #endif //KAB_EMBEDDED
 }
 
 #ifdef KAB_EMBEDDED
 void KABCore::configureResources()
 {
   KRES::KCMKResources dlg( this, "" , 0 );
 
   if ( !dlg.exec() )
     return;
   KMessageBox::information( this,  i18n("Please restart to get the \nchanged resources (re)loaded!\n") );
 }
 #endif //KAB_EMBEDDED
 
 
 /* this method will be called through the QCop interface from Ko/Pi to select addresses
  * for the attendees list of an event.
  */
 void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QString& uid)
 {
   QStringList nameList;
   QStringList emailList;
   QStringList uidList;
 
   KABC::Addressee::List list = KABC::AddresseeDialog::getAddressees(this);
   uint i=0;
   for (i=0; i < list.count(); i++)
   {
         nameList.append(list[i].realName());
         emailList.append(list[i].preferredEmail());
         uidList.append(list[i].uid());
   }
 
   bool res = ExternalAppHandler::instance()->returnNameEmailUidListFromKAPI(sourceChannel, uid, nameList, emailList, uidList);
 
 }
 
 /* this method will be called through the QCop interface from Ko/Pi to select birthdays
  * to put them into the calendar.
  */
 void KABCore::requestForBirthdayList(const QString& sourceChannel, const QString& uid)
 {
   //  qDebug("KABCore::requestForBirthdayList");
   QStringList birthdayList;
   QStringList anniversaryList;
   QStringList realNameList;
   QStringList preferredEmailList;
   QStringList assembledNameList;
   QStringList uidList;
 
   KABC::AddressBook::Iterator it;
 
     int count = 0;
     for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { 
         ++count;
     }
     QProgressBar bar(count,0 );
     int w = 300;
     if ( QApplication::desktop()->width() < 320 )
         w = 220;
     int h = bar.sizeHint().height() ;
     int dw = QApplication::desktop()->width();
     int dh = QApplication::desktop()->height();
     bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
     bar.show();
     bar.setCaption (i18n("Collecting birthdays - close to abort!") );
     qApp->processEvents();
 
     QDate bday;
     QString anni;
     QString formattedbday;
 
   for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it )  
   {
         if ( ! bar.isVisible() )
             return;
         bar.setProgress( count++ );
         qApp->processEvents();
         bday = (*it).birthday().date();
         anni = (*it).custom("KADDRESSBOOK", "X-Anniversary" );
 
         if ( bday.isValid() || !anni.isEmpty())
         {
           if (bday.isValid()) 
             formattedbday = KGlobal::locale()->formatDate(bday,  true, KLocale::ISODate);
           else
             formattedbday = "NOTVALID";
           if (anni.isEmpty())
             anni = "INVALID";
             
           birthdayList.append(formattedbday);
           anniversaryList.append(anni); //should be ISODate
           realNameList.append((*it).realName());
           preferredEmailList.append((*it).preferredEmail());
           assembledNameList.append((*it).assembledName());
           uidList.append((*it).uid());
 
           //qDebug("found birthday in KA/Pi: %s,%s,%s,%s: %s, %s", (*it).realName().latin1(), (*it).preferredEmail().latin1(), (*it).assembledName().latin1(), (*it).uid().latin1(), formattedbday.latin1(), anni.latin1() );
         }
   }
 
   bool res = ExternalAppHandler::instance()->returnBirthdayListFromKAPI(sourceChannel, uid, birthdayList, anniversaryList, realNameList, preferredEmailList, assembledNameList, uidList);
 
 }
 
 /* this method will be called through the QCop interface from other apps to show details of a contact.
  */
 void KABCore::requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid)
 {
     //qDebug("KABCore::requestForDetails %s %s %s %s %s", sourceChannel.latin1(), sessionuid.latin1(), name.latin1(), email.latin1(), uid.latin1());
 
     QString foundUid = QString::null;
     if ( ! uid.isEmpty() ) {
         Addressee adrr = mAddressBook->findByUid( uid );
         if (  !adrr.isEmpty() ) {
             foundUid = uid;
         }
             if ( email == "sendbacklist" ) {
                 //qDebug("ssssssssssssssssssssssend ");
                 QStringList nameList;
                 QStringList emailList;
                 QStringList uidList;
                 nameList.append(adrr.realName());
                 emailList = adrr.emails();
                 uidList.append( adrr.preferredEmail());
                 bool res = ExternalAppHandler::instance()->returnNameEmailUidListFromKAPI("QPE/Application/ompi", uid, nameList, emailList, uidList);
                 return;
             }
         
     }
   
   if ( email == "sendbacklist" ) 
       return;
   if (foundUid.isEmpty())
   {
     //find the uid of the person first
     Addressee::List namelist;
     Addressee::List emaillist;
 
     if (!name.isEmpty())
       namelist = mAddressBook->findByName( name );
 
     if (!email.isEmpty())
       emaillist = mAddressBook->findByEmail( email );
     //qDebug("count %d %d ",  namelist.count(),emaillist.count() );
     //check if we have a match in Namelist and Emaillist
     if ((namelist.count() == 0) && (emaillist.count() > 0)) {
       foundUid = emaillist[0].uid();
     }
     else if ((namelist.count() > 0) && (emaillist.count() == 0))
       foundUid = namelist[0].uid();
     else
     {
       for (int i = 0; i < namelist.count(); i++)
       {
         for (int j = 0; j < emaillist.count(); j++)
         {
           if (namelist[i] == emaillist[j])
           {
             foundUid = namelist[i].uid();
           }
         }
       }
     }
   }
   else
   {
     foundUid = uid;
   }
 
   if (!foundUid.isEmpty())
   {
    
     // raise Ka/Pi if it is in the background
 #ifndef DESKTOP_VERSION
 #ifndef KORG_NODCOP
       //QCopEnvelope e("QPE/Application/kapi", "raise()");
 #endif
 #endif
     
     mMainWindow->showMaximized();
     mMainWindow-> raise();
 
     mViewManager->setSelected( "", false);
     mViewManager->refreshView( "" );
     mViewManager->setSelected( foundUid, true );
     mViewManager->refreshView( foundUid );
 
     if ( !mMultipleViewsAtOnce )
     {
       setDetailsVisible( true );
       mActionDetails->setChecked(true);
     }
   }
 }
 
 void KABCore::whatsnew()
 {
     KApplication::showFile( "KDE-Pim/Pi Version Info", "kdepim/WhatsNew.txt" );
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index c7c12ff..85ffbdb 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -1,516 +1,515 @@
 /*
     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 KABCORE_H
 #define KABCORE_H
 
 #include <kabc/field.h>
 
 #ifndef KAB_EMBEDDED
 #endif //KAB_EMBEDDED
 #include <qdict.h>
 #include <qtimer.h>
 
 #include <qwidget.h>
 #include <qpopupmenu.h>
 #include <ksyncmanager.h>
 #ifndef DESKTOP_VERSION
 #include <qcopchannel_qws.h> 
 #endif
 
 namespace KABC {
 class AddressBook;
 }
 
 #ifndef KAB_EMBEDDED
 class KAboutData;
 class KConfig;
 
 class KAddressBookService;
 class LDAPSearchDialog;
 #else //KAB_EMBEDDED
 class KAddressBookMain;
 //US class QAction;
 #endif //KAB_EMBEDDED
 class KCMultiDialog;
 class KXMLGUIClient;
 class ExtensionManager;
 class XXPortManager;
 class JumpButtonBar;
 class IncSearchWidget;
 class KDGanttMinimizeSplitter;
 class KAction;
 class KActionCollection;
 class KToggleAction;
 class KSyncProfile;
 
 class QAction;
 class QMenuBar;
 class QSplitter;
 class ViewContainer;
 class ViewManager;
 class AddresseeEditorDialog;
 class Ir;
 
 class KABCore : public QWidget, public KSyncInterface
 {
   Q_OBJECT
 
   public:
     KABCore( KAddressBookMain *client, bool readWrite, QWidget *parent, const char *name = 0 );
 
 
     ~KABCore();
 
 
 #ifdef KAB_EMBEDDED
   //US added functionality
     QPopupMenu* getViewMenu() {return viewMenu;}
     QPopupMenu* getFilterMenu() {return filterMenu;}
     QPopupMenu* getSettingsMenu() {return settingsMenu;}
     void addActionsManually();
 #endif //KAB_EMBEDDED
     /**
       Restores the global settings.
      */
     void restoreSettings();
 
-    /**
-      Saves the global settings.
-     */
-    void saveSettings();
+  
 
     /**
       Returns a pointer to the StdAddressBook of the application.
      */
     KABC::AddressBook *addressBook() const;
 
     /**
       Returns a pointer to the KConfig object of the application.
      */
     static KConfig *config();
 
     /**
       Returns a pointer to the global KActionCollection object. So
       other classes can register their actions easily.
      */
     KActionCollection *actionCollection() const;
 
     /**
       Returns the current search field of the Incremental Search Widget.
      */
     KABC::Field *currentSearchField() const;
 
     /**
       Returns the uid list of the currently selected contacts.
      */
     QStringList selectedUIDs() const;
 
     /**
       Displays the ResourceSelectDialog and returns the selected
       resource or a null pointer if no resource was selected by
       the user.
      */
     KABC::Resource *requestResource( QWidget *parent );
 
 #ifndef KAB_EMBEDDED
     static KAboutData *createAboutData();
 #endif //KAB_EMBEDDED
 
 #ifdef KAB_EMBEDDED
     inline QPopupMenu* getImportMenu() { return ImportMenu;}
     inline QPopupMenu* getExportMenu() { return ExportMenu;}
 #endif //KAB_EMBEDDED
 
   public slots:
 #ifdef KAB_EMBEDDED
     void createAboutData();
 #endif //KAB_EMBEDDED
     void setDetailsToggle();
 
     void showLicence();
     void faq();
     void whatsnew() ;
     void synchowto() ;
     void multisynchowto() ;
     void kdesynchowto() ;
     void writeToPhone();
 
     /**
       Is called whenever a contact is selected in the view.
      */
     void setContactSelected( const QString &uid );
 
     /**
       Opens the preferred mail composer with all selected contacts as
       arguments.
      */
     void sendMail();
 
     /**
       Opens the preferred mail composer with the given contacts as
       arguments.
      */
     void sendMail( const QString& email );
 
 
     void mailVCard();
     void mailVCard(const QStringList& uids);
 
     /**
       Beams the "WhoAmI contact.
      */
     void beamMySelf();
 
     void beamVCard();
     void export2phone();
     void beamVCard(const QStringList& uids);
     void beamDone( Ir *ir );
 
 
     /**
       Starts the preferred web browser with the given URL as argument.
      */
     void browse( const QString& url );
 
     /**
       Select all contacts in the view.
      */
     void selectAllContacts();
 
     /**
       Deletes all selected contacts from the address book.
      */
     void deleteContacts();
 
     /**
       Deletes given contacts from the address book.
 
       @param uids The uids of the contacts, which shall be deleted.
      */
     void deleteContacts( const QStringList &uids );
 
     /**
       Copys the selected contacts into clipboard for later pasting.
      */
     void copyContacts();
 
     /**
       Cuts the selected contacts and stores them for later pasting.
      */
     void cutContacts();
 
     /**
       Paste contacts from clipboard into the address book.
      */
     void pasteContacts();
 
     /**
       Paste given contacts into the address book.
 
       @param list The list of addressee, which shall be pasted.
      */
     void pasteContacts( KABC::Addressee::List &list );
 
     /**
       Sets the whoAmI contact, that is used by many other programs to
       get personal information about the current user.
      */
     void setWhoAmI();
 
     /**
       Displays the category dialog and applies the result to all
       selected contacts.
      */
     void setCategories();
     void manageCategories();
     void editCategories();
 
     /**
       Sets the field list of the Incremental Search Widget.
      */
     void setSearchFields( const KABC::Field::List &fields );
 
     /**
       Search with the current search field for a contact, that matches
       the given text, and selects it in the view.
      */
     void incrementalSearch( const QString& text );
 
     /**
       Marks the address book as modified.
      */
     void setModified();
     /**
       Marks the address book as modified without refreshing the view.
      */
     void setModifiedWOrefresh();
 
     /**
       Marks the address book as modified concerning the argument.
      */
     void setModified( bool modified );
 
     /**
       Returns whether the address book is modified.
      */
     bool modified() const;
 
     /**
       Called whenever an contact is modified in the contact editor
       dialog or the quick edit.
      */
     void contactModified( const KABC::Addressee &addr );
 
     /**
       DCOP METHODS.
      */
     void addEmail( QString addr );
     void importVCard( const KURL& url, bool showPreview );
     void importVCard( const QString& vCard, bool showPreview );
     void newContact();
     QString getNameByPhone( const QString& phone );
     /**
       END DCOP METHODS
      */
 
     /**
       Saves the contents of the AddressBook back to disk.
      */
     void save();
 
     /**
       Undos the last command using the undo stack.
      */
     void undo();
 
     /**
       Redos the last command that was undone, using the redo stack.
      */
     void redo();
 
     /**
       Shows the edit dialog for the given uid. If the uid is QString::null,
       the method will try to find a selected addressee in the view.
      */
     void editContact( const QString &uid /*US = QString::null*/ );
 //US added a second method without defaultparameter
     void editContact2();
 
     /**
       Shows or edits the detail view for the given uid. If the uid is QString::null,
       the method will try to find a selected addressee in the view.
      */
     void executeContact( const QString &uid /*US = QString::null*/ );
 
     /**
       Launches the configuration dialog.
      */
     void openConfigDialog();
 
     /**
       Launches the ldap search dialog.
      */
     void openLDAPDialog();
 
     /**
       Creates a KAddressBookPrinter, which will display the print
       dialog and do the printing.
      */
     void print();
 
     /**
       Registers a new GUI client, so plugins can register its actions.
      */
    void addGUIClient( KXMLGUIClient *client );
 
    void requestForNameEmailUidList(const QString& sourceChannel, const QString& sessionuid);
    void requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid);
    void requestForBirthdayList(const QString& sourceChannel, const QString& sessionuid);
 
 
   signals:
     void contactSelected( const QString &name );
     void contactSelected( const QPixmap &pixmap );
   public slots:
     void recieve(QString cmsg );
     void getFile( bool success );
     void syncFileRequest();
     void setDetailsVisible( bool visible );
     void setDetailsToState();
-    //    void slotSyncMenu( int );
+   
+    void saveSettings();
+
   private slots:
     void updateToolBar();
     void updateMainWindow();
     void receive( const QCString& cmsg, const QByteArray& data );
     void toggleBeamReceive( );
     void disableBR(bool);
     void setJumpButtonBarVisible( bool visible );
     void setCaptionBack();
   void importFromOL();
     void extensionModified( const KABC::Addressee::List &list );
     void extensionChanged( int id );
     void clipboardDataChanged();
     void updateActionMenu();
     void configureKeyBindings();
     void removeVoice();
 #ifdef KAB_EMBEDDED
     void configureResources();
 #endif //KAB_EMBEDDED
 
     void slotEditorDestroyed( const QString &uid );
     void configurationChanged();
     void addressBookChanged();
 
   private:
     void resizeEvent(QResizeEvent* e );
     bool mBRdisabled;
 #ifndef DESKTOP_VERSION
     QCopChannel* infrared;
 #endif
     QTimer *mMessageTimer;
     void initGUI();
     void initActions();
     QString getPhoneFile();
 
     AddresseeEditorDialog *createAddresseeEditorDialog( QWidget *parent,
                                                         const char *name = 0 );
 
  KXMLGUIClient *mGUIClient;
 
   KABC::AddressBook *mAddressBook;
 
   ViewManager *mViewManager;
   // QSplitter *mDetailsSplitter;
   KDGanttMinimizeSplitter *mExtensionBarSplitter;
   ViewContainer *mDetails;
   KDGanttMinimizeSplitter* mMiniSplitter;
   XXPortManager *mXXPortManager;
   JumpButtonBar *mJumpButtonBar;
   IncSearchWidget *mIncSearchWidget;
   ExtensionManager *mExtensionManager;
 
   KCMultiDialog *mConfigureDialog;
 
 #ifndef KAB_EMBEDDED
     LDAPSearchDialog *mLdapSearchDialog;
 #endif //KAB_EMBEDDED
     // QDict<AddresseeEditorDialog> mEditorDict;
     AddresseeEditorDialog *mEditorDialog;
     bool mReadWrite;
     bool mModified;
     bool mIsPart;
     bool mMultipleViewsAtOnce;
 
 
     //US file menu
     KAction *mActionMail;
     KAction *mActionBeam;
     KToggleAction *mActionBR;
     KAction *mActionExport2phone;
     KAction* mActionPrint;
     KAction* mActionNewContact;
     KAction *mActionSave;
     KAction *mActionEditAddressee;
     KAction *mActionMailVCard;
     KAction *mActionBeamVCard;
 
     KAction *mActionQuit;
 
     //US edit menu
     KAction *mActionCopy;
     KAction *mActionCut;
     KAction *mActionPaste;
     KAction *mActionSelectAll;
     KAction *mActionUndo;
     KAction *mActionRedo;
     KAction *mActionDelete;
 
     //US settings menu
     KAction *mActionConfigResources;
     KAction *mActionConfigKAddressbook;
     KAction *mActionConfigShortcuts;
     KAction *mActionConfigureToolbars;
     KAction *mActionKeyBindings;
     KToggleAction *mActionJumpBar;
     KToggleAction *mActionDetails;
     KAction *mActionWhoAmI;
     KAction *mActionCategories;
     KAction *mActionEditCategories;
     KAction *mActionManageCategories;
     KAction *mActionAboutKAddressbook;
     KAction *mActionLicence;
     KAction *mActionFaq;
     KAction *mActionWN;
     KAction *mActionSyncHowto;
     KAction *mActionKdeSyncHowto;
     KAction *mActionMultiSyncHowto;
 
     KAction *mActionDeleteView;
 
     QPopupMenu *viewMenu;
     QPopupMenu *filterMenu;
     QPopupMenu *settingsMenu;
     QPopupMenu *changeMenu;
     QPopupMenu *beamMenu;
 //US    QAction *mActionSave;
     QPopupMenu *ImportMenu;
     QPopupMenu *ExportMenu;
     //LR additional methods
     KAction *mActionRemoveVoice;
     KAction * mActionImportOL;
 
 #ifndef KAB_EMBEDDED
     KAddressBookService *mAddressBookService;
 #endif //KAB_EMBEDDED
 
     class KABCorePrivate;
     KABCorePrivate *d;
     //US    bool mBlockSaveFlag;
 
 #ifdef KAB_EMBEDDED
     KAddressBookMain *mMainWindow;  // should be the same like mGUIClient
 #endif //KAB_EMBEDDED
 
     //this are the overwritten callbackmethods from the syncinterface
     virtual bool sync(KSyncManager* manager, QString filename, int mode);
     virtual bool syncExternal(KSyncManager* manager, QString resource);
     virtual void removeSyncInfo( QString syncProfile);
     bool syncPhone();
     void message( QString m );
 
     // LR *******************************
     // sync stuff!
     QString sentSyncFile();
     QPopupMenu *syncMenu;
     KSyncManager* syncManager;
     int mGlobalSyncMode; 
     bool synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBook* remote,int mode);
     KABC::Addressee getLastSyncAddressee();
     QDateTime mLastAddressbookSync;
     int  takeAddressee( KABC::Addressee* local,  KABC::Addressee* remote, int mode , bool full );
     // *********************
 
 };
 
 #endif
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index 33bef5a..59bddd9 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -352,374 +352,375 @@ void ViewManager::editView()
       } else if ( mActiveView->defaultFilterType() == KAddressBookView::Active ) {
         setActiveFilter( mActionSelectFilter->currentItem() );
       } else {
         uint pos = filterPosition( mActiveView->defaultFilterName() );
         mActionSelectFilter->setCurrentItem( pos );
         setActiveFilter( pos );
       }
       mCore->setSearchFields( mActiveView->fields() );
 //US performance optimization. setActiveFilter calls also mActiveView->refresh()
 //US      mActiveView->refresh();
 
 
       //US this is a bugfix, that we get notified if we change a views configuration
       emit modified();
 
     }
 
   }
   delete dlg;
 }
 
 void ViewManager::deleteView()
 {
   QString text = i18n( "<qt>Are you sure that you want to delete the view <b>%1</b>?</qt>" )
                      .arg( mActiveView->caption() );
   QString caption = i18n( "Confirm Delete" );
 
 
    if (QMessageBox::information( this, caption,
                                       text,
                                       i18n("Yes!"), i18n("No"), 0, 0 ) == 0)
    {
     mViewNameList.remove( mActiveView->caption() );
 
     // remove the view from the config file
     KConfig *config = mCore->config();
     config->deleteGroup( mActiveView->caption() );
 
     mViewDict.remove( mActiveView->caption() );
     mActiveView = 0;
 
     // we are in an invalid state now, but that should be fixed after
     // we emit the signal
     mActionSelectView->setItems( mViewNameList );
     if ( mViewNameList.count() > 0 ) {
       mActionSelectView->setCurrentItem( 0 );
       setActiveView( mViewNameList[ 0 ] );
     }
     mActionDeleteView->setEnabled( mViewNameList.count() > 1 );
   }
 }
 
 void ViewManager::addView()
 {
   AddViewDialog dialog( &mViewFactoryDict, this );
 
   if ( dialog.exec() ) {
     QString newName = dialog.viewName();
     QString type = dialog.viewType();
 
     // Check for name conflicts
     bool firstConflict = true;
     int numTries = 1;
     while ( mViewNameList.contains( newName ) > 0 ) {
       if ( !firstConflict ) {
         newName = newName.left( newName.length() - 4 );
         firstConflict = false;
       }
 
       newName = QString( "%1 <%2>" ).arg( newName ).arg( numTries );
       numTries++;
     }
 
     // Add the new one to the list
     mViewNameList.append( newName );
 
     // write the view to the config file,
     KConfig *config = mCore->config();
 
     config->deleteGroup( newName );
 
     KConfigGroupSaver saver( config, newName );
 
     config->writeEntry( "Type", type );
 
     // try to set the active view
     mActionSelectView->setItems( mViewNameList );
     mActionSelectView->setCurrentItem( mViewNameList.findIndex( newName ) );
     setActiveView( newName );
 
     editView();
 
     mActionDeleteView->setEnabled( mViewNameList.count() > 1 );
   }
 }
 
 void ViewManager::createViewFactories()
 {
 #ifndef KAB_EMBEDDED
   KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/View" );
   KTrader::OfferList::ConstIterator it;
   for ( it = plugins.begin(); it != plugins.end(); ++it ) {
     if ( !(*it)->hasServiceType( "KAddressBook/View" ) )
       continue;
 
     KLibFactory *factory = KLibLoader::self()->factory( (*it)->library().latin1() );
 
     if ( !factory ) {
       kdDebug(5720) << "ViewManager::createViewFactories(): Factory creation failed" << endl;
       continue;
     }
 
     ViewFactory *viewFactory = static_cast<ViewFactory*>( factory );
 
     if ( !viewFactory ) {
       kdDebug(5720) << "ViewManager::createViewFactories(): Cast failed" << endl;
       continue;
     }
 
     mViewFactoryDict.insert( viewFactory->type(), viewFactory );
   }
 
 #else //KAB_EMBEDDED
   ViewFactory* viewFactory = new IconViewFactory();
   mViewFactoryDict.insert( viewFactory->type(), viewFactory );
 //  qDebug("ViewManager::createViewFactories() Loading factory: %s", viewFactory->type().latin1());
 
   viewFactory = new TableViewFactory();
   mViewFactoryDict.insert( viewFactory->type(), viewFactory );
 //  qDebug("ViewManager::createViewFactories() Loading factory: %s", viewFactory->type().latin1());
 
   viewFactory = new CardViewFactory();
   mViewFactoryDict.insert( viewFactory->type(), viewFactory );
 //  qDebug("ViewManager::createViewFactories() Loading factory: %s", viewFactory->type().latin1());
 
 #endif //KAB_EMBEDDED
 
 }
 
 void ViewManager::dropped( QDropEvent *e )
 {
   kdDebug(5720) << "ViewManager::dropped: got a drop event" << endl;
 
 #ifndef KAB_EMBEDDED
 
   QString clipText, vcards;
   KURL::List urls;
 
   if ( KURLDrag::decode( e, urls) ) {
     KURL::List::Iterator it = urls.begin();
     int c = urls.count();
     if ( c > 1 ) {
       QString questionString = i18n( "Import one contact into your addressbook?", "Import %n contacts into your addressbook?", c );
       if ( KMessageBox::questionYesNo( this, questionString, i18n( "Import Contacts?" ) ) == KMessageBox::Yes ) {
         for ( ; it != urls.end(); ++it )
           emit urlDropped( *it );
       }
     } else if ( c == 1 )
       emit urlDropped( *it );
   } else if ( KVCardDrag::decode( e, vcards ) ) {
     KABC::Addressee addr;
     KABC::VCardConverter converter;
     QStringList list = QStringList::split( "\r\n\r\n", vcards );
     QStringList::Iterator it;
     for ( it = list.begin(); it != list.end(); ++it ) {
       if ( converter.vCardToAddressee( (*it).stripWhiteSpace(), addr ) ) {
         KABC::Addressee a = mCore->addressBook()->findByUid( addr.uid() );
         if ( a.isEmpty() ) {
           mCore->addressBook()->insertAddressee( addr );
           emit modified();
         }
       }
     }
 
     mActiveView->refresh();
   }
 #else //KAB_EMBEDDED
 qDebug("ViewManager::dropped() has to be changed!!" );
 #endif //KAB_EMBEDDED
 
 }
 
 void ViewManager::startDrag()
 {
   kdDebug(5720) << "ViewManager::startDrag: starting to drag" << endl;
 
 #ifndef KAB_EMBEDDED
 
   // Get the list of all the selected addressees
   KABC::Addressee::List addrList;
   QStringList uidList = selectedUids();
   QStringList::Iterator iter;
   for ( iter = uidList.begin(); iter != uidList.end(); ++iter )
     addrList.append( mCore->addressBook()->findByUid( *iter ) );
 
   KMultipleDrag *drag = new KMultipleDrag( this );
   drag->addDragObject( new QTextDrag( AddresseeUtil::addresseesToClipboard(addrList), this ) );
   KABC::Addressee::List::Iterator it;
   QStringList vcards;
   for ( it = addrList.begin(); it != addrList.end(); ++it ) {
     QString vcard = QString::null;
     KABC::VCardConverter converter;
     if ( converter.addresseeToVCard( *it, vcard ) )
       vcards.append( vcard );
   }
   drag->addDragObject( new KVCardDrag( vcards.join( "\r\n" ), this ) );
 
   drag->setPixmap( KGlobal::iconLoader()->loadIcon( "vcard", KIcon::Desktop ) );
   drag->dragCopy();
 
 #else //KAB_EMBEDDED
 qDebug("ViewManager::startDrag() has to be changed!!" );
 #endif //KAB_EMBEDDED
 
 }
 void ViewManager::doSearch( const QString&  s,KABC::Field *field  )
 {
     if ( mActiveView ) 
         mActiveView->doSearch( s, field  );
 
 }
 void ViewManager::setActiveFilter( int index )
 {
   Filter currentFilter;
 
   if ( ( index - 1 ) < 0 )
     currentFilter = Filter();
   else
     currentFilter = mFilterList[ index - 1 ];
 
   // Check if we have a view. Since the filter combo is created before
   // the view, this slot could be called before there is a valid view.
   if ( mActiveView ) {
     mActiveView->setFilter( currentFilter );
     mActiveView->refresh();
     emit selected( QString::null );
   }
 }
 
 void ViewManager::configureFilters()
 {
   FilterDialog dlg( this );
 
   dlg.setFilters( mFilterList );
 
   if ( dlg.exec() )
     mFilterList = dlg.filters();
 
   uint pos = mActionSelectFilter->currentItem();
   mActionSelectFilter->setItems( filterNames() );
   mActionSelectFilter->setCurrentItem( pos );
   setActiveFilter( pos );
   int cw = 150;
   if (QApplication::desktop()->width() == 480 )
       cw = 0; 
   mActionSelectFilter->setComboWidth( cw );
+  saveSettings();
 }
 
 QStringList ViewManager::filterNames() const
 {
   QStringList names( i18n( "No Filter" ) );
 
   Filter::List::ConstIterator it;
   for ( it = mFilterList.begin(); it != mFilterList.end(); ++it )
     names.append( (*it).name() );
 
   return names;
 }
 
 int ViewManager::filterPosition( const QString &name ) const
 {
   int pos = 0;
 
   Filter::List::ConstIterator it;
   for ( it = mFilterList.begin(); it != mFilterList.end(); ++it, ++pos )
     if ( name == (*it).name() )
       return pos + 1;
 
   return 0;
 }
 
 void ViewManager::initActions()
 {
 //US      <ActionList name="view_loadedviews"/>
 //US      <Separator/>
 
 #ifdef KAB_EMBEDDED
   QPopupMenu *viewmenu = (QPopupMenu*)mCore->getViewMenu();
   QPopupMenu *settingsmenu = (QPopupMenu*)mCore->getSettingsMenu();
   QPopupMenu *filtermenu = (QPopupMenu*)mCore->getFilterMenu();
 #endif //KAB_EMBEDDED
 
   mActionSelectView = new KSelectAction( i18n( "Select View" ), 0, mCore->actionCollection(), "select_view" );
 #if KDE_VERSION >= 309
   mActionSelectView->setMenuAccelsEnabled( false );
 #endif
   connect( mActionSelectView, SIGNAL( activated( const QString& ) ),
            SLOT( setActiveView( const QString& ) ) );
 
 
 #ifdef KAB_EMBEDDED
   mActionSelectView->plug(viewmenu);
   viewmenu->insertSeparator();
 #endif //KAB_EMBEDDED
 
   KAction *action;
 
   action = new KAction( i18n( "Modify View..." ), "configure", 0, this,
                SLOT( editView() ), mCore->actionCollection(), "view_modify" );
 #ifndef KAB_EMBEDDED
   action->setWhatsThis( i18n( "By pressing this button a dialog opens that allows you to modify the view of the addressbook. There you can add or remove fields that you want to be shown or hidden in the addressbook like the name for example." ) );
 #else //KAB_EMBEDDED
   action->plug(viewmenu);
 #endif //KAB_EMBEDDED
 
   action = new KAction( i18n( "Add View..." ), "window_new", 0, this,
                SLOT( addView() ), mCore->actionCollection(), "view_add" );
 #ifndef KAB_EMBEDDED
   action->setWhatsThis( i18n( "You can add a new view by choosing one of the dialog that appears after pressing the button. You have to give the view a name, so that you can distinguish between the different views." ) );
 #else //KAB_EMBEDDED
   action->plug(viewmenu);
 #endif //KAB_EMBEDDED
 
   mActionDeleteView = new KAction( i18n( "Delete View" ), "view_remove", 0,
                                    this, SLOT( deleteView() ),
                                    mCore->actionCollection(), "view_delete" );
 #ifndef KAB_EMBEDDED
   mActionDeleteView->setWhatsThis( i18n( "By pressing this button you can delete the actual view, which you have added before." ) );
 #else //KAB_EMBEDDED
   mActionDeleteView->plug(viewmenu);
   viewmenu->insertSeparator();
 #endif //KAB_EMBEDDED
 
 #ifndef KAB_EMBEDDED
   action = new KAction( i18n( "Refresh View" ), "reload", 0, this,
                SLOT( refreshView(const QString &) ), mCore->actionCollection(),
                "view_refresh" );
   action->setWhatsThis( i18n( "The view will be refreshed by pressing this button." ) );
 #else //KAB_EMBEDDED
   action = new KAction( i18n( "Refresh View" ), "reload", 0, this,
                SLOT( refreshView()), mCore->actionCollection(),
                "view_refresh" );
   action->plug(viewmenu);
   viewmenu->insertSeparator();
 #endif //KAB_EMBEDDED
 
   action = new KAction( i18n( "Edit &Filters..." ), "filter", 0, this,
                SLOT( configureFilters() ), mCore->actionCollection(),
                "options_edit_filters" );
 
   mActionSelectFilter = new KSelectAction( i18n( "Select Filter" ), "filter", mCore->actionCollection(), "select_filter" );
 #if KDE_VERSION >= 309
   mActionSelectFilter->setMenuAccelsEnabled( false );
 #endif
   connect( mActionSelectFilter, SIGNAL( activated( int ) ),
            SLOT( setActiveFilter( int ) ) );
 
 #ifdef KAB_EMBEDDED
   action->plug(settingsmenu);
   mActionSelectFilter->plug(viewmenu);
 #endif //KAB_EMBEDDED
 
 }
 
 void ViewManager::initGUI()
 {
     QHBoxLayout *layout = new QHBoxLayout( this, 0, 0 );
   mViewWidgetStack = new QWidgetStack( this );
   layout->addWidget( mViewWidgetStack );
 }
 
 #ifndef KAB_EMBEDDED
 #include "viewmanager.moc"
 #endif //KAB_EMBEDDED
diff --git a/kde2file/abdump/main.cpp b/kde2file/abdump/main.cpp
index 1ee64f5..9ad78e5 100644
--- a/kde2file/abdump/main.cpp
+++ b/kde2file/abdump/main.cpp
@@ -1,195 +1,193 @@
 /*******************************************************************************
  * main.cpp                                                                    *
  *                                                                             *
  * 
  *                                                                             *
  * 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 <kcmdlineargs.h>
 #include <kaboutdata.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kconfig.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 
 #include <kabc/addressbook.h>
 #include <kabc/stdaddressbook.h>
 #include <kabc/resource.h>
 #include <kabc/vcardconverter.h>
 
 #include <qdatetime.h>
 #include <qfile.h>
 #include <qdir.h>
 #include <qapplication.h>
 
 #include <stdlib.h>
 #include <iostream>
 
 using namespace std;
 
 static const char progName[] = "kdecalendar";
 static const char progDisplay[] = "KDE_Addressbook";
 static const char progVersion[] = "33.1/3";
 static const char progDesc[] = "A command line interface to KDE addressbooks";
 
 
 static KCmdLineOptions options[] =
     {
         { "dump",
           I18N_NOOP( "Dumps addressbook" ), 0 },
         { "read",
           I18N_NOOP( "Reads addressbook" ), 0 },
         KCmdLineLastOption
     };
 
 int main( int argc, char *argv[] )
 {
     KAboutData aboutData(
                          progName,                        // internal program name
                          I18N_NOOP( progDisplay ),        // displayable program name.
                          progVersion,                     // version string
                          I18N_NOOP( progDesc ),           // short porgram description
                          KAboutData::License_GPL,         // license type
                          "(c) 2004, Lutz Rogowski", // copyright statement
                          0,                               // any free form text
                          "",                         // program home page address
                          "bugs.kde.org"                   // bug report email address
                          );
 
 
     // KCmdLineArgs::init() final 'true' argument indicates no commandline options
     // for QApplication/KApplication (no KDE or Qt options)
     KCmdLineArgs::init( argc, argv, &aboutData, true );
     KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
 
     KInstance ins  ( progName );
 
     KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
 
     bool read = false;
     if ( args->isSet( "read" ) ) {
         read = true;
         qDebug("read ");
     }
     QString fileName = QDir::homeDirPath ()+"/.kdeaddressbookdump.vcf";
 
     KABC::StdAddressBook* standardAddressBook = KABC::StdAddressBook::self();
     standardAddressBook->setAutomaticSave( false );
     qDebug("************************************* ");
     qDebug("***************kdeABdump************* ");
     qDebug("************************************* ");
     if ( !read ) {
         KABC::AddressBook::Iterator it;
         KABC::VCardConverter converter;
         QString datastream;
         for( it = standardAddressBook->begin(); it != standardAddressBook->end(); ++it ) { 
             if ( (*it).isEmpty() || ! (*it).resource() )
                 continue;
-            if ( (*it).resource()->readOnly()   )
-                continue;
             KABC::Addressee a = ( *it );
             QString vcard = converter.createVCard( a );
             vcard += QString("\r\n");
             datastream += vcard;
         }
          QFile outFile(fileName);
          if ( outFile.open(IO_WriteOnly) ) { 
              QTextStream t( &outFile );  // use a text stream
              t.setEncoding( QTextStream::UnicodeUTF8 );
              t <<datastream;
              t <<  "\r\n\r\n";
              outFile.close();
          }
     } else {
         //Addressee::List aList;//parseVCards( const QString& vcard );
         KABC::Addressee::List list;
         int added = 0, changedC = 0, deleted = 0;
         QFile file( fileName );
         if ( file.open( IO_ReadOnly ) ) {
             QTextStream t( &file );  // use a text stream
             t.setEncoding( QTextStream::UnicodeUTF8 );
             QString data;
             data = t.read();
             file.close();
             KABC::VCardConverter converter;
             list = converter.parseVCards( data );
             qDebug("kdeABdump::file has %d entries", list.count());
 
             KABC::Addressee::List::Iterator it;
             for ( it = list.begin();it != list.end();++it) {
                 (*it).setChanged( true ); 
                 bool changed = ((*it).custom( "KADDRESSBOOK", "X-ExternalID" ) == "changed");
                 (*it).removeCustom( "KADDRESSBOOK", "X-ExternalID" );
                 //qDebug("ext %s ", (*it).custom( "KADDRESSBOOK", "X-ExternalID" ).latin1());
                 if ( changed ) {
                     //qDebug("changed Addressee found! ");
                     KABC::Addressee std = standardAddressBook->findByUid( (*it).uid() );
                     if ( ! std.isEmpty() )
                         (*it).setResource(std.resource());
                     standardAddressBook->insertAddressee( (*it) );
                     ++changedC;
                 } else {
                     //maybe added?
                     KABC::Addressee std = standardAddressBook->findByUid( (*it).uid() );
                     if (  std.isEmpty() ) {
                         standardAddressBook->insertAddressee( (*it) );
                         ++added;
                     }
                 }
             }
             KABC::AddressBook::Iterator itA = standardAddressBook->begin();
             KABC::AddressBook::Iterator it2 ;
             while ( itA != standardAddressBook->end() ) {
                 bool found = false;
                 KABC::Addressee::List::Iterator itL;
                 for ( itL = list.begin();itL != list.end();++itL) {
                     if ( (*itL).uid() == (*itA).uid() ) {
                         found = true;
                         break;
                     }
                 }
                 if ( !found ) {
                     it2 = itA;
                     ++itA;
                     standardAddressBook->removeAddressee( it2 );
                     ++deleted;
                 } else  {
                     ++itA;
                 }
             }
 
             //standardAddressBook->saveAll();
             standardAddressBook->setAutomaticSave( true );
             qDebug("************************************* ");
             qDebug("*************kdeABdump*************** ");
             qDebug("************************************* ");
             qDebug("Addressbook entries\nchanged %d\ndeleted %d\nadded %d\nfrom file %s", changedC,deleted, added, fileName.latin1());
         } else
             qDebug("error open file ");
     }
 
     delete standardAddressBook;
     //KABC::StdAddressBook::close();
     //StdAddressBook::mSelf = 0;
     qDebug("ente ");
     return 0;
 }
diff --git a/kde2file/caldump/main.cpp b/kde2file/caldump/main.cpp
index be1735b..08ccafb 100644
--- a/kde2file/caldump/main.cpp
+++ b/kde2file/caldump/main.cpp
@@ -1,253 +1,253 @@
 /*******************************************************************************
  * main.cpp                                                                    *
  *                                                                             *
  * 
  *                                                                             *
  * 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.        *
  *                                                                             *
  ******************************************************************************/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #if TIME_WITH_SYS_TIME
 # include <sys/time.h>
 # include <time.h>
 #else
 # if HAVE_SYS_TIME_H
 #  include <sys/time.h>
 # else
 #  include <time.h>
 # endif
 #endif
 
 #include <kcmdlineargs.h>
 #include <kaboutdata.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kconfig.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 
 #include <libkcal/calformat.h>
 #include <libkcal/calendarresources.h>
 #include <libkcal/resourcelocal.h>
 #include <libkcal/filestorage.h>
 #include <libkcal/icalformat.h>
 
 #include <qdatetime.h>
 #include <qfile.h>
 #include <qdir.h>
 #include <qapplication.h>
 
 #include <stdlib.h>
 #include <iostream>
 
 using namespace KCal;
 using namespace std;
 
 static const char progName[] = "kdecalendar";
 static const char progDisplay[] = "KDE_Calendar";
 static const char progVersion[] = "33.1/3";
 static const char progDesc[] = "A command line interface to KDE calendars";
 
 
 static KCmdLineOptions options[] =
     {
         { "dump",
           I18N_NOOP( "Dumps calendar" ), 0 },
         { "read",
           I18N_NOOP( "Reads calendar" ), 0 },
         KCmdLineLastOption
     };
 
 int main( int argc, char *argv[] )
 {
     KAboutData aboutData(
                          progName,                        // internal program name
                          I18N_NOOP( progDisplay ),        // displayable program name.
                          progVersion,                     // version string
                          I18N_NOOP( progDesc ),           // short porgram description
                          KAboutData::License_GPL,         // license type
                          "(c) 2004, Lutz Rogowski", // copyright statement
                          0,                               // any free form text
                          "",                         // program home page address
                          "bugs.kde.org"                   // bug report email address
                          );
 
 
     // KCmdLineArgs::init() final 'true' argument indicates no commandline options
     // for QApplication/KApplication (no KDE or Qt options)
     KCmdLineArgs::init( argc, argv, &aboutData, true );
     KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
 
     KInstance ins  ( progName );
 
     KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
 
     bool read = false;
     if ( args->isSet( "read" ) ) {
         read = true;
         qDebug("read ");
     }
     QString fileName = QDir::homeDirPath ()+"/.kdecalendardump.ics";
     CalendarResources *calendarResource = 0;
     CalendarLocal *localCalendar = 0;
     KConfig c( locate( "config", "korganizerrc" ) );
     c.setGroup( "Time & Date" );
     QString tz = c.readEntry( "TimeZoneId" );
     calendarResource = new CalendarResources( tz );
     calendarResource->readConfig();
     calendarResource->load();
     qDebug("************************************* ");
     qDebug("**************kdecaldump************* ");
     qDebug("************************************* ");
     qDebug("Using timezone ID: %s", calendarResource->timeZoneId().latin1());
 
     if ( !read ) {
         localCalendar = new CalendarLocal();
         localCalendar->setTimeZoneId( calendarResource->timeZoneId());
         KCal::Incidence::List  allInc = calendarResource->rawIncidences();
         Incidence::List::ConstIterator it;
         int num = 0;
         for( it = allInc.begin(); it != allInc.end(); ++it ) {
             ResourceCalendar * re = calendarResource->resource( (*it) );
-            if ( re && !re->readOnly() ) {
+            if ( re && /*!re->readOnly() now readonly syncing possible */) {
                 ++num;
                 Incidence* cl = (*it)->clone();
                 cl->setLastModified( (*it)->lastModified() );
                 if ( cl->type() == "Journal" )
                     localCalendar->addJournal( (Journal *) cl  );
                 else if ( cl->type() == "Todo" )
                     localCalendar->addTodo( (Todo *) cl );
                 else if ( cl->type() == "Event" )
                     localCalendar->addEvent( (Event *) cl );
             }
         }
   
         FileStorage* storage = new FileStorage( calendarResource );
         storage->setFileName( fileName );
         storage->setSaveFormat( new ICalFormat() );
         storage->save();
         delete storage;
         qDebug("************************************* ");
         qDebug("************kdecaldump*************** ");
         qDebug("************************************* ");
         qDebug("%d calendar entries dumped to file %s", num, fileName.latin1());
 
     } else {
         qDebug("************load");
         localCalendar = new CalendarLocal();
         localCalendar->setTimeZoneId( calendarResource->timeZoneId());
         FileStorage* storage = new FileStorage( localCalendar );
         storage->setFileName( fileName );
         int num = 0;
         int del = 0;
         int add = 0;
         if ( storage->load() ) {
             qDebug("***********loaded!");
             KCal::Incidence::List  newInc = localCalendar->rawIncidences();
             Incidence::List::ConstIterator it;
             for( it = newInc.begin(); it != newInc.end(); ++it ) {
                 if ( (*it)->pilotId() > 1 ) { //changed
                     qDebug("*********pilot id %d %s ",(*it)->pilotId() ,(*it)->summary().latin1());
                     Incidence *incOld = calendarResource->incidence( (*it)->uid() );
                     ResourceCalendar * res = 0;
                     if ( incOld )
                         res = calendarResource->resource( incOld );
                     if ( res ) {
                         Incidence* cl = (*it)->clone();
                         cl->setPilotId( incOld->pilotId() );
                         ++num;
                         if ( incOld->type() == "Journal" )
                             calendarResource->deleteJournal( (Journal *) incOld  );
                         else if ( incOld->type() == "Todo" )
                             calendarResource->deleteTodo( (Todo *) incOld );
                         else if ( incOld->type() == "Event" )
                             calendarResource->deleteEvent( (Event *) incOld );
                         qDebug("*********change incidence %s ",cl->summary().latin1());
                         if ( cl->type() == "Journal" )
                             calendarResource->addJournal( (Journal *) cl, res  );
                         else if ( cl->type() == "Todo" )
                             calendarResource->addTodo( (Todo *) cl, res  );
                         else if ( cl->type() == "Event" )
                             calendarResource->addEvent( (Event *) cl, res  );
 
                     } else {
                         Incidence* cl = (*it)->clone();
                         qDebug("*********add incidence %s ",cl->summary().latin1());
                         calendarResource->addIncidence( cl );
                         ++add;
                     }
                 } else { // maybe added
                     Incidence *incOld = calendarResource->incidence( (*it)->uid() );
                     if ( !incOld ) { //added
                         Incidence* cl = (*it)->clone();
                         qDebug("*********add incidence %s ",cl->summary().latin1());
                         calendarResource->addIncidence( cl );
                         ++add;
                     }
                 }
             }
             KCal::Incidence::List  allInc = calendarResource->rawIncidences();
                 
             for( it = allInc.begin(); it != allInc.end(); ++it ) {
                 ResourceCalendar * re = calendarResource->resource( (*it) );
                 if ( re && !re->readOnly() ) {
                     Incidence* cl = localCalendar->incidence( (*it)->uid() );
                     if ( !cl ) {
                         ++del;  
                         cl = (*it);
                         if ( cl->type() == "Journal" )
                             calendarResource->deleteJournal( (Journal *) cl  );
                         else if ( cl->type() == "Todo" )
                             calendarResource->deleteTodo( (Todo *) cl );
                         else if ( cl->type() == "Event" )
                             calendarResource->deleteEvent( (Event *) cl );
                         //QDateTime lm = cl->lastModified();
                         //cl->setResources( (*it)->resources() );
                         //cl->setLastModified(lm);
                     }  
                 }
             }
             
             calendarResource->save();
             qDebug("************************************* ");
             qDebug("************kdecaldump*************** ");
             qDebug("************************************* ");
             qDebug("Calendar entries\nchanged %d\ndeleted %d\nadded %d\nfrom file %s", num,del, add, fileName.latin1());
             
         } else
             qDebug("ERROR loading file %s",fileName.latin1() );
 
     }
 
     if ( localCalendar ) {
         localCalendar->close();
         delete localCalendar;
     }
     if ( calendarResource ) {
         calendarResource->close();
         delete calendarResource;
     }
 
     qDebug("ente ");
     return 0;
 }
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 3d4acb7..f8bfc8b 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -1,369 +1,371 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 1999 Preston Brown
     Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qlistview.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qpopupmenu.h>
 #include <qprogressbar.h>
 #include <qfileinfo.h>
 #include <qmessagebox.h>
 #include <qdialog.h>
 #include <qtextstream.h>
 #include <qdir.h>
 #include <qregexp.h>
 
 #include <klocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kglobal.h>
 
 #include <libkdepim/kpimglobalprefs.h>
 #include <libkcal/calendar.h>
 #include <libkcal/calendarlocal.h>
 #include <libkcal/icalformat.h>
 #include <libkcal/vcalformat.h>
 #include <libkcal/recurrence.h>
 #include <libkcal/filestorage.h>
 #include <libkdepim/categoryselectdialog.h>
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #else
 #include <qapplication.h>
 #endif
 
 #ifndef KORG_NOPRINTER
 #include "calprinter.h"
 #endif
 #include "koglobals.h"
 #include "koprefs.h"
 #include "kfiledialog.h"
 
 #include "kolistview.h"
 
 ListItemVisitor::ListItemVisitor(KOListViewItem *item, QDate date )
 {
     mItem = item;
     mDate = date;
 }
 
 ListItemVisitor::~ListItemVisitor()
 {
 }
 
 bool ListItemVisitor::visit(Event *e)
 {
     
     bool ok = false;
     QString start, end;
+    QDate ds, de;
     if ( e->doesRecur() ) {
-        QDate d = e->getNextOccurence( QDateTime( mDate, QTime(0,0,0)), &ok ).date();
+        ds = e->getNextOccurence( QDateTime( mDate, QTime(0,0,0)), &ok ).date();
         if ( ok ) {
             int days = e->dtStart().date().daysTo(e->dtEnd().date() );
-            start = KGlobal::locale()->formatDate(d,true);
-            end = KGlobal::locale()->formatDate(d.addDays( days),true);
+            start = KGlobal::locale()->formatDate(ds,true);
+            de = ds.addDays( days);
+            end = KGlobal::locale()->formatDate(de,true);
         }
 
     } 
     if ( ! ok ) {
         start =e->dtStartDateStr();
         end = e->dtEndDateStr();
+        ds = e->dtStart().date();
+        de = e->dtEnd().date();
     }
     mItem->setText(0,e->summary());
     mItem->setText(1,start);
     mItem->setText(2,e->dtStartTimeStr());
     mItem->setText(3,end);
     mItem->setText(4,e->dtEndTimeStr());
     mItem->setText(5,e->isAlarmEnabled() ? i18n("Yes") : i18n("No"));
     mItem->setText(6, e->recurrence()->recurrenceText());
     mItem->setText(7,"---");
     mItem->setText(8,"---");
     mItem->setText(9, e->cancelled() ? i18n("Yes") : i18n("No"));
     mItem->setText(10,e->categoriesStr());
 
     QString key;
-    QDate d = e->dtStart().date();
     QTime t = e->doesFloat() ? QTime(0,0) : e->dtStart().time();
-    key.sprintf("%04d%02d%02d%02d%02d",d.year(),d.month(),d.day(),t.hour(),t.minute());
+    key.sprintf("%04d%02d%02d%02d%02d",ds.year(),ds.month(),ds.day(),t.hour(),t.minute());
     mItem->setSortKey(1,key);
 
-    d = e->dtEnd().date();
     t = e->doesFloat() ? QTime(0,0) : e->dtEnd().time();
-    key.sprintf("%04d%02d%02d%02d%02d",d.year(),d.month(),d.day(),t.hour(),t.minute());
+    key.sprintf("%04d%02d%02d%02d%02d",de.year(),de.month(),de.day(),t.hour(),t.minute());
     mItem->setSortKey(3,key);
 
     return true;
 }
 
 bool ListItemVisitor::visit(Todo *t)
 {
     mItem->setText(0,i18n("To-Do: %1").arg(t->summary()));
     if (t->hasStartDate()) {
         mItem->setText(1,t->dtStartDateStr());
         if (t->doesFloat()) {
             mItem->setText(2,"---");
         } else {
             mItem->setText(2,t->dtStartTimeStr());
         }
     } else {
         mItem->setText(1,"---");
         mItem->setText(2,"---");
     }
     mItem->setText(3,"---");
     mItem->setText(4,"---");
     mItem->setText(5,"---");
     mItem->setText(6,"---");
     if (t->hasDueDate()) {
         mItem->setText(7,t->dtDueDateStr());
         if (t->doesFloat()) {
             mItem->setText(8,"---");
         } else {
             mItem->setText(8,t->dtDueTimeStr());
         }
     } else {
         mItem->setText(7,"---");
         mItem->setText(8,"---");
     }
     mItem->setText(9, t->cancelled() ? i18n("Yes") : i18n("No"));
     mItem->setText(10,t->categoriesStr());
 
     QString key;
     QDate d;
     if (t->hasDueDate()) {
         d = t->dtDue().date();
         QTime tm = t->doesFloat() ? QTime(0,0) : t->dtDue().time();
         key.sprintf("%04d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute());
         mItem->setSortKey(7,key);
     }
     if ( t->hasStartDate() ) {
         d = t->dtStart().date();
         QTime tm = t->doesFloat() ? QTime(0,0) : t->dtStart().time();
         key.sprintf("%04d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute());
         mItem->setSortKey(1,key);
     }
     return true;
 }
 
 bool ListItemVisitor::visit(Journal * j)
 { 
     QString des = j->description().left(50);
     des = des.simplifyWhiteSpace ();
     des.replace (QRegExp ("\\n"),"" );
     des.replace (QRegExp ("\\r"),"" );
     mItem->setText(0,i18n("Journal")+": "+des.left(25));
     mItem->setText(1,j->dtStartDateStr());
     mItem->setText(2,"---");
     mItem->setText(3,"---");
     mItem->setText(4,"---");
     mItem->setText(5,"---");
     mItem->setText(6,"---");
     mItem->setText(7,j->dtStartDateStr());
     mItem->setText(8,"---");
     mItem->setText(9,"---");
     mItem->setText(10,i18n("Last Modified: ")+  KGlobal::locale()->formatDateTime( j->lastModified() , true) );
 
     QString key;
     QDate d = j->dtStart().date();
     key.sprintf("%04d%02d%02d",d.year(),d.month(),d.day());
     mItem->setSortKey(1,key);
     mItem->setSortKey(7,key);
 
     return true;
 }
 
 KOListView::KOListView(Calendar *calendar, QWidget *parent,
                        const char *name)
     : KOEventView(calendar, parent, name)
 {
     mActiveItem = 0;
     mListView = new KOListViewListView(this);
     mListView->addColumn(i18n("Summary"));
     mListView->addColumn(i18n("Start Date"));
     mListView->addColumn(i18n("Start Time"));
     mListView->addColumn(i18n("End Date"));
     mListView->addColumn(i18n("End Time"));
     mListView->addColumn(i18n("Alarm")); // alarm set?
     mListView->addColumn(i18n("Recurs")); // recurs?
     mListView->addColumn(i18n("Due Date"));
     mListView->addColumn(i18n("Due Time"));
     mListView->addColumn(i18n("Cancelled"));
     mListView->addColumn(i18n("Categories"));
 
     mListView->setColumnAlignment(0,AlignLeft);
     mListView->setColumnAlignment(1,AlignLeft);
     mListView->setColumnAlignment(2,AlignHCenter);
     mListView->setColumnAlignment(3,AlignLeft);
     mListView->setColumnAlignment(4,AlignHCenter);
     mListView->setColumnAlignment(5,AlignLeft);
     mListView->setColumnAlignment(6,AlignLeft);
     mListView->setColumnAlignment(7,AlignLeft);
     mListView->setColumnAlignment(8,AlignLeft);
     mListView->setColumnAlignment(9,AlignLeft);
     mListView->setColumnAlignment(10,AlignLeft);
 
     int iii = 0;
     for ( iii = 0; iii< 10 ; ++iii )
         mListView->setColumnWidthMode( iii, QListView::Manual );
 
     QBoxLayout *layoutTop = new QVBoxLayout(this);
     layoutTop->addWidget(mListView);
     mListView->setFont ( KOPrefs::instance()->mListViewFont );
     mPopupMenu = eventPopup();
     mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
                                   i18n("Select all"),this,
                                   SLOT(allSelection()),true);
     mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
                                   i18n("Deselect All"),this,
                                   SLOT(clearSelection()),true);
     mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
                                   i18n("Delete all selected"),this,
                                   SLOT(deleteAll()),true);
     mPopupMenu->insertSeparator();
     mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
                                   i18n("Save selected to file..."),this,
                                   SLOT(saveToFile()),true);
     mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
                                   i18n("Save Journal/Description..."),this,
                                   SLOT(saveDescriptionToFile()),true);
     mPopupMenu->insertSeparator();
     mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
                                   i18n("Add Categ. to selected..."),this,
                                   SLOT(addCat()),true);
     mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
                                   i18n("Set Categ. for selected..."),this,
                                   SLOT(setCat()),true);
     mPopupMenu->insertSeparator();
 
 
 #ifndef DESKTOP_VERSION
     mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
                                   i18n("Beam selected via IR"),this,
                                   SLOT(beamSelected()),true);
 #endif
     /*
       mPopupMenu = new QPopupMenu;
       mPopupMenu->insertItem(i18n("Edit Event"), this,
       SLOT (editEvent()));
       mPopupMenu->insertItem(SmallIcon("delete"), i18n("Delete Event"), this,
       SLOT (deleteEvent()));
       mPopupMenu->insertSeparator();
       mPopupMenu->insertItem(i18n("Show Dates"), this,
       SLOT(showDates()));
       mPopupMenu->insertItem(i18n("Hide Dates"), this,
       SLOT(hideDates()));
     */
     QObject::connect(mListView,SIGNAL( newEvent()),
                      this,SIGNAL(signalNewEvent()));
     QObject::connect(mListView,SIGNAL(doubleClicked(QListViewItem *)),
                      this,SLOT(defaultItemAction(QListViewItem *)));
     QObject::connect(mListView,SIGNAL(rightButtonClicked ( QListViewItem *,
                                                            const QPoint &, int )),
                      this,SLOT(popupMenu(QListViewItem *,const QPoint &,int)));
     QObject::connect(mListView,SIGNAL(currentChanged(QListViewItem *)),
                      SLOT(processSelectionChange(QListViewItem *)));
     QObject::connect(mListView,SIGNAL(showIncidence(Incidence *)),
                      SIGNAL(showIncidenceSignal(Incidence *)) );
 
     readSettings(KOGlobals::config(),"KOListView Layout");
 }
 
 KOListView::~KOListView()
 {
     delete mPopupMenu;
 }
 
 void KOListView::updateList()
 {
     // qDebug(" KOListView::updateList() ");
 
 }
 
 void KOListView::addCat( )
 {
     setCategories( false );
 }
 void KOListView::setCat()
 {
     setCategories( true );
 }
 void KOListView::setCategories( bool removeOld )
 {
    
     KPIM::CategorySelectDialog* csd = new KPIM::CategorySelectDialog( KOPrefs::instance(), 0 );
     if (! csd->exec()) { 
         delete csd;
         return;
     }
     QStringList catList = csd->selectedCategories();
     delete csd;
     // if ( catList.count() == 0 )
     //   return;
     catList.sort();
     QString categoriesStr = catList.join(",");
     int i;
     QStringList itemList;
     QPtrList<KOListViewItem> sel ;
     QListViewItem *qitem  = mListView->firstChild ();
     while ( qitem ) {
         if ( qitem->isSelected() ) {
             sel.append(((KOListViewItem *)qitem));
         }
         qitem = qitem->nextSibling();
     }
     KOListViewItem * item, *temp;
     item = sel.first();
     Incidence* inc;
     while ( item ) {
         inc = item->data();
         if ( removeOld ) {
             inc->setCategories( categoriesStr );
         } else {
             itemList = QStringList::split (",", inc->categoriesStr() );
             for( i = 0; i<   catList.count(); ++i ) {
                 if (  !itemList.contains (catList[i]))
                     itemList.append( catList[i] );
             }
             itemList.sort();
             inc->setCategories( itemList.join(",") );
         }
         temp = item;
         item = sel.next();
         mUidDict.remove( inc->uid() ); 
         delete temp;;
         addIncidence( inc );
     }
 }
 
 void KOListView::beamSelected()
 {
     int icount = 0;
     QPtrList<Incidence> delSel ;
     QListViewItem *item  = mListView->firstChild ();
     while ( item ) {
         if ( item->isSelected() ) {
             delSel.append(((KOListViewItem *)item)->data());
             ++icount;
         }
         
         item = item->nextSibling();
diff --git a/version b/version
index 65eb8d1..d8563ed 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-version = "1.9.16";
+version = "1.9.17";