desktop compile fixes

5 files changed, 7 insertions, 1 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 1b40d71..df634d0 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1,552 +1,553 @@
 /*
     This file is part of KAddressbook.
     Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include "kabcore.h"
 
 #include <stdaddressbook.h>
 #include <klocale.h>
 #include <kfiledialog.h>
+#include <qtimer.h>
 #include <qprogressbar.h>
 
 #ifndef KAB_EMBEDDED
 #include <qclipboard.h>
-#include <qdir.h>
+#include <qdir.h> 
 #include <qfile.h>
 #include <qapplicaton.h>
 #include <qprogressbar.h>
 #include <qlayout.h>
 #include <qregexp.h>
 #include <qvbox.h>
 #include <kabc/addresseelist.h>
 #include <kabc/errorhandler.h>
 #include <kabc/resource.h>
 #include <kabc/vcardconverter.h>
 #include <kapplication.h>
 #include <kactionclasses.h>
 #include <kcmultidialog.h>
 #include <kdebug.h>
 #include <kdeversion.h>
 #include <kkeydialog.h>
 #include <kmessagebox.h>
 #include <kprinter.h>
 #include <kprotocolinfo.h>
 #include <kresources/selectdialog.h>
 #include <kstandarddirs.h>
 #include <ktempfile.h>
 #include <kxmlguiclient.h>
 #include <kaboutdata.h>
 #include <libkdepim/categoryselectdialog.h>
 
 #include "addresseeutil.h"
 #include "addresseeeditordialog.h"
 #include "extensionmanager.h"
 #include "kstdaction.h"
 #include "kaddressbookservice.h"
 #include "ldapsearchdialog.h"
 #include "printing/printingwizard.h"
 #else // KAB_EMBEDDED
 
 #include <kapplication.h>
 #include "KDGanttMinimizeSplitter.h"
 #include "kaddressbookmain.h"
 #include "kactioncollection.h"
 #include "addresseedialog.h"
 //US
 #include <addresseeview.h>
 
 #include <qapp.h>
 #include <qmenubar.h>
 //#include <qtoolbar.h>
 #include <qmessagebox.h>
 #include <kdebug.h>
 #include <kiconloader.h> // needed for SmallIcon
 #include <kresources/kcmkresources.h>
 #include <ktoolbar.h>
 
 
 //#include <qlabel.h>
 
 
 #ifndef DESKTOP_VERSION
 #include <qpe/ir.h>
 #include <qpe/qpemenubar.h>
 #include <qtopia/qcopenvelope_qws.h>
 #else
 
 #include <qmenubar.h>
 #endif
 
 #endif // KAB_EMBEDDED
 #include "kcmconfigs/kcmkabconfig.h"
 #include "kcmconfigs/kcmkdepimconfig.h"
 #include "kpimglobalprefs.h"
 #include "externalapphandler.h"
 
 
 #include <kresources/selectdialog.h>
 #include <kmessagebox.h>
 
 #include <picture.h>
 #include <resource.h>
 
 //US#include <qsplitter.h>
 #include <qmap.h>
 #include <qdir.h>
 #include <qfile.h>
 #include <qvbox.h>
 #include <qlayout.h>
 #include <qclipboard.h>
 #include <qtextstream.h>
 
 #include <libkdepim/categoryselectdialog.h>
 #include <kabc/vcardconverter.h>
 
 
 #include "addresseeutil.h"
 #include "undocmds.h"
 #include "addresseeeditordialog.h"
 #include "viewmanager.h"
 #include "details/detailsviewcontainer.h"
 #include "kabprefs.h"
 #include "xxportmanager.h"
 #include "incsearchwidget.h"
 #include "jumpbuttonbar.h"
 #include "extensionmanager.h"
 #include "addresseeconfig.h"
 #include <kcmultidialog.h>
 
 #ifdef _WIN32_
 
 #include "kaimportoldialog.h"
 #else
 #include <unistd.h>
 #endif
 // sync includes
 #include <libkdepim/ksyncprofile.h>
 #include <libkdepim/ksyncprefsdialog.h>
 
 
 bool pasteWithNewUid = true;
 
 #ifdef KAB_EMBEDDED
 KABCore::KABCore( KAddressBookMain *client, bool readWrite, QWidget *parent, const char *name )
   : QWidget( parent, name ), mGUIClient( client ), mViewManager( 0 ),
     mExtensionManager( 0 ),mConfigureDialog( 0 ),/*US  mLdapSearchDialog( 0 ),*/
     mReadWrite( readWrite ), mModified( false ), mMainWindow(client)
 #else //KAB_EMBEDDED
 KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const char *name )
   : QWidget( parent, name ), mGUIClient( client ), mViewManager( 0 ),
     mExtensionManager( 0 ), mConfigureDialog( 0 ), mLdapSearchDialog( 0 ),
     mReadWrite( readWrite ), mModified( false )
 #endif //KAB_EMBEDDED
 {
 
     mBlockSaveFlag = false;
   mExtensionBarSplitter = 0;
   mIsPart = !parent->inherits( "KAddressBookMain" );
 
   mAddressBook = KABC::StdAddressBook::self();
   KABC::StdAddressBook::setAutomaticSave( false );
 
 #ifndef KAB_EMBEDDED
   mAddressBook->setErrorHandler( new KABC::GUIErrorHandler );
 #endif //KAB_EMBEDDED
 
   connect( mAddressBook, SIGNAL( addressBookChanged( AddressBook * ) ),
            SLOT( addressBookChanged() ) );
 
 #if 0
   // LP moved to addressbook init method
   mAddressBook->addCustomField( i18n( "Department" ), KABC::Field::Organization,
                                 "X-Department", "KADDRESSBOOK" );
   mAddressBook->addCustomField( i18n( "Profession" ), KABC::Field::Organization,
                                 "X-Profession", "KADDRESSBOOK" );
   mAddressBook->addCustomField( i18n( "Assistant's Name" ), KABC::Field::Organization,
                                 "X-AssistantsName", "KADDRESSBOOK" );
   mAddressBook->addCustomField( i18n( "Manager's Name" ), KABC::Field::Organization,
                                 "X-ManagersName", "KADDRESSBOOK" );
   mAddressBook->addCustomField( i18n( "Spouse's Name" ), KABC::Field::Personal,
                                 "X-SpousesName", "KADDRESSBOOK" );
   mAddressBook->addCustomField( i18n( "Office" ), KABC::Field::Personal,
                                 "X-Office", "KADDRESSBOOK" );
   mAddressBook->addCustomField( i18n( "IM Address" ), KABC::Field::Personal,
                                 "X-IMAddress", "KADDRESSBOOK" );
   mAddressBook->addCustomField( i18n( "Anniversary" ), KABC::Field::Personal,
                                 "X-Anniversary", "KADDRESSBOOK" );
 
   //US added this field to become compatible with Opie/qtopia addressbook
   // values can be "female" or "male" or "". An empty field represents undefined.
   mAddressBook->addCustomField( i18n( "Gender" ), KABC::Field::Personal,
                                 "X-Gender", "KADDRESSBOOK" );
   mAddressBook->addCustomField( i18n( "Children" ), KABC::Field::Personal,
                                 "X-Children", "KADDRESSBOOK" );
   mAddressBook->addCustomField( i18n( "FreeBusyUrl" ), KABC::Field::Personal,
                                 "X-FreeBusyUrl", "KADDRESSBOOK" );
 #endif
   initGUI();
 
   mIncSearchWidget->setFocus();
 
 
   connect( mViewManager, SIGNAL( selected( const QString& ) ),
            SLOT( setContactSelected( const QString& ) ) );
   connect( mViewManager, SIGNAL( executed( const QString& ) ),
            SLOT( executeContact( const QString& ) ) );
 
   connect( mViewManager, SIGNAL( deleteRequest( ) ),
            SLOT( deleteContacts( ) ) );
   connect( mViewManager, SIGNAL( modified() ),
            SLOT( setModified() ) );
 
   connect( mExtensionManager, SIGNAL( modified( const KABC::Addressee::List& ) ), this, SLOT( extensionModified( const KABC::Addressee::List& ) ) );
   connect( mExtensionManager, SIGNAL( changedActiveExtension( int ) ), this, SLOT( extensionChanged( int ) ) );
 
   connect( mXXPortManager, SIGNAL( modified() ),
            SLOT( setModified() ) );
 
   connect( mJumpButtonBar, SIGNAL( jumpToLetter( const QString& ) ),
            SLOT( incrementalSearch( const QString& ) ) );
   connect( mIncSearchWidget, SIGNAL( fieldChanged() ),
            mJumpButtonBar, SLOT( recreateButtons() ) );
 
   connect( mDetails, SIGNAL( sendEmail( const QString& ) ),
            SLOT( sendMail( const QString& ) ) );
 
 
   connect( ExternalAppHandler::instance(), SIGNAL (requestForNameEmailUidList(const QString&, const QString&)),this, SLOT(requestForNameEmailUidList(const QString&, const QString&)));
   connect( ExternalAppHandler::instance(), SIGNAL (requestForDetails(const QString&, const QString&, const QString&, const QString&, const QString&)),this, SLOT(requestForDetails(const QString&, const QString&, const QString&, const QString&, const QString&)));
 
 
 #ifndef KAB_EMBEDDED
   connect( mViewManager, SIGNAL( urlDropped( const KURL& ) ),
            mXXPortManager, SLOT( importVCard( const KURL& ) ) );
 
   connect( mDetails, SIGNAL( browse( const QString& ) ),
            SLOT( browse( const QString& ) ) );
 
 
   mAddressBookService = new KAddressBookService( this );
 
 #endif //KAB_EMBEDDED
   mEditorDialog = 0;
   createAddresseeEditorDialog( this );
   setModified( false );
 }
 
 KABCore::~KABCore()
 {
     //  save();
     //saveSettings();
     //KABPrefs::instance()->writeConfig();
     delete AddresseeConfig::instance();
   mAddressBook = 0;
   KABC::StdAddressBook::close();
 }
 
 void KABCore::restoreSettings()
 {
   mMultipleViewsAtOnce = KABPrefs::instance()->mMultipleViewsAtOnce;
 
   bool state;
 
   if (mMultipleViewsAtOnce)
     state = KABPrefs::instance()->mDetailsPageVisible;
   else
     state = false;
 
   mActionDetails->setChecked( state );
   setDetailsVisible( state );
 
   state = KABPrefs::instance()->mJumpButtonBarVisible;
 
   mActionJumpBar->setChecked( state );
   setJumpButtonBarVisible( state );
 /*US
  QValueList<int> splitterSize = KABPrefs::instance()->mDetailsSplitter;
   if ( splitterSize.count() == 0 ) {
     splitterSize.append( width() / 2 );
     splitterSize.append( width() / 2 );
   }
   mMiniSplitter->setSizes( splitterSize );
   if (  mExtensionBarSplitter ) {
   splitterSize = KABPrefs::instance()->mExtensionsSplitter;
   if ( splitterSize.count() == 0 ) {
     splitterSize.append( width() / 2 );
     splitterSize.append( width() / 2 );
   }
   mExtensionBarSplitter->setSizes( splitterSize );
 
   }
 */
   mViewManager->restoreSettings();
   mIncSearchWidget->setCurrentItem( KABPrefs::instance()->mCurrentIncSearchField );
   mExtensionManager->restoreSettings();
 #ifdef DESKTOP_VERSION
   int wid = width();
   if ( wid < 10 )
       wid = 400;
 #else
   int wid = QApplication::desktop()->width();
   if ( wid < 640 )
       wid = QApplication::desktop()->height();
 #endif
   QValueList<int> splitterSize;// = KABPrefs::instance()->mDetailsSplitter;
   if ( true /*splitterSize.count() == 0*/ ) {
       splitterSize.append( wid / 2 );
       splitterSize.append( wid / 2 );
   }
   mMiniSplitter->setSizes( splitterSize );
   if (  mExtensionBarSplitter ) {
       //splitterSize = KABPrefs::instance()->mExtensionsSplitter;
       if ( true /*splitterSize.count() == 0*/ ) {
           splitterSize.append( wid / 2 );
           splitterSize.append( wid / 2 );
       }
       mExtensionBarSplitter->setSizes( splitterSize );
 
   }
 
 
 }
 
 void KABCore::saveSettings()
 {
   KABPrefs::instance()->mJumpButtonBarVisible = mActionJumpBar->isChecked();
   if ( mExtensionBarSplitter )
     KABPrefs::instance()->mExtensionsSplitter = mExtensionBarSplitter->sizes();
   KABPrefs::instance()->mDetailsPageVisible = mActionDetails->isChecked();
   KABPrefs::instance()->mDetailsSplitter = mMiniSplitter->sizes();
 #ifndef KAB_EMBEDDED
 
   KABPrefs::instance()->mExtensionsSplitter = mExtensionBarSplitter->sizes();
   KABPrefs::instance()->mDetailsSplitter = mDetailsSplitter->sizes();
 #endif //KAB_EMBEDDED
   mExtensionManager->saveSettings();
   mViewManager->saveSettings();
 
   KABPrefs::instance()->mCurrentIncSearchField = mIncSearchWidget->currentItem();
 }
 
 KABC::AddressBook *KABCore::addressBook() const
 {
   return mAddressBook;
 }
 
 KConfig *KABCore::config()
 {
 #ifndef KAB_EMBEDDED
   return KABPrefs::instance()->config();
 #else //KAB_EMBEDDED
   return KABPrefs::instance()->getConfig();
 #endif //KAB_EMBEDDED
 }
 
 KActionCollection *KABCore::actionCollection() const
 {
   return mGUIClient->actionCollection();
 }
 
 KABC::Field *KABCore::currentSearchField() const
 {
    if (mIncSearchWidget)
     return mIncSearchWidget->currentField();
   else
     return 0;
 }
 
 QStringList KABCore::selectedUIDs() const
 {
   return mViewManager->selectedUids();
 }
 
 KABC::Resource *KABCore::requestResource( QWidget *parent )
 {
   QPtrList<KABC::Resource> kabcResources = addressBook()->resources();
 
   QPtrList<KRES::Resource> kresResources;
   QPtrListIterator<KABC::Resource> resIt( kabcResources );
   KABC::Resource *resource;
   while ( ( resource = resIt.current() ) != 0 ) {
     ++resIt;
     if ( !resource->readOnly() ) {
       KRES::Resource *res = static_cast<KRES::Resource*>( resource );
       if ( res )
         kresResources.append( res );
     }
   }
 
   KRES::Resource *res = KRES::SelectDialog::getResource( kresResources, parent );
   return static_cast<KABC::Resource*>( res );
 }
 
 #ifndef KAB_EMBEDDED
 KAboutData *KABCore::createAboutData()
 #else //KAB_EMBEDDED
 void KABCore::createAboutData()
 #endif //KAB_EMBEDDED
 {
 #ifndef KAB_EMBEDDED
   KAboutData *about = new KAboutData( "kaddressbook", I18N_NOOP( "KAddressBook" ),
                                       "3.1", I18N_NOOP( "The KDE Address Book" ),
                                       KAboutData::License_GPL_V2,
                                       I18N_NOOP( "(c) 1997-2003, The KDE PIM Team" ) );
   about->addAuthor( "Tobias Koenig", I18N_NOOP( "Current maintainer " ), "tokoe@kde.org" );
   about->addAuthor( "Don Sanders", I18N_NOOP( "Original author " ) );
   about->addAuthor( "Cornelius Schumacher",
                     I18N_NOOP( "Co-maintainer, libkabc port, CSV import/export " ),
                     "schumacher@kde.org" );
   about->addAuthor( "Mike Pilone", I18N_NOOP( "GUI and framework redesign " ),
                     "mpilone@slac.com" );
   about->addAuthor( "Greg Stern", I18N_NOOP( "DCOP interface" ) );
   about->addAuthor( "Mark Westcott", I18N_NOOP( "Contact pinning" ) );
   about->addAuthor( "Michel Boyer de la Giroday", I18N_NOOP( "LDAP Lookup\n" ),
                     "michel@klaralvdalens-datakonsult.se" );
   about->addAuthor( "Steffen Hansen", I18N_NOOP( "LDAP Lookup " ),
                     "hansen@kde.org" );
 
   return about;
 #endif //KAB_EMBEDDED
 
   QString version;
 #include <../version>
     QMessageBox::about( this, "About KAddressbook/Pi",
                         "KAddressbook/Platform-independent\n"
                         "(KA/Pi) " +version + " - " +
 #ifdef DESKTOP_VERSION
                         "Desktop Edition\n"
 #else
                         "PDA-Edition\n"
                         "for: Zaurus 5500 / 7x0 / 8x0\n"
 #endif
 
                         "(c) 2004 Ulf Schenk\n"
                         "(c) 2004 Lutz Rogowski\n"
                         "(c) 1997-2003, The KDE PIM Team\n"
   "Tobias Koenig Current maintainer\ntokoe@kde.org\n"
   "Don Sanders Original author\n"
   "Cornelius Schumacher Co-maintainer\nschumacher@kde.org\n"
   "Mike Pilone GUI and framework redesign\nmpilone@slac.com\n"
   "Greg Stern DCOP interface\n"
   "Mark Westcot Contact pinning\n"
   "Michel Boyer de la Giroday LDAP Lookup\n" "michel@klaralvdalens-datakonsult.se\n"
   "Steffen Hansen LDAP Lookup\nhansen@kde.org\n"
 #ifdef _WIN32_
  "(c) 2004 Lutz Rogowski Import from OL\nrogowski@kde.org\n"
 #endif
  );
 }
 
 void KABCore::setContactSelected( const QString &uid )
 {
   KABC::Addressee addr = mAddressBook->findByUid( uid );
   if ( !mDetails->isHidden() )
     mDetails->setAddressee( addr );
 
   if ( !addr.isEmpty() ) {
     emit contactSelected( addr.formattedName() );
     KABC::Picture pic = addr.photo();
     if ( pic.isIntern() ) {
 //US      emit contactSelected( pic.data() );
 //US instead use:
       QPixmap px;
       if (pic.data().isNull() != true)
       {
         px.convertFromImage(pic.data());
       }
 
       emit contactSelected( px );
     }
   }
 
 
   mExtensionManager->setSelectionChanged();
 
   // update the actions
   bool selected = !uid.isEmpty();
 
   if ( mReadWrite ) {
     mActionCut->setEnabled( selected );
     mActionPaste->setEnabled( selected );
   }
 
   mActionCopy->setEnabled( selected );
   mActionDelete->setEnabled( selected );
   mActionEditAddressee->setEnabled( selected );
   mActionMail->setEnabled( selected );
   mActionMailVCard->setEnabled( selected );
   //if (mActionBeam)
   //mActionBeam->setEnabled( selected );
 
   if (mActionBeamVCard)
    mActionBeamVCard->setEnabled( selected );
 
   mActionWhoAmI->setEnabled( selected );
   mActionCategories->setEnabled( selected );
 }
 
 void KABCore::sendMail()
 {
   sendMail( mViewManager->selectedEmails().join( ", " ) );
 }
 
 void KABCore::sendMail( const QString& emaillist )
 {
   // the parameter has the form "name1 <abc@aol.com>,name2 <abc@aol.com>;... "
   if (emaillist.contains(",") > 0)
     ExternalAppHandler::instance()->mailToMultipleContacts( emaillist, QString::null );
   else
     ExternalAppHandler::instance()->mailToOneContact( emaillist );
 }
 
 
 
 void KABCore::mailVCard()
 {
   QStringList uids = mViewManager->selectedUids();
   if ( !uids.isEmpty() )
     mailVCard( uids );
 }
 
 void KABCore::mailVCard( const QStringList& uids )
 {
   QStringList urls;
 
 //  QString tmpdir = locateLocal("tmp", KGlobal::getAppName());
 
   QString dirName = "/tmp/" + KApplication::randomString( 8 );
 
 
 
   QDir().mkdir( dirName, true );
 
   for( QStringList::ConstIterator it = uids.begin(); it != uids.end(); ++it ) {
     KABC::Addressee a = mAddressBook->findByUid( *it );
 
     if ( a.isEmpty() )
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
index 073ab74..03034b4 100644
--- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
+++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
@@ -1,550 +1,551 @@
 /*
     This file is part of KdePim/Pi.
     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$
 */
 
 #include <qlayout.h>
 #include <qtabwidget.h>
 #include <qcombobox.h>
 #include <qgroupbox.h>
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <qbuttongroup.h>
 #include <qfile.h>
+#include <qregexp.h>
 
 #include <kdialog.h>
 #include <klocale.h>
 #include <kdateedit.h>
 #include <kglobal.h>
 #include <stdlib.h>
 
 /*US
 #include <qcheckbox.h>
 #include <qframe.h>
 #include <qpushbutton.h>
 #include <qcombobox.h>
 #include <qlineedit.h>
 #include <qlabel.h>
 #include <qfile.h>
 
 #include <kconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <klistview.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 
 #ifndef KAB_EMBEDDED
 #include <ktrader.h>
 #else // KAB_EMBEDDED
 #include <mergewidget.h>
 #include <distributionlistwidget.h>
 #endif // KAB_EMBEDDED
 
 #include "addresseewidget.h"
 #include "extensionconfigdialog.h"
 #include "extensionwidget.h"
 */
 
 #include "qapplication.h"
 
 #include "kpimglobalprefs.h"
 
 #include "kdepimconfigwidget.h"
 
 
 KDEPIMConfigWidget::KDEPIMConfigWidget(KPimGlobalPrefs *prefs, QWidget *parent, const char *name )
   : KPrefsWidget(prefs, parent, name )
 {
   mExternalAppsMap.insert(ExternalAppHandler::EMAIL, i18n("Email"));
   mExternalAppsMap.insert(ExternalAppHandler::PHONE, i18n("Phone"));
   mExternalAppsMap.insert(ExternalAppHandler::SMS, i18n("SMS"));
   mExternalAppsMap.insert(ExternalAppHandler::FAX, i18n("Fax"));
   mExternalAppsMap.insert(ExternalAppHandler::PAGER, i18n("Pager"));
   mExternalAppsMap.insert(ExternalAppHandler::SIP, i18n("SIP"));
 
 
   QVBoxLayout *topLayout = new QVBoxLayout( this, 0,
                                             KDialog::spacingHint() );
 
   tabWidget = new QTabWidget( this );
   topLayout->addWidget( tabWidget );
 
 
   setupLocaleTab();
   setupLocaleDateTab();
   setupTimeZoneTab();
   setupExternalAppTab();
 
 }
 void KDEPIMConfigWidget::showTimeZoneTab()
 {
     tabWidget->setCurrentPage ( 2 ) ;
 }
 void KDEPIMConfigWidget::setupExternalAppTab()
 {
   QWidget *externalAppsPage = new QWidget( this );
   QVBoxLayout* layout = new QVBoxLayout( externalAppsPage, KDialog::marginHintSmall(),
                                             KDialog::spacingHintSmall() );
 
   mExternalApps = new QComboBox( externalAppsPage );
 
   QMap<ExternalAppHandler::Types, QString>::Iterator it;
   for( it = mExternalAppsMap.begin(); it != mExternalAppsMap.end(); ++it )
     mExternalApps->insertItem( it.data(), it.key() );
 
   layout->addWidget( mExternalApps );
 
   connect( mExternalApps, SIGNAL( activated( int ) ),
            this, SLOT (externalapp_changed( int ) ) );
 
 
   mExternalAppGroupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Used Mail Client" ), externalAppsPage );
   QGridLayout *boxLayout = new QGridLayout( mExternalAppGroupBox->layout(), 4, 2,    -1, "gridlayout" );
 
 
   mClient = new QComboBox( mExternalAppGroupBox );
   boxLayout->addMultiCellWidget( mClient, 0, 0, 0, 1 );
 
   connect( mClient, SIGNAL( activated( int ) ),
            this, SLOT (client_changed( int ) ) );
 
   QLabel* lab = new QLabel( i18n("Channel:"), mExternalAppGroupBox);
   boxLayout->addWidget( lab, 1, 0 );
   mChannel = new QLineEdit(mExternalAppGroupBox);
   mChannel->setReadOnly(true);
   boxLayout->addMultiCellWidget( mChannel, 2 , 2, 0, 1 );
 
   lab = new QLabel( i18n("Message:"), mExternalAppGroupBox);
   boxLayout->addWidget( lab, 3, 0 );
   mMessage = new QLineEdit(mExternalAppGroupBox);
   mMessage->setReadOnly(true);
   boxLayout->addWidget( mMessage , 4, 0);
 
   lab = new QLabel( i18n("Parameters:"), mExternalAppGroupBox);
   boxLayout->addWidget( lab, 3, 1 );
   mParameters = new QLineEdit(mExternalAppGroupBox);
   mParameters->setReadOnly(true);
   boxLayout->addWidget( mParameters, 4, 1 );
 
   lab = new QLabel( i18n("HINT: Delimiter=; Name=%1,Email=%2"), mExternalAppGroupBox);
   boxLayout->addMultiCellWidget( lab, 5, 5, 0, 1 );
 
   lab = new QLabel( i18n("extra Message:"), mExternalAppGroupBox);
   boxLayout->addWidget( lab, 6, 0 );
   mMessage2 = new QLineEdit(mExternalAppGroupBox);
   mMessage2->setReadOnly(true);
   boxLayout->addWidget( mMessage2 , 7, 0);
 
   lab = new QLabel( i18n("extra Parameters:"), mExternalAppGroupBox);
   boxLayout->addWidget( lab, 6, 1 );
   mParameters2 = new QLineEdit(mExternalAppGroupBox);
   mParameters2->setReadOnly(true);
   boxLayout->addWidget( mParameters2, 7, 1 );
 
   lab = new QLabel( i18n("HINT: Emails=%1,Attachments=%2"), mExternalAppGroupBox);
   boxLayout->addMultiCellWidget( lab, 8, 8, 0, 1 );
 
 
   connect( mChannel, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & ))  );
   connect( mMessage, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & ))  );
   connect( mParameters, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & ))  );
   connect( mMessage2, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & ))  );
   connect( mParameters2, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & ))  );
 
 
   layout->addWidget( mExternalAppGroupBox );
   tabWidget->addTab( externalAppsPage, i18n( "External Apps." ) );
 
 }
 
   
 void KDEPIMConfigWidget::setupLocaleDateTab()
 {
   QWidget *topFrame = new QWidget( this );
   QGridLayout *topLayout = new QGridLayout( topFrame, 3, 2);
 
    topLayout->setSpacing(KDialog::spacingHint());
    topLayout->setMargin(KDialog::marginHint());  
    int iii = 0;
 
    
    KPrefsWidRadios *syncPrefsGroup =
        addWidRadios(i18n("Date Format:"),&(KPimGlobalPrefs::instance()->mPreferredDate),topFrame);
    QString format;
    if ( QApplication::desktop()->width() < 480 )
        format = "(%d.%m.%Y)";
    else 
        format = "(%d.%m.%Y|%A %d %B %Y)";
    syncPrefsGroup->addRadio(i18n("24.03.2004 "+format));
    if ( QApplication::desktop()->width() < 480 )
        format = "(%m.%d.%Y)";
    else 
        format = "(%m.%d.%Y|%A %B %d %Y)";
    syncPrefsGroup->addRadio(i18n("03.24.2004 "+format));
    if ( QApplication::desktop()->width() < 480 )
        format = "(%Y-%m-%d)";
    else 
        format = "(%Y-%m-%d|%A %Y %B %d)";
    syncPrefsGroup->addRadio(i18n("2004-03-24 "+format));
    syncPrefsGroup->addRadio(i18n("User defined"));
    topLayout->addMultiCellWidget( (QWidget*)syncPrefsGroup->groupBox(),iii,iii,0,1);
    ++iii;   
    ++iii;
    QLabel * lab;
    mUserDateFormatLong = new QLineEdit(topFrame);
    lab = new QLabel(mUserDateFormatLong, i18n("User long date:"), topFrame);
    topLayout->addWidget(lab ,iii,0);
    topLayout->addWidget(mUserDateFormatLong,iii,1);
    ++iii;
    mUserDateFormatShort = new QLineEdit(topFrame);
    lab = new QLabel(mUserDateFormatShort, i18n("User short date:"), topFrame);
    topLayout->addWidget(lab ,iii,0);
    topLayout->addWidget(mUserDateFormatShort,iii,1);
    ++iii;
    lab = new QLabel( i18n("Monday 19 April 2004: %A %d %B %Y"), topFrame);
    topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
    ++iii;
    lab = new QLabel( i18n("Mon 19.04.04: %a %d.%m.%y"), topFrame);
    topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
    ++iii;  
    lab = new QLabel( i18n("Mon, 19.Apr.04: %a, %d.%b.%y"), topFrame);
    topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
    ++iii;
 
   connect( mUserDateFormatLong, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & ))  );
   connect( mUserDateFormatShort, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & ))  );
 
 
    tabWidget->addTab( topFrame, i18n( "Date Format" ) );
 }
 
 void KDEPIMConfigWidget::setupLocaleTab()
 {
 
   QWidget *topFrame = new QWidget( this );
    QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
 
    topLayout->setSpacing(KDialog::spacingHint());
    topLayout->setMargin(KDialog::marginHint());  
    int iii = 0;
  KPrefsWidRadios *syncPrefsGroup =
       addWidRadios(i18n("Language:(needs restart)"),&(KPimGlobalPrefs::instance()->mPreferredLanguage),topFrame);
    syncPrefsGroup->addRadio(i18n("English"));
    syncPrefsGroup->addRadio(i18n("German")); 
    syncPrefsGroup->addRadio(i18n("French")); 
    syncPrefsGroup->addRadio(i18n("User defined (usertranslation.txt)")); 
    if (  QApplication::desktop()->width() <  300   ) 
        ;//   syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical);
    topLayout->addMultiCellWidget( (QWidget*)syncPrefsGroup->groupBox(),iii,iii,0,1);
    ++iii;   
  
    syncPrefsGroup =
        addWidRadios(i18n("Time Format(nr):"),&(KPimGlobalPrefs::instance()->mPreferredTime),topFrame);
    if (  QApplication::desktop()->width() >  300   )
        syncPrefsGroup->groupBox()->setOrientation (Qt::Vertical);
    syncPrefsGroup->addRadio(i18n("24:00"));
    syncPrefsGroup->addRadio(i18n("12:00am"));
    syncPrefsGroup->groupBox()->setOrientation (Qt::Vertical);
    topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1);
    ++iii;   
 
    KPrefsWidBool *sb = addWidBool(i18n("Week starts on Sunday"),
                       &(KPimGlobalPrefs::instance()->mWeekStartsOnSunday),topFrame);
    topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1);
    ++iii;   
 
 
    tabWidget->addTab( topFrame, i18n( "Locale" ) );
 
 }
 
 
 void KDEPIMConfigWidget::setupTimeZoneTab()
 {
   QWidget *topFrame = new QWidget( this );
   QGridLayout *topLayout = new QGridLayout( topFrame, 5, 2);
   topLayout->setSpacing(KDialog::spacingHint());
   topLayout->setMargin(KDialog::marginHint());
 
   QHBox *timeZoneBox = new QHBox( topFrame );
   topLayout->addMultiCellWidget( timeZoneBox, 0, 0, 0, 1 );
 
   new QLabel( i18n("Timezone:"), timeZoneBox );
   mTimeZoneCombo = new QComboBox( timeZoneBox ); 
   if ( QApplication::desktop()->width() <  300 ) {
        mTimeZoneCombo->setMaximumWidth(150);
     }
 
   QStringList list;
   list = KGlobal::locale()->timeZoneList();
   mTimeZoneCombo->insertStringList(list);
 
     // find the currently set time zone and select it
   QString sCurrentlySet = KPimGlobalPrefs::instance()->mTimeZoneId;
   int nCurrentlySet = 11;
   for (int i = 0; i < mTimeZoneCombo->count(); i++)
     {
       if (mTimeZoneCombo->text(i) == sCurrentlySet)
         {
          nCurrentlySet = i;
          break;
         }
     }
   mTimeZoneCombo->setCurrentItem(nCurrentlySet);
   int iii = 1;
   KPrefsWidBool *sb =
       addWidBool(i18n("Timezone has daylight saving"),
                  &(KPimGlobalPrefs::instance()->mUseDaylightsaving),topFrame);
   topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1);
   ++iii;  
   QLabel* lab = new QLabel(  i18n("Actual start and end is the\nsunday before this date."), topFrame );
   topLayout->addMultiCellWidget(lab, iii,iii,0,1);
   ++iii;   
   lab = new QLabel(  i18n("The year in the date is ignored."), topFrame );
   topLayout->addMultiCellWidget(lab, iii,iii,0,1);
   ++iii; 
   lab = new QLabel(  i18n("Daylight start:"), topFrame );
   topLayout->addWidget(lab, iii,0);
   mStartDateSavingEdit = new KDateEdit(topFrame);
   topLayout->addWidget(mStartDateSavingEdit, iii,1);
   ++iii;
 
   lab = new QLabel(  i18n("Daylight end:"), topFrame );
   topLayout->addWidget(lab, iii,0);
   mEndDateSavingEdit = new KDateEdit(topFrame);
   topLayout->addWidget(mEndDateSavingEdit, iii,1);
   ++iii;
   QDate current ( 2001, 1,1);
   mStartDateSavingEdit->setDate(current.addDays(KPimGlobalPrefs::instance()->mDaylightsavingStart-1));
   mEndDateSavingEdit->setDate(current.addDays(KPimGlobalPrefs::instance()->mDaylightsavingEnd-1));
 
   connect( mStartDateSavingEdit, SIGNAL(  dateChanged(QDate)), this, SLOT( modified())  );
   connect( mEndDateSavingEdit, SIGNAL(  dateChanged(QDate)), this, SLOT( modified())  );
   connect( mTimeZoneCombo, SIGNAL( activated( int ) ), this, SLOT (modified() ) );
 
 
 
   tabWidget->addTab( topFrame, i18n( "Time Zone" ) );
  
 }
 
 void KDEPIMConfigWidget::externalapp_changed( int newApp )
 {
   // first store the current data
   saveEditFieldSettings();
 
   // set mCurrentApp
   mCurrentApp = (ExternalAppHandler::Types)newApp;
 
   // set mCurrentClient
   switch(mCurrentApp)
   {
     case(ExternalAppHandler::EMAIL):
       mCurrentClient = mEmailClient;
       break;
     case(ExternalAppHandler::PHONE):
       mCurrentClient = mPhoneClient;
       break;
     case(ExternalAppHandler::SMS):
       mCurrentClient = mSMSClient;
       break;
     case(ExternalAppHandler::FAX):
       mCurrentClient = mFaxClient;
       break;
     case(ExternalAppHandler::PAGER):
       mCurrentClient = mPagerClient;
       break;
     case(ExternalAppHandler::SIP):
       mCurrentClient = mSipClient;
       break;
     default:
       return;
   }
 
   // and at last update the widgets
   updateClientWidgets();
 }
 
 
 
 void KDEPIMConfigWidget::client_changed( int newClient )
 {
   if (newClient == mCurrentClient)
     return;
 
   // first store the current data
   saveEditFieldSettings();
 
 
   //then reset the clientvariable
   mCurrentClient = newClient;
 
   // and at last update the widgets
   updateClientWidgets();
 
   KPrefsWidget::modified();
 }
 
 void KDEPIMConfigWidget::saveEditFieldSettings()
 {
 
   switch(mCurrentApp)
   {
     case(ExternalAppHandler::EMAIL):
       mEmailClient = mClient->currentItem();
       break;
     case(ExternalAppHandler::PHONE):
       mPhoneClient= mClient->currentItem();
       break;
     case(ExternalAppHandler::SMS):
       mSMSClient = mClient->currentItem();
       break;
     case(ExternalAppHandler::FAX):
       mFaxClient = mClient->currentItem();
       break;
     case(ExternalAppHandler::PAGER):
       mPagerClient = mClient->currentItem();
       break;
     case(ExternalAppHandler::SIP):
       mSipClient = mClient->currentItem();
       break;
     default:
       return;
   }
 
   //store the current data back to the apropriate membervariables if we had set it to "other"
   if ((mCurrentApp == ExternalAppHandler::EMAIL) && (mCurrentClient == KPimGlobalPrefs::OTHER_EMC))
   {
     mEmailOtherChannel = mChannel->text();
     mEmailOtherMessage = mMessage->text();
     mEmailOtherMessageParameters = mParameters->text();
     mEmailOtherMessage2 = mMessage2->text();
     mEmailOtherMessageParameters2 = mParameters2->text();
   }
   else if ((mCurrentApp == ExternalAppHandler::PHONE) && (mCurrentClient == KPimGlobalPrefs::OTHER_PHC))
   {
     mPhoneOtherChannel = mChannel->text();
     mPhoneOtherMessage = mMessage->text();
     mPhoneOtherMessageParameters = mParameters->text();
   }
   else if ((mCurrentApp == ExternalAppHandler::SMS) && (mCurrentClient == KPimGlobalPrefs::OTHER_SMC))
   {
     mSMSOtherChannel = mChannel->text();
     mSMSOtherMessage = mMessage->text();
     mSMSOtherMessageParameters = mParameters->text();
   }
   else if ((mCurrentApp == ExternalAppHandler::FAX) && (mCurrentClient == KPimGlobalPrefs::OTHER_FAC))
   {
     mFaxOtherChannel = mChannel->text();
     mFaxOtherMessage = mMessage->text();
     mFaxOtherMessageParameters = mParameters->text();
   }
   else if ((mCurrentApp == ExternalAppHandler::PAGER) && (mCurrentClient == KPimGlobalPrefs::OTHER_PAC))
   {
     mPagerOtherChannel = mChannel->text();
     mPagerOtherMessage = mMessage->text();
     mPagerOtherMessageParameters = mParameters->text();
   }
   else if ((mCurrentApp == ExternalAppHandler::SIP) && (mCurrentClient == KPimGlobalPrefs::OTHER_SIC))
   {
     mSipOtherChannel = mChannel->text();
     mSipOtherMessage = mMessage->text();
     mSipOtherMessageParameters = mParameters->text();
   }
 
 
 }
 
 void KDEPIMConfigWidget::updateClientWidgets()
 {
   bool blocked = signalsBlocked();
   blockSignals( true );
 
   // at this point we assume, that mCurrentApp and mCurrentClient are set to the values that we want to display
   QMap<ExternalAppHandler::Types, QString>::Iterator it = mExternalAppsMap.find ( mCurrentApp );
   if (it == mExternalAppsMap.end())
     return;
 
   // update group box
   mExternalAppGroupBox->setTitle(i18n( "Used %1 Client" ).arg(it.data()));
 
   //update the entries in the client combobox
   mClient->clear();
 
   QList<DefaultAppItem> items = ExternalAppHandler::instance()->getAvailableDefaultItems(mCurrentApp);
   DefaultAppItem* dai;
   for ( dai=items.first(); dai != 0; dai=items.next() )
   {
     mClient->insertItem( i18n(dai->_label), dai->_id );
 
     if (dai->_id == mCurrentClient)
     {
       //restore the edit fields with the data of the local membervariables if we had set it to "other".
       //Otherwise take the default data from externalapphandler.
       mChannel->setText(dai->_channel);
       mMessage->setText(dai->_message);
       mParameters->setText(dai->_parameters);
       mMessage2->setText(dai->_message2);
       mParameters2->setText(dai->_parameters2);
 
 
       if ((mCurrentApp == ExternalAppHandler::EMAIL) && (mCurrentClient == KPimGlobalPrefs::OTHER_EMC))
       {
         mChannel->setText(mEmailOtherChannel);
         mMessage->setText(mEmailOtherMessage);
         mParameters->setText(mEmailOtherMessageParameters);
         mMessage2->setText(mEmailOtherMessage2);
         mParameters2->setText(mEmailOtherMessageParameters2);
       }
       else if ((mCurrentApp == ExternalAppHandler::PHONE) && (mCurrentClient == KPimGlobalPrefs::OTHER_PHC))
       {
         mChannel->setText(mPhoneOtherChannel);
         mMessage->setText(mPhoneOtherMessage);
         mParameters->setText(mPhoneOtherMessageParameters);
       }
       else if ((mCurrentApp == ExternalAppHandler::SMS) && (mCurrentClient == KPimGlobalPrefs::OTHER_SMC))
       {
         mChannel->setText(mSMSOtherChannel);
         mMessage->setText(mSMSOtherMessage);
         mParameters->setText(mSMSOtherMessageParameters);
       }
       else if ((mCurrentApp == ExternalAppHandler::FAX) && (mCurrentClient == KPimGlobalPrefs::OTHER_FAC))
       {
         mChannel->setText(mFaxOtherChannel);
         mMessage->setText(mFaxOtherMessage);
         mParameters->setText(mFaxOtherMessageParameters);
       }
       else if ((mCurrentApp == ExternalAppHandler::PAGER) && (mCurrentClient == KPimGlobalPrefs::OTHER_PAC))
       {
         mChannel->setText(mPagerOtherChannel);
         mMessage->setText(mPagerOtherMessage);
         mParameters->setText(mPagerOtherMessageParameters);
       }
diff --git a/libkdepim/kpimglobalprefs.cpp b/libkdepim/kpimglobalprefs.cpp
index a896a0f..b2b7663 100644
--- a/libkdepim/kpimglobalprefs.cpp
+++ b/libkdepim/kpimglobalprefs.cpp
@@ -1,132 +1,133 @@
 /*
     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 "kpimglobalprefs.h"
 
 KPimGlobalPrefs *KPimGlobalPrefs::sInstance = 0;
 static KStaticDeleter<KPimGlobalPrefs> staticDeleter;
 
 
 KPimGlobalPrefs::KPimGlobalPrefs( const QString &name )
   : KPrefs("microkdeglobalrc")
 {
 
   KPrefs::setCurrentGroup("Locale");
   addItemInt("PreferredLanguage",&mPreferredLanguage,0);
   addItemInt("PreferredTime",&mPreferredTime,0);
   addItemInt("PreferredDate",&mPreferredDate,0);
   addItemBool("WeekStartsOnSunday",&mWeekStartsOnSunday,false); 
   //addItemBool("QuickSavingWOUnicode",&mUseQuicksave,false); 
   //  addItemBool("ShortDateInViewer",&mShortDateInViewer,false); 
   addItemString("UserDateFormatLong", &mUserDateFormatLong, "%A %d %b %y");
   addItemString("UserDateFormatShort", &mUserDateFormatShort, "%aK %d.%m.%y");
 
   KPrefs::setCurrentGroup("Time & Date");
 
   addItemString("TimeZoneName",&mTimeZoneId,i18n ("+01:00 Europe/Oslo(CET)") );
   addItemBool("UseDaylightsaving",&mUseDaylightsaving,true);
   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, NONE_SIC );
   addItemString( "SIPChannel", &mSipOtherChannel, "" );
   addItemString( "SIPChannelMessage", &mSipOtherMessage, "" );
   addItemString( "SIPChannelParameters", &mSipOtherMessageParameters, "" );
 
 }
 
 void KPimGlobalPrefs::setGlobalConfig()
 {
 
     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 );
 
 }
 KPimGlobalPrefs::~KPimGlobalPrefs()
 {
 }
 
 KPimGlobalPrefs *KPimGlobalPrefs::instance()
 {
   if ( !sInstance ) {
     sInstance = staticDeleter.setObject( new KPimGlobalPrefs() );
     sInstance->readConfig();
   }
 
   return sInstance;
 }
diff --git a/libkdepim/kprefswidget.h b/libkdepim/kprefswidget.h
index 8a24515..8543a39 100644
--- a/libkdepim/kprefswidget.h
+++ b/libkdepim/kprefswidget.h
@@ -1,454 +1,455 @@
 /*
     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.
 */
 // $Id$
 
 #ifndef _KPREFSWIDGET_H
 #define _KPREFSWIDGET_H
 
 #include <qptrlist.h>
 #include <qlineedit.h>
+#include <qpushbutton.h>
 
 #include <qwidget.h>
 
 class KPrefs;
 
 class KColorButton;
 class QCheckBox;
 class QLabel;
 class QSpinBox;
 class QButtonGroup;
 
 /**
   @short Base class for widgets used by @ref KPrefsDialog.
   @author Cornelius Schumacher
   @see KPrefsDialog
 
   This class provides the interface for the preferences widgets used by
   KPrefsDialog.
 */
 class KPrefsWid : public QObject
 {
   Q_OBJECT
   public:
     /**
       This function is called to read value of the setting from the
       stored configuration and display it in the widget.
     */
     virtual void readConfig() = 0;
     /**
       This function is called to write the current setting of the widget to the
       stored configuration.
     */
     virtual void writeConfig() = 0;
 
     //connect to this signal if you want to be notified of changes
   signals:
     void modified();
 
 };
 
 /**
   @short Widget for bool settings in @ref KPrefsDialog.
   
   This class provides a widget for configuring bool values. It is meant to be
   used by KPrefsDialog. The user is responsible for the layout management.
 */
 class KPrefsWidBool : public KPrefsWid
 {
   public:
     /**
       Create a bool widget consisting of a QCheckbox.
       
       @param text      Text of QCheckBox.
       @param reference Pointer to variable read and written by this widget.
       @param parent    Parent widget.
     */
     KPrefsWidBool(const QString &text,bool *reference,QWidget *parent);
     
     /**
       Return the QCheckbox used by this widget.
     */
     QCheckBox *checkBox();
     
     void readConfig();
     void writeConfig();
     
   private:
     bool *mReference;
     
     QCheckBox *mCheck;
 };
 
 /**
   @short Widget for time settings in @ref KPrefsDialog.
   
   This class provides a widget for configuring time values. It is meant to be
   used by KPrefsDialog. The user is responsible for the layout management.
 */
 class KPrefsWidTime : public KPrefsWid
 {
   public:
     /**
       Create a time widget consisting of a label and a spinbox.
       
       @param text      Text of Label.
       @param reference Pointer to variable read and written by this widget.
       @param parent    Parent widget.
     */
     KPrefsWidTime(const QString &text,int *reference,QWidget *parent);
     
     /**
       Return QLabel used by this widget.
     */
     QLabel *label();
     /**
       Return QSpinBox used by this widget.
     */
     QSpinBox *spinBox();
     
     void readConfig();
     void writeConfig();
     
   private:
     int *mReference;
     
     QLabel *mLabel;
     QSpinBox *mSpin;
 };
 
 /**
   @short Widget for color settings in @ref KPrefsDialog.
   
   This class provides a widget for configuring color values. It is meant to be
   used by KPrefsDialog. The user is responsible for the layout management.
 */
 class KPrefsWidColor : public  KPrefsWid
 {
   public:
     /**
       Create a color widget consisting of a test field and a button for opening
       a color dialog.
       
       @param text      Text of button.
       @param reference Pointer to variable read and written by this widget.
       @param parent    Parent widget.
     */
     KPrefsWidColor(const QString &text,QColor *reference,QWidget *parent);
     /**
       Destruct color setting widget.
     */
     ~KPrefsWidColor();
     
     /**
       Return QLabel for the button
     */
     QLabel *label();
     /**
       Return button opening the color dialog.
     */
     KColorButton *button();
     
     void readConfig();
     void writeConfig();
     
   private:
     QColor *mReference;
     
     QLabel *mLabel;
     KColorButton *mButton;
 };
 
 /**
   @short Widget for font settings in @ref KPrefsDialog.
   
   This class provides a widget for configuring font values. It is meant to be
   used by KPrefsDialog. The user is responsible for the layout management.
 */
 class KPrefsWidFont : public KPrefsWid
 {
   Q_OBJECT
   public:
     /**
       Create a font widget consisting of a test field and a button for opening
       a font dialog.
       
       @param label     Text of label.
       @param reference Pointer to variable read and written by this widget.
       @param parent    Parent widget.
     */
     KPrefsWidFont(const QString &sampleText,const QString &labelText,
                   QFont *reference,QWidget *parent);
     /**
       Destruct font setting widget.
     */
     ~KPrefsWidFont();
     
     /**
       Return label.
     */
     QLabel *label();
     /**
       Return QFrame used as preview field.
     */
     QLabel *preview();
     /**
       Return button opening the font dialog.
     */
     QPushButton *button();
     
     void readConfig();
     void writeConfig();
 
   protected slots:
     void selectFont();
     
   private:
     QFont *mReference;
     
     QLabel *mLabel;
     QLabel *mPreview;
     QPushButton *mButton;
 };
 
 /**
   @short Widget for settings represented by a group of radio buttons in
   @ref KPrefsDialog.
   
   This class provides a widget for configuring selections. It is meant to be
   used by KPrefsDialog. The user is responsible for the layout management. The
   setting is interpreted as an int value, corresponding to the position of the
   radio button. The position of the button is defined by the sequence of @ref
   addRadio() calls, starting with 0.
 */
 class KPrefsWidRadios : public KPrefsWid
 {
   public:
     /**
       Create a widget for selection of an option. It consists of a box with
       several radio buttons.
       
       @param text      Text of main box.
       @param reference Pointer to variable read and written by this widget.
       @param parent    Parent widget.
     */
     KPrefsWidRadios(const QString &text,int *reference,QWidget *parent);
     virtual ~KPrefsWidRadios();
 
     /**
       Add a radio button.
       
       @param text Text of the button.
     */
     void addRadio(const QString &text);
     
     /**
       Return the box widget used by this widget.
     */
     QButtonGroup *groupBox();
     
     void readConfig();
     void writeConfig();
     
   private:
     int *mReference;
 
     QButtonGroup *mBox;
 };
 
 
 /**
   @short Widget for string settings in @ref KPrefsDialog.
   
   This class provides a widget for configuring string values. It is meant to be
   used by KPrefsDialog. The user is responsible for the layout management.
 */
 class KPrefsWidString : public KPrefsWid
 {
   public:
     /**
       Create a string widget consisting of a test label and a line edit.
       
       @param text      Text of label.
       @param reference Pointer to variable read and written by this widget.
       @param parent    Parent widget.
     */
     KPrefsWidString(const QString &text,QString *reference,QWidget *parent,QLineEdit::EchoMode echomode=QLineEdit::Normal);
     /**
       Destructor.
     */
     virtual ~KPrefsWidString();
 
     /**
       Return label used by this widget.
     */
     QLabel *label();
     /**
       Return QLineEdit used by this widget.
     */
     QLineEdit *lineEdit();
     
     void readConfig();
     void writeConfig();
     
   private:
     QString *mReference;
 
     QLabel *mLabel;
     QLineEdit *mEdit;
 };
 
 
 /**
   @short Base class for a preferences widget.
   
   This class provides the framework for a preferences widget. You have to
   subclass it and add the code to create the actual configuration widgets and
   do the layout management.
   
   KPrefsWidget provides functions to add subclasses of @ref KPrefsWid. For
   these widgets the reading, writing and setting to default values is handled
   automatically. Custom widgets have to be handled in the functions @ref
   usrReadConfig() and @ref usrWriteConfig().
 */
 class KPrefsWidget : public QWidget
 {
     Q_OBJECT
   public:
     /**
       Create a KPrefsDialog for a KPrefs object.
       
       @param prefs  KPrefs object used to access te configuration.
       @param parent Parent widget.
       @param name   Widget name.
     */
     KPrefsWidget(KPrefs *prefs,QWidget *parent=0,const char *name=0);
     /**
       Destructor.
     */
     virtual ~KPrefsWidget();
 
     /**
       Register a custom KPrefsWid object.
     */
     void addWid(KPrefsWid *);
     /**
       Register a @ref KPrefsWidBool object.
       
       @param text      Text of bool widget.
       @param reference Reference to variable storing the setting.
       @param parent    Parent widget.
     */
     KPrefsWidBool *addWidBool(const QString &text,bool *reference,QWidget *parent);
     /**
       Register a @ref KPrefsWidTime object.
       
       @param text      Text of time widget.
       @param reference Reference to variable storing the setting.
       @param parent    Parent widget.
     */
     KPrefsWidTime *addWidTime(const QString &text,int *reference,QWidget *parent);
     /**
       Register a @ref KPrefsWidColor object.
       
       @param text      Text of color widget.
       @param reference Reference to variable storing the setting.
       @param parent    Parent widget.
     */
     KPrefsWidColor *addWidColor(const QString &text,QColor *reference,QWidget *parent);
     /**
       Register a @ref KPrefsWidRadios object.
       
       @param text      Text of radio button box widget.
       @param reference Reference to variable storing the setting.
       @param parent    Parent widget.
     */
     KPrefsWidRadios *addWidRadios(const QString &text,int *reference,QWidget *parent);
     /**
       Register a @ref KPrefsWidString object.
       
       @param text      Text of string widget.
       @param reference Reference to variable storing the setting.
       @param parent    Parent widget.
     */
     KPrefsWidString *addWidString(const QString &text,QString *reference,QWidget *parent);
     /**
       Register a password @ref KPrefsWidString object, with echomode set to QLineEdit::Password.
       
       @param text      Text of string widget.
       @param reference Reference to variable storing the setting.
       @param parent    Parent widget.
     */
     KPrefsWidString *addWidPassword (const QString &text,QString *reference,QWidget *parent);
     /**
       Register a @ref KPrefsWidFont object.
       
       @param sampleText Sample text of font widget.
       @param buttonText Button text of font widget.
       @param reference  Reference to variable storing the setting.
       @param parent     Parent widget.
     */
     KPrefsWidFont *addWidFont(const QString &sampleText,const QString &buttonText,
                               QFont *reference,QWidget *parent);
 
   public slots:
     /** Set all widgets to default values. */
     void setDefaults();
   
     /** Read preferences from config file. */
     void readConfig();
 
     /** Write preferences to config file. */
     void writeConfig();
 
     /** connect this slot to all UI elements */
     void modified();
 
   signals:
     /** Emitted when the a changed configuration has been stored. */
     //US    void configChanged();
     void changed( bool );
     
   protected slots:
     /** Apply changes to preferences */
     //US    void slotApply();  
 
     //US    void accept();
     /** Accept changes to preferences and close dialog */
     //US    void slotOk();
   
     /** Set preferences to default values */
     //US    void slotDefault();
 
   protected:
     /** Implement this to read custom configuration widgets. */
     virtual void usrReadConfig() {}
     /** Implement this to write custom configuration widgets. */
     virtual void usrWriteConfig() {}
 
   private:
     KPrefs *mPrefs;
 
     QPtrList<KPrefsWid> mPrefsWids;
 };
 
 #endif
diff --git a/libkdepim/libkdepim.pro b/libkdepim/libkdepim.pro
index 1fedac7..7231842 100644
--- a/libkdepim/libkdepim.pro
+++ b/libkdepim/libkdepim.pro
@@ -1,55 +1,57 @@
         TEMPLATE= lib
         CONFIG  = qt warn_on
 DEFINES +=KORG_NOKABC
 TARGET = microkdepim
 INCLUDEPATH += ../microkde ../microkde/kdecore ../microkde/kdeui . ..
 DESTDIR=../bin
 
 DEFINES +=  DESKTOP_VERSION
 include( ../variables.pri )
 unix : {
 OBJECTS_DIR = obj/unix
 MOC_DIR = moc/unix
 }
 win32: {
 DEFINES += _WIN32_
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
 }
 INTERFACES = \
 
 HEADERS = \
  categoryeditdialog.h \
  categoryeditdialog_base.h \
  categoryselectdialog.h \
  categoryselectdialog_base.h \
  externalapphandler.h \
  kdateedit.h \
  kdatepicker.h \
  kinputdialog.h \
  kpimprefs.h \
  kpimglobalprefs.h \
  kprefsdialog.h \
+ kprefswidget.h \
  ksyncprofile.h \
  ksyncprefsdialog.h \
  kcmconfigs/kcmkdepimconfig.h \
  kcmconfigs/kdepimconfigwidget.h
 
 SOURCES = \
  categoryeditdialog.cpp \
  categoryeditdialog_base.cpp \
  categoryselectdialog.cpp \
  categoryselectdialog_base.cpp \
  externalapphandler.cpp \
  kdateedit.cpp \
  kdatepicker.cpp \
  kinputdialog.cpp \
  kpimprefs.cpp \
  kpimglobalprefs.cpp \
  kprefsdialog.cpp \
+ kprefswidget.cpp \
  ksyncprofile.cpp \
  ksyncprefsdialog.cpp \
  kcmconfigs/kcmkdepimconfig.cpp \
  kcmconfigs/kdepimconfigwidget.cpp