fixed layout problems in config widgets

2 files changed, 24 insertions, 14 deletions

diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
index c8b68c7..936d052 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
@@ -101,2 +101,3 @@ KABConfigWidget::KABConfigWidget( KABPrefs* prefs, QWidget *parent, const char *
 
+
   QWidget *hBox = new QWidget( generalPage, "qhbox" );
@@ -111,2 +112,3 @@ KABConfigWidget::KABConfigWidget( KABPrefs* prefs, QWidget *parent, const char *
   hboxLayout->setSpacing(KDialog::spacingHintSmall());
+  //hBox->setBackgroundColor( black);
   layout->addWidget( hBox );
@@ -114,8 +116,6 @@ KABConfigWidget::KABConfigWidget( KABPrefs* prefs, QWidget *parent, const char *
   //general groupbox
-  QVBox *vBox = new QVBox( generalPage, "qvbox" );
-  QVBoxLayout *boxLayout = new QVBoxLayout( vBox->layout(), -1, "qvboxlayout" );
+   QWidget *vBox = new QWidget( generalPage, "qvbox" );
+  QVBoxLayout *boxLayout = new QVBoxLayout( vBox );
   boxLayout->setAlignment( Qt::AlignTop );
   boxLayout->setMargin(KDialog::marginHintSmall() );
-  vBox->layout()->setMargin(KDialog::marginHintSmall()) ;
-  vBox->layout()->setSpacing(KDialog::spacingHintSmall());
   boxLayout->setSpacing( KDialog::spacingHintSmall() );
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
index 332f975..6de60fa 100644
--- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
+++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
@@ -131,3 +131,3 @@ void KDEPIMConfigWidget::setupExternalAppTab()
   QGridLayout *boxLayout = new QGridLayout( mExternalAppGroupBox->layout(), 4, 2,    -1, "gridlayout" );
-
+  mExternalAppGroupBox->layout()->setMargin(5);
 
@@ -160,2 +160,3 @@ void KDEPIMConfigWidget::setupExternalAppTab()
 
+
   lab = new QLabel( i18n("extra Message:"), mExternalAppGroupBox);
@@ -194,4 +195,4 @@ void KDEPIMConfigWidget::setupLocaleDateTab()
 
-   topLayout->setSpacing(KDialog::spacingHint());
-   topLayout->setMargin(KDialog::marginHint());  
+   topLayout->setSpacing(KDialog::spacingHintSmall());
+   topLayout->setMargin(KDialog::marginHintSmall());  
    int iii = 0;
@@ -218,2 +219,6 @@ void KDEPIMConfigWidget::setupLocaleDateTab()
    syncPrefsGroup->addRadio(i18n("User defined"));
+   if ( QApplication::desktop()->width() < 480 ) {
+       syncPrefsGroup->groupBox()->layout()->setMargin( 5 );
+       syncPrefsGroup->groupBox()->layout()->setSpacing( 0 );
+   }  
    topLayout->addMultiCellWidget( (QWidget*)syncPrefsGroup->groupBox(),iii,iii,0,1);
@@ -265,4 +270,6 @@ void KDEPIMConfigWidget::setupLocaleTab()
    syncPrefsGroup->addRadio(i18n("User defined (usertranslation.txt)")); 
-   if (  QApplication::desktop()->width() <  300   ) 
-       ;//   syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical);
+   if (  QApplication::desktop()->width() <  300   ) {
+       syncPrefsGroup->groupBox()->layout()->setMargin( 5 );
+       syncPrefsGroup->groupBox()->layout()->setSpacing( 0 );
+   }
    topLayout->addMultiCellWidget( (QWidget*)syncPrefsGroup->groupBox(),iii,iii,0,1);
@@ -295,4 +302,4 @@ void KDEPIMConfigWidget::setupTimeZoneTab()
   QGridLayout *topLayout = new QGridLayout( topFrame, 5, 2);
-  topLayout->setSpacing(KDialog::spacingHint());
-  topLayout->setMargin(KDialog::marginHint());
+  topLayout->setSpacing(KDialog::spacingHintSmall());
+  topLayout->setMargin(KDialog::marginHintSmall());
 
@@ -333,6 +340,9 @@ void KDEPIMConfigWidget::setupTimeZoneTab()
   topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1);
-  ++iii;  
-  QLabel* lab = new QLabel(  i18n("Actual start and end is the\nsunday before this date."), topFrame );
+  ++iii; 
+  QLabel* lab; 
+
+  lab = new QLabel(  i18n("Actual start and end is the\nsunday before this date."), topFrame );
   topLayout->addMultiCellWidget(lab, iii,iii,0,1);
-  ++iii;   
+  ++iii;
+ 
   lab = new QLabel(  i18n("The year in the date is ignored."), topFrame );