11 files changed, 28 insertions, 22 deletions
diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp
index a8816f9..547d208 100644
--- a/kaddressbook/mainembedded.cpp
+++ b/kaddressbook/mainembedded.cpp
@@ -1,99 +1,100 @@
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #include <qcopchannel_qws.h> 
 #include <stdlib.h>
 #else
 #include <qapplication.h>
 #include <qwindowsstyle.h>
 #include <qplatinumstyle.h>
 #include <qmainwindow.h>
 #endif
 #include <qtextcodec.h> 
 #include <kstandarddirs.h>
 #include <qregexp.h>
 #include <kglobal.h>
 #include <stdio.h>
 #include <qdir.h>
 #include "kabprefs.h"
 #include "kaddressbookmain.h"
 #include "externalapphandler.h"
 #include <libkdepim/kpimglobalprefs.h>
 void dumpMissing();
 int main( int argc, char **argv )
 {
 #ifndef DESKTOP_VERSION
  QPEApplication a( argc, argv );
  a.setKeepRunning ();
 #else
  QApplication a( argc, argv );
  QApplication::setStyle( new QPlatinumStyle ());
  QString hdir = QDir::homeDirPath();
  // there is a bug when creating dirs for WIN 98
  // it is difficult to fix, because we have no WIN 98 runnung
  // such that we try it to create the dirs at startup here
  if ( hdir == "C:\\" ) { // win 98 or ME
       QDir app_dir;
       if ( !app_dir.exists("C:\\kdepim") )
           app_dir.mkdir ("C:\\kdepim");
       if ( !app_dir.exists("C:\\kdepim\\apps") )
           app_dir.mkdir ("C:\\kdepim\\apps");
       if ( !app_dir.exists("C:\\kdepim\\config") )
           app_dir.mkdir ("C:\\kdepim\\config");
       if ( !app_dir.exists("C:\\kdepim\\apps\\kaddressbook") )
           app_dir.mkdir ("C:\\kdepim\\apps\\kaddressbook");
  }
 #endif
  bool exitHelp = false;
  if ( argc > 1 ) {
      QString command = argv[1];
      if (  command == "-help" ){
          printf("KA/E command line commands:\n");
          printf("  no command: Start KA/E in usual way\n");
          printf("  -help: This output\n");
          printf(" KA/E is exiting now. Bye!\n");
          exitHelp = true;
      }
  }
  if ( ! exitHelp ) {
    KGlobal::setAppName( "kaddressbook" );
 #ifndef DESKTOP_VERSION
    if ( QApplication::desktop()->width() > 320 )
        KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons22/");
    else
        KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons16/");
 #else
      QString fileName ;
      fileName  = qApp->applicationDirPath () + "/kdepim/kaddressbook/icons22/";
      KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName));
      QApplication::addLibraryPath ( qApp->applicationDirPath () );
 #endif
      KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kaddressbook")));
    // init language
    KABPrefs::instance();
       KAddressBookMain m ;
 //US      MainWindow m;
      QObject::connect(&a, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
-      {
+      
-          KPimGlobalPrefs::instance()->setGlobalConfig();
+      KPimGlobalPrefs::instance()->setGlobalConfig();
-      }
+      
 #ifndef DESKTOP_VERSION
       a.showMainWidget( &m ); 
      
 #else
      a.setMainWidget( &m );
      m.resize (640, 480 );
      m.show();
 #endif 
      a.exec();
      dumpMissing();
+      KPimGlobalPrefs::instance()->writeConfig();
  }
  qDebug("KA: Bye! ");
 }
diff --git a/kmicromail/main.cpp b/kmicromail/main.cpp
index 8947ff8..8341c5a 100644
--- a/kmicromail/main.cpp
+++ b/kmicromail/main.cpp
@@ -1,63 +1,66 @@
 // CHANGED 2004-08-06 Lutz Rogowski
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #include <libkdepim/externalapphandler.h>
 #include <stdlib.h>
 #else
 #include <qapplication.h>
 #include <qstring.h>
 #include <qwindowsstyle.h> 
 #include <qplatinumstyle.h> 
 #include <qsgistyle.h> 
 #endif
 #include "opiemail.h"
 #include <qdir.h>
 #include <kstandarddirs.h>
 #include <kglobal.h>
 #include <stdio.h>
 #include "mainwindow.h"
 #include "koprefs.h"
+#include <libkdepim/kpimglobalprefs.h>
 void dumpMissing();
 //using namespace Opie::Core;
 int main( int argc,  char **argv ) {  
 #ifndef DESKTOP_VERSION
    QPEApplication a( argc, argv );
    a.setKeepRunning ();
 #else
    QApplication a( argc, argv ); 
    QApplication::setStyle( new QPlatinumStyle ());
 #endif
    a.setFont( KOPrefs::instance()->mAppFont );
    KGlobal::setAppName( "kopiemail" );
    QString fileName ;
 #ifndef DESKTOP_VERSION
    fileName = getenv("QPEDIR");
    if ( QApplication::desktop()->width() > 320 )
        KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/kopiemail/icons22/");
    else
        KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/kopiemail/");
 #else
    fileName  = qApp->applicationDirPath () + "/kdepim/kopiemail/";
    KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName));
 #endif 
    KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kopiemail")));
    OpieMail  mw;
 #ifndef DESKTOP_VERSION
    //qDebug("CONNECT ");
    QObject::connect( &a, SIGNAL (appMessage ( const QCString &, const QByteArray & )),&mw, SLOT(message(  const QCString&, const QByteArray& ))); 
    // QObject::connect(&a, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
    a.showMainWidget(&mw );
 #else
    a.setMainWidget(&mw );
    mw.show();
    //m.resize( 800, 600 );
    QObject::connect(&a, SIGNAL(lastWindowClosed()), &a, SLOT(quit()));
 #endif
    int rv = a.exec(); 
    dumpMissing();
