summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-08-04 04:08:59 (UTC)
committer zautrix <zautrix>2005-08-04 04:08:59 (UTC)
commit7c639808d3d78e323857e0a110237e6d77bf04c8 (patch) (unidiff)
tree793083edac43e84821257aed8782c29dfb88632f
parentbfa3d79c4172c4a8efebb1f2801e152a3a706dca (diff)
downloadkdepimpi-7c639808d3d78e323857e0a110237e6d77bf04c8.zip
kdepimpi-7c639808d3d78e323857e0a110237e6d77bf04c8.tar.gz
kdepimpi-7c639808d3d78e323857e0a110237e6d77bf04c8.tar.bz2
fixxx
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/calendarview.cpp36
1 files changed, 25 insertions, 11 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 7566b22..d51187a 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -527,916 +527,930 @@ void CalendarView::init()
527 connect( mDateNavigator, SIGNAL( weekClicked( const QDate & ) ), 527 connect( mDateNavigator, SIGNAL( weekClicked( const QDate & ) ),
528 mNavigator, SLOT( selectWeek( const QDate & ) ) ); 528 mNavigator, SLOT( selectWeek( const QDate & ) ) );
529 529
530 connect( mDateNavigator, SIGNAL( goPrevYear() ), 530 connect( mDateNavigator, SIGNAL( goPrevYear() ),
531 mNavigator, SLOT( selectPreviousYear() ) ); 531 mNavigator, SLOT( selectPreviousYear() ) );
532 connect( mDateNavigator, SIGNAL( goNextYear() ), 532 connect( mDateNavigator, SIGNAL( goNextYear() ),
533 mNavigator, SLOT( selectNextYear() ) ); 533 mNavigator, SLOT( selectNextYear() ) );
534 connect( mDateNavigator, SIGNAL( goPrevMonth() ), 534 connect( mDateNavigator, SIGNAL( goPrevMonth() ),
535 mNavigator, SLOT( selectPreviousMonth() ) ); 535 mNavigator, SLOT( selectPreviousMonth() ) );
536 connect( mDateNavigator, SIGNAL( goNextMonth() ), 536 connect( mDateNavigator, SIGNAL( goNextMonth() ),
537 mNavigator, SLOT( selectNextMonth() ) ); 537 mNavigator, SLOT( selectNextMonth() ) );
538 538
539 connect( mDateNavigator, SIGNAL( goPrevious() ), 539 connect( mDateNavigator, SIGNAL( goPrevious() ),
540 mNavigator, SLOT( selectPrevious() ) ); 540 mNavigator, SLOT( selectPrevious() ) );
541 connect( mDateNavigator, SIGNAL( goNext() ), 541 connect( mDateNavigator, SIGNAL( goNext() ),
542 mNavigator, SLOT( selectNext() ) ); 542 mNavigator, SLOT( selectNext() ) );
543 connect( mDateNavigator, SIGNAL( monthSelected ( int ) ), 543 connect( mDateNavigator, SIGNAL( monthSelected ( int ) ),
544 mNavigator, SLOT( slotMonthSelect( int ) ) ); 544 mNavigator, SLOT( slotMonthSelect( int ) ) );
545 545
546 connect( mDateNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ), 546 connect( mDateNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ),
547 mNavigator, SLOT( selectDates( const KCal::DateList & ) ) ); 547 mNavigator, SLOT( selectDates( const KCal::DateList & ) ) );
548#if 0 548#if 0
549 connect( mDateNavigator, SIGNAL( incidenceDropped( Incidence * ) ), 549 connect( mDateNavigator, SIGNAL( incidenceDropped( Incidence * ) ),
550 SLOT( incidenceAdded( Incidence *) ) ); 550 SLOT( incidenceAdded( Incidence *) ) );
551#endif 551#endif
552 // connect(mDateNavigator,SIGNAL(dayPassed(QDate)),SLOT(updateView())); 552 // connect(mDateNavigator,SIGNAL(dayPassed(QDate)),SLOT(updateView()));
553 553
554 connect( this, SIGNAL( configChanged() ), 554 connect( this, SIGNAL( configChanged() ),
555 mDateNavigator, SLOT( updateConfig() ) ); 555 mDateNavigator, SLOT( updateConfig() ) );
556 556
557 connect( mTodoList, SIGNAL( newTodoSignal() ), 557 connect( mTodoList, SIGNAL( newTodoSignal() ),
558 SLOT( newTodo() ) ); 558 SLOT( newTodo() ) );
559 connect( mTodoList, SIGNAL( newSubTodoSignal( Todo *) ), 559 connect( mTodoList, SIGNAL( newSubTodoSignal( Todo *) ),
560 SLOT( newSubTodo( Todo * ) ) ); 560 SLOT( newSubTodo( Todo * ) ) );
561 connect( mTodoList, SIGNAL( editTodoSignal( Todo * ) ), 561 connect( mTodoList, SIGNAL( editTodoSignal( Todo * ) ),
562 SLOT( editTodo( Todo * ) ) ); 562 SLOT( editTodo( Todo * ) ) );
563 connect( mTodoList, SIGNAL( showTodoSignal( Todo * ) ), 563 connect( mTodoList, SIGNAL( showTodoSignal( Todo * ) ),
564 SLOT( showTodo( Todo *) ) ); 564 SLOT( showTodo( Todo *) ) );
565 connect( mTodoList, SIGNAL( deleteTodoSignal( Todo *) ), 565 connect( mTodoList, SIGNAL( deleteTodoSignal( Todo *) ),
566 SLOT( deleteTodo( Todo *) ) ); 566 SLOT( deleteTodo( Todo *) ) );
567 connect( this, SIGNAL( configChanged()), mTodoList, SLOT( updateConfig() ) ); 567 connect( this, SIGNAL( configChanged()), mTodoList, SLOT( updateConfig() ) );
568 connect( mTodoList, SIGNAL( purgeCompletedSignal() ), 568 connect( mTodoList, SIGNAL( purgeCompletedSignal() ),
569 SLOT( purgeCompleted() ) ); 569 SLOT( purgeCompleted() ) );
570 connect( mTodoList, SIGNAL( todoModifiedSignal( Todo *, int ) ), 570 connect( mTodoList, SIGNAL( todoModifiedSignal( Todo *, int ) ),
571 SIGNAL( todoModified( Todo *, int ) ) ); 571 SIGNAL( todoModified( Todo *, int ) ) );
572 572
573 connect( mTodoList, SIGNAL( cloneTodoSignal( Incidence * ) ), 573 connect( mTodoList, SIGNAL( cloneTodoSignal( Incidence * ) ),
574 this, SLOT ( cloneIncidence( Incidence * ) ) ); 574 this, SLOT ( cloneIncidence( Incidence * ) ) );
575 connect( mTodoList, SIGNAL( cancelTodoSignal( Incidence * ) ), 575 connect( mTodoList, SIGNAL( cancelTodoSignal( Incidence * ) ),
576 this, SLOT (cancelIncidence( Incidence * ) ) ); 576 this, SLOT (cancelIncidence( Incidence * ) ) );
577 577
578 connect( mTodoList, SIGNAL( moveTodoSignal( Incidence * ) ), 578 connect( mTodoList, SIGNAL( moveTodoSignal( Incidence * ) ),
579 this, SLOT ( moveIncidence( Incidence * ) ) ); 579 this, SLOT ( moveIncidence( Incidence * ) ) );
580 connect( mTodoList, SIGNAL( beamTodoSignal( Incidence * ) ), 580 connect( mTodoList, SIGNAL( beamTodoSignal( Incidence * ) ),
581 this, SLOT ( beamIncidence( Incidence * ) ) ); 581 this, SLOT ( beamIncidence( Incidence * ) ) );
582 582
583 connect( mTodoList, SIGNAL( unparentTodoSignal( Todo * ) ), 583 connect( mTodoList, SIGNAL( unparentTodoSignal( Todo * ) ),
584 this, SLOT ( todo_unsub( Todo * ) ) ); 584 this, SLOT ( todo_unsub( Todo * ) ) );
585 585
586 connect( mTodoList, SIGNAL( reparentTodoSignal( Todo *,Todo * ) ), 586 connect( mTodoList, SIGNAL( reparentTodoSignal( Todo *,Todo * ) ),
587 this, SLOT ( todo_resub( Todo *,Todo * ) ) ); 587 this, SLOT ( todo_resub( Todo *,Todo * ) ) );
588 connect( this, SIGNAL( todoModified( Todo *, int )), mTodoList, 588 connect( this, SIGNAL( todoModified( Todo *, int )), mTodoList,
589 SLOT( updateTodo( Todo *, int ) ) ); 589 SLOT( updateTodo( Todo *, int ) ) );
590 connect( this, SIGNAL( todoModified( Todo *, int )), this, 590 connect( this, SIGNAL( todoModified( Todo *, int )), this,
591 SLOT( changeTodoDisplay( Todo *, int ) ) ); 591 SLOT( changeTodoDisplay( Todo *, int ) ) );
592 592
593 593
594 connect( mFilterView, SIGNAL( filterChanged() ), SLOT( updateFilter() ) ); 594 connect( mFilterView, SIGNAL( filterChanged() ), SLOT( updateFilter() ) );
595 connect( mFilterView, SIGNAL( editFilters() ), SLOT( editFilters() ) ); 595 connect( mFilterView, SIGNAL( editFilters() ), SLOT( editFilters() ) );
596 connect( mCalendar, SIGNAL( addAlarm(const QDateTime &, const QString & ) ), SLOT( addAlarm(const QDateTime &, const QString & ) ) ); 596 connect( mCalendar, SIGNAL( addAlarm(const QDateTime &, const QString & ) ), SLOT( addAlarm(const QDateTime &, const QString & ) ) );
597 connect( mCalendar, SIGNAL( removeAlarm(const QDateTime &, const QString & ) ), SLOT( removeAlarm(const QDateTime &, const QString & ) ) ); 597 connect( mCalendar, SIGNAL( removeAlarm(const QDateTime &, const QString & ) ), SLOT( removeAlarm(const QDateTime &, const QString & ) ) );
598 598
599 599
600 600
601 601
602 602
603 connect(QApplication::clipboard(),SIGNAL(dataChanged()), 603 connect(QApplication::clipboard(),SIGNAL(dataChanged()),
604 SLOT(checkClipboard())); 604 SLOT(checkClipboard()));
605 connect( mTodoList,SIGNAL( incidenceSelected( Incidence * ) ), 605 connect( mTodoList,SIGNAL( incidenceSelected( Incidence * ) ),
606 SLOT( processTodoListSelection( Incidence * ) ) ); 606 SLOT( processTodoListSelection( Incidence * ) ) );
607 connect(mTodoList,SIGNAL(isModified(bool)),SLOT(setModified(bool))); 607 connect(mTodoList,SIGNAL(isModified(bool)),SLOT(setModified(bool)));
608 608
609 // kdDebug() << "CalendarView::CalendarView() done" << endl; 609 // kdDebug() << "CalendarView::CalendarView() done" << endl;
610 610
611 mDateFrame = new QVBox(0,0,WType_Popup); 611 mDateFrame = new QVBox(0,0,WType_Popup);
612 //mDateFrame->setFrameStyle(QFrame::PopupPanel | QFrame::Raised); 612 //mDateFrame->setFrameStyle(QFrame::PopupPanel | QFrame::Raised);
613 mDateFrame->setFrameStyle( QFrame::WinPanel |QFrame::Raised ); 613 mDateFrame->setFrameStyle( QFrame::WinPanel |QFrame::Raised );
614 mDateFrame->setLineWidth(3); 614 mDateFrame->setLineWidth(3);
615 mDateFrame->hide(); 615 mDateFrame->hide();
616 mDateFrame->setCaption( i18n( "Pick a date to display")); 616 mDateFrame->setCaption( i18n( "Pick a date to display"));
617 mDatePicker = new KDatePicker ( mDateFrame , QDate::currentDate() ); 617 mDatePicker = new KDatePicker ( mDateFrame , QDate::currentDate() );
618 618
619 connect(mDatePicker,SIGNAL(dateSelected(QDate)),SLOT(slotSelectPickerDate(QDate))); 619 connect(mDatePicker,SIGNAL(dateSelected(QDate)),SLOT(slotSelectPickerDate(QDate)));
620 620
621 mEventEditor = mDialogManager->getEventEditor(); 621 mEventEditor = mDialogManager->getEventEditor();
622 mTodoEditor = mDialogManager->getTodoEditor(); 622 mTodoEditor = mDialogManager->getTodoEditor();
623 623
624 mFlagEditDescription = false; 624 mFlagEditDescription = false;
625 625
626 mSuspendTimer = new QTimer( this ); 626 mSuspendTimer = new QTimer( this );
627 mAlarmTimer = new QTimer( this ); 627 mAlarmTimer = new QTimer( this );
628 mRecheckAlarmTimer = new QTimer( this ); 628 mRecheckAlarmTimer = new QTimer( this );
629 connect( mRecheckAlarmTimer, SIGNAL( timeout () ), SLOT( recheckTimerAlarm() ) ); 629 connect( mRecheckAlarmTimer, SIGNAL( timeout () ), SLOT( recheckTimerAlarm() ) );
630 connect( mSuspendTimer, SIGNAL( timeout () ), SLOT( suspendAlarm() ) ); 630 connect( mSuspendTimer, SIGNAL( timeout () ), SLOT( suspendAlarm() ) );
631 connect( mAlarmTimer, SIGNAL( timeout () ), SLOT( timerAlarm() ) ); 631 connect( mAlarmTimer, SIGNAL( timeout () ), SLOT( timerAlarm() ) );
632 mAlarmDialog = new AlarmDialog( this ); 632 mAlarmDialog = new AlarmDialog( this );
633 connect( mAlarmDialog, SIGNAL( addAlarm(const QDateTime &, const QString & ) ), SLOT( addSuspendAlarm(const QDateTime &, const QString & ) ) ); 633 connect( mAlarmDialog, SIGNAL( addAlarm(const QDateTime &, const QString & ) ), SLOT( addSuspendAlarm(const QDateTime &, const QString & ) ) );
634 mAlarmDialog->setServerNotification( false ); 634 mAlarmDialog->setServerNotification( false );
635 mAlarmDialog->setSuspendTime( KOPrefs::instance()->mAlarmSuspendTime ); 635 mAlarmDialog->setSuspendTime( KOPrefs::instance()->mAlarmSuspendTime );
636 636
637 637
638#ifndef DESKTOP_VERSION 638#ifndef DESKTOP_VERSION
639//US listen for arriving address resultsets 639//US listen for arriving address resultsets
640 connect(ExternalAppHandler::instance(), SIGNAL(receivedBirthdayListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&)), 640 connect(ExternalAppHandler::instance(), SIGNAL(receivedBirthdayListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&)),
641 this, SLOT(insertBirthdays(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&))); 641 this, SLOT(insertBirthdays(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&)));
642#endif 642#endif
643 mDateNavigator->setCalendar( mCalendar ); 643 mDateNavigator->setCalendar( mCalendar );
644} 644}
645 645
646 646
647CalendarView::~CalendarView() 647CalendarView::~CalendarView()
648{ 648{
649 // kdDebug() << "~CalendarView()" << endl; 649 // kdDebug() << "~CalendarView()" << endl;
650 //qDebug("CalendarView::~CalendarView() "); 650 //qDebug("CalendarView::~CalendarView() ");
651 delete mDialogManager; 651 delete mDialogManager;
652 delete mViewManager; 652 delete mViewManager;
653 delete mStorage; 653 delete mStorage;
654 delete mDateFrame ; 654 delete mDateFrame ;
655 delete mEventViewerDialog; 655 delete mEventViewerDialog;
656 //kdDebug() << "~CalendarView() done" << endl; 656 //kdDebug() << "~CalendarView() done" << endl;
657} 657}
658 658
659 659
660void CalendarView::nextConflict( bool all, bool allday ) 660void CalendarView::nextConflict( bool all, bool allday )
661{ 661{
662 static bool block = false; 662 static bool block = false;
663 if ( block ) return; 663 if ( block ) return;
664 block = true; 664 block = true;
665 QPtrList<Event> testlist = mCalendar->events(); 665 QPtrList<Event> testlist = mCalendar->events();
666 Event * test = testlist.first(); 666 Event * test = testlist.first();
667 while ( test ) { 667 while ( test ) {
668 test->setTagged( false ); 668 test->setTagged( false );
669 test = testlist.next(); 669 test = testlist.next();
670 } 670 }
671 QTime st ( 0,0,0); 671 QTime st ( 0,0,0);
672 if ( mViewManager->currentView() == mViewManager->agendaView() ) 672 if ( mViewManager->currentView() == mViewManager->agendaView() )
673 st = mViewManager->agendaView()->agenda()->getEndTime(); 673 st = mViewManager->agendaView()->agenda()->getEndTime();
674 //qDebug("time %s ", st.toString().latin1()); 674 //qDebug("time %s ", st.toString().latin1());
675 QDateTime startDT = QDateTime (mNavigator->selectedDates().first(),st); 675 QDateTime startDT = QDateTime (mNavigator->selectedDates().first(),st);
676 QDateTime conflict; 676 QDateTime conflict;
677 QDateTime retVal; 677 QDateTime retVal;
678 bool found = false; 678 bool found = false;
679 Event * cE = 0; 679 Event * cE = 0;
680 Event * cE2 = 0; 680 Event * cE2 = 0;
681 QPtrList<Event> testlist2 = testlist; 681 QPtrList<Event> testlist2 = testlist;
682 test = testlist.first(); 682 test = testlist.first();
683 bool skip = false; 683 bool skip = false;
684 topLevelWidget()->setCaption( i18n("Checking conflicts ... please wait") ); 684 topLevelWidget()->setCaption( i18n("Checking conflicts ... please wait") );
685 //QTime tm; 685 //QTime tm;
686 //tm.start(); 686 //tm.start();
687 while ( test ) { 687 while ( test ) {
688 qApp->processEvents(); 688 qApp->processEvents();
689 skip = false; 689 skip = false;
690 if ( !all ) skip = ( allday != test->doesFloat() ); 690 if ( !all ) skip = ( allday != test->doesFloat() );
691 if ( !skip ) { 691 if ( !skip ) {
692 if ( found ) 692 if ( found )
693 skip = !test->matchTime( &startDT, &conflict ); 693 skip = !test->matchTime( &startDT, &conflict );
694 else 694 else
695 skip = !test->matchTime( &startDT, 0 ); 695 skip = !test->matchTime( &startDT, 0 );
696 } 696 }
697 if ( !skip ) { 697 if ( !skip ) {
698 Event * test2 = testlist2.first(); 698 Event * test2 = testlist2.first();
699 while ( test2 ) { 699 while ( test2 ) {
700 skip = test2->isTagged(); 700 skip = test2->isTagged();
701 if ( !skip && !all ) skip = ( allday != test2->doesFloat() ); 701 if ( !skip && !all ) skip = ( allday != test2->doesFloat() );
702 if ( !skip ) { 702 if ( !skip ) {
703 if ( found ) 703 if ( found )
704 skip = !test2->matchTime( &startDT, &conflict ); 704 skip = !test2->matchTime( &startDT, &conflict );
705 else 705 else
706 skip = !test2->matchTime( &startDT, 0 ); 706 skip = !test2->matchTime( &startDT, 0 );
707 } 707 }
708 if ( !skip ) { 708 if ( !skip ) {
709 if ( test->isOverlapping ( test2, &retVal, &startDT ) ) { 709 if ( test->isOverlapping ( test2, &retVal, &startDT ) ) {
710 //qDebug("overlap "); 710 //qDebug("overlap ");
711 if ( ! found ) { 711 if ( ! found ) {
712 if ( retVal >= startDT ) { 712 if ( retVal >= startDT ) {
713 conflict = retVal; 713 conflict = retVal;
714 cE = test; 714 cE = test;
715 cE2 = test2; 715 cE2 = test2;
716 found = true; 716 found = true;
717 } 717 }
718 } else { 718 } else {
719 if ( retVal >= startDT && retVal < conflict ) { 719 if ( retVal >= startDT && retVal < conflict ) {
720 conflict = retVal; 720 conflict = retVal;
721 cE = test; 721 cE = test;
722 cE2 = test2; 722 cE2 = test2;
723 } 723 }
724 } 724 }
725 } 725 }
726 } 726 }
727 test2 = testlist2.next(); 727 test2 = testlist2.next();
728 } 728 }
729 } 729 }
730 test->setTagged( true ); 730 test->setTagged( true );
731 test = testlist.next(); 731 test = testlist.next();
732 } 732 }
733 //qDebug("Search time : %d", tm.elapsed()); 733 //qDebug("Search time : %d", tm.elapsed());
734 if ( found ) { 734 if ( found ) {
735 if ( mViewManager->currentView() != mViewManager->agendaView() || mNavigator->selectedDates().count() > 1 ) 735 if ( mViewManager->currentView() != mViewManager->agendaView() || mNavigator->selectedDates().count() > 1 )
736 mViewManager->showDayView(); 736 mViewManager->showDayView();
737 mNavigator->slotDaySelect( conflict.date() ); 737 mNavigator->slotDaySelect( conflict.date() );
738 int hour = conflict.time().hour(); 738 int hour = conflict.time().hour();
739 mViewManager->agendaView()->setStartHour( hour ); 739 mViewManager->agendaView()->setStartHour( hour );
740 topLevelWidget()->setCaption( i18n("Conflict %1 <-> %2"). arg( cE->summary().left( 20 ) ).arg( cE2->summary().left( 20 ) ) ); 740 topLevelWidget()->setCaption( i18n("Conflict %1 <-> %2"). arg( cE->summary().left( 20 ) ).arg( cE2->summary().left( 20 ) ) );
741 block = false; 741 block = false;
742 return; 742 return;
743 } 743 }
744 744
745 topLevelWidget()->setCaption( i18n("No conflict found") ); 745 topLevelWidget()->setCaption( i18n("No conflict found") );
746 //qDebug("No conflict found "); 746 //qDebug("No conflict found ");
747 block = false; 747 block = false;
748 return; 748 return;
749} 749}
750 750
751void CalendarView::conflictAll() 751void CalendarView::conflictAll()
752{ 752{
753 nextConflict ( true, true ); 753 nextConflict ( true, true );
754} 754}
755void CalendarView::conflictAllday() 755void CalendarView::conflictAllday()
756{ 756{
757 nextConflict ( false, true ); 757 nextConflict ( false, true );
758} 758}
759void CalendarView::conflictNotAll() 759void CalendarView::conflictNotAll()
760{ 760{
761 nextConflict ( false, false ); 761 nextConflict ( false, false );
762} 762}
763 763
764void CalendarView::setCalReadOnly( int id, bool readO ) 764void CalendarView::setCalReadOnly( int id, bool readO )
765{ 765{
766 if ( readO ) { 766 if ( readO ) {
767 emit save(); 767 emit save();
768 } 768 }
769 mCalendar->setReadOnly( id, readO ); 769 mCalendar->setReadOnly( id, readO );
770} 770}
771void CalendarView::setScrollBarStep(int val ) 771void CalendarView::setScrollBarStep(int val )
772{ 772{
773#ifdef DESKTOP_VERSION 773#ifdef DESKTOP_VERSION
774 mDateScrollBar->setLineStep ( val ); 774 mDateScrollBar->setLineStep ( val );
775#endif 775#endif
776} 776}
777void CalendarView::scrollBarValue(int val ) 777void CalendarView::scrollBarValue(int val )
778{ 778{
779#ifdef DESKTOP_VERSION 779#ifdef DESKTOP_VERSION
780 if ( QApplication::desktop()->width() < 800 ) return; 780 if ( QApplication::desktop()->width() < 800 ) return;
781 static bool block = false; 781 static bool block = false;
782 if ( block ) return; 782 if ( block ) return;
783 block = true; 783 block = true;
784 int count = mNavigator->selectedDates().count(); 784 int count = mNavigator->selectedDates().count();
785 int day = mNavigator->selectedDates().first().dayOfYear(); 785 int day = mNavigator->selectedDates().first().dayOfYear();
786 int stepdays = val; 786 int stepdays = val;
787 if ( mDateScrollBar->lineStep () <= count ) { 787 if ( mDateScrollBar->lineStep () <= count ) {
788 //val = val/mDateScrollBar->lineStep ()*mDateScrollBar->lineStep(); 788 //val = val/mDateScrollBar->lineStep ()*mDateScrollBar->lineStep();
789 //qDebug("VAL %d ",val ); 789 //qDebug("VAL %d ",val );
790 stepdays = (val-day)/mDateScrollBar->lineStep ()*mDateScrollBar->lineStep(); 790 stepdays = (val-day)/mDateScrollBar->lineStep ()*mDateScrollBar->lineStep();
791 stepdays = day+stepdays; 791 stepdays = day+stepdays;
792 if ( stepdays < 0 ) stepdays = 0; 792 if ( stepdays < 0 ) stepdays = 0;
793 } 793 }
794 if ( stepdays == day ) { 794 if ( stepdays == day ) {
795 block = false; 795 block = false;
796 return; 796 return;
797 } 797 }
798 int year = mNavigator->selectedDates().first().year(); 798 int year = mNavigator->selectedDates().first().year();
799 QDate d ( year,1,1 ); 799 QDate d ( year,1,1 );
800 mNavigator->selectDates( d.addDays( stepdays-1) , count ); 800 mNavigator->selectDates( d.addDays( stepdays-1) , count );
801 block = false; 801 block = false;
802#endif 802#endif
803 803
804} 804}
805void CalendarView::updateView(const QDate &start, const QDate &end) 805void CalendarView::updateView(const QDate &start, const QDate &end)
806{ 806{
807#ifdef DESKTOP_VERSION 807#ifdef DESKTOP_VERSION
808 if ( ! mDateScrollBar->draggingSlider () ) { 808 if ( ! mDateScrollBar->draggingSlider () ) {
809 int dof = start.dayOfYear(); 809 int dof = start.dayOfYear();
810 //qDebug("dof %d day %d val %d ", dof, start.dayOfYear(),mDateScrollBar->value() ); 810 //qDebug("dof %d day %d val %d ", dof, start.dayOfYear(),mDateScrollBar->value() );
811 if ( dof != mDateScrollBar->value() ) { 811 if ( dof != mDateScrollBar->value() ) {
812 mDateScrollBar->blockSignals( true ); 812 mDateScrollBar->blockSignals( true );
813 mDateScrollBar->setValue( start.dayOfYear()); 813 mDateScrollBar->setValue( start.dayOfYear());
814 mDateScrollBar->blockSignals( false ); 814 mDateScrollBar->blockSignals( false );
815 } 815 }
816 } 816 }
817#endif 817#endif
818 mTodoList->updateView(); 818 mTodoList->updateView();
819 mViewManager->updateView(start, end); 819 mViewManager->updateView(start, end);
820 //mDateNavigator->updateView(); 820 //mDateNavigator->updateView();
821} 821}
822 822
823 823
824 824
825void CalendarView::checkFiles() 825void CalendarView::checkFiles()
826{ 826{
827 QString message; 827 QString message;
828 QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; 828 QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
829 KopiCalendarFile * cal = calendars.first(); 829 KopiCalendarFile * cal = calendars.first();
830 while ( cal ) { 830 while ( cal ) {
831 if ( cal->mErrorOnLoad ) { 831 if ( cal->mErrorOnLoad ) {
832 message += cal->mName +"\n"+KGlobal::formatMessage ( "(" +i18n( "Filepath: ")+ cal->mFileName+")" ,0 )+"\n"; 832 message += cal->mName +"\n"+KGlobal::formatMessage ( "(" +i18n( "Filepath: ")+ cal->mFileName+")" ,0 )+"\n";
833 } 833 }
834 cal = calendars.next(); 834 cal = calendars.next();
835 } 835 }
836 if ( !message.isEmpty() ) { 836 if ( !message.isEmpty() ) {
837 message = KGlobal::formatMessage( i18n("Calendar(s) not loaded:"),0 )+"\n" + message +KGlobal::formatMessage(i18n("You can try to reload the calendar in the Resource View!"),0); 837 message = KGlobal::formatMessage( i18n("Calendar(s) not loaded:"),0 )+"\n" + message +KGlobal::formatMessage(i18n("You can try to reload the calendar in the Resource View!"),0);
838 KMessageBox::error(this,message, i18n("Loding of calendar(s) failed")); 838 KMessageBox::error(this,message, i18n("Loding of calendar(s) failed"));
839 } 839 }
840 static bool firstTime = true; 840 static bool firstTime = true;
841 if ( firstTime ) { 841 if ( firstTime ) {
842 firstTime = false; 842 firstTime = false;
843 QTimer::singleShot( 2000, this, SLOT ( checkAlarms() )); 843 QTimer::singleShot( 2000, this, SLOT ( checkAlarms() ));
844 } 844 }
845} 845}
846void CalendarView::checkAlarms() 846void CalendarView::checkAlarms()
847{ 847{
848 KConfig *config = KOGlobals::config(); 848 KConfig *config = KOGlobals::config();
849 config->setGroup( "AppRun" ); 849 config->setGroup( "AppRun" );
850 QDateTime dt ( QDate (2005,1,1), QTime( 0,0,0 ) ); 850 QDateTime dt ( QDate (2005,1,1), QTime( 0,0,0 ) );
851 int daysto = dt.daysTo( QDate::currentDate() ); 851 int daysto = dt.daysTo( QDate::currentDate() );
852 int days = config->readNumEntry( "LatestProgramStopDays" , daysto); 852 int days = config->readNumEntry( "LatestProgramStopDays" , daysto);
853 dt = dt.addDays( days ); 853 dt = dt.addDays( days );
854 int secto = dt.secsTo( QDateTime::currentDateTime() ); 854 int secto = dt.secsTo( QDateTime::currentDateTime() );
855 int secs = config->readNumEntry( "LatestProgramStopSecs" , secto) - 30; 855 int secs = config->readNumEntry( "LatestProgramStopSecs" , secto) - 30;
856 //qDebug("KO: Reading program stop %d ", secs); 856 //qDebug("KO: Reading program stop %d ", secs);
857 //secs -= ( 3600 * 24*3 ); // debug only 857 //secs -= ( 3600 * 24*3 ); // debug only
858 QDateTime latest = dt.addSecs ( secs ); 858 QDateTime latest = dt.addSecs ( secs );
859 qDebug("KO: Last termination on %s ", latest.toString().latin1()); 859 qDebug("KO: Last termination on %s ", latest.toString().latin1());
860 //qDebug("KO: Current Time %s ",QDateTime::currentDateTime().toString().latin1() ); 860 //qDebug("KO: Current Time %s ",QDateTime::currentDateTime().toString().latin1() );
861 QPtrList<Incidence> el = mCalendar->rawIncidences(); 861 QPtrList<Incidence> el = mCalendar->rawIncidences();
862 QPtrList<Incidence> al; 862 QPtrList<Incidence> al;
863 Incidence* inL = el.first(); 863 Incidence* inL = el.first();
864 QDateTime cur = QDateTime::currentDateTime().addSecs(-59); 864 QDateTime cur = QDateTime::currentDateTime().addSecs(-59);
865 qDebug("KO: Checking alarm until %s ", cur.toString().latin1()); 865 qDebug("KO: Checking alarm until %s ", cur.toString().latin1());
866 while ( inL ) { 866 while ( inL ) {
867 bool ok = false; 867 bool ok = false;
868 int offset = 0; 868 int offset = 0;
869 QDateTime next = inL->getNextAlarmDateTime(& ok, &offset, latest ) ; 869 QDateTime next = inL->getNextAlarmDateTime(& ok, &offset, latest ) ;
870 if ( ok ) { 870 if ( ok ) {
871 //qDebug("OK %s",next.toString().latin1()); 871 //qDebug("OK %s",next.toString().latin1());
872 if ( next < cur ) { 872 if ( next < cur ) {
873 al.append( inL ); 873 al.append( inL );
874 //qDebug("found missed alarm: %s ", inL->summary().latin1() ); 874 //qDebug("found missed alarm: %s ", inL->summary().latin1() );
875 } 875 }
876 } 876 }
877 inL = el.next(); 877 inL = el.next();
878 } 878 }
879 if ( al.count() ) { 879 if ( al.count() ) {
880 QDialog* dia = new QDialog( this, "huhu", false, WDestructiveClose | WStyle_StaysOnTop ); 880 QDialog* dia = new QDialog( this, "huhu", false, WDestructiveClose | WStyle_StaysOnTop );
881 dia->setCaption( i18n("KO/Pi: Missing alarms!") ); 881 dia->setCaption( i18n("KO/Pi: Missing alarms!") );
882 QVBoxLayout* lay = new QVBoxLayout( dia ); 882 QVBoxLayout* lay = new QVBoxLayout( dia );
883 lay->setSpacing( 0 ); 883 lay->setSpacing( 0 );
884 lay->setMargin( 0 ); 884 lay->setMargin( 0 );
885 MissedAlarmTextBrowser* matb = new MissedAlarmTextBrowser ( dia, al, latest ); 885 MissedAlarmTextBrowser* matb = new MissedAlarmTextBrowser ( dia, al, latest );
886 connect( matb, SIGNAL( showIncidence( QString ) ),SLOT( showIncidence( QString ) )); 886 connect( matb, SIGNAL( showIncidence( QString ) ),SLOT( showIncidence( QString ) ));
887 lay->addWidget( matb ); 887 lay->addWidget( matb );
888 if ( QApplication::desktop()->width() == 480 || QApplication::desktop()->width() == 640 ) { 888 if ( QApplication::desktop()->width() == 480 || QApplication::desktop()->width() == 640 ) {
889 int wid = 210; 889 int wid = 210;
890 int x = QApplication::desktop()->width() - wid - 7; 890 int x = QApplication::desktop()->width() - wid - 7;
891 int y = QApplication::desktop()->height() - wid - 70; 891 int y = QApplication::desktop()->height() - wid - 70;
892 dia->setGeometry ( x,y,wid,wid); 892 dia->setGeometry ( x,y,wid,wid);
893 } else { 893 } else {
894 int si = 220; 894 int si = 220;
895 if ( QApplication::desktop()->width() > 470 ) 895 if ( QApplication::desktop()->width() > 470 )
896 si = 400; 896 si = 400;
897 dia->resize(si,si/2); 897 dia->resize(si,si/2);
898 } 898 }
899 dia->setBackgroundColor( QColor( 255, 255, 255 ) ); 899 dia->setBackgroundColor( QColor( 255, 255, 255 ) );
900 dia->show(); 900 dia->show();
901 901
902 } 902 }
903#if 0 903#if 0
904 // for creating timetracker test data 904 // for creating timetracker test data
905 qDebug("CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCc "); 905 qDebug("CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCc ");
906 Todo * nt; 906 Todo * nt;
907 mCalendar->close(); 907 mCalendar->close();
908 { 908 {
909 Todo * root1 = new Todo; 909 Todo * root1 = new Todo;
910 mCalendar->addTodo( root1 ); 910 mCalendar->addTodo( root1 );
911 root1->setSummary( "Project_1"); 911 root1->setSummary( "Project1");
912 root1->setPriority( 1 ); 912 root1->setPriority( 1 );
913 root1->setCategories( QString( "Cat_Pro1") );
913 root1->setDescription( "This is a test description of a root Project" ); 914 root1->setDescription( "This is a test description of a root Project" );
914 root1->setPercentComplete( 20 ); 915 root1->setPercentComplete( 20 );
915 updateView(); 916 updateView();
916 QDateTime start = QDateTime ( QDate( 2004,11,1), QTime ( 7,30,0) ); 917 QDateTime start = QDateTime ( QDate( 2004,11,1), QTime ( 7,30,0) );
917 QDateTime end = QDateTime ( QDate( 2005,8,1), QTime ( 0,0,0) ); 918 QDateTime end = QDateTime ( QDate( 2005,8,5), QTime ( 0,0,0) );
918 919
919 nt = new Todo; 920 nt = new Todo;
920 mCalendar->addTodo( nt ); 921 mCalendar->addTodo( nt );
921 nt->setSummary( "Planning_Project_1"); 922 nt->setSummary( "Planning Project1");
922 nt->setPriority( 1 ); 923 nt->setPriority( 1 );
923 nt->setDescription( "This is a test description of Planning_Project_1" ); 924 nt->setDescription( "This is a test description of Planning Project1" );
924 nt->setPercentComplete( 20 ); 925 nt->setPercentComplete( 20 );
926 nt->setCategories( QString( "Cat_Pro1,Cat_Plan_Pro1") );
925 927
926 928
927 Todo * sub1 = nt; 929 Todo * sub1 = nt;
928 sub1->setRelatedTo( root1 ); 930 sub1->setRelatedTo( root1 );
929 931
930 nt = new Todo; 932 nt = new Todo;
931 mCalendar->addTodo( nt ); 933 mCalendar->addTodo( nt );
932 nt->setSummary( "Planning_Project_1: Lutz"); 934 nt->setSummary( "Planning Project1: Lutz");
933 nt->setPriority( 1 ); 935 nt->setPriority( 1 );
934 nt->setDescription( "This todo counts the actual work of a person on a project" ); 936 nt->setDescription( "This todo counts the actual work of a person on a project" );
935 nt->setPercentComplete( 20 ); 937 nt->setPercentComplete( 20 );
938 nt->setCategories( QString( "Cat_Pro1,Cat_Plan_Pro1,Cat_Work_Lutz") );
936 Todo * workLutz11 = nt; 939 Todo * workLutz11 = nt;
937 workLutz11->setRelatedTo( sub1 ); 940 workLutz11->setRelatedTo( sub1 );
938 941
939 nt = new Todo; 942 nt = new Todo;
940 mCalendar->addTodo( nt ); 943 mCalendar->addTodo( nt );
941 nt->setSummary( "Planning_Project_1: Norbert"); 944 nt->setSummary( "Planning Project1: Norbert");
942 nt->setPriority( 1 ); 945 nt->setPriority( 1 );
943 nt->setDescription( "This todo counts the actual work of a person on a project" ); 946 nt->setDescription( "This todo counts the actual work of a person on a project" );
944 nt->setPercentComplete( 20 ); 947 nt->setPercentComplete( 20 );
948 nt->setCategories( QString( "Cat_Pro1,Cat_Plan_Pro1,Cat_Work_Norbert") );
945 Todo * workNorbert11 = nt; 949 Todo * workNorbert11 = nt;
946 workNorbert11->setRelatedTo( sub1 ); 950 workNorbert11->setRelatedTo( sub1 );
947 951
948 nt = new Todo; 952 nt = new Todo;
949 mCalendar->addTodo( nt ); 953 mCalendar->addTodo( nt );
950 nt->setSummary( "Work on 1"); 954 nt->setSummary( "Work on 1");
951 nt->setPriority( 1 ); 955 nt->setPriority( 1 );
952 nt->setDescription( "This is a test description of Work Project_1" ); 956 nt->setDescription( "This is a test description of Work Project_1" );
957 nt->setCategories( QString( "Cat_Pro1,Cat_Work_Pro1") );
953 nt->setPercentComplete( 20 ); 958 nt->setPercentComplete( 20 );
954 959
955 Todo * sub2 = nt; 960 Todo * sub2 = nt;
956 sub2->setRelatedTo( root1 ); 961 sub2->setRelatedTo( root1 );
957 962
958 963
959 nt = new Todo; 964 nt = new Todo;
960 mCalendar->addTodo( nt ); 965 mCalendar->addTodo( nt );
961 nt->setSummary( "Work on 1: Lutz"); 966 nt->setSummary( "Work on 1: Lutz");
962 nt->setPriority( 1 ); 967 nt->setPriority( 1 );
963 nt->setDescription( "This todo counts the actual work of a person on a project" ); 968 nt->setDescription( "This todo counts the actual work of a person on a project" );
969 nt->setCategories( QString( "Cat_Pro1,Cat_Work_Pro1,Cat_Work_Lutz") );
964 nt->setPercentComplete( 20 ); 970 nt->setPercentComplete( 20 );
965 Todo * workLutz12 = nt; 971 Todo * workLutz12 = nt;
966 workLutz12->setRelatedTo( sub2 ); 972 workLutz12->setRelatedTo( sub2 );
967 973
968 nt = new Todo; 974 nt = new Todo;
969 mCalendar->addTodo( nt ); 975 mCalendar->addTodo( nt );
970 nt->setSummary( "Work on 1: Norbert"); 976 nt->setSummary( "Work on 1: Norbert");
971 nt->setPriority( 1 ); 977 nt->setPriority( 1 );
972 nt->setDescription( "This todo counts the actual work of a person on a project" ); 978 nt->setDescription( "This todo counts the actual work of a person on a project" );
979 nt->setCategories( QString( "Cat_Pro1,Cat_Work_Pro1,Cat_Work_Norbert") );
973 nt->setPercentComplete( 20 ); 980 nt->setPercentComplete( 20 );
974 Todo * workNorbert12 = nt; 981 Todo * workNorbert12 = nt;
975 workNorbert12->setRelatedTo( sub2 ); 982 workNorbert12->setRelatedTo( sub2 );
976 983
977 int secLenRunning = 7200; 984 int secLenRunning = 7200;
978 int secLenPausing = 3600 * 3; 985 int secLenPausing = 3600 * 3;
979 int dayInterval = 1; 986 int dayInterval = 1;
980 //createRunningDate4Todo( root1, start, end, secLenRunning, secLenPausing, dayInterval ); 987 //createRunningDate4Todo( root1, start, end, secLenRunning, secLenPausing, dayInterval );
981 createRunningDate4Todo( root1, start, end, secLenRunning*24, secLenPausing, 14 ); 988 createRunningDate4Todo( root1, start, end, secLenRunning*24, secLenPausing, 14 );
982 createRunningDate4Todo( sub1, start.addSecs( secLenRunning ), start.addDays( 10 ), secLenRunning*4, secLenPausing, 1); 989 createRunningDate4Todo( sub1, start.addSecs( secLenRunning ), start.addDays( 10 ), secLenRunning*4, secLenPausing, 1);
983 createRunningDate4Todo( sub2, start.addDays( 8 ), end, secLenRunning*4, secLenPausing, 3); 990 createRunningDate4Todo( sub2, start.addDays( 8 ), end, secLenRunning*4, secLenPausing, 3);
984 createRunningDate4Todo( workLutz11, start, start.addDays( 8 ), secLenRunning, secLenPausing, 0); 991 createRunningDate4Todo( workLutz11, start, start.addDays( 8 ), secLenRunning, secLenPausing, 0);
985 createRunningDate4Todo( workNorbert11, start, start.addDays( 8 ), secLenRunning*2, secLenPausing, 1); 992 createRunningDate4Todo( workNorbert11, start, start.addDays( 8 ), secLenRunning*2, secLenPausing, 1);
986 createRunningDate4Todo( workLutz12, start.addDays( 8 ),end, secLenRunning*5, secLenPausing, 3); 993 createRunningDate4Todo( workLutz12, start.addDays( 8 ),end, secLenRunning*5, secLenPausing, 3);
987 createRunningDate4Todo( workNorbert12, start.addDays( 8 ), end, secLenRunning, secLenPausing*3, 0); 994 createRunningDate4Todo( workNorbert12, start.addDays( 8 ), end, secLenRunning, secLenPausing*3, 0);
988 995
989 } 996 }
990 997
991 { 998 {
992 Todo * root1 = new Todo; 999 Todo * root1 = new Todo;
993 mCalendar->addTodo( root1 ); 1000 mCalendar->addTodo( root1 );
994 root1->setSummary( "Project_2"); 1001 root1->setSummary( "Project2");
995 root1->setPriority( 1 ); 1002 root1->setPriority( 1 );
996 root1->setDescription( "This is a test description of a root Project 2" ); 1003 root1->setDescription( "This is a test description of a root Project 2" );
997 root1->setPercentComplete( 20 ); 1004 root1->setPercentComplete( 20 );
1005 root1->setCategories( QString( "Cat_Pro2") );
998 updateView(); 1006 updateView();
999 QDateTime start = QDateTime ( QDate( 2004,11,1), QTime ( 7,30,0) ); 1007 QDateTime start = QDateTime ( QDate( 2004,11,1), QTime ( 7,30,0) );
1000 QDateTime end = QDateTime ( QDate( 2005,8,1), QTime ( 0,0,0) ); 1008 QDateTime end = QDateTime ( QDate( 2005,8,5), QTime ( 0,0,0) );
1001 int secLenRunning = 7200; 1009 int secLenRunning = 7200;
1002 int secLenPausing = 3600 * 3; 1010 int secLenPausing = 3600 * 3;
1003 int dayInterval = 1; 1011 int dayInterval = 1;
1004 1012
1005 nt = new Todo; 1013 nt = new Todo;
1006 mCalendar->addTodo( nt ); 1014 mCalendar->addTodo( nt );
1007 nt->setSummary( "Planning_Project_2"); 1015 nt->setSummary( "Planning Project2");
1008 nt->setPriority( 1 ); 1016 nt->setPriority( 1 );
1009 nt->setDescription( "This is a test description of Planning_Project_2" ); 1017 nt->setDescription( "This is a test description of Planning_Project_2" );
1018 nt->setCategories( QString( "Cat_Pro2,Cat_Plan_Pro2") );
1010 nt->setPercentComplete( 20 ); 1019 nt->setPercentComplete( 20 );
1011 1020
1012 1021
1013 Todo * sub1 = nt; 1022 Todo * sub1 = nt;
1014 sub1->setRelatedTo( root1 ); 1023 sub1->setRelatedTo( root1 );
1015 1024
1016 nt = new Todo; 1025 nt = new Todo;
1017 mCalendar->addTodo( nt ); 1026 mCalendar->addTodo( nt );
1018 nt->setSummary( "Planning_Project_2: Lutz"); 1027 nt->setSummary( "Planning Project2: Lutz");
1019 nt->setPriority( 1 ); 1028 nt->setPriority( 1 );
1020 nt->setDescription( "This todo counts the actual work of a person on a project" ); 1029 nt->setDescription( "This todo counts the actual work of a person on a project" );
1030 nt->setCategories( QString( "Cat_Pro2,Cat_Plan_Pro2,Cat_Work_Lutz") );
1021 nt->setPercentComplete( 20 ); 1031 nt->setPercentComplete( 20 );
1022 Todo * workLutz11 = nt; 1032 Todo * workLutz11 = nt;
1023 workLutz11->setRelatedTo( sub1 ); 1033 workLutz11->setRelatedTo( sub1 );
1024 1034
1025 nt = new Todo; 1035 nt = new Todo;
1026 mCalendar->addTodo( nt ); 1036 mCalendar->addTodo( nt );
1027 nt->setSummary( "Planning_Project_2: Norbert"); 1037 nt->setSummary( "Planning Project2: Norbert");
1028 nt->setPriority( 1 ); 1038 nt->setPriority( 1 );
1029 nt->setDescription( "This todo counts the actual work of a person on a project" ); 1039 nt->setDescription( "This todo counts the actual work of a person on a project" );
1040 nt->setCategories( QString( "Cat_Pro2,Cat_Plan_Pro2,Cat_Work_Norbert") );
1030 nt->setPercentComplete( 20 ); 1041 nt->setPercentComplete( 20 );
1031 Todo * workNorbert11 = nt; 1042 Todo * workNorbert11 = nt;
1032 workNorbert11->setRelatedTo( sub1 ); 1043 workNorbert11->setRelatedTo( sub1 );
1033 1044
1034 nt = new Todo; 1045 nt = new Todo;
1035 mCalendar->addTodo( nt ); 1046 mCalendar->addTodo( nt );
1036 nt->setSummary( "Work on 2"); 1047 nt->setSummary( "Work on 2");
1037 nt->setPriority( 1 ); 1048 nt->setPriority( 1 );
1038 nt->setDescription( "This is a test description of Work Project_2" ); 1049 nt->setDescription( "This is a test description of Work Project_2" );
1050 nt->setCategories( QString( "Cat_Pro2,Cat_Work_Pro2") );
1039 nt->setPercentComplete( 20 ); 1051 nt->setPercentComplete( 20 );
1040 1052
1041 Todo * sub2 = nt; 1053 Todo * sub2 = nt;
1042 sub2->setRelatedTo( root1 ); 1054 sub2->setRelatedTo( root1 );
1043 1055
1044 1056
1045 nt = new Todo; 1057 nt = new Todo;
1046 mCalendar->addTodo( nt ); 1058 mCalendar->addTodo( nt );
1047 nt->setSummary( "Work on 2: Lutz"); 1059 nt->setSummary( "Work on 2: Lutz");
1048 nt->setPriority( 1 ); 1060 nt->setPriority( 1 );
1049 nt->setDescription( "This todo counts the actual work of a person on a project" ); 1061 nt->setDescription( "This todo counts the actual work of a person on a project" );
1062 nt->setCategories( QString( "Cat_Pro2,Cat_Work_Pro2,Cat_Work_Lutz") );
1050 nt->setPercentComplete( 20 ); 1063 nt->setPercentComplete( 20 );
1051 Todo * workLutz12 = nt; 1064 Todo * workLutz12 = nt;
1052 workLutz12->setRelatedTo( sub2 ); 1065 workLutz12->setRelatedTo( sub2 );
1053 1066
1054 nt = new Todo; 1067 nt = new Todo;
1055 mCalendar->addTodo( nt ); 1068 mCalendar->addTodo( nt );
1056 nt->setSummary( "Work on 2: Norbert"); 1069 nt->setSummary( "Work on 2: Norbert");
1057 nt->setPriority( 1 ); 1070 nt->setPriority( 1 );
1058 nt->setDescription( "This todo counts the actual work of a person on a project" ); 1071 nt->setDescription( "This todo counts the actual work of a person on a project" );
1072 nt->setCategories( QString( "Cat_Pro2,Cat_Work_Pro2,Cat_Work_Norbert") );
1059 nt->setPercentComplete( 20 ); 1073 nt->setPercentComplete( 20 );
1060 Todo * workNorbert12 = nt; 1074 Todo * workNorbert12 = nt;
1061 workNorbert12->setRelatedTo( sub2 ); 1075 workNorbert12->setRelatedTo( sub2 );
1062 createRunningDate4Todo( root1, start, end, secLenRunning, secLenPausing, 10 ); 1076 createRunningDate4Todo( root1, start, end, secLenRunning, secLenPausing, 10 );
1063 createRunningDate4Todo( sub1, start.addSecs( secLenRunning*3 ), start.addDays( 20 ), secLenRunning*2, secLenPausing, 2); 1077 createRunningDate4Todo( sub1, start.addSecs( secLenRunning*3 ), start.addDays( 20 ), secLenRunning*2, secLenPausing, 2);
1064 createRunningDate4Todo( sub2, start.addDays( 8 ), end, secLenRunning*3, secLenPausing, 7); 1078 createRunningDate4Todo( sub2, start.addDays( 8 ), end, secLenRunning*3, secLenPausing, 7);
1065 createRunningDate4Todo( workLutz11, start, start.addDays( 18 ), secLenRunning/2, secLenPausing*5, 0); 1079 createRunningDate4Todo( workLutz11, start, start.addDays( 18 ), secLenRunning/2, secLenPausing*5, 0);
1066 createRunningDate4Todo( workNorbert11, start.addDays( 8 ), start.addDays( 18 ), secLenRunning*5, secLenPausing*5, 1); 1080 createRunningDate4Todo( workNorbert11, start.addDays( 8 ), start.addDays( 18 ), secLenRunning*5, secLenPausing*5, 1);
1067 createRunningDate4Todo( workLutz12, start.addDays( 8 ),end, secLenRunning, secLenPausing*8, 0); 1081 createRunningDate4Todo( workLutz12, start.addDays( 8 ),end, secLenRunning, secLenPausing*8, 0);
1068 createRunningDate4Todo( workNorbert12, start.addDays( 28 ), end, secLenRunning/8, secLenPausing*6, 0); 1082 createRunningDate4Todo( workNorbert12, start.addDays( 28 ), end, secLenRunning/8, secLenPausing*6, 0);
1069 } 1083 }
1070 updateView(); 1084 updateView();
1071#endif 1085#endif
1072 1086
1073} 1087}
1074void CalendarView::createRunningDate4Todo( Todo * runT, QDateTime start , QDateTime end, int secLenRunning, int secLenPausing,int dayInterval ) 1088void CalendarView::createRunningDate4Todo( Todo * runT, QDateTime start , QDateTime end, int secLenRunning, int secLenPausing,int dayInterval )
1075{ 1089{
1076 static int ccc = 0; 1090 static int ccc = 0;
1077 ++ccc; 1091 ++ccc;
1078 QDateTime t_start = start; 1092 QDateTime t_start = start;
1079 runT->setPriority( 5 ); 1093 runT->setPriority( 5 );
1080 runT->setPercentComplete( 0 ); 1094 runT->setPercentComplete( 0 );
1081 int count = 0; 1095 int count = 0;
1082 int prio = 5; 1096 int prio = 5;
1083 int complete = 0; 1097 int complete = 0;
1084 while ( t_start < end ) { 1098 while ( t_start < end ) {
1085 ++count; 1099 ++count;
1086 if ( count > ccc ) { 1100 if ( count > ccc ) {
1087 count = 0; 1101 count = 0;
1088 --prio; 1102 --prio;
1089 if ( prio == 0 ) prio = 5; 1103 if ( prio == 0 ) prio = 5;
1090 complete += 20; 1104 complete += 20;
1091 if ( complete > 100 ) complete = 0; 1105 if ( complete > 100 ) complete = 0;
1092 runT->setPriority( prio ); 1106 runT->setPriority( prio );
1093 runT->setPercentComplete( complete ); 1107 runT->setPercentComplete( complete );
1094 } 1108 }
1095 runT->setRunning( true ); 1109 runT->setRunning( true );
1096 runT->saveRunningInfo( "Additional tt comment: running on "+ t_start.toString(), t_start, t_start.addSecs( secLenRunning ) ); 1110 runT->saveRunningInfo( "Additional tt comment: running on "+ t_start.toString(), t_start, t_start.addSecs( secLenRunning ) );
1097 if ( dayInterval ) 1111 if ( dayInterval )
1098 t_start = t_start.addDays( dayInterval ); 1112 t_start = t_start.addDays( dayInterval );
1099 else { 1113 else {
1100 t_start = t_start.addSecs( secLenRunning + secLenPausing ); 1114 t_start = t_start.addSecs( secLenRunning + secLenPausing );
1101 } 1115 }
1102 } 1116 }
1103} 1117}
1104 1118
1105void CalendarView::showDay( QDate d ) 1119void CalendarView::showDay( QDate d )
1106{ 1120{
1107 dateNavigator()->blockSignals( true ); 1121 dateNavigator()->blockSignals( true );
1108 dateNavigator()->selectDate( d ); 1122 dateNavigator()->selectDate( d );
1109 dateNavigator()->blockSignals( false ); 1123 dateNavigator()->blockSignals( false );
1110 mViewManager->showDayView(); 1124 mViewManager->showDayView();
1111 //dateNavigator()->selectDate( d ); 1125 //dateNavigator()->selectDate( d );
1112} 1126}
1113void CalendarView::timerAlarm() 1127void CalendarView::timerAlarm()
1114{ 1128{
1115 //qDebug("CalendarView::timerAlarm() "); 1129 //qDebug("CalendarView::timerAlarm() ");
1116 computeAlarm(mAlarmNotification ); 1130 computeAlarm(mAlarmNotification );
1117} 1131}
1118 1132
1119void CalendarView::suspendAlarm() 1133void CalendarView::suspendAlarm()
1120{ 1134{
1121 //qDebug(" CalendarView::suspendAlarm() "); 1135 //qDebug(" CalendarView::suspendAlarm() ");
1122 computeAlarm(mSuspendAlarmNotification ); 1136 computeAlarm(mSuspendAlarmNotification );
1123 1137
1124} 1138}
1125 1139
1126void CalendarView::startAlarm( QString mess , QString filename) 1140void CalendarView::startAlarm( QString mess , QString filename)
1127{ 1141{
1128 1142
1129 topLevelWidget()->showNormal(); 1143 topLevelWidget()->showNormal();
1130 topLevelWidget()->setActiveWindow(); 1144 topLevelWidget()->setActiveWindow();
1131 topLevelWidget()->raise(); 1145 topLevelWidget()->raise();
1132 1146
1133 mAlarmDialog->eventNotification( mess, KOPrefs::instance()->mAlarmPlayBeeps, filename, true,KOPrefs::instance()->mAlarmBeepInterval ,KOPrefs::instance()->mAlarmSuspendCount ); 1147 mAlarmDialog->eventNotification( mess, KOPrefs::instance()->mAlarmPlayBeeps, filename, true,KOPrefs::instance()->mAlarmBeepInterval ,KOPrefs::instance()->mAlarmSuspendCount );
1134 QTimer::singleShot( 2000, this, SLOT( checkNextTimerAlarm() ) ); 1148 QTimer::singleShot( 2000, this, SLOT( checkNextTimerAlarm() ) );
1135 1149
1136} 1150}
1137 1151
1138void CalendarView::checkNextTimerAlarm() 1152void CalendarView::checkNextTimerAlarm()
1139{ 1153{
1140 mCalendar->checkAlarmForIncidence( 0, true ); 1154 mCalendar->checkAlarmForIncidence( 0, true );
1141} 1155}
1142 1156
1143void CalendarView::computeAlarm( QString msg ) 1157void CalendarView::computeAlarm( QString msg )
1144{ 1158{
1145 1159
1146 QString mess = msg; 1160 QString mess = msg;
1147 QString mAlarmMessage = mess.mid( 9 ); 1161 QString mAlarmMessage = mess.mid( 9 );
1148 QString filename = MainWindow::resourcePath(); 1162 QString filename = MainWindow::resourcePath();
1149 filename += "koalarm.wav"; 1163 filename += "koalarm.wav";
1150 QString tempfilename; 1164 QString tempfilename;
1151 if ( mess.left( 13 ) == "suspend_alarm") { 1165 if ( mess.left( 13 ) == "suspend_alarm") {
1152 bool error = false; 1166 bool error = false;
1153 int len = mess.mid( 13 ).find("+++"); 1167 int len = mess.mid( 13 ).find("+++");
1154 if ( len < 2 ) 1168 if ( len < 2 )
1155 error = true; 1169 error = true;
1156 else { 1170 else {
1157 tempfilename = mess.mid( 13, len ); 1171 tempfilename = mess.mid( 13, len );
1158 if ( !QFile::exists( tempfilename ) ) 1172 if ( !QFile::exists( tempfilename ) )
1159 error = true; 1173 error = true;
1160 } 1174 }
1161 if ( ! error ) { 1175 if ( ! error ) {
1162 filename = tempfilename; 1176 filename = tempfilename;
1163 } 1177 }
1164 mAlarmMessage = mess.mid( 13+len+3 ); 1178 mAlarmMessage = mess.mid( 13+len+3 );
1165 //qDebug("suspend file %s ",tempfilename.latin1() ); 1179 //qDebug("suspend file %s ",tempfilename.latin1() );
1166 startAlarm( mAlarmMessage, filename); 1180 startAlarm( mAlarmMessage, filename);
1167 return; 1181 return;
1168 } 1182 }
1169 if ( mess.left( 11 ) == "timer_alarm") { 1183 if ( mess.left( 11 ) == "timer_alarm") {
1170 //mTimerTime = 0; 1184 //mTimerTime = 0;
1171 startAlarm( mess.mid( 11 ), filename ); 1185 startAlarm( mess.mid( 11 ), filename );
1172 return; 1186 return;
1173 } 1187 }
1174 if ( mess.left( 10 ) == "proc_alarm") { 1188 if ( mess.left( 10 ) == "proc_alarm") {
1175 bool error = false; 1189 bool error = false;
1176 int len = mess.mid( 10 ).find("+++"); 1190 int len = mess.mid( 10 ).find("+++");
1177 if ( len < 2 ) 1191 if ( len < 2 )
1178 error = true; 1192 error = true;
1179 else { 1193 else {
1180 tempfilename = mess.mid( 10, len ); 1194 tempfilename = mess.mid( 10, len );
1181 if ( !QFile::exists( tempfilename ) ) 1195 if ( !QFile::exists( tempfilename ) )
1182 error = true; 1196 error = true;
1183 } 1197 }
1184 if ( error ) { 1198 if ( error ) {
1185 mAlarmMessage = "Procedure Alarm\nError - File not found\n"; 1199 mAlarmMessage = "Procedure Alarm\nError - File not found\n";
1186 mAlarmMessage += mess.mid( 10+len+3+9 ); 1200 mAlarmMessage += mess.mid( 10+len+3+9 );
1187 } else { 1201 } else {
1188 //QCopEnvelope e("QPE/Application/kopi", "-writeFileSilent"); 1202 //QCopEnvelope e("QPE/Application/kopi", "-writeFileSilent");
1189 //qDebug("-----system command %s ",tempfilename.latin1() ); 1203 //qDebug("-----system command %s ",tempfilename.latin1() );
1190#ifndef _WIN32_ 1204#ifndef _WIN32_
1191 if ( vfork () == 0 ) { 1205 if ( vfork () == 0 ) {
1192 execl ( tempfilename.latin1(), 0 ); 1206 execl ( tempfilename.latin1(), 0 );
1193 return; 1207 return;
1194 } 1208 }
1195#else 1209#else
1196 QProcess* p = new QProcess(); 1210 QProcess* p = new QProcess();
1197 p->addArgument( tempfilename.latin1() ); 1211 p->addArgument( tempfilename.latin1() );
1198 p->start(); 1212 p->start();
1199 return; 1213 return;
1200#endif 1214#endif
1201 1215
1202 return; 1216 return;
1203 } 1217 }
1204 1218
1205 //qDebug("+++++++system command %s ",tempfilename.latin1() ); 1219 //qDebug("+++++++system command %s ",tempfilename.latin1() );
1206 } 1220 }
1207 if ( mess.left( 11 ) == "audio_alarm") { 1221 if ( mess.left( 11 ) == "audio_alarm") {
1208 bool error = false; 1222 bool error = false;
1209 int len = mess.mid( 11 ).find("+++"); 1223 int len = mess.mid( 11 ).find("+++");
1210 if ( len < 2 ) 1224 if ( len < 2 )
1211 error = true; 1225 error = true;
1212 else { 1226 else {
1213 tempfilename = mess.mid( 11, len ); 1227 tempfilename = mess.mid( 11, len );
1214 if ( !QFile::exists( tempfilename ) ) 1228 if ( !QFile::exists( tempfilename ) )
1215 error = true; 1229 error = true;
1216 } 1230 }
1217 if ( ! error ) { 1231 if ( ! error ) {
1218 filename = tempfilename; 1232 filename = tempfilename;
1219 } 1233 }
1220 mAlarmMessage = mess.mid( 11+len+3+9 ); 1234 mAlarmMessage = mess.mid( 11+len+3+9 );
1221 //qDebug("audio file command %s ",tempfilename.latin1() ); 1235 //qDebug("audio file command %s ",tempfilename.latin1() );
1222 } 1236 }
1223 if ( mess.left( 9 ) == "cal_alarm") { 1237 if ( mess.left( 9 ) == "cal_alarm") {
1224 mAlarmMessage = mess.mid( 9 ) ; 1238 mAlarmMessage = mess.mid( 9 ) ;
1225 } 1239 }
1226 1240
1227 startAlarm( mAlarmMessage, filename ); 1241 startAlarm( mAlarmMessage, filename );
1228 1242
1229 1243
1230} 1244}
1231 1245
1232void CalendarView::addSuspendAlarm(const QDateTime &qdt, const QString &noti ) 1246void CalendarView::addSuspendAlarm(const QDateTime &qdt, const QString &noti )
1233{ 1247{
1234 //qDebug("+++++addSUSPENDAlarm %s %s ", qdt.toString().latin1() , noti.latin1() ); 1248 //qDebug("+++++addSUSPENDAlarm %s %s ", qdt.toString().latin1() , noti.latin1() );
1235 1249
1236 mSuspendAlarmNotification = noti; 1250 mSuspendAlarmNotification = noti;
1237 int ms = QDateTime::currentDateTime().secsTo( qdt )*1000; 1251 int ms = QDateTime::currentDateTime().secsTo( qdt )*1000;
1238 //qDebug("Suspend Alarm timer started with secs: %d ", ms/1000); 1252 //qDebug("Suspend Alarm timer started with secs: %d ", ms/1000);
1239 mSuspendTimer->start( ms , true ); 1253 mSuspendTimer->start( ms , true );
1240 1254
1241} 1255}
1242 1256
1243void CalendarView::addAlarm(const QDateTime &qdt, const QString &noti ) 1257void CalendarView::addAlarm(const QDateTime &qdt, const QString &noti )
1244{ 1258{
1245 mNextAlarmDateTime = qdt; 1259 mNextAlarmDateTime = qdt;
1246 //qDebug("+++++addAlarm %s %s ", qdt.toString().latin1() , noti.latin1() ); 1260 //qDebug("+++++addAlarm %s %s ", qdt.toString().latin1() , noti.latin1() );
1247 if ( ! KOPrefs::instance()->mUseInternalAlarmNotification ) { 1261 if ( ! KOPrefs::instance()->mUseInternalAlarmNotification ) {
1248#ifndef DESKTOP_VERSION 1262#ifndef DESKTOP_VERSION
1249 AlarmServer::addAlarm ( qdt,"koalarm", noti.utf8() ); 1263 AlarmServer::addAlarm ( qdt,"koalarm", noti.utf8() );
1250#endif 1264#endif
1251 return; 1265 return;
1252 } 1266 }
1253 int maxSec; 1267 int maxSec;
1254 //maxSec = 5; //testing only 1268 //maxSec = 5; //testing only
1255 maxSec = 86400+3600; // one day+1hour 1269 maxSec = 86400+3600; // one day+1hour
1256 mAlarmNotification = noti; 1270 mAlarmNotification = noti;
1257 int sec = QDateTime::currentDateTime().secsTo( qdt ); 1271 int sec = QDateTime::currentDateTime().secsTo( qdt );
1258 if ( sec > maxSec ) { 1272 if ( sec > maxSec ) {
1259 mRecheckAlarmTimer->start( maxSec * 1000 ); 1273 mRecheckAlarmTimer->start( maxSec * 1000 );
1260 // qDebug("recheck Alarm timer started with secs: %d next alarm in sec:%d", maxSec,sec ); 1274 // qDebug("recheck Alarm timer started with secs: %d next alarm in sec:%d", maxSec,sec );
1261 return; 1275 return;
1262 } else { 1276 } else {
1263 mRecheckAlarmTimer->stop(); 1277 mRecheckAlarmTimer->stop();
1264 } 1278 }
1265 //qDebug("Alarm timer started with secs: %d ", sec); 1279 //qDebug("Alarm timer started with secs: %d ", sec);
1266 mAlarmTimer->start( sec *1000 , true ); 1280 mAlarmTimer->start( sec *1000 , true );
1267 1281
1268} 1282}
1269// called by mRecheckAlarmTimer to get next alarm 1283// called by mRecheckAlarmTimer to get next alarm
1270// we need this, because a QTimer has only a max range of 25 days 1284// we need this, because a QTimer has only a max range of 25 days
1271void CalendarView::recheckTimerAlarm() 1285void CalendarView::recheckTimerAlarm()
1272{ 1286{
1273 mAlarmTimer->stop(); 1287 mAlarmTimer->stop();
1274 mRecheckAlarmTimer->stop(); 1288 mRecheckAlarmTimer->stop();
1275 mCalendar->checkAlarmForIncidence( 0, true ); 1289 mCalendar->checkAlarmForIncidence( 0, true );
1276} 1290}
1277#ifndef DESKTOP_VERSION 1291#ifndef DESKTOP_VERSION
1278void CalendarView::removeAlarm(const QDateTime &qdt, const QString &noti ) 1292void CalendarView::removeAlarm(const QDateTime &qdt, const QString &noti )
1279#else 1293#else
1280void CalendarView::removeAlarm(const QDateTime &, const QString & ) 1294void CalendarView::removeAlarm(const QDateTime &, const QString & )
1281#endif 1295#endif
1282{ 1296{
1283 //qDebug("-----removeAlarm %s %s ", qdt.toString().latin1() , noti.latin1() ); 1297 //qDebug("-----removeAlarm %s %s ", qdt.toString().latin1() , noti.latin1() );
1284 if ( ! KOPrefs::instance()->mUseInternalAlarmNotification ) { 1298 if ( ! KOPrefs::instance()->mUseInternalAlarmNotification ) {
1285#ifndef DESKTOP_VERSION 1299#ifndef DESKTOP_VERSION
1286 AlarmServer::deleteAlarm (qdt ,"koalarm" ,noti.utf8() ); 1300 AlarmServer::deleteAlarm (qdt ,"koalarm" ,noti.utf8() );
1287#endif 1301#endif
1288 return; 1302 return;
1289 } 1303 }
1290 mAlarmTimer->stop(); 1304 mAlarmTimer->stop();
1291} 1305}
1292void CalendarView::selectWeekNum ( int num ) 1306void CalendarView::selectWeekNum ( int num )
1293{ 1307{
1294 dateNavigator()->blockSignals( true ); 1308 dateNavigator()->blockSignals( true );
1295 dateNavigator()->selectWeek( num ); 1309 dateNavigator()->selectWeek( num );
1296 dateNavigator()->blockSignals( false ); 1310 dateNavigator()->blockSignals( false );
1297 mViewManager->showWeekView(); 1311 mViewManager->showWeekView();
1298} 1312}
1299KOViewManager *CalendarView::viewManager() 1313KOViewManager *CalendarView::viewManager()
1300{ 1314{
1301 return mViewManager; 1315 return mViewManager;
1302} 1316}
1303 1317
1304KODialogManager *CalendarView::dialogManager() 1318KODialogManager *CalendarView::dialogManager()
1305{ 1319{
1306 return mDialogManager; 1320 return mDialogManager;
1307} 1321}
1308 1322
1309QDate CalendarView::startDate() 1323QDate CalendarView::startDate()
1310{ 1324{
1311 DateList dates = mNavigator->selectedDates(); 1325 DateList dates = mNavigator->selectedDates();
1312 1326
1313 return dates.first(); 1327 return dates.first();
1314} 1328}
1315 1329
1316QDate CalendarView::endDate() 1330QDate CalendarView::endDate()
1317{ 1331{
1318 DateList dates = mNavigator->selectedDates(); 1332 DateList dates = mNavigator->selectedDates();
1319 1333
1320 return dates.last(); 1334 return dates.last();
1321} 1335}
1322 1336
1323 1337
1324void CalendarView::createPrinter() 1338void CalendarView::createPrinter()
1325{ 1339{
1326#ifndef KORG_NOPRINTER 1340#ifndef KORG_NOPRINTER
1327 if (!mCalPrinter) { 1341 if (!mCalPrinter) {
1328 mCalPrinter = new CalPrinter(this, mCalendar); 1342 mCalPrinter = new CalPrinter(this, mCalendar);
1329 connect(this, SIGNAL(configChanged()), mCalPrinter, SLOT(updateConfig())); 1343 connect(this, SIGNAL(configChanged()), mCalPrinter, SLOT(updateConfig()));
1330 } 1344 }
1331#endif 1345#endif
1332} 1346}
1333 1347
1334 1348
1335//KOPrefs::instance()->mWriteBackFile 1349//KOPrefs::instance()->mWriteBackFile
1336//KOPrefs::instance()->mWriteBackExistingOnly 1350//KOPrefs::instance()->mWriteBackExistingOnly
1337 1351
1338// 0 syncPrefsGroup->addRadio(i18n("Take local entry on conflict")); 1352// 0 syncPrefsGroup->addRadio(i18n("Take local entry on conflict"));
1339// 1 syncPrefsGroup->addRadio(i18n("Take remote entry on conflict")); 1353// 1 syncPrefsGroup->addRadio(i18n("Take remote entry on conflict"));
1340// 2 syncPrefsGroup->addRadio(i18n("Take newest entry on conflict")); 1354// 2 syncPrefsGroup->addRadio(i18n("Take newest entry on conflict"));
1341// 3 syncPrefsGroup->addRadio(i18n("Ask for every entry on conflict")); 1355// 3 syncPrefsGroup->addRadio(i18n("Ask for every entry on conflict"));
1342// 4 syncPrefsGroup->addRadio(i18n("Force take local entry always")); 1356// 4 syncPrefsGroup->addRadio(i18n("Force take local entry always"));
1343// 5 syncPrefsGroup->addRadio(i18n("Force take remote entry always")); 1357// 5 syncPrefsGroup->addRadio(i18n("Force take remote entry always"));
1344 1358
1345int CalendarView::takeEvent( Incidence* local, Incidence* remote, int mode , bool full ) 1359int CalendarView::takeEvent( Incidence* local, Incidence* remote, int mode , bool full )
1346{ 1360{
1347 1361
1348 // 0 equal 1362 // 0 equal
1349 // 1 take local 1363 // 1 take local
1350 // 2 take remote 1364 // 2 take remote
1351 // 3 cancel 1365 // 3 cancel
1352 QDateTime lastSync = mLastCalendarSync; 1366 QDateTime lastSync = mLastCalendarSync;
1353 QDateTime localMod = local->lastModified(); 1367 QDateTime localMod = local->lastModified();
1354 QDateTime remoteMod = remote->lastModified(); 1368 QDateTime remoteMod = remote->lastModified();
1355 if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { 1369 if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
1356 bool remCh, locCh; 1370 bool remCh, locCh;
1357 remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) ); 1371 remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) );
1358 //if ( remCh ) 1372 //if ( remCh )
1359 //qDebug("loc %s rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() ); 1373 //qDebug("loc %s rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() );
1360 locCh = ( localMod > mLastCalendarSync ); 1374 locCh = ( localMod > mLastCalendarSync );
1361 if ( !remCh && ! locCh ) { 1375 if ( !remCh && ! locCh ) {
1362 //qDebug("both not changed "); 1376 //qDebug("both not changed ");
1363 lastSync = localMod.addDays(1); 1377 lastSync = localMod.addDays(1);
1364 if ( mode <= SYNC_PREF_ASK ) 1378 if ( mode <= SYNC_PREF_ASK )
1365 return 0; 1379 return 0;
1366 } else { 1380 } else {
1367 if ( locCh ) { 1381 if ( locCh ) {
1368 //qDebug("loc changed %d %s %s", local->revision() , localMod.toString().latin1(), mLastCalendarSync.toString().latin1()); 1382 //qDebug("loc changed %d %s %s", local->revision() , localMod.toString().latin1(), mLastCalendarSync.toString().latin1());
1369 lastSync = localMod.addDays( -1 ); 1383 lastSync = localMod.addDays( -1 );
1370 if ( !remCh ) 1384 if ( !remCh )
1371 remoteMod = ( lastSync.addDays( -1 ) ); 1385 remoteMod = ( lastSync.addDays( -1 ) );
1372 } else { 1386 } else {
1373 //qDebug(" not loc changed "); 1387 //qDebug(" not loc changed ");
1374 lastSync = localMod.addDays( 1 ); 1388 lastSync = localMod.addDays( 1 );
1375 if ( remCh ) 1389 if ( remCh )
1376 remoteMod =( lastSync.addDays( 1 ) ); 1390 remoteMod =( lastSync.addDays( 1 ) );
1377 1391
1378 } 1392 }
1379 } 1393 }
1380 full = true; 1394 full = true;
1381 if ( mode < SYNC_PREF_ASK ) 1395 if ( mode < SYNC_PREF_ASK )
1382 mode = SYNC_PREF_ASK; 1396 mode = SYNC_PREF_ASK;
1383 } else { 1397 } else {
1384 if ( localMod == remoteMod ) 1398 if ( localMod == remoteMod )
1385 // if ( local->revision() == remote->revision() ) 1399 // if ( local->revision() == remote->revision() )
1386 return 0; 1400 return 0;
1387 1401
1388 } 1402 }
1389 // qDebug(" %d %d conflict on %s %s ", mode, full, local->summary().latin1(), remote->summary().latin1() ); 1403 // qDebug(" %d %d conflict on %s %s ", mode, full, local->summary().latin1(), remote->summary().latin1() );
1390 1404
1391 //qDebug("%s %d %s %d", localMod.toString().latin1() , local->revision(), remoteMod.toString().latin1(), remote->revision()); 1405 //qDebug("%s %d %s %d", localMod.toString().latin1() , local->revision(), remoteMod.toString().latin1(), remote->revision());
1392 //qDebug("%d %d %d %d ", localMod.time().second(), localMod.time().msec(), remoteMod.time().second(), remoteMod.time().msec() ); 1406 //qDebug("%d %d %d %d ", localMod.time().second(), localMod.time().msec(), remoteMod.time().second(), remoteMod.time().msec() );
1393 //full = true; //debug only 1407 //full = true; //debug only
1394 if ( full ) { 1408 if ( full ) {
1395 bool equ = false; 1409 bool equ = false;
1396 if ( local->typeID() == eventID ) { 1410 if ( local->typeID() == eventID ) {
1397 equ = (*((Event*) local) == *((Event*) remote)); 1411 equ = (*((Event*) local) == *((Event*) remote));
1398 } 1412 }
1399 else if ( local->typeID() == todoID ) 1413 else if ( local->typeID() == todoID )
1400 equ = (*((Todo*) local) == (*(Todo*) remote)); 1414 equ = (*((Todo*) local) == (*(Todo*) remote));
1401 else if ( local->typeID() == journalID ) 1415 else if ( local->typeID() == journalID )
1402 equ = (*((Journal*) local) == *((Journal*) remote)); 1416 equ = (*((Journal*) local) == *((Journal*) remote));
1403 if ( equ ) { 1417 if ( equ ) {
1404 //qDebug("equal "); 1418 //qDebug("equal ");
1405 if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { 1419 if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
1406 local->setCsum( mCurrentSyncDevice, remote->getCsum(mCurrentSyncDevice) ); 1420 local->setCsum( mCurrentSyncDevice, remote->getCsum(mCurrentSyncDevice) );
1407 } 1421 }
1408 if ( mode < SYNC_PREF_FORCE_LOCAL ) 1422 if ( mode < SYNC_PREF_FORCE_LOCAL )
1409 return 0; 1423 return 0;
1410 1424
1411 }//else //debug only 1425 }//else //debug only
1412 //qDebug("not equal %s %s ", local->summary().latin1(), remote->summary().latin1()); 1426 //qDebug("not equal %s %s ", local->summary().latin1(), remote->summary().latin1());
1413 } 1427 }
1414 int result; 1428 int result;
1415 bool localIsNew; 1429 bool localIsNew;
1416 //qDebug("%s -- %s mLastCalendarSync %s lastsync %s --- local %s remote %s ",local->summary().latin1(), remote->summary().latin1(),mLastCalendarSync.toString().latin1() ,lastSync.toString().latin1() , localMod.toString().latin1() , remoteMod.toString().latin1() ); 1430 //qDebug("%s -- %s mLastCalendarSync %s lastsync %s --- local %s remote %s ",local->summary().latin1(), remote->summary().latin1(),mLastCalendarSync.toString().latin1() ,lastSync.toString().latin1() , localMod.toString().latin1() , remoteMod.toString().latin1() );
1417 1431
1418 1432
1419 // ************************************************ 1433 // ************************************************
1420 // ************************************************ 1434 // ************************************************
1421 // ************************************************ 1435 // ************************************************
1422 // We may have that lastSync > remoteMod AND lastSync > localMod 1436 // We may have that lastSync > remoteMod AND lastSync > localMod
1423 // BUT remoteMod != localMod 1437 // BUT remoteMod != localMod
1424 1438
1425 1439
1426 if ( full && mode < SYNC_PREF_NEWEST ) 1440 if ( full && mode < SYNC_PREF_NEWEST )
1427 mode = SYNC_PREF_ASK; 1441 mode = SYNC_PREF_ASK;
1428 1442
1429 switch( mode ) { 1443 switch( mode ) {
1430 case SYNC_PREF_LOCAL: 1444 case SYNC_PREF_LOCAL:
1431 if ( lastSync > remoteMod ) 1445 if ( lastSync > remoteMod )
1432 return 1; 1446 return 1;
1433 if ( lastSync > localMod ) 1447 if ( lastSync > localMod )
1434 return 2; 1448 return 2;
1435 return 1; 1449 return 1;
1436 break; 1450 break;
1437 case SYNC_PREF_REMOTE: 1451 case SYNC_PREF_REMOTE:
1438 if ( lastSync > localMod ) 1452 if ( lastSync > localMod )
1439 return 2; 1453 return 2;
1440 if ( lastSync > remoteMod ) 1454 if ( lastSync > remoteMod )
1441 return 1; 1455 return 1;
1442 return 2; 1456 return 2;