| author | zecke <zecke> | 2002-06-27 12:42:37 (UTC) |
|---|---|---|
| committer | zecke <zecke> | 2002-06-27 12:42:37 (UTC) |
| commit | 475c11d442a03d8e53b220923626c4bb7350831f (patch) (side-by-side diff) | |
| tree | 10e7fdfc22b337dfd8f6947f09e7bd163e609f0f | |
| 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 @@ -424,16 +424,18 @@ void DateBook::editEvent( const Event &e ) entry->timezone->setEnabled( FALSE ); sv->addChild( entry ); #if defined(Q_WS_QWS) || defined(_WS_QWS_) editDlg.showMaximized(); #endif while (editDlg.exec() ) { Event newEv = entry->event(); + if(newEv.description().isEmpty() && newEv.notes().isEmpty() ) + break; newEv.setUid(e.uid()); // FIXME: Hack not to clear uid QString error = checkEvent(newEv); if (!error.isNull()) { if (QMessageBox::warning(this, "error box", error, "Fix it", "Continue", 0, 0, 1) == 0) continue; } 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 @@ -565,8 +565,9 @@ void DateEntry::initCombos() } void DateEntry::slotChangeClock( bool whichClock ) { ampm = whichClock; initCombos(); setDates( QDateTime( startDate, startTime ), QDateTime( endDate, endTime ) ); } + |