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
@@ -692,4 +692,16 @@ void KOEventViewer::addText(QString text)
692{ 692{
693 mText.append(text); 693 mText.append(text);
694 setText(mText); 694 setText(mText);
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
@@ -59,8 +59,9 @@ class KOEventViewer : public QTextBrowser {
59 59
60 void formatCategories(Incidence *event); 60 void formatCategories(Incidence *event);
61 void formatAttendees(Incidence *event); 61 void formatAttendees(Incidence *event);
62 void formatReadOnly(Incidence *event); 62 void formatReadOnly(Incidence *event);
63 void keyPressEvent ( QKeyEvent * e );
63 64
64 private: 65 private:
65 QTextBrowser *mEventTextView; 66 QTextBrowser *mEventTextView;
66 bool mSyncMode; 67 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()
76 show(); 76 show();
77#else 77#else
78 showMaximized(); 78 showMaximized();
79#endif 79#endif
80 setFocus();
81 setActiveWindow(); 80 setActiveWindow();
81 mEventViewer->setFocus();
82 82
83} 83}
84void KOEventViewerDialog::setSyncMode( bool b ) 84void KOEventViewerDialog::setSyncMode( bool b )
85{ 85{
@@ -118,10 +118,11 @@ void KOEventViewerDialog::updateConfig()
118} 118}
119void KOEventViewerDialog::setEvent(Event *event) 119void KOEventViewerDialog::setEvent(Event *event)
120{ 120{
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 ) {
125 findButton( User1 )->setText( i18n("Agenda")); 126 findButton( User1 )->setText( i18n("Agenda"));
126 } 127 }
127} 128}
@@ -151,37 +152,41 @@ void KOEventViewerDialog::addIncidence(Incidence *in)
151void KOEventViewerDialog::addEvent(Event *event) 152void KOEventViewerDialog::addEvent(Event *event)
152{ 153{
153 mEventViewer->addEvent(event); 154 mEventViewer->addEvent(event);
154 mIncidence = event; 155 mIncidence = event;
155 findButton( Close )->setFocus(); 156 mEventViewer->setFocus();
157 //findButton( Close )->setFocus();
156 if ( !mSyncMode ) { 158 if ( !mSyncMode ) {
157 findButton( User1 )->setText( i18n("Agenda")); 159 findButton( User1 )->setText( i18n("Agenda"));
158 } 160 }
159} 161}
160 162
161void KOEventViewerDialog::setTodo(Todo *event) 163void KOEventViewerDialog::setTodo(Todo *event)
162{ 164{
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 ) {
167 findButton( User1 )->setText( i18n("Set complete")); 170 findButton( User1 )->setText( i18n("Set complete"));
168 } 171 }
169} 172}
170void KOEventViewerDialog::setJournal(Journal *j) 173void KOEventViewerDialog::setJournal(Journal *j)
171{ 174{
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 ) {
176 findButton( User1 )->setText( i18n("Agenda")); 180 findButton( User1 )->setText( i18n("Agenda"));
177 } 181 }
178} 182}
179 183
180void KOEventViewerDialog::addText(QString text) 184void 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}
185void KOEventViewerDialog::editIncidence() 190void KOEventViewerDialog::editIncidence()
186{ 191{
187 if ( mSyncMode ) { 192 if ( mSyncMode ) {
@@ -253,8 +258,9 @@ void KOEventViewerDialog::keyPressEvent ( QKeyEvent * e )
253 case Qt::Key_I: 258 case Qt::Key_I:
254 accept(); 259 accept();
255 break; 260 break;
256 default: 261 default:
262 KDialogBase::keyPressEvent ( e );
257 break; 263 break;
258 } 264 }
259 265
260} 266}
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)
83 layout->addWidget(subjectGroup); 83 layout->addWidget(subjectGroup);
84 84
85 mSummaryCheck = new QCheckBox(i18n("Summary/Loc."),subjectGroup); 85 mSummaryCheck = new QCheckBox(i18n("Summary/Loc."),subjectGroup);
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);
89 89
90 QHBox *attendeeGroup = new QHBox( topFrame ); 90 QHBox *attendeeGroup = new QHBox( topFrame );
91 layout->addWidget(attendeeGroup ); 91 layout->addWidget(attendeeGroup );