+    KPimGlobalPrefs::instance()->writeConfig();
    return rv; 
   
 }
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index d3aa650..3d4acb7 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -753,321 +753,322 @@ void KOListView::addIncidence(Incidence *incidence)
    KOListViewItem *item = new KOListViewItem( incidence, mListView ); 
    ListItemVisitor v(item, mStartDate );
    if (incidence->accept(v)) return;
    else delete item;
    //qDebug("delete item ");
 }
 void KOListView::showEvents(QPtrList<Event> eventList)
 {
    clear();
    addEvents(eventList);
    // After new creation of list view no events are selected.
    emit incidenceSelected( 0 );
 }
 int KOListView::count()
 {
    return mListView->childCount();
 }
 void KOListView::changeEventDisplay(Event *event, int action)
 {
    KOListViewItem *item;
    switch(action) {
    case KOGlobals::EVENTADDED:
        addIncidence( event );
        break;
    case KOGlobals::EVENTEDITED:
        item = getItemForEvent(event);
        if (item) { 
            mUidDict.remove( event->uid() ); 
            delete item;
            addIncidence( event );
        }
        break;
    case KOGlobals::EVENTDELETED:
        item = getItemForEvent(event);
        if (item) {
            mUidDict.remove( event->uid() ); 
            delete item;
        }
        break;
    default:
        ;
    }
 }
 KOListViewItem *KOListView::getItemForEvent(Event *event)
 {
    KOListViewItem *item = (KOListViewItem *)mListView->firstChild();
    while (item) {
        if (item->data() == event) return item;
        item = (KOListViewItem *)item->nextSibling();
    }
    return 0;
 }
 void KOListView::defaultItemAction(QListViewItem *i)
 {
    KOListViewItem *item = static_cast<KOListViewItem *>( i );
    if ( item ) defaultAction( item->data() );
      
 }
 void KOListView::popupMenu(QListViewItem *item,const QPoint &,int)
 {
    mActiveItem = (KOListViewItem *)item;
    if (mActiveItem) {
        Incidence *incidence = mActiveItem->data();
        mPopupMenu->showIncidencePopup(incidence);
        /*
          if ( incidence && incidence->type() == "Event" ) {
          Event *event = static_cast<Event *>( incidence );
          mPopupMenu->showEventPopup(event);
          }
        */
    }
 }
 void KOListView::readSettings(KConfig *config, QString setting)
 {
    //  qDebug("KOListView::readSettings ");
    mListView->restoreLayout(config,setting);
 }
 void KOListView::writeSettings(KConfig *config, QString setting)
 {
    // qDebug("KOListView::writeSettings ");
    mListView->saveLayout(config, setting);
 }
 void KOListView::processSelectionChange(QListViewItem *)
 {
  
    KOListViewItem *item =
        static_cast<KOListViewItem *>( mListView->currentItem() );
    if ( !item ) {
        emit incidenceSelected( 0 );
    } else {
        emit incidenceSelected( item->data() );
    }
 }
 void KOListView::clearSelection()
 {
    mListView->selectAll( false );
 }
 void KOListView::allSelection()
 {
    mListView->selectAll( true );
 }
 void KOListView::clear()
 {
    mListView->clear();
    mUidDict.clear();
 }
 Incidence* KOListView::currentItem()
 {
    if ( mListView->currentItem()  )
        return ((KOListViewItem*) mListView->currentItem())->data();
    return 0;
 }
 void KOListView::keyPressEvent ( QKeyEvent *e) 
 {
   
    if (  e->key() == Qt::Key_Delete || e->key() == Qt::Key_Backspace ) {
        deleteAll();
        return;
    }
   
    e->ignore();
 }
 void KOListViewListView::keyPressEvent ( QKeyEvent *e) 
 {
  
    switch ( e->key() ) {
    case Qt::Key_Down:
        if ( e->state() == ShiftButton ) {
            QListViewItem* cn = currentItem();
            if ( !cn ) 
                cn = firstChild();
            if ( !cn ) 
                return;
            while (  cn->nextSibling() )
                cn = cn->nextSibling();
            setCurrentItem ( cn );
            ensureItemVisible ( cn );
        
            e->accept();
            return;
        }
        if ( e->state() == ControlButton ) {
            int count = childCount ();
            int jump = count / 5;
            QListViewItem* cn;
            cn = currentItem();
            if ( ! cn )
                return;
            if ( jump  == 0 )
                jump = 1;
            while ( jump && cn->nextSibling() ) {
                cn = cn->nextSibling();
                --jump;
            }
            setCurrentItem ( cn );
            ensureItemVisible ( cn );
            
        } else
            QListView::keyPressEvent ( e ) ;
        e->accept();
        break;
              
    case Qt::Key_Up:
        if ( e->state() == ShiftButton ) {
            QListViewItem* cn = firstChild();
            if ( cn ) {
                setCurrentItem ( cn );
                ensureItemVisible ( cn );
            }
            e->accept();
            return;
        }
        if ( e->state() == ControlButton ) {
            int count = childCount ();
            int jump = count / 5;
            QListViewItem* cn;
            cn = currentItem();
            if ( ! cn )
                return;
            if ( jump  == 0 )
                jump = 1;
            while ( jump && cn->itemAbove ()) {
                cn = cn->itemAbove ();
                --jump;
            }
            setCurrentItem ( cn );
            ensureItemVisible ( cn );
        } else
            QListView::keyPressEvent ( e ) ;
        e->accept();
        break;   
    case Qt::Key_I: {
        QListViewItem* cn;
        cn = currentItem();
        if ( cn ) {
            KOListViewItem* ci = (KOListViewItem*)( cn ); 
            if ( ci ){
                emit showIncidence( ci->data());
                cn = cn->nextSibling();
                if ( cn ) {
                    setCurrentItem ( cn );
                    ensureItemVisible ( cn );
                }
            }
        }
        e->accept();
    }
        break;          
    case Qt::Key_Return:
    case Qt::Key_Enter:
        {
            QListViewItem* cn;
            cn = currentItem();
            if ( cn ) {
                KOListViewItem* ci = (KOListViewItem*)( cn ); 
                if ( ci ){ 
                    if ( e->state() == ShiftButton )
                        ci->setSelected( false );
                    else
                        ci->setSelected( true );
                    cn = cn->nextSibling();
                    if ( cn ) {
                        setCurrentItem ( cn );
                        ensureItemVisible ( cn );
                    }
                }
            }
            e->accept();
        }
    break;             
    default:
        e->ignore();
    }
 }
 KOListViewListView::KOListViewListView(KOListView * lv ) 
    : KListView( lv )
 {
 #ifndef DESKTOP_VERSION
    QPEApplication::setStylusOperation(viewport(), QPEApplication::RightOnHold );
 #endif
+    mYMousePos = -1000;
    setSelectionMode( QListView::Multi );   
    setMultiSelection( true);
    mAllowPopupMenu = true;
    mMouseDown = false;
    
 }
 void KOListViewListView::contentsMouseDoubleClickEvent(QMouseEvent *e)
 {
    if (!e) return;
    QPoint vp = contentsToViewport(e->pos());
    QListViewItem *item = itemAt(vp);
    if (!item) {
        emit newEvent();
        return;
    }
    KListView::contentsMouseDoubleClickEvent(e);
 }
 void KOListViewListView::contentsMousePressEvent(QMouseEvent *e)
 {
    //qDebug("contentsMousePressEvent++++ ");
    if (! mMouseDown ) {
        mAllowPopupMenu = true;
        mYMousePos = mapToGlobal( (e->pos())).y();
    }
    if (  e->button() == RightButton &&  mMouseDown   )
        return;
    if (  e->button() == LeftButton )
        mMouseDown = true;
    KListView::contentsMousePressEvent( e );
 }
 void KOListViewListView::contentsMouseReleaseEvent(QMouseEvent *e)
 {
    //qDebug("contentsMouseReleaseEv---- ");
    if ( ! mMouseDown  ) {
        if (  e->button() == RightButton && ! mAllowPopupMenu   )
            return;
        QListViewItem* ci = currentItem(); 
        if ( ci ) 
            ci->setSelected( true );
        KListView::contentsMouseReleaseEvent(e);
        return;
    }
    if (  e->button() == LeftButton )
        mMouseDown = false;   
    if (  e->button() == RightButton && ! mAllowPopupMenu   )
        return;
    if (  e->button() == RightButton ) {
        QListViewItem* ci = currentItem(); 
        if ( ci ) 
            ci->setSelected( true );
    }
    KListView::contentsMouseReleaseEvent(e);
 }
 void KOListViewListView::contentsMouseMoveEvent(QMouseEvent *e)
 {
    // qDebug("contentsMouseMoveEv....... ");
    //  qDebug("start: %d  current %d ",mYMousePos , mapToGlobal( (e->pos())).y()   );
    int diff = mYMousePos - mapToGlobal( (e->pos())).y();
    if ( diff < 0 ) diff = -diff;
    if ( diff > 20 )
        mAllowPopupMenu = false;
    KListView::contentsMouseMoveEvent(e);
 }
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index f44debc..8dca3ae 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -1,436 +1,426 @@
 /*
    This file is part of KOrganizer.
    Copyright (c) 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 <time.h>
 #ifndef _WIN32_
 #include <unistd.h>
 #endif
 #include <qdir.h>
 #include <qtextstream.h>
 #include <qtextcodec.h>
 #include <qstring.h>
 #include <qregexp.h>
 #include <qfont.h>
 #include <qcolor.h>
 #include <qstringlist.h>
 #include <stdlib.h>
 #include <kglobal.h>
 #include <kconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kemailsettings.h>
 #include <kstaticdeleter.h>
 #include <libkdepim/kpimglobalprefs.h>
 #include "koprefs.h"
 #include "mainwindow.h"
 KOPrefs *KOPrefs::mInstance = 0;
 static KStaticDeleter<KOPrefs> insd;
 KOPrefs::KOPrefs() :
  KPimPrefs("korganizerrc")
 {
  mCategoryColors.setAutoDelete(true);
  fillMailDefaults();
  mDefaultCategoryColor           = QColor(175,210,255);//196,196,196);
  QColor defaultHolidayColor      = QColor(255,0,0);
  QColor defaultHighlightColor    = QColor(129,112,255);//64,64,255);
  QColor defaultAgendaBgColor     = QColor(239,241,169);//128,128,128);
  QColor defaultWorkingHoursColor = QColor(170,223,150);//160,160,160);
  QColor defaultTodoDueTodayColor = QColor(255,220,100);
  QColor defaultTodoOverdueColor  = QColor(255,153,125);
  mTimeBarFont = QFont("helvetica",10);//,QFont::Bold);
  mDefaultViewFont = QFont("helvetica",10);
  mDefaultMonthViewFont = QFont("helvetica",8);
  mMarcusBainsFont= QFont("helvetica",10);
  mDateNavigatorFont= QFont("helvetica",10, QFont::Bold);
  mEditBoxFont = QFont("helvetica",12);
  mJornalViewFont = QFont("helvetica",12);
  KPrefs::setCurrentGroup("General");
  addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false);
  addItemBool("ShowIconNewTodo",&mShowIconNewTodo,true);
  addItemBool("ShowIconNewEvent",&mShowIconNewEvent,true);
  addItemBool("ShowIconSearch",&mShowIconSearch,true);
  addItemBool("ShowIconList",&mShowIconList,true);
  addItemBool("ShowIconDay1",&mShowIconDay1,true);
  addItemBool("ShowIconDay5",&mShowIconDay5,true);
  addItemBool("ShowIconDay7",&mShowIconDay7,true);
  addItemBool("ShowIconMonth",&mShowIconMonth,true);
  addItemBool("ShowIconTodoview",&mShowIconTodoview,true);
  addItemBool("ShowIconBackFast",&mShowIconBackFast,true);
  addItemBool("ShowIconBack",&mShowIconBack,true);
  addItemBool("ShowIconToday",&mShowIconToday,true);
  addItemBool("ShowIconForward",&mShowIconForward,true);
  addItemBool("ShowIconForwardFast",&mShowIconForwardFast,true);
  addItemBool("ShowIconWhatsThis",&mShowIconWhatsThis,false);
  addItemBool("ShowIconNextDays",&mShowIconNextDays,true);
  addItemBool("ShowIconNext",&mShowIconNext,true);
  addItemBool("ShowIconJournal",&mShowIconJournal,true); 
  addItemBool("ShowIconStretch",&mShowIconStretch,true); 
  addItemInt("LastLoadedLanguage",&mOldLanguage,0);
  addItemBool("AskForQuit",&mAskForQuit,false); 
 #ifndef DESKTOP_VERSION
  addItemBool("ShowFullMenu",&mShowFullMenu,false); 
 #else
  addItemBool("ShowFullMenu",&mShowFullMenu,true); 
 #endif
  addItemBool("ToolBarHor",&mToolBarHor, true );
  addItemBool("ToolBarUp",&mToolBarUp, false );
  addItemBool("ToolBarMiniIcons",&mToolBarMiniIcons, false );
  addItemInt("Whats Next Days",&mWhatsNextDays,3);
  addItemInt("Whats Next Prios",&mWhatsNextPrios,1);
  addItemBool("ShowTodoInAgenda",&mShowTodoInAgenda,true);
  addItemBool("ShowCompletedTodo",&mShowCompletedTodo,true);
  addItemInt("AllDay Size",&mAllDaySize,28);
  QString defAlarm = KGlobal::iconLoader()->iconPath()+"koalarm.wav";
  addItemString("DefaultAlarmFile",&mDefaultAlarmFile,defAlarm );
  addItemStringList("LocationDefaults",&mLocationDefaults );
  addItemStringList("EventSummary User",&mEventSummaryUser);
  addItemStringList("TodoSummary User",&mTodoSummaryUser);
  addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false);
  addItemBool("Enable Project View",&mEnableProjectView,false);
  addItemBool("Auto Save",&mAutoSave,false);
  addItemInt("Auto Save Interval",&mAutoSaveInterval,3);
  addItemBool("Confirm Deletes",&mConfirm,true);
  addItemString("Archive File",&mArchiveFile);
  addItemString("Html Export File",&mHtmlExportFile,
      QDir::homeDirPath() + "/" + i18n("Default export file", "calendar.html"));
  addItemBool("Html With Save",&mHtmlWithSave,false);
  KPrefs::setCurrentGroup("Personal Settings");
  addItemInt("Mail Client",&mMailClient,MailClientKMail);
  addItemBool("Use Control Center Email",&mEmailControlCenter,false);
  addItemBool("Bcc",&mBcc,false);
  KPrefs::setCurrentGroup("Time & Date");
  addItemInt("Default Start Time",&mStartTime,10);
  addItemInt("Default Duration",&mDefaultDuration,2);
  addItemInt("Default Alarm Time",&mAlarmTime,3);
  KPrefs::setCurrentGroup("AlarmSettings");
  addItemInt("AlarmPlayBeeps",&mAlarmPlayBeeps,20);
  addItemInt("AlarmSuspendTime",&mAlarmSuspendTime,7);
  addItemInt("AlarmSuspendCount",&mAlarmSuspendCount,5);
  addItemInt("AlarmBeepInterval",&mAlarmBeepInterval,3);
  KPrefs::setCurrentGroup("Calendar");
  addItemInt("Default Calendar Format",&mDefaultFormat,FormatICalendar);
  KPrefs::setCurrentGroup("Fonts");
  // qDebug(" KPrefs::setCurrentGroup(Fonts); ");
  addItemFont("TimeBar Font",&mTimeBarFont);
  addItemFont("MonthView Font",&mMonthViewFont);
  addItemFont("AgendaView Font",&mAgendaViewFont);
  addItemFont("MarcusBains Font",&mMarcusBainsFont);
  addItemFont("TimeLabels Font",&mTimeLabelsFont);
  addItemFont("TodoView Font",&mTodoViewFont);
  addItemFont("ListView Font",&mListViewFont);
  addItemFont("DateNavigator Font",&mDateNavigatorFont);
  addItemFont("EditBox Font",&mEditBoxFont);
  addItemFont("JournalView Font",&mJornalViewFont);
  addItemFont("WhatsNextView Font",&mWhatsNextFont);
  addItemFont("EventView Font",&mEventViewFont);
-//   KPrefs::setCurrentGroup("SyncProfiles");
-//   addItemString("LocalMachineName",&mLocalMachineName, "undefined");
-//   addItemStringList("SyncProfileNames",&mSyncProfileNames);
-//   addItemStringList("ExternSyncProfiles",&mExternSyncProfileNames);
  KPrefs::setCurrentGroup("RemoteSyncing");
-//   addItemBool("UsePasswd",&mUsePassWd,false); 
-//   addItemBool("WriteBackFile",&mWriteBackFile,true);
-//   addItemBool("WriteBackExistingOnly",&mWriteBackExistingOnly,false);
-//   addItemBool("AskForPreferences",&mAskForPreferences,true); 
-//   addItemBool("ShowSyncSummary",&mShowSyncSummary,true);
  addItemString("ActiveSyncPort",&mActiveSyncPort,"9197" );  
  addItemString("ActiveSyncIP",&mActiveSyncIP,"192.168.0.40" ); 
  addItemBool("ShowSyncEvents",&mShowSyncEvents,false); 
  addItemInt("LastSyncTime",&mLastSyncTime,0); 
 #ifdef _WIN32_
  QString hdp= locateLocal("data","korganizer")+"\\\\";
 #else
  QString hdp= locateLocal("data","korganizer")+"/";
 #endif
  KPrefs::setCurrentGroup("LoadSaveFileNames");
  addItemString("LastImportFile", &mLastImportFile ,hdp +"import.ics" );
  addItemString("LastVcalFile", &mLastVcalFile ,hdp +"export.vcs" );
  addItemString("LastSaveFile", &mLastSaveFile ,hdp +"mybackup.ics" );
  addItemString("LastLoadFile", &mLastLoadFile ,hdp +"mybackup.ics" );
 
  KPrefs::setCurrentGroup("Locale");
  addItemBool("ShortDateInViewer",&mShortDateInViewer,false); 
  KPrefs::setCurrentGroup("Colors");
  addItemColor("Holiday Color",&mHolidayColor,defaultHolidayColor);
  addItemColor("Highlight Color",&mHighlightColor,defaultHighlightColor);
  addItemColor("Event Color",&mEventColor,mDefaultCategoryColor);
  addItemColor("Agenda Background Color",&mAgendaBgColor,defaultAgendaBgColor);
  addItemColor("WorkingHours Color",&mWorkingHoursColor,defaultWorkingHoursColor);
  addItemColor("Todo due today Color",&mTodoDueTodayColor,defaultTodoDueTodayColor);
  addItemColor("Todo overdue Color",&mTodoOverdueColor,defaultTodoOverdueColor);
  addItemColor("MonthViewEvenColor",&mMonthViewEvenColor,QColor( 160,160,255 ));
  addItemColor("MonthViewOddColor",&mMonthViewOddColor,QColor( 160,255,160 ));
  addItemColor("MonthViewHolidayColor",&mMonthViewHolidayColor,QColor( 255,160,160 ));
  addItemBool("MonthViewUsesDayColors",&mMonthViewUsesDayColors,true); 
  addItemBool("MonthViewSatSunTog",&mMonthViewSatSunTog,true);
  addItemBool("HightlightDateTimeEdit",&mHightlightDateTimeEdit,false); 
  addItemColor("AppColor1",&mAppColor1,QColor( 130,170,255 ));
  addItemColor("AppColor2",&mAppColor2,QColor(  174,216,255 ));
  addItemBool("UseAppColors",&mUseAppColors,false); 
  
  KPrefs::setCurrentGroup("Views");
  addItemInt("Hour Size",&mHourSize,8);
  addItemBool("Show Daily Recurrences",&mDailyRecur,true);
  addItemBool("Show Weekly Recurrences",&mWeeklyRecur,true);
  addItemBool("Show Month Daily Recurrences",&mMonthDailyRecur,true);
  addItemBool("Show Month Weekly Recurrences",&mMonthWeeklyRecur,true);
  addItemBool("ShowShortMonthName",&mMonthShowShort,false);
  addItemBool("ShowIconsInMonthCell",&mMonthShowIcons,true);
  addItemBool("Enable ToolTips",&mEnableToolTips,false);
  addItemBool("Enable MonthView ScrollBars",&mEnableMonthScroll,false);
  addItemBool("Marcus Bains shows seconds",&mMarcusBainsShowSeconds,false);
  addItemBool("Show Marcus Bains",&mMarcusBainsEnabled,true);
  addItemBool("EditOnDoubleClick",&mEditOnDoubleClick,true);
  addItemBool("ViewChangeHoldFullscreen",&mViewChangeHoldFullscreen,false);
  addItemBool("ViewChangeHoldNonFullscreen",&mViewChangeHoldNonFullscreen,false);
  addItemBool("CenterOnCurrentTime",&mCenterOnCurrentTime,false);
  addItemBool("SetTimeToDayStartAt",&mSetTimeToDayStartAt,true);
  addItemBool("HighlightCurrentDay",&mHighlightCurrentDay,true);
  addItemBool("WNViewShowsParents",&mWNViewShowsParents,true);
  addItemBool("WNViewShowLocation",&mWNViewShowLocation,false);
  addItemBool("UseHighlightLightColor",&mUseHighlightLightColor,false);
  addItemBool("ListViewMonthTimespan",&mListViewMonthTimespan,true);
  addItemBool("TodoViewUsesCatColors",&mTodoViewUsesCatColors,false);
  addItemBool("TodoViewShowsPercentage",&mTodoViewShowsPercentage,false);
  addItemBool("TodoViewUsesSmallFont",&mTodoViewUsesSmallFont,false);
  addItemBool("TodoViewUsesForegroundColor",&mTodoViewUsesForegroundColor,false);
  addItemBool("MonthViewUsesForegroundColor",&mMonthViewUsesForegroundColor,false);
 #ifdef DESKTOP_VERSION
  addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,true);
 #else
  addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,false);
 #endif
  addItemInt("Day Begins",&mDayBegins,7);
  addItemInt("Working Hours Start",&mWorkingHoursStart,8);
  addItemInt("Working Hours End",&mWorkingHoursEnd,17);
  addItemBool("Exclude Holidays",&mExcludeHolidays,true);
  addItemBool("Exclude Saturdays",&mExcludeSaturdays,true);
  addItemBool("Month View Uses Category Color",&mMonthViewUsesCategoryColor,false);
  addItemBool("Full View Month",&mFullViewMonth,true);
  addItemBool("Full View Todo",&mFullViewTodo,true);
  addItemBool("Quick Todo",&mEnableQuickTodo,false);
  addItemInt("Next X Days",&mNextXDays,3);
  KPrefs::setCurrentGroup("Printer");
  KPrefs::setCurrentGroup("Layout");
  addItemBool("CompactDialogs",&mCompactDialogs,false);
  addItemBool("VerticalScreen",&mVerticalScreen,true);
  KPrefs::setCurrentGroup("KOrganizer Plugins");
  addItemStringList("SelectedPlugins",&mSelectedPlugins,"holidays");
  KPrefs::setCurrentGroup("Group Scheduling");
  addItemInt("IMIPScheduler",&mIMIPScheduler,IMIPKMail);
  addItemInt("IMIPSend",&mIMIPSend,IMIPdirectsend);
  addItemStringList("AdditionalMails",&mAdditionalMails,"");
  addItemInt("IMIP auto refresh",&mIMIPAutoRefresh,neverAuto);
  addItemInt("IMIP auto insert request",&mIMIPAutoInsertRequest,neverAuto);
  addItemInt("IMIP auto insert reply",&mIMIPAutoInsertReply,neverAuto);
  addItemInt("IMIP auto FreeBusy",&mIMIPAutoFreeBusy,neverAuto);
  addItemInt("IMIP auto save FreeBusy",&mIMIPAutoFreeBusyReply,neverAuto);
  KPrefs::setCurrentGroup( "Editors" );
  addItemStringList( "EventTemplates", &mEventTemplates );
  addItemStringList( "TodoTemplates", &mTodoTemplates );
  addItemInt("DestinationPolicy",&mDestination,standardDestination);
 }
 KOPrefs::~KOPrefs()
 {
  if (mInstance == this)
      mInstance = insd.setObject(0); 
 
  //qDebug("KOPrefs::~KOPrefs() ");
 }
 KOPrefs *KOPrefs::instance()
 {
  if (!mInstance) {
      mInstance = insd.setObject(new KOPrefs());
      mInstance->readConfig();
  }
  return mInstance;
 }
 void KOPrefs::usrSetDefaults()
 {
   
 }
 void KOPrefs::fillMailDefaults()
 {
  if (mName.isEmpty()) mName = i18n("Anonymous");
  if (mEmail.isEmpty()) mEmail = i18n("nobody@nowhere");
 }
 void KOPrefs::setTimeZoneIdDefault()
 {
    ;
 }
 void KOPrefs::setCategoryDefaults()
 {
  mCustomCategories.clear();
  mCustomCategories = getDefaultList();
  QStringList::Iterator it;
  for (it = mCustomCategories.begin();it != mCustomCategories.end();++it ) {
    setCategoryColor(*it,mDefaultCategoryColor);
  }
 }
 QStringList KOPrefs::getDefaultList()
 {
    QStringList retval ;
    retval << i18n("Anniversary") << i18n("Appointment") << i18n("Birthday") << i18n("Business") << i18n("Business Travel") << i18n("Cinema")  << i18n("Customer")
           << i18n("Break")<< i18n("Breakfast")<< i18n("Competition")<< i18n("Dinner")
           << i18n("Education")<< i18n("Family")  << i18n("Favorites")  << i18n("Festival")<< i18n("Fishing")<< i18n("Flight") << i18n("Gifts")  
           << i18n("Holiday") << i18n("Holiday Cards")<< i18n("Hot Contacts") << i18n("Hiking") << i18n("Hunting") << i18n("Key Customer") << i18n("Kids") 
                    << i18n("Lunch")  << i18n("Meeting") << i18n("Miscellaneous") << i18n("Partner")<< i18n("Party") << i18n("Personal") << i18n("Personal Travel")
           << i18n("PHB") << i18n("Phone Calls") << i18n("Projects") << i18n("Recurring") << i18n("School") << i18n("Shopping")
           << i18n("Speach")  << i18n("Special Occasion") << i18n("Sports") << i18n("Talk") << i18n("Travel") << i18n("TV")<< i18n("University")
           << i18n("Vacation") << i18n("VIP") << i18n("SyncEvent")  ;
    retval.sort();
    return retval; 
 }
 void KOPrefs::usrReadConfig()
 {
    config()->setGroup("General");
    
    mCustomCategories = config()->readListEntry("Custom Categories");
    if ( KPimGlobalPrefs::instance()->mPreferredLanguage != mOldLanguage ) {
        mLocationDefaults.clear();
        mEventSummaryUser.clear();
        mTodoSummaryUser.clear();
    }
    mOldLoadedLanguage = mOldLanguage ;
    mOldLanguage = KPimGlobalPrefs::instance()->mPreferredLanguage;
   if (mLocationDefaults.isEmpty()) {
       mLocationDefaults << i18n("Home") << i18n("Office") << i18n("Library") << i18n("School") << i18n("Doctor") << i18n("Beach") 
                         << i18n("University") << i18n("Restaurant")  << i18n("Bar") << i18n("Conference room") << i18n("Cinema")  << i18n("Lake") << i18n("Kindergarten")
                         << i18n("Germany") << i18n("Sweden") << i18n("Forest") << i18n("Desert") << i18n("Kitchen") ;
       // << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("")
       mLocationDefaults.sort();
    }
       
   if (mEventSummaryUser.isEmpty()) {
        mEventSummaryUser  = getDefaultList() ;
    }
   if (mTodoSummaryUser.isEmpty()) {
       mTodoSummaryUser  = getDefaultList() ;
   }
  
  if (mCustomCategories.isEmpty()) setCategoryDefaults();
  config()->setGroup("Personal Settings");
  mName = config()->readEntry("user_name","");
  mEmail = config()->readEntry("user_email","");
  fillMailDefaults();
  config()->setGroup("Category Colors");
  QStringList::Iterator it;
  for (it = mCustomCategories.begin();it != mCustomCategories.end();++it ) {
    setCategoryColor(*it,config()->readColorEntry(*it,&mDefaultCategoryColor));
   
  }
 
  KPimPrefs::usrReadConfig();
 }
 void KOPrefs::usrWriteConfig()
 {
  config()->setGroup("General");
  config()->writeEntry("Custom Categories",mCustomCategories); 
  
  config()->setGroup("Personal Settings");
  config()->writeEntry("user_name",mName);
  config()->writeEntry("user_email",mEmail);
  config()->setGroup("Category Colors");
  QDictIterator<QColor> it(mCategoryColors);
  while (it.current()) {
    config()->writeEntry(it.currentKey(),*(it.current()));
    ++it;
  }
  KPimPrefs::usrWriteConfig();
 }
 void KOPrefs::setCategoryColor(QString cat,const QColor & color)
 {
  mCategoryColors.replace(cat,new QColor(color));
 }
 QColor *KOPrefs::categoryColor(QString cat)
 {
  QColor *color = 0;
diff --git a/korganizer/main.cpp b/korganizer/main.cpp
index 4194d12..2481ca4 100644
--- a/korganizer/main.cpp
+++ b/korganizer/main.cpp
@@ -1,106 +1,109 @@
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #include <qcopchannel_qws.h> 
 #include <qpe/global.h>
 #include <stdlib.h>
 #else
 #include <qapplication.h>
 #include <qstring.h>
 #include <qwindowsstyle.h> 
 #include <qplatinumstyle.h> 
 #include <qsgistyle.h> 
 #endif
 #include <qtextcodec.h> 
 #include <qdir.h>
 #include <kstandarddirs.h>
 #include <kglobal.h>
 #include <stdio.h>
 #include "mainwindow.h"
+#include <libkdepim/kpimglobalprefs.h>
 void dumpMissing();
 int main( int argc, char **argv )
 {
 #ifndef DESKTOP_VERSION
  QPEApplication a( argc, argv );
  a.setKeepRunning ();
 #else
  QApplication a( argc, argv ); 
  QApplication::setStyle( new QPlatinumStyle ());
  QString hdir = QDir::homeDirPath();
  // there is a bug when creating dirs for WIN 98
  // it is difficult to fix, because we have no WIN 98 runnung
  // such that we try it to create the dirs at startup here
  if ( hdir == "C:\\" ) { // win 98 or ME
       QDir app_dir;
       if ( !app_dir.exists("C:\\kdepim") )
           app_dir.mkdir ("C:\\kdepim");
       if ( !app_dir.exists("C:\\kdepim\\apps") )
           app_dir.mkdir ("C:\\kdepim\\apps");
       if ( !app_dir.exists("C:\\kdepim\\config") )
           app_dir.mkdir ("C:\\kdepim\\config");
       if ( !app_dir.exists("C:\\kdepim\\apps\\korganizer") )
           app_dir.mkdir ("C:\\kdepim\\apps\\korganizer");
  }
 #endif
  bool exitHelp = false;
  if ( argc > 1 ) {
      QString command = argv[1];
      if (  command == "-help" ){
          printf("KO/Pi command line commands:\n");
          printf("  no command: Start KO/Pi in usual way\n");
          printf("  -help: This output\n");
          printf("Next Option: Open or Show after start:\n");
          printf("  -newTodo: New Todo dialog\n");
          printf("  -newEvent: New Event dialog\n");
          printf("  -showList: List view\n");
          printf("  -showDay: Day view\n");
          printf("  -showWWeek: Work Week view\n");
          printf("  -showWeek: Week view\n");
          printf("  -showTodo: Todo view\n");
          printf("  -showJournal: Journal view\n");
          printf("  -showKO: Next Days view\n");
          printf("  -showWNext: What's Next view\n");  
          printf("  -showNextXView: Next X View\n");
          printf(" -new[Y] and -show[X] may be used togehther\n");
          printf(" KO/Pi is exiting now. Bye!\n");
          exitHelp = true;
      }
  }
  if ( ! exitHelp ) {
      KGlobal::setAppName( "korganizer" );
      QString fileName ;
 #ifndef DESKTOP_VERSION
      fileName = getenv("QPEDIR");
      KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/korganizer/");
 #else
      fileName  = qApp->applicationDirPath () + "/kdepim/korganizer/";
      KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName));
 #endif 
      KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "korganizer")));
      MainWindow m;
 #ifndef DESKTOP_VERSION
     
      QObject::connect( &a, SIGNAL (appMessage ( const QCString &, const QByteArray & )),&m, SLOT(recieve(  const QCString&, const QByteArray& )));
      a.showMainWidget(&m );
 #else
      a.setMainWidget(&m );
      m.show();
      //m.resize( 800, 600 );
      QObject::connect(&a, SIGNAL(lastWindowClosed()), &a, SLOT(quit()));
 #endif
      if ( argc > 1 ) {
          QCString command = argv[1];
          if ( argc > 2 )
              command += argv[2];
          qApp->processEvents();
          m.recieve(command,  QByteArray() );
          
      }
     
      a.exec();
      dumpMissing();
+      KPimGlobalPrefs::instance()->writeConfig();
  }
  qDebug("KO: Bye! ");
 }
diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp
index 779b20e..9085673 100644
--- a/libkdepim/externalapphandler.cpp
+++ b/libkdepim/externalapphandler.cpp
@@ -1,634 +1,642 @@
 /*
    This file is part of libkdepim.
    Copyright (c) 2002 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.
 */
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 #include <stdlib.h>
 #include <qfile.h>
 #include <qmap.h>
 #include <qregexp.h>
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #include <qtopia/qcopenvelope_qws.h>
 #else
 #include <qapplication.h>
 #endif
 #include <kstaticdeleter.h>
 #include <kmessagebox.h>
 #include "externalapphandler.h"
 #include "kpimglobalprefs.h"
 //uncomment line to get debug output
 //#define DEBUG_EXT_APP_HANDLER
 /*********************************************************************************
 *
 ********************************************************************************/
 QCopTransferItem::QCopTransferItem(int usedSourceParameters, const QString& sourceMessage, const QString& targetChannel, const QString& targetMessage)
  : _usedSourceParameters(usedSourceParameters), _sourceMessage(sourceMessage), _targetChannel(targetChannel), _targetMessage(targetMessage)
 {
  //sourceMessage passes later three parameters: sourceChannel, uid, param1
    if (_usedSourceParameters == 0)
-      _sourceMessageParameters = "(QString,QString)";
+      _sourceMessageParameters = "QString,QString)";
    else if (_usedSourceParameters == 1)
      _sourceMessageParameters = "(QString,QString,QString)";
    else if (_usedSourceParameters == 2)
      _sourceMessageParameters = "(QString,QString,QString,QString)";
    else if (_usedSourceParameters == 3)
      _sourceMessageParameters = "(QString,QString,QString,QString,QString)";
 }
 /*********************************************************************************/
 QCopTransferItem::QCopTransferItem()
 {
 }
 /*********************************************************************************/
 bool QCopTransferItem::sendMessageToTarget(const QString& uid, const QString& param1, const QString& param2, const QString& param3)
 {
 #ifndef DESKTOP_VERSION
  //sourceMessage passes two parameters: sourceChannel, uid
  QString sourceMessage = _sourceMessage + _sourceMessageParameters;
 #ifdef DEBUG_EXT_APP_HANDLER
  qDebug("1Using QCopEnvelope e(\"%s\",\"%s\")", _targetChannel.latin1(), sourceMessage.latin1());
  qDebug("passing sourcechannel(%s), uid(%s), param1(%s), param2(%s), param3(%s) as parameter to QCopEnvelope", _sourceChannel.latin1(), uid.latin1(), param1.latin1(), param2.latin1(), param3.latin1());
 #endif
  QCopEnvelope e(_targetChannel.latin1(), sourceMessage.latin1());
  e << _sourceChannel << uid;
  if (_usedSourceParameters == 1)
    e << param1;
  else if (_usedSourceParameters == 2)
    e << param1 << param2;
  else if (_usedSourceParameters == 3)
    e << param1 << param2 << param3;
  qApp->processEvents();
  return true;
 #else
  KMessageBox::sorry( 0, i18n( "This version does not support QCop." ) );
  return false;
 #endif
 }
 /*********************************************************************************/
 void QCopTransferItem::setSourceChannel(const QString& sourceChannel)
 {
    if ( !sourceChannel.isEmpty())
        _sourceChannel = sourceChannel;
 }
 /*********************************************************************************/
 bool QCopTransferItem::appMessage( const QCString& cmsg, const QByteArray& data )
 {
  // copied from old mail2
 /*
  static int ii = 0;
    // block second call
    if ( ii < 2 ) {
      ++ii;
      if ( ii > 1 ) {
        qDebug("qcop call blocked ");
        return true;
      }
    }
 */
 //  qDebug("QCopTransferItem- QCOP message received: %s ", cmsg.data()  );
  //we are in the target and get a request from the source
  if ( (_sourceMessage + _sourceMessageParameters) == cmsg.data())
  {
    QDataStream stream( data, IO_ReadOnly );
    QString sourceChannel;
    QString uid;
    QString param1;
    QString param2;
    QString param3;
    stream >> sourceChannel >> uid;
    if (_usedSourceParameters == 0)
    {
      emit receivedMessageFromSource(sourceChannel, uid);
    }
    else if (_usedSourceParameters == 1)
    {
      stream >> param1;
      emit receivedMessageFromSource(sourceChannel, uid, param1);
        }
    else if (_usedSourceParameters == 2)
    {
      stream >> param1 >> param2;
      emit receivedMessageFromSource(sourceChannel, uid, param1, param2);
    }
    else if (_usedSourceParameters == 3)
    {
      stream >> param1 >> param2 >> param3;
      emit receivedMessageFromSource(sourceChannel, uid, param1, param2, param3);
    }
    return true;
  }
  return false;
 }
 /*********************************************************************************
 *
 ********************************************************************************/
 QCopMapTransferItem::QCopMapTransferItem(int usedSourceParameters, const QString& sourceMessage, const QString& targetChannel, const QString& targetMessage)
  : QCopTransferItem(usedSourceParameters, sourceMessage, targetChannel,targetMessage)
 {
  //targetMessage returns later two parameters: uid, and map<qstring,qstring>
  _targetMessageParameters = "(QString,QMAP<QString,QString>)";
 }
 /*********************************************************************************/
 bool QCopMapTransferItem::sendMessageToSource(const QString& uid, const QMap<QString,QString>& nameEmailMap)
 {
 #ifndef DESKTOP_VERSION
  //targetMessage passes two parameters: uid, map
  QString targetMessage = _targetMessage + _targetMessageParameters;
 #ifdef DEBUG_EXT_APP_HANDLER
  qDebug("2Using QCopEnvelope e(\"%s\",\"%s\")", _sourceChannel.latin1(), targetMessage.latin1());
  qDebug("passing uid(%s) and map as parameter to QCopEnvelope", uid.latin1());
 #endif
  QCopEnvelope e(_sourceChannel.latin1(), targetMessage.latin1());
    //US we need no names in the To field. The emailadresses are enough
  e << uid << nameEmailMap;
  qApp->processEvents();
  return true;
 #else
  KMessageBox::sorry( 0, i18n( "This version does not support QCop." ) );
  return false;
 #endif
 }
 /*********************************************************************************/
 bool QCopMapTransferItem::appMessage( const QCString& cmsg, const QByteArray& data )
 {
  bool res = QCopTransferItem::appMessage( cmsg, data );
  if (res == false)
  {
    QDataStream stream( data, IO_ReadOnly );
 //    qDebug("QCopMapTransferItem- QCOP message received: %s ", cmsg.data()  );
    //we are in the source and get an answer from the target
    if ((_targetMessage + _targetMessageParameters) == cmsg.data())
    {
      QMap<QString,QString> adrMap;
      QString uid;
      stream >> uid >> adrMap;
      emit receivedMessageFromTarget(uid, adrMap);
      return true;
    }
  }
  return false;
 }
 /*********************************************************************************
 *
 ********************************************************************************/
