formatted name fixes

1 files changed, 3 insertions, 8 deletions

diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp
index eb5bdd9..168d39e 100644
--- a/kaddressbook/kcmconfigs/addresseewidget.cpp
+++ b/kaddressbook/kcmconfigs/addresseewidget.cpp
@@ -93,151 +93,146 @@ NamePartWidget::NamePartWidget( const QString &title, QWidget *parent,
     
   }  
 
   mAddButton->setEnabled( false );
   mRemoveButton->setEnabled( false );
     
 
   connect( mBox, SIGNAL( selectionChanged( QListBoxItem* ) ),
            SLOT( selectionChanged( QListBoxItem* ) ) );
   connect( mEdit, SIGNAL( textChanged( const QString& ) ),
              SLOT( textChanged( const QString& ) ) );
   connect( mEdit, SIGNAL( returnPressed() ), SLOT( add() ) );
                
 }
 
 NamePartWidget::~NamePartWidget()
 {
 }
 
 void NamePartWidget::setNameParts( const QStringList &list )
 {
   mBox->clear();
   mBox->insertStringList( list );
 }
 
 QStringList NamePartWidget::nameParts() const
 {
   QStringList parts;
   for ( uint i = 0; i < mBox->count(); ++i )
     parts.append( mBox->text( i ) );
 
   return parts;
 }
 
 void NamePartWidget::add()
 {
   if ( !mEdit->text().isEmpty() ) {
     mBox->insertItem( mEdit->text() );
     emit modified();
   }
 
   mEdit->setText( "" );
 }
 
 void NamePartWidget::remove()
 {
   mBox->removeItem( mBox->currentItem() );
   if ( mBox->count() == 0 )
     selectionChanged( 0 );
 
   emit modified();
 }
 
 void NamePartWidget::selectionChanged( QListBoxItem *item )
 {
   mRemoveButton->setEnabled( item != 0 );
 }
 
 void NamePartWidget::textChanged( const QString& text )
 {
   mAddButton->setEnabled( !text.isEmpty() );
 }
 
 
 AddresseeWidget::AddresseeWidget( QWidget *parent, const char *name )
   : QWidget( parent, name )
 {
   QGridLayout *layout;
 
   mPrefix = new NamePartWidget( i18n( "Prefixes" ), this );
   mInclusion = new NamePartWidget( i18n( "Inclusions" ), this );
   mSuffix = new NamePartWidget( i18n( "Suffixes" ), this );
   QString dfn;
   if (QApplication::desktop()->width() > 320 )
       dfn = i18n( "Default formatted name:" );
   else
       dfn = i18n( "Def. formatted name:" );
       
   QLabel *label = new QLabel( dfn, this );
 
   mFormattedNameCombo = new KComboBox( this );
   mFormattedNameCombo->insertItem( i18n( "Empty" ) );
   mFormattedNameCombo->insertItem( i18n( "Simple Name" ) );
   mFormattedNameCombo->insertItem( i18n( "Full Name" ) );
   mFormattedNameCombo->insertItem( i18n( "Reverse Name" ) );
     
   if (KGlobal::getOrientation() == KGlobal::Portrait)
   {
     layout = new QGridLayout( this, 4, 2, KDialog::marginHintSmall(),
                                          KDialog::spacingHintSmall() );
 
     layout->addMultiCellWidget( mPrefix, 0, 0, 0, 1 );
     layout->addMultiCellWidget( mInclusion, 1, 1, 0, 1 );
     layout->addMultiCellWidget( mSuffix, 2, 2, 0, 1 );
     layout->addWidget( label, 3, 0 );
     layout->addWidget( mFormattedNameCombo, 3, 1 );
     
   }
   else
   {
     layout = new QGridLayout( this, 2, 3, KDialog::marginHint(),
                                          KDialog::spacingHint() );
 
     layout->addWidget( mPrefix, 0, 0 );
     layout->addWidget( mInclusion, 0, 1 );
     layout->addWidget( mSuffix, 0, 2 );
     layout->addWidget( label, 1, 0 );
     layout->addMultiCellWidget( mFormattedNameCombo, 1, 1, 1, 2 );
   }
 
   connect( mPrefix, SIGNAL( modified() ), SIGNAL( modified() ) );
   connect( mInclusion, SIGNAL( modified() ), SIGNAL( modified() ) );
   connect( mSuffix, SIGNAL( modified() ), SIGNAL( modified() ) );
   connect( mFormattedNameCombo, SIGNAL( activated( int ) ), SIGNAL( modified() ) );
 }
 
 AddresseeWidget::~AddresseeWidget()
 {
 }
 
 void AddresseeWidget::restoreSettings()
 {
   KConfig config( locateLocal("config", "kabcrc") );
   config.setGroup( "General" );
 
   mPrefix->setNameParts( config.readListEntry( "Prefixes" ) );
   mInclusion->setNameParts( config.readListEntry( "Inclusions" ) );
   mSuffix->setNameParts( config.readListEntry( "Suffixes" ) );
-
-  KConfig cfg( locateLocal("config","kaddressbookrc") );
-  cfg.setGroup( "General" );
-  mFormattedNameCombo->setCurrentItem( cfg.readNumEntry( "FormattedNameType", 1 ) );
+  mFormattedNameCombo->setCurrentItem( config.readNumEntry( "FormattedNameType", 1 ) );
 }
 
 void AddresseeWidget::saveSettings()
 {
+    qDebug("AddresseeWidget::saveSettings() ");
   KConfig config( locateLocal("config","kabcrc") );
   config.setGroup( "General" );
 
   config.writeEntry( "Prefixes", mPrefix->nameParts() );
   config.writeEntry( "Inclusions", mInclusion->nameParts() );
   config.writeEntry( "Suffixes", mSuffix->nameParts() );
-
-  KConfig cfg( locateLocal("config","kaddressbookrc") );
-  cfg.setGroup( "General" );
-  cfg.writeEntry( "FormattedNameType", mFormattedNameCombo->currentItem() );
+  config.writeEntry( "FormattedNameType", mFormattedNameCombo->currentItem() );
 }
 
 #ifndef KAB_EMBEDDED
 #include "addresseewidget.moc"
 #endif //KAB_EMBEDDED