| -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 @@ -426,12 +426,14 @@ void DateBook::editEvent( const Event &e ) #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) 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 @@ -90,13 +90,13 @@ bool DateEntry::eventFilter(QObject *obj, QEvent *ev ) else if( obj == comboStart ){ QString s; s.sprintf("%.2d:%.2d",startTime.hour(), startTime.minute()); comboStart->setText(s); } } - + return false; } static void addOrPick( QComboBox* combo, const QString& t ) { // Pick an item if one excists @@ -183,13 +183,13 @@ void DateEntry::updateTimeEdit(bool s, bool e) { strEnd.sprintf( "%d:%02d AM", ehour, endTime.minute() ); } } 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); } void DateEntry::init() { @@ -208,13 +208,13 @@ void DateEntry::init() connect( startPicker, SIGNAL( dateClicked( int, int, int ) ), this, SLOT( endDateChanged( int, int, int ) ) ); 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 ); endPicker = new DateBookMonth( m2, 0, TRUE ); m2->insertItem( endPicker ); @@ -243,13 +243,13 @@ 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 if (noteDlg.exec() ) { noteStr=noteDlg.note->text(); @@ -418,13 +418,13 @@ Event DateEntry::event() ev.setType( checkAllDay->isChecked() ? Event::AllDay : Event::Normal ); if ( startDate > endDate ) { 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 ); if ( startTime > endTime && endDate == startDate ) { QTime tmp = endTime; @@ -567,6 +567,7 @@ void DateEntry::initCombos() void DateEntry::slotChangeClock( bool whichClock ) { ampm = whichClock; initCombos(); setDates( QDateTime( startDate, startTime ), QDateTime( endDate, endTime ) ); } + |