4 files changed, 52 insertions, 73 deletions

diff --git a/kaddressbook/kabprefs.cpp b/kaddressbook/kabprefs.cpp
index 03c5e76..2425158 100644
--- a/kaddressbook/kabprefs.cpp
+++ b/kaddressbook/kabprefs.cpp
@@ -1,130 +1,130 @@
 /*
     This file is part of KAddressBook.
     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
     (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.
 */
 
 //US#ifdef KAB_EMBEDDED
 //#include <qstring.h>
 //#endif //KAB_EMBEDDED
 
 
 #include <kconfig.h>
 #include <klocale.h>
 #include <kstaticdeleter.h>
 //US#include <kdebug.h> // defines kdDebug()
 
 #include "kabprefs.h"
 
 KABPrefs *KABPrefs::sInstance = 0;
 static KStaticDeleter<KABPrefs> staticDeleter;
 
 KABPrefs::KABPrefs()
   : KPimPrefs("kaddressbookrc")
 {
   KPrefs::setCurrentGroup( "Views" );
   addItemBool( "HonorSingleClick", &mHonorSingleClick, false );
 
   KPrefs::setCurrentGroup( "General" );
   addItemBool( "AutomaticNameParsing", &mAutomaticNameParsing, true );
   addItemInt( "CurrentIncSearchField", &mCurrentIncSearchField, 0 );
 
 #ifdef KAB_EMBEDDED
-  addItemBool("AskForQuit",&mAskForQuit,false);
+  addItemBool("AskForQuit",&mAskForQuit,true);
   addItemBool("ToolBarHor",&mToolBarHor, true );
   addItemBool("ToolBarUp",&mToolBarUp, false );
 
 #endif //KAB_EMBEDDED
 
   KPrefs::setCurrentGroup( "MainWindow" );
   addItemBool( "JumpButtonBarVisible", &mJumpButtonBarVisible, false );
   addItemBool( "DetailsPageVisible", &mDetailsPageVisible, true );
   addItemIntList( "ExtensionsSplitter", &mExtensionsSplitter );
   addItemIntList( "DetailsSplitter", &mDetailsSplitter );
   addItemBool( "MultipleViewsAtOnce", &mMultipleViewsAtOnce, true );
 
 
   KPrefs::setCurrentGroup( "Extensions_General" );
   QStringList defaultExtensions;
   defaultExtensions << "merge";
   defaultExtensions << "distribution_list_editor";
   addItemInt( "CurrentExtension", &mCurrentExtension, 0 );
   addItemStringList( "ActiveExtensions", &mActiveExtensions, defaultExtensions );
 
   KPrefs::setCurrentGroup( "Views" );
   QString defaultView = i18n( "Default Table View" );
   addItemString( "CurrentView", &mCurrentView, defaultView );
   addItemStringList( "ViewNames", &mViewNames, defaultView );
 
   KPrefs::setCurrentGroup( "Filters" );
   addItemInt( "CurrentFilter", &mCurrentFilter, 0 );
 
 }
 
 KABPrefs::~KABPrefs()
 {
 }
 
 KABPrefs *KABPrefs::instance()
 {
   if ( !sInstance ) {
 #ifdef KAB_EMBEDDED
     sInstance = staticDeleter.setObject( new KABPrefs() );
 #else  //KAB_EMBEDDED
     //US the following line has changed ???. Why
     staticDeleter.setObject( sInstance, new KABPrefs() );
 #endif //KAB_EMBEDDED
     sInstance->readConfig();
   }
 
   return sInstance;
 }
 
 void KABPrefs::setCategoryDefaults()
 {
   mCustomCategories.clear();
 
   mCustomCategories << i18n( "Business" ) << i18n( "Family" ) << i18n( "School" )
                     << i18n( "Customer" ) << i18n( "Friend" );
 }
 
     // US introduce a nonconst way to return the config object.
 KConfig* KABPrefs::getConfig()
 {
     return config();
 }
 
 
 /*US
 void KABPrefs::usrSetDefaults()
 {
   KPimPrefs::usrSetDefaults();
 }
 
 void KABPrefs::usrReadConfig()
 {
   KPimPrefs::usrReadConfig();
 }
 
 void KABPrefs::usrWriteConfig()
 {
   KPimPrefs::usrWriteConfig();
 }
 */
