7 files changed, 392 insertions, 230 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index a7ca0ce..2a54900 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -21,7 +21,7 @@
    without including the source code for Qt in the source distribution.
 */
-#include "kabcore.h" 
+#include "kabcore.h"
 #include <stdaddressbook.h>
 #include <klocale.h>
@@ -78,8 +78,14 @@
 #include <kcmkabconfig.h>
-//US#include <qpe/resource.h> // needed for Resource::loadPixmap
 //#include <qlabel.h>
+#ifdef Q_WS_QWS
+#include <qtopia/services.h>
+#include <qtopia/qcopenvelope_qws.h>
+#endif
 #endif // KAB_EMBEDDED
 #include <kcmkabconfig.h>
@@ -91,11 +97,17 @@
 #include <resource.h>
 //US#include <qsplitter.h>
+#include <qmap.h>
+#include <qdir.h>
+#include <qfile.h>
 #include <qvbox.h>
 #include <qlayout.h>
 #include <qclipboard.h>
+#include <qtextstream.h>
 #include <libkdepim/categoryselectdialog.h>
+#include <kabc/vcardconverter.h>
 #include "addresseeutil.h"
 #include "undocmds.h"
@@ -129,10 +141,7 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const
    mReadWrite( readWrite ), mModified( false )
 #endif //KAB_EMBEDDED
 {
-#ifdef KAB_EMBEDDED
-  //US we define here our own global actioncollection. 
-  //mActionCollection = new KActionCollection(this);
-#endif //KAB_EMBEDDED  
  mExtensionBarSplitter = 0;
  mIsPart = !parent->inherits( "KAddressBookMain" );
@@ -142,7 +151,7 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const
 #ifndef KAB_EMBEDDED
  mAddressBook->setErrorHandler( new KABC::GUIErrorHandler );
 #endif //KAB_EMBEDDED
-  
  connect( mAddressBook, SIGNAL( addressBookChanged( AddressBook * ) ),
           SLOT( addressBookChanged() ) );
@@ -162,8 +171,8 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const
                                "X-IMAddress", "KADDRESSBOOK" );
  mAddressBook->addCustomField( i18n( "Anniversary" ), KABC::Field::Personal,
                                "X-Anniversary", "KADDRESSBOOK" );
-                               
-  //US added this field to become compatible with Opie/qtopia addressbook  
+  //US added this field to become compatible with Opie/qtopia addressbook
  // values can be "female" or "male" or "". An empty field represents undefined.
  mAddressBook->addCustomField( i18n( "Gender" ), KABC::Field::Personal,
                                "X-Gender", "KADDRESSBOOK" );
@@ -195,13 +204,14 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const
           SLOT( incrementalSearch( const QString& ) ) );
  connect( mIncSearchWidget, SIGNAL( fieldChanged() ),
           mJumpButtonBar, SLOT( recreateButtons() ) );
-                                 
+  connect( mDetails, SIGNAL( sendEmail( const QString& ) ),
+           SLOT( sendMail( const QString& ) ) );
 #ifndef KAB_EMBEDDED
  connect( mViewManager, SIGNAL( urlDropped( const KURL& ) ),
           mXXPortManager, SLOT( importVCard( const KURL& ) ) );
-  connect( mDetails, SIGNAL( sendEmail( const QString& ) ),
-           SLOT( sendMail( const QString& ) ) );
  connect( mDetails, SIGNAL( browse( const QString& ) ),
           SLOT( browse( const QString& ) ) );
@@ -221,12 +231,6 @@ KABCore::~KABCore()
    delete AddresseeConfig::instance();
  mAddressBook = 0;
  KABC::StdAddressBook::close();
-  
-#ifdef KAB_EMBEDDED
-  //US we define here our own global actioncollection. 
-  // delete mActionCollection;
-#endif //KAB_EMBEDDED  
-  
 }
 void KABCore::restoreSettings()
@@ -235,7 +239,7 @@ void KABCore::restoreSettings()
  mActionJumpBar->setChecked( state );
  setJumpButtonBarVisible( state );
-  
  state = KABPrefs::instance()->mDetailsPageVisible;
  mActionDetails->setChecked( state );
@@ -294,9 +298,9 @@ void KABCore::saveSettings()
 #endif //KAB_EMBEDDED
  mExtensionManager->saveSettings();
  mViewManager->saveSettings();
-  
  KABPrefs::instance()->mCurrentIncSearchField = mIncSearchWidget->currentItem();
-  
 }
 KABC::AddressBook *KABCore::addressBook() const
@@ -378,9 +382,9 @@ void KABCore::createAboutData()
  return about;
 #endif //KAB_EMBEDDED
-  
  QString version;
-#include <../version>    
+#include <../version>
    QMessageBox::about( this, "About KAddressbook/Pi",
                        "KAddressbook/Platform-independent\n"
                        "(KA/Pi) " +version + " - " +
@@ -390,7 +394,7 @@ void KABCore::createAboutData()
                        "PDA-Edition\n"
                        "for: Zaurus 5500 / 7x0 / 8x0\n"
 #endif
-                        
                        "(c) 2004 Ulf Schenk\n"
                        "(c) 1997-2003, The KDE PIM Team\n"
  "Tobias Koenig Current maintainer tokoe@kde.org\n"
@@ -418,13 +422,13 @@ void KABCore::setContactSelected( const QString &uid )
    KABC::Picture pic = addr.photo();
    if ( pic.isIntern() ) {
 //US      emit contactSelected( pic.data() );
-//US instead use:      
+//US instead use:
      QPixmap px;
      if (pic.data().isNull() != true)
      {
        px.convertFromImage(pic.data());
      }
-      
      emit contactSelected( px );
    }
  }
