summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (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
@@ -695 +695,13 @@ void KOEventViewer::addText(QString text)
695} 695}
696void KOEventViewer::keyPressEvent ( QKeyEvent * e )
697{
698 switch ( e->key() ) {
699 case Qt::Key_Return:
700 case Qt::Key_Enter :
701 e->ignore();
702 break;
703 default:
704 QTextBrowser::keyPressEvent ( e );
705 break;
706 }
707}
diff --git a/korganizer/koeventviewer.h b/korganizer/koeventviewer.h
index cf44284..d8142ca 100644
--- a/korganizer/koeventviewer.h
+++ b/korganizer/koeventviewer.h
@@ -62,2 +62,3 @@ class KOEventViewer : public QTextBrowser {
62 void formatReadOnly(Incidence *event); 62 void formatReadOnly(Incidence *event);
63 void keyPressEvent ( QKeyEvent * e );
63 64
diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp
index f6f7258..23e62d3 100644
--- a/korganizer/koeventviewerdialog.cpp
+++ b/korganizer/koeventviewerdialog.cpp
@@ -79,4 +79,4 @@ void KOEventViewerDialog::showMe()
79#endif 79#endif
80 setFocus();
81 setActiveWindow(); 80 setActiveWindow();
81 mEventViewer->setFocus();
82 82
@@ -121,4 +121,5 @@ void KOEventViewerDialog::setEvent(Event *event)
121 mEventViewer->setEvent(event); 121 mEventViewer->setEvent(event);
122 mIncidence = event; 122 mIncidence = event;
123 findButton( Close )->setFocus(); 123 mEventViewer->setFocus();
124 //findButton( Close )->setFocus();
124 if ( !mSyncMode ) { 125 if ( !mSyncMode ) {
@@ -154,3 +155,4 @@ void KOEventViewerDialog::addEvent(Event *event)
154 mIncidence = event; 155 mIncidence = event;
155 findButton( Close )->setFocus(); 156 mEventViewer->setFocus();
157 //findButton( Close )->setFocus();
156 if ( !mSyncMode ) { 158 if ( !mSyncMode ) {
@@ -163,4 +165,5 @@ void KOEventViewerDialog::setTodo(Todo *event)
163 mEventViewer->setTodo(event); 165 mEventViewer->setTodo(event);
164 mIncidence = (Incidence*)event; 166 mIncidence = (Incidence*)event;
165 findButton( Close )->setFocus(); 167 mEventViewer->setFocus();
168 //findButton( Close )->setFocus();
166 if ( !mSyncMode ) { 169 if ( !mSyncMode ) {
@@ -172,4 +175,5 @@ void KOEventViewerDialog::setJournal(Journal *j)
172 mEventViewer->setJournal(j); 175 mEventViewer->setJournal(j);
173 mIncidence = (Incidence*)j; 176 mIncidence = (Incidence*)j;
174 findButton( Close )->setFocus(); 177 mEventViewer->setFocus();
178 //findButton( Close )->setFocus();
175 if ( !mSyncMode ) { 179 if ( !mSyncMode ) {
@@ -181,4 +185,5 @@ void KOEventViewerDialog::addText(QString text)
181{ 185{
182 mEventViewer->addText(text); 186 mEventViewer->addText(text);
183 findButton( Close )->setFocus(); 187 mEventViewer->setFocus();
188 //findButton( Close )->setFocus();
184} 189}
@@ -256,2 +261,3 @@ void KOEventViewerDialog::keyPressEvent ( QKeyEvent * e )
256 default: 261 default:
262 KDialogBase::keyPressEvent ( e );
257 break; 263 break;
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index aa1b244..cef59a2 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -86,3 +86,3 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
86 mSummaryCheck->setChecked(true); 86 mSummaryCheck->setChecked(true);
87 mDescriptionCheck = new QCheckBox(i18n("Descriptions"),subjectGroup); 87 mDescriptionCheck = new QCheckBox(i18n("Details"),subjectGroup);
88 mCategoryCheck = new QCheckBox(i18n("Categories"),subjectGroup); 88 mCategoryCheck = new QCheckBox(i18n("Categories"),subjectGroup);