diff --git a/kaddressbook/kaddressbookmain.cpp b/kaddressbook/kaddressbookmain.cpp
index 8ebb93a..f48f214 100644
--- a/kaddressbook/kaddressbookmain.cpp
+++ b/kaddressbook/kaddressbookmain.cpp
@@ -1,276 +1,240 @@
 /*
     This file is part of KAddressbook.
     Copyright (c) 1999 Don Sanders <dsanders@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.
 */
 
 #ifdef KAB_EMBEDDED
 #include "kabprefs.h"
 #include <kglobal.h>
 #include <qmessagebox.h>
 #include <qtoolbar.h>
 #include <qapplication.h>
 #else //KAB_EMBEDDED
 #include <kedittoolbar.h>
 #include <kkeydialog.h>
 #include <kmessagebox.h>
 #include <kstatusbar.h>
 #endif //KAB_EMBEDDED
 #include <klocale.h>
 
 #include "kabcore.h"
 #include "kaddressbookmain.h"
 #include "kactioncollection.h"
 
 #ifdef KAB_EMBEDDED
 KAddressBookMain::KAddressBookMain() : KMainWindow( 0, "adrressbook" )
 #else //KAB_EMBEDDED
 //MOC_SKIP_BEGIN
 KAddressBookMain::KAddressBookMain() : DCOPObject( "KAddressBookIface" ), KMainWindow( 0 ) 
 //MOC_SKIP_END
 #endif //KAB_EMBEDDED
 { 
 
     setIcon(SmallIcon( "ka24" )  );
 #if 0
   //US for embedded systems, create the toolbar before we initiate KABCore.
   // KABCore will fill the toolbar with menues and icons
   QMainWindow::ToolBarDock tbd;
   tbd = Top;
   iconToolBar = new QToolBar( this );
   addToolBar (iconToolBar , tbd );
   iconToolBar->setHorizontalStretchable(true);  
 //US  iconToolBar->setWidth(300);
 #endif // 0
 
   mCore = new KABCore( this, true, this );
   
 #ifdef KAB_EMBEDDED
   setCaption( i18n( "KAddressbook/Pi" ) );
 #else //KAB_EMBEDDED
   setCaption( i18n( "Address Book Browser" ) );
 #endif //KAB_EMBEDDED
 
   //mCore->restoreSettings();
 
   initActions();
 
   setCentralWidget( mCore );
 
 //US  statusBar()->show();
 
 #ifndef KAB_EMBEDDED
   setStandardToolBarMenuEnabled(true);
   
   createGUI( "kaddressbookui.rc", false );
 
 
 #endif //KAB_EMBEDDED
   setAutoSaveSettings();
   qApp->processEvents();
   mCore->restoreSettings();
 }
 
 KAddressBookMain::~KAddressBookMain()
 {
     // mCore->saveSettings();
 }
 
 void KAddressBookMain::showMinimized () 
 {
     QWidget::showMinimized () ;
 }
 void KAddressBookMain::addEmail( QString addr )
 {
   mCore->addEmail( addr );
 }
 
 #ifndef KAB_EMBEDDED
 ASYNC KAddressBookMain::showContactEditor( QString uid )
 {
   mCore->editContact( uid );
 }
 #endif //KAB_EMBEDDED
 void KAddressBookMain::newContact()
 {
   mCore->newContact();
 }
 
 QString KAddressBookMain::getNameByPhone( QString phone )
 {
   return mCore->getNameByPhone( phone );
 }
 
 void KAddressBookMain::save()
 {
   mCore->save();
 }
 
 void KAddressBookMain::exit()
 {
   close( );
 }
 
 void KAddressBookMain::saveProperties( KConfig* )
 {
 }
 
 void KAddressBookMain::readProperties( KConfig* )
 {
 }
 
 void KAddressBookMain::initActions()
 {
 #ifndef KAB_EMBEDDED
   KStdAction::quit( this, SLOT( close() ), actionCollection() );
   KStdAction::configureToolbars( this, SLOT( configureToolbars() ), actionCollection() );
 #else //KAB_EMBEDDED
   //US: transfered the setup of the actions into KABCore
 #endif //KAB_EMBEDDED
 
   
 }
 
 //US new method to setup menues and toolbars on embedded systems
 #ifdef KAB_EMBEDDED
 /*
 QToolBar * KAddressBookMain::getIconToolBar()
 {
   return iconToolBar;
 }
 */
 
 void KAddressBookMain::createGUI()
 {
 
 
     
 }
 #endif //KAB_EMBEDDED
 
 void KAddressBookMain::configureToolbars()
 {
 #ifndef KAB_EMBEDDED
   saveMainWindowSettings( KGlobal::config(), "MainWindow" );
 
   KEditToolbar dlg( factory() );
   connect( &dlg, SIGNAL( newToolbarConfig() ), SLOT( slotNewToolbarConfig() ) );
 
   dlg.exec();
 #else  //KAB_EMBEDDED
     qDebug("KAddressBookMain::configureToolbars() not implemented by ulf" );
 #endif //KAB_EMBEDDED
 }
 
 void KAddressBookMain::slotNewToolbarConfig()
 {
 #ifndef KAB_EMBEDDED
   applyMainWindowSettings( KGlobal::config(), "MainWindow" );
 #else  //KAB_EMBEDDED
     qDebug("KAddressBookMain::slotNewToolbarConfig() not implemented by ulf" );
 #endif //KAB_EMBEDDED
 }
 
 void KAddressBookMain::configureKeys()
 {
 #ifndef KAB_EMBEDDED
   KKeyDialog::configureKeys( actionCollection(), xmlFile(), true, this );
 #else  //KAB_EMBEDDED
     qDebug("KAddressBookMain::configureKeys() not implemented by ulf" );
 #endif //KAB_EMBEDDED
 }
 
 void KAddressBookMain::closeEvent( QCloseEvent* ce )
 {
-    QString mess = i18n( "Close KA/Pi?");
-    if ( mCore->modified() ) 
-        mess += i18n( "\n\nChanges will be saved!");
-    else
-        mess += i18n( "\n\nNo unsaved changes detected!\nNothing will be  saved!");
-
- switch( QMessageBox::information( this, "KA/Pi", mess ,
-                                      i18n("Yes!"), i18n("No"), 0, 0 ) ) {
-    case 0:
-     
-        break;
-    case 1:
-        return;
-              break;
-    case 2:
-        return;
-              break;
-
-    default:
-        return;
-      break;
-    }
+  bool mModified = mCore->modified();
+  bool mAskForQuit = KABPrefs::instance()->mAskForQuit;
 
-#if 0
+  QString mess = i18n( "Close KA/Pi?");
+  if ( mModified == true ) 
+      mess += i18n( "\nChanges will be saved!");
+  else
+      mess += i18n( "\nNo unsaved changes detected!\nNothing will be  saved!");
 
-  if ( mCore->modified() ) {
-    QString text = i18n( "The address book has been modified.\nDo you want to save your changes?" );
+  bool mQuit = true;
 
-#ifndef KAB_EMBEDDED
-    int ret = KMessageBox::warningYesNoCancel( this, text, "",
-                                              KStdGuiItem::yes(),
-                                              KStdGuiItem::no(), "AskForSave" );
-    switch ( ret ) {
-      case KMessageBox::Yes:
-        save();
-        break;
-      case KMessageBox::No:
-        return true;
-        break;
-      default: //cancel
-        return ;
-        break;
-    }
 
-#else  //KAB_EMBEDDED
-   switch( QMessageBox::information( this, "KA/Pi",
-                                      text,
-                                      i18n("Yes!"), i18n("No"), 0, 0 ) ) {
-    case 0:
-        save();
-        break;
-    case 1:
-              break;
-    case 2:
-        return;
-    default:
-        return;
-      break;
-    }
-#endif //KAB_EMBEDDED
+  if (mAskForQuit)
+  { 
+    
+    int res = QMessageBox::information( this, "KA/Pi", mess , i18n("Yes!"), i18n("No"), 0, 0 );
+    if (res == 0)
+      mQuit = true;
+    else
+      mQuit = false;
   }
 
-#endif
+  if (mQuit == false)
+    return;
+
+  if (mModified == true)
+  {
+    save();
+    mCore->saveSettings();
+    KABPrefs::instance()->writeConfig();
+  }
 
-  save();
-  mCore->saveSettings();
-  KABPrefs::instance()->writeConfig();
   ce->accept();
- 
 }
 
 #ifndef KAB_EMBEDDED
 #include "kaddressbookmain.moc"
 #endif //KAB_EMBEDDED
 
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
index 31ab7b5..3a2ccbb 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
@@ -1,383 +1,397 @@
 /*
     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.
 */
 
 #include <qcheckbox.h>
 #include <qframe.h>
 #include <qgroupbox.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include <qtabwidget.h>
 #include <qcombobox.h>
 #include <qlineedit.h>
 #include <qlabel.h>
 #include <qfile.h>
+#include <qvbox.h>
 
 #include <kconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <klistview.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 
 #ifndef KAB_EMBEDDED
 #include <ktrader.h>
 #else // KAB_EMBEDDED
 #include <mergewidget.h>
 #include <distributionlistwidget.h>
 #endif // KAB_EMBEDDED
 
 #include "addresseewidget.h"
 #include "extensionconfigdialog.h"
 #include "extensionwidget.h"
 #include "kabprefs.h"
 
 #include "kabconfigwidget.h"
 
 class ExtensionItem : public QCheckListItem
 {
   public:
 
 #ifndef KAB_EMBEDDED
     ExtensionItem( QListView *parent, const QString &text );
     void setService( const KService::Ptr &ptr );
 #else //KAB_EMBEDDED
     ExtensionItem( QListView *parent, const QString &text, const QString &name, const QString &comment );
     void setFactory( ExtensionFactory* fac );
 #endif //KAB_EMBEDDED
 
     bool configWidgetAvailable() const;
     ExtensionFactory *factory() const;
 
     virtual QString text( int column ) const;
 
   private:
 #ifndef KAB_EMBEDDED
     KService::Ptr mPtr;
 #else //KAB_EMBEDDED
     ExtensionFactory* mFactory;
     QString mName;
     QString mComment;
 
 #endif //KAB_EMBEDDED
 
 };
 
 KABConfigWidget::KABConfigWidget( QWidget *parent, const char *name )
   : QWidget( parent, name )
 {
   QVBoxLayout *topLayout = new QVBoxLayout( this, 0,
                                             KDialog::spacingHint() );
 
   QTabWidget *tabWidget = new QTabWidget( this );
   topLayout->addWidget( tabWidget );
 
   // General page
   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() );
+  QVBox *vBox = new QVBox( generalPage, "qvbox" );
+  QVBoxLayout *boxLayout = new QVBoxLayout( vBox->layout(), -1, "qvboxlayout" );
   boxLayout->setAlignment( Qt::AlignTop );
   boxLayout->setMargin(KDialog::marginHintSmall() );
-  groupBox->layout()->setMargin(KDialog::marginHintSmall()) ;
-  groupBox->layout()->setSpacing(KDialog::spacingHintSmall());
+  vBox->layout()->setMargin(KDialog::marginHintSmall()) ;
+  vBox->layout()->setSpacing(KDialog::spacingHintSmall());
   boxLayout->setSpacing( KDialog::spacingHintSmall() );
-  mViewsSingleClickBox = new QCheckBox( i18n( "Honor KDE single click" ), groupBox, "msingle" );
+  mViewsSingleClickBox = new QCheckBox( i18n( "Honor KDE single click" ), vBox, "msingle" );
   boxLayout->addWidget( mViewsSingleClickBox );
 
-  mNameParsing = new QCheckBox( i18n( "Automatic name parsing for new addressees" ), groupBox, "mparse" );
+  mNameParsing = new QCheckBox( i18n( "Automatic name parsing for new addressees" ), vBox, "mparse" );
   boxLayout->addWidget( mNameParsing );
 
-  mMultipleViewsAtOnce = new QCheckBox( i18n( "Display List and Details at once (restart)" ), groupBox, "mdisplay" );
+  mMultipleViewsAtOnce = new QCheckBox( i18n( "Display List and Details at once (restart)" ), vBox, "mdisplay" );
   boxLayout->addWidget( mMultipleViewsAtOnce );
 
-  layout->addWidget( groupBox );
+  mAskForQuit = new QCheckBox( i18n( "Ask for quit when closing Ka/Pi" ), vBox, "mquit" );
+  boxLayout->addWidget( mAskForQuit );
 
+  layout->addWidget( vBox );
+
+  tabWidget->addTab( generalPage, i18n( "General" ) );
+
+  // Extension page
+  QWidget *extensionPage = new QWidget( this );
+  QVBoxLayout *extensionLayout = new QVBoxLayout( extensionPage, KDialog::marginHintSmall(),
+                                            KDialog::spacingHintSmall() );
 
   //extensions groupbox
 
-  groupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Extensions (restart)" ), generalPage );
+  QGroupBox* groupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Extensions (restart)" ), extensionPage );
   boxLayout = new QVBoxLayout( groupBox->layout() );
   boxLayout->setAlignment( Qt::AlignTop );
   boxLayout->setMargin(KDialog::marginHintSmall());
   boxLayout->setSpacing(KDialog::spacingHintSmall());
   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 );
