summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-02-23 14:09:49 (UTC)
committer zautrix <zautrix>2005-02-23 14:09:49 (UTC)
commitfaedffc5ce8391204e0340a21eaaf582319ac824 (patch) (unidiff)
treecef25226d049d6a370bce9444edad171f4b24e97
parent36704cb63582c161d2ab5c63e66ee63bbf3b865f (diff)
downloadkdepimpi-faedffc5ce8391204e0340a21eaaf582319ac824.zip
kdepimpi-faedffc5ce8391204e0340a21eaaf582319ac824.tar.gz
kdepimpi-faedffc5ce8391204e0340a21eaaf582319ac824.tar.bz2
focus fixes
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--korganizer/koeventviewer.cpp12
-rw-r--r--korganizer/koeventviewer.h1
-rw-r--r--korganizer/koeventviewerdialog.cpp18
-rw-r--r--korganizer/searchdialog.cpp2
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
@@ -693,3 +693,15 @@ void KOEventViewer::addText(QString text)
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
@@ -60,6 +60,7 @@ class KOEventViewer : public QTextBrowser {
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;
diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp
index f6f7258..23e62d3 100644
--- a/korganizer/koeventviewerdialog.cpp
+++ b/korganizer/koeventviewerdialog.cpp
@@ -77,8 +77,8 @@ void KOEventViewerDialog::showMe()
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 )
@@ -120,7 +120,8 @@ void 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 }
@@ -152,7 +153,8 @@ void 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 }
@@ -162,7 +164,8 @@ void 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 }
@@ -171,7 +174,8 @@ void 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 }
@@ -180,7 +184,8 @@ void KOEventViewerDialog::setJournal(Journal *j)
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{
@@ -254,6 +259,7 @@ void KOEventViewerDialog::keyPressEvent ( QKeyEvent * e )
254 accept(); 259 accept();
255 break; 260 break;
256 default: 261 default:
262 KDialogBase::keyPressEvent ( e );
257 break; 263 break;
258 } 264 }
259 265
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index aa1b244..cef59a2 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -84,7 +84,7 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
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 );