author | zautrix <zautrix> | 2005-03-26 13:13:04 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-26 13:13:04 (UTC) |
commit | 93d1be2c6eead07300e7f90f3b417fcef0f109d3 (patch) (unidiff) | |
tree | cdcac27cfa1e02c6fa388c252287ed9818b95847 /korganizer/koeditorgeneral.cpp | |
parent | bc8929ccca1ad8cd04f61366c78254803d9c1565 (diff) | |
download | kdepimpi-93d1be2c6eead07300e7f90f3b417fcef0f109d3.zip kdepimpi-93d1be2c6eead07300e7f90f3b417fcef0f109d3.tar.gz kdepimpi-93d1be2c6eead07300e7f90f3b417fcef0f109d3.tar.bz2 |
icons added
Diffstat (limited to 'korganizer/koeditorgeneral.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | korganizer/koeditorgeneral.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp index cf0d4ae..92fcd1c 100644 --- a/korganizer/koeditorgeneral.cpp +++ b/korganizer/koeditorgeneral.cpp | |||
@@ -366,48 +366,50 @@ void KOEditorGeneral::setDefaults(bool allDay) | |||
366 | } else { | 366 | } else { |
367 | alarmTime = a[index]; | 367 | alarmTime = a[index]; |
368 | } | 368 | } |
369 | mAlarmButton ->setChecked( false ); | 369 | mAlarmButton ->setChecked( false ); |
370 | mAlarmTimeEdit->setValue(alarmTime); | 370 | mAlarmTimeEdit->setValue(alarmTime); |
371 | mAlarmIncrCombo->setCurrentItem(0); | 371 | mAlarmIncrCombo->setCurrentItem(0); |
372 | enableAlarmEdit( false ); | 372 | enableAlarmEdit( false ); |
373 | //alarmDisable (false); | 373 | //alarmDisable (false); |
374 | mSecrecyCombo->setCurrentItem(Incidence::SecrecyPublic); | 374 | mSecrecyCombo->setCurrentItem(Incidence::SecrecyPublic); |
375 | mCancelBox->setChecked( false ); | 375 | mCancelBox->setChecked( false ); |
376 | mSummaryEdit->setEditText(""); | 376 | mSummaryEdit->setEditText(""); |
377 | mLocationEdit->setEditText(""); | 377 | mLocationEdit->setEditText(""); |
378 | mDescriptionEdit->setText(""); | 378 | mDescriptionEdit->setText(""); |
379 | mAlarmSound = KOPrefs::instance()->mDefaultAlarmFile; | 379 | mAlarmSound = KOPrefs::instance()->mDefaultAlarmFile; |
380 | setCategories(""); | 380 | setCategories(""); |
381 | } | 381 | } |
382 | void KOEditorGeneral::setSecrecy( int num ) | 382 | void KOEditorGeneral::setSecrecy( int num ) |
383 | { | 383 | { |
384 | mSecrecyCombo->setCurrentItem(num); | 384 | mSecrecyCombo->setCurrentItem(num); |
385 | } | 385 | } |
386 | void KOEditorGeneral::readIncidence(Incidence *event) | 386 | void KOEditorGeneral::readIncidence(Incidence *event) |
387 | { | 387 | { |
388 | 388 | ||
389 | mAlarmMessage = event->summary(); | 389 | mAlarmMessage = event->summary(); |
390 | if ( ! event->location().isEmpty() ) | ||
391 | mAlarmMessage += " ("+event->location()+")"; | ||
390 | mAlarmIncrCombo->setCurrentItem(0); | 392 | mAlarmIncrCombo->setCurrentItem(0); |
391 | mSummaryEdit->setEditText(event->summary()); | 393 | mSummaryEdit->setEditText(event->summary()); |
392 | mLocationEdit->setEditText(event->location()); | 394 | mLocationEdit->setEditText(event->location()); |
393 | mDescriptionEdit->setText(event->description()); | 395 | mDescriptionEdit->setText(event->description()); |
394 | 396 | ||
395 | #if 0 | 397 | #if 0 |
396 | // organizer information | 398 | // organizer information |
397 | mOwnerLabel->setText(i18n("Owner: ") + event->organizer()); | 399 | mOwnerLabel->setText(i18n("Owner: ") + event->organizer()); |
398 | #endif | 400 | #endif |
399 | 401 | ||
400 | enableAlarmEdit( event->isAlarmEnabled() ); | 402 | enableAlarmEdit( event->isAlarmEnabled() ); |
401 | //qDebug("KOEditorGeneral::readIncidence(Incidence *event) "); | 403 | //qDebug("KOEditorGeneral::readIncidence(Incidence *event) "); |
402 | if(!event->isAlarmEnabled()) { | 404 | if(!event->isAlarmEnabled()) { |
403 | // TODO: Implement a KPrefsComboItem to solve this in a clean way. | 405 | // TODO: Implement a KPrefsComboItem to solve this in a clean way. |
404 | int alarmTime; | 406 | int alarmTime; |
405 | int a[] = { 1,5,10,15,30,60,180, 1440 }; | 407 | int a[] = { 1,5,10,15,30,60,180, 1440 }; |
406 | int index = KOPrefs::instance()->mAlarmTime; | 408 | int index = KOPrefs::instance()->mAlarmTime; |
407 | if (index < 0 || index > 7) { | 409 | if (index < 0 || index > 7) { |
408 | alarmTime = 15; | 410 | alarmTime = 15; |
409 | } else { | 411 | } else { |
410 | alarmTime = a[index]; | 412 | alarmTime = a[index]; |
411 | } | 413 | } |
412 | mAlarmTimeEdit->setValue(alarmTime); | 414 | mAlarmTimeEdit->setValue(alarmTime); |
413 | } | 415 | } |