+QCopListTransferItem::~QCopListTransferItem()
+{
+    
+}
 QCopListTransferItem::QCopListTransferItem(int usedSourceParameters, const QString& sourceMessage, const QString& targetChannel, const QString& targetMessage)
  : QCopTransferItem(usedSourceParameters, sourceMessage, targetChannel,targetMessage)
 {
  //targetMessage returns later two parameters: uid, and three lists
  _targetMessageParameters = "(QString,QStringList,QStringList,QStringList,QStringList,QStringList,QStringList)";
 }
 /*********************************************************************************/
 bool QCopListTransferItem::sendMessageToSource(const QString& uid, const QStringList& list1, const QStringList& list2, const QStringList& list3, const QStringList& list4, const QStringList& list5, const QStringList& list6)
 {
 #ifndef DESKTOP_VERSION
  //targetMessage passes two parameters: uid, map
  QString targetMessage = _targetMessage + _targetMessageParameters;
 #ifdef DEBUG_EXT_APP_HANDLER
  qDebug("3Using QCopEnvelope e(\"%s\",\"%s\")", _sourceChannel.latin1(), targetMessage.latin1());
  qDebug("passing uid(%s) and list1, list2, list3, list4, list5, list6 as parameter to QCopEnvelope", uid.latin1());
  
    for ( int i = 0; i < list3.count(); i++)
      qDebug("listentry list3: %s",list3[i].latin1());
 #endif
  QCopEnvelope e(_sourceChannel.latin1(), targetMessage.latin1());
    //US we need no names in the To field. The emailadresses are enough
  e << uid << list1 << list2 << list3 << list4 << list5 << list6;
  qApp->processEvents();
  return true;
 #else
  KMessageBox::sorry( 0, i18n( "This version does not support QCop." ) );
  return false;
 #endif
 }
 /*********************************************************************************/
 bool QCopListTransferItem::appMessage( const QCString& cmsg, const QByteArray& data )
 {
  bool res = QCopTransferItem::appMessage( cmsg, data );
 #ifdef DEBUG_EXT_APP_HANDLER
    qDebug("1QCopListTransferItem- QCOP message received: %s ", cmsg.data()  );
 #endif
  if (res == false)
  {
    QDataStream stream( data, IO_ReadOnly );
 #ifdef DEBUG_EXT_APP_HANDLER
    qDebug("2QCopListTransferItem- QCOP message received: %s ", cmsg.data()  );
 #endif
    //we are in the source and get an answer from the target
    if ((_targetMessage + _targetMessageParameters) == cmsg.data())
    {
      QStringList list1;
      QStringList list2;
      QStringList list3;
      QStringList list4;
      QStringList list5;
      QStringList list6;
      QString uid;
 #ifdef DEBUG_EXT_APP_HANDLER
      qDebug("3QCopListTransferItem- QCOP message received: %s ", cmsg.data()  );
 #endif
      stream >> uid >> list1 >> list2 >> list3 >> list4 >> list5 >> list6;
      emit receivedMessageFromTarget(uid, list1, list2, list3, list4, list5, list6);
      return true;
    }
  }
  return false;
 }
 /*********************************************************************************
 *
 ********************************************************************************/
 ExternalAppHandler *ExternalAppHandler::sInstance = 0;
 static KStaticDeleter<ExternalAppHandler> staticDeleter;
 ExternalAppHandler::ExternalAppHandler()
 {
  mDefaultItems.setAutoDelete(true);
  mNameEmailUidListFromKAPITransfer = new QCopListTransferItem(0, "requestNameEmailUIDListFromKAPI", "QPE/Application/kapi", "receiveNameEmailUIDList");
  connect(mNameEmailUidListFromKAPITransfer, SIGNAL (receivedMessageFromSource(const QString&, const QString&)), this, SIGNAL (requestForNameEmailUidList(const QString&, const QString&)));
  connect(mNameEmailUidListFromKAPITransfer, SIGNAL (receivedMessageFromTarget(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&)), this, SLOT (receivedNameEmailUidList_Slot(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&)));
 //US  mFindByEmailFromKAPITransfer = new QCopListTransferItem(1, "requestFindByEmailFromKAPI", "QPE/Application/kapi", "receiveFindByEmailNameEmailUIDList");
 //US  connect(mFindByEmailFromKAPITransfer, SIGNAL (receivedMessageFromSource(const QString&, const QString&, const QString&)), this, SIGNAL (requestForFindByEmail(const QString&, const QString&, const QString&)));
 //US  connect(mFindByEmailFromKAPITransfer, SIGNAL (receivedMessageFromTarget(const QString&, const QStringList&, const QStringList&, const QStringList&)), this, SIGNAL (receivedFindByEmailEvent(const QString&, const QStringList&, const QStringList&, const QStringList&)));
  mDisplayDetails = new QCopListTransferItem(3, "requestDisplayDetailsFromKAPI", "QPE/Application/kapi", "");
  connect(mDisplayDetails, SIGNAL (receivedMessageFromSource(const QString&, const QString&, const QString&, const QString&, const QString&)), this, SIGNAL (requestForDetails(const QString&, const QString&, const QString&, const QString&, const QString&)));
  mBirthdayListFromKAPITransfer = new QCopListTransferItem(0, "requestBirthdayListFromKAPI", "QPE/Application/kapi", "receiveBirthdayList");
  connect(mBirthdayListFromKAPITransfer, SIGNAL (receivedMessageFromSource(const QString&, const QString&)), this, SIGNAL (requestForBirthdayList(const QString&, const QString&)));
  connect(mBirthdayListFromKAPITransfer, SIGNAL (receivedMessageFromTarget(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&)), this, SIGNAL (receivedBirthdayListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&)));
 }
 ExternalAppHandler::~ExternalAppHandler()