@@ -451,38 +455,50 @@ void KABCore::setContactSelected( const QString &uid )
 void KABCore::sendMail()
 {
-#ifndef KAB_EMBEDDED
  sendMail( mViewManager->selectedEmails().join( ", " ) );
-#else //KAB_EMBEDDED
-  qDebug("KABCore::sendMail() ust be fixed");
-#endif //KAB_EMBEDDED
 }
 void KABCore::sendMail( const QString& email )
 {
-#ifndef KAB_EMBEDDED
+//US original kde implementation : kapp->invokeMailer( email, "" );
-  kapp->invokeMailer( email, "" );
-#else //KAB_EMBEDDED
+/*US original qtopia implementation
-  qDebug("KABCore::sendMail(const QString& email) ust be fixed");
+    PimContact c = abList->currentEntry();
-#endif //KAB_EMBEDDED
+    QString name = c.fileAs();
+    QString email = c.defaultEmail();
+#ifndef QT_NO_COP
+    QCopEnvelope e(Service::channel("Email"), "writeMail(QString,QString)");
+    e << name << email;
+#else
+*/
+#ifndef QT_NO_COP
+    QCString channel = KABPrefs::instance()->mEmailChannel.latin1();
+    qDebug("Using QCopEnvelope e(\"" + channel + "\", \"writeMail(QMap(QString,QString))\")");
+    QCopEnvelope e(channel, "writeMail(QString,QString)");
+    //US we need no names in the To field. The emailadresses are enough
+    e << "" << email;
+#else
+    KMessageBox::sorry( this, i18n( "This version does not support sending emails." ) );
+#endif
 }
 void KABCore::mailVCard()
 {
-#ifndef KAB_EMBEDDED
  QStringList uids = mViewManager->selectedUids();
  if ( !uids.isEmpty() )
    mailVCard( uids );
-#else //KAB_EMBEDDED
-  qDebug("KABCore::mailVCard() must be fixed");
-#endif //KAB_EMBEDDED
 }
 void KABCore::mailVCard( const QStringList& uids )
 {
-#ifndef KAB_EMBEDDED
  QStringList urls;
+  QString tmpdir = locateLocal("tmp", KGlobal::getAppName());
+/*US
  // Create a temp dir, so that we can put the files in it with proper names
  KTempFile tempDir;
  if ( tempDir.status() != 0 ) {
@@ -492,6 +508,11 @@ void KABCore::mailVCard( const QStringList& uids )
  QString dirName = tempDir.name();
  tempDir.unlink();
+*/
+  QString dirName = tmpdir + "/" + KApplication::randomString( 8 );
  QDir().mkdir( dirName, true );
  for( QStringList::ConstIterator it = uids.begin(); it != uids.end(); ++it ) {
@@ -520,15 +541,26 @@ void KABCore::mailVCard( const QStringList& uids )
      urls.append( fileName );
    }
  }
+/*US
  kapp->invokeMailer( QString::null, QString::null, QString::null,
                      QString::null,  // subject
                      QString::null,  // body
                      QString::null,
                      urls );  // attachments
-#else //KAB_EMBEDDED
+*/
-  qDebug("KABCore::mailVCard( must be fixed");
+#ifndef QT_NO_COP
-#endif //KAB_EMBEDDED
+    QCString channel = KABPrefs::instance()->mEmailChannel.latin1();
+    qDebug("Using QCopEnvelope e(\"" + channel + "\", \"writeMail(QMap(QString,QString))\")");
+    QMap<QString, QString> parameterMap;
+    parameterMap.insert("ATTACHMENT<n>", urls.join(", "));
+    QCopEnvelope e(channel, "writeMail(QMap(QString,QString))");
+    e << parameterMap;
+#else
+    KMessageBox::sorry( this, i18n( "This version does not support sending emails." ) );
+#endif
 }
@@ -752,7 +784,7 @@ void KABCore::setModified( bool modified )
  mViewManager->refreshView();
  mDetails->refreshView();
-  
 }
 bool KABCore::modified() const
@@ -762,7 +794,7 @@ bool KABCore::modified() const
 void KABCore::contactModified( const KABC::Addressee &addr )
 {
-  
  Command *command = 0;
  QString uid;
@@ -806,14 +838,14 @@ void KABCore::newContact()
    KABC::Addressee addr;
    addr.setResource( resource );
    mEditorDialog->setAddressee( addr );
-    KApplication::execDialog ( mEditorDialog ); 
+    KApplication::execDialog ( mEditorDialog );
-    
  } else
    return;
-    
  // mEditorDict.insert( dialog->addressee().uid(), dialog );
-  
 }
 void KABCore::addEmail( QString aStr )
@@ -888,7 +920,7 @@ void KABCore::importVCard( const QString &vCard, bool showPreview )
  mXXPortManager->importVCard( vCard, showPreview );
 }
-//US added a second method without defaultparameter    
+//US added a second method without defaultparameter
 void KABCore::editContact2() {
  editContact( QString::null );
 }
@@ -981,14 +1013,14 @@ void KABCore::setDetailsVisible( bool visible )
 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 
+    else
        setModifiedWOrefresh();
  }
  if ( list.count() == 0 )
@@ -996,7 +1028,7 @@ void KABCore::extensionModified( const KABC::Addressee::List &list )
  else
     mViewManager->refreshView( list[ 0 ].uid() );
- 
 }
@@ -1028,7 +1060,7 @@ QString KABCore::getNameByPhone( const QString &phone )
  qDebug("KABCore::getNameByPhone finsih method");
  return "";
 #endif //KAB_EMBEDDED
