1 files changed, 8 insertions, 102 deletions

diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
index 1bac26f..b5309c0 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
@@ -124,198 +124,104 @@ KABConfigWidget::KABConfigWidget( QWidget *parent, const char *name )
   groupBox->layout()->setMargin(1) ;
   groupBox->layout()->setSpacing(0);
   mExtensionView = new KListView( groupBox );
   mExtensionView->setAllColumnsShowFocus( true );
   mExtensionView->addColumn( i18n( "Name" ) );
   mExtensionView->addColumn( i18n( "Description" ) );
   mExtensionView->setMaximumHeight(80);
 
   boxLayout->addWidget( mExtensionView );
 
   mConfigureButton = new QPushButton( i18n( "Configure..." ), groupBox );
   mConfigureButton->setEnabled( false );
   boxLayout->addWidget( mConfigureButton );
 
   layout->addWidget( groupBox );
 
   connect( mNameParsing, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) );
   connect( mViewsSingleClickBox, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) );
   connect( mExtensionView, SIGNAL( selectionChanged( QListViewItem* ) ),
            SLOT( selectionChanged( QListViewItem* ) ) );
   connect( mExtensionView, SIGNAL( clicked( QListViewItem* ) ),
            SLOT( itemClicked( QListViewItem* ) ) );
   connect( mConfigureButton, SIGNAL( clicked() ),
            SLOT( configureExtension() ) );
 
   tabWidget->addTab( generalPage, i18n( "General" ) );
 
   // Addressee page
   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 )
+void KABConfigWidget::restoreSettings(KABPrefs* prefs)
 {
-  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";
+//US  prefs was KABPrefs::instance() before
 
-  }
-  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();
   blockSignals( true );
 
-  mNameParsing->setChecked( KABPrefs::instance()->mAutomaticNameParsing );
-  mViewsSingleClickBox->setChecked( KABPrefs::instance()->mHonorSingleClick );
-
-  mEmailChannel->setText( KABPrefs::instance()->mEmailChannel );
-  mEmailClient->setCurrentItem(KABPrefs::instance()->mEmailClient);
+  mNameParsing->setChecked( prefs->mAutomaticNameParsing );
+  mViewsSingleClickBox->setChecked( prefs->mHonorSingleClick );
 
   mAddresseeWidget->restoreSettings();
 
   restoreExtensionSettings();
 
   blockSignals( blocked );
 
   emit changed( false );
 }
 
-void KABConfigWidget::saveSettings()
+void KABConfigWidget::saveSettings(KABPrefs* prefs)
 {
-  KABPrefs::instance()->mAutomaticNameParsing = mNameParsing->isChecked();
-  KABPrefs::instance()->mHonorSingleClick = mViewsSingleClickBox->isChecked();
-
-  KABPrefs::instance()->mEmailClient = mEmailClient->currentItem();
-  KABPrefs::instance()->mEmailChannel = mEmailChannel->text();
+  prefs->mAutomaticNameParsing = mNameParsing->isChecked();
+  prefs->mHonorSingleClick = mViewsSingleClickBox->isChecked();
 
   mAddresseeWidget->saveSettings();
 
   saveExtensionSettings();
   KABPrefs::instance()->writeConfig();
 
   emit changed( false );
 }
 
-void KABConfigWidget::defaults()
+void KABConfigWidget::defaults(KABPrefs* prefs)
 {
   mNameParsing->setChecked( true );
   mViewsSingleClickBox->setChecked( false );
 
-  mEmailClient->setCurrentItem(KABPrefs::OMPI);
-  emailclient_changed( KABPrefs::OMPI );
-
-
   emit changed( true );
 }
 
 void KABConfigWidget::modified()
 {
   emit changed( true );
 }
 
 void KABConfigWidget::restoreExtensionSettings()
 {
   QStringList activeExtensions = KABPrefs::instance()->mActiveExtensions;
 
   mExtensionView->clear();
 
 #ifndef KAB_EMBEDDED
   KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/Extension" );
   KTrader::OfferList::ConstIterator it;
   for ( it = plugins.begin(); it != plugins.end(); ++it ) {
     if ( !(*it)->hasServiceType( "KAddressBook/Extension" ) )
       continue;
 
     ExtensionItem *item = new ExtensionItem( mExtensionView, (*it)->name() );
     item->setService( *it );
     if ( activeExtensions.contains( item->factory()->identifier() ) )
       item->setOn( true );
   }
 #else //KAB_EMBEDDED
     ExtensionFactory *extensionFactory = new MergeFactory();
 
     ExtensionItem *item = new ExtensionItem( mExtensionView, "Merge",  "Merge", "Merge contacts");
 
     item->setFactory( extensionFactory );