| 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 /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 | 11 |
2 files changed, 8 insertions, 5 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 @@ -431,2 +431,4 @@ void DateBook::editEvent( const Event &e ) Event newEv = entry->event(); + if(newEv.description().isEmpty() && newEv.notes().isEmpty() ) + break; newEv.setUid(e.uid()); // FIXME: Hack not to clear uid 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 @@ -95,3 +95,3 @@ bool DateEntry::eventFilter(QObject *obj, QEvent *ev ) } - + return false; @@ -188,3 +188,3 @@ void DateEntry::updateTimeEdit(bool s, bool e) { } - + if (s) comboStart->setText(strStart); @@ -213,3 +213,3 @@ void DateEntry::init() this, SLOT(slotChangeStartOfWeek(bool)) ); - + connect( editNote, SIGNAL(clicked()), @@ -248,3 +248,3 @@ void DateEntry::slotEditNote() { NoteEntry noteDlg(s+comboDescription->currentText(), noteStr, - this,0,TRUE); + this,0,TRUE); @@ -423,3 +423,3 @@ Event DateEntry::event() } - + // This is now done in the changed slots @@ -572 +572,2 @@ void DateEntry::slotChangeClock( bool whichClock ) } + |