-{
+{ 
+    delete mNameEmailUidListFromKAPITransfer;
+    //delete mFindByEmailFromKAPITransfer;
+    delete mDisplayDetails;
+    delete mBirthdayListFromKAPITransfer;
 }
 void ExternalAppHandler::receivedNameEmailUidList_Slot(const QString& uid,
                                                       const QStringList& nameList,
                                                       const QStringList& emailList,
                                                       const QStringList& uidList,
                                                       const QStringList&,
                                                       const QStringList&,
                                                       const QStringList& )
 {
  // this method is a conevnient way to reduce the number of parameters I have to pass 
  emit receivedNameEmailUidListEvent(uid, nameList, emailList, uidList);
 }
 void ExternalAppHandler::loadConfig()
 {
  mDefaultItems.clear();
  mEmailAppAvailable = UNDEFINED;
  mPhoneAppAvailable = UNDEFINED;
  mFaxAppAvailable = UNDEFINED;
  mSMSAppAvailable = UNDEFINED;
  mPagerAppAvailable = UNDEFINED;
  mSIPAppAvailable = UNDEFINED;
  QString opiepath = QString::fromLatin1( getenv("OPIEDIR") );
  QString qtopiapath = QString::fromLatin1( getenv("QPEDIR") );
  if (opiepath.isEmpty())
    opiepath = qtopiapath;
  //mailclients
  QString mailmsg1 = "writeMail(QString,QString)";
  QString mailmsg2 = "writeMail(QMap(QString,QString))";
  QString undefined = "";
  addDefaultAppItem(ExternalAppHandler::EMAIL, KPimGlobalPrefs::NONE_EMC,   "No email client installed",       undefined,                undefined,        undefined, undefined, undefined);
  addDefaultAppItem(ExternalAppHandler::EMAIL, KPimGlobalPrefs::OTHER_EMC,  "Userdefined email client",       undefined,                undefined,        undefined, undefined, undefined);
  if (( QFile::exists( qtopiapath + "/bin/ompi" )) ||
     ( QFile::exists( opiepath + "/bin/ompi" )))
    addDefaultAppItem(ExternalAppHandler::EMAIL, KPimGlobalPrefs::OMPI_EMC,   "OM/Pi email client",   "QPE/Application/ompi",    mailmsg1, "%1;%2",        mailmsg2,   "TO=%1;ATTACHMENT=%2");
  if ( QFile::exists( qtopiapath + "/bin/qtmail" ))
    addDefaultAppItem(ExternalAppHandler::EMAIL, KPimGlobalPrefs::QTOPIA_EMC, "Qtopia email client", "QPE/Application/qtmail",   mailmsg1, "%1;%2",       mailmsg2,    "TO=%1;ATTACHMENT=%2");
  if ( QFile::exists( opiepath + "/bin/opiemail" ))
    addDefaultAppItem(ExternalAppHandler::EMAIL, KPimGlobalPrefs::OPIE_EMC,   "Opie email client",   "QPE/Application/opiemail", mailmsg1, "%1;%2",       mailmsg2,    "TO=%1;ATTACHMENT=%2");
  //phoneclients
  addDefaultAppItem(ExternalAppHandler::PHONE, KPimGlobalPrefs::NONE_PHC,  "No phone client installed",       undefined,            undefined, undefined, undefined, undefined);
  addDefaultAppItem(ExternalAppHandler::PHONE, KPimGlobalPrefs::OTHER_PHC,  "Other phone client",       undefined,            undefined, undefined, undefined, undefined);
  if (( QFile::exists( qtopiapath + "/bin/kppi" )) ||
     ( QFile::exists( opiepath + "/bin/kppi" )))
    addDefaultAppItem(ExternalAppHandler::PHONE, KPimGlobalPrefs::KPPI_PHC,   "KP/Pi phone client",       "QPE/Application/kppi", "-ring:%1", "", undefined, undefined);
  //faxclients
  addDefaultAppItem(ExternalAppHandler::FAX,   KPimGlobalPrefs::NONE_FAC,  "No fax client installed",       undefined,            undefined, undefined, undefined, undefined);
  addDefaultAppItem(ExternalAppHandler::FAX,   KPimGlobalPrefs::OTHER_FAC,  "Other fax client",       undefined,            undefined, undefined, undefined, undefined);
  //smsclients
  addDefaultAppItem(ExternalAppHandler::SMS,   KPimGlobalPrefs::NONE_SMC,  "No sms client installed",       undefined,            undefined, undefined, undefined, undefined);
  addDefaultAppItem(ExternalAppHandler::SMS,   KPimGlobalPrefs::OTHER_SMC,  "Other sms client",       undefined,            undefined, undefined, undefined, undefined);
  //pagerclients
  addDefaultAppItem(ExternalAppHandler::PAGER, KPimGlobalPrefs::NONE_PAC,  "No pager client installed",       undefined,            undefined, undefined, undefined, undefined);
  addDefaultAppItem(ExternalAppHandler::PAGER, KPimGlobalPrefs::OTHER_PAC,  "Other pager client",       undefined,            undefined, undefined, undefined, undefined);
  //sipclients
  addDefaultAppItem(ExternalAppHandler::SIP, KPimGlobalPrefs::NONE_SIC,  "No SIP client installed",       undefined,            undefined, undefined, undefined, undefined);
  addDefaultAppItem(ExternalAppHandler::SIP, KPimGlobalPrefs::OTHER_SIC,  "Other SIP client",       undefined,            undefined, undefined, undefined, undefined);
  if (( QFile::exists( qtopiapath + "/bin/kppi" )) ||
      ( QFile::exists( opiepath + "/bin/kppi" )))
      addDefaultAppItem(ExternalAppHandler::SIP, KPimGlobalPrefs::KPPI_SIC,   "KP/Pi SIP client",       "QPE/Application/kppi", "-ring:%1", "", undefined, undefined);
 }
 ExternalAppHandler *ExternalAppHandler::instance()
 {
  if ( !sInstance ) {
    sInstance = staticDeleter.setObject( new ExternalAppHandler() );
    sInstance->loadConfig();
  }
  return sInstance;
 }
 void ExternalAppHandler::addDefaultAppItem(Types type, int id, const QString& label,  const QString& channel, const QString& message, const QString& parameter, const QString& message2, const QString& parameter2)
 {
  DefaultAppItem* dai = new DefaultAppItem(type, id, label,  channel, message, parameter, message2, parameter2);
  // qDebug("%d %d %s %s ",   type,  id,  label.latin1(), channel.latin1() );
  mDefaultItems.append(dai);
 }
 QList<DefaultAppItem> ExternalAppHandler::getAvailableDefaultItems(Types type)
 {
  QList<DefaultAppItem> list;
  DefaultAppItem* dai;
  for ( dai=mDefaultItems.first(); dai != 0; dai=mDefaultItems.next() )
  {
    if (dai->_type == type)
      list.append(dai);
  }
  return list;
 }
 DefaultAppItem* ExternalAppHandler::getDefaultItem(Types type, int clientid)
 {
  DefaultAppItem* dai;
  for ( dai=mDefaultItems.first(); dai != 0; dai=mDefaultItems.next() )
  {
    if (dai->_type == type && dai->_id == clientid)
      return dai;
  }
  return 0;
 }
 bool ExternalAppHandler::isEmailAppAvailable()
 {
 #ifndef DESKTOP_VERSION
  if (mEmailAppAvailable == UNDEFINED)
  {
    int client = KPimGlobalPrefs::instance()->mEmailClient;
    if (client == KPimGlobalPrefs::NONE_EMC)
      mEmailAppAvailable = UNAVAILABLE;
    else
      mEmailAppAvailable = AVAILABLE;
  }
  return (mEmailAppAvailable == AVAILABLE);
 #else //DESKTOP_VERSION
  return false;
 #endif //DESKTOP_VERSION
 }
 bool ExternalAppHandler::isSMSAppAvailable()
 {
 #ifndef DESKTOP_VERSION
  if (mSMSAppAvailable == UNDEFINED)
  {
    int client = KPimGlobalPrefs::instance()->mSMSClient;
    if (client == KPimGlobalPrefs::NONE_SMC)
      mSMSAppAvailable = UNAVAILABLE;
    else
      mSMSAppAvailable = AVAILABLE;
  }
  return (mSMSAppAvailable == AVAILABLE);
 #else //DESKTOP_VERSION
  return false;
 #endif //DESKTOP_VERSION
 }
 bool ExternalAppHandler::isPhoneAppAvailable()
 {
 #ifndef DESKTOP_VERSION
  if (mPhoneAppAvailable == UNDEFINED)
  {
    int client = KPimGlobalPrefs::instance()->mPhoneClient;
    if (client == KPimGlobalPrefs::NONE_PHC)
      mPhoneAppAvailable = UNAVAILABLE;
    else
      mPhoneAppAvailable = AVAILABLE;
  }
  return (mPhoneAppAvailable == AVAILABLE);
 #else //DESKTOP_VERSION
  return false;
 #endif //DESKTOP_VERSION
 }
 bool ExternalAppHandler::isFaxAppAvailable()
 {
 #ifndef DESKTOP_VERSION
  if (mFaxAppAvailable == UNDEFINED)
  {
    int client = KPimGlobalPrefs::instance()->mFaxClient;
    if (client == KPimGlobalPrefs::NONE_FAC)
      mFaxAppAvailable = UNAVAILABLE;
    else
      mFaxAppAvailable = AVAILABLE;
  }
  return (mFaxAppAvailable == AVAILABLE);
 #else //DESKTOP_VERSION
  return false;
 #endif //DESKTOP_VERSION
 }
 bool ExternalAppHandler::isPagerAppAvailable()
 {
 #ifndef DESKTOP_VERSION
  if (mPagerAppAvailable == UNDEFINED)
  {
    int client = KPimGlobalPrefs::instance()->mPagerClient;
    if (client == KPimGlobalPrefs::NONE_PAC)
      mPagerAppAvailable = UNAVAILABLE;
    else
      mPagerAppAvailable = AVAILABLE;
  }
  return (mPagerAppAvailable == AVAILABLE);
 #else //DESKTOP_VERSION
  return false;
 #endif //DESKTOP_VERSION
 }
 bool ExternalAppHandler::isSIPAppAvailable()
 {
 #ifndef DESKTOP_VERSION
  if (mSIPAppAvailable == UNDEFINED)
  {
    int client = KPimGlobalPrefs::instance()->mSipClient;
    if (client == KPimGlobalPrefs::NONE_SIC)
      mSIPAppAvailable = UNAVAILABLE;
    else
      mSIPAppAvailable = AVAILABLE;
  }
  return (mSIPAppAvailable == AVAILABLE);
 #else //DESKTOP_VERSION
  return false;
 #endif //DESKTOP_VERSION
 }
 /**************************************************************************
 *
 **************************************************************************/
 //calls the emailapplication with a number of attachments that need to be send (Seperated by Comma)
 bool ExternalAppHandler::mailToMultipleContacts( const QString& emails, const QString& urls )
 {
 #ifndef DESKTOP_VERSION
  QString channel;
  QString message2;
  QString parameters2;
  int client = KPimGlobalPrefs::instance()->mEmailClient;
  if (client == KPimGlobalPrefs::OTHER_EMC)
  {
    channel = KPimGlobalPrefs::instance()->mEmailOtherChannel;
diff --git a/libkdepim/externalapphandler.h b/libkdepim/externalapphandler.h
index 4c6f1ea..6f5d345 100644
--- a/libkdepim/externalapphandler.h
+++ b/libkdepim/externalapphandler.h
@@ -1,291 +1,291 @@
 /*
    This file is part of libkdepim.
    Copyright (c) 2004 Ulf Schenk
    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.
 */
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 #ifndef EXTERNALAPPHANDLER_H
 #define EXTERNALAPPHANDLER_H
 #include <qobject.h>
 #include <qlist.h>
 #include <qmap.h>
 class QCopEnvelope;
 class ExternalAppHandler;
 class QCopTransferItem  : public QObject
 {
  Q_OBJECT
  public:
    QCopTransferItem(int usedSourceParameters, const QString& sourceMessage, const QString& targetChannel, const QString& targetMessage);
        QCopTransferItem();
    bool sendMessageToTarget(const QString& uid, const QString& param1 = QString::null, const QString& param2 = QString::null, const QString& param3 = QString::null);
    void setSourceChannel(const QString& sourceChannel);
    virtual bool appMessage( const QCString& msg, const QByteArray& data );
 signals:
    void receivedMessageFromSource(const QString& sourceChannel, const QString& uid);
    void receivedMessageFromSource(const QString& sourceChannel, const QString& uid, const QString& param1);
    void receivedMessageFromSource(const QString& sourceChannel, const QString& uid, const QString& param1, const QString& param2);
    void receivedMessageFromSource(const QString& sourceChannel, const QString& uid, const QString& param1, const QString& param2, const QString& param3);
  public:
    int _usedSourceParameters;
    QString _sourceChannel;
    QString _sourceMessage;
    QString _sourceMessageParameters;
    QString _targetChannel;
    QString _targetMessage;
    QString _targetMessageParameters;
 };
 /*********************************************************************************
 *
 ********************************************************************************/
 class QCopMapTransferItem : public QCopTransferItem
 {
  Q_OBJECT
  public:
    QCopMapTransferItem(int usedSourceParameters, const QString& sourceMessage, const QString& targetChannel, const QString& targetMessage);
    bool sendMessageToSource(const QString& uid, const QMap<QString,QString>& nameEmailMap);
    virtual bool appMessage( const QCString& msg, const QByteArray& data );
 signals:
    void receivedMessageFromTarget(const QString& uid, const QMap<QString,QString>& nameEmailMap);
 };
 /*********************************************************************************
 *
 ********************************************************************************/
 class QCopListTransferItem : public QCopTransferItem
 {
  Q_OBJECT
  public:
    QCopListTransferItem(int usedSourceParameters, const QString& sourceMessage, const QString& targetChannel, const QString& targetMessage);
+    ~QCopListTransferItem();
    bool sendMessageToSource(const QString& uid, const QStringList& list1, const QStringList& list2, const QStringList& list3, const QStringList& list4, const QStringList& list5,  const QStringList& list6);
    virtual bool appMessage( const QCString& msg, const QByteArray& data );
 signals:
    void receivedMessageFromTarget(const QString& uid, const QStringList& list1, const QStringList& list2, const QStringList& list3, const QStringList& list4 , const QStringList& list5,  const QStringList& list6);
 };
 /*********************************************************************************
 *
 ********************************************************************************/
 class DefaultAppItem
 {
  public:
    DefaultAppItem(int type, int id, const QString& label,  const QString& channel, const QString& message, const QString& parameters, const QString& message2, const QString& parameters2)
      : _type(type), _id(id), _label(label), _channel(channel), _message(message), _parameters(parameters), _message2(message2), _parameters2(parameters2)
              {}
        DefaultAppItem()
        {  }
  public:
    int _type;
    int _id;
    QString _label;
    QString _channel;
    QString _message;
            QString _parameters;// a list of parameters in stringrepresentation. Delimiter is ;
    QString _message2;
    QString _parameters2;  // a list of parameters in stringrepresentation. Delimiter is ;
 };
 /*********************************************************************************
 *
 ********************************************************************************/
 class ExternalAppHandler : public QObject
 {
  Q_OBJECT
  public:
    virtual ~ExternalAppHandler();
    static ExternalAppHandler *instance();
    enum Types {
                EMAIL = 0,
                PHONE = 1,
                SMS   = 2,
                FAX   = 3,
                PAGER = 4,
                SIP   = 5
        };
    enum Availability {
                UNDEFINED = -1,
                UNAVAILABLE   = 0,
                AVAILABLE = 1
        };
    //calls the emailapplication with a number of attachments that need to be send.
    //either parameter can be left empty.
    bool mailToMultipleContacts( const QString& recipients, const QString& attachmenturls );
    //calls the emailapplication and creates a mail with parameter emailadress as recipients
    bool mailToOneContact( const QString& name, const QString& emailadress );
    //calls the emailapplication and creates a mail with parameter as recipients
    // parameters format is
    //  NAME <EMAIL>:SUBJECT
    bool mailToOneContact( const QString& adressline );
    //calls the phoneapplication with the number
    bool callByPhone( const QString& phonenumber );
    //calls the smsapplication with the number
    bool callBySMS( const QString& phonenumber );
    //calls the pagerapplication with the number
    bool callByPager( const QString& pagernumber );
    //calls the faxapplication with the number
    bool callByFax( const QString& faxnumber );
    //calls the sipapplication with the number
    bool callBySIP( const QString& sipnumber );
    bool isEmailAppAvailable();
    bool isSMSAppAvailable();
    bool isPhoneAppAvailable();
    bool isFaxAppAvailable();
    bool isPagerAppAvailable();
    bool isSIPAppAvailable();
    //Call this method on the source when you want to select names from the addressbook by using QCop
    bool requestNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid);
    //Call this method on the target when you want to return the name/email map to the source (client).
    bool returnNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& name, const QStringList& email, const QStringList& uid);
    bool requestFindByEmailFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QString& email);
    bool returnFindByEmailFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& name, const QStringList& email, const QStringList& uid);
    bool requestDetailsFromKAPI(const QString& name, const QString& email, const QString& uid);
    bool requestBirthdayListFromKAPI(const QString& sourceChannel, const QString& sessionuid);
    bool returnBirthdayListFromKAPI(const QString& sourceChannel, const QString& sessionuid,
                                    const QStringList& birthdayList, const QStringList& anniversaryList,
                                    const QStringList& realNameList, const QStringList& emailList,
                                    const QStringList& assembledNameList, const QStringList& uidList);
    //loadConfig clears the cache and checks again if the applications are available or not
    void loadConfig();
    QList<DefaultAppItem> getAvailableDefaultItems(Types);
    DefaultAppItem* getDefaultItem(Types, int);
 public  slots:
    void appMessage( const QCString& msg, const QByteArray& data );
 signals:
    // Emmitted when the target app receives a request from the source app
    void requestForNameEmailUidList(const QString& sourceChannel, const QString& uid);
    // Emitted when the source app recieves a list of name/email pairs (=addresses) from another target app. Usually Ka/Pi
    // The first parameter is a uniqueid. It can be used to identify the event
    void receivedNameEmailUidListEvent(const QString& uid, const QStringList& nameList, const QStringList& emailList, const QStringList& uidList);
    void requestFindByEmail(const QString& sourceChannel, const QString& uid, const QString& email);
    void receivedFindByEmailEvent(const QString& uid, const QStringList& nameList, const QStringList& emailList, const QStringList& uidList);
    void requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid);
    // Emmitted when the target app receives a request from the source app
    void requestForBirthdayList(const QString& sourceChannel, const QString& uid);
    // Emitted when the source app recieves a list of name/email pairs (=addresses) from another target app. Usually Ka/Pi
    // The first parameter is a uniqueid. It can be used to identify the event
    void receivedBirthdayListEvent(const QString& uid, const QStringList& birthdayList,
                                   const QStringList& anniversaryList, const QStringList& realNameList,
                                   const QStringList& emailList, const QStringList& assembledNameList,
                                   const QStringList& uidList);
  private:
    ExternalAppHandler();
    QList<DefaultAppItem> mDefaultItems;
    Availability mEmailAppAvailable;
    Availability mPhoneAppAvailable;
    Availability mFaxAppAvailable;
    Availability mSMSAppAvailable;
    Availability mPagerAppAvailable;
    Availability mSIPAppAvailable;
    QCopListTransferItem* mNameEmailUidListFromKAPITransfer;
    QCopListTransferItem* mFindByEmailFromKAPITransfer;
    QCopTransferItem* mDisplayDetails;
    QCopListTransferItem* mBirthdayListFromKAPITransfer;
    void addDefaultAppItem(Types type, int id, const QString& label,  const QString& channel, const QString& message, const QString& parameters, const QString& message2, const QString& parameters2);
    QString& translateMessage(QString& message, const QString& param1, const QString& param2) const;
        void passParameters(QCopEnvelope* e, const QString& parameters, const QString& param1, const QString& param2) const;
    static ExternalAppHandler *sInstance;
  private slots:
    void receivedNameEmailUidList_Slot(const QString& uid, const QStringList& nameList, const QStringList& emailList, const QStringList& uidList, const QStringList&, const QStringList&, const QStringList& );
 };
 #endif
