Diffstat (limited to 'core/pim/datebook/dateentryimpl.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/datebook/dateentryimpl.cpp | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/core/pim/datebook/dateentryimpl.cpp b/core/pim/datebook/dateentryimpl.cpp index c4f6c68..9cc5073 100644 --- a/core/pim/datebook/dateentryimpl.cpp +++ b/core/pim/datebook/dateentryimpl.cpp @@ -129,6 +129,6 @@ DateEntry::DateEntry( bool startOnMonday, const Event &event, bool whichClock, checkAlarm->setChecked( event.hasAlarm() ); checkAllDay->setChecked( event.type() == Event::AllDay ); - if(!event.notes().isEmpty()) - editNote->setText(event.notes()); + if(!event.notes().isEmpty()) noteStr=event.notes(); + else noteStr=""; spinAlarm->setValue(event.alarmTime()); if ( event.alarmSound() != Event::Silent ) @@ -211,4 +211,7 @@ void DateEntry::init() connect( qApp, SIGNAL(weekChanged(bool)), this, SLOT(slotChangeStartOfWeek(bool)) ); + + connect( editNote, SIGNAL(clicked()), + this, SLOT(slotEditNote()) ); QPopupMenu *m2 = new QPopupMenu( this ); @@ -221,5 +224,4 @@ void DateEntry::init() connect(timePickerStart, SIGNAL( timeChanged(const QTime &) ), this, SLOT( startTimePicked(const QTime &) )); - editNote->setFixedVisibleLines(3); // install eventFilters comboEnd->installEventFilter( this ); @@ -239,4 +241,20 @@ DateEntry::~DateEntry() * public slot */ + +void DateEntry::slotEditNote() { + QString s; + s.sprintf("<B>%d/%d</B> ", startDate.day(), startDate.month()); + NoteEntry noteDlg(s+comboDescription->currentText(), noteStr, + this,0,TRUE); + +#if defined(Q_WS_QWS) || defined(_WS_QWS_) + noteDlg.showMaximized(); +#endif + if (noteDlg.exec() ) { + noteStr=noteDlg.note->text(); + } + +} + void DateEntry::endDateChanged( int y, int m, int d ) { @@ -456,5 +474,5 @@ Event DateEntry::event() if ( rp.type != Event::NoRepeat ) ev.setRepeat( TRUE, rp ); - ev.setNotes( editNote->text() ); + ev.setNotes( noteStr ); //cout << "Start: " << comboStart->currentText() << endl; |