Diffstat (limited to 'korganizer/koviewmanager.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | korganizer/koviewmanager.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index ca3de59..a74c5fe 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp | |||
@@ -362,96 +362,98 @@ void KOViewManager::showAgendaView( bool fullScreen ) | |||
362 | addView(mAgendaView); | 362 | addView(mAgendaView); |
363 | #ifndef DESKTOP_VERSION | 363 | #ifndef DESKTOP_VERSION |
364 | QPEApplication::setStylusOperation( mAgendaView, QPEApplication::RightOnHold ); | 364 | QPEApplication::setStylusOperation( mAgendaView, QPEApplication::RightOnHold ); |
365 | #endif | 365 | #endif |
366 | connect( mAgendaView, SIGNAL( incidenceChanged(Incidence *, int )), | 366 | connect( mAgendaView, SIGNAL( incidenceChanged(Incidence *, int )), |
367 | mMainView, SLOT( changeIncidenceDisplay( Incidence *, int ) )); | 367 | mMainView, SLOT( changeIncidenceDisplay( Incidence *, int ) )); |
368 | 368 | ||
369 | // SIGNALS/SLOTS FOR DAY/WEEK VIEW | 369 | // SIGNALS/SLOTS FOR DAY/WEEK VIEW |
370 | 370 | ||
371 | connect(mAgendaView,SIGNAL(showDateView( int, QDate )),SLOT(showDateView( int, QDate ))); | 371 | connect(mAgendaView,SIGNAL(showDateView( int, QDate )),SLOT(showDateView( int, QDate ))); |
372 | 372 | ||
373 | connect(mAgendaView,SIGNAL(newTodoSignal(QDateTime,bool)), | 373 | connect(mAgendaView,SIGNAL(newTodoSignal(QDateTime,bool)), |
374 | mMainView, SLOT(newTodoDateTime(QDateTime,bool))); | 374 | mMainView, SLOT(newTodoDateTime(QDateTime,bool))); |
375 | connect(mAgendaView,SIGNAL(newEventSignal(QDateTime)), | 375 | connect(mAgendaView,SIGNAL(newEventSignal(QDateTime)), |
376 | mMainView, SLOT(newEvent(QDateTime))); | 376 | mMainView, SLOT(newEvent(QDateTime))); |
377 | connect(mAgendaView,SIGNAL(newEventSignal(QDateTime,QDateTime)), | 377 | connect(mAgendaView,SIGNAL(newEventSignal(QDateTime,QDateTime)), |
378 | mMainView, SLOT(newEvent(QDateTime,QDateTime))); | 378 | mMainView, SLOT(newEvent(QDateTime,QDateTime))); |
379 | connect(mAgendaView,SIGNAL(newEventSignal(QDate)), | 379 | connect(mAgendaView,SIGNAL(newEventSignal(QDate)), |
380 | mMainView, SLOT(newEvent(QDate))); | 380 | mMainView, SLOT(newEvent(QDate))); |
381 | 381 | ||
382 | connect(mAgendaView, SIGNAL(editIncidenceSignal(Incidence *)), | 382 | connect(mAgendaView, SIGNAL(editIncidenceSignal(Incidence *)), |
383 | mMainView, SLOT(editIncidence(Incidence *))); | 383 | mMainView, SLOT(editIncidence(Incidence *))); |
384 | connect(mAgendaView, SIGNAL(showIncidenceSignal(Incidence *)), | 384 | connect(mAgendaView, SIGNAL(showIncidenceSignal(Incidence *)), |
385 | mMainView, SLOT(showIncidence(Incidence *))); | 385 | mMainView, SLOT(showIncidence(Incidence *))); |
386 | connect(mAgendaView, SIGNAL(deleteIncidenceSignal(Incidence *)), | 386 | connect(mAgendaView, SIGNAL(deleteIncidenceSignal(Incidence *)), |
387 | mMainView, SLOT(deleteIncidence(Incidence *))); | 387 | mMainView, SLOT(deleteIncidence(Incidence *))); |
388 | 388 | ||
389 | connect( mAgendaView, SIGNAL( incidenceSelected( Incidence * ) ), | 389 | connect( mAgendaView, SIGNAL( incidenceSelected( Incidence * ) ), |
390 | mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); | 390 | mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); |
391 | 391 | ||
392 | connect(mAgendaView, SIGNAL( toggleExpand() ), | 392 | connect(mAgendaView, SIGNAL( toggleExpand() ), |
393 | mMainView, SLOT( toggleExpand() ) ); | 393 | mMainView, SLOT( toggleExpand() ) ); |
394 | 394 | ||
395 | connect(mMainView, SIGNAL( calendarViewExpanded( bool ) ), | 395 | connect(mMainView, SIGNAL( calendarViewExpanded( bool ) ), |
396 | mAgendaView, SLOT( setExpandedButton( bool ) ) ); | 396 | mAgendaView, SLOT( setExpandedButton( bool ) ) ); |
397 | connect( mAgendaView, SIGNAL( cloneIncidenceSignal(Incidence *) ), | 397 | connect( mAgendaView, SIGNAL( cloneIncidenceSignal(Incidence *) ), |
398 | mMainView, SLOT(cloneIncidence(Incidence *) ) ) ; | 398 | mMainView, SLOT(cloneIncidence(Incidence *) ) ) ; |
399 | connect( mAgendaView, SIGNAL( cancelIncidenceSignal(Incidence *) ), | 399 | connect( mAgendaView, SIGNAL( cancelIncidenceSignal(Incidence *) ), |
400 | mMainView, SLOT(cancelIncidence(Incidence *) ) ) ; | 400 | mMainView, SLOT(cancelIncidence(Incidence *) ) ) ; |
401 | connect(mMainView, SIGNAL(configChanged()), mAgendaView, SLOT(updateConfig())); | 401 | connect(mMainView, SIGNAL(configChanged()), mAgendaView, SLOT(updateConfig())); |
402 | connect( mMainView, SIGNAL( todoModified( Todo *, int )), mAgendaView, | 402 | connect( mMainView, SIGNAL( todoModified( Todo *, int )), mAgendaView, |
403 | SLOT( updateTodo( Todo *, int ) ) ); | 403 | SLOT( updateTodo( Todo *, int ) ) ); |
404 | connect( mAgendaView,SIGNAL( todoMoved( Todo *, int )), | 404 | connect( mAgendaView,SIGNAL( todoMoved( Todo *, int )), |
405 | mMainView, SIGNAL( todoModified( Todo *, int ))); | 405 | mMainView, SIGNAL( todoModified( Todo *, int ))); |
406 | connect( mAgendaView, SIGNAL( moveIncidenceSignal( Incidence * ) ), | 406 | connect( mAgendaView, SIGNAL( moveIncidenceSignal( Incidence * ) ), |
407 | mMainView, SLOT ( moveIncidence( Incidence * ) ) ); | 407 | mMainView, SLOT ( moveIncidence( Incidence * ) ) ); |
408 | connect( mAgendaView, SIGNAL( beamIncidenceSignal( Incidence * ) ), | 408 | connect( mAgendaView, SIGNAL( beamIncidenceSignal( Incidence * ) ), |
409 | mMainView, SLOT ( beamIncidence( Incidence * ) ) ); | 409 | mMainView, SLOT ( beamIncidence( Incidence * ) ) ); |
410 | connect( mAgendaView, SIGNAL( selectWeekNum( int ) ), | ||
411 | mMainView->dateNavigator(), SLOT ( selectWeek( int ) ) ); | ||
410 | mAgendaView->readSettings(); | 412 | mAgendaView->readSettings(); |
411 | mAgendaView->updateConfig(); | 413 | mAgendaView->updateConfig(); |
412 | } | 414 | } |
413 | 415 | ||
414 | showView( mAgendaView, full); | 416 | showView( mAgendaView, full); |
415 | 417 | ||
416 | } | 418 | } |
417 | 419 | ||
418 | void KOViewManager::showDayView() | 420 | void KOViewManager::showDayView() |
419 | { | 421 | { |
420 | mFlagShowNextxDays = false; | 422 | mFlagShowNextxDays = false; |
421 | globalFlagBlockLabel = 1; | 423 | globalFlagBlockLabel = 1; |
422 | globalFlagBlockAgenda = 1; | 424 | globalFlagBlockAgenda = 1; |
423 | if ( mCurrentAgendaView != 1 ) | 425 | if ( mCurrentAgendaView != 1 ) |
424 | mCurrentAgendaView = -1; | 426 | mCurrentAgendaView = -1; |
425 | showAgendaView(); | 427 | showAgendaView(); |
426 | qApp->processEvents(); | 428 | qApp->processEvents(); |
427 | globalFlagBlockAgenda = 2; | 429 | globalFlagBlockAgenda = 2; |
428 | globalFlagBlockLabel = 0; | 430 | globalFlagBlockLabel = 0; |
429 | mMainView->dateNavigator()->selectDates( 1 ); | 431 | mMainView->dateNavigator()->selectDates( 1 ); |
430 | mCurrentAgendaView = 1 ; | 432 | mCurrentAgendaView = 1 ; |
431 | 433 | ||
432 | } | 434 | } |
433 | 435 | ||
434 | void KOViewManager::showWorkWeekView() | 436 | void KOViewManager::showWorkWeekView() |
435 | { | 437 | { |
436 | mFlagShowNextxDays = false; | 438 | mFlagShowNextxDays = false; |
437 | globalFlagBlockAgenda = 1; | 439 | globalFlagBlockAgenda = 1; |
438 | globalFlagBlockLabel = 1; | 440 | globalFlagBlockLabel = 1; |
439 | if ( mCurrentAgendaView != 5 ) | 441 | if ( mCurrentAgendaView != 5 ) |
440 | mCurrentAgendaView = -1; | 442 | mCurrentAgendaView = -1; |
441 | showAgendaView(); | 443 | showAgendaView(); |
442 | qApp->processEvents(); | 444 | qApp->processEvents(); |
443 | globalFlagBlockAgenda = 2; | 445 | globalFlagBlockAgenda = 2; |
444 | globalFlagBlockLabel = 0; | 446 | globalFlagBlockLabel = 0; |
445 | mMainView->dateNavigator()->selectWorkWeek(); | 447 | mMainView->dateNavigator()->selectWorkWeek(); |
446 | mCurrentAgendaView = 5 ; | 448 | mCurrentAgendaView = 5 ; |
447 | 449 | ||
448 | } | 450 | } |
449 | 451 | ||
450 | void KOViewManager::showWeekView() | 452 | void KOViewManager::showWeekView() |
451 | { | 453 | { |
452 | /* | 454 | /* |
453 | globalFlagBlockAgenda = 2; | 455 | globalFlagBlockAgenda = 2; |
454 | qDebug("4globalFlagBlockAgenda = 2; "); | 456 | qDebug("4globalFlagBlockAgenda = 2; "); |
455 | //globalFlagBlockPainting = true; | 457 | //globalFlagBlockPainting = true; |
456 | mMainView->dateNavigator()->selectWeek(); | 458 | mMainView->dateNavigator()->selectWeek(); |
457 | showAgendaView(); | 459 | showAgendaView(); |