+  extensionLayout->addWidget( groupBox );
 
   connect( mNameParsing, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) );
   connect( mViewsSingleClickBox, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) );
   connect( mMultipleViewsAtOnce, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) );
+  connect( mAskForQuit, 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" ) );
+  tabWidget->addTab( extensionPage, i18n( "Extensions" ) );
 
   // Addressee page
   mAddresseeWidget = new AddresseeWidget( this );
   tabWidget->addTab( mAddresseeWidget, i18n( "Contact" ) );
   connect( mAddresseeWidget, SIGNAL( modified() ), SLOT( modified() ) );
 
 }
 
 
 void KABConfigWidget::restoreSettings(KABPrefs* prefs)
 {
 //US  prefs was KABPrefs::instance() before
 
   bool blocked = signalsBlocked();
   blockSignals( true );
 
   mNameParsing->setChecked( prefs->mAutomaticNameParsing );
   mViewsSingleClickBox->setChecked( prefs->mHonorSingleClick );
   mMultipleViewsAtOnce->setChecked( prefs->mMultipleViewsAtOnce );
+  mAskForQuit->setChecked( prefs->mAskForQuit );
 
   mAddresseeWidget->restoreSettings();
 
   restoreExtensionSettings();
 
   blockSignals( blocked );
 
   emit changed( false );
 }
 
 void KABConfigWidget::saveSettings(KABPrefs* prefs)
 {
   prefs->mAutomaticNameParsing = mNameParsing->isChecked();
   prefs->mHonorSingleClick = mViewsSingleClickBox->isChecked();
   prefs->mMultipleViewsAtOnce = mMultipleViewsAtOnce->isChecked();
+  prefs->mAskForQuit = mAskForQuit->isChecked();
 
   mAddresseeWidget->saveSettings();
 
   saveExtensionSettings();
   KABPrefs::instance()->writeConfig();
 
   emit changed( false );
 }
 
 void KABConfigWidget::defaults(KABPrefs* prefs)
 {
   mNameParsing->setChecked( true );
   mViewsSingleClickBox->setChecked( false );
   mMultipleViewsAtOnce->setChecked( true );
+  mAskForQuit->setChecked (true);
 
   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 );
     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()
 {
   QStringList activeExtensions;
 
   QPtrList<QListViewItem> list;
   QListViewItemIterator it( mExtensionView );
   while ( it.current() ) {
     ExtensionItem *item = static_cast<ExtensionItem*>( it.current() );
     if ( item ) {
       if ( item->isOn() )
         activeExtensions.append( item->factory()->identifier() );
     }
     ++it;
   }
 
   KABPrefs::instance()->mActiveExtensions = activeExtensions;
 }
 
 void KABConfigWidget::configureExtension()
 {
   ExtensionItem *item = static_cast<ExtensionItem*>( mExtensionView->currentItem() );
   if ( !item )
     return;
 
 #ifndef KAB_EMBEDDED
   KConfig config( "kaddressbookrc" );
 #else //KAB_EMBEDDED
   KConfig config( locateLocal("config", "kaddressbookrc") );
 #endif //KAB_EMBEDDED
   config.setGroup( QString( "Extensions_%1" ).arg( item->factory()->identifier() ) );
 
   ExtensionConfigDialog dlg( item->factory(), &config, this );
   dlg.exec();
 
   config.sync();
 }
 
 void KABConfigWidget::selectionChanged( QListViewItem *i )
 {
   ExtensionItem *item = static_cast<ExtensionItem*>( i );
   if ( !item )
     return;
 
   mConfigureButton->setEnabled( item->configWidgetAvailable() );
 }
 
 void KABConfigWidget::itemClicked( QListViewItem *item )
 {
   if ( item != 0 )
     modified();
 }
 
 #ifndef KAB_EMBEDDED
 ExtensionItem::ExtensionItem( QListView *parent, const QString &text )
   : QCheckListItem( parent, text, CheckBox )
 {
 }
 
 void ExtensionItem::setService( const KService::Ptr &ptr )
 {
   mPtr = ptr;
 }
 #else //KAB_EMBEDDED
 ExtensionItem::ExtensionItem( QListView *parent, const QString &text, const QString &name, const QString &comment )
   : QCheckListItem( parent, text, CheckBox )
 {
   mName = name;
   mComment = comment;
 }
 
 
 void ExtensionItem::setFactory( ExtensionFactory* fac )
 {
   mFactory = fac;
 }
 #endif //KAB_EMBEDDED
 
 bool ExtensionItem::configWidgetAvailable() const
 {
 #ifndef KAB_EMBEDDED
   KLibFactory *factory = KLibLoader::self()->factory( mPtr->library().latin1() );
   if ( !factory )
     return false;
 
   ExtensionFactory *extensionFactory = static_cast<ExtensionFactory*>( factory );
   if ( !extensionFactory )
     return false;
 
   return extensionFactory->configureWidgetAvailable();
 #else //KAB_EMBEDDED
   return mFactory->configureWidgetAvailable();
 #endif //KAB_EMBEDDED
 
 }
 
 ExtensionFactory *ExtensionItem::factory() const
 {
 #ifndef KAB_EMBEDDED
   KLibFactory *factory = KLibLoader::self()->factory( mPtr->library().latin1() );
   if ( !factory )
     return 0;
 
   return static_cast<ExtensionFactory*>( factory );
 #else //KAB_EMBEDDED
   return mFactory;
 #endif //KAB_EMBEDDED
 }
 
 QString ExtensionItem::text( int column ) const
 {
 #ifndef KAB_EMBEDDED
   if ( column == 0 )
     return mPtr->name();
   else if ( column == 1 )
     return mPtr->comment();
   else
     return QString::null;
 #else //KAB_EMBEDDED
   if ( column == 0 )
     return mName;
   else if ( column == 1 )
     return mComment;
   else
     return QString::null;
 #endif //KAB_EMBEDDED
 }
 
 #ifndef KAB_EMBEDDED
 #include "kabconfigwidget.moc"
 #endif //KAB_EMBEDDED
 
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.h b/kaddressbook/kcmconfigs/kabconfigwidget.h
index 2928495..831efc1 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.h
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.h
@@ -1,78 +1,79 @@
 /*
     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 KABCONFIGWIDGET_H
 #define KABCONFIGWIDGET_H
 
 #include <qwidget.h>
 
 class QCheckBox;
 class QListViewItem;
 class QPushButton;
 class QComboBox;
 class QLineEdit;
 class KListView;
 class KABPrefs;
 
 class AddresseeWidget;
 
 class KABConfigWidget : public QWidget
 {
   Q_OBJECT
 
   public:
     KABConfigWidget( QWidget *parent, const char *name = 0 );
 
     void restoreSettings(KABPrefs* prefs);
     void saveSettings(KABPrefs* prefs);
     void defaults(KABPrefs* prefs);
 
   signals:
     void changed( bool );
 
   public slots:
     void modified();
 
 
 
   private slots:
     void configureExtension();
     void selectionChanged( QListViewItem* );
     void itemClicked( QListViewItem* );
 
   private:
     void restoreExtensionSettings();
     void saveExtensionSettings();
 
     KListView *mExtensionView;
 
     QCheckBox *mNameParsing;
     QCheckBox *mViewsSingleClickBox;
     QCheckBox *mMultipleViewsAtOnce;
+    QCheckBox *mAskForQuit;
 
     QPushButton *mConfigureButton;
 
     AddresseeWidget *mAddresseeWidget;
 };
 
 #endif