1 files changed, 18 insertions, 8 deletions

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
@@ -128,9 +128,9 @@ void KDEPIMConfigWidget::setupExternalAppTab()
 
 
   mExternalAppGroupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Used Mail Client" ), externalAppsPage );
   QGridLayout *boxLayout = new QGridLayout( mExternalAppGroupBox->layout(), 4, 2,    -1, "gridlayout" );
-
+  mExternalAppGroupBox->layout()->setMargin(5);
 
   mClient = new QComboBox( mExternalAppGroupBox );
   boxLayout->addMultiCellWidget( mClient, 0, 0, 0, 1 );
 
@@ -157,8 +157,9 @@ void KDEPIMConfigWidget::setupExternalAppTab()
 
   lab = new QLabel( i18n("HINT: Delimiter=; Name=%1,Email=%2"), mExternalAppGroupBox);
   boxLayout->addMultiCellWidget( lab, 5, 5, 0, 1 );
 
+
   lab = new QLabel( i18n("extra Message:"), mExternalAppGroupBox);
   boxLayout->addWidget( lab, 6, 0 );
   mMessage2 = new QLineEdit(mExternalAppGroupBox);
   mMessage2->setReadOnly(true);
@@ -191,10 +192,10 @@ void KDEPIMConfigWidget::setupLocaleDateTab()
 {
   QWidget *topFrame = new QWidget( this );
   QGridLayout *topLayout = new QGridLayout( topFrame, 3, 2);
 
-   topLayout->setSpacing(KDialog::spacingHint());
-   topLayout->setMargin(KDialog::marginHint());  
+   topLayout->setSpacing(KDialog::spacingHintSmall());
+   topLayout->setMargin(KDialog::marginHintSmall());  
    int iii = 0;
 
    
    KPrefsWidRadios *syncPrefsGroup =
@@ -215,8 +216,12 @@ void KDEPIMConfigWidget::setupLocaleDateTab()
    else 
        format = "(%Y-%m-%d|%A %Y %B %d)";
    syncPrefsGroup->addRadio(i18n("2004-03-24 "+format));
    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);
    ++iii;   
    ++iii;
    QLabel * lab;
@@ -262,10 +267,12 @@ void KDEPIMConfigWidget::setupLocaleTab()
    syncPrefsGroup->addRadio(i18n("German")); 
    syncPrefsGroup->addRadio(i18n("French")); 
    syncPrefsGroup->addRadio(i18n("Italian")); 
    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);
    ++iii;   
  
    syncPrefsGroup =
@@ -292,10 +299,10 @@ void KDEPIMConfigWidget::setupLocaleTab()
 void KDEPIMConfigWidget::setupTimeZoneTab()
 {
   QWidget *topFrame = new QWidget( this );
   QGridLayout *topLayout = new QGridLayout( topFrame, 5, 2);
-  topLayout->setSpacing(KDialog::spacingHint());
-  topLayout->setMargin(KDialog::marginHint());
+  topLayout->setSpacing(KDialog::spacingHintSmall());
+  topLayout->setMargin(KDialog::marginHintSmall());
 
   QHBox *timeZoneBox = new QHBox( topFrame );
   topLayout->addMultiCellWidget( timeZoneBox, 0, 0, 0, 1 );
 
@@ -331,11 +338,14 @@ void KDEPIMConfigWidget::setupTimeZoneTab()
       addWidBool(i18n("Timezone has daylight saving"),
                  &(KPimGlobalPrefs::instance()->mUseDaylightsaving),topFrame);
   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 );
+  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;   
+ 
   lab = new QLabel(  i18n("The year in the date is ignored."), topFrame );
   topLayout->addMultiCellWidget(lab, iii,iii,0,1);
   ++iii; 
   lab = new QLabel(  i18n("Daylight start:"), topFrame );