Diffstat (limited to 'korganizer/koeventviewerdialog.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | korganizer/koeventviewerdialog.cpp | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp index f6f7258..23e62d3 100644 --- a/korganizer/koeventviewerdialog.cpp +++ b/korganizer/koeventviewerdialog.cpp | |||
@@ -74,14 +74,14 @@ void KOEventViewerDialog::showMe() | |||
74 | 74 | ||
75 | #ifdef DESKTOP_VERSION | 75 | #ifdef DESKTOP_VERSION |
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 | } |
84 | void KOEventViewerDialog::setSyncMode( bool b ) | 84 | void KOEventViewerDialog::setSyncMode( bool b ) |
85 | { | 85 | { |
86 | mSyncMode = b; | 86 | mSyncMode = b; |
87 | //qDebug("KOEventViewerDialog::setSyncMode %d ",mSyncMode ); | 87 | //qDebug("KOEventViewerDialog::setSyncMode %d ",mSyncMode ); |
@@ -116,14 +116,15 @@ void KOEventViewerDialog::updateConfig() | |||
116 | mEventViewer->setFont( KOPrefs::instance()->mEventViewFont ); | 116 | mEventViewer->setFont( KOPrefs::instance()->mEventViewFont ); |
117 | 117 | ||
118 | } | 118 | } |
119 | void KOEventViewerDialog::setEvent(Event *event) | 119 | 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 | } |
127 | } | 128 | } |
128 | void KOEventViewerDialog::setIncidence(Incidence *in ) | 129 | void KOEventViewerDialog::setIncidence(Incidence *in ) |
129 | { | 130 | { |
@@ -149,41 +150,45 @@ void KOEventViewerDialog::addIncidence(Incidence *in) | |||
149 | } | 150 | } |
150 | 151 | ||
151 | void KOEventViewerDialog::addEvent(Event *event) | 152 | 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 | } |
159 | } | 161 | } |
160 | 162 | ||
161 | void KOEventViewerDialog::setTodo(Todo *event) | 163 | 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 | } |
169 | } | 172 | } |
170 | void KOEventViewerDialog::setJournal(Journal *j) | 173 | 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 | } |
178 | } | 182 | } |
179 | 183 | ||
180 | void KOEventViewerDialog::addText(QString text) | 184 | 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 | } |
185 | void KOEventViewerDialog::editIncidence() | 190 | void KOEventViewerDialog::editIncidence() |
186 | { | 191 | { |
187 | if ( mSyncMode ) { | 192 | if ( mSyncMode ) { |
188 | mSyncResult = 2; | 193 | mSyncResult = 2; |
189 | accept(); | 194 | accept(); |
@@ -251,10 +256,11 @@ void KOEventViewerDialog::keyPressEvent ( QKeyEvent * e ) | |||
251 | close(); | 256 | close(); |
252 | break; | 257 | break; |
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 | } |