-  
 }
 void KABCore::openConfigDialog()
@@ -1185,7 +1217,7 @@ void KABCore::initGUI()
  mXXPortManager = new XXPortManager( this, this );
 #else //KAB_EMBEDDED
-  //US initialize viewMenu before settingup viewmanager. 
+  //US initialize viewMenu before settingup viewmanager.
  //  Viewmanager needs this menu to plugin submenues.
  viewMenu = new QPopupMenu( this );
  settingsMenu = new QPopupMenu( this );
@@ -1202,17 +1234,17 @@ void KABCore::initGUI()
  // = new QHBoxLayout( this );
 //  QBoxLayout *topLayout = (QBoxLayout*)layout();
- 
 //  QWidget *mainBox = new QWidget( this );
 //  QBoxLayout * mainBoxLayout  = new QHBoxLayout(mainBox);
 #ifdef DESKTOP_VERSION
  topLayout = new QHBoxLayout( this );
-  
  mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this);
  mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right );
-  
  topLayout->addWidget(mMiniSplitter );
  mExtensionBarSplitter = new KDGanttMinimizeSplitter( Qt::Vertical,mMiniSplitter );
@@ -1231,18 +1263,18 @@ void KABCore::initGUI()
      mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Vertical, this);
      mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down );
  }
-  
  topLayout->addWidget(mMiniSplitter );
  mViewManager = new ViewManager( this,  mMiniSplitter );
  mDetails = new ViewContainer( mMiniSplitter );
-  
- 
   mExtensionManager = new ExtensionManager( this, mMiniSplitter );
 #endif
   //eh->hide();
  // topLayout->addWidget(mExtensionManager );
- 
-  
 /*US
 #ifndef KAB_NOSPLITTER
  QHBoxLayout *topLayout = new QHBoxLayout( this );
@@ -1257,7 +1289,7 @@ void KABCore::initGUI()
  viewSpace->setStretchFactor( mViewManager, 1 );
  mDetails = new ViewContainer( mDetailsSplitter );
-    
  topLayout->addWidget( mDetailsSplitter );
  topLayout->setStretchFactor( mDetailsSplitter, 100 );
 #else //KAB_NOSPLITTER
@@ -1280,7 +1312,7 @@ void KABCore::initGUI()
 #endif //KAB_NOSPLITTER
 */
-  
 #endif //KAB_EMBEDDED
  initActions();
@@ -1298,26 +1330,26 @@ void KABCore::initGUI()
  connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ),
           SLOT( incrementalSearch( const QString& ) ) );
-  
  mJumpButtonBar = new JumpButtonBar( this, this );
  topLayout->addWidget( mJumpButtonBar );
 //US  topLayout->setStretchFactor( mJumpButtonBar, 10 );
-  
 // mMainWindow->getIconToolBar()->raise();
 #endif //KAB_EMBEDDED