diff --git a/libkdepim/kpimglobalprefs.cpp b/libkdepim/kpimglobalprefs.cpp
index 3771569..0fdc3e4 100644
--- a/libkdepim/kpimglobalprefs.cpp
+++ b/libkdepim/kpimglobalprefs.cpp
@@ -1,205 +1,204 @@
 /*
    This file is part of libkdepim.
    Copyright (c) 2002 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.
 */
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 #include <kglobal.h>
 #include <kconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kstaticdeleter.h>
 #include <qregexp.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qapplication.h>
 #include "kpimglobalprefs.h"
 KPimGlobalPrefs *KPimGlobalPrefs::sInstance = 0;
 static KStaticDeleter<KPimGlobalPrefs> staticDeleterGP;
 KPimGlobalPrefs::KPimGlobalPrefs( const QString &name )
  : KPrefs("microkdeglobalrc")
 {
    mLocaleDict = 0;
  KPrefs::setCurrentGroup("Locale");
  addItemInt("PreferredLanguage",&mPreferredLanguage,0);
  addItemInt("PreferredTime",&mPreferredTime,0);
  addItemInt("PreferredDate",&mPreferredDate,0);
  addItemBool("WeekStartsOnSunday",&mWeekStartsOnSunday,false);
  addItemString("UserDateFormatLong", &mUserDateFormatLong, "%A %d %b %y");
  addItemString("UserDateFormatShort", &mUserDateFormatShort, "%aK %d.%m.%y");
  KPrefs::setCurrentGroup("Time & Date");
  addItemString("TimeZoneName",&mTimeZoneId, ("+01:00 Europe/Oslo(CET)") );
  addItemBool("UseDaylightsaving",&mUseDaylightsaving,true);
  addItemBool("TimeZoneAdd30min",&mTimeZoneAdd30min,false);
  addItemInt("DaylightsavingStart",&mDaylightsavingStart,90);
  addItemInt("DaylightsavingEnd",&mDaylightsavingEnd,304);
  KPrefs::setCurrentGroup( "ExternalApplications" );
  addItemInt( "EmailChannelType", &mEmailClient, OMPI_EMC );
  addItemString( "EmailChannel", &mEmailOtherChannel, "" );
  addItemString( "EmailChannelMessage", &mEmailOtherMessage, "" );
  addItemString( "EmailChannelParameters", &mEmailOtherMessageParameters, "" );
  addItemString( "EmailChannelMessage2", &mEmailOtherMessage2, "" );
  addItemString( "EmailChannelParameters2", &mEmailOtherMessageParameters2, "" );
  addItemInt( "PhoneChannelType", &mPhoneClient, KPPI_PHC );
  addItemString( "PhoneChannel", &mPhoneOtherChannel, "" );
  addItemString( "PhoneChannelMessage", &mPhoneOtherMessage, "" );
  addItemString( "PhoneChannelParameters", &mPhoneOtherMessageParameters, "" );
  addItemInt( "FaxChannelType", &mFaxClient, NONE_FAC );
  addItemString( "FaxChannel", &mFaxOtherChannel, "" );
  addItemString( "FaxChannelMessage", &mFaxOtherMessage, "" );
  addItemString( "FaxChannelParameters", &mFaxOtherMessageParameters, "" );
  addItemInt( "SMSChannelType", &mSMSClient, NONE_SMC );
  addItemString( "SMSChannel", &mSMSOtherChannel, "" );
  addItemString( "SMSChannelMessage", &mSMSOtherMessage, "" );
  addItemString( "SMSChannelParameters", &mSMSOtherMessageParameters, "" );
  addItemInt( "PagerChannelType", &mPagerClient, NONE_PAC );
  addItemString( "PagerChannel", &mPagerOtherChannel, "" );
  addItemString( "PagerChannelMessage", &mPagerOtherMessage, "" );
  addItemString( "PagerChannelParameters", &mPagerOtherMessageParameters, "" );
  addItemInt( "SIPChannelType", &mSipClient, KPPI_SIC );
  addItemString( "SIPChannel", &mSipOtherChannel, "" );
  addItemString( "SIPChannelMessage", &mSipOtherMessage, "" );
  addItemString( "SIPChannelParameters", &mSipOtherMessageParameters, "" );
  KPrefs::setCurrentGroup( "PhoneAccess" );
  addItemString("Ex2PhoneDevice",&mEx2PhoneDevice,"/dev/ircomm");
  addItemString("Ex2PhoneConnection",&mEx2PhoneConnection,"irda");
  addItemString("Ex2PhoneModel",&mEx2PhoneModel,"6310i");
 }
 void KPimGlobalPrefs::setGlobalConfig()
 {
    if ( mLocaleDict == 0 ) {
        QString fileName ; 
        QString name = KGlobal::getAppName() +"/";
 #ifndef DESKTOP_VERSION
        fileName= QString(getenv("QPEDIR"))+"/pics/kdepim/"+name
 #else
            fileName  = qApp->applicationDirPath () + "/kdepim/"+ name;
 #endif
        mLocaleDict = 0;
        if ( mPreferredLanguage > 0 && mPreferredLanguage < 5 ) {
         
            if ( mPreferredLanguage == 1 ) 
                fileName = fileName+"germantranslation.txt"; 
            else if ( mPreferredLanguage == 4 ) 
                fileName = fileName+"usertranslation.txt"; 
            else if ( mPreferredLanguage == 2 ) 
                fileName = fileName+"frenchtranslation.txt"; 
            else if ( mPreferredLanguage == 3 ) 
                fileName = fileName+"italiantranslation.txt";
            QFile file( fileName );
            if (file.open( IO_ReadOnly ) ) {
                QTextStream ts( &file );
                ts.setEncoding( QTextStream::Latin1 );
                //ts.setCodec( QTextCodec::latin1 );
                QString  text = ts.read();
                file.close();  
                text.replace( QRegExp("\\\\n"), "\n" );
                QString line;
                QString we;
                QString wt;
                int br = 0;
                int nbr;
                nbr = text.find ( "},", br );
                line = text.mid( br, nbr - br );
                br = nbr+1;
                int se, ee, st, et;
                mLocaleDict = new QDict<QString>;
+                mLocaleDict->setAutoDelete( true );
                QString end = "{ \"\",\"\" }";
                while ( (line != end) && (br > 1)  ) {
                    //qDebug("%d *%s* ", br, line.latin1());
                    se = line.find("\"")+1;
                    et = line.findRev("\"",-1);
                    ee = line.find("\",\"");
                    st = ee+3;
                    we = line.mid( se, ee-se );
                    wt = line.mid( st, et-st );
                    //qDebug("*%s* *%s* ", we.latin1(), wt.latin1());
                    mLocaleDict->insert( we, new QString (wt) );
                    nbr = text.find ( "}", br );
                    line = text.mid( br, nbr - br );
                    br = nbr+1;
                }
                //qDebug("end *%s* ", end.latin1());
                setLocaleDict( mLocaleDict );
            } else {
                qDebug("KO: Cannot find translation file %s",fileName.latin1() );
            }
        }
    }
    KGlobal::locale()->setHore24Format( !mPreferredTime );
    KGlobal::locale()->setWeekStartMonday( !mWeekStartsOnSunday );
    KGlobal::locale()->setIntDateFormat( (KLocale::IntDateFormat)mPreferredDate );
    KGlobal::locale()->setLanguage( mPreferredLanguage );
    QString dummy = mUserDateFormatLong;
    KGlobal::locale()->setDateFormat(dummy.replace( QRegExp("K"), QString(",") ));
    dummy = mUserDateFormatShort;
    KGlobal::locale()->setDateFormatShort(dummy.replace( QRegExp("K"), QString(",") ));
    KGlobal::locale()->setDaylightSaving( mUseDaylightsaving,
                                          mDaylightsavingStart,
                                          mDaylightsavingEnd );
    KGlobal::locale()->setTimezone( mTimeZoneId, mTimeZoneAdd30min );
 }
 KPimGlobalPrefs::~KPimGlobalPrefs()
 { 
    if (sInstance == this)
      sInstance = staticDeleterGP.setObject(0); 
    else
        qDebug("Whats this? Error in KPimGlobalPrefs::~KPimGlobalPrefs() ?");
-    //qDebug("KPimGlobalPrefs::~KPimGlobalPrefs() ");
-    writeConfig();
    if ( mLocaleDict )
        delete mLocaleDict;
 }
 KPimGlobalPrefs *KPimGlobalPrefs::instance()
 {
  if ( !sInstance ) {
    sInstance = staticDeleterGP.setObject( new KPimGlobalPrefs() );
    sInstance->readConfig();
  }
  return sInstance;
 }
