-rw-r--r-- | korganizer/calendarview.cpp | 5 | ||||
-rw-r--r-- | libkcal/sharpformat.cpp | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 5150455..f859b90 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -634,529 +634,532 @@ void CalendarView::recheckTimerAlarm() | |||
634 | } | 634 | } |
635 | void CalendarView::removeAlarm(const QDateTime &qdt, const QString ¬i ) | 635 | void CalendarView::removeAlarm(const QDateTime &qdt, const QString ¬i ) |
636 | { | 636 | { |
637 | //qDebug("-----removeAlarm %s %s ", qdt.toString().latin1() , noti.latin1() ); | 637 | //qDebug("-----removeAlarm %s %s ", qdt.toString().latin1() , noti.latin1() ); |
638 | if ( ! KOPrefs::instance()->mUseInternalAlarmNotification ) { | 638 | if ( ! KOPrefs::instance()->mUseInternalAlarmNotification ) { |
639 | #ifndef DESKTOP_VERSION | 639 | #ifndef DESKTOP_VERSION |
640 | AlarmServer::deleteAlarm (qdt ,"koalarm" ,noti.latin1() ); | 640 | AlarmServer::deleteAlarm (qdt ,"koalarm" ,noti.latin1() ); |
641 | #endif | 641 | #endif |
642 | return; | 642 | return; |
643 | } | 643 | } |
644 | mAlarmTimer->stop(); | 644 | mAlarmTimer->stop(); |
645 | } | 645 | } |
646 | void CalendarView::selectWeekNum ( int num ) | 646 | void CalendarView::selectWeekNum ( int num ) |
647 | { | 647 | { |
648 | dateNavigator()->selectWeek( num ); | 648 | dateNavigator()->selectWeek( num ); |
649 | mViewManager->showWeekView(); | 649 | mViewManager->showWeekView(); |
650 | } | 650 | } |
651 | KOViewManager *CalendarView::viewManager() | 651 | KOViewManager *CalendarView::viewManager() |
652 | { | 652 | { |
653 | return mViewManager; | 653 | return mViewManager; |
654 | } | 654 | } |
655 | 655 | ||
656 | KODialogManager *CalendarView::dialogManager() | 656 | KODialogManager *CalendarView::dialogManager() |
657 | { | 657 | { |
658 | return mDialogManager; | 658 | return mDialogManager; |
659 | } | 659 | } |
660 | 660 | ||
661 | QDate CalendarView::startDate() | 661 | QDate CalendarView::startDate() |
662 | { | 662 | { |
663 | DateList dates = mNavigator->selectedDates(); | 663 | DateList dates = mNavigator->selectedDates(); |
664 | 664 | ||
665 | return dates.first(); | 665 | return dates.first(); |
666 | } | 666 | } |
667 | 667 | ||
668 | QDate CalendarView::endDate() | 668 | QDate CalendarView::endDate() |
669 | { | 669 | { |
670 | DateList dates = mNavigator->selectedDates(); | 670 | DateList dates = mNavigator->selectedDates(); |
671 | 671 | ||
672 | return dates.last(); | 672 | return dates.last(); |
673 | } | 673 | } |
674 | 674 | ||
675 | 675 | ||
676 | void CalendarView::createPrinter() | 676 | void CalendarView::createPrinter() |
677 | { | 677 | { |
678 | #ifndef KORG_NOPRINTER | 678 | #ifndef KORG_NOPRINTER |
679 | if (!mCalPrinter) { | 679 | if (!mCalPrinter) { |
680 | mCalPrinter = new CalPrinter(this, mCalendar); | 680 | mCalPrinter = new CalPrinter(this, mCalendar); |
681 | connect(this, SIGNAL(configChanged()), mCalPrinter, SLOT(updateConfig())); | 681 | connect(this, SIGNAL(configChanged()), mCalPrinter, SLOT(updateConfig())); |
682 | } | 682 | } |
683 | #endif | 683 | #endif |
684 | } | 684 | } |
685 | 685 | ||
686 | void CalendarView::confSync() | 686 | void CalendarView::confSync() |
687 | { | 687 | { |
688 | static KSyncPrefsDialog* sp = 0; | 688 | static KSyncPrefsDialog* sp = 0; |
689 | if ( ! sp ) { | 689 | if ( ! sp ) { |
690 | sp = new KSyncPrefsDialog( this, "syncprefs", true ); | 690 | sp = new KSyncPrefsDialog( this, "syncprefs", true ); |
691 | } | 691 | } |
692 | sp->usrReadConfig(); | 692 | sp->usrReadConfig(); |
693 | #ifndef DESKTOP_VERSION | 693 | #ifndef DESKTOP_VERSION |
694 | sp->showMaximized(); | 694 | sp->showMaximized(); |
695 | #else | 695 | #else |
696 | sp->show(); | 696 | sp->show(); |
697 | #endif | 697 | #endif |
698 | sp->exec(); | 698 | sp->exec(); |
699 | KOPrefs::instance()->mSyncProfileNames = sp->getSyncProfileNames(); | 699 | KOPrefs::instance()->mSyncProfileNames = sp->getSyncProfileNames(); |
700 | KOPrefs::instance()->mLocalMachineName = sp->getLocalMachineName (); | 700 | KOPrefs::instance()->mLocalMachineName = sp->getLocalMachineName (); |
701 | } | 701 | } |
702 | 702 | ||
703 | 703 | ||
704 | //KOPrefs::instance()->mWriteBackFile | 704 | //KOPrefs::instance()->mWriteBackFile |
705 | //KOPrefs::instance()->mWriteBackExistingOnly | 705 | //KOPrefs::instance()->mWriteBackExistingOnly |
706 | 706 | ||
707 | // 0 syncPrefsGroup->addRadio(i18n("Take local entry on conflict")); | 707 | // 0 syncPrefsGroup->addRadio(i18n("Take local entry on conflict")); |
708 | // 1 syncPrefsGroup->addRadio(i18n("Take remote entry on conflict")); | 708 | // 1 syncPrefsGroup->addRadio(i18n("Take remote entry on conflict")); |
709 | // 2 syncPrefsGroup->addRadio(i18n("Take newest entry on conflict")); | 709 | // 2 syncPrefsGroup->addRadio(i18n("Take newest entry on conflict")); |
710 | // 3 syncPrefsGroup->addRadio(i18n("Ask for every entry on conflict")); | 710 | // 3 syncPrefsGroup->addRadio(i18n("Ask for every entry on conflict")); |
711 | // 4 syncPrefsGroup->addRadio(i18n("Force take local entry always")); | 711 | // 4 syncPrefsGroup->addRadio(i18n("Force take local entry always")); |
712 | // 5 syncPrefsGroup->addRadio(i18n("Force take remote entry always")); | 712 | // 5 syncPrefsGroup->addRadio(i18n("Force take remote entry always")); |
713 | 713 | ||
714 | int CalendarView::takeEvent( Incidence* local, Incidence* remote, int mode , bool full ) | 714 | int CalendarView::takeEvent( Incidence* local, Incidence* remote, int mode , bool full ) |
715 | { | 715 | { |
716 | 716 | ||
717 | //void setZaurusId(int id); | 717 | //void setZaurusId(int id); |
718 | // int zaurusId() const; | 718 | // int zaurusId() const; |
719 | // void setZaurusUid(int id); | 719 | // void setZaurusUid(int id); |
720 | // int zaurusUid() const; | 720 | // int zaurusUid() const; |
721 | // void setZaurusStat(int id); | 721 | // void setZaurusStat(int id); |
722 | // int zaurusStat() const; | 722 | // int zaurusStat() const; |
723 | // 0 equal | 723 | // 0 equal |
724 | // 1 take local | 724 | // 1 take local |
725 | // 2 take remote | 725 | // 2 take remote |
726 | // 3 cancel | 726 | // 3 cancel |
727 | QDateTime lastSync = mLastCalendarSync; | 727 | QDateTime lastSync = mLastCalendarSync; |
728 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 728 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
729 | bool remCh, locCh; | 729 | bool remCh, locCh; |
730 | remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) ); | 730 | remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) ); |
731 | locCh = ( local->lastModified() > mLastCalendarSync ); | 731 | locCh = ( local->lastModified() > mLastCalendarSync ); |
732 | //qDebug("locCh %d remCh %d locuid %d remuid %d", locCh, remCh,local->zaurusUid(), remote->zaurusUid() ); | 732 | //qDebug("locCh %d remCh %d locuid %d remuid %d", locCh, remCh,local->zaurusUid(), remote->zaurusUid() ); |
733 | if ( !remCh && ! locCh ) { | 733 | if ( !remCh && ! locCh ) { |
734 | //qDebug("both not changed "); | 734 | //qDebug("both not changed "); |
735 | lastSync = local->lastModified().addDays(1); | 735 | lastSync = local->lastModified().addDays(1); |
736 | } else { | 736 | } else { |
737 | if ( locCh ) { | 737 | if ( locCh ) { |
738 | //qDebug("loc changed %d %d", local->zaurusStat(), local->revision() ); | 738 | //qDebug("loc changed %d %d", local->zaurusStat(), local->revision() ); |
739 | lastSync = local->lastModified().addDays( -1 ); | 739 | lastSync = local->lastModified().addDays( -1 ); |
740 | if ( !remCh ) | 740 | if ( !remCh ) |
741 | remote->setLastModified( lastSync.addDays( -1 ) ); | 741 | remote->setLastModified( lastSync.addDays( -1 ) ); |
742 | } else { | 742 | } else { |
743 | //qDebug(" not loc changed "); | 743 | //qDebug(" not loc changed "); |
744 | lastSync = local->lastModified().addDays( 1 ); | 744 | lastSync = local->lastModified().addDays( 1 ); |
745 | if ( remCh ) | 745 | if ( remCh ) |
746 | remote->setLastModified( lastSync.addDays( 1 ) ); | 746 | remote->setLastModified( lastSync.addDays( 1 ) ); |
747 | 747 | ||
748 | } | 748 | } |
749 | } | 749 | } |
750 | full = true; | 750 | full = true; |
751 | if ( mode < SYNC_PREF_ASK ) | 751 | if ( mode < SYNC_PREF_ASK ) |
752 | mode = SYNC_PREF_ASK; | 752 | mode = SYNC_PREF_ASK; |
753 | } else { | 753 | } else { |
754 | if ( local->lastModified() == remote->lastModified() ) | 754 | if ( local->lastModified() == remote->lastModified() ) |
755 | if ( local->revision() == remote->revision() ) | 755 | if ( local->revision() == remote->revision() ) |
756 | return 0; | 756 | return 0; |
757 | 757 | ||
758 | } | 758 | } |
759 | // qDebug(" %d %d conflict on %s %s ", mode, full, local->summary().latin1(), remote->summary().latin1() ); | 759 | // qDebug(" %d %d conflict on %s %s ", mode, full, local->summary().latin1(), remote->summary().latin1() ); |
760 | 760 | ||
761 | //qDebug("%s %d %s %d", local->lastModified().toString().latin1() , local->revision(), remote->lastModified().toString().latin1(), remote->revision()); | 761 | //qDebug("%s %d %s %d", local->lastModified().toString().latin1() , local->revision(), remote->lastModified().toString().latin1(), remote->revision()); |
762 | //qDebug("%d %d %d %d ", local->lastModified().time().second(), local->lastModified().time().msec(), remote->lastModified().time().second(), remote->lastModified().time().msec() ); | 762 | //qDebug("%d %d %d %d ", local->lastModified().time().second(), local->lastModified().time().msec(), remote->lastModified().time().second(), remote->lastModified().time().msec() ); |
763 | //full = true; //debug only | 763 | //full = true; //debug only |
764 | if ( full ) { | 764 | if ( full ) { |
765 | bool equ = false; | 765 | bool equ = false; |
766 | if ( local->type() == "Event" ) { | 766 | if ( local->type() == "Event" ) { |
767 | equ = (*((Event*) local) == *((Event*) remote)); | 767 | equ = (*((Event*) local) == *((Event*) remote)); |
768 | } | 768 | } |
769 | else if ( local->type() =="Todo" ) | 769 | else if ( local->type() =="Todo" ) |
770 | equ = (*((Todo*) local) == (*(Todo*) remote)); | 770 | equ = (*((Todo*) local) == (*(Todo*) remote)); |
771 | else if ( local->type() =="Journal" ) | 771 | else if ( local->type() =="Journal" ) |
772 | equ = (*((Journal*) local) == *((Journal*) remote)); | 772 | equ = (*((Journal*) local) == *((Journal*) remote)); |
773 | if ( equ ) { | 773 | if ( equ ) { |
774 | //qDebug("equal "); | 774 | //qDebug("equal "); |
775 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 775 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
776 | local->setCsum( mCurrentSyncDevice, remote->getCsum(mCurrentSyncDevice) ); | 776 | local->setCsum( mCurrentSyncDevice, remote->getCsum(mCurrentSyncDevice) ); |
777 | } | 777 | } |
778 | if ( mode < SYNC_PREF_FORCE_LOCAL ) | 778 | if ( mode < SYNC_PREF_FORCE_LOCAL ) |
779 | return 0; | 779 | return 0; |
780 | 780 | ||
781 | }//else //debug only | 781 | }//else //debug only |
782 | //qDebug("not equal %s %s ", local->summary().latin1(), remote->summary().latin1()); | 782 | //qDebug("not equal %s %s ", local->summary().latin1(), remote->summary().latin1()); |
783 | } | 783 | } |
784 | int result; | 784 | int result; |
785 | bool localIsNew; | 785 | bool localIsNew; |
786 | if ( full && mode < SYNC_PREF_NEWEST ) | 786 | if ( full && mode < SYNC_PREF_NEWEST ) |
787 | mode = SYNC_PREF_ASK; | 787 | mode = SYNC_PREF_ASK; |
788 | 788 | ||
789 | switch( mode ) { | 789 | switch( mode ) { |
790 | case SYNC_PREF_LOCAL: | 790 | case SYNC_PREF_LOCAL: |
791 | if ( lastSync > remote->lastModified() ) | 791 | if ( lastSync > remote->lastModified() ) |
792 | return 1; | 792 | return 1; |
793 | if ( lastSync > local->lastModified() ) | 793 | if ( lastSync > local->lastModified() ) |
794 | return 2; | 794 | return 2; |
795 | return 1; | 795 | return 1; |
796 | break; | 796 | break; |
797 | case SYNC_PREF_REMOTE: | 797 | case SYNC_PREF_REMOTE: |
798 | if ( lastSync > remote->lastModified() ) | 798 | if ( lastSync > remote->lastModified() ) |
799 | return 1; | 799 | return 1; |
800 | if ( lastSync > local->lastModified() ) | 800 | if ( lastSync > local->lastModified() ) |
801 | return 2; | 801 | return 2; |
802 | return 2; | 802 | return 2; |
803 | break; | 803 | break; |
804 | case SYNC_PREF_NEWEST: | 804 | case SYNC_PREF_NEWEST: |
805 | if ( local->lastModified() > remote->lastModified() ) | 805 | if ( local->lastModified() > remote->lastModified() ) |
806 | return 1; | 806 | return 1; |
807 | else | 807 | else |
808 | return 2; | 808 | return 2; |
809 | break; | 809 | break; |
810 | case SYNC_PREF_ASK: | 810 | case SYNC_PREF_ASK: |
811 | //qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), local->lastModified().toString().latin1(), remote->lastModified().toString().latin1() ); | 811 | //qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), local->lastModified().toString().latin1(), remote->lastModified().toString().latin1() ); |
812 | if ( lastSync > remote->lastModified() ) | 812 | if ( lastSync > remote->lastModified() ) |
813 | return 1; | 813 | return 1; |
814 | if ( lastSync > local->lastModified() ) | 814 | if ( lastSync > local->lastModified() ) |
815 | return 2; | 815 | return 2; |
816 | //qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), local->lastModified().toString().latin1(), remote->lastModified().toString().latin1() ); | 816 | //qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), local->lastModified().toString().latin1(), remote->lastModified().toString().latin1() ); |
817 | localIsNew = local->lastModified() > remote->lastModified(); | 817 | localIsNew = local->lastModified() > remote->lastModified(); |
818 | if ( localIsNew ) | 818 | if ( localIsNew ) |
819 | getEventViewerDialog()->setColorMode( 1 ); | 819 | getEventViewerDialog()->setColorMode( 1 ); |
820 | else | 820 | else |
821 | getEventViewerDialog()->setColorMode( 2 ); | 821 | getEventViewerDialog()->setColorMode( 2 ); |
822 | getEventViewerDialog()->setIncidence(local); | 822 | getEventViewerDialog()->setIncidence(local); |
823 | if ( localIsNew ) | 823 | if ( localIsNew ) |
824 | getEventViewerDialog()->setColorMode( 2 ); | 824 | getEventViewerDialog()->setColorMode( 2 ); |
825 | else | 825 | else |
826 | getEventViewerDialog()->setColorMode( 1 ); | 826 | getEventViewerDialog()->setColorMode( 1 ); |
827 | getEventViewerDialog()->addIncidence(remote); | 827 | getEventViewerDialog()->addIncidence(remote); |
828 | getEventViewerDialog()->setColorMode( 0 ); | 828 | getEventViewerDialog()->setColorMode( 0 ); |
829 | //qDebug("local %d remote %d ",local->relatedTo(),remote->relatedTo() ); | 829 | //qDebug("local %d remote %d ",local->relatedTo(),remote->relatedTo() ); |
830 | getEventViewerDialog()->setCaption( mCurrentSyncDevice +i18n(" : Conflict! Please choose entry!")); | 830 | getEventViewerDialog()->setCaption( mCurrentSyncDevice +i18n(" : Conflict! Please choose entry!")); |
831 | getEventViewerDialog()->showMe(); | 831 | getEventViewerDialog()->showMe(); |
832 | result = getEventViewerDialog()->executeS( localIsNew ); | 832 | result = getEventViewerDialog()->executeS( localIsNew ); |
833 | return result; | 833 | return result; |
834 | 834 | ||
835 | break; | 835 | break; |
836 | case SYNC_PREF_FORCE_LOCAL: | 836 | case SYNC_PREF_FORCE_LOCAL: |
837 | return 1; | 837 | return 1; |
838 | break; | 838 | break; |
839 | case SYNC_PREF_FORCE_REMOTE: | 839 | case SYNC_PREF_FORCE_REMOTE: |
840 | return 2; | 840 | return 2; |
841 | break; | 841 | break; |
842 | 842 | ||
843 | default: | 843 | default: |
844 | // SYNC_PREF_TAKE_BOTH not implemented | 844 | // SYNC_PREF_TAKE_BOTH not implemented |
845 | break; | 845 | break; |
846 | } | 846 | } |
847 | return 0; | 847 | return 0; |
848 | } | 848 | } |
849 | Event* CalendarView::getLastSyncEvent() | 849 | Event* CalendarView::getLastSyncEvent() |
850 | { | 850 | { |
851 | Event* lse; | 851 | Event* lse; |
852 | //qDebug("CurrentSyncDevice %s ",mCurrentSyncDevice .latin1() ); | 852 | //qDebug("CurrentSyncDevice %s ",mCurrentSyncDevice .latin1() ); |
853 | lse = mCalendar->event( "last-syncEvent-"+mCurrentSyncDevice ); | 853 | lse = mCalendar->event( "last-syncEvent-"+mCurrentSyncDevice ); |
854 | if (!lse) { | 854 | if (!lse) { |
855 | lse = new Event(); | 855 | lse = new Event(); |
856 | lse->setUid( "last-syncEvent-"+mCurrentSyncDevice ); | 856 | lse->setUid( "last-syncEvent-"+mCurrentSyncDevice ); |
857 | QString sum = ""; | 857 | QString sum = ""; |
858 | if ( KOPrefs::instance()->mExternSyncProfiles.contains( mCurrentSyncDevice ) ) | 858 | if ( KOPrefs::instance()->mExternSyncProfiles.contains( mCurrentSyncDevice ) ) |
859 | sum = "E: "; | 859 | sum = "E: "; |
860 | lse->setSummary(sum+mCurrentSyncDevice + i18n(" - sync event")); | 860 | lse->setSummary(sum+mCurrentSyncDevice + i18n(" - sync event")); |
861 | lse->setDtStart( mLastCalendarSync ); | 861 | lse->setDtStart( mLastCalendarSync ); |
862 | lse->setDtEnd( mLastCalendarSync.addSecs( 7200 ) ); | 862 | lse->setDtEnd( mLastCalendarSync.addSecs( 7200 ) ); |
863 | lse->setCategories( i18n("SyncEvent") ); | 863 | lse->setCategories( i18n("SyncEvent") ); |
864 | lse->setReadOnly( true ); | 864 | lse->setReadOnly( true ); |
865 | mCalendar->addEvent( lse ); | 865 | mCalendar->addEvent( lse ); |
866 | } | 866 | } |
867 | 867 | ||
868 | return lse; | 868 | return lse; |
869 | 869 | ||
870 | } | 870 | } |
871 | // probaly useless | 871 | // probaly useless |
872 | void CalendarView::setupExternSyncProfiles() | 872 | void CalendarView::setupExternSyncProfiles() |
873 | { | 873 | { |
874 | Event* lse; | 874 | Event* lse; |
875 | mExternLastSyncEvent.clear(); | 875 | mExternLastSyncEvent.clear(); |
876 | int i; | 876 | int i; |
877 | for ( i = 0; i < KOPrefs::instance()->mExternSyncProfiles.count(); ++i ) { | 877 | for ( i = 0; i < KOPrefs::instance()->mExternSyncProfiles.count(); ++i ) { |
878 | lse = mCalendar->event( "last-syncEvent-"+ KOPrefs::instance()->mExternSyncProfiles[i] ); | 878 | lse = mCalendar->event( "last-syncEvent-"+ KOPrefs::instance()->mExternSyncProfiles[i] ); |
879 | if ( lse ) | 879 | if ( lse ) |
880 | mExternLastSyncEvent.append( lse ); | 880 | mExternLastSyncEvent.append( lse ); |
881 | else | 881 | else |
882 | qDebug("Last Sync event not found for %s ", KOPrefs::instance()->mExternSyncProfiles[i].latin1()); | 882 | qDebug("Last Sync event not found for %s ", KOPrefs::instance()->mExternSyncProfiles[i].latin1()); |
883 | } | 883 | } |
884 | 884 | ||
885 | } | 885 | } |
886 | // we check, if the to delete event has a id for a profile | 886 | // we check, if the to delete event has a id for a profile |
887 | // if yes, we set this id in the profile to delete | 887 | // if yes, we set this id in the profile to delete |
888 | void CalendarView::checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* toDelete ) | 888 | void CalendarView::checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* toDelete ) |
889 | { | 889 | { |
890 | if ( ! lastSync.count() == 0 ) | 890 | if ( lastSync.count() == 0 ) { |
891 | //qDebug(" lastSync.count() == 0"); | ||
891 | return; | 892 | return; |
893 | } | ||
892 | if ( toDelete->type() == "Journal" ) | 894 | if ( toDelete->type() == "Journal" ) |
893 | return; | 895 | return; |
894 | 896 | ||
895 | Event* eve = lastSync.first(); | 897 | Event* eve = lastSync.first(); |
896 | 898 | ||
897 | while ( eve ) { | 899 | while ( eve ) { |
898 | QString id = toDelete->getID( eve->uid().mid( 15 ) ); // this is the sync profile name | 900 | QString id = toDelete->getID( eve->uid().mid( 15 ) ); // this is the sync profile name |
899 | if ( !id.isEmpty() ) { | 901 | if ( !id.isEmpty() ) { |
900 | QString des = eve->description(); | 902 | QString des = eve->description(); |
901 | QString pref = "e"; | 903 | QString pref = "e"; |
902 | if ( toDelete->type() == "Todo" ) | 904 | if ( toDelete->type() == "Todo" ) |
903 | pref = "t"; | 905 | pref = "t"; |
904 | des += pref+ id + ","; | 906 | des += pref+ id + ","; |
905 | eve->setReadOnly( false ); | 907 | eve->setReadOnly( false ); |
906 | eve->setDescription( des ); | 908 | eve->setDescription( des ); |
909 | //qDebug("setdes %s ", des.latin1()); | ||
907 | eve->setReadOnly( true ); | 910 | eve->setReadOnly( true ); |
908 | } | 911 | } |
909 | eve = lastSync.next(); | 912 | eve = lastSync.next(); |
910 | } | 913 | } |
911 | 914 | ||
912 | } | 915 | } |
913 | void CalendarView::checkExternalId( Incidence * inc ) | 916 | void CalendarView::checkExternalId( Incidence * inc ) |
914 | { | 917 | { |
915 | QPtrList<Event> lastSync = mCalendar->getExternLastSyncEvents() ; | 918 | QPtrList<Event> lastSync = mCalendar->getExternLastSyncEvents() ; |
916 | checkExternSyncEvent( lastSync, inc ); | 919 | checkExternSyncEvent( lastSync, inc ); |
917 | 920 | ||
918 | } | 921 | } |
919 | bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int mode ) | 922 | bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int mode ) |
920 | { | 923 | { |
921 | bool syncOK = true; | 924 | bool syncOK = true; |
922 | int addedEvent = 0; | 925 | int addedEvent = 0; |
923 | int addedEventR = 0; | 926 | int addedEventR = 0; |
924 | int deletedEventR = 0; | 927 | int deletedEventR = 0; |
925 | int deletedEventL = 0; | 928 | int deletedEventL = 0; |
926 | int changedLocal = 0; | 929 | int changedLocal = 0; |
927 | int changedRemote = 0; | 930 | int changedRemote = 0; |
928 | //QPtrList<Event> el = local->rawEvents(); | 931 | //QPtrList<Event> el = local->rawEvents(); |
929 | Event* eventR; | 932 | Event* eventR; |
930 | QString uid; | 933 | QString uid; |
931 | int take; | 934 | int take; |
932 | Event* eventL; | 935 | Event* eventL; |
933 | Event* eventRSync; | 936 | Event* eventRSync; |
934 | Event* eventLSync; | 937 | Event* eventLSync; |
935 | QPtrList<Event> eventRSyncSharp = remote->getExternLastSyncEvents(); | 938 | QPtrList<Event> eventRSyncSharp = remote->getExternLastSyncEvents(); |
936 | QPtrList<Event> eventLSyncSharp = local->getExternLastSyncEvents(); | 939 | QPtrList<Event> eventLSyncSharp = local->getExternLastSyncEvents(); |
937 | bool fullDateRange = false; | 940 | bool fullDateRange = false; |
938 | mLastCalendarSync = QDateTime::currentDateTime(); | 941 | mLastCalendarSync = QDateTime::currentDateTime(); |
939 | QDateTime modifiedCalendar = mLastCalendarSync;; | 942 | QDateTime modifiedCalendar = mLastCalendarSync;; |
940 | eventR = remote->event("last-syncEvent-"+mCurrentSyncName ); | 943 | eventR = remote->event("last-syncEvent-"+mCurrentSyncName ); |
941 | if ( eventR ) { | 944 | if ( eventR ) { |
942 | eventRSync = (Event*) eventR->clone(); | 945 | eventRSync = (Event*) eventR->clone(); |
943 | remote->deleteEvent(eventR ); | 946 | remote->deleteEvent(eventR ); |
944 | 947 | ||
945 | } else { | 948 | } else { |
946 | fullDateRange = true; | 949 | fullDateRange = true; |
947 | eventRSync = new Event(); | 950 | eventRSync = new Event(); |
948 | eventRSync->setSummary(mCurrentSyncName + i18n(" - sync event")); | 951 | eventRSync->setSummary(mCurrentSyncName + i18n(" - sync event")); |
949 | eventRSync->setUid("last-syncEvent-"+mCurrentSyncName ); | 952 | eventRSync->setUid("last-syncEvent-"+mCurrentSyncName ); |
950 | eventRSync->setDtStart( mLastCalendarSync ); | 953 | eventRSync->setDtStart( mLastCalendarSync ); |
951 | eventRSync->setDtEnd( mLastCalendarSync.addSecs( 7200 ) ); | 954 | eventRSync->setDtEnd( mLastCalendarSync.addSecs( 7200 ) ); |
952 | eventRSync->setCategories( i18n("SyncEvent") ); | 955 | eventRSync->setCategories( i18n("SyncEvent") ); |
953 | } | 956 | } |
954 | eventLSync = getLastSyncEvent(); | 957 | eventLSync = getLastSyncEvent(); |
955 | if ( eventLSync->dtStart() == mLastCalendarSync ) | 958 | if ( eventLSync->dtStart() == mLastCalendarSync ) |
956 | fullDateRange = true; | 959 | fullDateRange = true; |
957 | 960 | ||
958 | if ( ! fullDateRange ) { | 961 | if ( ! fullDateRange ) { |
959 | if ( eventLSync->dtStart() != eventRSync->dtStart() ) { | 962 | if ( eventLSync->dtStart() != eventRSync->dtStart() ) { |
960 | 963 | ||
961 | // qDebug("set fulldate to true %s %s" ,eventLSync->dtStart().toString().latin1(), eventRSync->dtStart().toString().latin1() ); | 964 | // qDebug("set fulldate to true %s %s" ,eventLSync->dtStart().toString().latin1(), eventRSync->dtStart().toString().latin1() ); |
962 | //qDebug("%d %d %d %d ", eventLSync->dtStart().time().second(), eventLSync->dtStart().time().msec() , eventRSync->dtStart().time().second(), eventRSync->dtStart().time().msec()); | 965 | //qDebug("%d %d %d %d ", eventLSync->dtStart().time().second(), eventLSync->dtStart().time().msec() , eventRSync->dtStart().time().second(), eventRSync->dtStart().time().msec()); |
963 | fullDateRange = true; | 966 | fullDateRange = true; |
964 | } | 967 | } |
965 | } | 968 | } |
966 | if ( fullDateRange ) | 969 | if ( fullDateRange ) |
967 | mLastCalendarSync = QDateTime::currentDateTime().addDays( -100*365); | 970 | mLastCalendarSync = QDateTime::currentDateTime().addDays( -100*365); |
968 | else | 971 | else |
969 | mLastCalendarSync = eventLSync->dtStart(); | 972 | mLastCalendarSync = eventLSync->dtStart(); |
970 | // for resyncing if own file has changed | 973 | // for resyncing if own file has changed |
971 | if ( mCurrentSyncDevice == "deleteaftersync" ) { | 974 | if ( mCurrentSyncDevice == "deleteaftersync" ) { |
972 | mLastCalendarSync = loadedFileVersion; | 975 | mLastCalendarSync = loadedFileVersion; |
973 | qDebug("setting mLastCalendarSync "); | 976 | qDebug("setting mLastCalendarSync "); |
974 | } | 977 | } |
975 | //qDebug("*************************** "); | 978 | //qDebug("*************************** "); |
976 | qDebug("mLastCalendarSync %s ",mLastCalendarSync.toString().latin1() ); | 979 | qDebug("mLastCalendarSync %s ",mLastCalendarSync.toString().latin1() ); |
977 | QPtrList<Incidence> er = remote->rawIncidences(); | 980 | QPtrList<Incidence> er = remote->rawIncidences(); |
978 | Incidence* inR = er.first(); | 981 | Incidence* inR = er.first(); |
979 | Incidence* inL; | 982 | Incidence* inL; |
980 | QProgressBar bar( er.count(),0 ); | 983 | QProgressBar bar( er.count(),0 ); |
981 | bar.setCaption (i18n("Syncing - close to abort!") ); | 984 | bar.setCaption (i18n("Syncing - close to abort!") ); |
982 | 985 | ||
983 | int w = 300; | 986 | int w = 300; |
984 | if ( QApplication::desktop()->width() < 320 ) | 987 | if ( QApplication::desktop()->width() < 320 ) |
985 | w = 220; | 988 | w = 220; |
986 | int h = bar.sizeHint().height() ; | 989 | int h = bar.sizeHint().height() ; |
987 | int dw = QApplication::desktop()->width(); | 990 | int dw = QApplication::desktop()->width(); |
988 | int dh = QApplication::desktop()->height(); | 991 | int dh = QApplication::desktop()->height(); |
989 | bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); | 992 | bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); |
990 | bar.show(); | 993 | bar.show(); |
991 | int modulo = (er.count()/10)+1; | 994 | int modulo = (er.count()/10)+1; |
992 | int incCounter = 0; | 995 | int incCounter = 0; |
993 | while ( inR ) { | 996 | while ( inR ) { |
994 | if ( ! bar.isVisible() ) | 997 | if ( ! bar.isVisible() ) |
995 | return false; | 998 | return false; |
996 | if ( incCounter % modulo == 0 ) | 999 | if ( incCounter % modulo == 0 ) |
997 | bar.setProgress( incCounter ); | 1000 | bar.setProgress( incCounter ); |
998 | ++incCounter; | 1001 | ++incCounter; |
999 | uid = inR->uid(); | 1002 | uid = inR->uid(); |
1000 | bool skipIncidence = false; | 1003 | bool skipIncidence = false; |
1001 | if ( uid.left(15) == QString("last-syncEvent-") ) | 1004 | if ( uid.left(15) == QString("last-syncEvent-") ) |
1002 | skipIncidence = true; | 1005 | skipIncidence = true; |
1003 | 1006 | ||
1004 | qApp->processEvents(); | 1007 | qApp->processEvents(); |
1005 | if ( !skipIncidence ) { | 1008 | if ( !skipIncidence ) { |
1006 | inL = local->incidence( uid ); | 1009 | inL = local->incidence( uid ); |
1007 | if ( inL ) { // maybe conflict - same uid in both calendars | 1010 | if ( inL ) { // maybe conflict - same uid in both calendars |
1008 | int maxrev = inL->revision(); | 1011 | int maxrev = inL->revision(); |
1009 | if ( maxrev < inR->revision() ) | 1012 | if ( maxrev < inR->revision() ) |
1010 | maxrev = inR->revision(); | 1013 | maxrev = inR->revision(); |
1011 | if ( (take = takeEvent( inL, inR, mode, fullDateRange )) > 0 ) { | 1014 | if ( (take = takeEvent( inL, inR, mode, fullDateRange )) > 0 ) { |
1012 | //qDebug("take %d %s ", take, inL->summary().latin1()); | 1015 | //qDebug("take %d %s ", take, inL->summary().latin1()); |
1013 | if ( take == 3 ) | 1016 | if ( take == 3 ) |
1014 | return false; | 1017 | return false; |
1015 | if ( take == 1 ) {// take local | 1018 | if ( take == 1 ) {// take local |
1016 | inL->setCsum( mCurrentSyncDevice, inR->getCsum(mCurrentSyncDevice) ); | 1019 | inL->setCsum( mCurrentSyncDevice, inR->getCsum(mCurrentSyncDevice) ); |
1017 | remote->deleteIncidence( inR ); | 1020 | remote->deleteIncidence( inR ); |
1018 | if ( inL->revision() < maxrev ) | 1021 | if ( inL->revision() < maxrev ) |
1019 | inL->setRevision( maxrev ); | 1022 | inL->setRevision( maxrev ); |
1020 | remote->addIncidence( inL->clone() ); | 1023 | remote->addIncidence( inL->clone() ); |
1021 | ++changedRemote; | 1024 | ++changedRemote; |
1022 | } else { | 1025 | } else { |
1023 | if ( inR->revision() < maxrev ) | 1026 | if ( inR->revision() < maxrev ) |
1024 | inR->setRevision( maxrev ); | 1027 | inR->setRevision( maxrev ); |
1025 | local->deleteIncidence( inL ); | 1028 | local->deleteIncidence( inL ); |
1026 | local->addIncidence( inR->clone() ); | 1029 | local->addIncidence( inR->clone() ); |
1027 | ++changedLocal; | 1030 | ++changedLocal; |
1028 | } | 1031 | } |
1029 | } | 1032 | } |
1030 | } else { // no conflict | 1033 | } else { // no conflict |
1031 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 1034 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
1032 | QString des = eventLSync->description(); | 1035 | QString des = eventLSync->description(); |
1033 | QString pref = "e"; | 1036 | QString pref = "e"; |
1034 | if ( inR->type() == "Todo" ) | 1037 | if ( inR->type() == "Todo" ) |
1035 | pref = "t"; | 1038 | pref = "t"; |
1036 | if ( des.find(pref+ inR->getID(mCurrentSyncDevice) +"," ) >= 0 && mode != 5) { // delete it | 1039 | if ( des.find(pref+ inR->getID(mCurrentSyncDevice) +"," ) >= 0 && mode != 5) { // delete it |
1037 | inR->setTempSyncStat( SYNC_TEMPSTATE_DELETE ); | 1040 | inR->setTempSyncStat( SYNC_TEMPSTATE_DELETE ); |
1038 | //remote->deleteIncidence( inR ); | 1041 | //remote->deleteIncidence( inR ); |
1039 | ++deletedEventR; | 1042 | ++deletedEventR; |
1040 | } else { | 1043 | } else { |
1041 | inR->setLastModified( modifiedCalendar ); | 1044 | inR->setLastModified( modifiedCalendar ); |
1042 | local->addIncidence( inR->clone() ); | 1045 | local->addIncidence( inR->clone() ); |
1043 | ++addedEvent; | 1046 | ++addedEvent; |
1044 | } | 1047 | } |
1045 | } else { | 1048 | } else { |
1046 | if ( inR->lastModified() > mLastCalendarSync || mode == 5 ) { | 1049 | if ( inR->lastModified() > mLastCalendarSync || mode == 5 ) { |
1047 | inR->setLastModified( modifiedCalendar ); | 1050 | inR->setLastModified( modifiedCalendar ); |
1048 | local->addIncidence( inR->clone() ); | 1051 | local->addIncidence( inR->clone() ); |
1049 | ++addedEvent; | 1052 | ++addedEvent; |
1050 | } else { | 1053 | } else { |
1051 | checkExternSyncEvent(eventRSyncSharp, inR); | 1054 | checkExternSyncEvent(eventRSyncSharp, inR); |
1052 | remote->deleteIncidence( inR ); | 1055 | remote->deleteIncidence( inR ); |
1053 | ++deletedEventR; | 1056 | ++deletedEventR; |
1054 | } | 1057 | } |
1055 | } | 1058 | } |
1056 | } | 1059 | } |
1057 | } | 1060 | } |
1058 | inR = er.next(); | 1061 | inR = er.next(); |
1059 | } | 1062 | } |
1060 | QPtrList<Incidence> el = local->rawIncidences(); | 1063 | QPtrList<Incidence> el = local->rawIncidences(); |
1061 | inL = el.first(); | 1064 | inL = el.first(); |
1062 | modulo = (el.count()/10)+1; | 1065 | modulo = (el.count()/10)+1; |
1063 | bar.setCaption (i18n("Add / remove events") ); | 1066 | bar.setCaption (i18n("Add / remove events") ); |
1064 | bar.setTotalSteps ( el.count() ) ; | 1067 | bar.setTotalSteps ( el.count() ) ; |
1065 | bar.show(); | 1068 | bar.show(); |
1066 | incCounter = 0; | 1069 | incCounter = 0; |
1067 | 1070 | ||
1068 | while ( inL ) { | 1071 | while ( inL ) { |
1069 | 1072 | ||
1070 | qApp->processEvents(); | 1073 | qApp->processEvents(); |
1071 | if ( ! bar.isVisible() ) | 1074 | if ( ! bar.isVisible() ) |
1072 | return false; | 1075 | return false; |
1073 | if ( incCounter % modulo == 0 ) | 1076 | if ( incCounter % modulo == 0 ) |
1074 | bar.setProgress( incCounter ); | 1077 | bar.setProgress( incCounter ); |
1075 | ++incCounter; | 1078 | ++incCounter; |
1076 | uid = inL->uid(); | 1079 | uid = inL->uid(); |
1077 | bool skipIncidence = false; | 1080 | bool skipIncidence = false; |
1078 | if ( uid.left(15) == QString("last-syncEvent-") ) | 1081 | if ( uid.left(15) == QString("last-syncEvent-") ) |
1079 | skipIncidence = true; | 1082 | skipIncidence = true; |
1080 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL && inL->type() == "Journal" ) | 1083 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL && inL->type() == "Journal" ) |
1081 | skipIncidence = true; | 1084 | skipIncidence = true; |
1082 | if ( !skipIncidence ) { | 1085 | if ( !skipIncidence ) { |
1083 | inR = remote->incidence( uid ); | 1086 | inR = remote->incidence( uid ); |
1084 | if ( ! inR ) { | 1087 | if ( ! inR ) { |
1085 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 1088 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
1086 | if ( !inL->getID(mCurrentSyncDevice).isEmpty() && mode != 4 ) { | 1089 | if ( !inL->getID(mCurrentSyncDevice).isEmpty() && mode != 4 ) { |
1087 | local->deleteIncidence( inL ); | 1090 | local->deleteIncidence( inL ); |
1088 | ++deletedEventL; | 1091 | ++deletedEventL; |
1089 | } else { | 1092 | } else { |
1090 | if ( ! KOPrefs::instance()->mWriteBackExistingOnly ) { | 1093 | if ( ! KOPrefs::instance()->mWriteBackExistingOnly ) { |
1091 | inL->removeID(mCurrentSyncDevice ); | 1094 | inL->removeID(mCurrentSyncDevice ); |
1092 | ++addedEventR; | 1095 | ++addedEventR; |
1093 | inL->setLastModified( modifiedCalendar ); | 1096 | inL->setLastModified( modifiedCalendar ); |
1094 | remote->addIncidence( inL->clone() ); | 1097 | remote->addIncidence( inL->clone() ); |
1095 | } | 1098 | } |
1096 | } | 1099 | } |
1097 | } else { | 1100 | } else { |
1098 | if ( inL->lastModified() < mLastCalendarSync && mode != 4 ) { | 1101 | if ( inL->lastModified() < mLastCalendarSync && mode != 4 ) { |
1099 | checkExternSyncEvent(eventLSyncSharp, inL); | 1102 | checkExternSyncEvent(eventLSyncSharp, inL); |
1100 | local->deleteIncidence( inL ); | 1103 | local->deleteIncidence( inL ); |
1101 | ++deletedEventL; | 1104 | ++deletedEventL; |
1102 | } else { | 1105 | } else { |
1103 | if ( ! KOPrefs::instance()->mWriteBackExistingOnly ) { | 1106 | if ( ! KOPrefs::instance()->mWriteBackExistingOnly ) { |
1104 | ++addedEventR; | 1107 | ++addedEventR; |
1105 | inL->setLastModified( modifiedCalendar ); | 1108 | inL->setLastModified( modifiedCalendar ); |
1106 | remote->addIncidence( inL->clone() ); | 1109 | remote->addIncidence( inL->clone() ); |
1107 | } | 1110 | } |
1108 | } | 1111 | } |
1109 | } | 1112 | } |
1110 | } | 1113 | } |
1111 | } | 1114 | } |
1112 | inL = el.next(); | 1115 | inL = el.next(); |
1113 | } | 1116 | } |
1114 | 1117 | ||
1115 | bar.hide(); | 1118 | bar.hide(); |
1116 | mLastCalendarSync = QDateTime::currentDateTime().addSecs( 1 ); | 1119 | mLastCalendarSync = QDateTime::currentDateTime().addSecs( 1 ); |
1117 | eventLSync->setReadOnly( false ); | 1120 | eventLSync->setReadOnly( false ); |
1118 | eventLSync->setDtStart( mLastCalendarSync ); | 1121 | eventLSync->setDtStart( mLastCalendarSync ); |
1119 | eventRSync->setDtStart( mLastCalendarSync ); | 1122 | eventRSync->setDtStart( mLastCalendarSync ); |
1120 | eventLSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) ); | 1123 | eventLSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) ); |
1121 | eventRSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) ); | 1124 | eventRSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) ); |
1122 | eventRSync->setLocation( i18n("Remote from: ")+mCurrentSyncName ) ; | 1125 | eventRSync->setLocation( i18n("Remote from: ")+mCurrentSyncName ) ; |
1123 | eventLSync->setLocation(i18n("Local from: ") + mCurrentSyncName ); | 1126 | eventLSync->setLocation(i18n("Local from: ") + mCurrentSyncName ); |
1124 | eventLSync->setReadOnly( true ); | 1127 | eventLSync->setReadOnly( true ); |
1125 | if ( mGlobalSyncMode == SYNC_MODE_NORMAL) | 1128 | if ( mGlobalSyncMode == SYNC_MODE_NORMAL) |
1126 | remote->addEvent( eventRSync ); | 1129 | remote->addEvent( eventRSync ); |
1127 | QString mes; | 1130 | QString mes; |
1128 | mes .sprintf( i18n("Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n"),addedEvent, addedEventR, changedLocal, changedRemote, deletedEventL, deletedEventR ); | 1131 | mes .sprintf( i18n("Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n"),addedEvent, addedEventR, changedLocal, changedRemote, deletedEventL, deletedEventR ); |
1129 | if ( KOPrefs::instance()->mShowSyncSummary ) { | 1132 | if ( KOPrefs::instance()->mShowSyncSummary ) { |
1130 | KMessageBox::information(this, mes, i18n("KO/Pi Synchronization") ); | 1133 | KMessageBox::information(this, mes, i18n("KO/Pi Synchronization") ); |
1131 | } | 1134 | } |
1132 | qDebug( mes ); | 1135 | qDebug( mes ); |
1133 | mCalendar->checkAlarmForIncidence( 0, true ); | 1136 | mCalendar->checkAlarmForIncidence( 0, true ); |
1134 | return syncOK; | 1137 | return syncOK; |
1135 | } | 1138 | } |
1136 | 1139 | ||
1137 | void CalendarView::setSyncDevice( QString s ) | 1140 | void CalendarView::setSyncDevice( QString s ) |
1138 | { | 1141 | { |
1139 | mCurrentSyncDevice= s; | 1142 | mCurrentSyncDevice= s; |
1140 | } | 1143 | } |
1141 | void CalendarView::setSyncName( QString s ) | 1144 | void CalendarView::setSyncName( QString s ) |
1142 | { | 1145 | { |
1143 | mCurrentSyncName= s; | 1146 | mCurrentSyncName= s; |
1144 | } | 1147 | } |
1145 | bool CalendarView::syncCalendar(QString filename, int mode) | 1148 | bool CalendarView::syncCalendar(QString filename, int mode) |
1146 | { | 1149 | { |
1147 | mGlobalSyncMode = SYNC_MODE_NORMAL; | 1150 | mGlobalSyncMode = SYNC_MODE_NORMAL; |
1148 | CalendarLocal* calendar = new CalendarLocal(); | 1151 | CalendarLocal* calendar = new CalendarLocal(); |
1149 | calendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId); | 1152 | calendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId); |
1150 | FileStorage* storage = new FileStorage( calendar ); | 1153 | FileStorage* storage = new FileStorage( calendar ); |
1151 | bool syncOK = false; | 1154 | bool syncOK = false; |
1152 | storage->setFileName( filename ); | 1155 | storage->setFileName( filename ); |
1153 | // qDebug("loading ... "); | 1156 | // qDebug("loading ... "); |
1154 | if ( storage->load(KOPrefs::instance()->mUseQuicksave) ) { | 1157 | if ( storage->load(KOPrefs::instance()->mUseQuicksave) ) { |
1155 | getEventViewerDialog()->setSyncMode( true ); | 1158 | getEventViewerDialog()->setSyncMode( true ); |
1156 | syncOK = synchronizeCalendar( mCalendar, calendar, mode ); | 1159 | syncOK = synchronizeCalendar( mCalendar, calendar, mode ); |
1157 | getEventViewerDialog()->setSyncMode( false ); | 1160 | getEventViewerDialog()->setSyncMode( false ); |
1158 | if ( syncOK ) { | 1161 | if ( syncOK ) { |
1159 | if ( KOPrefs::instance()->mWriteBackFile ) | 1162 | if ( KOPrefs::instance()->mWriteBackFile ) |
1160 | { | 1163 | { |
1161 | storage->setSaveFormat( new ICalFormat( KOPrefs::instance()->mUseQuicksave) ); | 1164 | storage->setSaveFormat( new ICalFormat( KOPrefs::instance()->mUseQuicksave) ); |
1162 | storage->save(); | 1165 | storage->save(); |
diff --git a/libkcal/sharpformat.cpp b/libkcal/sharpformat.cpp index ebfe164..4e54fdf 100644 --- a/libkcal/sharpformat.cpp +++ b/libkcal/sharpformat.cpp | |||
@@ -105,513 +105,513 @@ class SharpParser : public QObject | |||
105 | event->setFloats( false ); | 105 | event->setFloats( false ); |
106 | event->setDtStart( fromString( attList[5] ) ); | 106 | event->setDtStart( fromString( attList[5] ) ); |
107 | event->setDtEnd( fromString( attList[6] )); | 107 | event->setDtEnd( fromString( attList[6] )); |
108 | } | 108 | } |
109 | 109 | ||
110 | QString rtype = attList[11]; | 110 | QString rtype = attList[11]; |
111 | if ( rtype != "255" ) { | 111 | if ( rtype != "255" ) { |
112 | // qDebug("recurs "); | 112 | // qDebug("recurs "); |
113 | QDate startDate = event->dtStart().date(); | 113 | QDate startDate = event->dtStart().date(); |
114 | 114 | ||
115 | QString freqStr = attList[12]; | 115 | QString freqStr = attList[12]; |
116 | int freq = freqStr.toInt(); | 116 | int freq = freqStr.toInt(); |
117 | 117 | ||
118 | QString hasEndDateStr = attList[15] ; | 118 | QString hasEndDateStr = attList[15] ; |
119 | bool hasEndDate = hasEndDateStr == "1"; | 119 | bool hasEndDate = hasEndDateStr == "1"; |
120 | 120 | ||
121 | QString endDateStr = attList[16]; | 121 | QString endDateStr = attList[16]; |
122 | QDate endDate = fromString( endDateStr ).date(); | 122 | QDate endDate = fromString( endDateStr ).date(); |
123 | 123 | ||
124 | QString weekDaysStr = attList[14]; | 124 | QString weekDaysStr = attList[14]; |
125 | uint weekDaysNum = weekDaysStr.toInt(); | 125 | uint weekDaysNum = weekDaysStr.toInt(); |
126 | 126 | ||
127 | QBitArray weekDays( 7 ); | 127 | QBitArray weekDays( 7 ); |
128 | int i; | 128 | int i; |
129 | int bb = 1; | 129 | int bb = 1; |
130 | for( i = 1; i <= 7; ++i ) { | 130 | for( i = 1; i <= 7; ++i ) { |
131 | weekDays.setBit( i - 1, ( bb & weekDaysNum )); | 131 | weekDays.setBit( i - 1, ( bb & weekDaysNum )); |
132 | bb = 2 << (i-1); | 132 | bb = 2 << (i-1); |
133 | //qDebug(" %d bit %d ",i-1,weekDays.at(i-1) ); | 133 | //qDebug(" %d bit %d ",i-1,weekDays.at(i-1) ); |
134 | } | 134 | } |
135 | // qDebug("next "); | 135 | // qDebug("next "); |
136 | QString posStr = attList[13]; | 136 | QString posStr = attList[13]; |
137 | int pos = posStr.toInt(); | 137 | int pos = posStr.toInt(); |
138 | Recurrence *r = event->recurrence(); | 138 | Recurrence *r = event->recurrence(); |
139 | 139 | ||
140 | if ( rtype == "0" ) { | 140 | if ( rtype == "0" ) { |
141 | if ( hasEndDate ) r->setDaily( freq, endDate ); | 141 | if ( hasEndDate ) r->setDaily( freq, endDate ); |
142 | else r->setDaily( freq, -1 ); | 142 | else r->setDaily( freq, -1 ); |
143 | } else if ( rtype == "1" ) { | 143 | } else if ( rtype == "1" ) { |
144 | if ( hasEndDate ) r->setWeekly( freq, weekDays, endDate ); | 144 | if ( hasEndDate ) r->setWeekly( freq, weekDays, endDate ); |
145 | else r->setWeekly( freq, weekDays, -1 ); | 145 | else r->setWeekly( freq, weekDays, -1 ); |
146 | } else if ( rtype == "3" ) { | 146 | } else if ( rtype == "3" ) { |
147 | if ( hasEndDate ) | 147 | if ( hasEndDate ) |
148 | r->setMonthly( Recurrence::rMonthlyDay, freq, endDate ); | 148 | r->setMonthly( Recurrence::rMonthlyDay, freq, endDate ); |
149 | else | 149 | else |
150 | r->setMonthly( Recurrence::rMonthlyDay, freq, -1 ); | 150 | r->setMonthly( Recurrence::rMonthlyDay, freq, -1 ); |
151 | r->addMonthlyDay( startDate.day() ); | 151 | r->addMonthlyDay( startDate.day() ); |
152 | } else if ( rtype == "2" ) { | 152 | } else if ( rtype == "2" ) { |
153 | if ( hasEndDate ) | 153 | if ( hasEndDate ) |
154 | r->setMonthly( Recurrence::rMonthlyPos, freq, endDate ); | 154 | r->setMonthly( Recurrence::rMonthlyPos, freq, endDate ); |
155 | else | 155 | else |
156 | r->setMonthly( Recurrence::rMonthlyPos, freq, -1 ); | 156 | r->setMonthly( Recurrence::rMonthlyPos, freq, -1 ); |
157 | QBitArray days( 7 ); | 157 | QBitArray days( 7 ); |
158 | days.fill( false ); | 158 | days.fill( false ); |
159 | days.setBit( startDate.dayOfWeek() - 1 ); | 159 | days.setBit( startDate.dayOfWeek() - 1 ); |
160 | r->addMonthlyPos( pos, days ); | 160 | r->addMonthlyPos( pos, days ); |
161 | } else if ( rtype == "4" ) { | 161 | } else if ( rtype == "4" ) { |
162 | if ( hasEndDate ) | 162 | if ( hasEndDate ) |
163 | r->setYearly( Recurrence::rYearlyMonth, freq, endDate ); | 163 | r->setYearly( Recurrence::rYearlyMonth, freq, endDate ); |
164 | else | 164 | else |
165 | r->setYearly( Recurrence::rYearlyMonth, freq, -1 ); | 165 | r->setYearly( Recurrence::rYearlyMonth, freq, -1 ); |
166 | r->addYearlyNum( startDate.month() ); | 166 | r->addYearlyNum( startDate.month() ); |
167 | } | 167 | } |
168 | } | 168 | } |
169 | 169 | ||
170 | QString categoryList = attList[1] ; | 170 | QString categoryList = attList[1] ; |
171 | event->setCategories( lookupCategories( categoryList ) ); | 171 | event->setCategories( lookupCategories( categoryList ) ); |
172 | 172 | ||
173 | // strange 0 semms to mean: alarm enabled | 173 | // strange 0 semms to mean: alarm enabled |
174 | if ( attList[8] == "0" ) { | 174 | if ( attList[8] == "0" ) { |
175 | Alarm *alarm; | 175 | Alarm *alarm; |
176 | if ( event->alarms().count() > 0 ) | 176 | if ( event->alarms().count() > 0 ) |
177 | alarm = event->alarms().first(); | 177 | alarm = event->alarms().first(); |
178 | else { | 178 | else { |
179 | alarm = new Alarm( event ); | 179 | alarm = new Alarm( event ); |
180 | event->addAlarm( alarm ); | 180 | event->addAlarm( alarm ); |
181 | } | 181 | } |
182 | alarm->setType( Alarm::Audio ); | 182 | alarm->setType( Alarm::Audio ); |
183 | alarm->setEnabled( true ); | 183 | alarm->setEnabled( true ); |
184 | int alarmOffset = attList[9].toInt(); | 184 | int alarmOffset = attList[9].toInt(); |
185 | alarm->setStartOffset( alarmOffset * -60 ); | 185 | alarm->setStartOffset( alarmOffset * -60 ); |
186 | } | 186 | } |
187 | 187 | ||
188 | mCalendar->addEvent( event); | 188 | mCalendar->addEvent( event); |
189 | } else if ( qName == "Todo" ) { | 189 | } else if ( qName == "Todo" ) { |
190 | Todo *todo; | 190 | Todo *todo; |
191 | 191 | ||
192 | todo = existingCalendar->todo( "Sharp_DTM", attList[0] ); | 192 | todo = existingCalendar->todo( "Sharp_DTM", attList[0] ); |
193 | if (todo ) | 193 | if (todo ) |
194 | todo = (Todo*)todo->clone(); | 194 | todo = (Todo*)todo->clone(); |
195 | else | 195 | else |
196 | todo = new Todo; | 196 | todo = new Todo; |
197 | 197 | ||
198 | //CARDID,CATEGORY,ETDY,LTDY,FNDY,MARK,PRTY,TITL,MEM1 | 198 | //CARDID,CATEGORY,ETDY,LTDY,FNDY,MARK,PRTY,TITL,MEM1 |
199 | // 0 1 2 3 4 5 6 7 8 | 199 | // 0 1 2 3 4 5 6 7 8 |
200 | //1,,,,,1,4,Loch zumachen,"" | 200 | //1,,,,,1,4,Loch zumachen,"" |
201 | //3,Privat,20040317T000000,20040318T000000,20040319T000000,0,5,Call bbb,"notes123 bbb gggg ""bb "" " | 201 | //3,Privat,20040317T000000,20040318T000000,20040319T000000,0,5,Call bbb,"notes123 bbb gggg ""bb "" " |
202 | //2,"Familie,Freunde,Holiday",20040318T000000,20040324T000000,20040317T000000,1,2,tod2,notes | 202 | //2,"Familie,Freunde,Holiday",20040318T000000,20040324T000000,20040317T000000,1,2,tod2,notes |
203 | 203 | ||
204 | todo->setID( "Sharp_DTM", attList[0]); | 204 | todo->setID( "Sharp_DTM", attList[0]); |
205 | todo->setCsum( "Sharp_DTM", QString::number( cSum )); | 205 | todo->setCsum( "Sharp_DTM", QString::number( cSum )); |
206 | todo->setTempSyncStat( SYNC_TEMPSTATE_NEW_EXTERNAL ); | 206 | todo->setTempSyncStat( SYNC_TEMPSTATE_NEW_EXTERNAL ); |
207 | 207 | ||
208 | todo->setSummary( attList[7] ); | 208 | todo->setSummary( attList[7] ); |
209 | todo->setDescription( attList[8]); | 209 | todo->setDescription( attList[8]); |
210 | 210 | ||
211 | int priority = attList[6].toInt(); | 211 | int priority = attList[6].toInt(); |
212 | if ( priority == 0 ) priority = 3; | 212 | if ( priority == 0 ) priority = 3; |
213 | todo->setPriority( priority ); | 213 | todo->setPriority( priority ); |
214 | 214 | ||
215 | QString categoryList = attList[1]; | 215 | QString categoryList = attList[1]; |
216 | todo->setCategories( lookupCategories( categoryList ) ); | 216 | todo->setCategories( lookupCategories( categoryList ) ); |
217 | 217 | ||
218 | 218 | ||
219 | 219 | ||
220 | QString hasDateStr = attList[3]; // due | 220 | QString hasDateStr = attList[3]; // due |
221 | if ( !hasDateStr.isEmpty() ) { | 221 | if ( !hasDateStr.isEmpty() ) { |
222 | if ( hasDateStr.right(6) == "000000" ) { | 222 | if ( hasDateStr.right(6) == "000000" ) { |
223 | todo->setDtDue( QDateTime(fromString( hasDateStr, false ).date(), QTime(0,0,0 )) ); | 223 | todo->setDtDue( QDateTime(fromString( hasDateStr, false ).date(), QTime(0,0,0 )) ); |
224 | todo->setFloats( true ); | 224 | todo->setFloats( true ); |
225 | } | 225 | } |
226 | else { | 226 | else { |
227 | todo->setDtDue( fromString( hasDateStr ) ); | 227 | todo->setDtDue( fromString( hasDateStr ) ); |
228 | todo->setFloats( false ); | 228 | todo->setFloats( false ); |
229 | } | 229 | } |
230 | 230 | ||
231 | todo->setHasDueDate( true ); | 231 | todo->setHasDueDate( true ); |
232 | } | 232 | } |
233 | hasDateStr = attList[2];//start | 233 | hasDateStr = attList[2];//start |
234 | if ( !hasDateStr.isEmpty() ) { | 234 | if ( !hasDateStr.isEmpty() ) { |
235 | 235 | ||
236 | todo->setDtStart( fromString( hasDateStr ) ); | 236 | todo->setDtStart( fromString( hasDateStr ) ); |
237 | todo->setHasStartDate( true); | 237 | todo->setHasStartDate( true); |
238 | } else | 238 | } else |
239 | todo->setHasStartDate( false ); | 239 | todo->setHasStartDate( false ); |
240 | hasDateStr = attList[4];//completed | 240 | hasDateStr = attList[4];//completed |
241 | if ( !hasDateStr.isEmpty() ) { | 241 | if ( !hasDateStr.isEmpty() ) { |
242 | todo->setCompleted(fromString( hasDateStr ) ); | 242 | todo->setCompleted(fromString( hasDateStr ) ); |
243 | } | 243 | } |
244 | QString completedStr = attList[5]; | 244 | QString completedStr = attList[5]; |
245 | if ( completedStr == "0" ) | 245 | if ( completedStr == "0" ) |
246 | todo->setCompleted( true ); | 246 | todo->setCompleted( true ); |
247 | else | 247 | else |
248 | todo->setCompleted( false ); | 248 | todo->setCompleted( false ); |
249 | mCalendar->addTodo( todo ); | 249 | mCalendar->addTodo( todo ); |
250 | 250 | ||
251 | } else if ( qName == "Category" ) { | 251 | } else if ( qName == "Category" ) { |
252 | /* | 252 | /* |
253 | QString id = attributes.value( "id" ); | 253 | QString id = attributes.value( "id" ); |
254 | QString name = attributes.value( "name" ); | 254 | QString name = attributes.value( "name" ); |
255 | setCategory( id, name ); | 255 | setCategory( id, name ); |
256 | */ | 256 | */ |
257 | } | 257 | } |
258 | //qDebug("end "); | 258 | //qDebug("end "); |
259 | return true; | 259 | return true; |
260 | } | 260 | } |
261 | 261 | ||
262 | 262 | ||
263 | void setCategoriesList ( QStringList * c ) | 263 | void setCategoriesList ( QStringList * c ) |
264 | { | 264 | { |
265 | oldCategories = c; | 265 | oldCategories = c; |
266 | } | 266 | } |
267 | 267 | ||
268 | QDateTime fromString ( QString s, bool useTz = true ) { | 268 | QDateTime fromString ( QString s, bool useTz = true ) { |
269 | QDateTime dt; | 269 | QDateTime dt; |
270 | int y,m,t,h,min,sec; | 270 | int y,m,t,h,min,sec; |
271 | y = s.mid(0,4).toInt(); | 271 | y = s.mid(0,4).toInt(); |
272 | m = s.mid(4,2).toInt(); | 272 | m = s.mid(4,2).toInt(); |
273 | t = s.mid(6,2).toInt(); | 273 | t = s.mid(6,2).toInt(); |
274 | h = s.mid(9,2).toInt(); | 274 | h = s.mid(9,2).toInt(); |
275 | min = s.mid(11,2).toInt(); | 275 | min = s.mid(11,2).toInt(); |
276 | sec = s.mid(13,2).toInt(); | 276 | sec = s.mid(13,2).toInt(); |
277 | dt = QDateTime(QDate(y,m,t), QTime(h,min,sec)); | 277 | dt = QDateTime(QDate(y,m,t), QTime(h,min,sec)); |
278 | int offset = KGlobal::locale()->localTimeOffset( dt ); | 278 | int offset = KGlobal::locale()->localTimeOffset( dt ); |
279 | if ( useTz ) | 279 | if ( useTz ) |
280 | dt = dt.addSecs ( offset*60); | 280 | dt = dt.addSecs ( offset*60); |
281 | return dt; | 281 | return dt; |
282 | 282 | ||
283 | } | 283 | } |
284 | protected: | 284 | protected: |
285 | QDateTime toDateTime( const QString &value ) | 285 | QDateTime toDateTime( const QString &value ) |
286 | { | 286 | { |
287 | QDateTime dt; | 287 | QDateTime dt; |
288 | dt.setTime_t( value.toUInt() ); | 288 | dt.setTime_t( value.toUInt() ); |
289 | 289 | ||
290 | return dt; | 290 | return dt; |
291 | } | 291 | } |
292 | 292 | ||
293 | QStringList lookupCategories( const QString &categoryList ) | 293 | QStringList lookupCategories( const QString &categoryList ) |
294 | { | 294 | { |
295 | QStringList categoryIds = QStringList::split( ";", categoryList ); | 295 | QStringList categoryIds = QStringList::split( ";", categoryList ); |
296 | QStringList categories; | 296 | QStringList categories; |
297 | QStringList::ConstIterator it; | 297 | QStringList::ConstIterator it; |
298 | for( it = categoryIds.begin(); it != categoryIds.end(); ++it ) { | 298 | for( it = categoryIds.begin(); it != categoryIds.end(); ++it ) { |
299 | QString cate = category( *it ); | 299 | QString cate = category( *it ); |
300 | if ( oldCategories ) { | 300 | if ( oldCategories ) { |
301 | if ( ! oldCategories->contains( cate ) ) | 301 | if ( ! oldCategories->contains( cate ) ) |
302 | oldCategories->append( cate ); | 302 | oldCategories->append( cate ); |
303 | } | 303 | } |
304 | categories.append(cate ); | 304 | categories.append(cate ); |
305 | } | 305 | } |
306 | return categories; | 306 | return categories; |
307 | } | 307 | } |
308 | 308 | ||
309 | private: | 309 | private: |
310 | Calendar *mCalendar; | 310 | Calendar *mCalendar; |
311 | QStringList * oldCategories; | 311 | QStringList * oldCategories; |
312 | static QString category( const QString &id ) | 312 | static QString category( const QString &id ) |
313 | { | 313 | { |
314 | QMap<QString,QString>::ConstIterator it = mCategoriesMap.find( id ); | 314 | QMap<QString,QString>::ConstIterator it = mCategoriesMap.find( id ); |
315 | if ( it == mCategoriesMap.end() ) return id; | 315 | if ( it == mCategoriesMap.end() ) return id; |
316 | else return *it; | 316 | else return *it; |
317 | } | 317 | } |
318 | 318 | ||
319 | static void setCategory( const QString &id, const QString &name ) | 319 | static void setCategory( const QString &id, const QString &name ) |
320 | { | 320 | { |
321 | mCategoriesMap.insert( id, name ); | 321 | mCategoriesMap.insert( id, name ); |
322 | } | 322 | } |
323 | 323 | ||
324 | static QMap<QString,QString> mCategoriesMap; | 324 | static QMap<QString,QString> mCategoriesMap; |
325 | }; | 325 | }; |
326 | 326 | ||
327 | QMap<QString,QString> SharpParser::mCategoriesMap; | 327 | QMap<QString,QString> SharpParser::mCategoriesMap; |
328 | 328 | ||
329 | SharpFormat::SharpFormat() | 329 | SharpFormat::SharpFormat() |
330 | { | 330 | { |
331 | mCategories = 0; | 331 | mCategories = 0; |
332 | } | 332 | } |
333 | 333 | ||
334 | SharpFormat::~SharpFormat() | 334 | SharpFormat::~SharpFormat() |
335 | { | 335 | { |
336 | } | 336 | } |
337 | ulong SharpFormat::getCsum( const QStringList & attList) | 337 | ulong SharpFormat::getCsum( const QStringList & attList) |
338 | { | 338 | { |
339 | int max = attList.count() -1; | 339 | int max = attList.count() -1; |
340 | ulong cSum = 0; | 340 | ulong cSum = 0; |
341 | int j,k,i; | 341 | int j,k,i; |
342 | int add; | 342 | int add; |
343 | for ( i = 1; i < max ; ++i ) { | 343 | for ( i = 1; i < max ; ++i ) { |
344 | QString s = attList[i]; | 344 | QString s = attList[i]; |
345 | if ( ! s.isEmpty() ){ | 345 | if ( ! s.isEmpty() ){ |
346 | j = s.length(); | 346 | j = s.length(); |
347 | for ( k = 0; k < j; ++k ) { | 347 | for ( k = 0; k < j; ++k ) { |
348 | int mul = k +1; | 348 | int mul = k +1; |
349 | add = s[k].unicode (); | 349 | add = s[k].unicode (); |
350 | if ( k < 16 ) | 350 | if ( k < 16 ) |
351 | mul = mul * mul; | 351 | mul = mul * mul; |
352 | add = add * mul *i*i*i; | 352 | add = add * mul *i*i*i; |
353 | cSum += add; | 353 | cSum += add; |
354 | } | 354 | } |
355 | } | 355 | } |
356 | } | 356 | } |
357 | return cSum; | 357 | return cSum; |
358 | 358 | ||
359 | } | 359 | } |
360 | #include <stdlib.h> | 360 | #include <stdlib.h> |
361 | #define DEBUGMODE true | 361 | #define DEBUGMODE false |
362 | bool SharpFormat::load( Calendar *calendar, Calendar *existngCal ) | 362 | bool SharpFormat::load( Calendar *calendar, Calendar *existngCal ) |
363 | { | 363 | { |
364 | 364 | ||
365 | 365 | ||
366 | bool debug = DEBUGMODE; | 366 | bool debug = DEBUGMODE; |
367 | //debug = true; | 367 | //debug = true; |
368 | QString text; | 368 | QString text; |
369 | QString codec = "utf8"; | 369 | QString codec = "utf8"; |
370 | QLabel status ( i18n("Reading events ..."), 0 ); | 370 | QLabel status ( i18n("Reading events ..."), 0 ); |
371 | 371 | ||
372 | int w = status.sizeHint().width()+20 ; | 372 | int w = status.sizeHint().width()+20 ; |
373 | if ( w < 200 ) w = 200; | 373 | if ( w < 200 ) w = 200; |
374 | int h = status.sizeHint().height()+20 ; | 374 | int h = status.sizeHint().height()+20 ; |
375 | int dw = QApplication::desktop()->width(); | 375 | int dw = QApplication::desktop()->width(); |
376 | int dh = QApplication::desktop()->height(); | 376 | int dh = QApplication::desktop()->height(); |
377 | status.setCaption(i18n("Reading DTM Data") ); | 377 | status.setCaption(i18n("Reading DTM Data") ); |
378 | status.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); | 378 | status.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); |
379 | status.show(); | 379 | status.show(); |
380 | status.raise(); | 380 | status.raise(); |
381 | qApp->processEvents(); | 381 | qApp->processEvents(); |
382 | QString fileName; | 382 | QString fileName; |
383 | if ( ! debug ) { | 383 | if ( ! debug ) { |
384 | fileName = "/tmp/kopitempout"; | 384 | fileName = "/tmp/kopitempout"; |
385 | QString command ="db2file datebook -r -c "+ codec + " > " + fileName; | 385 | QString command ="db2file datebook -r -c "+ codec + " > " + fileName; |
386 | system ( command.latin1() ); | 386 | system ( command.latin1() ); |
387 | } else { | 387 | } else { |
388 | fileName = "/tmp/events.txt"; | 388 | fileName = "/tmp/events.txt"; |
389 | 389 | ||
390 | } | 390 | } |
391 | QFile file( fileName ); | 391 | QFile file( fileName ); |
392 | if (!file.open( IO_ReadOnly ) ) { | 392 | if (!file.open( IO_ReadOnly ) ) { |
393 | return false; | 393 | return false; |
394 | 394 | ||
395 | } | 395 | } |
396 | QTextStream ts( &file ); | 396 | QTextStream ts( &file ); |
397 | ts.setCodec( QTextCodec::codecForName("utf8") ); | 397 | ts.setCodec( QTextCodec::codecForName("utf8") ); |
398 | text = ts.read(); | 398 | text = ts.read(); |
399 | file.close(); | 399 | file.close(); |
400 | status.setText( i18n("Processing events ...") ); | 400 | status.setText( i18n("Processing events ...") ); |
401 | status.raise(); | 401 | status.raise(); |
402 | qApp->processEvents(); | 402 | qApp->processEvents(); |
403 | fromString2Cal( calendar, existngCal, text, "Event" ); | 403 | fromString2Cal( calendar, existngCal, text, "Event" ); |
404 | status.setText( i18n("Reading todos ...") ); | 404 | status.setText( i18n("Reading todos ...") ); |
405 | qApp->processEvents(); | 405 | qApp->processEvents(); |
406 | if ( ! debug ) { | 406 | if ( ! debug ) { |
407 | fileName = "/tmp/kopitempout"; | 407 | fileName = "/tmp/kopitempout"; |
408 | QString command = "db2file todo -r -c " + codec+ " > " + fileName; | 408 | QString command = "db2file todo -r -c " + codec+ " > " + fileName; |
409 | system ( command.latin1() ); | 409 | system ( command.latin1() ); |
410 | } else { | 410 | } else { |
411 | fileName = "/tmp/todo.txt"; | 411 | fileName = "/tmp/todo.txt"; |
412 | } | 412 | } |
413 | file.setName( fileName ); | 413 | file.setName( fileName ); |
414 | if (!file.open( IO_ReadOnly ) ) { | 414 | if (!file.open( IO_ReadOnly ) ) { |
415 | return false; | 415 | return false; |
416 | 416 | ||
417 | } | 417 | } |
418 | ts.setDevice( &file ); | 418 | ts.setDevice( &file ); |
419 | text = ts.read(); | 419 | text = ts.read(); |
420 | file.close(); | 420 | file.close(); |
421 | 421 | ||
422 | status.setText( i18n("Processing todos ...") ); | 422 | status.setText( i18n("Processing todos ...") ); |
423 | status.raise(); | 423 | status.raise(); |
424 | qApp->processEvents(); | 424 | qApp->processEvents(); |
425 | fromString2Cal( calendar, existngCal, text, "Todo" ); | 425 | fromString2Cal( calendar, existngCal, text, "Todo" ); |
426 | return true; | 426 | return true; |
427 | } | 427 | } |
428 | int SharpFormat::getNumFromRecord( QString answer, Incidence* inc ) | 428 | int SharpFormat::getNumFromRecord( QString answer, Incidence* inc ) |
429 | { | 429 | { |
430 | int retval = -1; | 430 | int retval = -1; |
431 | QStringList templist; | 431 | QStringList templist; |
432 | QString tempString; | 432 | QString tempString; |
433 | int start = 0; | 433 | int start = 0; |
434 | int len = answer.length(); | 434 | int len = answer.length(); |
435 | int end = answer.find ("\n",start)+1; | 435 | int end = answer.find ("\n",start)+1; |
436 | bool ok = true; | 436 | bool ok = true; |
437 | start = end; | 437 | start = end; |
438 | int ccc = 0; | 438 | int ccc = 0; |
439 | while ( start > 0 ) { | 439 | while ( start > 0 ) { |
440 | templist.clear(); | 440 | templist.clear(); |
441 | ok = true; | 441 | ok = true; |
442 | int loopCount = 0; | 442 | int loopCount = 0; |
443 | while ( ok ) { | 443 | while ( ok ) { |
444 | ++loopCount; | 444 | ++loopCount; |
445 | if ( loopCount > 25 ) { | 445 | if ( loopCount > 25 ) { |
446 | qDebug("KO: Error in while loop"); | 446 | qDebug("KO: Error in while loop"); |
447 | ok = false; | 447 | ok = false; |
448 | start = 0; | 448 | start = 0; |
449 | break; | 449 | break; |
450 | } | 450 | } |
451 | if ( ok ) | 451 | if ( ok ) |
452 | tempString = getPart( answer, ok, start ); | 452 | tempString = getPart( answer, ok, start ); |
453 | if ( start >= len || start == 0 ) { | 453 | if ( start >= len || start == 0 ) { |
454 | start = 0; | 454 | start = 0; |
455 | ok = false; | 455 | ok = false; |
456 | } | 456 | } |
457 | if ( tempString.right(1) =="\n" ) | 457 | if ( tempString.right(1) =="\n" ) |
458 | tempString = tempString.left( tempString.length()-1); | 458 | tempString = tempString.left( tempString.length()-1); |
459 | 459 | ||
460 | templist.append( tempString ); | 460 | templist.append( tempString ); |
461 | } | 461 | } |
462 | ++ccc; | 462 | ++ccc; |
463 | if ( ccc == 2 && loopCount < 25 ) { | 463 | if ( ccc == 2 && loopCount < 25 ) { |
464 | start = 0; | 464 | start = 0; |
465 | bool ok; | 465 | bool ok; |
466 | int newnum = templist[0].toInt( &ok ); | 466 | int newnum = templist[0].toInt( &ok ); |
467 | if ( ok && newnum > 0) { | 467 | if ( ok && newnum > 0) { |
468 | retval = newnum; | 468 | retval = newnum; |
469 | inc->setID( "Sharp_DTM",templist[0] ); | 469 | inc->setID( "Sharp_DTM",templist[0] ); |
470 | inc->setCsum( "Sharp_DTM", QString::number( getCsum( templist ) )); | 470 | inc->setCsum( "Sharp_DTM", QString::number( getCsum( templist ) )); |
471 | inc->setTempSyncStat( SYNC_TEMPSTATE_NEW_ID ); | 471 | inc->setTempSyncStat( SYNC_TEMPSTATE_NEW_ID ); |
472 | } | 472 | } |
473 | } | 473 | } |
474 | } | 474 | } |
475 | //qDebug("getNumFromRecord returning : %d ", retval); | 475 | //qDebug("getNumFromRecord returning : %d ", retval); |
476 | return retval; | 476 | return retval; |
477 | } | 477 | } |
478 | bool SharpFormat::save( Calendar *calendar) | 478 | bool SharpFormat::save( Calendar *calendar) |
479 | { | 479 | { |
480 | 480 | ||
481 | QLabel status ( i18n("Processing/adding events ..."), 0 ); | 481 | QLabel status ( i18n("Processing/adding events ..."), 0 ); |
482 | int w = status.sizeHint().width()+20 ; | 482 | int w = status.sizeHint().width()+20 ; |
483 | if ( w < 200 ) w = 200; | 483 | if ( w < 200 ) w = 200; |
484 | int h = status.sizeHint().height()+20 ; | 484 | int h = status.sizeHint().height()+20 ; |
485 | int dw = QApplication::desktop()->width(); | 485 | int dw = QApplication::desktop()->width(); |
486 | int dh = QApplication::desktop()->height(); | 486 | int dh = QApplication::desktop()->height(); |
487 | status.setCaption(i18n("Writing DTM Data") ); | 487 | status.setCaption(i18n("Writing DTM Data") ); |
488 | status.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); | 488 | status.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); |
489 | status.show(); | 489 | status.show(); |
490 | status.raise(); | 490 | status.raise(); |
491 | qApp->processEvents(); | 491 | qApp->processEvents(); |
492 | bool debug = DEBUGMODE; | 492 | bool debug = DEBUGMODE; |
493 | QString codec = "utf8"; | 493 | QString codec = "utf8"; |
494 | QString answer; | 494 | QString answer; |
495 | QString ePrefix = "CARDID,CATEGORY,DSRP,PLCE,MEM1,TIM1,TIM2,ADAY,ARON,ARMN,ARSD,RTYP,RFRQ,RPOS,RDYS,REND,REDT,ALSD,ALED,MDAY\n"; | 495 | QString ePrefix = "CARDID,CATEGORY,DSRP,PLCE,MEM1,TIM1,TIM2,ADAY,ARON,ARMN,ARSD,RTYP,RFRQ,RPOS,RDYS,REND,REDT,ALSD,ALED,MDAY\n"; |
496 | QString tPrefix = "CARDID,CATEGORY,ETDY,LTDY,FNDY,MARK,PRTY,TITL,MEM1\n"; | 496 | QString tPrefix = "CARDID,CATEGORY,ETDY,LTDY,FNDY,MARK,PRTY,TITL,MEM1\n"; |
497 | QString command; | 497 | QString command; |
498 | QPtrList<Event> er = calendar->rawEvents(); | 498 | QPtrList<Event> er = calendar->rawEvents(); |
499 | Event* ev = er.first(); | 499 | Event* ev = er.first(); |
500 | QString fileName = "/tmp/kopitempout"; | 500 | QString fileName = "/tmp/kopitempout"; |
501 | int i = 0; | 501 | int i = 0; |
502 | QString changeString = ePrefix; | 502 | QString changeString = ePrefix; |
503 | QString deleteString = ePrefix; | 503 | QString deleteString = ePrefix; |
504 | bool deleteEnt = false; | 504 | bool deleteEnt = false; |
505 | bool changeEnt = false; | 505 | bool changeEnt = false; |
506 | QString message = i18n("Processing event # "); | 506 | QString message = i18n("Processing event # "); |
507 | int procCount = 0; | 507 | int procCount = 0; |
508 | while ( ev ) { | 508 | while ( ev ) { |
509 | //qDebug("i %d ", ++i); | 509 | //qDebug("i %d ", ++i); |
510 | if ( ev->tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) { | 510 | if ( ev->tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) { |
511 | status.setText ( message + QString::number ( ++procCount ) ); | 511 | status.setText ( message + QString::number ( ++procCount ) ); |
512 | qApp->processEvents(); | 512 | qApp->processEvents(); |
513 | QString eString = getEventString( ev ); | 513 | QString eString = getEventString( ev ); |
514 | if ( ev->tempSyncStat() == SYNC_TEMPSTATE_DELETE ) { // delete | 514 | if ( ev->tempSyncStat() == SYNC_TEMPSTATE_DELETE ) { // delete |
515 | // deleting empty strings does not work. | 515 | // deleting empty strings does not work. |
516 | // we write first and x and then delete the record with the x | 516 | // we write first and x and then delete the record with the x |
517 | eString = eString.replace( QRegExp(",\"\""),",\"x\"" ); | 517 | eString = eString.replace( QRegExp(",\"\""),",\"x\"" ); |
518 | changeString += eString + "\n"; | 518 | changeString += eString + "\n"; |
519 | deleteString += eString + "\n"; | 519 | deleteString += eString + "\n"; |
520 | deleteEnt = true; | 520 | deleteEnt = true; |
521 | changeEnt = true; | 521 | changeEnt = true; |
522 | } | 522 | } |
523 | else if ( ev->getID("Sharp_DTM").isEmpty() ) { // add new | 523 | else if ( ev->getID("Sharp_DTM").isEmpty() ) { // add new |
524 | command = "(echo \"" + ePrefix + eString + "\" ) | db2file datebook -w -g -c " + codec+ " > "+ fileName; | 524 | command = "(echo \"" + ePrefix + eString + "\" ) | db2file datebook -w -g -c " + codec+ " > "+ fileName; |
525 | system ( command.utf8() ); | 525 | system ( command.utf8() ); |
526 | QFile file( fileName ); | 526 | QFile file( fileName ); |
527 | if (!file.open( IO_ReadOnly ) ) { | 527 | if (!file.open( IO_ReadOnly ) ) { |
528 | return false; | 528 | return false; |
529 | 529 | ||
530 | } | 530 | } |
531 | QTextStream ts( &file ); | 531 | QTextStream ts( &file ); |
532 | ts.setCodec( QTextCodec::codecForName("utf8") ); | 532 | ts.setCodec( QTextCodec::codecForName("utf8") ); |
533 | answer = ts.read(); | 533 | answer = ts.read(); |
534 | file.close(); | 534 | file.close(); |
535 | //qDebug("answer \n%s ", answer.latin1()); | 535 | //qDebug("answer \n%s ", answer.latin1()); |
536 | getNumFromRecord( answer, ev ) ; | 536 | getNumFromRecord( answer, ev ) ; |
537 | 537 | ||
538 | } | 538 | } |
539 | else { // change existing | 539 | else { // change existing |
540 | //qDebug("canging %d %d",ev->zaurusStat() ,ev->zaurusId() ); | 540 | //qDebug("canging %d %d",ev->zaurusStat() ,ev->zaurusId() ); |
541 | //command = "(echo \"" + ePrefix + eString + "\" ) | db2file datebook -w -g -c " + codec+ " > "+ fileName; | 541 | //command = "(echo \"" + ePrefix + eString + "\" ) | db2file datebook -w -g -c " + codec+ " > "+ fileName; |
542 | changeString += eString + "\n"; | 542 | changeString += eString + "\n"; |
543 | changeEnt = true; | 543 | changeEnt = true; |
544 | 544 | ||
545 | } | 545 | } |
546 | } | 546 | } |
547 | ev = er.next(); | 547 | ev = er.next(); |
548 | } | 548 | } |
549 | status.setText ( i18n("Changing events ...") ); | 549 | status.setText ( i18n("Changing events ...") ); |
550 | qApp->processEvents(); | 550 | qApp->processEvents(); |
551 | //qDebug("changing... "); | 551 | //qDebug("changing... "); |
552 | if ( changeEnt ) { | 552 | if ( changeEnt ) { |
553 | QFile file( fileName ); | 553 | QFile file( fileName ); |
554 | if (!file.open( IO_WriteOnly ) ) { | 554 | if (!file.open( IO_WriteOnly ) ) { |
555 | return false; | 555 | return false; |
556 | 556 | ||
557 | } | 557 | } |
558 | QTextStream ts( &file ); | 558 | QTextStream ts( &file ); |
559 | ts.setCodec( QTextCodec::codecForName("utf8") ); | 559 | ts.setCodec( QTextCodec::codecForName("utf8") ); |
560 | ts << changeString ; | 560 | ts << changeString ; |
561 | file.close(); | 561 | file.close(); |
562 | command = "db2file datebook -w -g -c " + codec+ " < "+ fileName; | 562 | command = "db2file datebook -w -g -c " + codec+ " < "+ fileName; |
563 | system ( command.latin1() ); | 563 | system ( command.latin1() ); |
564 | //qDebug("command %s file :\n%s ", command.latin1(), changeString.latin1()); | 564 | //qDebug("command %s file :\n%s ", command.latin1(), changeString.latin1()); |
565 | 565 | ||
566 | } | 566 | } |
567 | status.setText ( i18n("Deleting events ...") ); | 567 | status.setText ( i18n("Deleting events ...") ); |
568 | qApp->processEvents(); | 568 | qApp->processEvents(); |
569 | //qDebug("deleting... "); | 569 | //qDebug("deleting... "); |
570 | if ( deleteEnt ) { | 570 | if ( deleteEnt ) { |
571 | QFile file( fileName ); | 571 | QFile file( fileName ); |
572 | if (!file.open( IO_WriteOnly ) ) { | 572 | if (!file.open( IO_WriteOnly ) ) { |
573 | return false; | 573 | return false; |
574 | 574 | ||
575 | } | 575 | } |
576 | QTextStream ts( &file ); | 576 | QTextStream ts( &file ); |
577 | ts.setCodec( QTextCodec::codecForName("utf8") ); | 577 | ts.setCodec( QTextCodec::codecForName("utf8") ); |
578 | ts << deleteString; | 578 | ts << deleteString; |
579 | file.close(); | 579 | file.close(); |
580 | command = "db2file datebook -d -c " + codec+ " < "+ fileName; | 580 | command = "db2file datebook -d -c " + codec+ " < "+ fileName; |
581 | system ( command.latin1() ); | 581 | system ( command.latin1() ); |
582 | // qDebug("command %s file :\n%s ", command.latin1(), deleteString.latin1()); | 582 | // qDebug("command %s file :\n%s ", command.latin1(), deleteString.latin1()); |
583 | } | 583 | } |
584 | 584 | ||
585 | 585 | ||
586 | changeString = tPrefix; | 586 | changeString = tPrefix; |
587 | deleteString = tPrefix; | 587 | deleteString = tPrefix; |
588 | status.setText ( i18n("Processing todos ...") ); | 588 | status.setText ( i18n("Processing todos ...") ); |
589 | qApp->processEvents(); | 589 | qApp->processEvents(); |
590 | QPtrList<Todo> tl = calendar->rawTodos(); | 590 | QPtrList<Todo> tl = calendar->rawTodos(); |
591 | Todo* to = tl.first(); | 591 | Todo* to = tl.first(); |
592 | i = 0; | 592 | i = 0; |
593 | message = i18n("Processing todo # "); | 593 | message = i18n("Processing todo # "); |
594 | procCount = 0; | 594 | procCount = 0; |
595 | while ( to ) { | 595 | while ( to ) { |
596 | if ( to->tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) { | 596 | if ( to->tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) { |
597 | status.setText ( message + QString::number ( ++procCount ) ); | 597 | status.setText ( message + QString::number ( ++procCount ) ); |
598 | qApp->processEvents(); | 598 | qApp->processEvents(); |
599 | QString eString = getTodoString( to ); | 599 | QString eString = getTodoString( to ); |
600 | if ( to->tempSyncStat() == SYNC_TEMPSTATE_DELETE ) { // delete | 600 | if ( to->tempSyncStat() == SYNC_TEMPSTATE_DELETE ) { // delete |
601 | // deleting empty strings does not work. | 601 | // deleting empty strings does not work. |
602 | // we write first and x and then delete the record with the x | 602 | // we write first and x and then delete the record with the x |
603 | eString = eString.replace( QRegExp(",\"\""),",\"x\"" ); | 603 | eString = eString.replace( QRegExp(",\"\""),",\"x\"" ); |
604 | changeString += eString + "\n"; | 604 | changeString += eString + "\n"; |
605 | deleteString += eString + "\n"; | 605 | deleteString += eString + "\n"; |
606 | deleteEnt = true; | 606 | deleteEnt = true; |
607 | changeEnt = true; | 607 | changeEnt = true; |
608 | } | 608 | } |
609 | else if ( to->getID("Sharp_DTM").isEmpty() ) { // add new | 609 | else if ( to->getID("Sharp_DTM").isEmpty() ) { // add new |
610 | command = "(echo \"" + tPrefix + eString + "\" ) | db2file todo -w -g -c " + codec+ " > "+ fileName; | 610 | command = "(echo \"" + tPrefix + eString + "\" ) | db2file todo -w -g -c " + codec+ " > "+ fileName; |
611 | system ( command.utf8() ); | 611 | system ( command.utf8() ); |
612 | QFile file( fileName ); | 612 | QFile file( fileName ); |
613 | if (!file.open( IO_ReadOnly ) ) { | 613 | if (!file.open( IO_ReadOnly ) ) { |
614 | return false; | 614 | return false; |
615 | 615 | ||
616 | } | 616 | } |
617 | QTextStream ts( &file ); | 617 | QTextStream ts( &file ); |