-        
 }
 void KABCore::initActions()
 {
 //US  qDebug("KABCore::initActions(): mIsPart %i", mIsPart);
-    
 #ifndef KAB_EMBEDDED
  connect( QApplication::clipboard(), SIGNAL( dataChanged() ),
           SLOT( clipboardDataChanged() ) );
 #endif //KAB_EMBEDDED
-                      
  // file menu
  if ( mIsPart ) {
    mActionMail = new KAction( i18n( "&Mail" ), "mail_generic", 0, this,
@@ -1330,13 +1362,13 @@ void KABCore::initActions()
    mActionMail = KStdAction::mail( this, SLOT( sendMail() ), actionCollection() );
    mActionPrint = KStdAction::print( this, SLOT( print() ), actionCollection() );
  }
-  
  mActionSave = new KAction( i18n( "&Save" ), "filesave", CTRL+Key_S, this,
                             SLOT( save() ), actionCollection(), "file_sync" );
-  
  mActionNewContact = new KAction( i18n( "&New Contact..." ), "filenew", CTRL+Key_N, this,
                             SLOT( newContact() ), actionCollection(), "file_new_contact" );
-                             
  mActionMailVCard = new KAction(i18n("Mail &vCard..."), "mail_post_to", 0,
                                 this, SLOT( mailVCard() ),
                                 actionCollection(), "file_mail_vcard");
@@ -1351,7 +1383,7 @@ void KABCore::initActions()
                                      mMainWindow, SLOT( exit() ),
                                      actionCollection(), "quit" );
 #endif //KAB_EMBEDDED
-                                      
  // edit menu
  if ( mIsPart ) {
    mActionCopy = new KAction( i18n( "&Copy" ), "editcopy", CTRL + Key_C, this,
@@ -1387,7 +1419,7 @@ void KABCore::initActions()
  mActionUndo->setEnabled( false );
  mActionRedo->setEnabled( false );
-  
  // settings menu
 #ifdef KAB_EMBEDDED
 //US special menuentry to configure the addressbook resources. On KDE
@@ -1396,12 +1428,12 @@ void KABCore::initActions()
               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" );
-    
    mActionConfigShortcuts = new KAction( i18n( "Configure S&hortcuts..." ), "configure_shortcuts", 0,
                 this, SLOT( configureKeyBindings() ), actionCollection(),
                 "kaddressbook_configure_shortcuts" );
@@ -1409,33 +1441,33 @@ void KABCore::initActions()
  mActionConfigureToolbars = KStdAction::configureToolbars( this, SLOT( mMainWindow->configureToolbars() ), actionCollection() );
  mActionConfigureToolbars->setEnabled( false );
 #endif //KAB_EMBEDDED
-                 
  } else {
    mActionConfigKAddressbook = KStdAction::preferences( this, SLOT( openConfigDialog() ), actionCollection() );
-    
    mActionKeyBindings = KStdAction::keyBindings( this, SLOT( configureKeyBindings() ), actionCollection() );
  }
-  
  mActionJumpBar = new KToggleAction( i18n( "Show Jump Bar" ), 0, 0,
                                      actionCollection(), "options_show_jump_bar" );
  connect( mActionJumpBar, SIGNAL( toggled( bool ) ), SLOT( setJumpButtonBarVisible( bool ) ) );
-  
  mActionDetails = new KToggleAction( i18n( "Show Details" ), 0, 0,
                                      actionCollection(), "options_show_details" );
  connect( mActionDetails, SIGNAL( toggled( bool ) ), SLOT( setDetailsVisible( bool ) ) );
-  
  // misc
  // only enable LDAP lookup if we can handle the protocol
-#ifndef KAB_EMBEDDED  
+#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  
+#else //KAB_EMBEDDED
  //qDebug("KABCore::initActions() LDAP has to be implemented");
-#endif //KAB_EMBEDDED  
+#endif //KAB_EMBEDDED
-  
  mActionWhoAmI = new KAction( i18n( "Set Who Am I" ), "personal", 0, this,
                               SLOT( setWhoAmI() ), actionCollection(),
@@ -1457,7 +1489,7 @@ void KABCore::initActions()
                 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() ) );
@@ -1478,7 +1510,7 @@ void KABCore::addActionsManually()
 #ifdef DESKTOP_VERSION
  QMenuBar* mb = mMainWindow->menuBar();
-  
  //US setup menubar.
  //Disable the following block if you do not want to have a menubar.
  mb->insertItem( "&File", fileMenu );
@@ -1489,15 +1521,15 @@ void KABCore::addActionsManually()
  mb->insertItem( "&Help", helpMenu );
  mIncSearchWidget = new IncSearchWidget( tb );
  // tb->insertWidget(-1, 0, mIncSearchWidget);
-  
-#else  
+#else
  //US setup toolbar
  QMenuBar   *menuBarTB = new QMenuBar( tb );
  QPopupMenu *popupBarTB = new QPopupMenu( this );
  menuBarTB->insertItem( "ME", popupBarTB);
  tb->insertWidget(-1, 0, menuBarTB);
  mIncSearchWidget = new IncSearchWidget( tb );
-  
  tb->enableMoving(false);
  popupBarTB->insertItem( "&File", fileMenu );
  popupBarTB->insertItem( "&Edit", editMenu );
@@ -1518,10 +1550,10 @@ void KABCore::addActionsManually()
  mActionPrint->plug( fileMenu );
  mActionMail->plug( fileMenu );
  fileMenu->insertSeparator();
- 
  mActionNewContact->plug( fileMenu );
  mActionNewContact->plug( tb );
-  
  mActionEditAddressee->plug( fileMenu );
  fileMenu->insertSeparator();
  mActionSave->plug( fileMenu );
@@ -1533,7 +1565,7 @@ void KABCore::addActionsManually()
  mActionQuit->plug( fileMenu );
 #ifdef _WIN32_
  mActionImportOL->plug( ImportMenu  );
-#endif                                     
+#endif
  // edit menu
  mActionUndo->plug( editMenu );
  mActionRedo->plug( editMenu );
@@ -1544,7 +1576,7 @@ void KABCore::addActionsManually()
  mActionDelete->plug( editMenu );
  editMenu->insertSeparator();
  mActionSelectAll->plug( editMenu );
-  
  mActionRemoveVoice->plug( changeMenu );
  // settings menu
 //US special menuentry to configure the addressbook resources. On KDE
@@ -1553,32 +1585,32 @@ void KABCore::addActionsManually()
  settingsMenu->insertSeparator();
  mActionConfigKAddressbook->plug( settingsMenu );
-    
  if ( mIsPart ) {
    mActionConfigShortcuts->plug( settingsMenu );
    mActionConfigureToolbars->plug( settingsMenu );
-  
  } else {
    mActionKeyBindings->plug( settingsMenu );
  }
-  
  settingsMenu->insertSeparator();
-  
  mActionJumpBar->plug( settingsMenu );
  mActionDetails->plug( settingsMenu );
  settingsMenu->insertSeparator();
  mActionWhoAmI->plug( settingsMenu );
  mActionCategories->plug( settingsMenu );
-  
  mActionAboutKAddressbook->plug( helpMenu );
-  
  if (QApplication::desktop()->width() > 320 ) {
      mActionEditAddressee->plug( tb );
      mActionSave->plug( tb );
-      mViewManager->getFilterAction()->plug ( tb); 
+      mViewManager->getFilterAction()->plug ( tb);
      if (QApplication::desktop()->width() > 480 ) {
        mActionUndo->plug( tb );
        mActionDelete->plug( tb );
@@ -1587,22 +1619,22 @@ void KABCore::addActionsManually()
  }
  //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  
+/*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
 }
 void KABCore::removeVoice()
@@ -1623,7 +1655,7 @@ void KABCore::removeVoice()
                    found = true;
                }
            }
-            
        }
        if ( found )
            contactModified((*it) );
@@ -1634,7 +1666,7 @@ void KABCore::removeVoice()
 void KABCore::clipboardDataChanged()
 {
-  
  if ( mReadWrite )
    mActionPaste->setEnabled( !QApplication::clipboard()->text().isEmpty() );
@@ -1673,7 +1705,7 @@ void KABCore::configureKeyBindings()
 void KABCore::configureResources()
 {
  KRES::KCMKResources dlg( this, "" , 0 );
-  
  if ( !dlg.exec() )
    return;
  KMessageBox::information( this,  i18n("Please restart to get the \nchanged resources (re)loaded!\n") );
diff --git a/kaddressbook/kabprefs.cpp b/kaddressbook/kabprefs.cpp
index 5b3b1ab..8bd4b15 100644
--- a/kaddressbook/kabprefs.cpp
+++ b/kaddressbook/kabprefs.cpp
@@ -1,23 +1,23 @@
-/*                                                                      
+/*
-    This file is part of KAddressBook.                                  
+    This file is part of KAddressBook.
-    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>                   
+    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>
-                                                                        
    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   
+    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.                                 
+    (at your option) any later version.
-                                                                        
-    This program is distributed in the hope that it will be useful,     
+    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of      
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-    GNU General Public License for more details.                        
+    GNU General Public License for more details.
-                                                                        
-    You should have received a copy of the GNU General Public License   
+    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software         
+    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
+    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-                                                                        
-    As a special exception, permission is given to link this program    
+    As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,    
+    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
@@ -46,12 +46,15 @@ KABPrefs::KABPrefs()
  addItemBool( "AutomaticNameParsing", &mAutomaticNameParsing, true );
  addItemInt( "CurrentIncSearchField", &mCurrentIncSearchField, 0 );
-#ifdef KAB_EMBEDDED  
+#ifdef KAB_EMBEDDED
-  addItemBool("AskForQuit",&mAskForQuit,false); 
+  addItemBool("AskForQuit",&mAskForQuit,false);
  addItemBool("ToolBarHor",&mToolBarHor, true );
  addItemBool("ToolBarUp",&mToolBarUp, false );
+  addItemInt( "EmailChannelType", &mEmailClient, OMPI );
+  addItemString( "EmailChannelOther", &mEmailChannel, "" );
 #endif //KAB_EMBEDDED
-  
  KPrefs::setCurrentGroup( "MainWindow" );
  addItemBool( "JumpButtonBarVisible", &mJumpButtonBarVisible, false );
  addItemBool( "DetailsPageVisible", &mDetailsPageVisible, true );
@@ -97,7 +100,7 @@ KABPrefs *KABPrefs::instance()
 void KABPrefs::setCategoryDefaults()
 {
  mCustomCategories.clear();
-  
  mCustomCategories << i18n( "Business" ) << i18n( "Family" ) << i18n( "School" )
                    << i18n( "Customer" ) << i18n( "Friend" );
 }
diff --git a/kaddressbook/kabprefs.h b/kaddressbook/kabprefs.h
index 370fc5b..c81a9a9 100644
--- a/kaddressbook/kabprefs.h
+++ b/kaddressbook/kabprefs.h
@@ -1,25 +1,25 @@
-/*                                                                      
+/*
-    This file is part of KAddressBook.                                  
+    This file is part of KAddressBook.
-    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>                   
+    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>
-                                                                        
    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   
+    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.                                 
+    (at your option) any later version.
-                                                                        
-    This program is distributed in the hope that it will be useful,     
+    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of      
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-    GNU General Public License for more details.                        
+    GNU General Public License for more details.
-                                                                        
-    You should have received a copy of the GNU General Public License   
+    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software         
+    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
+    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-                                                                        
-    As a special exception, permission is given to link this program    
+    As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,    
+    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
-*/                                       
+*/
 #ifndef KABPREFS_H
 #define KABPREFS_H
@@ -36,7 +36,15 @@ class KABPrefs : public KPimPrefs
    virtual ~KABPrefs();
    static KABPrefs *instance();
-    
+  enum EMailClients {
+    OMPI = 0,
+    QTOPIA = 1,
+    OPIE = 2,
+    OTHER = 3
+  };
    // General
    bool mHonorSingleClick;
    bool mAutomaticNameParsing;
@@ -49,6 +57,10 @@ class KABPrefs : public KPimPrefs
    bool mToolBarHor;
    bool mToolBarUp;
    bool mAskForQuit;
+    int mEmailClient;
+    QString mEmailChannel;
    /** Set preferences to default values */
 //    void usrSetDefaults();
@@ -59,7 +71,7 @@ class KABPrefs : public KPimPrefs
 //    void usrWriteConfig();
 #endif //KAB_EMBEDDED
-                
    // GUI
    bool mJumpButtonBarVisible;
    bool mDetailsPageVisible;
@@ -78,10 +90,10 @@ class KABPrefs : public KPimPrefs
    int mCurrentFilter;
    void setCategoryDefaults();
-    
  private:
    KABPrefs();
-    
    static KABPrefs *sInstance;
 };
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
index 38c7946..1bac26f 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
@@ -1,25 +1,25 @@
-/*                                                                      
+/*
-    This file is part of KAddressBook.                                  
+    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   
+    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.                                 
+    (at your option) any later version.
-                                                                        
-    This program is distributed in the hope that it will be useful,     
+    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of      
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-    GNU General Public License for more details.                        
+    GNU General Public License for more details.
-                                                                        
-    You should have received a copy of the GNU General Public License   
+    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software         
+    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
+    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-                                                                        
-    As a special exception, permission is given to link this program    
+    As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,    
+    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
-*/                                                                      
+*/
 #include <qcheckbox.h>
 #include <qframe.h>
@@ -27,6 +27,10 @@
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include <qtabwidget.h>
+#include <qcombobox.h>
+#include <qlineedit.h>
+#include <qlabel.h>
+#include <qfile.h>
 #include <kconfig.h>
 #include <kdebug.h>
@@ -75,9 +79,9 @@ class ExtensionItem : public QCheckListItem
    ExtensionFactory* mFactory;
    QString mName;
    QString mComment;
-    
 #endif //KAB_EMBEDDED
-  
 };
 KABConfigWidget::KABConfigWidget( QWidget *parent, const char *name )
