author | hakan <hakan> | 2002-05-07 15:27:34 (UTC) |
---|---|---|
committer | hakan <hakan> | 2002-05-07 15:27:34 (UTC) |
commit | ad2c6f2e1b5504989ceed297d9ee8c49129ad1fb (patch) (side-by-side diff) | |
tree | 60d75877abb05a322b265d8b50621f3f7f75c9d1 /core/pim/datebook/dateentryimpl.cpp | |
parent | 8ba0398d93f0e70ea2de254a4090d8bd02f593cd (diff) | |
download | opie-ad2c6f2e1b5504989ceed297d9ee8c49129ad1fb.zip opie-ad2c6f2e1b5504989ceed297d9ee8c49129ad1fb.tar.gz opie-ad2c6f2e1b5504989ceed297d9ee8c49129ad1fb.tar.bz2 |
Added separate note editor dialog (currently only a QMultiLineEdit)
Diffstat (limited to 'core/pim/datebook/dateentryimpl.cpp') (more/less context) (show 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 @@ -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 ); @@ -211,6 +211,9 @@ void DateEntry::init() 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 ); @@ -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; |