summaryrefslogtreecommitdiffabout
path: root/korganizer/koviewmanager.cpp
Unidiff
Diffstat (limited to 'korganizer/koviewmanager.cpp') (more/less context) (show whitespace changes)
-rw-r--r--korganizer/koviewmanager.cpp3
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
@@ -412,40 +412,42 @@ void KOViewManager::showAgendaView( bool fullScreen )
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
422void KOViewManager::showDayView() 422void 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
438void KOViewManager::showWorkWeekView() 439void 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
@@ -453,24 +455,25 @@ void KOViewManager::showWorkWeekView()
453 455
454void KOViewManager::showWeekView() 456void 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}