@@ -93,7 +97,7 @@ KABConfigWidget::KABConfigWidget( QWidget *parent, const char *name )
  QWidget *generalPage = new QWidget( this );
  QVBoxLayout *layout = new QVBoxLayout( generalPage, KDialog::marginHintSmall(),
                                            KDialog::spacingHintSmall() );
+  //general groupbox
  QGroupBox *groupBox = new QGroupBox( 0, Qt::Vertical, i18n( "General" ), generalPage );
  QVBoxLayout *boxLayout = new QVBoxLayout( groupBox->layout() );
  boxLayout->setAlignment( Qt::AlignTop );
@@ -109,6 +113,9 @@ KABConfigWidget::KABConfigWidget( QWidget *parent, const char *name )
  layout->addWidget( groupBox );
+  //extensions groupbox
  groupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Extensions" ), generalPage );
  boxLayout = new QVBoxLayout( groupBox->layout() );
  boxLayout->setAlignment( Qt::AlignTop );
@@ -121,7 +128,7 @@ KABConfigWidget::KABConfigWidget( QWidget *parent, const char *name )
  mExtensionView->addColumn( i18n( "Name" ) );
  mExtensionView->addColumn( i18n( "Description" ) );
  mExtensionView->setMaximumHeight(80);
-  
  boxLayout->addWidget( mExtensionView );
  mConfigureButton = new QPushButton( i18n( "Configure..." ), groupBox );
