8 files changed, 148 insertions, 8 deletions

diff --git a/core/pim/datebook/.cvsignore b/core/pim/datebook/.cvsignore
index d2e4975..74ec374 100644
--- a/core/pim/datebook/.cvsignore
+++ b/core/pim/datebook/.cvsignore
@@ -16 +16,3 @@ datebookweeklstheader.cpp
 datebookweeklstheader.h
+noteentry.cpp
+noteentry.h
diff --git a/core/pim/datebook/datebook.pro b/core/pim/datebook/datebook.pro
index 9383053..60c2b08 100644
--- a/core/pim/datebook/datebook.pro
+++ b/core/pim/datebook/datebook.pro
@@ -13,3 +13,4 @@ HEADERS	= datebookday.h \
           repeatentry.h \
-          timepicker.h
+          timepicker.h \
+          noteentryimpl.h
 
@@ -25,3 +26,4 @@ SOURCES	= main.cpp \
           repeatentry.cpp \
-          timepicker.cpp
+          timepicker.cpp \
+          noteentryimpl.cpp
 
@@ -33,3 +35,4 @@ INTERFACES	= dateentry.ui \
                           datebookweeklstdayhdr.ui \      
-                  repeatentrybase.ui
+                  repeatentrybase.ui \
+                  noteentry.ui
 
diff --git a/core/pim/datebook/dateentry.ui b/core/pim/datebook/dateentry.ui
index 1a712ec..fadbc35 100644
--- a/core/pim/datebook/dateentry.ui
+++ b/core/pim/datebook/dateentry.ui
@@ -491,5 +491,12 @@
             </property>
+            <property stdset="1">
+                <name>sizePolicy</name>
+                <sizepolicy>
+                    <hsizetype>7</hsizetype>
+                    <vsizetype>0</vsizetype>
+                </sizepolicy>
+            </property>
         </widget>
         <widget row="10"  column="0"  rowspan="1"  colspan="4" >
-            <class>QMultiLineEdit</class>
+            <class>QToolButton</class>
             <property stdset="1">
@@ -498,2 +505,6 @@
             </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>Note...</string>
+            </property>
         </widget>
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 );
 
diff --git a/core/pim/datebook/dateentryimpl.h b/core/pim/datebook/dateentryimpl.h
index 4eb24b4..a3c4668 100644
--- a/core/pim/datebook/dateentryimpl.h
+++ b/core/pim/datebook/dateentryimpl.h
@@ -23,2 +23,3 @@
 #include "dateentry.h"
+#include "noteentryimpl.h"
 
@@ -57,2 +58,3 @@ public slots:
     void slotChangeStartOfWeek( bool );
+    void slotEditNote();
 
@@ -72,2 +74,4 @@ private:
     bool m_showStart:1;
+
+    QString noteStr;
 };
diff --git a/core/pim/datebook/noteentry.ui b/core/pim/datebook/noteentry.ui
new file mode 100644
index 0000000..ce3c4ad
--- a/dev/null
+++ b/core/pim/datebook/noteentry.ui
@@ -0,0 +1,68 @@
+<!DOCTYPE UI><UI>
+<class>NoteEntryBase</class>
+<widget>
+    <class>QDialog</class>
+    <property stdset="1">
+        <name>name</name>
+        <cstring>NoteEntryBase</cstring>
+    </property>
+    <property stdset="1">
+        <name>geometry</name>
+        <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>465</width>
+            <height>500</height>
+        </rect>
+    </property>
+    <property stdset="1">
+        <name>caption</name>
+        <string>Edit Note</string>
+    </property>
+    <property>
+        <name>layoutMargin</name>
+    </property>
+    <property>
+        <name>layoutSpacing</name>
+    </property>
+    <vbox>
+        <property stdset="1">
+            <name>margin</name>
+            <number>2</number>
+        </property>
+        <property stdset="1">
+            <name>spacing</name>
+            <number>0</number>
+        </property>
+        <widget>
+            <class>QLabel</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>eventLabel</cstring>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>&lt;b&gt;1/10&lt;/b&gt; Lunch</string>
+            </property>
+            <property stdset="1">
+                <name>alignment</name>
+                <set>AlignCenter</set>
+            </property>
+            <property>
+                <name>hAlign</name>
+            </property>
+        </widget>
+        <widget>
+            <class>QMultiLineEdit</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>note</cstring>
+            </property>
+            <property stdset="1">
+                <name>wordWrap</name>
+                <enum>WidgetWidth</enum>
+            </property>
+        </widget>
+    </vbox>
+</widget>
+</UI>
diff --git a/core/pim/datebook/noteentryimpl.cpp b/core/pim/datebook/noteentryimpl.cpp
new file mode 100644
index 0000000..9e1abb9
--- a/dev/null
+++ b/core/pim/datebook/noteentryimpl.cpp
@@ -0,0 +1,16 @@
+#include "noteentryimpl.h"
+#include "qstring.h"
+#include "qmultilinedit.h"
+#include "qlabel.h"
+
+NoteEntry::NoteEntry(const QString &title, const QString &noteStr,
+                     QWidget* parent, const char* name, bool modal,
+                     WFlags fl) :
+  NoteEntryBase(parent, name, modal, fl) {
+
+
+  eventLabel->setText(title);
+  note->setText(noteStr);
+  int l=note->length();
+  note->setCursorPosition(l,l,false);
+}
diff --git a/core/pim/datebook/noteentryimpl.h b/core/pim/datebook/noteentryimpl.h
new file mode 100644
index 0000000..f3adfa6
--- a/dev/null
+++ b/core/pim/datebook/noteentryimpl.h
@@ -0,0 +1,18 @@
+#ifndef noteentryimpl_h
+#define noteentryimpl_h
+
+#include "noteentry.h"
+
+class QString;
+
+class NoteEntry : public NoteEntryBase 
+{
+    Q_OBJECT
+
+public:
+    NoteEntry(const QString &title, const QString &noteStr,
+              QWidget* parent = 0, const char* name = 0, 
+              bool modal=TRUE, WFlags fl=0);
+};
+
+#endif