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