4 files changed, 26 insertions, 9 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 7bf1a2f..a6d722d 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1008,6 +1008,7 @@ void KABCore::openConfigDialog()
     connect( ConfigureDialog, SIGNAL( okClicked() ),
              this, SLOT( configurationChanged() ) );
     saveSettings();
+    ConfigureDialog->showMaximized();
     ConfigureDialog->exec();
     delete ConfigureDialog;
 }
diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp
index 0f3c353..f84b2ba 100644
--- a/kaddressbook/kcmconfigs/addresseewidget.cpp
+++ b/kaddressbook/kcmconfigs/addresseewidget.cpp
@@ -58,7 +58,7 @@ NamePartWidget::NamePartWidget( const QString &title, QWidget *parent,
     mAddButton = bbox->addButton( i18n( "Add" ), this,  SLOT( add() ) );
     mRemoveButton = bbox->addButton( i18n( "Rem" ), this,  SLOT( remove() ) );
     bbox->layout();
-    layout->addMultiCellWidget( bbox, 0, 2, 2,2);
+    layout->addMultiCellWidget( bbox, 0, 1, 2,2);
 
     mEdit = new KLineEdit( this );
     layout->addWidget( mEdit, 1, 1 );
@@ -161,7 +161,13 @@ AddresseeWidget::AddresseeWidget( QWidget *parent, const char *name )
   mPrefix = new NamePartWidget( i18n( "Prefixes" ), this );
   mInclusion = new NamePartWidget( i18n( "Inclusions" ), this );
   mSuffix = new NamePartWidget( i18n( "Suffixes" ), this );
-  QLabel *label = new QLabel( i18n( "Default formatted name:" ), 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" ) );
@@ -171,8 +177,8 @@ AddresseeWidget::AddresseeWidget( QWidget *parent, const char *name )
     
   if (KGlobal::getOrientation() == KGlobal::Portrait)
   {
-    layout = new QGridLayout( this, 4, 2, KDialog::marginHint(),
-                                         KDialog::spacingHint() );
+    layout = new QGridLayout( this, 4, 2, KDialog::marginHintSmall(),
+                                         KDialog::spacingHintSmall() );
 
     layout->addMultiCellWidget( mPrefix, 0, 0, 0, 1 );
     layout->addMultiCellWidget( mInclusion, 1, 1, 0, 1 );
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
index 7b3e5c6..38c7946 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
@@ -91,13 +91,16 @@ KABConfigWidget::KABConfigWidget( QWidget *parent, const char *name )
 
   // General page
   QWidget *generalPage = new QWidget( this );
-  QVBoxLayout *layout = new QVBoxLayout( generalPage, KDialog::marginHint(),
-                                            KDialog::spacingHint() );
+  QVBoxLayout *layout = new QVBoxLayout( generalPage, KDialog::marginHintSmall(),
+                                            KDialog::spacingHintSmall() );
 
   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 );
 
@@ -109,7 +112,10 @@ KABConfigWidget::KABConfigWidget( QWidget *parent, const char *name )
   groupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Extensions" ), 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" ) );
diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
index 791a940..a278042 100644
--- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
@@ -28,6 +28,7 @@
 #endif //KAB_EMBEDDED
 #include <kdebug.h>
 #include <klocale.h>
+#include <stdlib.h>
 
 #include "kabconfigwidget.h"
 
@@ -43,10 +44,13 @@ extern "C"
 KCMKabConfig::KCMKabConfig( QWidget *parent, const char *name )
   : KCModule( parent, name )
 {
+    //abort();
   QVBoxLayout *layout = new QVBoxLayout( this );
   mConfigWidget = new KABConfigWidget( this, "mConfigWidget" );
   layout->addWidget( mConfigWidget );
-
+  layout->setSpacing( 0 );
+  layout->setMargin( 0 );
+  
   connect( mConfigWidget, SIGNAL( changed( bool ) ), SIGNAL( changed( bool ) ) );
   load();
 }