summaryrefslogtreecommitdiffabout
path: root/libkdepim
authorzautrix <zautrix>2004-10-25 23:39:31 (UTC)
committer zautrix <zautrix>2004-10-25 23:39:31 (UTC)
commite7c948b76a46c923c21f2f35c677912b462fa1f4 (patch) (unidiff)
treea9f9a0c696ea3809f2e0bfc27e643d70c4e123e3 /libkdepim
parent86ad7f5fe2a20f9dfd37d6891b57b326f8ee507b (diff)
downloadkdepimpi-e7c948b76a46c923c21f2f35c677912b462fa1f4.zip
kdepimpi-e7c948b76a46c923c21f2f35c677912b462fa1f4.tar.gz
kdepimpi-e7c948b76a46c923c21f2f35c677912b462fa1f4.tar.bz2
kopiemail fixes
Diffstat (limited to 'libkdepim') (more/less context) (ignore whitespace changes)
-rw-r--r--libkdepim/kcmconfigs/kdepimconfigwidget.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
index 1fae41f..4817a3f 100644
--- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
+++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
@@ -301,65 +301,65 @@ void KDEPIMConfigWidget::setupTimeZoneTab()
301 QWidget *topFrame = new QWidget( this ); 301 QWidget *topFrame = new QWidget( this );
302 QGridLayout *topLayout = new QGridLayout( topFrame, 5, 2); 302 QGridLayout *topLayout = new QGridLayout( topFrame, 5, 2);
303 topLayout->setSpacing(KDialog::spacingHintSmall()); 303 topLayout->setSpacing(KDialog::spacingHintSmall());
304 topLayout->setMargin(KDialog::marginHintSmall()); 304 topLayout->setMargin(KDialog::marginHintSmall());
305 305
306 QHBox *timeZoneBox = new QHBox( topFrame ); 306 QHBox *timeZoneBox = new QHBox( topFrame );
307 topLayout->addMultiCellWidget( timeZoneBox, 0, 0, 0, 1 ); 307 topLayout->addMultiCellWidget( timeZoneBox, 0, 0, 0, 1 );
308 308
309 new QLabel( i18n("Timezone:"), timeZoneBox ); 309 new QLabel( i18n("Timezone:"), timeZoneBox );
310 mTimeZoneCombo = new QComboBox( timeZoneBox ); 310 mTimeZoneCombo = new QComboBox( timeZoneBox );
311 if ( QApplication::desktop()->width() < 300 ) { 311 if ( QApplication::desktop()->width() < 300 ) {
312 mTimeZoneCombo->setMaximumWidth(150); 312 mTimeZoneCombo->setMaximumWidth(150);
313 } 313 }
314 314
315 QStringList list; 315 QStringList list;
316 list = KGlobal::locale()->timeZoneList(); 316 list = KGlobal::locale()->timeZoneList();
317 mTimeZoneCombo->insertStringList(list); 317 mTimeZoneCombo->insertStringList(list);
318 318
319 // find the currently set time zone and select it 319 // find the currently set time zone and select it
320 QString sCurrentlySet = KPimGlobalPrefs::instance()->mTimeZoneId; 320 QString sCurrentlySet = KPimGlobalPrefs::instance()->mTimeZoneId;
321 int nCurrentlySet = 11; 321 int nCurrentlySet = 11;
322 for (int i = 0; i < mTimeZoneCombo->count(); i++) 322 for (int i = 0; i < mTimeZoneCombo->count(); i++)
323 { 323 {
324 if (mTimeZoneCombo->text(i) == sCurrentlySet) 324 if (mTimeZoneCombo->text(i) == sCurrentlySet)
325 { 325 {
326 nCurrentlySet = i; 326 nCurrentlySet = i;
327 break; 327 break;
328 } 328 }
329 } 329 }
330 mTimeZoneCombo->setCurrentItem(nCurrentlySet); 330 mTimeZoneCombo->setCurrentItem(nCurrentlySet);
331 int iii = 1; 331 int iii = 1;
332 KPrefsWidBool *sb = 332 KPrefsWidBool *sb =
333 addWidBool(i18n("Add 30 min (+00:30) to selected Timezone"), 333 addWidBool(i18n("Add 30 min to selected Timezone"),
334 &(KPimGlobalPrefs::instance()->mTimeZoneAdd30min),topFrame); 334 &(KPimGlobalPrefs::instance()->mTimeZoneAdd30min),topFrame);
335 topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1); 335 topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1);
336 ++iii; 336 ++iii;
337 sb = 337 sb =
338 addWidBool(i18n("Timezone has daylight saving"), 338 addWidBool(i18n("Timezone has daylight saving"),
339 &(KPimGlobalPrefs::instance()->mUseDaylightsaving),topFrame); 339 &(KPimGlobalPrefs::instance()->mUseDaylightsaving),topFrame);
340 topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1); 340 topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1);
341 ++iii; 341 ++iii;
342 QLabel* lab; 342 QLabel* lab;
343 343
344 lab = new QLabel( i18n("Actual start and end is the\nsunday before this date."), topFrame ); 344 lab = new QLabel( i18n("Actual start and end is the\nsunday before this date."), topFrame );
345 topLayout->addMultiCellWidget(lab, iii,iii,0,1); 345 topLayout->addMultiCellWidget(lab, iii,iii,0,1);
346 ++iii; 346 ++iii;
347 347
348 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 );
349 topLayout->addMultiCellWidget(lab, iii,iii,0,1); 349 topLayout->addMultiCellWidget(lab, iii,iii,0,1);
350 ++iii; 350 ++iii;
351 lab = new QLabel( i18n("Daylight start:"), topFrame ); 351 lab = new QLabel( i18n("Daylight start:"), topFrame );
352 topLayout->addWidget(lab, iii,0); 352 topLayout->addWidget(lab, iii,0);
353 mStartDateSavingEdit = new KDateEdit(topFrame); 353 mStartDateSavingEdit = new KDateEdit(topFrame);
354 topLayout->addWidget(mStartDateSavingEdit, iii,1); 354 topLayout->addWidget(mStartDateSavingEdit, iii,1);
355 ++iii; 355 ++iii;
356 356
357 lab = new QLabel( i18n("Daylight end:"), topFrame ); 357 lab = new QLabel( i18n("Daylight end:"), topFrame );
358 topLayout->addWidget(lab, iii,0); 358 topLayout->addWidget(lab, iii,0);
359 mEndDateSavingEdit = new KDateEdit(topFrame); 359 mEndDateSavingEdit = new KDateEdit(topFrame);
360 topLayout->addWidget(mEndDateSavingEdit, iii,1); 360 topLayout->addWidget(mEndDateSavingEdit, iii,1);
361 ++iii; 361 ++iii;
362 QDate current ( 2001, 1,1); 362 QDate current ( 2001, 1,1);
363 mStartDateSavingEdit->setDate(current.addDays(KPimGlobalPrefs::instance()->mDaylightsavingStart-1)); 363 mStartDateSavingEdit->setDate(current.addDays(KPimGlobalPrefs::instance()->mDaylightsavingStart-1));
364 mEndDateSavingEdit->setDate(current.addDays(KPimGlobalPrefs::instance()->mDaylightsavingEnd-1)); 364 mEndDateSavingEdit->setDate(current.addDays(KPimGlobalPrefs::instance()->mDaylightsavingEnd-1));
365 365