@@ -145,8 +152,96 @@ KABConfigWidget::KABConfigWidget( QWidget *parent, const char *name )
  mAddresseeWidget = new AddresseeWidget( this );
  tabWidget->addTab( mAddresseeWidget, i18n( "Contact" ) );
  connect( mAddresseeWidget, SIGNAL( modified() ), SLOT( modified() ) );
+  // mailclient page
+  QWidget *mailclientPage = new QWidget( this );
+  layout = new QVBoxLayout( mailclientPage, KDialog::marginHintSmall(),
+                                            KDialog::spacingHintSmall() );
+  groupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Used Mail Client" ), mailclientPage );
+  boxLayout = new QVBoxLayout( groupBox->layout() );
+  boxLayout->setAlignment( Qt::AlignTop );
+//  boxLayout->setMargin(KDialog::marginHintSmall() );
+//  groupBox->layout()->setMargin(KDialog::marginHintSmall()) ;
+//  groupBox->layout()->setSpacing(KDialog::spacingHintSmall());
+//  boxLayout->setSpacing( KDialog::spacingHintSmall() );
+  mEmailClient = new QComboBox( groupBox );
+  mEmailClient->insertItem( i18n("OM/Pi"), KABPrefs::OMPI );
+  mEmailClient->insertItem( i18n("Qtopia mail"), KABPrefs::QTOPIA );
+  mEmailClient->insertItem( i18n("Opie mail"), KABPrefs::OPIE );
+  mEmailClient->insertItem( i18n("Other"), KABPrefs::OTHER );
+  boxLayout->addWidget( mEmailClient );
+  connect( mEmailClient, SIGNAL( activated( int ) ),
+           this, SLOT (emailclient_changed( int ) ) );
+  QLabel* lab = new QLabel( i18n("Channel:"), groupBox);
+  boxLayout->addWidget( lab );
+  mEmailChannel = new QLineEdit(groupBox);
+  mEmailChannel->setReadOnly(true);
+  boxLayout->addWidget( mEmailChannel );
+  layout->addWidget( groupBox );
+  tabWidget->addTab( mailclientPage, i18n( "Mail" ) );
 }