diff --git a/microkde/kdeui/klistview.cpp b/microkde/kdeui/klistview.cpp
index 5b50ba9..3c809b4 100644
--- a/microkde/kdeui/klistview.cpp
+++ b/microkde/kdeui/klistview.cpp
@@ -1,371 +1,370 @@
 /* This file is part of the KDE libraries
   Copyright (C) 2000 Reginald Stadlbauer <reggie@kde.org>
   Copyright (C) 2000 Charles Samuels <charles@kde.org>
   Copyright (C) 2000 Peter Putzer
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Library General Public
   License version 2 as published by the Free Software Foundation.
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   Library General Public License for more details.
   You should have received a copy of the GNU Library General Public License
   along with this library; see the file COPYING.LIB.  If not, write to
   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
   Boston, MA 02111-1307, USA.
 */
 #include <qdragobject.h>
 #include <qtimer.h>
 #include <qheader.h>
 #include <qcursor.h>
 #include <qtooltip.h>
 #include <qstyle.h>
 #include <qpainter.h>
 #include <kglobalsettings.h>
 #include <kconfig.h>
 #include <kconfigbase.h>
 //US #include <kcursor.h>
 #include <kapplication.h>
 //US #include <kipc.h>
 #include <kdebug.h>
 #ifdef _WIN32_
 #define Q_WS_QWS
 #endif
 #ifndef _WIN32_
 #define private public
 #include <qlistview.h>
 #undef private
 #endif
 #include "klistview.h"
 //US #include "klistviewlineedit.h"
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #endif
 // /*US
 class KListView::Tooltip : public QToolTip
 {
 public:
  Tooltip (KListView* parent, QToolTipGroup* group = 0L);
  virtual ~Tooltip () {}
 protected:
    // */
  /**
   * Reimplemented from QToolTip for internal reasons.
   */
    // /*US   
  virtual void maybeTip (const QPoint&);
 private:
  KListView* mParent;
 };
 KListView::Tooltip::Tooltip (KListView* parent, QToolTipGroup* group)
  : QToolTip (parent, group),
        mParent (parent)
 {
 }
 void KListView::Tooltip::maybeTip (const QPoint&)
 {
  // FIXME
 }
 // */
 class KListView::KListViewPrivate
 {
 public:
  KListViewPrivate (KListView* listview)
    : pCurrentItem (0L),
      autoSelectDelay(1),
 //US      dragDelay (KGlobalSettings::dndEventDelay()),
      
      dragDelay (10),
 //US      editor (new KListViewLineEdit (listview)),
      cursorInExecuteArea(false), 
      bUseSingle(false),
      bChangeCursorOverItem(false),
      itemsMovable (true),
      selectedBySimpleMove(false),
      selectedUsingMouse(false),
-      showContextMenusOnPress(true),
      itemsRenameable (false),
      validDrag (false),
      dragEnabled (false),
      autoOpen (true),
      dropVisualizer (true),
      dropHighlighter (false),
      createChildren (true),
      pressedOnSelected (false),
      wasShiftEvent (false),
      fullWidth (false),
      sortAscending(true),
            tabRename(true),
      sortColumn(0),
      selectionDirection(0),
      tooltipColumn (0),
      selectionMode (Single),
-//US      contextMenuKey (KGlobalSettings::contextMenuKey()),
+      contextMenuKey ( Qt::Key_Menu ),//KGlobalSettings::contextMenuKey()),
-//US      showContextMenusOnPress (KGlobalSettings::showContextMenusOnPress()),
+      showContextMenusOnPress (true),//showContextMenusOnPress (KGlobalSettings::showContextMenusOnPress()),
      mDropVisualizerWidth (4)
  {
      renameable += 0;
 //US      connect(editor, SIGNAL(done(QListViewItem*,int)), listview, SLOT(doneEditing(QListViewItem*,int)));
  }
  ~KListViewPrivate ()
  {
 //US    delete editor;
  }
  QListViewItem* pCurrentItem;
  QTimer autoSelect;
  int autoSelectDelay;
  QTimer dragExpand;
  QListViewItem* dragOverItem;
  QPoint dragOverPoint;
  
  QPoint startDragPos;
  int dragDelay;
 //US  KListViewLineEdit *editor;
  QValueList<int> renameable;
  bool cursorInExecuteArea:1;
  bool bUseSingle:1;
  bool bChangeCursorOverItem:1;
  bool itemsMovable:1;
  bool selectedBySimpleMove : 1;
  bool selectedUsingMouse:1;
  bool itemsRenameable:1;
  bool validDrag:1;
  bool dragEnabled:1;
  bool autoOpen:1;
  bool dropVisualizer:1;
  bool dropHighlighter:1;
  bool createChildren:1;
  bool pressedOnSelected:1;
  bool wasShiftEvent:1;
  bool fullWidth:1;
  bool sortAscending:1;
  bool tabRename:1;
  int sortColumn;
  //+1 means downwards (y increases, -1 means upwards, 0 means not selected), aleXXX
  int selectionDirection;
  int tooltipColumn;
  SelectionModeExt selectionMode;
  int contextMenuKey;
  bool showContextMenusOnPress;
  QRect mOldDropVisualizer;
  int mDropVisualizerWidth;
  QRect mOldDropHighlighter;
  QListViewItem *afterItemDrop;
  QListViewItem *parentItemDrop;
  QColor alternateBackground;
 };
 /*US
 KListViewLineEdit::KListViewLineEdit(KListView *parent)
        : KLineEdit(parent->viewport()), item(0), col(0), p(parent)
 {
        setFrame( false );
        hide();
        connect( parent, SIGNAL( selectionChanged() ), SLOT( slotSelectionChanged() ));
 }
 KListViewLineEdit::~KListViewLineEdit()
 {
 }
 void KListViewLineEdit::load(QListViewItem *i, int c)
 {
        item=i;
        col=c;
        QRect rect(p->itemRect(i));
        setText(item->text(c));
        int fieldX = rect.x() - 1;
        int fieldW = p->columnWidth(col) + 2;
        int pos = p->header()->mapToIndex(col);
        for ( int index = 0; index < pos; index++ )
            fieldX += p->columnWidth( p->header()->mapToSection( index ));
        if ( col == 0 ) {
            int d = i->depth() + (p->rootIsDecorated() ? 1 : 0);
            d *= p->treeStepSize();
            fieldX += d;
            fieldW -= d;
        }
        if ( i->pixmap( col ) ) {// add width of pixmap
            int d = i->pixmap( col )->width();
            fieldX += d;
            fieldW -= d;
        }
        setGeometry(fieldX, rect.y() - 1, fieldW, rect.height() + 2);
        show();
        setFocus();
 }
 */
        /*Helper functions to for
         *tabOrderedRename functionality.
 */
 static int nextCol (KListView *pl, QListViewItem *pi, int start, int dir)
 {
        if (pi)
        {
                        //Find the next renameable column in the current row
                for (; ((dir == +1) ? (start < pl->columns()) : (start >= 0)); start += dir)
                        if (pl->isRenameable(start))
                                return start;
        }
        return -1;
 }
 static QListViewItem *prevItem (QListViewItem *pi)
 {
        QListViewItem *pa = pi->itemAbove();
                /*Does what the QListViewItem::previousSibling()
                 *of my dreams would do.
         */
        if (pa && pa->parent() == pi->parent())
                return pa;
        return NULL;
 }
 static QListViewItem *lastQChild (QListViewItem *pi)
 {
        if (pi)
        {
                        /*Since there's no QListViewItem::lastChild().
                         *This finds the last sibling for the given
                         *item.
                 */
                for (QListViewItem *pt = pi->nextSibling(); pt; pt = pt->nextSibling())
                        pi = pt;
        }
        return pi;
 }
 /*US
 void KListViewLineEdit::selectNextCell (QListViewItem *pitem, int column, bool forward)
 {
        const int ncols = p->columns();
        const int dir = forward ? +1 : -1;
        const int restart = forward ? 0 : (ncols - 1);
        QListViewItem *top = (pitem && pitem->parent())
                ? pitem->parent()->firstChild()
                : p->firstChild();
        QListViewItem *pi = pitem;
                terminate();            //Save current changes
        do
        {
 */  
                        /*Check the rest of the current row for an editable column,
                         *if that fails, check the entire next/previous row. The
                         *last case goes back to the first item in the current branch
                         *or the last item in the current branch depending on the
                         *direction.
                 */
 /*US     
                if ((column = nextCol(p, pi, column + dir, dir)) != -1 ||
                        (column = nextCol(p, (pi = (forward ? pi->nextSibling() : prevItem(pi))), restart, dir)) != -1 ||
                        (column = nextCol(p, (pi = (forward ? top : lastQChild(pitem))), restart, dir)) != -1)
                {
                        if (pi)
                        {
                                        p->setCurrentItem(pi);          //Calls terminate
                                p->rename(pi, column);
 */
                                        /*Some listviews may override rename() to
                                         *prevent certain items from being renamed,
                                         *if this is done, [m_]item will be NULL
                                         *after the rename() call... try again.
                                 */
 /*US         
                                if (!item)
                                        continue;
                                break;
                        }
                }
        }
        while (pi && !item);
 }
 */
 /*US
 #ifdef KeyPress
 #undef KeyPress
 #endif
 bool KListViewLineEdit::event (QEvent *pe)
 {
        if (pe->type() == QEvent::KeyPress)
        {
                QKeyEvent *k = (QKeyEvent *) pe;
            if ((k->key() == Qt::Key_Backtab || k->key() == Qt::Key_Tab) &&
                        p->tabOrderedRenaming() && p->itemsRenameable() &&
                        !(k->state() & ControlButton || k->state() & AltButton))
                {
                        selectNextCell(item, col,
                                (k->key() == Key_Tab && !(k->state() & ShiftButton)));
                        return true;
            }
        }
        return KLineEdit::event(pe);
 }
 void KListViewLineEdit::keyPressEvent(QKeyEvent *e)
 {
        if(e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter )
                terminate(true);
        else if(e->key() == Qt::Key_Escape)
                terminate(false);
        else if (e->key() == Qt::Key_Down || e->key() == Qt::Key_Up)
        {
                terminate(true);
                KLineEdit::keyPressEvent(e);
        }
        else
                KLineEdit::keyPressEvent(e);
 }
 void KListViewLineEdit::terminate()
 {
    terminate(true);
 }
 void KListViewLineEdit::terminate(bool commit)
 {
    if ( item )
    {
        //kdDebug() << "KListViewLineEdit::terminate " << commit << endl;
        if (commit)
            item->setText(col, text());
        int c=col;
        QListViewItem *i=item;
diff --git a/pwmanager/pwmanager/main.cpp b/pwmanager/pwmanager/main.cpp
index 3f2d055..81e257f 100644
--- a/pwmanager/pwmanager/main.cpp
+++ b/pwmanager/pwmanager/main.cpp
@@ -1,213 +1,213 @@
 /***************************************************************************
 *                                                                         *
 *   copyright (C) 2003, 2004 by Michael Buesch                            *
 *   email: mbuesch@freenet.de                                             *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License version 2        *
 *   as published by the Free Software Foundation.                         *
 *                                                                         *
 ***************************************************************************/
 /***************************************************************************
 * copyright (C) 2004 by Ulf Schenk
 * This file is originaly based on version 1.0.1 of pwmanager
 * and was modified to run on embedded devices that run microkde
 *
 * $Id$
 **************************************************************************/  
 #ifndef PWM_EMBEDDED
 #include <kcmdlineargs.h>
 #include <kaboutdata.h>
 #else
 #include <qdir.h>
 #include <kpimglobalprefs.h>
 #endif
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include "pwmexception.h"
 #include "pwminit.h"
        #define LICENSE_FILE(::locate("data", "pwmanager/pwmanager_license_text"))
 int PwMApplication::newInstance()
 {
        static bool initial = true;
        if (initial) {
                initial = false;
                init = new PwMInit(this);
                init->initializeApp();
        } else {
                BUG_ON(!init);
                printInfo("passing parameters to old instance.");
                init->handleCmdLineArgs(false);
        }
        return EXIT_SUCCESS;
 }
 static const char *description = I18N_NOOP("PwManager\n"
                                           "The convenient way of managing passwords");
 #ifndef PWM_EMBEDDED
 static KCmdLineOptions options[] =
 {
                { "minimized",          I18N_NOOP("Windows minimized"),         0 },
                { "mintray",            I18N_NOOP("Windows minimized to tray"),0 },
                { "open-deeplocked",    I18N_NOOP("Open all \"files\" deeplocked"),0 },
                { "skip-self-test",     I18N_NOOP("Don't run a self-test on startup"),0 },
                { "+[files...]",        I18N_NOOP("Files to open on startup"),  0 },
        { 0, 0, 0 }
 };
 #endif
 #ifdef PWM_DEBUG
 static void printDebugConfigureInfo()
 {
        cout << "================================" << endl;
        cout << PROG_NAME " version " PACKAGE_VER << endl;
 #ifdef CONFIG_KEYCARD
        cout << "CONFIG_KEYCARD:    enabled" << endl;
 #else
        cout << "CONFIG_KEYCARD:    disabled" << endl;
 #endif
 #ifdef CONFIG_KWALLETIF
        cout << "CONFIG_KWALLETIF:  enabled" << endl;
 #else
        cout << "CONFIG_KWALLETIF:  disabled" << endl;
 #endif
 #ifdef BIG_ENDIAN_HOST
        cout << "Endianess:         big-endian" << endl;
 #else
        cout << "Endianess:         little-endian" << endl;
 #endif
        cout << "sizeof(long):      " << sizeof(long) << endl;
        cout << "================================" << endl;
 }
 #else // PWM_DEBUG
 static inline void printDebugConfigureInfo() { /* nothing */ }
 #endif // PWM_DEBUG
 #ifndef PWM_EMBEDDED
 static void addAuthors(KAboutData *aboutData)
 {
        aboutData->addAuthor("Michael Buesch",
                             I18N_NOOP(
                             "main programming and current maintainer"),
                             "mbuesch@freenet.de");
        aboutData->addAuthor("Matt Scifo",
                             I18N_NOOP(
                             "original implementaion of \n"
                             "\"categories\" and the password-tree \n"
                             "in the system-tray. Original implementations of \n"
                             "numerous view-improvements."),
                             "mscifo@o1.com");
        aboutData->addCredit("Elias Probst",
                             I18N_NOOP(
                             "Gentoo ebuild maintainer."),
                             "elias.probst@gmx.de");
        aboutData->addCredit("George Staikos",
                             I18N_NOOP("KWallet"),
                             "staikos@kde.org");
        aboutData->addCredit("Matthew Palmer",
                             I18N_NOOP("rc2 code"),
                             "mjp16@uow.edu.au");
        aboutData->addCredit("Olivier Sessink",
                             I18N_NOOP("gpasman"),
                             "gpasman@nl.linux.org");
        aboutData->addCredit("The libgcrypt developers",
                             I18N_NOOP("Blowfish and SHA1 algorithms"),
                             0, "ftp://ftp.gnupg.org/gcrypt/alpha/libgcrypt/");
        aboutData->addCredit("Troy Engel",
                             I18N_NOOP("kpasman"),
                             "tengel@sonic.net");
        aboutData->addCredit("Wickey",
                             I18N_NOOP("graphics-design in older versions."),
                             "wickey@gmx.at");
        aboutData->addCredit("Ian MacGregor",
                             I18N_NOOP(
                             "original documentation author."));
 }
 #endif
 int main(int argc, char *argv[])
 {
        printDebugConfigureInfo();
 #ifndef PWM_EMBEDDED
        KAboutData aboutData(PACKAGE_NAME, PROG_NAME,
                             PACKAGE_VER, description, KAboutData::License_File,
                             "(c) 2003, 2004 Michael Buesch and the PwManager Team", 0,
                             "http://passwordmanager.sourceforge.net/",
                             "mbuesch@freenet.de");
        addAuthors(&aboutData);
        KCmdLineArgs::init(argc, argv, &aboutData);
        KCmdLineArgs::addCmdLineOptions(options);
        KUniqueApplication::addCmdLineOptions();
        if (!KUniqueApplication::start()) {
                printInfo("already running.");
                return EXIT_SUCCESS;
        }
        PwMApplication a;
        aboutData.setLicenseTextFile(LICENSE_FILE);
        return a.exec();
 #else
  bool exitHelp = false;
  if ( argc > 1 ) {
      QString command = argv[1];
      if (  command == "-help" ){
          printf("PWM/PI command line commands:\n");
          printf("  no command: Start PWM/PI in usual way\n");
          printf("  -help: This output\n");
          printf(" PWM/PI is exiting now. Bye!\n");
          exitHelp = true;
      }
  }
  if ( ! exitHelp ) {
    PwMApplication a(argc, argv);
    KGlobal::setAppName( "pwmanager" );
 #ifndef DESKTOP_VERSION
    //qDebug("width %d ",QApplication::desktop()->width() );
    if ( QApplication::desktop()->width() > 320 )
      KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/pwmanager/icons22/");
    else
        KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/pwmanager/icons16/");
 #else
      QString fileName ;
      fileName  = qApp->applicationDirPath () + "/kdepim/pwmanager/icons22/";
      KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName));
      QApplication::addLibraryPath ( qApp->applicationDirPath () );
 #endif
      KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "pwmanager")));
      KPimGlobalPrefs::instance()->setGlobalConfig();
      a.newInstance();
      //US       KAddressBookMain m ;
      //US      QObject::connect(&a, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
      /*US
 #ifndef DESKTOP_VERSION
       a.showMainWidget( &m );
 #else
      a.setMainWidget( &m );
      m.resize (640, 480 );
      m.show();
 #endif
      */
      a.exec();
