-rw-r--r-- | korganizer/koeventviewer.cpp | 12 | ||||
-rw-r--r-- | korganizer/koeventviewer.h | 1 | ||||
-rw-r--r-- | korganizer/koeventviewerdialog.cpp | 18 | ||||
-rw-r--r-- | korganizer/searchdialog.cpp | 2 |
4 files changed, 26 insertions, 7 deletions
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index 417d89c..44da058 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp @@ -692,4 +692,16 @@ void KOEventViewer::addText(QString text) { mText.append(text); setText(mText); } +void KOEventViewer::keyPressEvent ( QKeyEvent * e ) +{ + switch ( e->key() ) { + case Qt::Key_Return: + case Qt::Key_Enter : + e->ignore(); + break; + default: + QTextBrowser::keyPressEvent ( e ); + break; + } +} diff --git a/korganizer/koeventviewer.h b/korganizer/koeventviewer.h index cf44284..d8142ca 100644 --- a/korganizer/koeventviewer.h +++ b/korganizer/koeventviewer.h @@ -59,8 +59,9 @@ class KOEventViewer : public QTextBrowser { void formatCategories(Incidence *event); void formatAttendees(Incidence *event); void formatReadOnly(Incidence *event); + void keyPressEvent ( QKeyEvent * e ); private: QTextBrowser *mEventTextView; bool mSyncMode; diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp index f6f7258..23e62d3 100644 --- a/korganizer/koeventviewerdialog.cpp +++ b/korganizer/koeventviewerdialog.cpp @@ -76,10 +76,10 @@ void KOEventViewerDialog::showMe() show(); #else showMaximized(); #endif - setFocus(); setActiveWindow(); + mEventViewer->setFocus(); } void KOEventViewerDialog::setSyncMode( bool b ) { @@ -119,9 +119,10 @@ void KOEventViewerDialog::updateConfig() void KOEventViewerDialog::setEvent(Event *event) { mEventViewer->setEvent(event); mIncidence = event; - findButton( Close )->setFocus(); + mEventViewer->setFocus(); + //findButton( Close )->setFocus(); if ( !mSyncMode ) { findButton( User1 )->setText( i18n("Agenda")); } } @@ -151,9 +152,10 @@ void KOEventViewerDialog::addIncidence(Incidence *in) void KOEventViewerDialog::addEvent(Event *event) { mEventViewer->addEvent(event); mIncidence = event; - findButton( Close )->setFocus(); + mEventViewer->setFocus(); + //findButton( Close )->setFocus(); if ( !mSyncMode ) { findButton( User1 )->setText( i18n("Agenda")); } } @@ -161,27 +163,30 @@ void KOEventViewerDialog::addEvent(Event *event) void KOEventViewerDialog::setTodo(Todo *event) { mEventViewer->setTodo(event); mIncidence = (Incidence*)event; - findButton( Close )->setFocus(); + mEventViewer->setFocus(); + //findButton( Close )->setFocus(); if ( !mSyncMode ) { findButton( User1 )->setText( i18n("Set complete")); } } void KOEventViewerDialog::setJournal(Journal *j) { mEventViewer->setJournal(j); mIncidence = (Incidence*)j; - findButton( Close )->setFocus(); + mEventViewer->setFocus(); + //findButton( Close )->setFocus(); if ( !mSyncMode ) { findButton( User1 )->setText( i18n("Agenda")); } } void KOEventViewerDialog::addText(QString text) { mEventViewer->addText(text); - findButton( Close )->setFocus(); + mEventViewer->setFocus(); + //findButton( Close )->setFocus(); } void KOEventViewerDialog::editIncidence() { if ( mSyncMode ) { @@ -253,8 +258,9 @@ void KOEventViewerDialog::keyPressEvent ( QKeyEvent * e ) case Qt::Key_I: accept(); break; default: + KDialogBase::keyPressEvent ( e ); break; } } diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp index aa1b244..cef59a2 100644 --- a/korganizer/searchdialog.cpp +++ b/korganizer/searchdialog.cpp @@ -83,9 +83,9 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) layout->addWidget(subjectGroup); mSummaryCheck = new QCheckBox(i18n("Summary/Loc."),subjectGroup); mSummaryCheck->setChecked(true); - mDescriptionCheck = new QCheckBox(i18n("Descriptions"),subjectGroup); + mDescriptionCheck = new QCheckBox(i18n("Details"),subjectGroup); mCategoryCheck = new QCheckBox(i18n("Categories"),subjectGroup); QHBox *attendeeGroup = new QHBox( topFrame ); layout->addWidget(attendeeGroup ); |