| -rw-r--r-- | kaddressbook/kabcore.cpp | 1 | ||||
| -rw-r--r-- | kaddressbook/kcmconfigs/addresseewidget.cpp | 14 | ||||
| -rw-r--r-- | kaddressbook/kcmconfigs/kabconfigwidget.cpp | 14 | ||||
| -rw-r--r-- | kaddressbook/kcmconfigs/kcmkabconfig.cpp | 4 |
4 files changed, 25 insertions, 8 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 7bf1a2f..a6d722d 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -1010,2 +1010,3 @@ void KABCore::openConfigDialog() saveSettings(); + ConfigureDialog->showMaximized(); ConfigureDialog->exec(); 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 @@ -60,3 +60,3 @@ NamePartWidget::NamePartWidget( const QString &title, QWidget *parent, bbox->layout(); - layout->addMultiCellWidget( bbox, 0, 2, 2,2); + layout->addMultiCellWidget( bbox, 0, 1, 2,2); @@ -163,3 +163,9 @@ AddresseeWidget::AddresseeWidget( QWidget *parent, const char *name ) 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 ); @@ -173,4 +179,4 @@ AddresseeWidget::AddresseeWidget( QWidget *parent, const char *name ) { - layout = new QGridLayout( this, 4, 2, KDialog::marginHint(), - KDialog::spacingHint() ); + layout = new QGridLayout( this, 4, 2, KDialog::marginHintSmall(), + KDialog::spacingHintSmall() ); 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 @@ -93,4 +93,4 @@ KABConfigWidget::KABConfigWidget( QWidget *parent, const char *name ) QWidget *generalPage = new QWidget( this ); - QVBoxLayout *layout = new QVBoxLayout( generalPage, KDialog::marginHint(), - KDialog::spacingHint() ); + QVBoxLayout *layout = new QVBoxLayout( generalPage, KDialog::marginHintSmall(), + KDialog::spacingHintSmall() ); @@ -99,3 +99,6 @@ KABConfigWidget::KABConfigWidget( QWidget *parent, const char *name ) 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" ); @@ -111,3 +114,6 @@ KABConfigWidget::KABConfigWidget( QWidget *parent, const char *name ) boxLayout->setAlignment( Qt::AlignTop ); - + boxLayout->setMargin(KDialog::marginHintSmall()); + boxLayout->setSpacing(KDialog::spacingHintSmall()); + groupBox->layout()->setMargin(1) ; + groupBox->layout()->setSpacing(0); mExtensionView = new KListView( groupBox ); 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 @@ -30,2 +30,3 @@ #include <klocale.h> +#include <stdlib.h> @@ -45,2 +46,3 @@ KCMKabConfig::KCMKabConfig( QWidget *parent, const char *name ) { + //abort(); QVBoxLayout *layout = new QVBoxLayout( this ); @@ -48,2 +50,4 @@ KCMKabConfig::KCMKabConfig( QWidget *parent, const char *name ) layout->addWidget( mConfigWidget ); + layout->setSpacing( 0 ); + layout->setMargin( 0 ); |