summaryrefslogtreecommitdiff
authorzecke <zecke>2002-06-27 12:42:37 (UTC)
committer zecke <zecke>2002-06-27 12:42:37 (UTC)
commit475c11d442a03d8e53b220923626c4bb7350831f (patch) (unidiff)
tree10e7fdfc22b337dfd8f6947f09e7bd163e609f0f
parente69c1daabcd8149f2ad61b2cbbf205128072b415 (diff)
downloadopie-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
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/datebook/datebook.cpp2
-rw-r--r--core/pim/datebook/dateentryimpl.cpp11
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
@@ -429,6 +429,8 @@ void DateBook::editEvent( const Event &e )
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()) {
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
@@ -93,7 +93,7 @@ bool DateEntry::eventFilter(QObject *obj, QEvent *ev )
93 comboStart->setText(s); 93 comboStart->setText(s);
94 } 94 }
95 } 95 }
96 96
97 return false; 97 return false;
98} 98}
99 99
@@ -186,7 +186,7 @@ void DateEntry::updateTimeEdit(bool s, bool e) {
186 strStart.sprintf( "%02d:%02d", startTime.hour(), startTime.minute() ); 186 strStart.sprintf( "%02d:%02d", startTime.hour(), startTime.minute() );
187 strEnd.sprintf( "%02d:%02d", endTime.hour(), endTime.minute() ); 187 strEnd.sprintf( "%02d:%02d", endTime.hour(), endTime.minute() );
188 } 188 }
189 189
190 if (s) comboStart->setText(strStart); 190 if (s) comboStart->setText(strStart);
191 if (e) comboEnd->setText(strEnd); 191 if (e) comboEnd->setText(strEnd);
192} 192}
@@ -211,7 +211,7 @@ void DateEntry::init()
211 this, SLOT( slotChangeClock( bool ) ) ); 211 this, SLOT( slotChangeClock( bool ) ) );
212 connect( qApp, SIGNAL(weekChanged(bool)), 212 connect( qApp, SIGNAL(weekChanged(bool)),
213 this, SLOT(slotChangeStartOfWeek(bool)) ); 213 this, SLOT(slotChangeStartOfWeek(bool)) );
214 214
215 connect( editNote, SIGNAL(clicked()), 215 connect( editNote, SIGNAL(clicked()),
216 this, SLOT(slotEditNote()) ); 216 this, SLOT(slotEditNote()) );
217 217
@@ -246,7 +246,7 @@ void DateEntry::slotEditNote() {
246 QString s; 246 QString s;
247 s.sprintf("<B>%d/%d</B> ", startDate.day(), startDate.month()); 247 s.sprintf("<B>%d/%d</B> ", startDate.day(), startDate.month());
248 NoteEntry noteDlg(s+comboDescription->currentText(), noteStr, 248 NoteEntry noteDlg(s+comboDescription->currentText(), noteStr,
249 this,0,TRUE); 249 this,0,TRUE);
250 250
251#if defined(Q_WS_QWS) || defined(_WS_QWS_) 251#if defined(Q_WS_QWS) || defined(_WS_QWS_)
252 noteDlg.showMaximized(); 252 noteDlg.showMaximized();
@@ -421,7 +421,7 @@ Event DateEntry::event()
421 endDate = startDate; 421 endDate = startDate;
422 startDate = tmp; 422 startDate = tmp;
423 } 423 }
424 424
425 // This is now done in the changed slots 425 // This is now done in the changed slots
426 // startTime = parseTime( comboStart->text(), ampm ); 426 // startTime = parseTime( comboStart->text(), ampm );
427 //endTime = parseTime( comboEnd->text(), ampm ); 427 //endTime = parseTime( comboEnd->text(), ampm );
@@ -570,3 +570,4 @@ void DateEntry::slotChangeClock( bool whichClock )
570 initCombos(); 570 initCombos();
571 setDates( QDateTime( startDate, startTime ), QDateTime( endDate, endTime ) ); 571 setDates( QDateTime( startDate, startTime ), QDateTime( endDate, endTime ) );
572} 572}
573