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
@@ -130,4 +130,4 @@ DateEntry::DateEntry( bool startOnMonday, const Event &event, bool whichClock,
     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());
@@ -212,2 +212,5 @@ void DateEntry::init()
              this, SLOT(slotChangeStartOfWeek(bool)) );
+    
+    connect( editNote, SIGNAL(clicked()),
+             this, SLOT(slotEditNote()) );
 
@@ -222,3 +225,2 @@ void DateEntry::init()
             this, SLOT( startTimePicked(const QTime &) ));
-    editNote->setFixedVisibleLines(3);
     // install eventFilters
@@ -240,2 +242,18 @@ 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);  
+
+#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 )
@@ -457,3 +475,3 @@ Event DateEntry::event()
         ev.setRepeat( TRUE, rp );
-    ev.setNotes( editNote->text() );
+    ev.setNotes( noteStr );