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
@@ -3,192 +3,193 @@
    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 );
    }
@@ -1518,207 +1519,218 @@ void KABCore::setDetailsVisible( bool 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 );
+    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->getNewVBoxPage(i18n( "Addressbook")) , "KCMKabConfig" );
-    ConfigureDialog->addModule(kabcfg );
-    KCMKdePimConfig* kdelibcfg = new KCMKdePimConfig( ConfigureDialog->getNewVBoxPage(i18n( "Global")) , "KCMKdeLibConfig" );
-    ConfigureDialog->addModule(kdelibcfg );
+    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" );
@@ -1932,198 +1944,199 @@ void KABCore::initActions()
                             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() );
+      mActionConfigKAddressbook = new KAction( i18n( "&Configure KA/Pi..." ), "configure", 0, this,
+                                               SLOT( openConfigDialog() ), actionCollection(),
-    //US not implemented yet
+                                               "kaddressbook_configure" );  
-    //mActionKeyBindings = KStdAction::keyBindings( this, SLOT( configureKeyBindings() ), actionCollection() );
+      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);
@@ -2150,194 +2163,195 @@ void KABCore::addActionsManually()
      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 );
+  mActionConfigGlobal->plug( settingsMenu, 1 );
-  settingsMenu->insertSeparator(2);
+  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;
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index 80dbf08..6479a58 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -234,295 +234,297 @@ class KABCore : public QWidget, public KSyncInterface
      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
@@ -2438,192 +2438,193 @@ void CalendarView::updateView(const QDate &start, const QDate &end)
 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()
 { 
diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp
index aa30c52..3dfa344 100644
--- a/korganizer/kodialogmanager.cpp
+++ b/korganizer/kodialogmanager.cpp
@@ -1,221 +1,208 @@
 /*
  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) {
+    KPimPrefsGlobalDialog gc ( mMainView );
-    mOptionsDialog = new KOPrefsDialog(0);
+    if ( showSync )
-    connect(mOptionsDialog,SIGNAL(configChanged()),
+        gc.showTZconfig();
-            mMainView,SLOT(updateConfig()));
+    gc.exec();
-  }
-  mOptionsDialog->readConfig();
-#ifndef DESKTOP_VERSION  
-  mOptionsDialog->showMaximized();
-#else
-  mOptionsDialog->show();
-#endif
-  if ( showSync )
-      mOptionsDialog->showSyncPage();
-  mOptionsDialog->exec();
-  delete mOptionsDialog;
-  mOptionsDialog = 0;
 }
 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();
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 4b5b66a..b782bb1 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -1,435 +1,331 @@
 /*
    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;
@@ -1367,389 +1263,235 @@ void KOPrefsDialog::setupGroupSchedulingTab()
  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()->mAlarmPlayBeeps  = mAlarmPlayBeeps->value();
-  KOPrefs::instance()->mAlarmSuspendTime = mAlarmSuspendTime->value() ;
+    KOPrefs::instance()->mAlarmSuspendTime = mAlarmSuspendTime->value() ;
-  KOPrefs::instance()->mAlarmSuspendCount= mAlarmSuspendCount->value() ;
+    KOPrefs::instance()->mAlarmSuspendCount= mAlarmSuspendCount->value() ;
-  KOPrefs::instance()->mAlarmBeepInterval= mAlarmBeepInterval->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,151 +1,153 @@
 /*
    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()
@@ -315,96 +317,124 @@ KPrefsDialogWidColor *KPrefsDialog::addWidColor(const QString &text,QColor *refe
  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
@@ -349,97 +349,123 @@ class KPrefsDialog : public KDialogBase
    /**
      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