config dialog fixes

9 files changed, 106 insertions, 316 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index cba5850..cd833cf 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1,354 +1,355 @@
 /*
     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.
 
     Async 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.
 */
 
 /*s
 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 <qlabel.h>
 #include <qregexp.h>
 #include <qlineedit.h>
 #include <qcheckbox.h>
 #include <qpushbutton.h>
 #include <qprogressbar.h>
 #include <libkdepim/phoneaccess.h>
 
 #ifndef KAB_EMBEDDED
 #include <qclipboard.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 <kprefsdialog.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 "xxportselectdialog.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 <qradiobutton.h>
 #include <qbuttongroup.h>
 
 #include <libkdepim/categoryselectdialog.h>
 #include <libkdepim/categoryeditdialog.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 "nameeditdialog.h"
 #include <kcmultidialog.h>
 
 #ifdef _WIN32_
 #ifdef  _OL_IMPORT_
 #include "kaimportoldialog.h"
 #endif
 #else
 #include <unistd.h>
 #endif
 // sync includes
 #include <libkdepim/ksyncprofile.h>
 #include <libkdepim/ksyncprefsdialog.h>
 
 
 class KABCatPrefs : public QDialog
 {
   public:
     KABCatPrefs( QWidget *parent=0, const char *name=0 ) :
       QDialog( parent, name, true ) 
     {
         setCaption( i18n("Manage new Categories") );
         QVBoxLayout* lay = new QVBoxLayout( this );
         lay->setSpacing( 3 );
         lay->setMargin( 3 );
         QLabel * lab = new QLabel( i18n("After importing/loading/syncing\nthere may be new categories in\naddressees\nwhich are not in the category list.\nPlease choose what to do:\n "), this );
         lay->addWidget( lab ); 
         QButtonGroup* format = new  QButtonGroup( 1, Horizontal, i18n("New categories not in list:"), this );
         lay->addWidget( format ); 
         format->setExclusive ( true ) ;
         addCatBut = new QRadioButton(i18n("Add to category list"), format );
         new QRadioButton(i18n("Remove from addressees"), format );
         addCatBut->setChecked( true );
         QPushButton * ok = new QPushButton( i18n("OK"), this );
         lay->addWidget( ok );
         QPushButton * cancel = new QPushButton( i18n("Cancel"), this );
         lay->addWidget( cancel );
         connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() )  );
         connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject())  );
         resize( 200, 200 );
     }
       
     bool addCat() { return addCatBut->isChecked(); }
 private:
     QRadioButton* addCatBut;
 };
 
 class KABFormatPrefs : public QDialog
 {
   public:
     KABFormatPrefs( QWidget *parent=0, const char *name=0 ) :
       QDialog( parent, name, true ) 
     {
         setCaption( i18n("Set formatted name") );
         QVBoxLayout* lay = new QVBoxLayout( this );
         lay->setSpacing( 3 );
         lay->setMargin( 3 );
         QLabel * lab = new QLabel( i18n("You can set the formatted name\nfor a list of contacts in one go."), this );
         lay->addWidget( lab ); 
         QButtonGroup* format = new QButtonGroup( 1, Horizontal, i18n("Set formatted name to:"), this );
         lay->addWidget( format ); 
         format->setExclusive ( true ) ;
         simple = new QRadioButton(i18n("Simple: James Bond"), format );
         full = new QRadioButton(i18n("Full: Mr. James 007 Bond I"), format );
         reverse = new QRadioButton(i18n("Reverse: Bond, James"), format );
         company = new QRadioButton(i18n("Organization: MI6"), format );
         simple->setChecked( true );
         setCompany = new QCheckBox(i18n("Set formatted name to\norganization, if name empty"), this);
         lay->addWidget( setCompany );
         QPushButton * ok = new QPushButton( i18n("Select contact list"), this );
         lay->addWidget( ok );
         QPushButton * cancel = new QPushButton( i18n("Cancel"), this );
         lay->addWidget( cancel );
         connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() )  );
         connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject())  );
         //resize( 200, 200 );
        
     }
 public:
     QRadioButton* simple, *full, *reverse, *company;
     QCheckBox* setCompany;
 };
 
 
 
 class KAex2phonePrefs : public QDialog
 {
   public:
     KAex2phonePrefs( QWidget *parent=0, const char *name=0 ) :
       QDialog( parent, name, true ) 
     {
         setCaption( i18n("Export to phone options") );
         QVBoxLayout* lay = new QVBoxLayout( this );
         lay->setSpacing( 3 );
         lay->setMargin( 3 );
         QLabel *lab;
         lay->addWidget(lab = new QLabel( i18n("Please read Help-Sync Howto\nto know what settings to use."), this ) );  
         lab->setAlignment (AlignHCenter  ); 
         QHBox* temphb;
         temphb = new QHBox( this );
         new QLabel( i18n("I/O device: "), temphb ); 
         mPhoneDevice = new QLineEdit( temphb);
         lay->addWidget( temphb );
         temphb = new QHBox( this );
         new QLabel( i18n("Connection: "), temphb ); 
         mPhoneConnection = new QLineEdit( temphb);
         lay->addWidget( temphb );
         temphb = new QHBox( this );
         new QLabel( i18n("Model(opt.): "), temphb ); 
         mPhoneModel = new QLineEdit( temphb);
         lay->addWidget( temphb );
         // mWriteToSim = new QCheckBox( i18n("Write Contacts to SIM card\n(if not, write to phone memory)"), this );
         // lay->addWidget( mWriteToSim );
         lay->addWidget(lab = new QLabel( i18n("NOTE: This will remove all old\ncontact data on phone!"), this ) );  
         lab->setAlignment (AlignHCenter); 
         QPushButton * ok = new QPushButton( i18n("Export to mobile phone!"), this );
         lay->addWidget( ok );
         QPushButton * cancel = new QPushButton( i18n("Cancel"), this );
         lay->addWidget( cancel );
         connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() )  );
         connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject())  );
         resize( 220, 240 );
         
     }
    
 public:
     QLineEdit* mPhoneConnection, *mPhoneDevice, *mPhoneModel; 
     QCheckBox* mWriteToSim;
 };
 
 
 bool pasteWithNewUid = true;
 
 #ifdef KAB_EMBEDDED
 KABCore::KABCore( KAddressBookMain *client, bool readWrite, QWidget *parent, const char *name )
   : QWidget( parent, name ), KSyncInterface(), 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 ), KSyncInterface(), mGUIClient( client ), mViewManager( 0 ),
     mExtensionManager( 0 ), mConfigureDialog( 0 ), mLdapSearchDialog( 0 ),
     mReadWrite( readWrite ), mModified( false )
 #endif //KAB_EMBEDDED
 {
   //  syncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)this, KSyncManager::KAPI, KABPrefs::instance(), syncMenu);
   //  syncManager->setBlockSave(false);
   mIncSearchWidget = 0;
     mMiniSplitter = 0;
   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
   // LR 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( ) ) );
@@ -1358,1146 +1359,1159 @@ void KABCore::editContact( const QString &uid )
   // First, locate the contact entry
   QString localUID = uid;
   if ( localUID.isNull() ) {
     QStringList uidList = mViewManager->selectedUids();
     if ( uidList.count() > 0 )
       localUID = *( uidList.at( 0 ) );
   }
 
   KABC::Addressee addr = mAddressBook->findByUid( localUID );
   if ( !addr.isEmpty() ) {
       mEditorDialog->setAddressee( addr );
       KApplication::execDialog ( mEditorDialog );
   }
 }
 
 /**
   Shows or edits the detail view for the given uid. If the uid is QString::null,
   the method will try to find a selected addressee in the view.
  */
 void KABCore::executeContact( const QString &uid /*US = QString::null*/ )
 {
   if ( mMultipleViewsAtOnce )
   {
     editContact( uid );
   }
   else
   {
     setDetailsVisible( true );
     mActionDetails->setChecked(true);
   }
 
 }
 
 void KABCore::save()
 {
      if (syncManager->blockSave())
         return;
     if ( !mModified )
         return;
 
     syncManager->setBlockSave(true);
    QString text = i18n( "There was an error while attempting to save\n the "
     "address book. Please check that some \nother application is "
     "not using it. " );
    message(i18n("Saving ... please wait! "), false);
    //qApp->processEvents();
 #ifndef KAB_EMBEDDED
   KABC::StdAddressBook *b = dynamic_cast<KABC::StdAddressBook*>( mAddressBook );
   if ( !b || !b->save() ) {
     KMessageBox::error( this, text, i18n( "Unable to Save" ) );
   }
 #else //KAB_EMBEDDED
   KABC::StdAddressBook *b = (KABC::StdAddressBook*)( mAddressBook );
   if ( !b || !b->save() ) {
     QMessageBox::critical( this, i18n( "Unable to Save" ), text,  i18n("Ok"));
   }
 #endif //KAB_EMBEDDED
 
   message(i18n("Addressbook saved!"));
   setModified( false );
   syncManager->setBlockSave(false);
 }
 
 
 void KABCore::undo()
 {
   UndoStack::instance()->undo();
 
   // Refresh the view
   mViewManager->refreshView();
 }
 
 void KABCore::redo()
 {
   RedoStack::instance()->redo();
 
   // Refresh the view
   mViewManager->refreshView();
 }
 void KABCore::setJumpButtonBar( bool visible )
 {
     setJumpButtonBarVisible(visible );
     saveSettings();
 }
 void KABCore::setJumpButtonBarVisible( bool visible )
 {
   if (mMultipleViewsAtOnce)
   {
     if ( visible )
       mJumpButtonBar->show();
     else
       mJumpButtonBar->hide();
   }
   else
   {
         // show the jumpbar only if "the details are hidden" == "viewmanager are shown"
     if (mViewManager->isVisible())
     {
       if ( visible )
         mJumpButtonBar->show();
       else
         mJumpButtonBar->hide();
         }
         else
         {
       mJumpButtonBar->hide();
         }
   }
   if ( visible ) {
       if ( mIncSearchWidget->currentItem() == 0 ) {
           message( i18n("Change search field enable jump bar") );
       }
   }
 }
 
 
 void KABCore::setDetailsToState()
 {
     setDetailsVisible(  mActionDetails->isChecked() );
 }
 void KABCore::setDetailsToggle()
 {
     mActionDetails->setChecked( !mActionDetails->isChecked() );
     setDetailsToState();
 }
 
 
 
 void KABCore::setDetailsVisible( bool visible )
 {
   if (visible && mDetails->isHidden())
   {
     KABC::Addressee::List addrList = mViewManager->selectedAddressees();
     if ( addrList.count() > 0 )
       mDetails->setAddressee( addrList[ 0 ] );
   }
 
   // mMultipleViewsAtOnce=false: mDetails is always visible. But we switch between
   // the listview and the detailview. We do that by changing the splitbar size.
   if (mMultipleViewsAtOnce)
   {
     if ( visible )
       mDetails->show();
     else
       mDetails->hide();
   }
   else
   {
     if ( visible ) {
       mViewManager->hide();
       mDetails->show();
       mIncSearchWidget->setFocus();
     }
     else {
       mViewManager->show();
       mDetails->hide();
       mViewManager->setFocusAV();
     }
     setJumpButtonBarVisible( !visible );
   }
 
 }
 
 void KABCore::extensionChanged( int id )
 {
   //change the details view only for non desktop systems
 #ifndef DESKTOP_VERSION
 
   if (id == 0)
   {
     //the user disabled the extension.
 
     if (mMultipleViewsAtOnce)
     { // enable detailsview again
       setDetailsVisible( true );
       mActionDetails->setChecked( true );
     }
     else
     {  //go back to the listview
       setDetailsVisible( false );
       mActionDetails->setChecked( false );
       mActionDetails->setEnabled(true);
         }
 
   }
   else
   {
     //the user enabled the extension.
     setDetailsVisible( false );
     mActionDetails->setChecked( false );
 
     if (!mMultipleViewsAtOnce)
     {
       mActionDetails->setEnabled(false);
         }
 
     mExtensionManager->setSelectionChanged();
 
   }
 
 #endif// DESKTOP_VERSION
 
 }
 
 
 void KABCore::extensionModified( const KABC::Addressee::List &list )
 {
 
   if ( list.count() != 0 ) {
     KABC::Addressee::List::ConstIterator it;
     for ( it = list.begin(); it != list.end(); ++it )
       mAddressBook->insertAddressee( *it );
     if ( list.count() > 1 )
         setModified();
     else
         setModifiedWOrefresh();
   }
   if ( list.count() == 0 )
     mViewManager->refreshView();
   else
      mViewManager->refreshView( list[ 0 ].uid() );
 
 
 
 }
 
 QString KABCore::getNameByPhone( const QString &phone )
 {
 #ifndef KAB_EMBEDDED
   QRegExp r( "[/*/-/ ]" );
   QString localPhone( phone );
 
   bool found = false;
   QString ownerName = "";
   KABC::AddressBook::Iterator iter;
   KABC::PhoneNumber::List::Iterator phoneIter;
   KABC::PhoneNumber::List phoneList;
   for ( iter = mAddressBook->begin(); !found && ( iter != mAddressBook->end() ); ++iter ) {
     phoneList = (*iter).phoneNumbers();
     for ( phoneIter = phoneList.begin(); !found && ( phoneIter != phoneList.end() );
           ++phoneIter) {
       // Get rid of separator chars so just the numbers are compared.
       if ( (*phoneIter).number().replace( r, "" ) == localPhone.replace( r, "" ) ) {
         ownerName = (*iter).formattedName();
         found = true;
       }
     }
   }
 
   return ownerName;
 #else //KAB_EMBEDDED
   qDebug("KABCore::getNameByPhone finsih method");
   return "";
 #endif //KAB_EMBEDDED
 
 }