+void KABConfigWidget::emailclient_changed( int newClient )
+{
+  if (newClient == KABPrefs::OTHER)
+    mEmailChannel->setReadOnly(false);
+  else
+    mEmailChannel->setReadOnly(true);
+  QString opiepath = QString::fromLatin1( getenv("OPIEDIR") );
+  QString qtopiapath = QString::fromLatin1( getenv("QPEDIR") );
+  if (opiepath.isEmpty())
+    opiepath = qtopiapath;
+  QString text = mEmailChannel->text();
+  if (newClient == KABPrefs::OPIE)
+  {
+    if ( QFile::exists( opiepath + "/bin/opiemail" ))
+      text = "QPE/Application/opiemail";
+    else
+      text = "FILENOTFOUND: " + opiepath + "/bin/opiemail";
+  }
+  else  if (newClient == KABPrefs::QTOPIA)
+  {
+    if ( QFile::exists( qtopiapath + "/bin/qtmail" ))
+      text = "QPE/Application/qtmail";
+    else
+      text = "FILENOTFOUND: " + qtopiapath + "/bin/qtmail";
+  }
+  else  if (newClient == KABPrefs::OMPI)
+  {
+    if ( QFile::exists( qtopiapath + "/bin/ompi" ))
+      text = "QPE/Application/ompi";
+    else if ( QFile::exists( opiepath + "/bin/ompi" ))
+      text = "QPE/Application/ompi";
+    else
+      text = "FILENOTFOUND: " + qtopiapath + "/bin/ompi";
+  }
+  else
+  {
+    //do nothing if we choosed other
+  }
+  mEmailChannel->setText( text );
+}
 void KABConfigWidget::restoreSettings()
 {
  bool blocked = signalsBlocked();
@@ -154,6 +249,10 @@ void KABConfigWidget::restoreSettings()
  mNameParsing->setChecked( KABPrefs::instance()->mAutomaticNameParsing );
  mViewsSingleClickBox->setChecked( KABPrefs::instance()->mHonorSingleClick );
+  mEmailChannel->setText( KABPrefs::instance()->mEmailChannel );
+  mEmailClient->setCurrentItem(KABPrefs::instance()->mEmailClient);
  mAddresseeWidget->restoreSettings();
  restoreExtensionSettings();
@@ -167,6 +266,10 @@ void KABConfigWidget::saveSettings()
 {
  KABPrefs::instance()->mAutomaticNameParsing = mNameParsing->isChecked();
  KABPrefs::instance()->mHonorSingleClick = mViewsSingleClickBox->isChecked();
+  KABPrefs::instance()->mEmailClient = mEmailClient->currentItem();
+  KABPrefs::instance()->mEmailChannel = mEmailChannel->text();
  mAddresseeWidget->saveSettings();
  saveExtensionSettings();
@@ -180,6 +283,10 @@ void KABConfigWidget::defaults()
  mNameParsing->setChecked( true );
  mViewsSingleClickBox->setChecked( false );
+  mEmailClient->setCurrentItem(KABPrefs::OMPI);
+  emailclient_changed( KABPrefs::OMPI );
  emit changed( true );
 }
@@ -210,24 +317,24 @@ void KABConfigWidget::restoreExtensionSettings()
    ExtensionFactory *extensionFactory = new MergeFactory();
    ExtensionItem *item = new ExtensionItem( mExtensionView, "Merge",  "Merge", "Merge contacts");
-    
    item->setFactory( extensionFactory );
    if ( activeExtensions.contains( extensionFactory->identifier() ) )
      item->setOn( true );
-      
-      
    extensionFactory = new DistributionListFactory();
    item = new ExtensionItem( mExtensionView, "Distribution List",  "Distribution List", "Manage Distribution Lists");
-    
    item->setFactory( extensionFactory );
    if ( activeExtensions.contains( extensionFactory->identifier() ) )
      item->setOn( true );
-            
-      
 #endif //KAB_EMBEDDED
-  
 }
 void KABConfigWidget::saveExtensionSettings()
@@ -317,7 +424,7 @@ bool ExtensionItem::configWidgetAvailable() const
  ExtensionFactory *extensionFactory = static_cast<ExtensionFactory*>( factory );
  if ( !extensionFactory )
    return false;
-  
  return extensionFactory->configureWidgetAvailable();
 #else //KAB_EMBEDDED
  return mFactory->configureWidgetAvailable();
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.h b/kaddressbook/kcmconfigs/kabconfigwidget.h
index 0f36d9e..9d1363b 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.h
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.h
@@ -1,25 +1,25 @@
-/*                                                                      
+/*
-    This file is part of KAddressBook.                                  
+    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   
+    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.                                 
+    (at your option) any later version.
-                                                                        
-    This program is distributed in the hope that it will be useful,     
+    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of      
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-    GNU General Public License for more details.                        
+    GNU General Public License for more details.
-                                                                        
-    You should have received a copy of the GNU General Public License   
+    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software         
+    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
+    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-                                                                        
-    As a special exception, permission is given to link this program    
+    As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,    
+    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
-*/                                                                      
+*/
 #ifndef KABCONFIGWIDGET_H
 #define KABCONFIGWIDGET_H
@@ -29,7 +29,8 @@
 class QCheckBox;
 class QListViewItem;
 class QPushButton;
+class QComboBox;
+class QLineEdit;
 class KListView;
 class AddresseeWidget;
@@ -37,10 +38,10 @@ class AddresseeWidget;
 class KABConfigWidget : public QWidget
 {
  Q_OBJECT
-  
  public:
    KABConfigWidget( QWidget *parent, const char *name = 0 );
-    
    void restoreSettings();
    void saveSettings();
    void defaults();
@@ -51,10 +52,13 @@ class KABConfigWidget : public QWidget
  public slots:
    void modified();
  private slots:
    void configureExtension();
    void selectionChanged( QListViewItem* );
    void itemClicked( QListViewItem* );
+    void emailclient_changed( int newClient );
  private:
    void restoreExtensionSettings();
@@ -65,6 +69,8 @@ class KABConfigWidget : public QWidget
    QCheckBox *mNameParsing;
    QCheckBox *mViewsSingleClickBox;
    QPushButton *mConfigureButton;
+    QComboBox* mEmailClient;
+    QLineEdit* mEmailChannel;
    AddresseeWidget *mAddresseeWidget;
 };
diff --git a/microkde/kdialogbase.cpp b/microkde/kdialogbase.cpp
index c953058..d1f7630 100644
--- a/microkde/kdialogbase.cpp
+++ b/microkde/kdialogbase.cpp
@@ -16,7 +16,7 @@ KDialogBase::KDialogBase()
 KDialogBase::KDialogBase( QWidget *parent, const char *name, bool modal,
             const QString &caption,
             int buttonMask, ButtonCode defaultButton,
-             bool separator, 
+             bool separator,
             const QString &user1,
             const QString &user2,
             const QString &user3) :
@@ -28,9 +28,9 @@ KDialogBase::KDialogBase( QWidget *parent, const char *name, bool modal,
 }
