added a configurationsettings that aloowes the user to choose between

the display of multiple views at once or just one

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
@@ -53,16 +53,18 @@ KABPrefs::KABPrefs()
 
 #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 );
 
diff --git a/kaddressbook/kabprefs.h b/kaddressbook/kabprefs.h
index 8f149ac..03e529f 100644
--- a/kaddressbook/kabprefs.h
+++ b/kaddressbook/kabprefs.h
@@ -60,16 +60,17 @@ class KABPrefs : public KPimPrefs
     /** 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
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
@@ -106,22 +106,25 @@ KABConfigWidget::KABConfigWidget( QWidget *parent, const char *name )
   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 );
@@ -134,16 +137,17 @@ KABConfigWidget::KABConfigWidget( QWidget *parent, const char *name )
   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" ) );
@@ -160,43 +164,46 @@ 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 );
 }
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
@@ -63,14 +63,16 @@ class KABConfigWidget : public QWidget
   private:
     void restoreExtensionSettings();
     void saveExtensionSettings();
 
     KListView *mExtensionView;
 
     QCheckBox *mNameParsing;
     QCheckBox *mViewsSingleClickBox;
+    QCheckBox *mMultipleViewsAtOnce;
+
     QPushButton *mConfigureButton;
 
     AddresseeWidget *mAddresseeWidget;
 };
 
 #endif