Fix for bug 81. It's now like in todolist

If neither description nor note is inserted
it'll be discarded

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
@@ -428,8 +428,10 @@ void DateBook::editEvent( const Event &e )
     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",
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
@@ -92,9 +92,9 @@ bool DateEntry::eventFilter(QObject *obj, QEvent *ev )
       s.sprintf("%.2d:%.2d",startTime.hour(), startTime.minute());
       comboStart->setText(s);
     }
   }
-  
+
   return false;
 }
 
 static void addOrPick( QComboBox* combo, const QString& t )
@@ -185,9 +185,9 @@ void DateEntry::updateTimeEdit(bool s, bool e) {
     } else {
 	strStart.sprintf( "%02d:%02d", startTime.hour(), startTime.minute() );
 	strEnd.sprintf( "%02d:%02d", endTime.hour(), endTime.minute() );
     }
-    
+
     if (s) comboStart->setText(strStart);
     if (e) comboEnd->setText(strEnd);
 }
 
@@ -210,9 +210,9 @@ void DateEntry::init()
     connect( qApp, SIGNAL( clockChanged( bool ) ),
 	     this, SLOT( slotChangeClock( bool ) ) );
     connect( qApp, SIGNAL(weekChanged(bool)),
 	     this, SLOT(slotChangeStartOfWeek(bool)) );
-    
+
     connect( editNote, SIGNAL(clicked()),
 	     this, SLOT(slotEditNote()) );
 
     QPopupMenu *m2 = new QPopupMenu( this );
@@ -245,9 +245,9 @@ DateEntry::~DateEntry()
 void DateEntry::slotEditNote() {
   QString s;
   s.sprintf("<B>%d/%d</B> ", startDate.day(), startDate.month());
   NoteEntry noteDlg(s+comboDescription->currentText(), noteStr,
-		    this,0,TRUE);  
+		    this,0,TRUE);
 
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
   noteDlg.showMaximized();
 #endif
@@ -420,9 +420,9 @@ Event DateEntry::event()
         QDate tmp = endDate;
         endDate = startDate;
         startDate = tmp;
     }
-    
+
     // This is now done in the changed slots
     //    startTime = parseTime( comboStart->text(), ampm );
     //endTime = parseTime( comboEnd->text(), ampm );
 
@@ -569,4 +569,5 @@ void DateEntry::slotChangeClock( bool whichClock )
     ampm = whichClock;
     initCombos();
     setDates( QDateTime( startDate, startTime ), QDateTime( endDate, endTime ) );
 }
+