-KDialogBase::KDialogBase( int dialogFace, const QString &caption, 
+KDialogBase::KDialogBase( int dialogFace, const QString &caption,
-             int buttonMask, ButtonCode defaultButton, 
+             int buttonMask, ButtonCode defaultButton,
-             QWidget *parent, const char *name, bool modal, 
+             QWidget *parent, const char *name, bool modal,
             bool separator,
             const QString &user1,
             const QString &user2,
@@ -78,7 +78,6 @@ void KDialogBase::init( const QString &caption, int buttonMask,
    mOkButton = 0;
  }
  if ( buttonMask & Default ) {
-     qDebug("buttonMask & Default ");
    mDefaultButton = new QPushButton( i18n("Default"), this );
    connect( mDefaultButton, SIGNAL( clicked() ), SIGNAL( defaultClicked() ) );
  } else {
@@ -104,7 +103,7 @@ void KDialogBase::init( const QString &caption, int buttonMask,
    connect( mCloseButton, SIGNAL( clicked() ), SLOT( slotClose() ) );
  } else {
    mCloseButton = 0;
-  } 
+  }
 }
 QTabWidget *KDialogBase::tabWidget()
@@ -125,21 +124,21 @@ void KDialogBase::hideButtons()
    if ( mDefaultButton ) mDefaultButton->hide();
    if ( mCancelButton ) mCancelButton->hide()  ;
    if ( mCloseButton ) mCloseButton->hide()  ;
-  
 }
 void KDialogBase::initLayout()
 {
- 
  delete mTopLayout;
  mTopLayout = new QVBoxLayout( this );
  mTopLayout->setMargin( marginHint() );
  mTopLayout->setSpacing( spacingHint() );
-  
  mTopLayout->addWidget( mMainWidget );
-  
  QBoxLayout *buttonLayout = new QHBoxLayout;
  mTopLayout->addLayout( buttonLayout );
-  
  if ( mUser1Button ) buttonLayout->addWidget( mUser1Button );
  if ( mUser2Button ) buttonLayout->addWidget( mUser2Button );
  if ( mOkButton ) buttonLayout->addWidget( mOkButton );
@@ -205,7 +204,7 @@ QPushButton *KDialogBase::findButton( ButtonCode id )
      break;
    case Cancel:
      button = mCancelButton;
-      break;  
+      break;
    case Default:
      button = mDefaultButton;
      break;
@@ -213,7 +212,7 @@ QPushButton *KDialogBase::findButton( ButtonCode id )
      button = mCloseButton;
      break;
    default:
-      break;      
+      break;
  }
  return button;
 }
diff --git a/microkde/kutils/kcmultidialog.cpp b/microkde/kutils/kcmultidialog.cpp
index 4136622..13be2ce 100644
--- a/microkde/kutils/kcmultidialog.cpp
+++ b/microkde/kutils/kcmultidialog.cpp
@@ -43,17 +43,20 @@ KCMultiDialog::KCMultiDialog(const QString& baseGroup, QWidget *parent, const ch
 {
    enableButton(Apply, false);
    //connect(this, SIGNAL(aboutToShowPage(QWidget *)), this, SLOT(slotAboutToShow(QWidget *)));
+  connect( this, SIGNAL( defaultClicked() ), SLOT( slotDefault() ) );
  _baseGroup = baseGroup;
  mMainWidget = new KJanusWidget( this, "JanusWidget", KJanusWidget::Tabbed );
  setMainWidget(mMainWidget );
 #ifdef DESKTOP_VERSION
    resize(640,480);
 #else
-    resize(640,480);  
+    resize(640,480);
    setMaximumSize( KMIN(KGlobal::getDesktopWidth()-5, 640), KMIN(KGlobal::getDesktopHeight()-20, 480));
    //showMaximized();
 #endif
-  
 }
 KCMultiDialog::~KCMultiDialog()
@@ -65,7 +68,7 @@ void KCMultiDialog::slotDefault()
 {
    int curPageIndex = mMainWidget->activePageIndex();
-    
    QPtrListIterator<KCModule> it(modules);
    for (; it.current(); ++it)
    {
@@ -76,7 +79,7 @@ void KCMultiDialog::slotDefault()
          return;
       }
    }
-    
 }
 void KCMultiDialog::slotApply()
@@ -89,14 +92,14 @@ qDebug("KCMultiDialog::slotApply clicked");
    clientChanged(false);
    emit applyClicked();
-    
 }
 void KCMultiDialog::slotOk()
 {
 qDebug("KCMultiDialog::slotOk clicked");
-    
    QPtrListIterator<KCModule> it(modules);
    for (; it.current(); ++it)
      (*it)->save();
@@ -119,7 +122,7 @@ void KCMultiDialog::slotHelp()
    } else {
        new KRun(url);
    }
-*/    
+*/
 }
 void KCMultiDialog::clientChanged(bool state)
@@ -127,7 +130,7 @@ void KCMultiDialog::clientChanged(bool state)
    enableButton(Apply, state);
 }
-/*US    
+/*US
 void KCMultiDialog::addModule(const QString& path, bool withfallback)
 {
    kdDebug(1208) << "KCMultiDialog::addModule " << path << endl;
@@ -157,7 +160,7 @@ void KCMultiDialog::addModule(KCModule* module ) //, const QString& modulename,
    modules.append(module);
    connect(module, SIGNAL(changed(bool)), this, SLOT(clientChanged(bool)));
-    
 }
@@ -197,5 +200,5 @@ void KCMultiDialog::slotAboutToShow(QWidget *page)
    QApplication::restoreOverrideCursor();
 */
-qDebug("KCMultiDialog::slotAboutToShow not implemented");    
+qDebug("KCMultiDialog::slotAboutToShow not implemented");
 }