author | zecke <zecke> | 2002-06-27 12:42:37 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-06-27 12:42:37 (UTC) |
commit | 475c11d442a03d8e53b220923626c4bb7350831f (patch) (unidiff) | |
tree | 10e7fdfc22b337dfd8f6947f09e7bd163e609f0f /core | |
parent | e69c1daabcd8149f2ad61b2cbbf205128072b415 (diff) | |
download | opie-475c11d442a03d8e53b220923626c4bb7350831f.zip opie-475c11d442a03d8e53b220923626c4bb7350831f.tar.gz opie-475c11d442a03d8e53b220923626c4bb7350831f.tar.bz2 |
Fix for bug 81. It's now like in todolist
If neither description nor note is inserted
it'll be discarded
-rw-r--r-- | core/pim/datebook/datebook.cpp | 2 | ||||
-rw-r--r-- | core/pim/datebook/dateentryimpl.cpp | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp index e10842a..76260e2 100644 --- a/core/pim/datebook/datebook.cpp +++ b/core/pim/datebook/datebook.cpp | |||
@@ -426,12 +426,14 @@ void DateBook::editEvent( const Event &e ) | |||
426 | 426 | ||
427 | #if defined(Q_WS_QWS) || defined(_WS_QWS_) | 427 | #if defined(Q_WS_QWS) || defined(_WS_QWS_) |
428 | editDlg.showMaximized(); | 428 | editDlg.showMaximized(); |
429 | #endif | 429 | #endif |
430 | while (editDlg.exec() ) { | 430 | while (editDlg.exec() ) { |
431 | Event newEv = entry->event(); | 431 | Event newEv = entry->event(); |
432 | if(newEv.description().isEmpty() && newEv.notes().isEmpty() ) | ||
433 | break; | ||
432 | newEv.setUid(e.uid()); // FIXME: Hack not to clear uid | 434 | newEv.setUid(e.uid()); // FIXME: Hack not to clear uid |
433 | QString error = checkEvent(newEv); | 435 | QString error = checkEvent(newEv); |
434 | if (!error.isNull()) { | 436 | if (!error.isNull()) { |
435 | if (QMessageBox::warning(this, "error box", | 437 | if (QMessageBox::warning(this, "error box", |
436 | error, "Fix it", "Continue", | 438 | error, "Fix it", "Continue", |
437 | 0, 0, 1) == 0) | 439 | 0, 0, 1) == 0) |
diff --git a/core/pim/datebook/dateentryimpl.cpp b/core/pim/datebook/dateentryimpl.cpp index dab3375..2cdda9d 100644 --- a/core/pim/datebook/dateentryimpl.cpp +++ b/core/pim/datebook/dateentryimpl.cpp | |||
@@ -567,6 +567,7 @@ void DateEntry::initCombos() | |||
567 | void DateEntry::slotChangeClock( bool whichClock ) | 567 | void DateEntry::slotChangeClock( bool whichClock ) |
568 | { | 568 | { |
569 | ampm = whichClock; | 569 | ampm = whichClock; |
570 | initCombos(); | 570 | initCombos(); |
571 | setDates( QDateTime( startDate, startTime ), QDateTime( endDate, endTime ) ); | 571 | setDates( QDateTime( startDate, startTime ), QDateTime( endDate, endTime ) ); |
572 | } | 572 | } |
573 | |||