+      KPimGlobalPrefs::instance()->writeConfig();
  }
  qDebug("PWMPI: Bye! ");
 #endif
 }
diff --git a/pwmanager/pwmanager/pwm.cpp b/pwmanager/pwmanager/pwm.cpp
index b7b5307..d92c90d 100644
--- a/pwmanager/pwmanager/pwm.cpp
+++ b/pwmanager/pwmanager/pwm.cpp
@@ -1,457 +1,459 @@
 /***************************************************************************
 *                                                                         *
 *   copyright (C) 2003, 2004 by Michael Buesch                            *
 *   email: mbuesch@freenet.de                                             *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License version 2        *
 *   as published by the Free Software Foundation.                         *
 *                                                                         *
 ***************************************************************************/
 /***************************************************************************
 * copyright (C) 2004 by Ulf Schenk
 * This file is originaly based on version 1.0.1 of pwmanager
 * and was modified to run on embedded devices that run microkde
 *
 * $Id$
 **************************************************************************/  
 #include <klocale.h>
 #include <klistview.h>
 #include <ktoolbar.h>
 #include <kfiledialog.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <qstatusbar.h>
 #ifndef PWM_EMBEDDED
 #include <kmenubar.h>
 #include <kstatusbar.h>
 #include <dcopclient.h>
 #include "configwndimpl.h"
 #include "configuration.h"
 #else
 #include <qmenubar.h>
 #include <qmessagebox.h>
 #include <pwmprefs.h>
 #include <kpimglobalprefs.h>
 #include <kcmconfigs/kcmpwmconfig.h>
 #include <kcmconfigs/kcmkdepimconfig.h>
 #include <kcmultidialog.h>
 #endif
 #ifndef DESKTOP_VERSION
 #include <qpe/global.h>
 #endif
 #include <qpixmap.h>
 #include <qcheckbox.h>
 #include <qspinbox.h>
 #include <qlineedit.h>
 #include <qfileinfo.h>
 #include <qclipboard.h>
 #include <stdio.h>
 #include "pwm.h"
 #include "pwminit.h"
 #include "pwmprint.h"
 #include "addentrywndimpl.h"
 #include "globalstuff.h"
 #include "findwndimpl.h"
 #include "csv.h"
 #ifdef CONFIG_KWALLETIF
 # include "kwalletif.h"
 # include "kwalletemu.h"
 #endif
 #ifdef CONFIG_KEYCARD
 # include "pwmkeycard.h"
 #endif
        #define DEFAULT_SIZE    (QSize(700, 400))
 // Button IDs for "file" popup menu
 enum {
        BUTTON_POPUP_FILE_NEW = 0,
        BUTTON_POPUP_FILE_OPEN,
        BUTTON_POPUP_FILE_CLOSE,
        BUTTON_POPUP_FILE_SAVE,
        BUTTON_POPUP_FILE_SAVEAS,
        BUTTON_POPUP_FILE_EXPORT,
        BUTTON_POPUP_FILE_IMPORT,
        BUTTON_POPUP_FILE_PRINT,
        BUTTON_POPUP_FILE_QUIT
 };
 // Button IDs for "manage" popup menu
 enum {
        BUTTON_POPUP_MANAGE_ADD = 0,
        BUTTON_POPUP_MANAGE_EDIT,
        BUTTON_POPUP_MANAGE_DEL,
        BUTTON_POPUP_MANAGE_CHANGEMP
 };
 // Button IDs for chipcard popup menu
 enum {
 #ifdef CONFIG_KEYCARD
        BUTTON_POPUP_CHIPCARD_GENNEW = 0,
        BUTTON_POPUP_CHIPCARD_DEL,
        BUTTON_POPUP_CHIPCARD_READID,
        BUTTON_POPUP_CHIPCARD_SAVEBACKUP,
        BUTTON_POPUP_CHIPCARD_REPLAYBACKUP
 #else // CONFIG_KEYCARD
        BUTTON_POPUP_CHIPCARD_NO = 0
 #endif // CONFIG_KEYCARD
 };
 // Button IDs for "view" popup menu
 enum {
        BUTTON_POPUP_VIEW_FIND = 0,
        BUTTON_POPUP_VIEW_LOCK,
        BUTTON_POPUP_VIEW_DEEPLOCK,
        BUTTON_POPUP_VIEW_UNLOCK
 };
 // Button IDs for "options" popup menu
 enum {
        BUTTON_POPUP_OPTIONS_CONFIG = 0
 };
 // Button IDs for "export" popup menu (in "file" popup menu)
 enum {
        BUTTON_POPUP_EXPORT_TEXT = 0,
        BUTTON_POPUP_EXPORT_GPASMAN,
        BUTTON_POPUP_EXPORT_CSV
 #ifdef CONFIG_KWALLETIF
        ,BUTTON_POPUP_EXPORT_KWALLET
 #endif
 };
 // Button IDs for "import" popup menu (in "file" popup menu)
 enum {
        BUTTON_POPUP_IMPORT_TEXT = 0,
        BUTTON_POPUP_IMPORT_GPASMAN,
        BUTTON_POPUP_IMPORT_CSV
 #ifdef CONFIG_KWALLETIF
        ,BUTTON_POPUP_IMPORT_KWALLET
 #endif
 };
 #ifdef PWM_EMBEDDED
 // Button IDs for "help" popup menu
 enum {
        BUTTON_POPUP_HELP_LICENSE = 0,
        BUTTON_POPUP_HELP_FAQ,
        BUTTON_POPUP_HELP_ABOUT,
        BUTTON_POPUP_HELP_SYNC,
        BUTTON_POPUP_HELP_WHATSNEW
 };
 #endif
 // Button IDs for toolbar
 enum {
        BUTTON_TOOL_NEW = 0,
        BUTTON_TOOL_OPEN,
        BUTTON_TOOL_SAVE,
        BUTTON_TOOL_SAVEAS,
        BUTTON_TOOL_PRINT,
        BUTTON_TOOL_ADD,
        BUTTON_TOOL_EDIT,
        BUTTON_TOOL_DEL,
        BUTTON_TOOL_FIND,
        BUTTON_TOOL_LOCK,
        BUTTON_TOOL_DEEPLOCK,
        BUTTON_TOOL_UNLOCK
 };
 PwM::PwM(PwMInit *_init, PwMDoc *doc,
         bool virginity,
         QWidget *parent, const char *name)
 : KMainWindow(parent, "HALLO")
 , forceQuit (false)
 , forceMinimizeToTray (false)
 {
+    syncManager = 0;
    virgin = !virginity;
        init = _init;
        connect(doc, SIGNAL(docClosed(PwMDoc *)),
                this, SLOT(docClosed(PwMDoc *)));
        initMenubar();
        initToolbar();
        initMetrics();
        setVirgin(virginity);
        setFocusPolicy(QWidget::WheelFocus);
 #ifndef PWM_EMBEDDED
        statusBar()->show();
 #endif
        view = makeNewListView(doc);
        setCentralWidget(view);
        updateCaption();
        showStatMsg(i18n("Ready."));
 }
 PwM::~PwM()
 {
  //qDebug("PwM::~PwM()");
        disconnect(curDoc(), SIGNAL(docClosed(PwMDoc *)),
                   this, SLOT(docClosed(PwMDoc *)));
        conf()->confWndMainWndSize(size());
        emit closed(this);
        //qDebug("PwM::~PwM() emited closed(this)");
        delete view;
+    delete syncManager;
 }
 void PwM::initMenubar()
 {
  KIconLoader* picons;
 #ifndef PWM_EMBEDDED
        KIconLoader icons;
        picons = &icons;
 #else
        picons = KGlobal::iconLoader();
        syncPopup = new KPopupMenu(this);
        
        syncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)this, KSyncManager::PWMPI, PWMPrefs::instance(), syncPopup);
        syncManager->setBlockSave(false);
        connect ( syncPopup, SIGNAL( activated ( int )  ), syncManager, SLOT (slotSyncMenu( int ) ) );
        syncManager->fillSyncMenu();
 #endif
        filePopup = new KPopupMenu(this);
        importPopup = new KPopupMenu(filePopup);
        exportPopup = new KPopupMenu(filePopup);
        managePopup = new KPopupMenu(this);
 #ifdef CONFIG_KEYCARD
        chipcardPopup = new KPopupMenu(this);
 #endif // CONFIG_KEYCARD
        viewPopup = new KPopupMenu(this);
        optionsPopup = new KPopupMenu(this);
 // "file" popup menu
        filePopup->insertItem(QIconSet(picons->loadIcon("filenew", KIcon::Small)),
                              i18n("&New"), this,
                              SLOT(new_slot()), 0, BUTTON_POPUP_FILE_NEW);
        filePopup->insertItem(QIconSet(picons->loadIcon("fileopen", KIcon::Small)),
                              i18n("&Open"), this,
                              SLOT(open_slot()), 0, BUTTON_POPUP_FILE_OPEN);
        filePopup->insertItem(QIconSet(picons->loadIcon("fileclose", KIcon::Small)),
                              i18n("&Close"), this,
                              SLOT(close_slot()), 0, BUTTON_POPUP_FILE_CLOSE);
        filePopup->insertSeparator();
        filePopup->insertItem(QIconSet(picons->loadIcon("filesave", KIcon::Small)),
                              i18n("&Save"), this,
                              SLOT(save_slot()), 0, BUTTON_POPUP_FILE_SAVE);
        filePopup->insertItem(QIconSet(picons->loadIcon("filesaveas", KIcon::Small)),
                              i18n("Save &as..."),
                              this, SLOT(saveAs_slot()), 0,
                              BUTTON_POPUP_FILE_SAVEAS);
        filePopup->insertSeparator();
        // "file/export" popup menu
        exportPopup->insertItem(i18n("&Text-file..."), this,
                                SLOT(exportToText()), 0, BUTTON_POPUP_EXPORT_TEXT);
        exportPopup->insertItem(i18n("&Gpasman / Kpasman ..."), this,
                                SLOT(exportToGpasman()), 0, BUTTON_POPUP_EXPORT_GPASMAN);
        exportPopup->insertItem(i18n("&CSV (Comma Separated Value) ..."), this,
                                SLOT(exportToCsv()), 0, BUTTON_POPUP_EXPORT_CSV);
 #ifdef CONFIG_KWALLETIF
        exportPopup->insertItem(i18n("&KWallet..."), this,
                                SLOT(exportToKWallet()), 0, BUTTON_POPUP_EXPORT_KWALLET);
 #endif
        filePopup->insertItem(QIconSet(picons->loadIcon("fileexport", KIcon::Small)),
                              i18n("E&xport"), exportPopup,
                              BUTTON_POPUP_FILE_EXPORT);
        // "file/import" popup menu
        importPopup->insertItem(i18n("&Text-file..."), this,
                                SLOT(importFromText()), 0, BUTTON_POPUP_IMPORT_TEXT);
        importPopup->insertItem(i18n("&Gpasman / Kpasman ..."), this,
                                SLOT(importFromGpasman()), 0, BUTTON_POPUP_IMPORT_GPASMAN);
        importPopup->insertItem(i18n("&CSV (Comma Separated Value) ..."), this,
                                SLOT(importCsv()), 0, BUTTON_POPUP_IMPORT_CSV);
 #ifdef CONFIG_KWALLETIF
        importPopup->insertItem(i18n("&KWallet..."), this,
                                SLOT(importKWallet()), 0, BUTTON_POPUP_IMPORT_KWALLET);
 #endif
        filePopup->insertItem(QIconSet(picons->loadIcon("fileimport", KIcon::Small)),
                              i18n("I&mport"), importPopup,
                              BUTTON_POPUP_FILE_IMPORT);
        filePopup->insertSeparator();
        filePopup->insertItem(QIconSet(picons->loadIcon("fileprint", KIcon::Small)),
                              i18n("&Print..."), this,
                              SLOT(print_slot()), 0, BUTTON_POPUP_FILE_PRINT);
        filePopup->insertSeparator();
        filePopup->insertItem(QIconSet(picons->loadIcon("exit", KIcon::Small)),
                              i18n("&Quit"), this,
                              SLOT(quitButton_slot()), 0, BUTTON_POPUP_FILE_QUIT);
        menuBar()->insertItem(i18n("&File"), filePopup);
 // "manage" popup menu
        managePopup->insertItem(QIconSet(picons->loadIcon("pencil", KIcon::Small)),
                                i18n("&Add password"), this,
                                SLOT(addPwd_slot()), 0,
                                BUTTON_POPUP_MANAGE_ADD);
        managePopup->insertItem(QIconSet(picons->loadIcon("edit", KIcon::Small)),
                                i18n("&Edit"), this, SLOT(editPwd_slot()), 0,
                                BUTTON_POPUP_MANAGE_EDIT);
        managePopup->insertItem(QIconSet(picons->loadIcon("editdelete", KIcon::Small)),
                                i18n("&Delete"), this, SLOT(deletePwd_slot()),
                                0, BUTTON_POPUP_MANAGE_DEL);
        managePopup->insertSeparator();
        managePopup->insertItem(QIconSet(picons->loadIcon("rotate", KIcon::Small)),
                                i18n("Change &Master Password"), this,
                                SLOT(changeMasterPwd_slot()), 0,
                                BUTTON_POPUP_MANAGE_CHANGEMP);
        menuBar()->insertItem(i18n("&Manage"), managePopup);
 // "chipcard" popup menu
 #ifdef CONFIG_KEYCARD
        chipcardPopup->insertItem(QIconSet(picons->loadIcon("filenew", KIcon::Small)),
                                  i18n("&Generate new key-card"), this,
                                  SLOT(genNewCard_slot()), 0,
                                  BUTTON_POPUP_CHIPCARD_GENNEW);
        chipcardPopup->insertItem(QIconSet(picons->loadIcon("editdelete", KIcon::Small)),
                                  i18n("&Erase key-card"), this,
                                  SLOT(eraseCard_slot()), 0,
                                  BUTTON_POPUP_CHIPCARD_DEL);
        chipcardPopup->insertItem(QIconSet(picons->loadIcon("", KIcon::Small)),
                                  i18n("Read card-&ID"), this,
                                  SLOT(readCardId_slot()), 0,
                                  BUTTON_POPUP_CHIPCARD_READID);
        chipcardPopup->insertSeparator();
        chipcardPopup->insertItem(QIconSet(picons->loadIcon("2rightarrow", KIcon::Small)),
                                  i18n("&Make card backup-image"), this,
                                  SLOT(makeCardBackup_slot()), 0,
                                  BUTTON_POPUP_CHIPCARD_SAVEBACKUP);
        chipcardPopup->insertItem(QIconSet(picons->loadIcon("2leftarrow", KIcon::Small)),
                                  i18n("&Replay card backup-image"), this,
                                  SLOT(replayCardBackup_slot()), 0,
                                  BUTTON_POPUP_CHIPCARD_REPLAYBACKUP);
        menuBar()->insertItem(i18n("&Chipcard manager"), chipcardPopup);
 #endif // CONFIG_KEYCARD
 // "view" popup menu
        viewPopup->insertItem(QIconSet(picons->loadIcon("find", KIcon::Small)),
                                i18n("&Find"), this,
                                SLOT(find_slot()), 0, BUTTON_POPUP_VIEW_FIND);
        viewPopup->insertSeparator();
        viewPopup->insertItem(QIconSet(picons->loadIcon("halfencrypted", KIcon::Small)),
                                i18n("&Lock all entries"), this,
                                SLOT(lockWnd_slot()), 0,
                                BUTTON_POPUP_VIEW_LOCK);
        viewPopup->insertItem(QIconSet(picons->loadIcon("encrypted", KIcon::Small)),
                                i18n("&Deep-lock all entries"), this,
                                SLOT(deepLockWnd_slot()), 0,
                                BUTTON_POPUP_VIEW_DEEPLOCK);
        viewPopup->insertItem(QIconSet(picons->loadIcon("decrypted", KIcon::Small)),
                                i18n("&Unlock all entries"), this,
                                SLOT(unlockWnd_slot()), 0,
                                BUTTON_POPUP_VIEW_UNLOCK);
        menuBar()->insertItem(i18n("&View"), viewPopup);
 // "options" popup menu
        optionsPopup->insertItem(QIconSet(picons->loadIcon("configure", KIcon::Small)),
                                 i18n("&Configure..."), this,
                                 SLOT(config_slot()),
                                 BUTTON_POPUP_OPTIONS_CONFIG);
        menuBar()->insertItem(i18n("&Options"), optionsPopup);
 // "help" popup menu
 #ifndef PWM_EMBEDDED
        helpPopup = helpMenu(QString::null, false);
 #else
        menuBar()->insertItem(i18n("&Sync"), syncPopup);
        helpPopup = new KPopupMenu(this);
        helpPopup->insertItem(i18n("&License"), this,
                                SLOT(showLicense_slot()), 0,
                                BUTTON_POPUP_HELP_LICENSE);
        helpPopup->insertItem(i18n("&Faq"), this,
                                SLOT(faq_slot()), 0,
                                BUTTON_POPUP_HELP_FAQ);
        helpPopup->insertItem(i18n("&About PwManager"), this,
                                SLOT(createAboutData_slot()), 0,
                                BUTTON_POPUP_HELP_ABOUT);
        helpPopup->insertItem(i18n("&Sync HowTo"), this,
                                SLOT(syncHowTo_slot()), 0,
                                BUTTON_POPUP_HELP_SYNC);
        helpPopup->insertItem(i18n("&What's New"), this,
                                SLOT(whatsnew_slot()), 0,
                                BUTTON_POPUP_HELP_WHATSNEW);
 #endif
        menuBar()->insertItem(i18n("&Help"), helpPopup);
 }
 void PwM::initToolbar()
 {
  KIconLoader* picons;
 #ifndef PWM_EMBEDDED
        KIconLoader icons;
        picons = &icons;
 #else
        picons = KGlobal::iconLoader();
 #endif
 #ifdef PWM_EMBEDDED
    if ( QApplication::desktop()->width() > 320 )
 #endif
    {
        toolBar()->insertButton(picons->loadIcon("filenew", KIcon::Toolbar),
                                BUTTON_TOOL_NEW, SIGNAL(clicked(int)), this,
                                SLOT(new_slot()), true, i18n("New"));
        toolBar()->insertButton(picons->loadIcon("fileopen", KIcon::Toolbar),
                                BUTTON_TOOL_OPEN, SIGNAL(clicked(int)), this,
                                SLOT(open_slot()), true, i18n("Open"));
        toolBar()->insertSeparator();
            }
        toolBar()->insertButton(picons->loadIcon("filesave", KIcon::Toolbar),
                                BUTTON_TOOL_SAVE, SIGNAL(clicked(int)), this,
                                SLOT(save_slot()), true, i18n("Save"));
        toolBar()->insertButton(picons->loadIcon("filesaveas", KIcon::Toolbar),
                                BUTTON_TOOL_SAVEAS, SIGNAL(clicked(int)), this,
                                SLOT(saveAs_slot()), true, i18n("Save as"));
        toolBar()->insertButton(picons->loadIcon("fileprint", KIcon::Toolbar),
                                BUTTON_TOOL_PRINT, SIGNAL(clicked(int)), this,
                                SLOT(print_slot()), true, i18n("Print..."));
        toolBar()->insertSeparator();
        toolBar()->insertButton(picons->loadIcon("pencil", KIcon::Toolbar),
                                BUTTON_TOOL_ADD, SIGNAL(clicked(int)), this,
                                SLOT(addPwd_slot()), true,
                                i18n("Add password"));
        toolBar()->insertButton(picons->loadIcon("edit", KIcon::Toolbar),
                                BUTTON_TOOL_EDIT, SIGNAL(clicked(int)), this,
                                SLOT(editPwd_slot()), true,
                                i18n("Edit password"));
        toolBar()->insertButton(picons->loadIcon("editdelete", KIcon::Toolbar),
                                BUTTON_TOOL_DEL, SIGNAL(clicked(int)), this,
                                SLOT(deletePwd_slot()), true,
                                i18n("Delete password"));
        toolBar()->insertSeparator();
        toolBar()->insertButton(picons->loadIcon("find", KIcon::Toolbar),
                                BUTTON_TOOL_FIND, SIGNAL(clicked(int)), this,
                                SLOT(find_slot()), true, i18n("Find entry"));
        toolBar()->insertSeparator();
        toolBar()->insertButton(picons->loadIcon("halfencrypted", KIcon::Toolbar),
                                BUTTON_TOOL_LOCK, SIGNAL(clicked(int)), this,
                                SLOT(lockWnd_slot()), true,
                                i18n("Lock all entries"));
        toolBar()->insertButton(picons->loadIcon("encrypted", KIcon::Toolbar),
                                BUTTON_TOOL_DEEPLOCK, SIGNAL(clicked(int)), this,
                                SLOT(deepLockWnd_slot()), true,
                                i18n("Deep-Lock all entries"));
        toolBar()->insertButton(picons->loadIcon("decrypted", KIcon::Toolbar),
                                BUTTON_TOOL_UNLOCK, SIGNAL(clicked(int)), this,
                                SLOT(unlockWnd_slot()), true,
                                i18n("Unlock all entries"));
 }
 void PwM::initMetrics()
 {