4 files changed, 13 insertions, 1 deletions

diff --git a/kaddressbook/kabprefs.cpp b/kaddressbook/kabprefs.cpp
index 0c192dd..03c5e76 100644
--- a/kaddressbook/kabprefs.cpp
+++ b/kaddressbook/kabprefs.cpp
@@ -1,124 +1,126 @@
 /*
     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("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()
diff --git a/kaddressbook/kabprefs.h b/kaddressbook/kabprefs.h
index 8f149ac..03e529f 100644
--- a/kaddressbook/kabprefs.h
+++ b/kaddressbook/kabprefs.h
@@ -4,87 +4,88 @@
 
     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 KABPREFS_H
 #define KABPREFS_H
 
 #include <qstringlist.h>
 
 #include <libkdepim/kpimprefs.h>
 
 class KConfig;
 
 class KABPrefs : public KPimPrefs
 {
   public:
     virtual ~KABPrefs();
 
     static KABPrefs *instance();
 
     // General
     bool mHonorSingleClick;
     bool mAutomaticNameParsing;
     int mCurrentIncSearchField;
 
 #ifdef KAB_EMBEDDED
     // US introduce a nonconst way to return the config object.
     KConfig* getConfig();
 
     bool mToolBarHor;
     bool mToolBarUp;
     bool mAskForQuit;
 
 
     /** Set preferences to default values */
 //    void usrSetDefaults();
 
     /** Read preferences from config file */
 //    void usrReadConfig();
 
     /** Write preferences to config file */
 //    void usrWriteConfig();
 #endif //KAB_EMBEDDED
 
 
     // GUI
     bool mJumpButtonBarVisible;
     bool mDetailsPageVisible;
+    bool mMultipleViewsAtOnce;
     QValueList<int> mExtensionsSplitter;
     QValueList<int> mDetailsSplitter;
 
     // Extensions stuff
     int mCurrentExtension;
     QStringList mActiveExtensions;
 
     // Views stuff
     QString mCurrentView;
     QStringList mViewNames;
 
     // Filter
     int mCurrentFilter;
 
     void setCategoryDefaults();
 
   private:
     KABPrefs();
 
     static KABPrefs *sInstance;
 };
 
 #endif
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
index b5309c0..31ab7b5 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
@@ -50,209 +50,216 @@
 
 #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() );
   boxLayout->setAlignment( Qt::AlignTop );
   boxLayout->setMargin(KDialog::marginHintSmall() );
   groupBox->layout()->setMargin(KDialog::marginHintSmall()) ;
   groupBox->layout()->setSpacing(KDialog::spacingHintSmall());
   boxLayout->setSpacing( KDialog::spacingHintSmall() );
   mViewsSingleClickBox = new QCheckBox( i18n( "Honor KDE single click" ), groupBox, "msingle" );
   boxLayout->addWidget( mViewsSingleClickBox );
 
   mNameParsing = new QCheckBox( i18n( "Automatic name parsing for new addressees" ), groupBox, "mparse" );
   boxLayout->addWidget( mNameParsing );
 
+  mMultipleViewsAtOnce = new QCheckBox( i18n( "Display List and Details at once (restart)" ), groupBox, "mdisplay" );
+  boxLayout->addWidget( mMultipleViewsAtOnce );
+
   layout->addWidget( groupBox );
 
 
   //extensions groupbox
 
-  groupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Extensions" ), generalPage );
+  groupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Extensions (restart)" ), generalPage );
   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 );
 
   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( 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() ) );
 
 }
 
 
 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 );
 
   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();
 
   mAddresseeWidget->saveSettings();
 
   saveExtensionSettings();
   KABPrefs::instance()->writeConfig();
 
   emit changed( false );
 }
 
 void KABConfigWidget::defaults(KABPrefs* prefs)
 {
   mNameParsing->setChecked( true );
   mViewsSingleClickBox->setChecked( false );
+  mMultipleViewsAtOnce->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;
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.h b/kaddressbook/kcmconfigs/kabconfigwidget.h
index 8c0c436..2928495 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.h
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.h
@@ -7,70 +7,72 @@
     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;
+
     QPushButton *mConfigureButton;
 
     AddresseeWidget *mAddresseeWidget;
 };
 
 #endif