-rw-r--r-- | korganizer/koviewmanager.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index a9f5a41..cc0ce9b 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp | |||
@@ -376,137 +376,140 @@ void KOViewManager::showAgendaView( bool fullScreen ) | |||
376 | mMainView, SLOT(newTodoDateTime(QDateTime,bool))); | 376 | mMainView, SLOT(newTodoDateTime(QDateTime,bool))); |
377 | connect(mAgendaView,SIGNAL(newEventSignal(QDateTime)), | 377 | connect(mAgendaView,SIGNAL(newEventSignal(QDateTime)), |
378 | mMainView, SLOT(newEvent(QDateTime))); | 378 | mMainView, SLOT(newEvent(QDateTime))); |
379 | connect(mAgendaView,SIGNAL(newEventSignal(QDateTime,QDateTime)), | 379 | connect(mAgendaView,SIGNAL(newEventSignal(QDateTime,QDateTime)), |
380 | mMainView, SLOT(newEvent(QDateTime,QDateTime))); | 380 | mMainView, SLOT(newEvent(QDateTime,QDateTime))); |
381 | connect(mAgendaView,SIGNAL(newEventSignal(QDate)), | 381 | connect(mAgendaView,SIGNAL(newEventSignal(QDate)), |
382 | mMainView, SLOT(newEvent(QDate))); | 382 | mMainView, SLOT(newEvent(QDate))); |
383 | 383 | ||
384 | connect(mAgendaView, SIGNAL(editIncidenceSignal(Incidence *)), | 384 | connect(mAgendaView, SIGNAL(editIncidenceSignal(Incidence *)), |
385 | mMainView, SLOT(editIncidence(Incidence *))); | 385 | mMainView, SLOT(editIncidence(Incidence *))); |
386 | connect(mAgendaView, SIGNAL(showIncidenceSignal(Incidence *)), | 386 | connect(mAgendaView, SIGNAL(showIncidenceSignal(Incidence *)), |
387 | mMainView, SLOT(showIncidence(Incidence *))); | 387 | mMainView, SLOT(showIncidence(Incidence *))); |
388 | connect(mAgendaView, SIGNAL(deleteIncidenceSignal(Incidence *)), | 388 | connect(mAgendaView, SIGNAL(deleteIncidenceSignal(Incidence *)), |
389 | mMainView, SLOT(deleteIncidence(Incidence *))); | 389 | mMainView, SLOT(deleteIncidence(Incidence *))); |
390 | 390 | ||
391 | connect( mAgendaView, SIGNAL( incidenceSelected( Incidence * ) ), | 391 | connect( mAgendaView, SIGNAL( incidenceSelected( Incidence * ) ), |
392 | mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); | 392 | mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); |
393 | 393 | ||
394 | connect(mAgendaView, SIGNAL( toggleExpand() ), | 394 | connect(mAgendaView, SIGNAL( toggleExpand() ), |
395 | mMainView, SLOT( toggleExpand() ) ); | 395 | mMainView, SLOT( toggleExpand() ) ); |
396 | 396 | ||
397 | connect(mMainView, SIGNAL( calendarViewExpanded( bool ) ), | 397 | connect(mMainView, SIGNAL( calendarViewExpanded( bool ) ), |
398 | mAgendaView, SLOT( setExpandedButton( bool ) ) ); | 398 | mAgendaView, SLOT( setExpandedButton( bool ) ) ); |
399 | connect( mAgendaView, SIGNAL( cloneIncidenceSignal(Incidence *) ), | 399 | connect( mAgendaView, SIGNAL( cloneIncidenceSignal(Incidence *) ), |
400 | mMainView, SLOT(cloneIncidence(Incidence *) ) ) ; | 400 | mMainView, SLOT(cloneIncidence(Incidence *) ) ) ; |
401 | connect( mAgendaView, SIGNAL( cancelIncidenceSignal(Incidence *) ), | 401 | connect( mAgendaView, SIGNAL( cancelIncidenceSignal(Incidence *) ), |
402 | mMainView, SLOT(cancelIncidence(Incidence *) ) ) ; | 402 | mMainView, SLOT(cancelIncidence(Incidence *) ) ) ; |
403 | connect(mMainView, SIGNAL(configChanged()), mAgendaView, SLOT(updateConfig())); | 403 | connect(mMainView, SIGNAL(configChanged()), mAgendaView, SLOT(updateConfig())); |
404 | connect( mMainView, SIGNAL( todoModified( Todo *, int )), mAgendaView, | 404 | connect( mMainView, SIGNAL( todoModified( Todo *, int )), mAgendaView, |
405 | SLOT( updateTodo( Todo *, int ) ) ); | 405 | SLOT( updateTodo( Todo *, int ) ) ); |
406 | connect( mAgendaView,SIGNAL( todoMoved( Todo *, int )), | 406 | connect( mAgendaView,SIGNAL( todoMoved( Todo *, int )), |
407 | mMainView, SIGNAL( todoModified( Todo *, int ))); | 407 | mMainView, SIGNAL( todoModified( Todo *, int ))); |
408 | connect( mAgendaView, SIGNAL( moveIncidenceSignal( Incidence * ) ), | 408 | connect( mAgendaView, SIGNAL( moveIncidenceSignal( Incidence * ) ), |
409 | mMainView, SLOT ( moveIncidence( Incidence * ) ) ); | 409 | mMainView, SLOT ( moveIncidence( Incidence * ) ) ); |
410 | connect( mAgendaView, SIGNAL( beamIncidenceSignal( Incidence * ) ), | 410 | connect( mAgendaView, SIGNAL( beamIncidenceSignal( Incidence * ) ), |
411 | mMainView, SLOT ( beamIncidence( Incidence * ) ) ); | 411 | mMainView, SLOT ( beamIncidence( Incidence * ) ) ); |
412 | connect( mAgendaView, SIGNAL( selectWeekNum( int ) ), | 412 | connect( mAgendaView, SIGNAL( selectWeekNum( int ) ), |
413 | mMainView->dateNavigator(), SLOT ( selectWeek( int ) ) ); | 413 | mMainView->dateNavigator(), SLOT ( selectWeek( int ) ) ); |
414 | mAgendaView->readSettings(); | 414 | mAgendaView->readSettings(); |
415 | mAgendaView->updateConfig(); | 415 | mAgendaView->updateConfig(); |
416 | } | 416 | } |
417 | 417 | ||
418 | showView( mAgendaView, full); | 418 | showView( mAgendaView, full); |
419 | 419 | ||
420 | } | 420 | } |
421 | 421 | ||
422 | void KOViewManager::showDayView() | 422 | void KOViewManager::showDayView() |
423 | { | 423 | { |
424 | mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count(); | ||
424 | mFlagShowNextxDays = false; | 425 | mFlagShowNextxDays = false; |
425 | globalFlagBlockLabel = 1; | 426 | globalFlagBlockLabel = 1; |
426 | globalFlagBlockAgenda = 1; | 427 | globalFlagBlockAgenda = 1; |
427 | if ( mCurrentAgendaView != 1 ) | 428 | if ( mCurrentAgendaView != 1 ) |
428 | mCurrentAgendaView = -1; | 429 | mCurrentAgendaView = -1; |
429 | showAgendaView(); | 430 | showAgendaView(); |
430 | qApp->processEvents(); | 431 | qApp->processEvents(); |
431 | globalFlagBlockAgenda = 2; | 432 | globalFlagBlockAgenda = 2; |
432 | globalFlagBlockLabel = 0; | 433 | globalFlagBlockLabel = 0; |
433 | mMainView->dateNavigator()->selectDates( 1 ); | 434 | mMainView->dateNavigator()->selectDates( 1 ); |
434 | mCurrentAgendaView = 1 ; | 435 | mCurrentAgendaView = 1 ; |
435 | 436 | ||
436 | } | 437 | } |
437 | 438 | ||
438 | void KOViewManager::showWorkWeekView() | 439 | void KOViewManager::showWorkWeekView() |
439 | { | 440 | { |
441 | mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count(); | ||
440 | mFlagShowNextxDays = false; | 442 | mFlagShowNextxDays = false; |
441 | globalFlagBlockAgenda = 1; | 443 | globalFlagBlockAgenda = 1; |
442 | globalFlagBlockLabel = 1; | 444 | globalFlagBlockLabel = 1; |
443 | if ( mCurrentAgendaView != 5 ) | 445 | if ( mCurrentAgendaView != 5 ) |
444 | mCurrentAgendaView = -1; | 446 | mCurrentAgendaView = -1; |
445 | showAgendaView(); | 447 | showAgendaView(); |
446 | qApp->processEvents(); | 448 | qApp->processEvents(); |
447 | globalFlagBlockAgenda = 2; | 449 | globalFlagBlockAgenda = 2; |
448 | globalFlagBlockLabel = 0; | 450 | globalFlagBlockLabel = 0; |
449 | mMainView->dateNavigator()->selectWorkWeek(); | 451 | mMainView->dateNavigator()->selectWorkWeek(); |
450 | mCurrentAgendaView = 5 ; | 452 | mCurrentAgendaView = 5 ; |
451 | 453 | ||
452 | } | 454 | } |
453 | 455 | ||
454 | void KOViewManager::showWeekView() | 456 | void KOViewManager::showWeekView() |
455 | { | 457 | { |
456 | /* | 458 | /* |
457 | globalFlagBlockAgenda = 2; | 459 | globalFlagBlockAgenda = 2; |
458 | qDebug("4globalFlagBlockAgenda = 2; "); | 460 | qDebug("4globalFlagBlockAgenda = 2; "); |
459 | //globalFlagBlockPainting = true; | 461 | //globalFlagBlockPainting = true; |
460 | mMainView->dateNavigator()->selectWeek(); | 462 | mMainView->dateNavigator()->selectWeek(); |
461 | showAgendaView(); | 463 | showAgendaView(); |
462 | */ | 464 | */ |
463 | 465 | ||
464 | 466 | ||
467 | mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count(); | ||
465 | mFlagShowNextxDays = false; | 468 | mFlagShowNextxDays = false; |
466 | globalFlagBlockAgenda = 1; | 469 | globalFlagBlockAgenda = 1; |
467 | globalFlagBlockLabel = 1; | 470 | globalFlagBlockLabel = 1; |
468 | if ( mCurrentAgendaView != 7 ) | 471 | if ( mCurrentAgendaView != 7 ) |
469 | mCurrentAgendaView = -1; | 472 | mCurrentAgendaView = -1; |
470 | showAgendaView(); | 473 | showAgendaView(); |
471 | qApp->processEvents(); | 474 | qApp->processEvents(); |
472 | globalFlagBlockAgenda = 2; | 475 | globalFlagBlockAgenda = 2; |
473 | globalFlagBlockLabel = 0; | 476 | globalFlagBlockLabel = 0; |
474 | mMainView->dateNavigator()->selectWeek(); | 477 | mMainView->dateNavigator()->selectWeek(); |
475 | mCurrentAgendaView = 7 ; | 478 | mCurrentAgendaView = 7 ; |
476 | } | 479 | } |
477 | 480 | ||
478 | void KOViewManager::showNextXView() | 481 | void KOViewManager::showNextXView() |
479 | { | 482 | { |
480 | 483 | ||
481 | globalFlagBlockAgenda = 1; | 484 | globalFlagBlockAgenda = 1; |
482 | if ( mCurrentAgendaView != 3 ) | 485 | if ( mCurrentAgendaView != 3 ) |
483 | mCurrentAgendaView = -1; | 486 | mCurrentAgendaView = -1; |
484 | showAgendaView(KOPrefs::instance()->mFullViewMonth); | 487 | showAgendaView(KOPrefs::instance()->mFullViewMonth); |
485 | globalFlagBlockAgenda = 2; | 488 | globalFlagBlockAgenda = 2; |
486 | mMainView->dateNavigator()->selectDates( QDate::currentDate(), | 489 | mMainView->dateNavigator()->selectDates( QDate::currentDate(), |
487 | KOPrefs::instance()->mNextXDays ); | 490 | KOPrefs::instance()->mNextXDays ); |
488 | mFlagShowNextxDays = true; | 491 | mFlagShowNextxDays = true; |
489 | mCurrentAgendaView = 3 ; | 492 | mCurrentAgendaView = 3 ; |
490 | } | 493 | } |
491 | bool KOViewManager::showsNextDays() | 494 | bool KOViewManager::showsNextDays() |
492 | { | 495 | { |
493 | return mFlagShowNextxDays; | 496 | return mFlagShowNextxDays; |
494 | } | 497 | } |
495 | void KOViewManager::createMonthView() | 498 | void KOViewManager::createMonthView() |
496 | { | 499 | { |
497 | if (!mMonthView) { | 500 | if (!mMonthView) { |
498 | mMonthView = new KOMonthView(mMainView->calendar(), mMainView->viewStack(), "KOViewManager::MonthView"); | 501 | mMonthView = new KOMonthView(mMainView->calendar(), mMainView->viewStack(), "KOViewManager::MonthView"); |
499 | 502 | ||
500 | addView(mMonthView); | 503 | addView(mMonthView); |
501 | // mMonthView->show(); | 504 | // mMonthView->show(); |
502 | // SIGNALS/SLOTS FOR MONTH VIEW | 505 | // SIGNALS/SLOTS FOR MONTH VIEW |
503 | connect(mMonthView, SIGNAL(newEventSignal(QDateTime)), | 506 | connect(mMonthView, SIGNAL(newEventSignal(QDateTime)), |
504 | mMainView, SLOT(newEvent(QDateTime))); | 507 | mMainView, SLOT(newEvent(QDateTime))); |
505 | 508 | ||
506 | connect(mMonthView, SIGNAL(showIncidenceSignal(Incidence *)), | 509 | connect(mMonthView, SIGNAL(showIncidenceSignal(Incidence *)), |
507 | mMainView, SLOT(showIncidence(Incidence *))); | 510 | mMainView, SLOT(showIncidence(Incidence *))); |
508 | connect(mMonthView, SIGNAL(editIncidenceSignal(Incidence *)), | 511 | connect(mMonthView, SIGNAL(editIncidenceSignal(Incidence *)), |
509 | mMainView, SLOT(editIncidence(Incidence *))); | 512 | mMainView, SLOT(editIncidence(Incidence *))); |
510 | connect(mMonthView, SIGNAL(deleteIncidenceSignal(Incidence *)), | 513 | connect(mMonthView, SIGNAL(deleteIncidenceSignal(Incidence *)), |
511 | mMainView, SLOT(deleteIncidence(Incidence *))); | 514 | mMainView, SLOT(deleteIncidence(Incidence *))); |
512 | 515 | ||