| -rw-r--r-- | kaddressbook/kcmconfigs/kabconfigwidget.cpp | 8 | ||||
| -rw-r--r-- | libkdepim/kcmconfigs/kdepimconfigwidget.cpp | 26 |
2 files changed, 22 insertions, 12 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 @@ -100,4 +100,5 @@ KABConfigWidget::KABConfigWidget( KABPrefs* prefs, QWidget *parent, const char * KDialog::spacingHintSmall() ); + QWidget *hBox = new QWidget( generalPage, "qhbox" ); QHBoxLayout *hboxLayout = new QHBoxLayout( hBox); @@ -110,13 +111,12 @@ KABConfigWidget::KABConfigWidget( KABPrefs* prefs, QWidget *parent, const char * hboxLayout->setMargin(KDialog::marginHintSmall() ); hboxLayout->setSpacing(KDialog::spacingHintSmall()); + //hBox->setBackgroundColor( black); layout->addWidget( hBox ); //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() ); mSearchReturnBox = new QCheckBox( i18n( "Search only after <return> key pressed" ), vBox, "mreturn" ); 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 @@ -130,5 +130,5 @@ 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 ); @@ -159,4 +159,5 @@ void KDEPIMConfigWidget::setupExternalAppTab() boxLayout->addMultiCellWidget( lab, 5, 5, 0, 1 ); + lab = new QLabel( i18n("extra Message:"), mExternalAppGroupBox); boxLayout->addWidget( lab, 6, 0 ); @@ -193,6 +194,6 @@ void KDEPIMConfigWidget::setupLocaleDateTab() 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; @@ -217,4 +218,8 @@ void KDEPIMConfigWidget::setupLocaleDateTab() 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; @@ -264,6 +269,8 @@ void KDEPIMConfigWidget::setupLocaleTab() 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; @@ -294,6 +301,6 @@ 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 ); @@ -333,7 +340,10 @@ 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 ); + 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); |