summaryrefslogtreecommitdiffabout
path: root/korganizer/koeventviewerdialog.cpp
Unidiff
Diffstat (limited to 'korganizer/koeventviewerdialog.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koeventviewerdialog.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp
index baa11b5..e5ff8af 100644
--- a/korganizer/koeventviewerdialog.cpp
+++ b/korganizer/koeventviewerdialog.cpp
@@ -195,89 +195,84 @@ void KOEventViewerDialog::setJournal(Journal *j)
195 mEventViewer->setJournal(j); 195 mEventViewer->setJournal(j);
196 mIncidence = (Incidence*)j; 196 mIncidence = (Incidence*)j;
197 mEventViewer->setFocus(); 197 mEventViewer->setFocus();
198 //findButton( Close )->setFocus(); 198 //findButton( Close )->setFocus();
199 if ( !mSyncMode ) { 199 if ( !mSyncMode ) {
200 findButton( User1 )->setText( i18n("Agenda")); 200 findButton( User1 )->setText( i18n("Agenda"));
201 } 201 }
202} 202}
203 203
204void KOEventViewerDialog::addText(QString text) 204void KOEventViewerDialog::addText(QString text)
205{ 205{
206 mEventViewer->addText(text); 206 mEventViewer->addText(text);
207 mEventViewer->setFocus(); 207 mEventViewer->setFocus();
208 //findButton( Close )->setFocus(); 208 //findButton( Close )->setFocus();
209} 209}
210void KOEventViewerDialog::editIncidence() 210void KOEventViewerDialog::editIncidence()
211{ 211{
212 sendSignalViewerClosed = false; 212 sendSignalViewerClosed = false;
213 if ( mSyncMode ) { 213 if ( mSyncMode ) {
214 mSyncResult = 2; 214 mSyncResult = 2;
215 accept(); 215 accept();
216 return; 216 return;
217 } 217 }
218 if ( mIncidence ){ 218 if ( mIncidence ){
219#ifndef DESKTOP_VERSION
220 //hide();
221 close(); 219 close();
222#endif
223 emit editIncidence( mIncidence ); 220 emit editIncidence( mIncidence );
224 } 221 }
225} 222}
226void KOEventViewerDialog::showIncidence() 223void KOEventViewerDialog::showIncidence()
227{ 224{
228 sendSignalViewerClosed = false; 225 sendSignalViewerClosed = false;
229 if ( mSyncMode ) { 226 if ( mSyncMode ) {
230 mSyncResult = 1; 227 mSyncResult = 1;
231 accept(); 228 accept();
232 return; 229 return;
233 } 230 }
234 231
235 if ( mIncidence ){ 232 if ( mIncidence ){
236 QDate date; 233 QDate date;
237 if ( mIncidence->type() == "Todo" ) { 234 if ( mIncidence->type() == "Todo" ) {
238 /* 235 /*
239 if ( ((Todo*)mIncidence)->hasDueDate() ) 236 if ( ((Todo*)mIncidence)->hasDueDate() )
240 date = ((Todo*)mIncidence)->dtDue().date(); 237 date = ((Todo*)mIncidence)->dtDue().date();
241 else { 238 else {
242 globalFlagBlockAgenda = 2; 239 globalFlagBlockAgenda = 2;
243 emit showAgendaView( false ); 240 emit showAgendaView( false );
244 return; 241 return;
245 } 242 }
246 */ 243 */
247 ((Todo*)mIncidence)->setCompleted( true ); 244 ((Todo*)mIncidence)->setCompleted( true );
248 ((Todo*)mIncidence)->setCompleted(QDateTime::currentDateTime() ); 245 ((Todo*)mIncidence)->setCompleted(QDateTime::currentDateTime() );
249 emit todoCompleted(((Todo*)mIncidence)); 246 emit todoCompleted(((Todo*)mIncidence));
250 } else { 247 } else {
251 date = mIncidence->dtStart().date(); 248 date = mIncidence->dtStart().date();
252 globalFlagBlockAgenda = 1; 249 globalFlagBlockAgenda = 1;
253 emit showAgendaView( false ); 250 emit showAgendaView( false );
254 globalFlagBlockAgenda = 2; 251 globalFlagBlockAgenda = 2;
255 emit jumpToTime( date ); 252 emit jumpToTime( date );
256 } 253 }
257#ifndef DESKTOP_VERSION 254 close();
258 reject();
259#endif
260 } 255 }
261} 256}
262void KOEventViewerDialog::keyPressEvent ( QKeyEvent * e ) 257void KOEventViewerDialog::keyPressEvent ( QKeyEvent * e )
263{ 258{
264 switch ( e->key() ) { 259 switch ( e->key() ) {
265 260
266 case Qt::Key_A : 261 case Qt::Key_A :
267 case Qt::Key_L : 262 case Qt::Key_L :
268 showIncidence(); 263 showIncidence();
269 break; 264 break;
270 case Qt::Key_E : 265 case Qt::Key_E :
271 case Qt::Key_R : 266 case Qt::Key_R :
272 editIncidence(); 267 editIncidence();
273 break; 268 break;
274 case Qt::Key_C: 269 case Qt::Key_C:
275 case Qt::Key_Escape: 270 case Qt::Key_Escape:
276 sendSignalViewerClosed = true; 271 sendSignalViewerClosed = true;
277 close(); 272 close();
278 break; 273 break;
279 case Qt::Key_I: 274 case Qt::Key_I:
280#ifndef DESKTOP_VERSION 275#ifndef DESKTOP_VERSION
281 sendSignalViewerClosed = true; 276 sendSignalViewerClosed = true;
282 close(); 277 close();
283#else 278#else