-
+void KABCore::openConfigGlobalDialog()
+{
+    KPimPrefsGlobalDialog gc ( this );
+    gc.exec();
+}
 void KABCore::openConfigDialog()
 {
-    KCMultiDialog*  ConfigureDialog = new KCMultiDialog( "PIM", this ,"kabconfigdialog", true );
-    KCMKabConfig* kabcfg = new KCMKabConfig( ConfigureDialog->getNewVBoxPage(i18n( "Addressbook")) , "KCMKabConfig" );
-    ConfigureDialog->addModule(kabcfg );
-    KCMKdePimConfig* kdelibcfg = new KCMKdePimConfig( ConfigureDialog->getNewVBoxPage(i18n( "Global")) , "KCMKdeLibConfig" );
-    ConfigureDialog->addModule(kdelibcfg );
+    KDialogBase * ConfigureDialog = new KDialogBase (  KDialogBase::Plain , i18n("Configure KA/Pi"), KDialogBase::Default |KDialogBase::Cancel | KDialogBase::Apply | KDialogBase::Ok, KDialogBase::Ok,0, "name", true, true);
 
+    KCMKabConfig* kabcfg = new KCMKabConfig( ConfigureDialog , "KCMKabConfig" );
+    ConfigureDialog->setMainWidget( kabcfg );
     connect( ConfigureDialog, SIGNAL( applyClicked() ),
            this, SLOT( configurationChanged() ) );
+    connect( ConfigureDialog, SIGNAL( applyClicked() ),
+            kabcfg, SLOT( save() ) );
     connect( ConfigureDialog, SIGNAL( okClicked() ),
              this, SLOT( configurationChanged() ) );
+    connect( ConfigureDialog, SIGNAL( okClicked() ),
+             kabcfg, SLOT( save() ) );
+    connect( ConfigureDialog, SIGNAL( defaultClicked() ),
+             kabcfg, SLOT( defaults() ) );
     saveSettings();
+    kabcfg->load();
 #ifndef DESKTOP_VERSION
+    if ( QApplication::desktop()->height() <= 480 )
+        ConfigureDialog->hideButtons(); 
     ConfigureDialog->showMaximized();
 #endif
     if ( ConfigureDialog->exec() )
         KMessageBox::information( this,  i18n("Some changes are only\neffective after a restart!\n") );
     delete ConfigureDialog;
 }
 
 void KABCore::openLDAPDialog()
 {
 #ifndef KAB_EMBEDDED
   if ( !mLdapSearchDialog ) {
     mLdapSearchDialog = new LDAPSearchDialog( mAddressBook, this );
     connect( mLdapSearchDialog, SIGNAL( addresseesAdded() ), mViewManager,
             SLOT( refreshView() ) );
     connect( mLdapSearchDialog, SIGNAL( addresseesAdded() ), this,
             SLOT( setModified() ) );
   } else
     mLdapSearchDialog->restoreSettings();
 
   if ( mLdapSearchDialog->isOK() )
     mLdapSearchDialog->exec();
 #else //KAB_EMBEDDED
   qDebug("KABCore::openLDAPDialog() finsih method");
 #endif //KAB_EMBEDDED
 }
 
 void KABCore::print()
 {
 #ifndef KAB_EMBEDDED
   KPrinter printer;
   if ( !printer.setup( this ) )
     return;
 
   KABPrinting::PrintingWizard wizard( &printer, mAddressBook,
                                       mViewManager->selectedUids(), this );
 
   wizard.exec();
 #else //KAB_EMBEDDED
   qDebug("KABCore::print() finsih method");
 #endif //KAB_EMBEDDED
 
 }
 
 
 void KABCore::addGUIClient( KXMLGUIClient *client )
 {
   if ( mGUIClient )
     mGUIClient->insertChildClient( client );
   else
     KMessageBox::error( this, "no KXMLGUICLient");
 }
 
 
 void KABCore::configurationChanged()
 {
   mExtensionManager->reconfigure();
 }
 
 void KABCore::addressBookChanged()
 {
 /*US
   QDictIterator<AddresseeEditorDialog> it( mEditorDict );
   while ( it.current() ) {
     if ( it.current()->dirty() ) {
       QString text = i18n( "Data has been changed externally. Unsaved "
                            "changes will be lost." );
       KMessageBox::information( this, text );
     }
     it.current()->setAddressee( mAddressBook->findByUid( it.currentKey() ) );
     ++it;
   }
 */
   if (mEditorDialog)
   {
     if (mEditorDialog->dirty())
     {
       QString text = i18n( "Data has been changed externally. Unsaved "
                            "changes will be lost." );
       KMessageBox::information( this, text );
     }
     QString currentuid = mEditorDialog->addressee().uid();
     mEditorDialog->setAddressee( mAddressBook->findByUid( currentuid ) );
   }
   mViewManager->refreshView();
 
 
 }
 
 AddresseeEditorDialog *KABCore::createAddresseeEditorDialog( QWidget *parent,
                                                              const char *name )
 {
 
     if ( mEditorDialog == 0 ) {
   mEditorDialog = new AddresseeEditorDialog( this, parent,
                                                  name ? name : "editorDialog" );
 
 
   connect( mEditorDialog, SIGNAL( contactModified( const KABC::Addressee& ) ),
            SLOT( contactModified( const KABC::Addressee& ) ) );
   //connect( mEditorDialog, SIGNAL( editorDestroyed( const QString& ) ),
   //       SLOT( slotEditorDestroyed( const QString& ) ) ;
     }
 
   return mEditorDialog;
 }
 
 void KABCore::slotEditorDestroyed( const QString &uid )
 {
     //mEditorDict.remove( uid );
 }
 
 void KABCore::initGUI()
 {
 #ifndef KAB_EMBEDDED
   QHBoxLayout *topLayout = new QHBoxLayout( this );
   topLayout->setSpacing( KDialogBase::spacingHint() );
 
   mExtensionBarSplitter = new QSplitter( this );
   mExtensionBarSplitter->setOrientation( Qt::Vertical );
 
   mDetailsSplitter = new QSplitter( mExtensionBarSplitter );
 
   QVBox *viewSpace = new QVBox( mDetailsSplitter );
   mIncSearchWidget = new IncSearchWidget( viewSpace );
   connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ),
            SLOT( incrementalSearch( const QString& ) ) );
 
   mViewManager = new ViewManager( this, viewSpace );
   viewSpace->setStretchFactor( mViewManager, 1 );
 
   mDetails = new ViewContainer( mDetailsSplitter );
 
   mJumpButtonBar = new JumpButtonBar( this, this );
 
   mExtensionManager = new ExtensionManager( this, mExtensionBarSplitter );
 
   topLayout->addWidget( mExtensionBarSplitter );
   topLayout->setStretchFactor( mExtensionBarSplitter, 100 );
   topLayout->addWidget( mJumpButtonBar );
   //topLayout->setStretchFactor( mJumpButtonBar, 1 );
 
   mXXPortManager = new XXPortManager( this, this );
 
 #else //KAB_EMBEDDED
   //US initialize viewMenu before settingup viewmanager.
   //  Viewmanager needs this menu to plugin submenues.
   viewMenu = new QPopupMenu( this );
   settingsMenu = new QPopupMenu( this );
   //filterMenu = new QPopupMenu( this );
   ImportMenu = new QPopupMenu( this );
   ExportMenu = new QPopupMenu( this );
   syncMenu = new QPopupMenu( this );
   changeMenu= new QPopupMenu( this );
   beamMenu= new QPopupMenu( this );
 
 //US since we have no splitter for the embedded system, setup
 // a layout with two frames. One left and one right.
 
   QBoxLayout *topLayout;
 
   // = new QHBoxLayout( this );
 //  QBoxLayout *topLayout = (QBoxLayout*)layout();
 
 //  QWidget *mainBox = new QWidget( this );
 //  QBoxLayout * mainBoxLayout  = new QHBoxLayout(mainBox);
 
 #ifdef DESKTOP_VERSION
   topLayout = new QHBoxLayout( this );
 
 
   mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this);
   mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right );
 
   topLayout->addWidget(mMiniSplitter );
 
   mExtensionBarSplitter = new KDGanttMinimizeSplitter( Qt::Vertical,mMiniSplitter );
   mExtensionBarSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down );
   mViewManager = new ViewManager( this, mExtensionBarSplitter  );
   mDetails = new ViewContainer( mMiniSplitter );
   mExtensionManager = new ExtensionManager( this, mExtensionBarSplitter );
 #else
   if ( QApplication::desktop()->width() > 480 ) {
       topLayout = new QHBoxLayout( this );
       mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this);
       mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right );
   } else {
 
       topLayout = new QHBoxLayout( this );
       mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Vertical, this);
       mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down );
   }
 
   topLayout->addWidget(mMiniSplitter );
   mViewManager = new ViewManager( this,  mMiniSplitter );
   mDetails = new ViewContainer( mMiniSplitter );
 
 
    mExtensionManager = new ExtensionManager( this, mMiniSplitter );
 #endif
    //eh->hide();
   // topLayout->addWidget(mExtensionManager );
 
 
 /*US
 #ifndef KAB_NOSPLITTER
   QHBoxLayout *topLayout = new QHBoxLayout( this );
 //US  topLayout->setSpacing( KDialogBase::spacingHint() );
   topLayout->setSpacing( 10 );
 
   mDetailsSplitter = new QSplitter( this );
 
   QVBox *viewSpace = new QVBox( mDetailsSplitter );
 
   mViewManager = new ViewManager( this, viewSpace );
   viewSpace->setStretchFactor( mViewManager, 1 );
 
   mDetails = new ViewContainer( mDetailsSplitter );
 
   topLayout->addWidget( mDetailsSplitter );
   topLayout->setStretchFactor( mDetailsSplitter, 100 );
 #else //KAB_NOSPLITTER
   QHBoxLayout *topLayout = new QHBoxLayout( this );
 //US  topLayout->setSpacing( KDialogBase::spacingHint() );
   topLayout->setSpacing( 10 );
 
 //  mDetailsSplitter = new QSplitter( this );
 
   QVBox *viewSpace = new QVBox( this );
 
   mViewManager = new ViewManager( this, viewSpace );
   viewSpace->setStretchFactor( mViewManager, 1 );
 
   mDetails = new ViewContainer( this );
 
   topLayout->addWidget( viewSpace );
 //  topLayout->setStretchFactor( mDetailsSplitter, 100 );
   topLayout->addWidget( mDetails );
 #endif //KAB_NOSPLITTER
 */
 
   syncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)this, KSyncManager::KAPI, KABPrefs::instance(), syncMenu);
   syncManager->setBlockSave(false);
 
     connect(syncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) );
     connect(syncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) );
     QString sync_file = sentSyncFile();
     //qDebug("KABCore::initGUI()::setting tmp sync file to:%s ",sync_file.latin1());
     syncManager->setDefaultFileName( sync_file );
     //connect(syncManager , SIGNAL( ), this, SLOT( ) );
 
 #endif //KAB_EMBEDDED
   initActions();
 
 #ifdef KAB_EMBEDDED
   addActionsManually();
   //US make sure the export and import menues are initialized before creating the xxPortManager.
   mXXPortManager = new XXPortManager( this, this );
 
   // LR mIncSearchWidget = new IncSearchWidget( mMainWindow->getIconToolBar() );
   //mMainWindow->toolBar()->insertWidget(-1, 4, mIncSearchWidget);
   // mActionQuit->plug ( mMainWindow->toolBar());
   //mIncSearchWidget = new IncSearchWidget( mMainWindow->toolBar() );
   //mMainWindow->toolBar()->insertWidget(-1, 0, mIncSearchWidget);
   // mIncSearchWidget->hide();
   connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ),
            SLOT( incrementalSearch( const QString& ) ) );
   connect( mIncSearchWidget, SIGNAL( scrollUP() ),mViewManager, SLOT( scrollUP() ) );
   connect( mIncSearchWidget, SIGNAL( scrollDOWN() ),mViewManager, SLOT( scrollDOWN() ) );
 
   mJumpButtonBar = new JumpButtonBar( this, this );
 
   topLayout->addWidget( mJumpButtonBar );
 //US  topLayout->setStretchFactor( mJumpButtonBar, 10 );
 
 // mMainWindow->getIconToolBar()->raise();
 
 #endif //KAB_EMBEDDED
 
 }
 void KABCore::initActions()
 {
 //US  qDebug("KABCore::initActions(): mIsPart %i", mIsPart);
 
 #ifndef KAB_EMBEDDED
   connect( QApplication::clipboard(), SIGNAL( dataChanged() ),
            SLOT( clipboardDataChanged() ) );
 #endif //KAB_EMBEDDED
 
   // file menu
  
     mActionMail = KStdAction::mail( this, SLOT( sendMail() ), actionCollection() );
     //mActionPrint = KStdAction::print( this, SLOT( print() ), actionCollection() );
     mActionPrint = new KAction( i18n( "&Print View" ), "fileprint", CTRL + Key_P, mViewManager,
                  SLOT( printView() ), actionCollection(), "kaddressbook_print" );
   
 
     mActionPrintDetails = new KAction( i18n( "&Print Details" ), "fileprint", 0, mDetails,
                  SLOT( printView() ), actionCollection(), "kaddressbook_print2" );
 
   mActionSave = new KAction( i18n( "&Save" ), "filesave", CTRL+Key_S, this,
                              SLOT( save() ), actionCollection(), "file_sync" );
 
   mActionNewContact = new KAction( i18n( "&New Contact..." ), "filenew", CTRL+Key_N, this,
                              SLOT( newContact() ), actionCollection(), "file_new_contact" );
 
   mActionMailVCard = new KAction(i18n("Mail &vCard..."), "mail_post_to", 0,
                                  this, SLOT( mailVCard() ),
                                  actionCollection(), "file_mail_vcard");
 
   mActionExport2phone = new KAction( i18n( "Export to phone" ), "ex2phone", 0, this,
                                SLOT( export2phone() ), actionCollection(),
                                "kaddressbook_ex2phone" );
 
   mActionBeamVCard = 0;
  mActionBeam = 0;
 
 #ifndef DESKTOP_VERSION
   if ( Ir::supported() ) {
     mActionBeamVCard = new KAction( i18n( "Beam v&Card(s)..." ), "beam", 0, this,
                                SLOT( beamVCard() ), actionCollection(),
                                "kaddressbook_beam_vcard" );
 
     mActionBeam = new KAction( i18n( "&Beam personal vCard" ), "beam", 0, this,
                                SLOT( beamMySelf() ), actionCollection(),
                                "kaddressbook_beam_myself" );
   }
 #endif
 
   mActionEditAddressee = new KAction( i18n( "&Edit Contact..." ), "edit", 0,
                                       this, SLOT( editContact2() ),
                                       actionCollection(), "file_properties" );
 
 #ifdef KAB_EMBEDDED
   // mActionQuit = KStdAction::quit( mMainWindow, SLOT( exit() ), actionCollection() );
   mActionQuit = new KAction( i18n( "&Exit" ), "exit", 0,
                                       mMainWindow, SLOT( exit() ),
                                       actionCollection(), "quit" );
 #endif //KAB_EMBEDDED
 
   // edit menu
   if ( mIsPart ) {
     mActionCopy = new KAction( i18n( "&Copy" ), "editcopy", CTRL + Key_C, this,
                                SLOT( copyContacts() ), actionCollection(),
                                "kaddressbook_copy" );
     mActionCut = new KAction( i18n( "Cu&t" ), "editcut", CTRL + Key_X, this,
                               SLOT( cutContacts() ), actionCollection(),
                               "kaddressbook_cut" );
     mActionPaste = new KAction( i18n( "&Paste" ), "editpaste", CTRL + Key_V, this,
                                 SLOT( pasteContacts() ), actionCollection(),
                                 "kaddressbook_paste" );
     mActionSelectAll = new KAction( i18n( "Select &All" ), CTRL + Key_A, this,
                   SLOT( selectAllContacts() ), actionCollection(),
                  "kaddressbook_select_all" );
     mActionUndo = new KAction( i18n( "&Undo" ), "undo", CTRL + Key_Z, this,
                                SLOT( undo() ), actionCollection(),
                                "kaddressbook_undo" );
     mActionRedo = new KAction( i18n( "Re&do" ), "redo", CTRL + SHIFT + Key_Z,
                                this, SLOT( redo() ), actionCollection(),
                                "kaddressbook_redo" );
   } else {
     mActionCopy = KStdAction::copy( this, SLOT( copyContacts() ), actionCollection() );
     mActionCut = KStdAction::cut( this, SLOT( cutContacts() ), actionCollection() );
     mActionPaste = KStdAction::paste( this, SLOT( pasteContacts() ), actionCollection() );
     mActionSelectAll = KStdAction::selectAll( this, SLOT( selectAllContacts() ), actionCollection() );
     mActionUndo = KStdAction::undo( this, SLOT( undo() ), actionCollection() );
     mActionRedo = KStdAction::redo( this, SLOT( redo() ), actionCollection() );
   }
 
   mActionDelete = new KAction( i18n( "&Delete Contact" ), "editdelete",
                                Key_Delete, this, SLOT( deleteContacts() ),
                                actionCollection(), "edit_delete" );
 
   mActionUndo->setEnabled( false );
   mActionRedo->setEnabled( false );
 
   // settings menu
 #ifdef KAB_EMBEDDED
 //US special menuentry to configure the addressbook resources. On KDE
 // you do that through the control center !!!
   mActionConfigResources = new KAction( i18n( "Configure &Resources..." ), "configure_resources", 0, this,
                SLOT( configureResources() ), actionCollection(),
                "kaddressbook_configure_resources" );
 #endif //KAB_EMBEDDED
 
   if ( mIsPart ) {
     mActionConfigKAddressbook = new KAction( i18n( "&Configure KAddressBook..." ), "configure", 0, this,
                  SLOT( openConfigDialog() ), actionCollection(),
                  "kaddressbook_configure" );
 
     //US not implemented yet
     //mActionConfigShortcuts = new KAction( i18n( "Configure S&hortcuts..." ), "configure_shortcuts", 0,
     //             this, SLOT( configureKeyBindings() ), actionCollection(),
     //             "kaddressbook_configure_shortcuts" );
 #ifdef KAB_EMBEDDED
   mActionConfigureToolbars = KStdAction::configureToolbars( this, SLOT( mMainWindow->configureToolbars() ), actionCollection() );
   mActionConfigureToolbars->setEnabled( false );
 #endif //KAB_EMBEDDED
 
   } else {
-    mActionConfigKAddressbook = KStdAction::preferences( this, SLOT( openConfigDialog() ), actionCollection() );
-
-    //US not implemented yet
-    //mActionKeyBindings = KStdAction::keyBindings( this, SLOT( configureKeyBindings() ), actionCollection() );
+      mActionConfigKAddressbook = new KAction( i18n( "&Configure KA/Pi..." ), "configure", 0, this,
+                                               SLOT( openConfigDialog() ), actionCollection(),
+                                               "kaddressbook_configure" );  
+      mActionConfigGlobal = new KAction( i18n( "Global Settings..." ), "configure", 0, this,
+                                         SLOT( openConfigGlobalDialog() ), actionCollection(),
+                                         "kaddressbook_configure" );
   }
-
   mActionJumpBar = new KToggleAction( i18n( "Show Jump Bar" ), 0, 0,
                                       actionCollection(), "options_show_jump_bar" );
   connect( mActionJumpBar, SIGNAL( toggled( bool ) ), SLOT( setJumpButtonBar( bool ) ) );
 
   mActionDetails = new KToggleAction( i18n( "Show Details" ), "listview", 0,
                                       actionCollection(), "options_show_details" );
   connect( mActionDetails, SIGNAL( toggled( bool ) ), SLOT( setDetailsVisible( bool ) ) );
 
 
   mActionBR = new KToggleAction( i18n( "Beam receive enabled" ), "beam", 0, this,
                                SLOT( toggleBeamReceive() ), actionCollection(),
                                "kaddressbook_beam_rec" );
 
 
   // misc
   // only enable LDAP lookup if we can handle the protocol
 #ifndef KAB_EMBEDDED
   if ( KProtocolInfo::isKnownProtocol( KURL( "ldap://localhost" ) ) ) {
     new KAction( i18n( "&Lookup Addresses in Directory" ), "find", 0,
                  this, SLOT( openLDAPDialog() ), actionCollection(),
                  "ldap_lookup" );
   }
 #else //KAB_EMBEDDED
   //qDebug("KABCore::initActions() LDAP has to be implemented");
 #endif //KAB_EMBEDDED
 
 
   mActionWhoAmI = new KAction( i18n( "Set Who Am I" ), "personal", 0, this,
                                SLOT( setWhoAmI() ), actionCollection(),
                                "set_personal" );
 
 
   mActionCategories = new KAction( i18n( "Set Categories for Contacts..." ), 0, this,
                                    SLOT( setCategories() ), actionCollection(),
                                    "edit_set_categories" );
   mActionEditCategories = new KAction( i18n( "Edit Category List..." ), 0, this,
                                    SLOT( editCategories() ), actionCollection(),
                                    "edit__categories" );
 
   mActionRemoveVoice = new KAction( i18n( "Remove \"voice\"..." ), 0, this,
                                     SLOT( removeVoice() ), actionCollection(),
                                    "remove_voice" );
   mActionSetFormattedName = new KAction( i18n( "Set formatted name..." ), 0, this,
                                     SLOT( setFormattedName() ), actionCollection(),
                                    "set_formatted" );
 
   mActionManageCategories= new KAction( i18n( "Manage new categories..." ), 0, this,
                                     SLOT( manageCategories() ), actionCollection(),
                                    "remove_voice" );
 
 
   mActionImportOL = new KAction( i18n( "Import from Outlook..." ), 0, this,
                                     SLOT( importFromOL() ), actionCollection(),
                                    "import_OL" );
 #ifdef KAB_EMBEDDED
  mActionLicence = new KAction( i18n( "Licence" ), 0,
                  this, SLOT( showLicence() ), actionCollection(),
                  "licence_about_data" );
  mActionFaq = new KAction( i18n( "Faq" ), 0,
                  this, SLOT( faq() ), actionCollection(),
                  "faq_about_data" );
  mActionWN = new KAction( i18n( "What's New?" ), 0,
                  this, SLOT( whatsnew() ), actionCollection(),
                  "wn" );
 
 
   
  mActionStorageHowto = new KAction( i18n( "Storage HowTo" ), 0,
                  this, SLOT( storagehowto() ), actionCollection(),
                  "storage" );
   
  mActionSyncHowto = new KAction( i18n( "Sync HowTo" ), 0,
                  this, SLOT( synchowto() ), actionCollection(),
                  "sync" );
  mActionKdeSyncHowto = new KAction( i18n( "Kde Sync HowTo" ), 0,
                  this, SLOT( kdesynchowto() ), actionCollection(),
                  "kdesync" );
  mActionMultiSyncHowto = new KAction( i18n( "Multi Sync HowTo" ), 0,
                  this, SLOT( multisynchowto() ), actionCollection(),
                  "multisync" );
 
   mActionAboutKAddressbook = new KAction( i18n( "&About KAddressBook" ), "kaddressbook2", 0,
                  this, SLOT( createAboutData() ), actionCollection(),
                  "kaddressbook_about_data" );
 #endif //KAB_EMBEDDED
 
   clipboardDataChanged();
   connect( UndoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) );
   connect( RedoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) );
 }
 
 //US we need this function, to plug all actions into the correct menues.
 // KDE uses a XML format to plug the actions, but we work her without this overhead.
 void KABCore::addActionsManually()
 {
 //US  qDebug("KABCore::initActions(): mIsPart %i", mIsPart);
 
 #ifdef KAB_EMBEDDED
   QPopupMenu *fileMenu = new QPopupMenu( this );
   QPopupMenu *editMenu = new QPopupMenu( this );
   QPopupMenu *helpMenu = new QPopupMenu( this );
 
   KToolBar* tb =  mMainWindow->toolBar();
   mMainWindow->setToolBarsMovable (false ); 
 #ifndef DESKTOP_VERSION
   if ( KABPrefs::instance()->mFullMenuBarVisible ) {
 #endif
       QMenuBar* mb = mMainWindow->menuBar();
 
       //US setup menubar.
       //Disable the following block if you do not want to have a menubar.
       mb->insertItem( i18n("&File"), fileMenu );
       mb->insertItem( i18n("&Edit"), editMenu );
       mb->insertItem( i18n("&View"), viewMenu );
       mb->insertItem( i18n("&Settings"), settingsMenu );
 #ifdef DESKTOP_VERSION
       mb->insertItem( i18n("Synchronize"), syncMenu );
 #else
       mb->insertItem( i18n("Sync"), syncMenu );
 #endif
       //mb->insertItem( i18n("&Change"), changeMenu );
       mb->insertItem( i18n("&Help"), helpMenu );
       mIncSearchWidget = new IncSearchWidget( tb );
       // tb->insertWidget(-1, 0, mIncSearchWidget);
 #ifndef DESKTOP_VERSION
   } else  {
       //US setup toolbar
       QPEMenuBar   *menuBarTB = new QPEMenuBar( tb );
       QPopupMenu *popupBarTB = new QPopupMenu( this );
       menuBarTB->insertItem( SmallIcon( "z_menu" ) , popupBarTB);
       tb->insertWidget(-1, 0, menuBarTB);
       mIncSearchWidget = new IncSearchWidget( tb );
       tb->enableMoving(false);
       popupBarTB->insertItem( i18n("&File"), fileMenu );
       popupBarTB->insertItem( i18n("&Edit"), editMenu );
       popupBarTB->insertItem( i18n("&View"), viewMenu );
       popupBarTB->insertItem( i18n("&Settings"), settingsMenu );
       popupBarTB->insertItem( i18n("Synchronize"), syncMenu );
       mViewManager->getFilterAction()->plug ( popupBarTB);
       //popupBarTB->insertItem( i18n("&Change selected"), changeMenu );
       popupBarTB->insertItem( i18n("&Help"), helpMenu );
       if (QApplication::desktop()->width() > 320 ) {
           // mViewManager->getFilterAction()->plug ( tb);
       }
   }
 #endif
   mIncSearchWidget->setSize();
   // mActionQuit->plug ( mMainWindow->toolBar());
 
 
 
   //US Now connect the actions with the menue entries.
 #ifdef DESKTOP_VERSION
   mActionPrint->plug( fileMenu );
   mActionPrintDetails->plug( fileMenu );
   fileMenu->insertSeparator();
 #endif
   mActionMail->plug( fileMenu );
   fileMenu->insertSeparator();
 
   mActionNewContact->plug( editMenu );
   mActionNewContact->plug( tb );
 
   mActionEditAddressee->plug( editMenu );
   editMenu->insertSeparator();
   // if ((KGlobal::getDesktopSize() > KGlobal::Small ) ||
   //  (!KABPrefs::instance()->mMultipleViewsAtOnce ))
     mActionEditAddressee->plug( tb );
 
     // fileMenu->insertSeparator();
   mActionSave->plug( fileMenu );
   fileMenu->insertItem( "&Import", ImportMenu );
   fileMenu->insertItem( "&Export", ExportMenu );
   editMenu->insertItem( i18n("&Change"), changeMenu );
   editMenu->insertSeparator();
 #ifndef DESKTOP_VERSION
   if ( Ir::supported() )  fileMenu->insertItem( i18n("&Beam"), beamMenu );
 #endif
 #if 0 
   // PENDING fix MailVCard
   fileMenu->insertSeparator();
   mActionMailVCard->plug( fileMenu );
 #endif
 #ifndef DESKTOP_VERSION
   if ( Ir::supported() ) mActionBR->plug( beamMenu );
   if ( Ir::supported() ) mActionBeamVCard->plug( beamMenu );
   if ( Ir::supported() ) mActionBeam->plug( beamMenu );
 #endif
   fileMenu->insertSeparator();
   mActionQuit->plug( fileMenu );
 #ifdef _OL_IMPORT_
   mActionImportOL->plug( ImportMenu  );
 #endif
   // edit menu
   mActionUndo->plug( editMenu );
   mActionRedo->plug( editMenu );
   editMenu->insertSeparator();
   mActionCut->plug( editMenu );
   mActionCopy->plug( editMenu );
   mActionPaste->plug( editMenu );
   mActionDelete->plug( editMenu );
   editMenu->insertSeparator();
   mActionSelectAll->plug( editMenu );
 
   mActionSetFormattedName->plug( changeMenu );
   mActionRemoveVoice->plug( changeMenu );
   // settingsmings menu
 //US special menuentry to configure the addressbook resources. On KDE
 // you do that through the control center !!!
   // settingsMenu->insertSeparator();
 
   mActionConfigKAddressbook->plug( settingsMenu, 0 );
-  mActionConfigResources->plug( settingsMenu,1 );
-  settingsMenu->insertSeparator(2);
+  mActionConfigGlobal->plug( settingsMenu, 1 );
+  mActionConfigResources->plug( settingsMenu,2 );
+  settingsMenu->insertSeparator(3);
 
   if ( mIsPart ) {
     //US not implemented yet
     //mActionConfigShortcuts->plug( settingsMenu );
     //mActionConfigureToolbars->plug( settingsMenu );
 
   } else {
     //US not implemented yet
     //mActionKeyBindings->plug( settingsMenu );
   }
 
   mActionEditCategories->plug( settingsMenu );
   mActionManageCategories->plug( settingsMenu );
   mActionJumpBar->plug( viewMenu,0 );
   mActionDetails->plug( viewMenu,0 );
   //if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop  )
   mActionDetails->plug( tb );
   settingsMenu->insertSeparator();
 #ifndef DESKTOP_VERSION
   if ( Ir::supported() ) mActionBR->plug(settingsMenu );
   settingsMenu->insertSeparator();
 #endif
 
   mActionWhoAmI->plug( settingsMenu );
   //mActionEditCategories->plug( changeMenu );
   mActionCategories->plug( changeMenu );
   //mActionManageCategories->plug( changeMenu );
 
   //mActionCategories->plug( settingsMenu );
 
      
   mActionWN->plug( helpMenu );
   mActionStorageHowto->plug( helpMenu );
   mActionSyncHowto->plug( helpMenu );
   mActionKdeSyncHowto->plug( helpMenu );
   mActionMultiSyncHowto->plug( helpMenu );
   mActionFaq->plug( helpMenu );
   mActionLicence->plug( helpMenu );
   mActionAboutKAddressbook->plug( helpMenu );
 
   if (KGlobal::getDesktopSize() > KGlobal::Small ) {
 
       mActionSave->plug( tb );
       mViewManager->getFilterAction()->plug ( tb);
       //LR hide filteraction on started in 480x640
       if (QApplication::desktop()->width() == 480 ) {
           mViewManager->getFilterAction()->setComboWidth( 0 );
       }
       mActionUndo->plug( tb );
       mActionDelete->plug( tb );
       mActionRedo->plug( tb );
   } else {
       mActionSave->plug( tb );
       tb->enableMoving(false);
   }
   //mActionQuit->plug ( tb );
   //tb->insertWidget(-1, 0, mIncSearchWidget, 6);
 
   //US link the searchwidget first to this.
   // The real linkage to the toolbar happens later.
 //US  mIncSearchWidget->reparent(tb, 0, QPoint(50,0), TRUE);
 //US  tb->insertItem( mIncSearchWidget );
 /*US
   mIncSearchWidget = new IncSearchWidget( tb );
   connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ),
            SLOT( incrementalSearch( const QString& ) ) );
 
   mJumpButtonBar = new JumpButtonBar( this, this );
 
 //US topLayout->addWidget( mJumpButtonBar );
  this->layout()->add( mJumpButtonBar );
 */
 
 #endif //KAB_EMBEDDED
 
   mActionExport2phone->plug( ExportMenu );
  connect ( syncMenu, SIGNAL( activated ( int )  ), syncManager, SLOT (slotSyncMenu( int ) ) );
  syncManager->fillSyncMenu();
 
 }
 void KABCore::showLicence()
 {
     KApplication::showLicence();
 }
 
 void KABCore::manageCategories( )
 {
     KABCatPrefs* cp = new KABCatPrefs(); 
     cp->show();
     int w =cp->sizeHint().width() ;
     int h = cp->sizeHint().height() ;
     int dw = QApplication::desktop()->width();
     int dh = QApplication::desktop()->height();
     cp->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
     if ( !cp->exec() ) {
         delete cp;
         return;
     }
     int count = 0;
     int cc = 0;
     message( i18n("Please wait, processing categories..."));
     if ( cp->addCat() ) {
         KABC::AddressBook::Iterator it;
         QStringList catList = KABPrefs::instance()->mCustomCategories;
         for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { 
             ++cc;
             if ( cc %10 == 0)
                 message(i18n("Processing contact #%1").arg(cc));
             QStringList catIncList = (*it).categories();
             int i;
             for( i = 0; i<   catIncList.count(); ++i ) {
                 if ( !catList.contains (catIncList[i])) {
                     catList.append( catIncList[i] );
                     //qDebug("add cat %s ",  catIncList[i].latin1());
                     ++count;
                 }
             }
         }
         catList.sort();
         KABPrefs::instance()->mCustomCategories = catList;
         KABPrefs::instance()->writeConfig();
         message(QString::number( count )+ i18n(" categories added to list! "));
     } else {
         QStringList catList = KABPrefs::instance()->mCustomCategories;
         QStringList catIncList;
         QStringList newCatList;
         KABC::AddressBook::Iterator it;
         for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { 
             ++cc;
             if ( cc %10 == 0)
                 message(i18n("Processing contact #%1").arg(cc));
             QStringList catIncList = (*it).categories();
             int i;
             if ( catIncList.count() ) {
                 newCatList.clear();
                 for( i = 0; i<   catIncList.count(); ++i ) {
                     if ( catList.contains (catIncList[i])) {
                         newCatList.append( catIncList[i] );
                     }
                 }
                 newCatList.sort();
                 (*it).setCategories( newCatList );
                 mAddressBook->insertAddressee( (*it) );
             }
         } 
         setModified( true );
         mViewManager->refreshView();
         message( i18n("Removing categories done!"));
     }
     delete cp;
 }
 void KABCore::removeVoice()
 {
     if ( KMessageBox::questionYesNo( this, i18n("After importing, phone numbers\nmay have two or more types.\n(E.g. work+voice)\nThese numbers are shown as \"other\".\nClick Yes to remove the voice type\nfrom numbers with more than one type.\n\nRemove voice type?") ) == KMessageBox::No )
         return;
     XXPortSelectDialog dlg( this, false, this );
     if ( !dlg.exec() )
         return;
     mAddressBook->setUntagged();
     dlg.tagSelected();
     message(i18n("Removing voice..."), false );
     KABC::AddressBook::Iterator it;
     for ( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) {
         if ( (*it).tagged() ) {
             (*it).removeVoice();
         }
     }
     message(i18n("Refreshing view...") );
     qApp->processEvents();
     mViewManager->refreshView( "" );
     Addressee add;
     mDetails->setAddressee( add );
     message(i18n("Remove voice completed!") );
 
 
 
 }
 
 void KABCore::setFormattedName()
 {
     KABFormatPrefs setpref;
     if ( !setpref.exec() ) {
         return;
     }
     XXPortSelectDialog dlg( this, false, this );
     if ( !dlg.exec() )
         return;
     mAddressBook->setUntagged();
     dlg.tagSelected();
     int count = 0;
     KABC::AddressBook::Iterator it;
     bool modified = false;
     for ( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) {
         if ( (*it).tagged() ) { 
             if ( (*it).uid().left( 2 ) == "la" )
                 if ( (*it).uid().left( 19 ) == QString("last-syncAddressee-") )
                     continue;
             ++count;
             if ( count %10 == 0 )
                 message(i18n("Changing contact #%1").arg( count ) );
             qApp->processEvents();
             QString fName;
             if ( setpref.simple->isChecked() )
                 fName = NameEditDialog::formattedName( (*it), NameEditDialog::SimpleName );
             else if ( setpref.full->isChecked() )
                 fName = NameEditDialog::formattedName( (*it), NameEditDialog::FullName );
             else if ( setpref.reverse->isChecked() )
                 fName = NameEditDialog::formattedName( (*it), NameEditDialog::ReverseName );
             else 
                 fName = (*it).organization();
             if ( setpref.setCompany->isChecked() )
                 if ( fName.isEmpty() || fName =="," )
                     fName = (*it).organization();
             (*it).setFormattedName( fName );
             (*it).setChanged( true );
             modified = true;
             (*it).setRevision( QDateTime::currentDateTime() ); 
         }
     }
     message(i18n("Refreshing view...") );
     qApp->processEvents();
     if ( modified )
         setModified( true );
     Addressee add;
     mDetails->setAddressee( add );
     if ( count == 0 )
         message(i18n("No contact changed!") );
     else
         message(i18n("%1 contacts changed!").arg( count ) );
 }
 
 void KABCore::clipboardDataChanged()
 {
 
   if ( mReadWrite )
     mActionPaste->setEnabled( !QApplication::clipboard()->text().isEmpty() );
 
 }
 
 void KABCore::updateActionMenu()
 {
   UndoStack *undo = UndoStack::instance();
   RedoStack *redo = RedoStack::instance();
 
   if ( undo->isEmpty() )
     mActionUndo->setText( i18n( "Undo" ) );
   else
     mActionUndo->setText( i18n( "Undo %1" ).arg( undo->top()->name() ) );
 
   mActionUndo->setEnabled( !undo->isEmpty() );
 
   if ( !redo->top() )
     mActionRedo->setText( i18n( "Redo" ) );
   else
     mActionRedo->setText( i18n( "Redo %1" ).arg( redo->top()->name() ) );
 
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index 80dbf08..6479a58 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -74,455 +74,457 @@ class Ir;
 
 class KABCore : public QWidget, public KSyncInterface
 {
   Q_OBJECT
 
   public:
     KABCore( KAddressBookMain *client, bool readWrite, QWidget *parent, const char *name = 0 );
 
 
     ~KABCore();
 
 
 #ifdef KAB_EMBEDDED
   //US added functionality
     QPopupMenu* getViewMenu() {return viewMenu;}
     QPopupMenu* getFilterMenu() {return filterMenu;}
     QPopupMenu* getSettingsMenu() {return settingsMenu;}
     void addActionsManually();
 #endif //KAB_EMBEDDED
     /**
       Restores the global settings.
      */
     void restoreSettings();
 
   
 
     /**
       Returns a pointer to the StdAddressBook of the application.
      */
     KABC::AddressBook *addressBook() const;
 
     /**
       Returns a pointer to the KConfig object of the application.
      */
     static KConfig *config();
 
     /**
       Returns a pointer to the global KActionCollection object. So
       other classes can register their actions easily.
      */
     KActionCollection *actionCollection() const;
 
     /**
       Returns the current search field of the Incremental Search Widget.
      */
     KABC::Field *currentSearchField() const;
 
     /**
       Returns the uid list of the currently selected contacts.
      */
     QStringList selectedUIDs() const;
 
     /**
       Displays the ResourceSelectDialog and returns the selected
       resource or a null pointer if no resource was selected by
       the user.
      */
     KABC::Resource *requestResource( QWidget *parent );
 
 #ifndef KAB_EMBEDDED
     static KAboutData *createAboutData();
 #endif //KAB_EMBEDDED
 
 #ifdef KAB_EMBEDDED
     inline QPopupMenu* getImportMenu() { return ImportMenu;}
     inline QPopupMenu* getExportMenu() { return ExportMenu;}
 #endif //KAB_EMBEDDED
 
   public slots:
 #ifdef KAB_EMBEDDED
     void createAboutData();
 #endif //KAB_EMBEDDED
     void setDetailsToggle();
 
     void showLicence();
     void faq();
     void whatsnew() ;
     void synchowto() ;
     void storagehowto() ;
     void multisynchowto() ;
     void kdesynchowto() ;
     void writeToPhone();
 
     /**
       Is called whenever a contact is selected in the view.
      */
     void setContactSelected( const QString &uid );
 
     /**
       Opens the preferred mail composer with all selected contacts as
       arguments.
      */
     void sendMail();
 
     /**
       Opens the preferred mail composer with the given contacts as
       arguments.
      */
     void sendMail( const QString& email );
 
 
     void mailVCard();
     void mailVCard(const QStringList& uids);
 
     /**
       Beams the "WhoAmI contact.
      */
     void beamMySelf();
 
     void beamVCard();
     void export2phone();
     void beamVCard(const QStringList& uids);
     void beamDone( Ir *ir );
 
 
     /**
       Starts the preferred web browser with the given URL as argument.
      */
     void browse( const QString& url );
 
     /**
       Select all contacts in the view.
      */
     void selectAllContacts();
 
     /**
       Deletes all selected contacts from the address book.
      */
     void deleteContacts();
 
     /**
       Deletes given contacts from the address book.
 
       @param uids The uids of the contacts, which shall be deleted.
      */
     void deleteContacts( const QStringList &uids );
 
     /**
       Copys the selected contacts into clipboard for later pasting.
      */
     void copyContacts();
 
     /**
       Cuts the selected contacts and stores them for later pasting.
      */
     void cutContacts();
 
     /**
       Paste contacts from clipboard into the address book.
      */
     void pasteContacts();
 
     /**
       Paste given contacts into the address book.
 
       @param list The list of addressee, which shall be pasted.
      */
     void pasteContacts( KABC::Addressee::List &list );
 
     /**
       Sets the whoAmI contact, that is used by many other programs to
       get personal information about the current user.
      */
     void setWhoAmI();
 
     /**
       Displays the category dialog and applies the result to all
       selected contacts.
      */
     void setCategories();
     void manageCategories();
     void editCategories();
 
     /**
       Sets the field list of the Incremental Search Widget.
      */
     void setSearchFields( const KABC::Field::List &fields );
 
     /**
       Search with the current search field for a contact, that matches
       the given text, and selects it in the view.
      */
     void incrementalSearch( const QString& text );
     void incrementalSearchJump( const QString& text );
 
     /**
       Marks the address book as modified.
      */
     void setModified();
     /**
       Marks the address book as modified without refreshing the view.
      */
     void setModifiedWOrefresh();
 
     /**
       Marks the address book as modified concerning the argument.
      */
     void setModified( bool modified );
 
     /**
       Returns whether the address book is modified.
      */
     bool modified() const;
 
     /**
       Called whenever an contact is modified in the contact editor
       dialog or the quick edit.
      */
     void contactModified( const KABC::Addressee &addr );
     void addrModified( const KABC::Addressee &addr, bool updateDetails = true );
 
     /**
       DCOP METHODS.
      */
     void addEmail( QString addr );
     void importVCard( const KURL& url, bool showPreview );
     void importVCard( const QString& vCard, bool showPreview );
     void newContact();
     QString getNameByPhone( const QString& phone );
     /**
       END DCOP METHODS
      */
 
     /**
       Saves the contents of the AddressBook back to disk.
      */
     void save();
 
     /**
       Undos the last command using the undo stack.
      */
     void undo();
 
     /**
       Redos the last command that was undone, using the redo stack.
      */
     void redo();
 
     /**
       Shows the edit dialog for the given uid. If the uid is QString::null,
       the method will try to find a selected addressee in the view.
      */
     void editContact( const QString &uid /*US = QString::null*/ );
 //US added a second method without defaultparameter
     void editContact2();
 
     /**
       Shows or edits the detail view for the given uid. If the uid is QString::null,
       the method will try to find a selected addressee in the view.
      */
     void executeContact( const QString &uid /*US = QString::null*/ );
 
     /**
       Launches the configuration dialog.
      */
     void openConfigDialog();
+    void openConfigGlobalDialog();
 
     /**
       Launches the ldap search dialog.
      */
     void openLDAPDialog();
 
     /**
       Creates a KAddressBookPrinter, which will display the print
       dialog and do the printing.
      */
     void print();
 
     /**
       Registers a new GUI client, so plugins can register its actions.
      */
    void addGUIClient( KXMLGUIClient *client );
 
    void requestForNameEmailUidList(const QString& sourceChannel, const QString& sessionuid);
    void requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid);
    void requestForBirthdayList(const QString& sourceChannel, const QString& sessionuid);
 
 
   signals:
     void contactSelected( const QString &name );
     void contactSelected( const QPixmap &pixmap );
   public slots:
     void recieve(QString cmsg );
     void getFile( bool success );
     void syncFileRequest();
     void setDetailsVisible( bool visible );
     void setDetailsToState();
    
     void saveSettings();
 
   private slots:
     void updateToolBar();
     void updateMainWindow();
     void receive( const QCString& cmsg, const QByteArray& data );
     void toggleBeamReceive( );
     void disableBR(bool);
     void setJumpButtonBarVisible( bool visible );
     void setJumpButtonBar( bool visible );
     void setCaptionBack();
     void resizeAndCallContactdialog();
     void callContactdialog();
 
   void importFromOL();
     void extensionModified( const KABC::Addressee::List &list );
     void extensionChanged( int id );
     void clipboardDataChanged();
     void updateActionMenu();
     void configureKeyBindings();
     void removeVoice();
     void setFormattedName();
 #ifdef KAB_EMBEDDED
     void configureResources();
 #endif //KAB_EMBEDDED
 
     void slotEditorDestroyed( const QString &uid );
     void configurationChanged();
     void addressBookChanged();
 
   private:
     QString mEmailSourceChannel;
     QString mEmailSourceUID;
     void resizeEvent(QResizeEvent* e );
     bool mBRdisabled;
 #ifndef DESKTOP_VERSION
     QCopChannel* infrared;
 #endif
     QTimer *mMessageTimer;
     void initGUI();
     void initActions();
     QString getPhoneFile();
 
     AddresseeEditorDialog *createAddresseeEditorDialog( QWidget *parent,
                                                         const char *name = 0 );
 
  KXMLGUIClient *mGUIClient;
 
   KABC::AddressBook *mAddressBook;
 
   ViewManager *mViewManager;
   // QSplitter *mDetailsSplitter;
   KDGanttMinimizeSplitter *mExtensionBarSplitter;
   ViewContainer *mDetails;
   KDGanttMinimizeSplitter* mMiniSplitter;
   XXPortManager *mXXPortManager;
   JumpButtonBar *mJumpButtonBar;
   IncSearchWidget *mIncSearchWidget;
   ExtensionManager *mExtensionManager;
 
   KCMultiDialog *mConfigureDialog;
 
 #ifndef KAB_EMBEDDED
     LDAPSearchDialog *mLdapSearchDialog;
 #endif //KAB_EMBEDDED
     // QDict<AddresseeEditorDialog> mEditorDict;
     AddresseeEditorDialog *mEditorDialog;
     bool mReadWrite;
     bool mModified;
     bool mIsPart;
     bool mMultipleViewsAtOnce;
 
 
     //US file menu
     KAction *mActionMail;
     KAction *mActionBeam;
     KToggleAction *mActionBR;
     KAction *mActionExport2phone;
     KAction* mActionPrint;
     KAction* mActionPrintDetails;
     KAction* mActionNewContact;
     KAction *mActionSave;
     KAction *mActionEditAddressee;
     KAction *mActionMailVCard;
     KAction *mActionBeamVCard;
 
     KAction *mActionQuit;
 
     //US edit menu
     KAction *mActionCopy;
     KAction *mActionCut;
     KAction *mActionPaste;
     KAction *mActionSelectAll;
     KAction *mActionUndo;
     KAction *mActionRedo;
     KAction *mActionDelete;
 
     //US settings menu
     KAction *mActionConfigResources;
+    KAction *mActionConfigGlobal;
     KAction *mActionConfigKAddressbook;
     KAction *mActionConfigShortcuts;
     KAction *mActionConfigureToolbars;
     KAction *mActionKeyBindings;
     KToggleAction *mActionJumpBar;
     KToggleAction *mActionDetails;
     KAction *mActionWhoAmI;
     KAction *mActionCategories;
     KAction *mActionEditCategories;
     KAction *mActionManageCategories;
     KAction *mActionAboutKAddressbook;
     KAction *mActionLicence;
     KAction *mActionFaq;
     KAction *mActionWN;
     KAction *mActionSyncHowto;
     KAction *mActionStorageHowto;
     KAction *mActionKdeSyncHowto;
     KAction *mActionMultiSyncHowto;
 
     KAction *mActionDeleteView;
 
     QPopupMenu *viewMenu;
     QPopupMenu *filterMenu;
     QPopupMenu *settingsMenu;
     QPopupMenu *changeMenu;
     QPopupMenu *beamMenu;
 //US    QAction *mActionSave;
     QPopupMenu *ImportMenu;
     QPopupMenu *ExportMenu;
     //LR additional methods
     KAction *mActionRemoveVoice;
     KAction *mActionSetFormattedName;
     KAction * mActionImportOL;
 
 #ifndef KAB_EMBEDDED
     KAddressBookService *mAddressBookService;
 #endif //KAB_EMBEDDED
 
     class KABCorePrivate;
     KABCorePrivate *d;
     //US    bool mBlockSaveFlag;
 
 #ifdef KAB_EMBEDDED
     KAddressBookMain *mMainWindow;  // should be the same like mGUIClient
 #endif //KAB_EMBEDDED
 
     //this are the overwritten callbackmethods from the syncinterface
     virtual bool sync(KSyncManager* manager, QString filename, int mode);
     virtual bool syncExternal(KSyncManager* manager, QString resource);
     virtual void removeSyncInfo( QString syncProfile);
     bool syncPhone();
     void message( QString m , bool startTimer = true);
 
     // LR *******************************
     // sync stuff!
     QString sentSyncFile();
     QPopupMenu *syncMenu;
     KSyncManager* syncManager;
     int mGlobalSyncMode; 
     bool synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBook* remote,int mode);
     KABC::Addressee getLastSyncAddressee();
     QDateTime mLastAddressbookSync;
     int  takeAddressee( KABC::Addressee* local,  KABC::Addressee* remote, int mode , bool full );
     // *********************
 
 };
 
 #endif
diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.h b/kaddressbook/kcmconfigs/kcmkabconfig.h
index 2ecbfef..2af10d7 100644
--- a/kaddressbook/kcmconfigs/kcmkabconfig.h
+++ b/kaddressbook/kcmconfigs/kcmkabconfig.h
@@ -1,47 +1,47 @@
 /*
     This file is part of KAddressBook.
     Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #ifndef KCMKABCONFIG_H
 #define KCMKABCONFIG_H
 
 #include <kcmodule.h>
 
 class KABConfigWidget;
 class KABPrefs;
 
 class KCMKabConfig : public KCModule
 {
   Q_OBJECT
 
   public:
     KCMKabConfig( QWidget *parent = 0, const char *name = 0 );
-
+  public slots:
     virtual void load();
     virtual void save();
     virtual void defaults();
 
   private:
     KABConfigWidget *mConfigWidget;
 };
 
 #endif
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 4794414..2a55127 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2278,512 +2278,513 @@ void CalendarView::writeFilterSettings(KConfig *config)
     QStringList filterList;
 
     CalFilter *filter = mFilters.first();
     while(filter) {
         //    kdDebug() << " fn: " << filter->name() << endl;
         filterList << filter->name();
         config->setGroup("Filter_" + filter->name().utf8());
         config->writeEntry("Criteria",filter->criteria());
         config->writeEntry("CategoryList",filter->categoryList());
         filter = mFilters.next();
     }
     config->setGroup("General");
     config->writeEntry("CalendarFilters",filterList);
 
     config->setGroup("FilterView");
     config->writeEntry("FilterEnabled",mFilterView->filtersEnabled());
     config->writeEntry("Current Filter",mFilterView->selectedFilter()->name());
 }
 
 
 void CalendarView::goToday()
 {
     if ( mViewManager->currentView()->isMonthView() )
         mNavigator->selectTodayMonth();
     else
         mNavigator->selectToday();
 }
 
 void CalendarView::goNext()
 {
     mNavigator->selectNext();
 }
 
 void CalendarView::goPrevious()
 {
     mNavigator->selectPrevious();
 }
 void CalendarView::goNextMonth()
 {
     mNavigator->selectNextMonth();
 }
 
 void CalendarView::goPreviousMonth()
 {
     mNavigator->selectPreviousMonth();
 }
 void CalendarView::writeLocale() 
 {
     //KPimGlobalPrefs::instance()->setGlobalConfig();
 #if 0
     KGlobal::locale()->setHore24Format( !KOPrefs::instance()->mPreferredTime );
     KGlobal::locale()->setWeekStartMonday( !KOPrefs::instance()->mWeekStartsOnSunday );
     KGlobal::locale()->setIntDateFormat( (KLocale::IntDateFormat)KOPrefs::instance()->mPreferredDate );
     KGlobal::locale()->setLanguage( KOPrefs::instance()->mPreferredLanguage );
     QString dummy = KOPrefs::instance()->mUserDateFormatLong;
     KGlobal::locale()->setDateFormat(dummy.replace( QRegExp("K"), QString(",") ));
     dummy = KOPrefs::instance()->mUserDateFormatShort;
     KGlobal::locale()->setDateFormatShort(dummy.replace( QRegExp("K"), QString(",") ));
     KGlobal::locale()->setDaylightSaving( KOPrefs::instance()->mUseDaylightsaving,
                                           KOPrefs::instance()->mDaylightsavingStart,
                                           KOPrefs::instance()->mDaylightsavingEnd );
     KGlobal::locale()->setTimezone( KPimGlobalPrefs::instance()->mTimeZoneId );
 #endif
 }
 void CalendarView::updateConfig()
 {
     writeLocale();
     if ( KOPrefs::instance()->mUseAppColors )
         QApplication::setPalette( QPalette (KOPrefs::instance()->mAppColor1, KOPrefs::instance()->mAppColor2), true );
     emit configChanged();
     mTodoList->updateConfig();
     // mDateNavigator->setFont ( KOPrefs::instance()->mDateNavigatorFont);
     mCalendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId);
     // To make the "fill window" configurations work
     //mViewManager->raiseCurrentView();
 }
 
 
 void CalendarView::eventChanged(Event *event)
 {
     changeEventDisplay(event,KOGlobals::EVENTEDITED);
     //updateUnmanagedViews();
 }
 
 void CalendarView::eventAdded(Event *event)
 {
     changeEventDisplay(event,KOGlobals::EVENTADDED);
 }
 
 void CalendarView::eventToBeDeleted(Event *)
 {
     kdDebug() << "CalendarView::eventToBeDeleted(): to be implemented" << endl;
 }
 
 void CalendarView::eventDeleted()
 {
     changeEventDisplay(0,KOGlobals::EVENTDELETED);
 }
 void CalendarView::changeTodoDisplay(Todo *which, int action)
 {
     changeIncidenceDisplay((Incidence *)which,  action);
     mDateNavigator->updateView(); //LR
     //mDialogManager->updateSearchDialog();
 
     if (which) {
         mViewManager->updateWNview();
         //mTodoList->updateView();
     }
    
 }
 
 void CalendarView::changeIncidenceDisplay(Incidence *which, int action)
 {
     updateUnmanagedViews();
     //qDebug(" CalendarView::changeIncidenceDisplay++++++++++++++++++++++++++  %d  %d ",which, action );
     if ( action == KOGlobals::EVENTDELETED ) { //delete
         mCalendar->checkAlarmForIncidence( 0, true );
         if ( mEventViewerDialog )
             mEventViewerDialog->hide();
     } 
     else
         mCalendar->checkAlarmForIncidence( which , false );
 }
 
 // most of the changeEventDisplays() right now just call the view's
 // total update mode, but they SHOULD be recoded to be more refresh-efficient.
 void CalendarView::changeEventDisplay(Event *which, int action)
 {
     //  kdDebug() << "CalendarView::changeEventDisplay" << endl;
     changeIncidenceDisplay((Incidence *)which,  action);
     mDateNavigator->updateView();
     //mDialogManager->updateSearchDialog();
 
     if (which) {
         // If there is an event view visible update the display
         mViewManager->currentView()->changeEventDisplay(which,action);
         // TODO: check, if update needed
         //    if (which->getTodoStatus()) {
         mTodoList->updateView();
         //    }
     } else {
         mViewManager->currentView()->updateView();
     }
 }
 
 
 void CalendarView::updateTodoViews()
 {
     mTodoList->updateView();
     mViewManager->currentView()->updateView();
  
 }
 
 
 void CalendarView::updateView(const QDate &start, const QDate &end)
 {
     mTodoList->updateView();
     mViewManager->updateView(start, end);
     //mDateNavigator->updateView();
 }
 
 void CalendarView::clearAllViews()
 {
     mTodoList->clearList();
     mViewManager->clearAllViews();
     SearchDialog * sd = mDialogManager->getSearchDialog();
     if ( sd ) {
         KOListView* kol = sd->listview();
         if ( kol )
             kol->clearList();
     }
 }
 void CalendarView::updateView()
 {
     DateList tmpList = mNavigator->selectedDates();
 
     if ( KOPrefs::instance()->mHideNonStartedTodos ) 
         mTodoList->updateView();
     // We assume that the navigator only selects consecutive days.
     updateView( tmpList.first(), tmpList.last() );
 }
 
 void CalendarView::updateUnmanagedViews()
 {
     mDateNavigator->updateDayMatrix();
 }
 
 int CalendarView::msgItemDelete(const QString name)
 {
     return KMessageBox::warningContinueCancel(this,name +"\n\n"+
                                               i18n("This item will be\npermanently deleted."),
                                               i18n("KO/Pi Confirmation"),i18n("Delete"));
 }
 
 
 void CalendarView::edit_cut()
 {
     Event *anEvent=0;
 
     Incidence *incidence = mViewManager->currentView()->selectedIncidences().first();
 
     if (mViewManager->currentView()->isEventView()) {
         if ( incidence && incidence->typeID() == eventID ) {
             anEvent = static_cast<Event *>(incidence);
         }
     }
 
     if (!anEvent) {
         KNotifyClient::beep();
         return;
     }
     DndFactory factory( mCalendar );
     factory.cutIncidence(anEvent);
     changeEventDisplay(anEvent, KOGlobals::EVENTDELETED);
 }
 
 void CalendarView::edit_copy()
 {
     Event *anEvent=0;
 
     Incidence *incidence = mViewManager->currentView()->selectedIncidences().first();
 
     if (mViewManager->currentView()->isEventView()) {
         if ( incidence && incidence->typeID() == eventID ) {
             anEvent = static_cast<Event *>(incidence);
         }
     }
 
     if (!anEvent) {
         KNotifyClient::beep();
         return;
     }
     DndFactory factory( mCalendar );
     factory.copyIncidence(anEvent);
 }
 
 void CalendarView::edit_paste()
 {
     QDate date = mNavigator->selectedDates().first();
 
     DndFactory factory( mCalendar );
     Event *pastedEvent = (Event *)factory.pasteIncidence( date );
 
     changeEventDisplay( pastedEvent, KOGlobals::EVENTADDED );
 }
 void CalendarView::edit_global_options()
 {
     QString tz = KPimGlobalPrefs::instance()->mTimeZoneId;
     emit save();
     emit saveStopTimer();
     mDialogManager->showGlobalOptionsDialog();
     if ( tz != KPimGlobalPrefs::instance()->mTimeZoneId) {
         emit saveStopTimer();
         if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, i18n("The timezone has changed!\nShould the calendar be reloaded\nto apply timezone changes?\nPlease read Menu: Help->FAQ:\n\"How do I change the timezone?\"\nas well!"),
                                                  i18n("Timezone settings"),i18n("Reload"))) {
             qDebug("KO: TZ reload cancelled ");
+            mCalendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId);
             return;
         }
         qDebug("KO: Timezone change ");
         openCalendar( MainWindow::defaultFileName() );
         setModified(true);
     }
     else
         qDebug("KO: No tz change ");
 }
 void CalendarView::edit_options()
 {
     mDialogManager->showOptionsDialog();
 }
 
 
 void  CalendarView::slotSelectPickerDate( QDate  d)
 {
     mDateFrame->hide();
     if ( mDatePickerMode == 1 ) {
         mNavigator->slotDaySelect( d );
     } else  if ( mDatePickerMode == 2 ) {
         if ( mMoveIncidence->typeID() == todoID ) {
             Todo * to = (Todo *) mMoveIncidence;
             QTime tim;
             int len  = 0;
             if ( to->hasStartDate() &&  to->hasDueDate() )
                 len = to->dtStart().secsTo( to->dtDue());
             if ( to->hasDueDate() ) 
                 tim = to->dtDue().time();
             else {
                 tim = QTime ( 0,0,0 );
                 to->setFloats( true );
                 to->setHasDueDate( true );
             }
             QDateTime dt ( d,tim );
             to->setDtDue( dt );
 
             if ( to->hasStartDate() ) {
                 if ( len>0 ) 
                     to->setDtStart(to->dtDue().addSecs( -len ));
                 else
                     if (to->dtStart() > to->dtDue() )
                         to->setDtStart(to->dtDue().addDays( -3 ));
             }
             
             todoChanged( to );
         } else { 
             if ( mMoveIncidence->doesRecur() ) {
 #if 0 
                 // PENDING implement this
                 Incidence* newInc = mMoveIncidence->recreateCloneException( mMoveIncidenceOldDate );
                 mCalendar()->addIncidence( newInc ); 
                 if ( mMoveIncidence->typeID() == todoID )
                     emit  todoMoved((Todo*)mMoveIncidence,  KOGlobals::EVENTEDITED );
                 else
                     emit incidenceChanged(mMoveIncidence, KOGlobals::EVENTEDITED);
                 mMoveIncidence = newInc;
             
 #endif 
             }
             QTime tim = mMoveIncidence->dtStart().time(); 
             int secs = mMoveIncidence->dtStart().secsTo(  mMoveIncidence->dtEnd());
             QDateTime dt ( d,tim );
             mMoveIncidence->setDtStart( dt );
             ((Event*)mMoveIncidence)->setDtEnd( dt.addSecs( secs ) );
             changeEventDisplay((Event*)mMoveIncidence, KOGlobals::EVENTEDITED);
         }
         
         mMoveIncidence->setRevision( mMoveIncidence->revision()+1  );
     }
 }
 
 void CalendarView::removeCategories()
 {
     QPtrList<Incidence> incList  = mCalendar->rawIncidences(); 
     QStringList catList = KOPrefs::instance()->mCustomCategories;
     QStringList catIncList;
     QStringList newCatList;
     Incidence* inc = incList.first();
     int i;
     int count = 0;
     while ( inc ) {
         newCatList.clear();
         catIncList =  inc->categories() ;
         for( i = 0; i<   catIncList.count(); ++i ) {
             if ( catList.contains (catIncList[i]))
                 newCatList.append( catIncList[i] );
         }
         newCatList.sort();
         inc->setCategories( newCatList.join(",") );
         inc = incList.next();
     }
 }
 
 int CalendarView::addCategories()
 { 
     QPtrList<Incidence> incList  = mCalendar->rawIncidences(); 
     QStringList catList = KOPrefs::instance()->mCustomCategories;
     QStringList catIncList;
     Incidence* inc = incList.first();
     int i;
     int count = 0;
      while ( inc ) {
         catIncList = inc->categories() ;
         for( i = 0; i<   catIncList.count(); ++i ) {
             if ( !catList.contains (catIncList[i])) {
                 catList.append( catIncList[i] );
                 //qDebug("add cat %s ",  catIncList[i].latin1());
                 ++count;
             }
         }
         inc = incList.next();
     }
     catList.sort();
     KOPrefs::instance()->mCustomCategories = catList;
     return count;
 }
 
 void CalendarView::manageCategories()
 {
     KOCatPrefs* cp = new KOCatPrefs(); 
     cp->show();
     int w =cp->sizeHint().width() ;
     int h = cp->sizeHint().height() ;
     int dw = QApplication::desktop()->width();
     int dh = QApplication::desktop()->height();
     cp->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
     if ( !cp->exec() ) {
         delete cp;
         return;
     }
     int count = 0;
     if ( cp->addCat() ) {
         count = addCategories();
         if ( count ) {
             topLevelWidget()->setCaption(QString::number( count )+ i18n(" Categories added to list! "));
             writeSettings();
         } else
             topLevelWidget()->setCaption(QString::number( 0 )+ i18n(" Categories added to list! "));
     } else {
         removeCategories();
         updateView();
     }
     delete cp;
 }
 
 void CalendarView::beamIncidence(Incidence * Inc) 
 {
     QPtrList<Incidence> delSel ;
     delSel.append(Inc);
     beamIncidenceList( delSel );
 } 
 void CalendarView::beamCalendar() 
 {
     QPtrList<Incidence> delSel  = mCalendar->rawIncidences(); 
     //qDebug("beamCalendar()  ");
     beamIncidenceList( delSel );
 }
 void CalendarView::beamFilteredCalendar() 
 {
     QPtrList<Incidence> delSel  = mCalendar->incidences(); 
     //qDebug("beamFilteredCalendar()  ");
     beamIncidenceList( delSel );
 }
 void  CalendarView::beamIncidenceList(QPtrList<Incidence> delSel )
 {
     if ( beamDialog->exec () == QDialog::Rejected ) 
         return;
 #ifdef DESKTOP_VERSION
     QString fn =  locateLocal( "tmp", "kopibeamfile" );
 #else
     QString fn = "/tmp/kopibeamfile";
 #endif
     QString mes;
     bool createbup = true;
     if ( createbup ) {
         QString description = "\n";
         CalendarLocal* cal = new CalendarLocal();
         if ( beamDialog->beamLocal() )
             cal->setLocalTime();
         else
             cal->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId);
         Incidence *incidence = delSel.first();
         bool addText = false;
         if ( delSel.count() < 10 )
             addText = true;
         else {
             description.sprintf(i18n("  %d items?"),delSel.count() );
         }
         while ( incidence ) {
             Incidence *in = incidence->clone();
             if ( ! in->summary().isEmpty() ) {
                 in->setDescription("");
             } else {
                 in->setSummary( in->description().left(20));
                 in->setDescription("");
             }
             if ( addText )
                 description += in->summary() + "\n";
             cal->addIncidence( in );
             incidence = delSel.next();
         }
         if ( beamDialog->beamVcal() ) {
             fn += ".vcs";
             FileStorage storage( cal, fn, new VCalFormat );
             storage.save();
         } else {
             fn += ".ics";
             FileStorage storage( cal, fn, new ICalFormat( ) );
             storage.save();
         }
         delete cal;
         mes = i18n("KO/Pi: Ready for beaming");
         topLevelWidget()->setCaption(mes); 
         KApplication::convert2latin1( fn );
 #ifndef DESKTOP_VERSION
         Ir *ir = new Ir( this ); 
         connect( ir, SIGNAL( done( Ir * ) ), this, SLOT( beamDone( Ir * ) ) );
         ir->send( fn, description, "text/x-vCalendar" );
 #endif
     }
 }
 void  CalendarView::beamDone( Ir *ir )
 {
 #ifndef DESKTOP_VERSION
     delete ir;
 #endif
     topLevelWidget()->setCaption( i18n("KO/Pi: Beaming done.") ); 
     topLevelWidget()->raise();
 }
 
 void CalendarView::moveIncidence(Incidence * inc ) 
 {
     if ( !inc ) return;
     showDatePickerPopup(); 
     mDatePickerMode = 2;
     mMoveIncidence = inc ;
     QDate da;
     if ( mMoveIncidence->typeID() == todoID ) {
         Todo * to = (Todo *) mMoveIncidence;
             if ( to->hasDueDate() ) 
                 da = to->dtDue().date();
             else
                 da = QDate::currentDate();
     } else {
         da = mMoveIncidence->dtStart().date();
     }
     //PENDING set date for recurring incidence to date of recurrence
     //mMoveIncidenceOldDate;
     mDatePicker->setDate( da );
 }
 void CalendarView::showDatePickerPopup() 
 {
  if ( mDateFrame->isVisible() )
         mDateFrame->hide();
     else {
diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp
index aa30c52..3dfa344 100644
--- a/korganizer/kodialogmanager.cpp
+++ b/korganizer/kodialogmanager.cpp
@@ -1,368 +1,355 @@
 /*
   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.
 */
 
 #include <libkdepim/categoryeditdialog.h>
 
 #include "calendarview.h"
 #include "incomingdialog.h"
 #include "outgoingdialog.h"
 #include "koprefsdialog.h"
 #include "koeventeditor.h"
 #include "koprefs.h"
 #include "datenavigator.h"
 #include "kotodoeditor.h"
 #include "searchdialog.h"
 #include "filtereditdialog.h"
 #ifndef KORG_NOPLUGINS
 #include "plugindialog.h"
 #endif
 #ifndef KORG_NOARCHIVE
 #include "archivedialog.h"
 #endif
 
 #include "kconfig.h"
 #include "kodialogmanager.h"
 #include <kapplication.h>
 
 KODialogManager::KODialogManager( CalendarView *mainView ) :
   QObject(), mMainView( mainView )
 {
   mOutgoingDialog = 0;
   mIncomingDialog = 0;
   mOptionsDialog = 0;
   mSearchDialog = 0;
   mArchiveDialog = 0;
   mFilterEditDialog = 0;
   mPluginDialog = 0;
 
   // mCategoryEditDialog = new KPIM::CategoryEditDialog(KOPrefs::instance(),mMainView);
   //KOGlobals::fitDialogToScreen( mCategoryEditDialog );
 }
 
 KODialogManager::~KODialogManager()
 {
   delete mOutgoingDialog;
   delete mIncomingDialog;
   delete mOptionsDialog;
   delete mSearchDialog;
 #ifndef KORG_NOARCHIVE
   delete mArchiveDialog;
 #endif
   delete mFilterEditDialog;
 #ifndef KORG_NOPLUGINS
   delete mPluginDialog;
 #endif
 }
 
 OutgoingDialog *KODialogManager::outgoingDialog()
 {
   createOutgoingDialog();
   return mOutgoingDialog;
 }
 
 void KODialogManager::createOutgoingDialog()
 {
   if (!mOutgoingDialog) {
     mOutgoingDialog = new OutgoingDialog(mMainView->calendar(),mMainView);
     if (mIncomingDialog) mIncomingDialog->setOutgoingDialog(mOutgoingDialog);
     connect(mOutgoingDialog,SIGNAL(numMessagesChanged(int)),
             mMainView,SIGNAL(numOutgoingChanged(int)));
   }
 }
 
 void KODialogManager::showGlobalOptionsDialog( bool showSync )
 {
- if (!mOptionsDialog) {
-    mOptionsDialog = new KOPrefsDialog(0);
-    connect(mOptionsDialog,SIGNAL(configChanged()),
-            mMainView,SLOT(updateConfig()));
-  }
-  mOptionsDialog->readConfig();
-#ifndef DESKTOP_VERSION  
-  mOptionsDialog->showMaximized();
-#else
-  mOptionsDialog->show();
-#endif
-  if ( showSync )
-      mOptionsDialog->showSyncPage();
-  mOptionsDialog->exec();
-  delete mOptionsDialog;
-  mOptionsDialog = 0;
+    KPimPrefsGlobalDialog gc ( mMainView );
+    if ( showSync )
+        gc.showTZconfig();
+    gc.exec();
 }
 void KODialogManager::showOptionsDialog( bool showSync )
 {
    
   if (!mOptionsDialog) {
     mOptionsDialog = new KOPrefsDialog(mMainView);
     connect(mOptionsDialog,SIGNAL(configChanged()),
             mMainView,SLOT(updateConfig()));
   }
   mOptionsDialog->readConfig();
 #ifndef DESKTOP_VERSION  
   mOptionsDialog->showMaximized();
 #else
   mOptionsDialog->show();
 #endif
-  if ( showSync )
-      mOptionsDialog->showSyncPage();
+ 
   mOptionsDialog->exec();
   delete mOptionsDialog;
   mOptionsDialog = 0;
 }
 void KODialogManager::showSyncOptions()
 {
     showGlobalOptionsDialog( true );
 
 }
 void KODialogManager::showOutgoingDialog()
 {
   createOutgoingDialog();
   mOutgoingDialog->show();
   mOutgoingDialog->raise();
 }
 
 IncomingDialog *KODialogManager::incomingDialog()
 {
   createOutgoingDialog();
   if (!mIncomingDialog) {
     mIncomingDialog = new IncomingDialog(mMainView->calendar(),mOutgoingDialog,mMainView);
     connect(mIncomingDialog,SIGNAL(numMessagesChanged(int)),
             mMainView,SIGNAL(numIncomingChanged(int)));
     connect(mIncomingDialog,SIGNAL(calendarUpdated()),
             mMainView,SLOT(updateView()));
   }
   return mIncomingDialog;
 }
 
 void KODialogManager::createIncomingDialog()
 {
   createOutgoingDialog();
   if (!mIncomingDialog) {
     mIncomingDialog = new IncomingDialog(mMainView->calendar(),mOutgoingDialog,mMainView);
     connect(mIncomingDialog,SIGNAL(numMessagesChanged(int)),
             mMainView,SIGNAL(numIncomingChanged(int)));
     connect(mIncomingDialog,SIGNAL(calendarUpdated()),
             mMainView,SLOT(updateView()));
   }
 }
 
 void KODialogManager::showIncomingDialog()
 {
   createIncomingDialog();
   mIncomingDialog->show();
   mIncomingDialog->raise();
 }
 /*
 void KODialogManager::showCategoryEditDialog()
 {
   mCategoryEditDialog->show();
 }
 */
 void KODialogManager::hideSearchDialog()
 {
   if (mSearchDialog) 
       mSearchDialog->hide();
 }
 
 void KODialogManager::showSearchDialog()
 {
     if (!mSearchDialog) {
         mSearchDialog = new SearchDialog(mMainView->calendar(),mMainView); 
         KOListView * lview = mSearchDialog->listview();
 
         connect(lview, SIGNAL(showIncidenceSignal(Incidence *)),
                 mMainView, SLOT(showIncidence(Incidence *)));
         connect(lview, SIGNAL(editIncidenceSignal(Incidence *)),
                 mMainView, SLOT(editIncidence(Incidence *)));
         connect(lview, SIGNAL(deleteIncidenceSignal(Incidence *)),
                 mMainView, SLOT(deleteIncidence(Incidence *)));
         connect(lview, SIGNAL(cloneIncidenceSignal(Incidence *)),
                 mMainView, SLOT(cloneIncidence(Incidence *)));
         connect(lview, SIGNAL(beamIncidenceSignal(Incidence *)),
                 mMainView, SLOT(beamIncidence(Incidence *)));
         connect(lview, SIGNAL(moveIncidenceSignal(Incidence *)),
                 mMainView, SLOT(moveIncidence(Incidence *)));
         connect(lview, SIGNAL(beamIncidenceList(QPtrList<Incidence> )),
                 mMainView, SLOT(beamIncidenceList(QPtrList<Incidence> )));
 
         connect(mMainView, SIGNAL(configChanged()), mSearchDialog, SLOT(updateConfig()));
         connect(mMainView, SIGNAL(updateSearchDialog()), mSearchDialog, SLOT(updateList()));
         //  connect( lview, SIGNAL( incidenceSelected( Incidence * ) ),
         //       mMainView, SLOT( processMainViewSelection( Incidence * ) ) );  
 #ifndef DESKTOP_VERSION    
         mSearchDialog->setMaximumSize( QApplication::desktop()->size());
         mSearchDialog->showMaximized();
 #else
         KConfig *config = KOGlobals::config();
         config->setGroup("WidgetLayout");
         QStringList list;
         list = config->readListEntry("SearchLayout");
         int x,y,w,h;
         if ( ! list.isEmpty() ) {
             x = list[0].toInt();
             y = list[1].toInt();
             w = list[2].toInt();
             h = list[3].toInt();
             KApplication::testCoords( &x,&y,&w,&h );
             mSearchDialog->setGeometry(x,y,w,h);
        
         }
 
 #endif
     }
     // make sure the widget is on top again 
 #ifdef DESKTOP_VERSION    
     mSearchDialog->show();
 #else 
     mSearchDialog->setMaximumSize( QApplication::desktop()->size());
     mSearchDialog->showMaximized();
 #endif
     mSearchDialog->raiseAndSelect();
 }
 
 SearchDialog * KODialogManager::getSearchDialog()
 {
     return mSearchDialog;
 }
 void KODialogManager::showArchiveDialog()
 {
 #ifndef KORG_NOARCHIVE
   if (!mArchiveDialog) {
     mArchiveDialog = new ArchiveDialog(mMainView->calendar(),mMainView);
     connect(mArchiveDialog,SIGNAL(eventsDeleted()),
             mMainView,SLOT(updateView()));
   }
   mArchiveDialog->show();
   mArchiveDialog->raise();
 
   // Workaround.
   QApplication::restoreOverrideCursor();
 #endif
 }
 
 void KODialogManager::showFilterEditDialog(QPtrList<CalFilter> *filters)
 {
   if (!mFilterEditDialog) {
     mFilterEditDialog = new FilterEditDialog(filters,mMainView);
     connect(mFilterEditDialog,SIGNAL(filterChanged()),
             mMainView,SLOT(filterEdited()));
     
   }
 
 #ifndef DESKTOP_VERSION  
   mFilterEditDialog->showMaximized();
 #else
   mFilterEditDialog->show();
 #endif
   mFilterEditDialog->raise();
 }
 
 void KODialogManager::showPluginDialog()
 {
 #ifndef KORG_NOPLUGINS
   if (!mPluginDialog) {
     mPluginDialog = new PluginDialog(mMainView);
     connect(mPluginDialog,SIGNAL(configChanged()),
             mMainView,SLOT(updateConfig()));
   }
   mPluginDialog->show();
   mPluginDialog->raise();
 #endif
 }
 
 KOEventEditor *KODialogManager::getEventEditor()
 {
   KOEventEditor *eventEditor = new KOEventEditor( mMainView->calendar(),
                                                   mMainView );
 
   connect(eventEditor,SIGNAL(eventAdded(Event *)),
           mMainView,SLOT(eventAdded(Event *)));
   connect(eventEditor,SIGNAL(eventChanged(Event *)),
           mMainView,SLOT(eventChanged(Event *)));
   connect(eventEditor,SIGNAL(eventDeleted()),
           mMainView,SLOT(eventDeleted()));
   connect(eventEditor,SIGNAL(deleteAttendee(Incidence *)),
           mMainView,SLOT(schedule_cancel(Incidence *)));
   connect( eventEditor, SIGNAL(jumpToTime( const QDate  &)), 
            mMainView->dateNavigator(), SLOT( selectWeek( const QDate & ) ) );
   connect( eventEditor, SIGNAL( showAgendaView( bool)), 
            mMainView->viewManager(), SLOT(  showAgendaView( bool) ) );
 
   //  connect(mCategoryEditDialog,SIGNAL(categoryConfigChanged()),
   //      eventEditor,SLOT(updateCategoryConfig()));
   // connect(eventEditor,SIGNAL(editCategories()),
   //      mCategoryEditDialog,SLOT(show()));
   connect(eventEditor,SIGNAL(dialogClose(Incidence*)),
           mMainView,SLOT(dialogClosing(Incidence*)));
 
   //connect(mMainView,SIGNAL(closingDown()),eventEditor,SLOT(reject()));
 
 #ifndef DESKTOP_VERSION
   eventEditor->resize( QApplication::desktop()->width() -20, 100 );
 #endif
   return eventEditor;
 }
 
 KOTodoEditor *KODialogManager::getTodoEditor()
 {
   KOTodoEditor *todoEditor = new KOTodoEditor( mMainView->calendar(),
                                                mMainView );
 
   // connect(mCategoryEditDialog,SIGNAL(categoryConfigChanged()),
   //      todoEditor,SLOT(updateCategoryConfig()));
   //  connect(todoEditor,SIGNAL(editCategories()),mCategoryEditDialog,SLOT(show()));
 
   connect(todoEditor,SIGNAL(todoAdded(Todo *)),
           mMainView,SLOT(todoAdded(Todo *)));
   connect(todoEditor,SIGNAL(todoChanged(Todo *)),
           mMainView,SLOT(todoChanged(Todo *)));
   connect(todoEditor,SIGNAL(todoDeleted()),
           mMainView,SLOT(todoDeleted()));
   connect(todoEditor,SIGNAL(dialogClose(Incidence*)),
           mMainView,SLOT(dialogClosing(Incidence*)));
   connect( todoEditor, SIGNAL(jumpToTime( const QDate &)), 
            mMainView->dateNavigator(), SLOT( selectWeek( const QDate & ) ) );
   connect( todoEditor, SIGNAL( showAgendaView( bool)), 
            mMainView->viewManager(), SLOT(  showAgendaView( bool) ) );
   // connect(todoEditor,SIGNAL(deleteAttendee(Incidence *)),
   //      mMainView,SLOT(schedule_cancel(Incidence *)));
   //connect(mMainView,SIGNAL(closingDown()),todoEditor,SLOT(reject()));
 #ifndef DESKTOP_VERSION
   todoEditor->resize( QApplication::desktop()->width() -20, 100 );
 #endif
   return todoEditor;
 }
 
 void KODialogManager::updateSearchDialog()
 {
   if (mSearchDialog) mSearchDialog->updateView();
 }
 
 void KODialogManager::setDocumentId( const QString &id )
 {
   if (mOutgoingDialog) mOutgoingDialog->setDocumentId( id );
 }
 
 void KODialogManager::writeSettings( KConfig *config )
 {
     if (mSearchDialog)
         mSearchDialog->listview()->writeSettings(config,"SearchListView Layout");
 }
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 4b5b66a..b782bb1 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -1,595 +1,491 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qgroupbox.h>
 #include <qbuttongroup.h>
 #include <qlineedit.h>
 #include <qfont.h>
 #include <qslider.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qcombobox.h>
 #include <qvbox.h>
 #include <qhbox.h>
 #include <qregexp.h>
 #include <qspinbox.h>
 #include <qdatetime.h>
 #include <qcheckbox.h>
 #include <qradiobutton.h>
 #include <qpushbutton.h>
 #include <qstrlist.h>
 #include <qapplication.h>
 
 #include <kcolorbutton.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kfontdialog.h>
 #include <kfiledialog.h>
 #include <kmessagebox.h>
 #include <kcolordialog.h>
 #include <kiconloader.h>
 #include <kemailsettings.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
 
 #include <kurlrequester.h>
 #include <klineedit.h>
 
 #if defined(USE_SOLARIS)
 #include <sys/param.h>
 
 #define ZONEINFODIR    "/usr/share/lib/zoneinfo"
 #define INITFILE       "/etc/default/init"
 #endif
 
 #include "koprefs.h"
 
 #include "koprefsdialog.h"
 #include "kpimglobalprefs.h"
 
 
 KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
   KPrefsDialog(KOPrefs::instance(),parent,name,true)
 {
 
     setFont( KGlobalSettings::generalMaxFont() );
   setCaption( i18n("Preferences - some settings need a restart (nr)"));
   mCategoryDict.setAutoDelete(true);
 
   KGlobal::locale()->insertCatalogue("timezones");
   mSpacingHint = spacingHintSmall();
    mMarginHint = marginHintSmall();
 #ifndef DESKTOP_VERSION
   if ( QApplication::desktop()->height() == 480  )
       hideButtons();
 #endif
-  kdelibcfg = 0;
-  if ( !parent ) 
-  setupGlobalTab();
-  else {
+ 
   setupMainTab();
   // setupLocaleTab();
   //setupTimeZoneTab();
   setupTimeTab();
   //setupLocaleDateTab();
   setupFontsTab();
   setupColorsTab();
   setupViewsTab();
   //setupSyncTab();
   //setupSyncAlgTab();
   //setupPrinterTab();
   //setupGroupSchedulingTab();
   //setupGroupAutomationTab();
-  }
+  
 
 }
 
 
 KOPrefsDialog::~KOPrefsDialog()
 {
 }
 void KOPrefsDialog::setupGlobalTab() 
 {
-    //QFrame *topFrame = addPage(i18n("Global"),0,0);
-   kdelibcfg = new KDEPIMConfigWidget(  KPimGlobalPrefs::instance(), this, "KCMKdeLibConfig" );
-   setMainWidget( kdelibcfg );
-   setCaption( i18n("KDE-Pim Global Settings"));
-
+   
 
 } 
 void KOPrefsDialog::setupLocaleDateTab()
 {
 #if 0
 QFrame *topFrame = addPage(i18n("Date Format"),0,0);
    QGridLayout *topLayout = new QGridLayout(topFrame,3,2);
    topLayout->setSpacing(mSpacingHint);
    topLayout->setMargin(mMarginHint);  
    int iii = 0;
 
    
    KPrefsDialogWidRadios *syncPrefsGroup =
        addWidRadios(i18n("Date Format:"),&(KOPrefs::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( 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;
 #endif
 
 }
 
 void  KOPrefsDialog::setupLocaleTab()
 {
 #if 0
  QFrame *topFrame = addPage(i18n("Locale"),0,0);
    QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
    topLayout->setSpacing(mSpacingHint);
    topLayout->setMargin(mMarginHint);  
    int iii = 0;
  KPrefsDialogWidRadios *syncPrefsGroup =
       addWidRadios(i18n("Language:(needs restart)"),&(KOPrefs::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( syncPrefsGroup->groupBox(),iii,iii,0,1);
    ++iii;   
  
    syncPrefsGroup =
        addWidRadios(i18n("Time Format(nr):"),&(KOPrefs::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;   
    KPrefsDialogWidBool *sb;
   if ( QApplication::desktop()->width() <  300 ) {
        sb =
            addWidBool(i18n("Week starts on Sunday"),
                       &(KOPrefs::instance()->mWeekStartsOnSunday),topFrame);
        topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
        ++iii;   
        sb =
            addWidBool(i18n("Use short date in (WN/E) view"),
                       &(KOPrefs::instance()->mShortDateInViewer),topFrame);
        topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
    }
    else {
        QWidget * hb = new QWidget( topFrame );
        QHBoxLayout  *hbLayout = new QHBoxLayout(hb);
        sb =
            addWidBool(i18n("Week starts on Sunday"),
                       &(KOPrefs::instance()->mWeekStartsOnSunday),hb);
        hbLayout->addWidget(sb->checkBox()  );
        sb =
            addWidBool(i18n("Use short date in (WN/E) view"),
                       &(KOPrefs::instance()->mShortDateInViewer),hb);
        hbLayout->addWidget(sb->checkBox()  );
        topLayout->addMultiCellWidget(hb, iii,iii,0,1);
 
    }
   //   KPrefsDialogWidBool *sb;  //#ifndef DESKTOP_VERSION
 #if 0
   ++iii;
   sb =
            addWidBool(i18n("Quick load/save (w/o Unicode)"), 
                       &(KOPrefs::instance()->mUseQuicksave),topFrame);
        topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
 #endif
 #endif
 }
-void KOPrefsDialog::showSyncPage()
-{
-    // showPage ( 0 ) ;
-    kdelibcfg->showTimeZoneTab() ;
-
-}
-void KOPrefsDialog::setupSyncAlgTab()
-{
-#if 0
-  QLabel * lab;
-   QFrame *topFrame = addPage(i18n("Sync Prefs"),0,0);
-   mSetupSyncAlgTab = topFrame;
-   QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
-   topLayout->setSpacing(mSpacingHint);
-   topLayout->setMargin(mMarginHint);  
-   int iii = 0;  
-   
-   KPrefsDialogWidBool *sb =
-       addWidBool(i18n("Ask for preferences before syncing"),
-                  &(KOPrefs::instance()->mAskForPreferences),topFrame);
-   topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
-
-   ++iii;
-
-   KPrefsDialogWidRadios *syncPrefsGroup =
-      addWidRadios(i18n("Sync preferences:"),&(KOPrefs::instance()->mSyncAlgoPrefs),
-                   topFrame);
-   syncPrefsGroup->addRadio(i18n("Take local entry on conflict"));
-   syncPrefsGroup->addRadio(i18n("Take remote entry on conflict"));
-   syncPrefsGroup->addRadio(i18n("Take newest entry on conflict"));
-   syncPrefsGroup->addRadio(i18n("Ask for every entry on conflict"));
-   syncPrefsGroup->addRadio(i18n("Force take local entry always"));
-   syncPrefsGroup->addRadio(i18n("Force take remote entry always"));
-   topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1);
-   ++iii;   
-  sb =
-       addWidBool(i18n("Show summary after syncing"),
-                  &(KOPrefs::instance()->mShowSyncSummary),topFrame);
-   topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
-
-   ++iii;
-#endif
-
-
-
-}
-
-
-void KOPrefsDialog::setupSyncTab()
-{
-#if 0
-    QLabel * lab;
-   QFrame *topFrame = addPage(i18n("Sync Network"),0,0);
-   QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
-   topLayout->setSpacing(mSpacingHint);
-   topLayout->setMargin(mMarginHint);
-   lab = new QLabel(i18n("Remote syncing (via ssh/scp)\nnetwork settings "), topFrame);
-   int iii = 0;
-   topLayout->addMultiCellWidget(lab , iii,iii,0,1);
-   ++iii;
-
-   mRemoteIPEdit = new QLineEdit(topFrame);
-   lab = new QLabel(mRemoteIPEdit, i18n("Remote IP:"), topFrame);
-   topLayout->addWidget(lab ,iii,0);
-   topLayout->addWidget(mRemoteIPEdit,iii,1);
-   ++iii;
-   mRemoteUser = new QLineEdit(topFrame);
-   lab = new QLabel(mRemoteUser, i18n("Remote user:"), topFrame);
-   topLayout->addWidget(lab ,iii,0);
-   topLayout->addWidget(mRemoteUser, iii,1); 
-   ++iii;
-
-   mRemoteFile = new QLineEdit(topFrame);
-   lab = new QLabel(mRemoteFile, i18n("Remote file:"), topFrame);
-   topLayout->addWidget(lab ,iii,0);
-   topLayout->addWidget(mRemoteFile,iii,1);
-   ++iii;
- 
-   mLocalTempFile = new QLineEdit(topFrame);
-   lab = new QLabel(mLocalTempFile, i18n("Local temp file:"), topFrame);
-   topLayout->addWidget(lab ,iii,0);
-   topLayout->addWidget(mLocalTempFile,iii,1);
-   ++iii;
- 
-   KPrefsDialogWidBool *wb =
-       addWidBool(i18n("Write back synced file"),
-                  &(KOPrefs::instance()->mWriteBackFile),topFrame);
-   topLayout->addMultiCellWidget(wb->checkBox(), iii,iii,0,1);
-   ++iii;
-   wb =
-       addWidBool(i18n("Write back existing entries only"),
-                  &(KOPrefs::instance()->mWriteBackExistingOnly),topFrame);
-   topLayout->addMultiCellWidget(wb->checkBox(), iii,iii,0,1);
-   ++iii;
- 
-#endif
-}
 
 void KOPrefsDialog::setupMainTab()
 {
     QFrame *topFrame = addPage(i18n("General"),0,0);
     // DesktopIcon("identity",KIcon::SizeMedium));
 
   QGridLayout *topLayout = new QGridLayout(topFrame,5,2);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
 
  //  KPrefsDialogWidBool *emailControlCenter =
 //       addWidBool(i18n("&Use email settings from Control Center"),
 //                  &(KOPrefs::instance()->mEmailControlCenter),topFrame);
 //   topLayout->addMultiCellWidget(emailControlCenter->checkBox(),0,0,0,1);
   // connect(emailControlCenter->checkBox(),SIGNAL(toggled(bool)),
   //      SLOT(toggleEmailSettings(bool)));
 
   mNameEdit = new QLineEdit(topFrame);
   mNameLabel = new QLabel(mNameEdit, i18n("Full &name:"), topFrame);
   topLayout->addWidget(mNameLabel,0,0);
   topLayout->addWidget(mNameEdit,0,1);
 
   mEmailEdit = new QLineEdit(topFrame);
   mEmailLabel = new QLabel(mEmailEdit, i18n("E&mail address:"),topFrame);
   topLayout->addWidget(mEmailLabel,1,0);
   topLayout->addWidget(mEmailEdit,1,1);
   KPrefsDialogWidBool *wb;
   
 
   
   KPrefsDialogWidBool *widbool = addWidBool(i18n("Full menu bar(nr)"),
              &(KOPrefs::instance()->mShowFullMenu),topFrame);
   topLayout->addMultiCellWidget(  widbool->checkBox(), 2,2,0,1); 
   
   
   widbool = addWidBool(i18n("Mini icons in toolbar(nr)"),
              &(KOPrefs::instance()->mToolBarMiniIcons),topFrame);
   topLayout->addMultiCellWidget(  widbool->checkBox(), 3,3,0,1); 
 
 
  KPrefsDialogWidBool *verticalScreen =
       addWidBool(i18n("Show vertical screen (Needs restart)"),
                  &(KOPrefs::instance()->mVerticalScreen),topFrame);
   //topLayout->addWidget(verticalScreen->checkBox(),ii++,0);
   topLayout->addMultiCellWidget(verticalScreen->checkBox(),4,4,0,1);
 
   
   int iii = 5;
   widbool = addWidBool(i18n("Block popup until mouse button release"),
              &(KOPrefs::instance()->mBlockPopupMenu),topFrame);
   topLayout->addMultiCellWidget(  widbool->checkBox(), iii,iii,0,1); 
   ++iii;
   QHBox *dummy = new QHBox(topFrame);
   new QLabel(i18n("Days in Next-X-Days:"),dummy);
   mNextXDaysSpin = new QSpinBox(2,14,1,dummy);
  
   topLayout->addMultiCellWidget(dummy,iii,iii,0,1);
 
   ++iii;
  
 
   // KPrefsDialogWidBool *bcc =
 //       addWidBool(i18n("Send copy to owner when mailing events"),
 //                  &(KOPrefs::instance()->mBcc),topFrame);
 //   topLayout->addMultiCellWidget(bcc->checkBox(),4,4,0,1);
 
 
   // QGroupBox *autoSaveGroup = new QGroupBox(1,Horizontal,i18n("Auto-Save"),  topFrame);
   //topLayout->addMultiCellWidget(autoSaveGroup,6,6,0,1);
 
   // addWidBool(i18n("Enable automatic saving of calendar"),
   //         &(KOPrefs::instance()->mAutoSave),autoSaveGroup);
 
   QHBox *intervalBox = new QHBox(topFrame);
   // intervalBox->setSpacing(mSpacingHint);
   topLayout->addMultiCellWidget(intervalBox,iii,iii,0,1);
   ++iii;
   QLabel *autoSaveIntervalLabel = new QLabel(i18n("Auto save delay in minutes:"),intervalBox);
   mAutoSaveIntervalSpin = new QSpinBox(0,500,1,intervalBox);
   autoSaveIntervalLabel->setBuddy(mAutoSaveIntervalSpin); 
   /*
   QHBox * agendasize = new QHBox ( topFrame );
   
   new QLabel (i18n("AllDayAgenda Height:"), agendasize );
   
 
   mHourSizeSlider = new QSlider(24,47,1,24,Horizontal,agendasize);
   topLayout->addMultiCellWidget(agendasize,7,7,0,1);
   */
   
 
   KPrefsDialogWidBool *ask =
     addWidBool(i18n("Ask for quit when closing KO/Pi"),
                &(KOPrefs::instance()->mAskForQuit),topFrame);
   topLayout->addMultiCellWidget(ask->checkBox(),iii,iii,0,1);
   ++iii;
  
 
   /*
   KPrefsDialogWidBool *confirmCheck =
       addWidBool(i18n("Confirm &deletes"),&(KOPrefs::instance()->mConfirm),
                  topFrame);
   topLayout->addMultiCellWidget(confirmCheck->checkBox(),7,7,0,1);
 
 
   mEnableGroupScheduling =
       addWidBool(i18n("Enable group scheduling"),
                  &(KOPrefs::instance()->mEnableGroupScheduling),topFrame);
   topLayout->addWidget(mEnableGroupScheduling->checkBox(),8,0);
   connect(mEnableGroupScheduling->checkBox(),SIGNAL(clicked()),
           SLOT(warningGroupScheduling()));
 
   mEnableProjectView =
       addWidBool(i18n("Enable project view"),
                  &(KOPrefs::instance()->mEnableProjectView),topFrame);
   topLayout->addWidget(mEnableProjectView->checkBox(),9,0);
   connect(mEnableProjectView->checkBox(),SIGNAL(clicked()),
           SLOT(warningProjectView()));
 
   // Can't be disabled anymore
   mEnableGroupScheduling->checkBox()->hide();
 
   // Disable setting, because this feature now becomes stable
   mEnableProjectView->checkBox()->hide();
 
   KPrefsDialogWidRadios *defaultFormatGroup =
       addWidRadios(i18n("Default Calendar Format"),
                    &(KOPrefs::instance()->mDefaultFormat),topFrame);
   defaultFormatGroup->addRadio(i18n("vCalendar"));
   defaultFormatGroup->addRadio(i18n("iCalendar"));
 
   topLayout->addMultiCellWidget(defaultFormatGroup->groupBox(),10,10,0,1);
 
   // Default format unconditionally is iCalendar
   defaultFormatGroup->groupBox()->hide();
 
   KPrefsDialogWidRadios *mailClientGroup =
       addWidRadios(i18n("Mail Client"),&(KOPrefs::instance()->mMailClient),
                    topFrame);
   mailClientGroup->addRadio(i18n("KMail"));
   mailClientGroup->addRadio(i18n("Sendmail"));
   topLayout->addMultiCellWidget(mailClientGroup->groupBox(),11,11,0,1);
 
   KPrefsDialogWidBool *htmlsave =
       addWidBool(i18n("Export to HTML with every save"),&(KOPrefs::instance()->mHtmlWithSave),
                  topFrame);
   topLayout->addMultiCellWidget(htmlsave->checkBox(),12,12,0,1);
 
   KPrefsDialogWidRadios *destinationGroup =
       addWidRadios(i18n("New Events/Todos should"),&(KOPrefs::instance()->mDestination),
                    topFrame);
   destinationGroup->addRadio(i18n("be added to the standard resource"));
   destinationGroup->addRadio(i18n("be asked which resource to use"));
   topLayout->addMultiCellWidget(destinationGroup->groupBox(),13,13,0,1);
 
   topLayout->setRowStretch(14,1);
   */
 }
 
 
 void KOPrefsDialog::setupTimeTab()
 {
     QFrame *topFrame = addPage(i18n("Time"),0,0);
     // DesktopIcon("clock",KIcon::SizeMedium));
 
   QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
  
   QHBox *dummy = new QHBox(topFrame);
   KPrefsDialogWidTime *dayBegins =
       addWidTime(i18n("Day begins at:"),&(KOPrefs::instance()->mDayBegins),
                dummy);
   //topLayout->addWidget(dayBegins->label(),2,0);
   
   //topLayout->addWidget(dayBegins->spinBox(),2,1);
   topLayout->addMultiCellWidget(dummy,0,0,0,1);
 
   topLayout->addWidget(new QLabel(i18n("Default appointment time:"),
                        topFrame),1,0);
   mStartTimeSpin = new QSpinBox(0,23,1,topFrame);
   mStartTimeSpin->setSuffix(":00");
   topLayout->addWidget(mStartTimeSpin,1,1);
 
   topLayout->addWidget(new QLabel(i18n("Def. duration of new app.:"),
                        topFrame),2,0);
   mDefaultDurationSpin = new QSpinBox(0,23,1,topFrame);
   mDefaultDurationSpin->setSuffix(":00");
   topLayout->addWidget(mDefaultDurationSpin,2,1);
 
   QStringList alarmList;
   alarmList << i18n("1 minute") << i18n("5 minutes") << i18n("10 minutes")
             << i18n("15 minutes") << i18n("30 minutes")<< i18n("1 hour")<< i18n("3 hours")  << i18n("24 hours") ;
   topLayout->addWidget(new QLabel(i18n("Default alarm time:"),topFrame),
                        3,0);
   mAlarmTimeCombo = new QComboBox(topFrame);
   mAlarmTimeCombo->insertStringList(alarmList);
   topLayout->addWidget(mAlarmTimeCombo,3,1);
 
 
   QGroupBox *workingHoursGroup = new QGroupBox(1,Horizontal,
                                                i18n("Working Hours"),
                                                topFrame);
   topLayout->addMultiCellWidget(workingHoursGroup,4,4,0,1);
   workingHoursGroup->layout()->setSpacing( 0 );
   workingHoursGroup->layout()->setMargin( 4 );
   QHBox *workStartBox = new QHBox(workingHoursGroup);
   // workStartBox->setMargin( 0 );
   addWidTime(i18n("Daily starting hour:"),
              &(KOPrefs::instance()->mWorkingHoursStart),workStartBox);
 
   QHBox *workEndBox = new QHBox(workingHoursGroup);
   //workEndBox->setMargin( 0 );
   addWidTime(i18n("Daily ending hour:"),
              &(KOPrefs::instance()->mWorkingHoursEnd),workEndBox);
   QVBox *excludeBox  = new QVBox(workingHoursGroup);
   //excludeBox->setMargin( 0 );
   addWidBool(i18n("Exclude holidays"),
              &(KOPrefs::instance()->mExcludeHolidays),excludeBox);
 
   addWidBool(i18n("Exclude Saturdays"),
              &(KOPrefs::instance()->mExcludeSaturdays),excludeBox);
 
 //   KPrefsDialogWidBool *marcusBainsShowSeconds = addWidBool(i18n("Show seconds on Marcus Bains line"),
         //      &(KOPrefs::instance()->mMarcusBainsShowSeconds),
         //      topFrame);
 //   topLayout->addWidget(marcusBainsShowSeconds->checkBox(),5,0);
 
   // topLayout->setRowStretch(6,1);
 }
 
 
 void KOPrefsDialog::setupViewsTab()
 {
 
     QFrame *topFrame = addPage(i18n("Views"),0,0);
     //  DesktopIcon("viewmag",KIcon::SizeMedium));
 
   QGridLayout *topLayout = new QGridLayout(topFrame,6,1);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
 
 //   QBoxLayout *dayBeginsLayout = new QHBoxLayout;
 //   topLayout->addLayout(dayBeginsLayout,0,0);
 
 //   KPrefsDialogWidTime *dayBegins =
 //     addWidTime(i18n("Day begins at:"),&(KOPrefs::instance()->mDayBegins),
 //                topFrame);
 //   dayBeginsLayout->addWidget(dayBegins->label());
 //   dayBeginsLayout->addStretch(1);
 //   dayBeginsLayout->addWidget(dayBegins->spinBox());
 
 //   QBoxLayout *nextDaysLayout = new QHBoxLayout;
 //   topLayout->addLayout(nextDaysLayout,1,0);
 //   nextDaysLayout->addWidget(new QLabel(i18n("Days to show in Next-X-Days view:"),topFrame));
 //   mNextXDaysSpin = new QSpinBox(2,14,1,topFrame);
@@ -1207,549 +1103,395 @@ void KOPrefsDialog::setupFontsTab()
 
   topLayout->setColStretch(1,1);
   topLayout->setRowStretch(4,1);
 
 
 
 
 }
 
 void KOPrefsDialog::setupColorsTab()
 {
     QFrame *topFrame = addPage(i18n("Colors"),0,0);
     //  DesktopIcon("colorize",KIcon::SizeMedium));
 
   QGridLayout *topLayout = new QGridLayout(topFrame,5,2);
   // topLayout->setSpacing(mSpacingHint);
   // topLayout->setMargin(mMarginHint);
 
   topLayout->setSpacing(2);
   topLayout->setMargin(3);
 
   int ii = 1;
   QGroupBox *categoryGroup ;
 
   categoryGroup = new QGroupBox(1,Vertical,i18n("Categories"),
                                            topFrame);
   topLayout->addMultiCellWidget(categoryGroup,0,0,0,1);
 
   mCategoryCombo = new QComboBox(categoryGroup);
   mCategoryCombo->insertStringList(KOPrefs::instance()->mCustomCategories);
   connect(mCategoryCombo,SIGNAL(activated(int)),SLOT(updateCategoryColor()));
    
   mCategoryButton = new KColorButton(categoryGroup);
   connect(mCategoryButton,SIGNAL(changed(const QColor &)),SLOT(setCategoryColor()));
   updateCategoryColor();
 
 
   // Holiday Color
 
   KPrefsDialogWidColor *holidayColor =
       addWidColor(i18n("Holiday color:"),
                   &(KOPrefs::instance()->mHolidayColor),topFrame);
   topLayout->addWidget(holidayColor->label(),ii,0);
   topLayout->addWidget(holidayColor->button(),ii++,1);
 
   // Highlight Color
   KPrefsDialogWidColor *highlightColor =
       addWidColor(i18n("Highlight color:"),
                   &(KOPrefs::instance()->mHighlightColor),topFrame);
   topLayout->addWidget(highlightColor->label(),ii,0);
   topLayout->addWidget(highlightColor->button(),ii++,1);
 
   // Event color
   KPrefsDialogWidColor *eventColor =
       addWidColor(i18n("Default event color:"),
                   &(KOPrefs::instance()->mEventColor),topFrame);
   topLayout->addWidget(eventColor->label(),ii,0);
   topLayout->addWidget(eventColor->button(),ii++,1);
   eventColor =
       addWidColor(i18n("Default todo done color:"),
                   &(KOPrefs::instance()->mTodoDoneColor),topFrame);
   topLayout->addWidget(eventColor->label(),ii,0);
   topLayout->addWidget(eventColor->button(),ii++,1);
 
 
   // agenda view background color
   KPrefsDialogWidColor *agendaBgColor =
       addWidColor(i18n("Agenda view background color:"),
                   &(KOPrefs::instance()->mAgendaBgColor),topFrame);
   topLayout->addWidget(agendaBgColor->label(),ii,0);
   topLayout->addWidget(agendaBgColor->button(),ii++,1);
 
   // working hours color
   KPrefsDialogWidColor *workingHoursColor =
       addWidColor(i18n("Working hours color:"),
                   &(KOPrefs::instance()->mWorkingHoursColor),topFrame);
   topLayout->addWidget(workingHoursColor->label(),ii,0);
   topLayout->addWidget(workingHoursColor->button(),ii++,1);
 
   KPrefsDialogWidBool *sb =
            addWidBool(i18n("Use colors for application:"),
                       &(KOPrefs::instance()->mUseAppColors),topFrame);
        topLayout->addMultiCellWidget(sb->checkBox(), ii, ii, 0,1 );
 
        ii++;
     KPrefsDialogWidColor *   workingHoursColor1 =
            addWidColor(i18n("Buttons, menus, etc.:"),
                        &(KOPrefs::instance()->mAppColor1),topFrame);
        topLayout->addWidget(workingHoursColor1->label(),ii,0);
        topLayout->addWidget(workingHoursColor1->button(),ii++,1);
        
       KPrefsDialogWidColor *   workingHoursColor2 =
            addWidColor(i18n("Frames, labels, etc.:"),
                        &(KOPrefs::instance()->mAppColor2),topFrame);
        topLayout->addWidget(workingHoursColor2->label(),ii,0);
        topLayout->addWidget(workingHoursColor2->button(),ii++,1);
 
 
   
 }
 
 void KOPrefsDialog::setCategoryColor()
 {
   mCategoryDict.replace(mCategoryCombo->currentText(), new QColor(mCategoryButton->color()));
 }
 
 void KOPrefsDialog::updateCategoryColor()
 {
   QString cat = mCategoryCombo->currentText();
   QColor *color = mCategoryDict.find(cat);
   if (!color) {
     color = KOPrefs::instance()->categoryColor(cat);
   }
   if (color) {
     mCategoryButton->setColor(*color);
   }
 }
 
 void KOPrefsDialog::setupPrinterTab()
 {
   mPrinterTab = addPage(i18n("Printing"),0,
                         DesktopIcon("fileprint",KIcon::SizeMedium));
 
   QGridLayout *topLayout = new QGridLayout(mPrinterTab,5,2);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
 
   topLayout->setRowStretch(4,1);
 }
 
 void KOPrefsDialog::setupGroupSchedulingTab()
 {
 #if 0
   QFrame *topFrame  = addPage(i18n("Group Scheduling"),0,
                               DesktopIcon("personal",KIcon::SizeMedium));
 
   QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
 
 #if 0
   KPrefsDialogWidRadios *schedulerGroup =
       addWidRadios(i18n("Scheduler Mail Client"),&(KOPrefs::instance()->mIMIPScheduler),
                    topFrame);
   schedulerGroup->addRadio("Dummy"); // Only for debugging
   schedulerGroup->addRadio(i18n("Mail client"));
 
   topLayout->addMultiCellWidget(schedulerGroup->groupBox(),0,0,0,1);
 #endif
 
   KPrefsDialogWidRadios *sendGroup =
       addWidRadios(i18n("Scheduler Mails Should Be"),&(KOPrefs::instance()->mIMIPSend),
                    topFrame);
   sendGroup->addRadio(i18n("Send to outbox"));
   sendGroup->addRadio(i18n("Send directly"));
 
   topLayout->addMultiCellWidget(sendGroup->groupBox(),1,1,0,1);
 
   topLayout->addMultiCellWidget(new QLabel(i18n("Additional email addresses:"),topFrame),2,2,0,1);
   mAMails = new QListView(topFrame);
   mAMails->addColumn(i18n("Email"),300);
   topLayout->addMultiCellWidget(mAMails,3,3,0,1);
 
   topLayout->addWidget(new QLabel(i18n("Additional email address:"),topFrame),4,0);
   aEmailsEdit = new QLineEdit(topFrame);
   aEmailsEdit->setEnabled(false);
   topLayout->addWidget(aEmailsEdit,4,1);
 
   QPushButton *add = new QPushButton(i18n("New"),topFrame,"new");
   topLayout->addWidget(add,5,0);
   QPushButton *del = new QPushButton(i18n("Remove"),topFrame,"remove");
   topLayout->addWidget(del,5,1);
 
   //topLayout->setRowStretch(2,1);
   connect(add, SIGNAL( clicked() ), this, SLOT(addItem()) );
   connect(del, SIGNAL( clicked() ), this, SLOT(removeItem()) );
   connect(aEmailsEdit,SIGNAL( textChanged(const QString&) ), this,SLOT(updateItem()));
   connect(mAMails,SIGNAL(selectionChanged(QListViewItem *)),SLOT(updateInput()));
 #endif
 }
 
 void KOPrefsDialog::setupGroupAutomationTab()
 {
     return;
   QFrame *topFrame  = addPage(i18n("Group Automation"),0,
                               DesktopIcon("personal",KIcon::SizeMedium));
 
   QGridLayout *topLayout = new QGridLayout(topFrame,5,1);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
 
   KPrefsDialogWidRadios *autoRefreshGroup =
       addWidRadios(i18n("Auto Send Refresh"),
                    &(KOPrefs::instance()->mIMIPAutoRefresh),topFrame);
   autoRefreshGroup->addRadio(i18n("Never"));
   autoRefreshGroup->addRadio(i18n("If attendee is in addressbook"));
   //autoRefreshGroup->addRadio(i18n("selected emails"));
   topLayout->addMultiCellWidget(autoRefreshGroup->groupBox(),0,0,0,0);
 
   KPrefsDialogWidRadios *autoInsertGroup =
       addWidRadios(i18n("Auto Insert IMIP Replies"),
                    &(KOPrefs::instance()->mIMIPAutoInsertReply),topFrame);
   autoInsertGroup->addRadio(i18n("Never"));
   autoInsertGroup->addRadio(i18n("If attendee is in addressbook"));
   //autoInsertGroup->addRadio(i18n("selected emails"));
   topLayout->addMultiCellWidget(autoInsertGroup->groupBox(),1,1,0,0);
 
   KPrefsDialogWidRadios *autoRequestGroup =
       addWidRadios(i18n("Auto Insert IMIP Requests"),
                    &(KOPrefs::instance()->mIMIPAutoInsertRequest),topFrame);
   autoRequestGroup->addRadio(i18n("Never"));
   autoRequestGroup->addRadio(i18n("If organizer is in addressbook"));
   //autoInsertGroup->addRadio(i18n("selected emails"));
   topLayout->addMultiCellWidget(autoRequestGroup->groupBox(),2,2,0,0);
 
   KPrefsDialogWidRadios *autoFreeBusyGroup =
       addWidRadios(i18n("Auto Send FreeBusy Information"),
                    &(KOPrefs::instance()->mIMIPAutoFreeBusy),topFrame);
   autoFreeBusyGroup->addRadio(i18n("Never"));
   autoFreeBusyGroup->addRadio(i18n("If requested from an email in addressbook"));
   //autoFreeBusyGroup->addRadio(i18n("selected emails"));
   topLayout->addMultiCellWidget(autoFreeBusyGroup->groupBox(),3,3,0,0);
 
   KPrefsDialogWidRadios *autoFreeBusyReplyGroup =
       addWidRadios(i18n("Auto Save FreeBusy Replies"),
                    &(KOPrefs::instance()->mIMIPAutoFreeBusyReply),topFrame);
   autoFreeBusyReplyGroup->addRadio(i18n("Never"));
   autoFreeBusyReplyGroup->addRadio(i18n("If attendee is in addressbook"));
   //autoFreeBusyGroup->addRadio(i18n("selected emails"));
   topLayout->addMultiCellWidget(autoFreeBusyReplyGroup->groupBox(),4,4,0,0);
 }
 
 void KOPrefsDialog::showPrinterTab()
 {
   showPage(pageIndex(mPrinterTab));
 }
 
 
 void KOPrefsDialog::setCombo(QComboBox *combo, const QString & text,
                                const QStringList *tags)
 {
   if (tags) {
     int i = tags->findIndex(text);
     if (i > 0) combo->setCurrentItem(i);
   } else {
     for(int i=0;i<combo->count();++i) {
       if (combo->text(i) == text) {
         combo->setCurrentItem(i);
         break;
       }
     }
   }
 }
 
 void KOPrefsDialog::usrReadConfig()
 {
-    if ( kdelibcfg )
-        kdelibcfg->readConfig();
-    else {
+  
   mNameEdit->setText(KOPrefs::instance()->fullName());
   mEmailEdit->setText(KOPrefs::instance()->email());
 
   mAutoSaveIntervalSpin->setValue(KOPrefs::instance()->mAutoSaveInterval);
-  // QDate current ( 2001, 1,1);
-  //mStartDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingStart-1));
-  //mEndDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingEnd-1));
-  //setCombo(mTimeZoneCombo,i18n(KOPrefs::instance()->mTimeZoneId));
-  //mTimezoneOffsetSpin->setValue( KOPrefs::instance()->mTimeZoneOffset);
+ 
   mStartTimeSpin->setValue(KOPrefs::instance()->mStartTime);
   mDefaultDurationSpin->setValue(KOPrefs::instance()->mDefaultDuration);
   mAlarmTimeCombo->setCurrentItem(KOPrefs::instance()->mAlarmTime);
-  // if  (KOPrefs::instance()->mAllDaySize > 47  )
-  //   KOPrefs::instance()->mAllDaySize = KOPrefs::instance()->mAllDaySize/2;
-  //mHourSizeSlider->setValue(KOPrefs::instance()->mAllDaySize);
 
   mNextXDaysSpin->setValue(KOPrefs::instance()->mNextXDays);
   mWhatsNextSpin->setValue(KOPrefs::instance()->mWhatsNextDays);
   mPrioSpin->setValue(KOPrefs::instance()->mWhatsNextPrios);
   // mAMails->clear();
  //  for ( QStringList::Iterator it = KOPrefs::instance()->mAdditionalMails.begin();
 //             it != KOPrefs::instance()->mAdditionalMails.end(); ++it ) {
 //     QListViewItem *item = new QListViewItem(mAMails);
 //     item->setText(0,*it);
 //     mAMails->insertItem(item);
 //   }
 
-  // mRemoteIPEdit->setText(KOPrefs::instance()->mRemoteIP);
-  //mRemoteUser->setText(KOPrefs::instance()->mRemoteUser);
-  //mRemotePassWd->setText(KOPrefs::instance()->mRemotePassWd);
-  //mRemoteFile->setText(KOPrefs::instance()->mRemoteFile);
-
   //that soundmLocalTempFile->setText(KOPrefs::instance()->mLocalTempFile);
   mDefaultAlarmFile->setText(KOPrefs::instance()->mDefaultAlarmFile);
-  //QString dummy = KOPrefs::instance()->mUserDateFormatLong;
-  //mUserDateFormatLong->setText(dummy.replace( QRegExp("K"), QString(",") ));
-  //dummy = KOPrefs::instance()->mUserDateFormatShort;
-  //mUserDateFormatShort->setText(dummy.replace( QRegExp("K"), QString(",") ));
   updateCategories();
   mAlarmPlayBeeps->setValue(KOPrefs::instance()->mAlarmPlayBeeps );
   mAlarmSuspendTime->setValue(KOPrefs::instance()->mAlarmSuspendTime );
   mAlarmSuspendCount->setValue(KOPrefs::instance()->mAlarmSuspendCount );
   mAlarmBeepInterval->setValue(KOPrefs::instance()->mAlarmBeepInterval );
-    }
+  
 }
 
 
 void KOPrefsDialog::usrWriteConfig()
 {
-    if ( kdelibcfg )
-        kdelibcfg->writeConfig();
-    else {
-    // KOPrefs::instance()->mRemoteIP = mRemoteIPEdit->text();
-    //KOPrefs::instance()->mRemoteUser =  mRemoteUser->text();
-    //KOPrefs::instance()->mRemotePassWd = mRemotePassWd->text();
-    //KOPrefs::instance()->mRemoteFile= mRemoteFile->text();
-    //KOPrefs::instance()->mLocalTempFile =mLocalTempFile->text();
+ 
+  
     KOPrefs::instance()->mDefaultAlarmFile =mDefaultAlarmFile->text();
-
-    //KOPrefs::instance()->mUserDateFormatShort = mUserDateFormatShort->text().replace( QRegExp(","), QString("K") );
-    //KOPrefs::instance()->mUserDateFormatLong = mUserDateFormatLong->text().replace( QRegExp(","), QString("K") );
     KOPrefs::instance()->setFullName(mNameEdit->text());
     KOPrefs::instance()->setEmail(mEmailEdit->text());
     
     KOPrefs::instance()->mAutoSaveInterval = mAutoSaveIntervalSpin->value();
-    
-    // KOPrefs::instance()->mTimeZoneId = mTimeZoneCombo->currentText();
-    //QDate date;
-    //date = mStartDateSavingEdit->date();
-    //int sub = 0;
-    //if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59 )
-    //     sub = 1;
-//     KOPrefs::instance()->mDaylightsavingStart = date.dayOfYear()-sub;
-//     date = mEndDateSavingEdit->date();
-//     if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59  )
-//         sub = 1;
-//     else 
-//         sub = 0;
-//     KOPrefs::instance()->mDaylightsavingEnd = date.dayOfYear()-sub;
-//     // KOPrefs::instance()->mTimeZoneOffset = mTimezoneOffsetSpin->value();
-    
     KOPrefs::instance()->mStartTime = mStartTimeSpin->value();
     KOPrefs::instance()->mDefaultDuration = mDefaultDurationSpin->value();
     KOPrefs::instance()->mAlarmTime = mAlarmTimeCombo->currentItem();
-    
-    //KOPrefs::instance()->mAllDaySize = mHourSizeSlider->value();
-    
+
     QDictIterator<QColor> it(mCategoryDict);
     while (it.current()) {
         KOPrefs::instance()->setCategoryColor(it.currentKey(),*it.current());
         ++it;
     }
     
     KOPrefs::instance()->mNextXDays = mNextXDaysSpin->value();
     KOPrefs::instance()->mWhatsNextDays = mWhatsNextSpin->value();
     KOPrefs::instance()->mWhatsNextPrios = mPrioSpin->value();
     
     KOPrefs::instance()->mAdditionalMails.clear();
     //  QListViewItem *item;
     //  item = mAMails->firstChild();
     //   while (item)
     //   {
     //     KOPrefs::instance()->mAdditionalMails.append( item->text(0) );
     //     item = item->nextSibling();
     //   }
-  KOPrefs::instance()->mAlarmPlayBeeps  = mAlarmPlayBeeps->value();
-  KOPrefs::instance()->mAlarmSuspendTime = mAlarmSuspendTime->value() ;
-  KOPrefs::instance()->mAlarmSuspendCount= mAlarmSuspendCount->value() ;
-  KOPrefs::instance()->mAlarmBeepInterval= mAlarmBeepInterval->value() ;
-    }
+    KOPrefs::instance()->mAlarmPlayBeeps  = mAlarmPlayBeeps->value();
+    KOPrefs::instance()->mAlarmSuspendTime = mAlarmSuspendTime->value() ;
+    KOPrefs::instance()->mAlarmSuspendCount= mAlarmSuspendCount->value() ;
+    KOPrefs::instance()->mAlarmBeepInterval= mAlarmBeepInterval->value() ;
+   
 }
 
 void KOPrefsDialog::updateCategories()
 {
   mCategoryCombo->clear();
   mCategoryDict.clear();
   mCategoryCombo->insertStringList(KOPrefs::instance()->mCustomCategories);
   updateCategoryColor();
 }
 
-void KOPrefsDialog::warningGroupScheduling()
-{
-  warningExperimental(mEnableGroupScheduling->checkBox()->isChecked());
-}
-
-void KOPrefsDialog::warningProjectView()
-{
-  warningExperimental(mEnableProjectView->checkBox()->isChecked());
-}
-
-void KOPrefsDialog::warningExperimental(bool on)
-{
-  if (on) {
-    KMessageBox::information(this,i18n("This is an experimental feature. "
-        "It may not work, it may do nothing useful and it may cause data loss. "
-        "Use with care.\n"
-        "You have to restart KOrganizer for this setting to take effect."));
-  } else {
-    KMessageBox::information(this,
-        i18n("You have to restart KOrganizer for this setting to take effect."));
-  }
-}
-
 void KOPrefsDialog::toggleEmailSettings(bool on)
 {
   if (on) {
     mEmailEdit->setEnabled(false);
     mNameEdit->setEnabled(false);
     mEmailLabel->setEnabled(false);
     mNameLabel->setEnabled(false);
 
     KEMailSettings settings;
     mNameEdit->setText(settings.getSetting(KEMailSettings::RealName));
     mEmailEdit->setText(settings.getSetting(KEMailSettings::EmailAddress));
   } else {
     mEmailEdit->setEnabled(true);
     mNameEdit->setEnabled(true);
     mEmailLabel->setEnabled(true);
     mNameLabel->setEnabled(true);
   }
 }
 
 void KOPrefsDialog::addItem()
 {
  //  aEmailsEdit->setEnabled(true);
 //   QListViewItem *item = new QListViewItem(mAMails);
 //   mAMails->insertItem(item);
 //   mAMails->setSelected(item,true);
 //   aEmailsEdit->setText(i18n("(EmptyEmail)"));
 }
 
 void KOPrefsDialog::removeItem()
 {
 //   QListViewItem *item;
 //   item = mAMails->selectedItem();
 //   if (!item) return;
 //   mAMails->takeItem(item);
 //   item = mAMails->selectedItem();
 //   if (!item) {
 //     aEmailsEdit->setText("");
 //     aEmailsEdit->setEnabled(false);
 //   }
 //   if (mAMails->childCount() == 0) {
 //     aEmailsEdit->setEnabled(false);
 //   }
 }
 
 void KOPrefsDialog::updateItem()
 {
  //  QListViewItem *item;
 //   item = mAMails->selectedItem();
 //   if (!item) return;
 //   item->setText(0,aEmailsEdit->text());
 }
 
 void KOPrefsDialog::updateInput()
 {
 //   QListViewItem *item;
 //   item = mAMails->selectedItem();
 //   if (!item) return;
 //   aEmailsEdit->setEnabled(true);
 //   aEmailsEdit->setText(item->text(0));
 }
-void KOPrefsDialog::updateTimezoneOffset( int index )
-{
-    /*
-    qDebug("updateTimezoneOffset %d ", index);
-    if ( index < 24 ) {
-        mTimezoneOffsetSpin->setEnabled ( false );
-        mTimezoneOffsetSpin->setValue( ( index-11 ) * 60 );
-
-
-    } else { 
-        if  ( index ==  24 ) {
-            mTimezoneOffsetSpin->setEnabled ( true );
-            mTimezoneOffsetSpin->setValue( KOPrefs::instance()->mTimeZoneOffset);
-            
-        } else {
-            mTimezoneOffsetSpin->setEnabled ( false );
-            mTimezoneOffsetSpin->setValue( 0 );
-        }
-    }
-    */
-}
-
-void KOPrefsDialog::setupTimeZoneTab()
-{
-#if 0
-    QFrame *topFrame = addPage(i18n("Time Zone"),0,0);
-    // DesktopIcon("clock",KIcon::SizeMedium));
-
-  QGridLayout *topLayout = new QGridLayout(topFrame,5,2);
-  topLayout->setSpacing(mSpacingHint);
-  topLayout->setMargin(mMarginHint);
-
-  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 = KOPrefs::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;
-  KPrefsDialogWidBool *sb =
-      addWidBool(i18n("Timezone has daylight saving"),
-                 &(KOPrefs::instance()->mUseDaylightsaving),topFrame);
-  topLayout->addMultiCellWidget(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(KOPrefs::instance()->mDaylightsavingStart-1));
-  mEndDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingEnd-1));
-#endif
- 
-}
 
diff --git a/korganizer/koprefsdialog.h b/korganizer/koprefsdialog.h
index 6892028..80d6545 100644
--- a/korganizer/koprefsdialog.h
+++ b/korganizer/koprefsdialog.h
@@ -1,166 +1,154 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 #ifndef _KOPREFSDIALOG_H
 #define _KOPREFSDIALOG_H
 
 #include <qframe.h>
 #include <qdict.h>
 #include <qcolor.h>
 #include <qlistview.h>
 
 #include <kdialogbase.h>
 
 #include <libkdepim/kprefsdialog.h>
 #include <libkdepim/kdateedit.h>
 #include <kcmconfigs/kdepimconfigwidget.h>
 
 class KColorButton;
 class QSpinBox;
 class QSlider;
 class KURLRequester;
 class QComboBox;
 class QLineEdit;
 class QStringList;
 
 /** Dialog to change the korganizer configuration.
   */
 class KOPrefsDialog : public KPrefsDialog
 {
     Q_OBJECT
   public:
     /** Initialize dialog and pages */
     KOPrefsDialog(QWidget *parent=0,char *name=0,bool modal=false);
     ~KOPrefsDialog();
 
   public slots:
     void showPrinterTab();
     
     /** Update controls for categories */
     void updateCategories();
-    void showSyncPage();
   protected slots:
     void selectSoundFile();
     void setCategoryColor();
     void updateCategoryColor();
-    void updateTimezoneOffset( int );
-
-
-    void warningExperimental(bool on);
-    void warningGroupScheduling();
-    void warningProjectView();
-
     void toggleEmailSettings(bool);
     
     //additional emails
     void addItem();
     void removeItem();
     void updateItem();
     void updateInput();
 
   protected:
     void usrReadConfig();
     void usrWriteConfig();
     void setupGlobalTab();
 
     void setupMainTab();
     void setupTimeTab();
-    void setupTimeZoneTab();
     void setupLocaleTab();
     void setupLocaleDateTab();
     void setupFontsTab();
     void setupColorsTab();
     void setupViewsTab();
     void setupDisplayTab();
     void setupPrinterTab();
     void setupGroupSchedulingTab();
     void setupGroupAutomationTab();
-    void setupSyncTab();
-    void setupSyncAlgTab();
 
     void setCombo(QComboBox *combo,const QString & text, const QStringList *tags = 0);
 
 
   private:
-    KDEPIMConfigWidget* kdelibcfg;
     KPrefsDialogWidBool *mEnableGroupScheduling;
     KPrefsDialogWidBool *mEnableProjectView;
 
     QFrame *mPrinterTab;
 
     QLineEdit *nameEdit;
     QLineEdit *emailEdit;
 
     QComboBox *timeCombo;
     QComboBox *tzCombo;
 
     // widgets holding preferences data
     QLineEdit *mNameEdit;
     QLineEdit *mEmailEdit;
     QLabel *mNameLabel;
     QLabel *mEmailLabel;
     QLineEdit *mAdditionalEdit;
     QSpinBox  *mAutoSaveIntervalSpin;
     QSpinBox  *mPrioSpin;
     //   QListView *mAMails;
     QLineEdit *aEmailsEdit;
 
     QComboBox    *mTimeZoneCombo;
     QStringList  tzonenames;
     QSpinBox     *mStartTimeSpin;
     QSpinBox     *mDefaultDurationSpin;
     QComboBox    *mAlarmTimeCombo;
 
     QComboBox     *mCategoryCombo;
     KColorButton  *mCategoryButton;
     QDict<QColor> mCategoryDict;
 
     QSlider   *mHourSizeSlider;
 
     QSpinBox  *mNextXDaysSpin;
     QSpinBox  *mWhatsNextSpin;
 
     QLineEdit * mRemoteIPEdit;
     QLineEdit * mRemoteUser;
     QLineEdit * mRemotePassWd;
     QLineEdit * mRemoteFile;
     QLineEdit * mLocalTempFile;
     QWidget* mSetupSyncAlgTab;
     QLineEdit * mUserDateFormatLong;
     QLineEdit * mUserDateFormatShort;
 
     QSpinBox     *mTimezoneOffsetSpin;
     QSpinBox     *mDaylightsavingStart;
     QSpinBox     *mDaylightsavingEnd;
     KDateEdit* mStartDateSavingEdit;
     KDateEdit* mEndDateSavingEdit;
     QSpinBox     * mAlarmPlayBeeps;
     QSpinBox     * mAlarmSuspendTime;
     QSpinBox     * mAlarmSuspendCount;
     QSpinBox     * mAlarmBeepInterval;
 
     QLineEdit * mDefaultAlarmFile;
     int mSpacingHint;
     int mMarginHint;
 };
 
 #endif
diff --git a/libkdepim/kprefsdialog.cpp b/libkdepim/kprefsdialog.cpp
index b6ae775..6dc741d 100644
--- a/libkdepim/kprefsdialog.cpp
+++ b/libkdepim/kprefsdialog.cpp
@@ -1,410 +1,440 @@
 /*
     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$
 
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qgroupbox.h>
 #include <qbuttongroup.h>
 #include <qlineedit.h>
 #include <qfont.h>
 #include <qslider.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qvbox.h>
 #include <qhbox.h>
 #include <qspinbox.h>
 #include <qdatetime.h>
 #include <qframe.h>
 #include <qcombobox.h>
 #include <qcheckbox.h>
 #include <qradiobutton.h>
 #include <qpushbutton.h>
 #include <qapplication.h>
 
 #include <kcolorbutton.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
+#include <kglobalsettings.h>
 #include <kfontdialog.h>
 #include <kmessagebox.h>
 #include <kcolordialog.h>
 #include <kiconloader.h>
 
 #include "kprefs.h"
+#include "kpimglobalprefs.h"
 
 #include "kprefsdialog.h"
 //#include "kprefsdialog.moc"
 
 KPrefsDialogWidBool::KPrefsDialogWidBool(const QString &text,bool *reference,
                              QWidget *parent)
 {
   mReference = reference;
 
   mCheck = new QCheckBox(text,parent);
 }
 
 void KPrefsDialogWidBool::readConfig()
 {
   mCheck->setChecked(*mReference);
 }
 
 void KPrefsDialogWidBool::writeConfig()
 {
   *mReference = mCheck->isChecked();
 }
 
 QCheckBox *KPrefsDialogWidBool::checkBox()
 {
   return mCheck;
 }
 
 
 KPrefsDialogWidColor::KPrefsDialogWidColor(const QString &text,QColor *reference,
                                QWidget *parent)
 {
   mReference = reference;
 
   mButton = new KColorButton(parent);
   mLabel = new QLabel(mButton, text, parent);
   mButton->setColor( *mReference );
   mButton->setColor( Qt::red );
 
 }
 
 KPrefsDialogWidColor::~KPrefsDialogWidColor()
 {
 //  kdDebug(5300) << "KPrefsDialogWidColor::~KPrefsDialogWidColor()" << endl;
 }
 
 void KPrefsDialogWidColor::readConfig()
 {
   mButton->setColor(*mReference);
 }
 
 void KPrefsDialogWidColor::writeConfig()
 {
   *mReference = mButton->color();
 }
 
 QLabel *KPrefsDialogWidColor::label()
 {
   return mLabel;
 }
 
 KColorButton *KPrefsDialogWidColor::button()
 {
   return mButton;
 }
 
 KPrefsDialogWidFont::KPrefsDialogWidFont(const QString &sampleText,const QString &labelText,
                              QFont *reference,QWidget *parent)
 {
   mReference = reference;
 
   mLabel = new QLabel(labelText, parent);
 
   mPreview = new QLabel(sampleText,parent);
   mPreview->setFrameStyle(QFrame::Panel|QFrame::Sunken);
 
   mButton = new QPushButton(i18n("Choose..."), parent);
   connect(mButton,SIGNAL(clicked()),SLOT(selectFont())); 
   mPreview->setMaximumHeight( QApplication::desktop()->height() / 12 );
   mPreview->setMaximumWidth( (QApplication::desktop()->width() / 2)-10 );
 }
 
 KPrefsDialogWidFont::~KPrefsDialogWidFont()
 {
 }
 
 void KPrefsDialogWidFont::readConfig()
 {
   mPreview->setFont(*mReference);
 }
 
 void KPrefsDialogWidFont::writeConfig()
 {
   *mReference = mPreview->font();
 }
 
 QLabel *KPrefsDialogWidFont::label()
 {
   return mLabel;
 }
 
 QLabel *KPrefsDialogWidFont::preview()
 {
   return mPreview;
 }
 
 QPushButton *KPrefsDialogWidFont::button()
 {
   return mButton;
 }
 
 void KPrefsDialogWidFont::selectFont()
 {
   QFont myFont(mPreview->font());
   bool ok;
   myFont = KFontDialog::getFont(myFont, ok);
   if ( ok ) {
     mPreview->setFont(myFont);
   }
 }
 
 
 KPrefsDialogWidTime::KPrefsDialogWidTime(const QString &text,int *reference,
                              QWidget *parent)
 {
   mReference = reference;
 
   mLabel = new QLabel(text,parent);
   mSpin = new QSpinBox(0,23,1,parent);
   mSpin->setSuffix(":00");
 }
 
 void KPrefsDialogWidTime::readConfig()
 {
   mSpin->setValue(*mReference);
 }
 
 void KPrefsDialogWidTime::writeConfig()
 {
   *mReference = mSpin->value();
 }
 
 QLabel *KPrefsDialogWidTime::label()
 {
   return mLabel;
 }
 
 QSpinBox *KPrefsDialogWidTime::spinBox()
 {
   return mSpin;
 }
 
 
 KPrefsDialogWidRadios::KPrefsDialogWidRadios(const QString &text,int *reference,
                 QWidget *parent)
 {
   mReference = reference;
 
   mBox = new QButtonGroup(1,Qt::Horizontal,text,parent);
 }
 
 KPrefsDialogWidRadios::~KPrefsDialogWidRadios()
 {
 }
 
 void KPrefsDialogWidRadios::addRadio(const QString &text)
 {
   new QRadioButton(text,mBox);
 }
 
 QButtonGroup *KPrefsDialogWidRadios::groupBox()
 {
   return mBox;
 }
 
 void KPrefsDialogWidRadios::readConfig()
 {
   mBox->setButton(*mReference);
 }
 
 void KPrefsDialogWidRadios::writeConfig()
 {
   *mReference = mBox->id(mBox->selected());
 }
 
 
 KPrefsDialogWidString::KPrefsDialogWidString(const QString &text,QString *reference,
                                  QWidget *parent, QLineEdit::EchoMode echomode)
 {
   mReference = reference;
   
   mLabel = new QLabel(text,parent);
   mEdit = new QLineEdit(parent);
   mEdit->setEchoMode( echomode );
 }
 
 KPrefsDialogWidString::~KPrefsDialogWidString()
 {
 }
 
 void KPrefsDialogWidString::readConfig()
 {
   mEdit->setText(*mReference);
 }
 
 void KPrefsDialogWidString::writeConfig()
 {
   *mReference = mEdit->text();
 }
 
 QLabel *KPrefsDialogWidString::label()
 {
   return mLabel;
 }
 
 QLineEdit *KPrefsDialogWidString::lineEdit()
 {
   return mEdit;
 }
 
 
 KPrefsDialog::KPrefsDialog(KPrefs *prefs,QWidget *parent,char *name,bool modal) :
   KDialogBase(IconList,i18n("Preferences"),Ok|Cancel|Default,Ok,parent,
               name,modal,true)
 {
   mPrefs = prefs;
 
 // This seems to cause a crash on exit. Investigate later.
   mPrefsWids.setAutoDelete(true);
 
   connect(this,SIGNAL(defaultClicked()),SLOT(slotDefault()));
   //connect(this,SIGNAL(cancelClicked()),SLOT(slotDefault()));
   //connect(this,SIGNAL(cancelClicked()),SLOT(reject()));
 }
 
 KPrefsDialog::~KPrefsDialog()
 {
 }
 
 void KPrefsDialog::addWid(KPrefsDialogWid *wid)
 {
   mPrefsWids.append(wid);
 }
 
 KPrefsDialogWidBool *KPrefsDialog::addWidBool(const QString &text,bool *reference,QWidget *parent)
 {
   KPrefsDialogWidBool *w = new KPrefsDialogWidBool(text,reference,parent);
   addWid(w);
   return w;
 }
 
 KPrefsDialogWidTime *KPrefsDialog::addWidTime(const QString &text,int *reference,QWidget *parent)
 {
   KPrefsDialogWidTime *w = new KPrefsDialogWidTime(text,reference,parent);
   addWid(w);
   return w;
 }
 
 KPrefsDialogWidColor *KPrefsDialog::addWidColor(const QString &text,QColor *reference,QWidget *parent)
 {
   KPrefsDialogWidColor *w = new KPrefsDialogWidColor(text,reference,parent);
   addWid(w);
   return w;
 }
 
 KPrefsDialogWidRadios *KPrefsDialog::addWidRadios(const QString &text,int *reference,QWidget *parent)
 {
   KPrefsDialogWidRadios *w = new KPrefsDialogWidRadios(text,reference,parent);
   addWid(w);
   return w;
 }
 
 KPrefsDialogWidString *KPrefsDialog::addWidString(const QString &text,QString *reference,QWidget *parent)
 {
   KPrefsDialogWidString *w = new KPrefsDialogWidString(text,reference,parent);
   addWid(w);
   return w;
 }
 
 KPrefsDialogWidString *KPrefsDialog::addWidPassword(const QString &text,QString *reference,QWidget *parent)
 {
   KPrefsDialogWidString *w = new KPrefsDialogWidString(text,reference,parent,QLineEdit::Password);
   addWid(w);
   return w;
 }
 
 KPrefsDialogWidFont *KPrefsDialog::addWidFont(const QString &sampleText,const QString &buttonText,
                                         QFont *reference,QWidget *parent)
 {
   KPrefsDialogWidFont *w = new KPrefsDialogWidFont(sampleText,buttonText,reference,parent);
   addWid(w);
   return w;
 }
 
 void KPrefsDialog::setDefaults()
 {
   mPrefs->setDefaults();
   
   readConfig();
 }
 
 void KPrefsDialog::readConfig()
 {
 //  kdDebug(5300) << "KPrefsDialog::readConfig()" << endl;
 
   KPrefsDialogWid *wid;
   for(wid = mPrefsWids.first();wid;wid=mPrefsWids.next()) {
     wid->readConfig();
   }
 
   usrReadConfig();
 }
 
 void KPrefsDialog::writeConfig()
 {
 //  kdDebug(5300) << "KPrefsDialog::writeConfig()" << endl;
 
   KPrefsDialogWid *wid;
   for(wid = mPrefsWids.first();wid;wid=mPrefsWids.next()) {
     wid->writeConfig();
   }
 
   usrWriteConfig();
 
 //  kdDebug(5300) << "KPrefsDialog::writeConfig() now writing..." << endl;
   
   mPrefs->writeConfig();
 
 //  kdDebug(5300) << "KPrefsDialog::writeConfig() done" << endl;
 }
 
 
 void KPrefsDialog::slotApply()
 {
   writeConfig();
   emit configChanged();
 }
 
 void KPrefsDialog::slotOk()
 {
   slotApply();
   QDialog::accept();
 }
 void KPrefsDialog::accept()
 {
   slotOk();
 }
 
 void KPrefsDialog::slotDefault()
 {
   if (KMessageBox::warningContinueCancel(this,
       i18n("You are about to set all\npreferences to default values.\nAll "
       "custom modifications will be lost."),i18n("Setting Default Preferences"),
       i18n("Continue"))
     == KMessageBox::Continue) setDefaults(); 
 }
+
+KPimPrefsGlobalDialog::KPimPrefsGlobalDialog(QWidget *parent,char *name,bool modal): KPrefsDialog( KPimGlobalPrefs::instance() ,parent, name, modal )
+{
+    setFont( KGlobalSettings::generalMaxFont() );
+    kdelibcfg = new KDEPIMConfigWidget(  KPimGlobalPrefs::instance(), this, "KPrefsGlobalDialog" );
+    setMainWidget( kdelibcfg );
+    setCaption( i18n("KDE-Pim Global Settings"));
+    kdelibcfg->readConfig();
+#ifndef DESKTOP_VERSION
+    if ( QApplication::desktop()->height() <= 480 )
+         hideButtons(); 
+    showMaximized();
+#endif
+}
+void KPimPrefsGlobalDialog::showTZconfig()
+{
+    kdelibcfg->showTimeZoneTab() ;
+}    
+void KPimPrefsGlobalDialog::usrReadConfig() 
+{
+    kdelibcfg->readConfig();
+}
+
+void KPimPrefsGlobalDialog::usrWriteConfig() 
+{
+    kdelibcfg->writeConfig();
+}
+
diff --git a/libkdepim/kprefsdialog.h b/libkdepim/kprefsdialog.h
index efcb86a..52ec809 100644
--- a/libkdepim/kprefsdialog.h
+++ b/libkdepim/kprefsdialog.h
@@ -189,257 +189,283 @@ class KPrefsDialogWidFont : public KPrefsDialogWid
       @param label     Text of label.
       @param reference Pointer to variable read and written by this widget.
       @param parent    Parent widget.
     */
     KPrefsDialogWidFont(const QString &sampleText,const QString &labelText,
                   QFont *reference,QWidget *parent);
     /**
       Destruct font setting widget.
     */
     ~KPrefsDialogWidFont();
     
     /**
       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 KPrefsDialogWidRadios : public KPrefsDialogWid
 {
   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.
     */
     KPrefsDialogWidRadios(const QString &text,int *reference,QWidget *parent);
     virtual ~KPrefsDialogWidRadios();
 
     /**
       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 KPrefsDialogWidString : public KPrefsDialogWid
 {
   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.
     */
     KPrefsDialogWidString(const QString &text,QString *reference,QWidget *parent,QLineEdit::EchoMode echomode=QLineEdit::Normal);
     /**
       Destructor.
     */
     virtual ~KPrefsDialogWidString();
 
     /**
       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 dialog.
   
   This class provides the framework for a preferences dialog. You have to
   subclass it and add the code to create the actual configuration widgets and
   do the layout management.
   
   KPrefsDialog provides functions to add subclasses of @ref KPrefsDialogWid. 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 KPrefsDialog : public KDialogBase
 {
     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.
       @param modal  true, if dialog has to be modal, false for non-modal.
     */
     KPrefsDialog(KPrefs *prefs,QWidget *parent=0,char *name=0,bool modal=false);
     /**
       Destructor.
     */
     virtual ~KPrefsDialog();
 
     /**
       Register a custom KPrefsDialogWid object.
     */
     void addWid(KPrefsDialogWid *);
     /**
       Register a @ref KPrefsDialogWidBool object.
       
       @param text      Text of bool widget.
       @param reference Reference to variable storing the setting.
       @param parent    Parent widget.
     */
     KPrefsDialogWidBool *addWidBool(const QString &text,bool *reference,QWidget *parent);
     /**
       Register a @ref KPrefsDialogWidTime object.
       
       @param text      Text of time widget.
       @param reference Reference to variable storing the setting.
       @param parent    Parent widget.
     */
     KPrefsDialogWidTime *addWidTime(const QString &text,int *reference,QWidget *parent);
     /**
       Register a @ref KPrefsDialogWidColor object.
       
       @param text      Text of color widget.
       @param reference Reference to variable storing the setting.
       @param parent    Parent widget.
     */
     KPrefsDialogWidColor *addWidColor(const QString &text,QColor *reference,QWidget *parent);
     /**
       Register a @ref KPrefsDialogWidRadios object.
       
       @param text      Text of radio button box widget.
       @param reference Reference to variable storing the setting.
       @param parent    Parent widget.
     */
     KPrefsDialogWidRadios *addWidRadios(const QString &text,int *reference,QWidget *parent);
     /**
       Register a @ref KPrefsDialogWidString object.
       
       @param text      Text of string widget.
       @param reference Reference to variable storing the setting.
       @param parent    Parent widget.
     */
     KPrefsDialogWidString *addWidString(const QString &text,QString *reference,QWidget *parent);
     /**
       Register a password @ref KPrefsDialogWidString 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.
     */
     KPrefsDialogWidString *addWidPassword (const QString &text,QString *reference,QWidget *parent);
     /**
       Register a @ref KPrefsDialogWidFont 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.
     */
     KPrefsDialogWidFont *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();
 
   signals:
     /** Emitted when the a changed configuration has been stored. */
     void configChanged();
 
   protected slots:
     /** Apply changes to preferences */
     void slotApply();  
 
     void accept();
     /** Accept changes to preferences and close dialog */
     void slotOk();
   
     /** Set preferences to default values */
     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<KPrefsDialogWid> mPrefsWids;
 };
 
+
+#include "kcmconfigs/kdepimconfigwidget.h"
+class KPimPrefsGlobalDialog : public KPrefsDialog
+{
+    Q_OBJECT
+        public:
+    KPimPrefsGlobalDialog(QWidget *parent=0,char *name=0,bool modal=true);
+        /**
+           Destructor.
+        */
+        void showTZconfig();
+
+        public slots:
+
+ signals:
+        protected slots:
+        
+ protected:
+        void usrReadConfig();
+        virtual void usrWriteConfig() ;
+
+ private:
+        KDEPIMConfigWidget* kdelibcfg;
+    
+};
+
 #endif