Diffstat (limited to 'libkdepim/kcmconfigs/kdepimconfigwidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libkdepim/kcmconfigs/kdepimconfigwidget.cpp | 30 |
1 files changed, 20 insertions, 10 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 | |||
@@ -129,7 +129,7 @@ void KDEPIMConfigWidget::setupExternalAppTab() | |||
129 | 129 | ||
130 | mExternalAppGroupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Used Mail Client" ), externalAppsPage ); | 130 | mExternalAppGroupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Used Mail Client" ), externalAppsPage ); |
131 | QGridLayout *boxLayout = new QGridLayout( mExternalAppGroupBox->layout(), 4, 2, -1, "gridlayout" ); | 131 | QGridLayout *boxLayout = new QGridLayout( mExternalAppGroupBox->layout(), 4, 2, -1, "gridlayout" ); |
132 | 132 | mExternalAppGroupBox->layout()->setMargin(5); | |
133 | 133 | ||
134 | mClient = new QComboBox( mExternalAppGroupBox ); | 134 | mClient = new QComboBox( mExternalAppGroupBox ); |
135 | boxLayout->addMultiCellWidget( mClient, 0, 0, 0, 1 ); | 135 | boxLayout->addMultiCellWidget( mClient, 0, 0, 0, 1 ); |
@@ -158,6 +158,7 @@ void KDEPIMConfigWidget::setupExternalAppTab() | |||
158 | lab = new QLabel( i18n("HINT: Delimiter=; Name=%1,Email=%2"), mExternalAppGroupBox); | 158 | lab = new QLabel( i18n("HINT: Delimiter=; Name=%1,Email=%2"), mExternalAppGroupBox); |
159 | boxLayout->addMultiCellWidget( lab, 5, 5, 0, 1 ); | 159 | boxLayout->addMultiCellWidget( lab, 5, 5, 0, 1 ); |
160 | 160 | ||
161 | |||
161 | lab = new QLabel( i18n("extra Message:"), mExternalAppGroupBox); | 162 | lab = new QLabel( i18n("extra Message:"), mExternalAppGroupBox); |
162 | boxLayout->addWidget( lab, 6, 0 ); | 163 | boxLayout->addWidget( lab, 6, 0 ); |
163 | mMessage2 = new QLineEdit(mExternalAppGroupBox); | 164 | mMessage2 = new QLineEdit(mExternalAppGroupBox); |
@@ -192,8 +193,8 @@ void KDEPIMConfigWidget::setupLocaleDateTab() | |||
192 | QWidget *topFrame = new QWidget( this ); | 193 | QWidget *topFrame = new QWidget( this ); |
193 | QGridLayout *topLayout = new QGridLayout( topFrame, 3, 2); | 194 | QGridLayout *topLayout = new QGridLayout( topFrame, 3, 2); |
194 | 195 | ||
195 | topLayout->setSpacing(KDialog::spacingHint()); | 196 | topLayout->setSpacing(KDialog::spacingHintSmall()); |
196 | topLayout->setMargin(KDialog::marginHint()); | 197 | topLayout->setMargin(KDialog::marginHintSmall()); |
197 | int iii = 0; | 198 | int iii = 0; |
198 | 199 | ||
199 | 200 | ||
@@ -216,6 +217,10 @@ void KDEPIMConfigWidget::setupLocaleDateTab() | |||
216 | format = "(%Y-%m-%d|%A %Y %B %d)"; | 217 | format = "(%Y-%m-%d|%A %Y %B %d)"; |
217 | syncPrefsGroup->addRadio(i18n("2004-03-24 "+format)); | 218 | syncPrefsGroup->addRadio(i18n("2004-03-24 "+format)); |
218 | syncPrefsGroup->addRadio(i18n("User defined")); | 219 | syncPrefsGroup->addRadio(i18n("User defined")); |
220 | if ( QApplication::desktop()->width() < 480 ) { | ||
221 | syncPrefsGroup->groupBox()->layout()->setMargin( 5 ); | ||
222 | syncPrefsGroup->groupBox()->layout()->setSpacing( 0 ); | ||
223 | } | ||
219 | topLayout->addMultiCellWidget( (QWidget*)syncPrefsGroup->groupBox(),iii,iii,0,1); | 224 | topLayout->addMultiCellWidget( (QWidget*)syncPrefsGroup->groupBox(),iii,iii,0,1); |
220 | ++iii; | 225 | ++iii; |
221 | ++iii; | 226 | ++iii; |
@@ -263,8 +268,10 @@ void KDEPIMConfigWidget::setupLocaleTab() | |||
263 | syncPrefsGroup->addRadio(i18n("French")); | 268 | syncPrefsGroup->addRadio(i18n("French")); |
264 | syncPrefsGroup->addRadio(i18n("Italian")); | 269 | syncPrefsGroup->addRadio(i18n("Italian")); |
265 | syncPrefsGroup->addRadio(i18n("User defined (usertranslation.txt)")); | 270 | syncPrefsGroup->addRadio(i18n("User defined (usertranslation.txt)")); |
266 | if ( QApplication::desktop()->width() < 300 ) | 271 | if ( QApplication::desktop()->width() < 300 ) { |
267 | ;// syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical); | 272 | syncPrefsGroup->groupBox()->layout()->setMargin( 5 ); |
273 | syncPrefsGroup->groupBox()->layout()->setSpacing( 0 ); | ||
274 | } | ||
268 | topLayout->addMultiCellWidget( (QWidget*)syncPrefsGroup->groupBox(),iii,iii,0,1); | 275 | topLayout->addMultiCellWidget( (QWidget*)syncPrefsGroup->groupBox(),iii,iii,0,1); |
269 | ++iii; | 276 | ++iii; |
270 | 277 | ||
@@ -293,8 +300,8 @@ void KDEPIMConfigWidget::setupTimeZoneTab() | |||
293 | { | 300 | { |
294 | QWidget *topFrame = new QWidget( this ); | 301 | QWidget *topFrame = new QWidget( this ); |
295 | QGridLayout *topLayout = new QGridLayout( topFrame, 5, 2); | 302 | QGridLayout *topLayout = new QGridLayout( topFrame, 5, 2); |
296 | topLayout->setSpacing(KDialog::spacingHint()); | 303 | topLayout->setSpacing(KDialog::spacingHintSmall()); |
297 | topLayout->setMargin(KDialog::marginHint()); | 304 | topLayout->setMargin(KDialog::marginHintSmall()); |
298 | 305 | ||
299 | QHBox *timeZoneBox = new QHBox( topFrame ); | 306 | QHBox *timeZoneBox = new QHBox( topFrame ); |
300 | topLayout->addMultiCellWidget( timeZoneBox, 0, 0, 0, 1 ); | 307 | topLayout->addMultiCellWidget( timeZoneBox, 0, 0, 0, 1 ); |
@@ -331,10 +338,13 @@ void KDEPIMConfigWidget::setupTimeZoneTab() | |||
331 | addWidBool(i18n("Timezone has daylight saving"), | 338 | addWidBool(i18n("Timezone has daylight saving"), |
332 | &(KPimGlobalPrefs::instance()->mUseDaylightsaving),topFrame); | 339 | &(KPimGlobalPrefs::instance()->mUseDaylightsaving),topFrame); |
333 | topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1); | 340 | topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1); |
334 | ++iii; | 341 | ++iii; |
335 | QLabel* lab = new QLabel( i18n("Actual start and end is the\nsunday before this date."), topFrame ); | 342 | QLabel* lab; |
343 | |||
344 | lab = new QLabel( i18n("Actual start and end is the\nsunday before this date."), topFrame ); | ||
336 | topLayout->addMultiCellWidget(lab, iii,iii,0,1); | 345 | topLayout->addMultiCellWidget(lab, iii,iii,0,1); |
337 | ++iii; | 346 | ++iii; |
347 | |||
338 | lab = new QLabel( i18n("The year in the date is ignored."), topFrame ); | 348 | lab = new QLabel( i18n("The year in the date is ignored."), topFrame ); |
339 | topLayout->addMultiCellWidget(lab, iii,iii,0,1); | 349 | topLayout->addMultiCellWidget(lab, iii,iii,0,1); |
340 | ++iii; | 350 | ++iii; |