summaryrefslogtreecommitdiffabout
path: root/korganizer
Side-by-side diff
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koeventviewer.cpp12
-rw-r--r--korganizer/koeventviewer.h1
-rw-r--r--korganizer/koeventviewerdialog.cpp26
-rw-r--r--korganizer/searchdialog.cpp2
4 files changed, 30 insertions, 11 deletions
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index 417d89c..44da058 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -694,2 +694,14 @@ void KOEventViewer::addText(QString 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
@@ -61,4 +61,5 @@ class KOEventViewer : public QTextBrowser {
void formatAttendees(Incidence *event);
void formatReadOnly(Incidence *event);
+ void keyPressEvent ( QKeyEvent * e );
private:
diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp
index f6f7258..23e62d3 100644
--- a/korganizer/koeventviewerdialog.cpp
+++ b/korganizer/koeventviewerdialog.cpp
@@ -78,6 +78,6 @@ void KOEventViewerDialog::showMe()
showMaximized();
#endif
- setFocus();
setActiveWindow();
+ mEventViewer->setFocus();
}
@@ -120,6 +120,7 @@ void KOEventViewerDialog::setEvent(Event *event)
{
mEventViewer->setEvent(event);
- mIncidence = event;
- findButton( Close )->setFocus();
+ mIncidence = event;
+ mEventViewer->setFocus();
+ //findButton( Close )->setFocus();
if ( !mSyncMode ) {
findButton( User1 )->setText( i18n("Agenda"));
@@ -153,5 +154,6 @@ 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"));
@@ -162,6 +164,7 @@ void KOEventViewerDialog::setTodo(Todo *event)
{
mEventViewer->setTodo(event);
- mIncidence = (Incidence*)event;
- findButton( Close )->setFocus();
+ mIncidence = (Incidence*)event;
+ mEventViewer->setFocus();
+ //findButton( Close )->setFocus();
if ( !mSyncMode ) {
findButton( User1 )->setText( i18n("Set complete"));
@@ -171,6 +174,7 @@ void KOEventViewerDialog::setJournal(Journal *j)
{
mEventViewer->setJournal(j);
- mIncidence = (Incidence*)j;
- findButton( Close )->setFocus();
+ mIncidence = (Incidence*)j;
+ mEventViewer->setFocus();
+ //findButton( Close )->setFocus();
if ( !mSyncMode ) {
findButton( User1 )->setText( i18n("Agenda"));
@@ -180,6 +184,7 @@ void KOEventViewerDialog::setJournal(Journal *j)
void KOEventViewerDialog::addText(QString text)
{
- mEventViewer->addText(text);
- findButton( Close )->setFocus();
+ mEventViewer->addText(text);
+ mEventViewer->setFocus();
+ //findButton( Close )->setFocus();
}
void KOEventViewerDialog::editIncidence()
@@ -255,4 +260,5 @@ void KOEventViewerDialog::keyPressEvent ( QKeyEvent * e )
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
@@ -85,5 +85,5 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
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);