summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/datebook/.cvsignore2
-rw-r--r--core/pim/datebook/datebook.pro9
-rw-r--r--core/pim/datebook/dateentry.ui13
-rw-r--r--core/pim/datebook/dateentryimpl.cpp26
-rw-r--r--core/pim/datebook/dateentryimpl.h4
-rw-r--r--core/pim/datebook/noteentry.ui68
-rw-r--r--core/pim/datebook/noteentryimpl.cpp16
-rw-r--r--core/pim/datebook/noteentryimpl.h18
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
@@ -14,3 +14,5 @@ datebookweeklstdayhdr.cpp
datebookweeklstdayhdr.h
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
@@ -11,7 +11,8 @@ HEADERS = datebookday.h \
datebookweeklst.h \
datebookweekheaderimpl.h \
repeatentry.h \
- timepicker.h
+ timepicker.h \
+ noteentryimpl.h
SOURCES = main.cpp \
datebookday.cpp \
@@ -23,7 +24,8 @@ SOURCES = main.cpp \
datebookweeklst.cpp \
datebookweekheaderimpl.cpp \
repeatentry.cpp \
- timepicker.cpp
+ timepicker.cpp \
+ noteentryimpl.cpp
INTERFACES = dateentry.ui \
datebookdayheader.ui \
@@ -31,7 +33,8 @@ INTERFACES = dateentry.ui \
datebookweekheader.ui \
datebookweeklstheader.ui \
datebookweeklstdayhdr.ui \
- repeatentrybase.ui
+ repeatentrybase.ui \
+ noteentry.ui
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
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
@@ -489,13 +489,24 @@
<name>text</name>
<string>No Repeat...</string>
</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">
<name>name</name>
<cstring>editNote</cstring>
</property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Note...</string>
+ </property>
</widget>
</grid>
</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
@@ -128,8 +128,8 @@ DateEntry::DateEntry( bool startOnMonday, const Event &event, bool whichClock,
addOrPick( comboLocation, event.location() );
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 )
comboSound->setCurrentItem( 1 );
@@ -210,6 +210,9 @@ void DateEntry::init()
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 );
@@ -220,7 +223,6 @@ void DateEntry::init()
connect(timePickerStart, SIGNAL( timeChanged(const QTime &) ),
this, SLOT( startTimePicked(const QTime &) ));
- editNote->setFixedVisibleLines(3);
// install eventFilters
comboEnd->installEventFilter( this );
comboStart->installEventFilter( this );
@@ -238,6 +240,22 @@ 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 )
{
endDate.setYMD( y, m, d );
@@ -455,7 +473,7 @@ Event DateEntry::event()
ev.setAlarm( checkAlarm->isChecked(), spinAlarm->value(), st );
if ( rp.type != Event::NoRepeat )
ev.setRepeat( TRUE, rp );
- ev.setNotes( editNote->text() );
+ ev.setNotes( noteStr );
//cout << "Start: " << comboStart->currentText() << endl;
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
@@ -21,6 +21,7 @@
#define DATEENTRY_H
#include "dateentry.h"
+#include "noteentryimpl.h"
#include <qpe/event.h>
@@ -55,6 +56,7 @@ public slots:
void slotRepeat();
void slotChangeClock( bool );
void slotChangeStartOfWeek( bool );
+ void slotEditNote();
private:
void init();
@@ -70,6 +72,8 @@ private:
bool ampm:1;
bool startWeekOnMonday:1;
bool m_showStart:1;
+
+ QString noteStr;
};
#endif // DATEENTRY_H
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