-rw-r--r-- | korganizer/calendarview.cpp | 32 |
1 files changed, 31 insertions, 1 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index d51187a..316826a 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -870,795 +870,825 @@ void CalendarView::checkAlarms() | |||
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( "Project1"); | 911 | root1->setSummary( "Project1"); |
912 | root1->setPriority( 1 ); | 912 | root1->setPriority( 1 ); |
913 | root1->setCategories( QString( "Cat_Pro1") ); | 913 | root1->setCategories( QString( "Cat_Pro1") ); |
914 | root1->setDescription( "This is a test description of a root Project" ); | 914 | root1->setDescription( "This is a test description of a root Project" ); |
915 | root1->setPercentComplete( 20 ); | 915 | root1->setPercentComplete( 20 ); |
916 | updateView(); | 916 | updateView(); |
917 | QDateTime start = QDateTime ( QDate( 2004,11,1), QTime ( 7,30,0) ); | 917 | QDateTime start = QDateTime ( QDate( 2004,11,1), QTime ( 7,30,0) ); |
918 | QDateTime end = QDateTime ( QDate( 2005,8,5), QTime ( 0,0,0) ); | 918 | QDateTime end = QDateTime ( QDate( 2005,8,5), QTime ( 0,0,0) ); |
919 | 919 | ||
920 | nt = new Todo; | 920 | nt = new Todo; |
921 | mCalendar->addTodo( nt ); | 921 | mCalendar->addTodo( nt ); |
922 | nt->setSummary( "Planning Project1"); | 922 | nt->setSummary( "Planning Project1"); |
923 | nt->setPriority( 1 ); | 923 | nt->setPriority( 1 ); |
924 | nt->setDescription( "This is a test description of Planning Project1" ); | 924 | nt->setDescription( "This is a test description of Planning Project1" ); |
925 | nt->setPercentComplete( 20 ); | 925 | nt->setPercentComplete( 20 ); |
926 | nt->setCategories( QString( "Cat_Pro1,Cat_Plan_Pro1") ); | 926 | nt->setCategories( QString( "Cat_Pro1,Cat_Plan_Pro1") ); |
927 | 927 | ||
928 | 928 | ||
929 | Todo * sub1 = nt; | 929 | Todo * sub1 = nt; |
930 | sub1->setRelatedTo( root1 ); | 930 | sub1->setRelatedTo( root1 ); |
931 | 931 | ||
932 | nt = new Todo; | 932 | nt = new Todo; |
933 | mCalendar->addTodo( nt ); | 933 | mCalendar->addTodo( nt ); |
934 | nt->setSummary( "Planning Project1: Lutz"); | 934 | nt->setSummary( "Planning Project1: Lutz"); |
935 | nt->setPriority( 1 ); | 935 | nt->setPriority( 1 ); |
936 | 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" ); |
937 | nt->setPercentComplete( 20 ); | 937 | nt->setPercentComplete( 20 ); |
938 | nt->setCategories( QString( "Cat_Pro1,Cat_Plan_Pro1,Cat_Work_Lutz") ); | 938 | nt->setCategories( QString( "Cat_Pro1,Cat_Plan_Pro1,Cat_Work_Lutz") ); |
939 | Todo * workLutz11 = nt; | 939 | Todo * workLutz11 = nt; |
940 | workLutz11->setRelatedTo( sub1 ); | 940 | workLutz11->setRelatedTo( sub1 ); |
941 | 941 | ||
942 | nt = new Todo; | 942 | nt = new Todo; |
943 | mCalendar->addTodo( nt ); | 943 | mCalendar->addTodo( nt ); |
944 | nt->setSummary( "Planning Project1: Norbert"); | 944 | nt->setSummary( "Planning Project1: Norbert"); |
945 | nt->setPriority( 1 ); | 945 | nt->setPriority( 1 ); |
946 | 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" ); |
947 | nt->setPercentComplete( 20 ); | 947 | nt->setPercentComplete( 20 ); |
948 | nt->setCategories( QString( "Cat_Pro1,Cat_Plan_Pro1,Cat_Work_Norbert") ); | 948 | nt->setCategories( QString( "Cat_Pro1,Cat_Plan_Pro1,Cat_Work_Norbert") ); |
949 | Todo * workNorbert11 = nt; | 949 | Todo * workNorbert11 = nt; |
950 | workNorbert11->setRelatedTo( sub1 ); | 950 | workNorbert11->setRelatedTo( sub1 ); |
951 | 951 | ||
952 | nt = new Todo; | 952 | nt = new Todo; |
953 | mCalendar->addTodo( nt ); | 953 | mCalendar->addTodo( nt ); |
954 | nt->setSummary( "Work on 1"); | 954 | nt->setSummary( "Work on 1"); |
955 | nt->setPriority( 1 ); | 955 | nt->setPriority( 1 ); |
956 | 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") ); | 957 | nt->setCategories( QString( "Cat_Pro1,Cat_Work_Pro1") ); |
958 | nt->setPercentComplete( 20 ); | 958 | nt->setPercentComplete( 20 ); |
959 | 959 | ||
960 | Todo * sub2 = nt; | 960 | Todo * sub2 = nt; |
961 | sub2->setRelatedTo( root1 ); | 961 | sub2->setRelatedTo( root1 ); |
962 | 962 | ||
963 | 963 | ||
964 | nt = new Todo; | 964 | nt = new Todo; |
965 | mCalendar->addTodo( nt ); | 965 | mCalendar->addTodo( nt ); |
966 | nt->setSummary( "Work on 1: Lutz"); | 966 | nt->setSummary( "Work on 1: Lutz"); |
967 | nt->setPriority( 1 ); | 967 | nt->setPriority( 1 ); |
968 | 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") ); | 969 | nt->setCategories( QString( "Cat_Pro1,Cat_Work_Pro1,Cat_Work_Lutz") ); |
970 | nt->setPercentComplete( 20 ); | 970 | nt->setPercentComplete( 20 ); |
971 | Todo * workLutz12 = nt; | 971 | Todo * workLutz12 = nt; |
972 | workLutz12->setRelatedTo( sub2 ); | 972 | workLutz12->setRelatedTo( sub2 ); |
973 | 973 | ||
974 | nt = new Todo; | 974 | nt = new Todo; |
975 | mCalendar->addTodo( nt ); | 975 | mCalendar->addTodo( nt ); |
976 | nt->setSummary( "Work on 1: Norbert"); | 976 | nt->setSummary( "Work on 1: Norbert"); |
977 | nt->setPriority( 1 ); | 977 | nt->setPriority( 1 ); |
978 | 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") ); | 979 | nt->setCategories( QString( "Cat_Pro1,Cat_Work_Pro1,Cat_Work_Norbert") ); |
980 | nt->setPercentComplete( 20 ); | 980 | nt->setPercentComplete( 20 ); |
981 | Todo * workNorbert12 = nt; | 981 | Todo * workNorbert12 = nt; |
982 | workNorbert12->setRelatedTo( sub2 ); | 982 | workNorbert12->setRelatedTo( sub2 ); |
983 | 983 | ||
984 | int secLenRunning = 7200; | 984 | int secLenRunning = 7200; |
985 | int secLenPausing = 3600 * 3; | 985 | int secLenPausing = 3600 * 3; |
986 | int dayInterval = 1; | 986 | int dayInterval = 1; |
987 | //createRunningDate4Todo( root1, start, end, secLenRunning, secLenPausing, dayInterval ); | 987 | //createRunningDate4Todo( root1, start, end, secLenRunning, secLenPausing, dayInterval ); |
988 | createRunningDate4Todo( root1, start, end, secLenRunning*24, secLenPausing, 14 ); | 988 | createRunningDate4Todo( root1, start, end, secLenRunning*24, secLenPausing, 14 ); |
989 | 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); |
990 | createRunningDate4Todo( sub2, start.addDays( 8 ), end, secLenRunning*4, secLenPausing, 3); | 990 | createRunningDate4Todo( sub2, start.addDays( 8 ), end, secLenRunning*4, secLenPausing, 3); |
991 | createRunningDate4Todo( workLutz11, start, start.addDays( 8 ), secLenRunning, secLenPausing, 0); | 991 | createRunningDate4Todo( workLutz11, start, start.addDays( 8 ), secLenRunning, secLenPausing, 0); |
992 | createRunningDate4Todo( workNorbert11, start, start.addDays( 8 ), secLenRunning*2, secLenPausing, 1); | 992 | createRunningDate4Todo( workNorbert11, start, start.addDays( 8 ), secLenRunning*2, secLenPausing, 1); |
993 | createRunningDate4Todo( workLutz12, start.addDays( 8 ),end, secLenRunning*5, secLenPausing, 3); | 993 | createRunningDate4Todo( workLutz12, start.addDays( 8 ),end, secLenRunning*5, secLenPausing, 3); |
994 | createRunningDate4Todo( workNorbert12, start.addDays( 8 ), end, secLenRunning, secLenPausing*3, 0); | 994 | createRunningDate4Todo( workNorbert12, start.addDays( 8 ), end, secLenRunning, secLenPausing*3, 0); |
995 | 995 | ||
996 | } | 996 | } |
997 | 997 | ||
998 | { | 998 | { |
999 | Todo * root1 = new Todo; | 999 | Todo * root1 = new Todo; |
1000 | mCalendar->addTodo( root1 ); | 1000 | mCalendar->addTodo( root1 ); |
1001 | root1->setSummary( "Project2"); | 1001 | root1->setSummary( "Project2"); |
1002 | root1->setPriority( 1 ); | 1002 | root1->setPriority( 1 ); |
1003 | 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" ); |
1004 | root1->setPercentComplete( 20 ); | 1004 | root1->setPercentComplete( 20 ); |
1005 | root1->setCategories( QString( "Cat_Pro2") ); | 1005 | root1->setCategories( QString( "Cat_Pro2") ); |
1006 | updateView(); | 1006 | updateView(); |
1007 | QDateTime start = QDateTime ( QDate( 2004,11,1), QTime ( 7,30,0) ); | 1007 | QDateTime start = QDateTime ( QDate( 2004,11,1), QTime ( 7,30,0) ); |
1008 | QDateTime end = QDateTime ( QDate( 2005,8,5), QTime ( 0,0,0) ); | 1008 | QDateTime end = QDateTime ( QDate( 2005,8,5), QTime ( 0,0,0) ); |
1009 | int secLenRunning = 7200; | 1009 | int secLenRunning = 7200; |
1010 | int secLenPausing = 3600 * 3; | 1010 | int secLenPausing = 3600 * 3; |
1011 | int dayInterval = 1; | 1011 | int dayInterval = 1; |
1012 | 1012 | ||
1013 | nt = new Todo; | 1013 | nt = new Todo; |
1014 | mCalendar->addTodo( nt ); | 1014 | mCalendar->addTodo( nt ); |
1015 | nt->setSummary( "Planning Project2"); | 1015 | nt->setSummary( "Planning Project2"); |
1016 | nt->setPriority( 1 ); | 1016 | nt->setPriority( 1 ); |
1017 | 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") ); | 1018 | nt->setCategories( QString( "Cat_Pro2,Cat_Plan_Pro2") ); |
1019 | nt->setPercentComplete( 20 ); | 1019 | nt->setPercentComplete( 20 ); |
1020 | 1020 | ||
1021 | 1021 | ||
1022 | Todo * sub1 = nt; | 1022 | Todo * sub1 = nt; |
1023 | sub1->setRelatedTo( root1 ); | 1023 | sub1->setRelatedTo( root1 ); |
1024 | 1024 | ||
1025 | nt = new Todo; | 1025 | nt = new Todo; |
1026 | mCalendar->addTodo( nt ); | 1026 | mCalendar->addTodo( nt ); |
1027 | nt->setSummary( "Planning Project2: Lutz"); | 1027 | nt->setSummary( "Planning Project2: Lutz"); |
1028 | nt->setPriority( 1 ); | 1028 | nt->setPriority( 1 ); |
1029 | 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") ); | 1030 | nt->setCategories( QString( "Cat_Pro2,Cat_Plan_Pro2,Cat_Work_Lutz") ); |
1031 | nt->setPercentComplete( 20 ); | 1031 | nt->setPercentComplete( 20 ); |
1032 | Todo * workLutz11 = nt; | 1032 | Todo * workLutz11 = nt; |
1033 | workLutz11->setRelatedTo( sub1 ); | 1033 | workLutz11->setRelatedTo( sub1 ); |
1034 | 1034 | ||
1035 | nt = new Todo; | 1035 | nt = new Todo; |
1036 | mCalendar->addTodo( nt ); | 1036 | mCalendar->addTodo( nt ); |
1037 | nt->setSummary( "Planning Project2: Norbert"); | 1037 | nt->setSummary( "Planning Project2: Norbert"); |
1038 | nt->setPriority( 1 ); | 1038 | nt->setPriority( 1 ); |
1039 | 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") ); | 1040 | nt->setCategories( QString( "Cat_Pro2,Cat_Plan_Pro2,Cat_Work_Norbert") ); |
1041 | nt->setPercentComplete( 20 ); | 1041 | nt->setPercentComplete( 20 ); |
1042 | Todo * workNorbert11 = nt; | 1042 | Todo * workNorbert11 = nt; |
1043 | workNorbert11->setRelatedTo( sub1 ); | 1043 | workNorbert11->setRelatedTo( sub1 ); |
1044 | 1044 | ||
1045 | nt = new Todo; | 1045 | nt = new Todo; |
1046 | mCalendar->addTodo( nt ); | 1046 | mCalendar->addTodo( nt ); |
1047 | nt->setSummary( "Work on 2"); | 1047 | nt->setSummary( "Work on 2"); |
1048 | nt->setPriority( 1 ); | 1048 | nt->setPriority( 1 ); |
1049 | 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") ); | 1050 | nt->setCategories( QString( "Cat_Pro2,Cat_Work_Pro2") ); |
1051 | nt->setPercentComplete( 20 ); | 1051 | nt->setPercentComplete( 20 ); |
1052 | 1052 | ||
1053 | Todo * sub2 = nt; | 1053 | Todo * sub2 = nt; |
1054 | sub2->setRelatedTo( root1 ); | 1054 | sub2->setRelatedTo( root1 ); |
1055 | 1055 | ||
1056 | 1056 | ||
1057 | nt = new Todo; | 1057 | nt = new Todo; |
1058 | mCalendar->addTodo( nt ); | 1058 | mCalendar->addTodo( nt ); |
1059 | nt->setSummary( "Work on 2: Lutz"); | 1059 | nt->setSummary( "Work on 2: Lutz"); |
1060 | nt->setPriority( 1 ); | 1060 | nt->setPriority( 1 ); |
1061 | 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") ); | 1062 | nt->setCategories( QString( "Cat_Pro2,Cat_Work_Pro2,Cat_Work_Lutz") ); |
1063 | nt->setPercentComplete( 20 ); | 1063 | nt->setPercentComplete( 20 ); |
1064 | Todo * workLutz12 = nt; | 1064 | Todo * workLutz12 = nt; |
1065 | workLutz12->setRelatedTo( sub2 ); | 1065 | workLutz12->setRelatedTo( sub2 ); |
1066 | 1066 | ||
1067 | nt = new Todo; | 1067 | nt = new Todo; |
1068 | mCalendar->addTodo( nt ); | 1068 | mCalendar->addTodo( nt ); |
1069 | nt->setSummary( "Work on 2: Norbert"); | 1069 | nt->setSummary( "Work on 2: Norbert"); |
1070 | nt->setPriority( 1 ); | 1070 | nt->setPriority( 1 ); |
1071 | 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") ); | 1072 | nt->setCategories( QString( "Cat_Pro2,Cat_Work_Pro2,Cat_Work_Norbert") ); |
1073 | nt->setPercentComplete( 20 ); | 1073 | nt->setPercentComplete( 20 ); |
1074 | Todo * workNorbert12 = nt; | 1074 | Todo * workNorbert12 = nt; |
1075 | workNorbert12->setRelatedTo( sub2 ); | 1075 | workNorbert12->setRelatedTo( sub2 ); |
1076 | createRunningDate4Todo( root1, start, end, secLenRunning, secLenPausing, 10 ); | 1076 | createRunningDate4Todo( root1, start, end, secLenRunning, secLenPausing, 10 ); |
1077 | 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); |
1078 | createRunningDate4Todo( sub2, start.addDays( 8 ), end, secLenRunning*3, secLenPausing, 7); | 1078 | createRunningDate4Todo( sub2, start.addDays( 8 ), end, secLenRunning*3, secLenPausing, 7); |
1079 | createRunningDate4Todo( workLutz11, start, start.addDays( 18 ), secLenRunning/2, secLenPausing*5, 0); | 1079 | createRunningDate4Todo( workLutz11, start, start.addDays( 18 ), secLenRunning/2, secLenPausing*5, 0); |
1080 | 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); |
1081 | createRunningDate4Todo( workLutz12, start.addDays( 8 ),end, secLenRunning, secLenPausing*8, 0); | 1081 | createRunningDate4Todo( workLutz12, start.addDays( 8 ),end, secLenRunning, secLenPausing*8, 0); |
1082 | createRunningDate4Todo( workNorbert12, start.addDays( 28 ), end, secLenRunning/8, secLenPausing*6, 0); | 1082 | createRunningDate4Todo( workNorbert12, start.addDays( 28 ), end, secLenRunning/8, secLenPausing*6, 0); |
1083 | } | 1083 | } |
1084 | updateView(); | 1084 | updateView(); |
1085 | #endif | 1085 | #endif |
1086 | 1086 | ||
1087 | } | 1087 | } |
1088 | void CalendarView::createRunningDate4Todo( Todo * runT, QDateTime start , QDateTime end, int secLenRunning, int secLenPausing,int dayInterval ) | 1088 | void CalendarView::createRunningDate4Todo( Todo * runT, QDateTime start , QDateTime end, int secLenRunning, int secLenPausing,int dayInterval ) |
1089 | { | 1089 | { |
1090 | static int ccc = 0; | 1090 | static int ccc = 0; |
1091 | ++ccc; | 1091 | ++ccc; |
1092 | QDateTime t_start = start; | 1092 | QDateTime t_start = start; |
1093 | runT->setPriority( 5 ); | 1093 | runT->setPriority( 5 ); |
1094 | runT->setPercentComplete( 0 ); | 1094 | runT->setPercentComplete( 0 ); |
1095 | int count = 0; | 1095 | int count = 0; |
1096 | int prio = 5; | 1096 | int prio = 5; |
1097 | int complete = 0; | 1097 | int complete = 0; |
1098 | while ( t_start < end ) { | 1098 | while ( t_start < end ) { |
1099 | ++count; | 1099 | ++count; |
1100 | if ( count > ccc ) { | 1100 | if ( count > ccc ) { |
1101 | count = 0; | 1101 | count = 0; |
1102 | --prio; | 1102 | --prio; |
1103 | if ( prio == 0 ) prio = 5; | 1103 | if ( prio == 0 ) prio = 5; |
1104 | complete += 20; | 1104 | complete += 20; |
1105 | if ( complete > 100 ) complete = 0; | 1105 | if ( complete > 100 ) complete = 0; |
1106 | runT->setPriority( prio ); | 1106 | runT->setPriority( prio ); |
1107 | runT->setPercentComplete( complete ); | 1107 | runT->setPercentComplete( complete ); |
1108 | } | 1108 | } |
1109 | runT->setRunning( true ); | 1109 | runT->setRunning( true ); |
1110 | 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 ) ); |
1111 | if ( dayInterval ) | 1111 | if ( dayInterval ) |
1112 | t_start = t_start.addDays( dayInterval ); | 1112 | t_start = t_start.addDays( dayInterval ); |
1113 | else { | 1113 | else { |
1114 | t_start = t_start.addSecs( secLenRunning + secLenPausing ); | 1114 | t_start = t_start.addSecs( secLenRunning + secLenPausing ); |
1115 | } | 1115 | } |
1116 | } | 1116 | } |
1117 | } | 1117 | } |
1118 | 1118 | ||
1119 | void CalendarView::showDay( QDate d ) | 1119 | void CalendarView::showDay( QDate d ) |
1120 | { | 1120 | { |
1121 | dateNavigator()->blockSignals( true ); | 1121 | dateNavigator()->blockSignals( true ); |
1122 | dateNavigator()->selectDate( d ); | 1122 | dateNavigator()->selectDate( d ); |
1123 | dateNavigator()->blockSignals( false ); | 1123 | dateNavigator()->blockSignals( false ); |
1124 | mViewManager->showDayView(); | 1124 | mViewManager->showDayView(); |
1125 | //dateNavigator()->selectDate( d ); | 1125 | //dateNavigator()->selectDate( d ); |
1126 | } | 1126 | } |
1127 | void CalendarView::timerAlarm() | 1127 | void CalendarView::timerAlarm() |
1128 | { | 1128 | { |
1129 | //qDebug("CalendarView::timerAlarm() "); | 1129 | //qDebug("CalendarView::timerAlarm() "); |
1130 | computeAlarm(mAlarmNotification ); | 1130 | computeAlarm(mAlarmNotification ); |
1131 | } | 1131 | } |
1132 | 1132 | ||
1133 | void CalendarView::suspendAlarm() | 1133 | void CalendarView::suspendAlarm() |
1134 | { | 1134 | { |
1135 | //qDebug(" CalendarView::suspendAlarm() "); | 1135 | //qDebug(" CalendarView::suspendAlarm() "); |
1136 | computeAlarm(mSuspendAlarmNotification ); | 1136 | computeAlarm(mSuspendAlarmNotification ); |
1137 | 1137 | ||
1138 | } | 1138 | } |
1139 | 1139 | ||
1140 | void CalendarView::startAlarm( QString mess , QString filename) | 1140 | void CalendarView::startAlarm( QString mess , QString filename) |
1141 | { | 1141 | { |
1142 | 1142 | ||
1143 | topLevelWidget()->showNormal(); | 1143 | topLevelWidget()->showNormal(); |
1144 | topLevelWidget()->setActiveWindow(); | 1144 | topLevelWidget()->setActiveWindow(); |
1145 | topLevelWidget()->raise(); | 1145 | topLevelWidget()->raise(); |
1146 | 1146 | ||
1147 | 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 ); |
1148 | QTimer::singleShot( 2000, this, SLOT( checkNextTimerAlarm() ) ); | 1148 | QTimer::singleShot( 2000, this, SLOT( checkNextTimerAlarm() ) ); |
1149 | 1149 | ||
1150 | } | 1150 | } |
1151 | 1151 | ||
1152 | void CalendarView::checkNextTimerAlarm() | 1152 | void CalendarView::checkNextTimerAlarm() |
1153 | { | 1153 | { |
1154 | mCalendar->checkAlarmForIncidence( 0, true ); | 1154 | mCalendar->checkAlarmForIncidence( 0, true ); |
1155 | } | 1155 | } |
1156 | 1156 | ||
1157 | void CalendarView::computeAlarm( QString msg ) | 1157 | void CalendarView::computeAlarm( QString msg ) |
1158 | { | 1158 | { |
1159 | 1159 | ||
1160 | QString mess = msg; | 1160 | QString mess = msg; |
1161 | QString mAlarmMessage = mess.mid( 9 ); | 1161 | QString mAlarmMessage = mess.mid( 9 ); |
1162 | QString filename = MainWindow::resourcePath(); | 1162 | QString filename = MainWindow::resourcePath(); |
1163 | filename += "koalarm.wav"; | 1163 | filename += "koalarm.wav"; |
1164 | QString tempfilename; | 1164 | QString tempfilename; |
1165 | if ( mess.left( 13 ) == "suspend_alarm") { | 1165 | if ( mess.left( 13 ) == "suspend_alarm") { |
1166 | bool error = false; | 1166 | bool error = false; |
1167 | int len = mess.mid( 13 ).find("+++"); | 1167 | int len = mess.mid( 13 ).find("+++"); |
1168 | if ( len < 2 ) | 1168 | if ( len < 2 ) |
1169 | error = true; | 1169 | error = true; |
1170 | else { | 1170 | else { |
1171 | tempfilename = mess.mid( 13, len ); | 1171 | tempfilename = mess.mid( 13, len ); |
1172 | if ( !QFile::exists( tempfilename ) ) | 1172 | if ( !QFile::exists( tempfilename ) ) |
1173 | error = true; | 1173 | error = true; |
1174 | } | 1174 | } |
1175 | if ( ! error ) { | 1175 | if ( ! error ) { |
1176 | filename = tempfilename; | 1176 | filename = tempfilename; |
1177 | } | 1177 | } |
1178 | mAlarmMessage = mess.mid( 13+len+3 ); | 1178 | mAlarmMessage = mess.mid( 13+len+3 ); |
1179 | //qDebug("suspend file %s ",tempfilename.latin1() ); | 1179 | //qDebug("suspend file %s ",tempfilename.latin1() ); |
1180 | startAlarm( mAlarmMessage, filename); | 1180 | startAlarm( mAlarmMessage, filename); |
1181 | return; | 1181 | return; |
1182 | } | 1182 | } |
1183 | if ( mess.left( 11 ) == "timer_alarm") { | 1183 | if ( mess.left( 11 ) == "timer_alarm") { |
1184 | //mTimerTime = 0; | 1184 | //mTimerTime = 0; |
1185 | startAlarm( mess.mid( 11 ), filename ); | 1185 | startAlarm( mess.mid( 11 ), filename ); |
1186 | return; | 1186 | return; |
1187 | } | 1187 | } |
1188 | if ( mess.left( 10 ) == "proc_alarm") { | 1188 | if ( mess.left( 10 ) == "proc_alarm") { |
1189 | bool error = false; | 1189 | bool error = false; |
1190 | int len = mess.mid( 10 ).find("+++"); | 1190 | int len = mess.mid( 10 ).find("+++"); |
1191 | if ( len < 2 ) | 1191 | if ( len < 2 ) |
1192 | error = true; | 1192 | error = true; |
1193 | else { | 1193 | else { |
1194 | tempfilename = mess.mid( 10, len ); | 1194 | tempfilename = mess.mid( 10, len ); |
1195 | if ( !QFile::exists( tempfilename ) ) | 1195 | if ( !QFile::exists( tempfilename ) ) |
1196 | error = true; | 1196 | error = true; |
1197 | } | 1197 | } |
1198 | if ( error ) { | 1198 | if ( error ) { |
1199 | mAlarmMessage = "Procedure Alarm\nError - File not found\n"; | 1199 | mAlarmMessage = "Procedure Alarm\nError - File not found\n"; |
1200 | mAlarmMessage += mess.mid( 10+len+3+9 ); | 1200 | mAlarmMessage += mess.mid( 10+len+3+9 ); |
1201 | } else { | 1201 | } else { |
1202 | //QCopEnvelope e("QPE/Application/kopi", "-writeFileSilent"); | 1202 | //QCopEnvelope e("QPE/Application/kopi", "-writeFileSilent"); |
1203 | //qDebug("-----system command %s ",tempfilename.latin1() ); | 1203 | //qDebug("-----system command %s ",tempfilename.latin1() ); |
1204 | #ifndef _WIN32_ | 1204 | #ifndef _WIN32_ |
1205 | if ( vfork () == 0 ) { | 1205 | if ( vfork () == 0 ) { |
1206 | execl ( tempfilename.latin1(), 0 ); | 1206 | execl ( tempfilename.latin1(), 0 ); |
1207 | return; | 1207 | return; |
1208 | } | 1208 | } |
1209 | #else | 1209 | #else |
1210 | QProcess* p = new QProcess(); | 1210 | QProcess* p = new QProcess(); |
1211 | p->addArgument( tempfilename.latin1() ); | 1211 | p->addArgument( tempfilename.latin1() ); |
1212 | p->start(); | 1212 | p->start(); |
1213 | return; | 1213 | return; |
1214 | #endif | 1214 | #endif |
1215 | 1215 | ||
1216 | return; | 1216 | return; |
1217 | } | 1217 | } |
1218 | 1218 | ||
1219 | //qDebug("+++++++system command %s ",tempfilename.latin1() ); | 1219 | //qDebug("+++++++system command %s ",tempfilename.latin1() ); |
1220 | } | 1220 | } |
1221 | if ( mess.left( 11 ) == "audio_alarm") { | 1221 | if ( mess.left( 11 ) == "audio_alarm") { |
1222 | bool error = false; | 1222 | bool error = false; |
1223 | int len = mess.mid( 11 ).find("+++"); | 1223 | int len = mess.mid( 11 ).find("+++"); |
1224 | if ( len < 2 ) | 1224 | if ( len < 2 ) |
1225 | error = true; | 1225 | error = true; |
1226 | else { | 1226 | else { |
1227 | tempfilename = mess.mid( 11, len ); | 1227 | tempfilename = mess.mid( 11, len ); |
1228 | if ( !QFile::exists( tempfilename ) ) | 1228 | if ( !QFile::exists( tempfilename ) ) |
1229 | error = true; | 1229 | error = true; |
1230 | } | 1230 | } |
1231 | if ( ! error ) { | 1231 | if ( ! error ) { |
1232 | filename = tempfilename; | 1232 | filename = tempfilename; |
1233 | } | 1233 | } |
1234 | mAlarmMessage = mess.mid( 11+len+3+9 ); | 1234 | mAlarmMessage = mess.mid( 11+len+3+9 ); |
1235 | //qDebug("audio file command %s ",tempfilename.latin1() ); | 1235 | //qDebug("audio file command %s ",tempfilename.latin1() ); |
1236 | } | 1236 | } |
1237 | if ( mess.left( 9 ) == "cal_alarm") { | 1237 | if ( mess.left( 9 ) == "cal_alarm") { |
1238 | mAlarmMessage = mess.mid( 9 ) ; | 1238 | mAlarmMessage = mess.mid( 9 ) ; |
1239 | } | 1239 | } |
1240 | 1240 | ||
1241 | startAlarm( mAlarmMessage, filename ); | 1241 | startAlarm( mAlarmMessage, filename ); |
1242 | 1242 | ||
1243 | 1243 | ||
1244 | } | 1244 | } |
1245 | 1245 | ||
1246 | void CalendarView::addSuspendAlarm(const QDateTime &qdt, const QString ¬i ) | 1246 | void CalendarView::addSuspendAlarm(const QDateTime &qdt, const QString ¬i ) |
1247 | { | 1247 | { |
1248 | //qDebug("+++++addSUSPENDAlarm %s %s ", qdt.toString().latin1() , noti.latin1() ); | 1248 | //qDebug("+++++addSUSPENDAlarm %s %s ", qdt.toString().latin1() , noti.latin1() ); |
1249 | 1249 | ||
1250 | mSuspendAlarmNotification = noti; | 1250 | mSuspendAlarmNotification = noti; |
1251 | int ms = QDateTime::currentDateTime().secsTo( qdt )*1000; | 1251 | int ms = QDateTime::currentDateTime().secsTo( qdt )*1000; |
1252 | //qDebug("Suspend Alarm timer started with secs: %d ", ms/1000); | 1252 | //qDebug("Suspend Alarm timer started with secs: %d ", ms/1000); |
1253 | mSuspendTimer->start( ms , true ); | 1253 | mSuspendTimer->start( ms , true ); |
1254 | #ifdef DESKTOP_VERSION | ||
1255 | if ( QApplication::desktop()->width() < 1024 ) { | ||
1256 | QString mess = qdt.toString( "yyyy-MM-dd hh:mm:ss" ) + "\n" + noti; | ||
1257 | //qDebug("nextsuspendalarm = \n%s ",mess.latin1() ); | ||
1258 | QString fn = QDir::homeDirPath() + "/.kopi_suspend_alarm"; | ||
1259 | QFile file( fn ); | ||
1260 | if (!file.open( IO_WriteOnly ) ) { | ||
1261 | qDebug("KO: Error writing next suspend alarm file %s\nContent: \n%s ", fn.latin1(), mess.latin1()); | ||
1262 | } else { | ||
1263 | QTextStream ts( &file ); | ||
1264 | ts << mess; | ||
1265 | file.close(); | ||
1266 | } | ||
1267 | } | ||
1268 | #endif | ||
1254 | 1269 | ||
1255 | } | 1270 | } |
1256 | 1271 | ||
1257 | void CalendarView::addAlarm(const QDateTime &qdt, const QString ¬i ) | 1272 | void CalendarView::addAlarm(const QDateTime &qdt, const QString ¬i ) |
1258 | { | 1273 | { |
1259 | mNextAlarmDateTime = qdt; | 1274 | mNextAlarmDateTime = qdt; |
1260 | //qDebug("+++++addAlarm %s %s ", qdt.toString().latin1() , noti.latin1() ); | 1275 | //qDebug("+++++addAlarm %s %s ", qdt.toString().latin1() , noti.latin1() ); |
1261 | if ( ! KOPrefs::instance()->mUseInternalAlarmNotification ) { | 1276 | if ( ! KOPrefs::instance()->mUseInternalAlarmNotification ) { |
1262 | #ifndef DESKTOP_VERSION | 1277 | #ifndef DESKTOP_VERSION |
1263 | AlarmServer::addAlarm ( qdt,"koalarm", noti.utf8() ); | 1278 | AlarmServer::addAlarm ( qdt,"koalarm", noti.utf8() ); |
1264 | #endif | 1279 | #endif |
1265 | return; | 1280 | return; |
1266 | } | 1281 | } |
1282 | #ifdef DESKTOP_VERSION | ||
1283 | if ( QApplication::desktop()->width() < 1024 ) { | ||
1284 | QString mess = qdt.toString( "yyyy-MM-dd hh:mm:ss" ) + "\n" + noti; | ||
1285 | //qDebug("nextalarm = \n%s ",mess.latin1() ); | ||
1286 | QString fn = QDir::homeDirPath() + "/.kopi_next_alarm"; | ||
1287 | QFile file( fn ); | ||
1288 | if (!file.open( IO_WriteOnly ) ) { | ||
1289 | qDebug("KO: Error writing next alarm file %s\nContent: \n%s ", fn.latin1(), mess.latin1()); | ||
1290 | } else { | ||
1291 | QTextStream ts( &file ); | ||
1292 | ts << mess; | ||
1293 | file.close(); | ||
1294 | } | ||
1295 | } | ||
1296 | #endif | ||
1267 | int maxSec; | 1297 | int maxSec; |
1268 | //maxSec = 5; //testing only | 1298 | //maxSec = 5; //testing only |
1269 | maxSec = 86400+3600; // one day+1hour | 1299 | maxSec = 86400+3600; // one day+1hour |
1270 | mAlarmNotification = noti; | 1300 | mAlarmNotification = noti; |
1271 | int sec = QDateTime::currentDateTime().secsTo( qdt ); | 1301 | int sec = QDateTime::currentDateTime().secsTo( qdt ); |
1272 | if ( sec > maxSec ) { | 1302 | if ( sec > maxSec ) { |
1273 | mRecheckAlarmTimer->start( maxSec * 1000 ); | 1303 | mRecheckAlarmTimer->start( maxSec * 1000 ); |
1274 | // qDebug("recheck Alarm timer started with secs: %d next alarm in sec:%d", maxSec,sec ); | 1304 | // qDebug("recheck Alarm timer started with secs: %d next alarm in sec:%d", maxSec,sec ); |
1275 | return; | 1305 | return; |
1276 | } else { | 1306 | } else { |
1277 | mRecheckAlarmTimer->stop(); | 1307 | mRecheckAlarmTimer->stop(); |
1278 | } | 1308 | } |
1279 | //qDebug("Alarm timer started with secs: %d ", sec); | 1309 | //qDebug("Alarm timer started with secs: %d ", sec); |
1280 | mAlarmTimer->start( sec *1000 , true ); | 1310 | mAlarmTimer->start( sec * 1000 , true ); |
1281 | 1311 | ||
1282 | } | 1312 | } |
1283 | // called by mRecheckAlarmTimer to get next alarm | 1313 | // called by mRecheckAlarmTimer to get next alarm |
1284 | // we need this, because a QTimer has only a max range of 25 days | 1314 | // we need this, because a QTimer has only a max range of 25 days |
1285 | void CalendarView::recheckTimerAlarm() | 1315 | void CalendarView::recheckTimerAlarm() |
1286 | { | 1316 | { |
1287 | mAlarmTimer->stop(); | 1317 | mAlarmTimer->stop(); |
1288 | mRecheckAlarmTimer->stop(); | 1318 | mRecheckAlarmTimer->stop(); |
1289 | mCalendar->checkAlarmForIncidence( 0, true ); | 1319 | mCalendar->checkAlarmForIncidence( 0, true ); |
1290 | } | 1320 | } |
1291 | #ifndef DESKTOP_VERSION | 1321 | #ifndef DESKTOP_VERSION |
1292 | void CalendarView::removeAlarm(const QDateTime &qdt, const QString ¬i ) | 1322 | void CalendarView::removeAlarm(const QDateTime &qdt, const QString ¬i ) |
1293 | #else | 1323 | #else |
1294 | void CalendarView::removeAlarm(const QDateTime &, const QString & ) | 1324 | void CalendarView::removeAlarm(const QDateTime &, const QString & ) |
1295 | #endif | 1325 | #endif |
1296 | { | 1326 | { |
1297 | //qDebug("-----removeAlarm %s %s ", qdt.toString().latin1() , noti.latin1() ); | 1327 | //qDebug("-----removeAlarm %s %s ", qdt.toString().latin1() , noti.latin1() ); |
1298 | if ( ! KOPrefs::instance()->mUseInternalAlarmNotification ) { | 1328 | if ( ! KOPrefs::instance()->mUseInternalAlarmNotification ) { |
1299 | #ifndef DESKTOP_VERSION | 1329 | #ifndef DESKTOP_VERSION |
1300 | AlarmServer::deleteAlarm (qdt ,"koalarm" ,noti.utf8() ); | 1330 | AlarmServer::deleteAlarm (qdt ,"koalarm" ,noti.utf8() ); |
1301 | #endif | 1331 | #endif |
1302 | return; | 1332 | return; |
1303 | } | 1333 | } |
1304 | mAlarmTimer->stop(); | 1334 | mAlarmTimer->stop(); |
1305 | } | 1335 | } |
1306 | void CalendarView::selectWeekNum ( int num ) | 1336 | void CalendarView::selectWeekNum ( int num ) |
1307 | { | 1337 | { |
1308 | dateNavigator()->blockSignals( true ); | 1338 | dateNavigator()->blockSignals( true ); |
1309 | dateNavigator()->selectWeek( num ); | 1339 | dateNavigator()->selectWeek( num ); |
1310 | dateNavigator()->blockSignals( false ); | 1340 | dateNavigator()->blockSignals( false ); |
1311 | mViewManager->showWeekView(); | 1341 | mViewManager->showWeekView(); |
1312 | } | 1342 | } |
1313 | KOViewManager *CalendarView::viewManager() | 1343 | KOViewManager *CalendarView::viewManager() |
1314 | { | 1344 | { |
1315 | return mViewManager; | 1345 | return mViewManager; |
1316 | } | 1346 | } |
1317 | 1347 | ||
1318 | KODialogManager *CalendarView::dialogManager() | 1348 | KODialogManager *CalendarView::dialogManager() |
1319 | { | 1349 | { |
1320 | return mDialogManager; | 1350 | return mDialogManager; |
1321 | } | 1351 | } |
1322 | 1352 | ||
1323 | QDate CalendarView::startDate() | 1353 | QDate CalendarView::startDate() |
1324 | { | 1354 | { |
1325 | DateList dates = mNavigator->selectedDates(); | 1355 | DateList dates = mNavigator->selectedDates(); |
1326 | 1356 | ||
1327 | return dates.first(); | 1357 | return dates.first(); |
1328 | } | 1358 | } |
1329 | 1359 | ||
1330 | QDate CalendarView::endDate() | 1360 | QDate CalendarView::endDate() |
1331 | { | 1361 | { |
1332 | DateList dates = mNavigator->selectedDates(); | 1362 | DateList dates = mNavigator->selectedDates(); |
1333 | 1363 | ||
1334 | return dates.last(); | 1364 | return dates.last(); |
1335 | } | 1365 | } |
1336 | 1366 | ||
1337 | 1367 | ||
1338 | void CalendarView::createPrinter() | 1368 | void CalendarView::createPrinter() |
1339 | { | 1369 | { |
1340 | #ifndef KORG_NOPRINTER | 1370 | #ifndef KORG_NOPRINTER |
1341 | if (!mCalPrinter) { | 1371 | if (!mCalPrinter) { |
1342 | mCalPrinter = new CalPrinter(this, mCalendar); | 1372 | mCalPrinter = new CalPrinter(this, mCalendar); |
1343 | connect(this, SIGNAL(configChanged()), mCalPrinter, SLOT(updateConfig())); | 1373 | connect(this, SIGNAL(configChanged()), mCalPrinter, SLOT(updateConfig())); |
1344 | } | 1374 | } |
1345 | #endif | 1375 | #endif |
1346 | } | 1376 | } |
1347 | 1377 | ||
1348 | 1378 | ||
1349 | //KOPrefs::instance()->mWriteBackFile | 1379 | //KOPrefs::instance()->mWriteBackFile |
1350 | //KOPrefs::instance()->mWriteBackExistingOnly | 1380 | //KOPrefs::instance()->mWriteBackExistingOnly |
1351 | 1381 | ||
1352 | // 0 syncPrefsGroup->addRadio(i18n("Take local entry on conflict")); | 1382 | // 0 syncPrefsGroup->addRadio(i18n("Take local entry on conflict")); |
1353 | // 1 syncPrefsGroup->addRadio(i18n("Take remote entry on conflict")); | 1383 | // 1 syncPrefsGroup->addRadio(i18n("Take remote entry on conflict")); |
1354 | // 2 syncPrefsGroup->addRadio(i18n("Take newest entry on conflict")); | 1384 | // 2 syncPrefsGroup->addRadio(i18n("Take newest entry on conflict")); |
1355 | // 3 syncPrefsGroup->addRadio(i18n("Ask for every entry on conflict")); | 1385 | // 3 syncPrefsGroup->addRadio(i18n("Ask for every entry on conflict")); |
1356 | // 4 syncPrefsGroup->addRadio(i18n("Force take local entry always")); | 1386 | // 4 syncPrefsGroup->addRadio(i18n("Force take local entry always")); |
1357 | // 5 syncPrefsGroup->addRadio(i18n("Force take remote entry always")); | 1387 | // 5 syncPrefsGroup->addRadio(i18n("Force take remote entry always")); |
1358 | 1388 | ||
1359 | int CalendarView::takeEvent( Incidence* local, Incidence* remote, int mode , bool full ) | 1389 | int CalendarView::takeEvent( Incidence* local, Incidence* remote, int mode , bool full ) |
1360 | { | 1390 | { |
1361 | 1391 | ||
1362 | // 0 equal | 1392 | // 0 equal |
1363 | // 1 take local | 1393 | // 1 take local |
1364 | // 2 take remote | 1394 | // 2 take remote |
1365 | // 3 cancel | 1395 | // 3 cancel |
1366 | QDateTime lastSync = mLastCalendarSync; | 1396 | QDateTime lastSync = mLastCalendarSync; |
1367 | QDateTime localMod = local->lastModified(); | 1397 | QDateTime localMod = local->lastModified(); |
1368 | QDateTime remoteMod = remote->lastModified(); | 1398 | QDateTime remoteMod = remote->lastModified(); |
1369 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 1399 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
1370 | bool remCh, locCh; | 1400 | bool remCh, locCh; |
1371 | remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) ); | 1401 | remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) ); |
1372 | //if ( remCh ) | 1402 | //if ( remCh ) |
1373 | //qDebug("loc %s rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() ); | 1403 | //qDebug("loc %s rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() ); |
1374 | locCh = ( localMod > mLastCalendarSync ); | 1404 | locCh = ( localMod > mLastCalendarSync ); |
1375 | if ( !remCh && ! locCh ) { | 1405 | if ( !remCh && ! locCh ) { |
1376 | //qDebug("both not changed "); | 1406 | //qDebug("both not changed "); |
1377 | lastSync = localMod.addDays(1); | 1407 | lastSync = localMod.addDays(1); |
1378 | if ( mode <= SYNC_PREF_ASK ) | 1408 | if ( mode <= SYNC_PREF_ASK ) |
1379 | return 0; | 1409 | return 0; |
1380 | } else { | 1410 | } else { |
1381 | if ( locCh ) { | 1411 | if ( locCh ) { |
1382 | //qDebug("loc changed %d %s %s", local->revision() , localMod.toString().latin1(), mLastCalendarSync.toString().latin1()); | 1412 | //qDebug("loc changed %d %s %s", local->revision() , localMod.toString().latin1(), mLastCalendarSync.toString().latin1()); |
1383 | lastSync = localMod.addDays( -1 ); | 1413 | lastSync = localMod.addDays( -1 ); |
1384 | if ( !remCh ) | 1414 | if ( !remCh ) |
1385 | remoteMod = ( lastSync.addDays( -1 ) ); | 1415 | remoteMod = ( lastSync.addDays( -1 ) ); |
1386 | } else { | 1416 | } else { |
1387 | //qDebug(" not loc changed "); | 1417 | //qDebug(" not loc changed "); |
1388 | lastSync = localMod.addDays( 1 ); | 1418 | lastSync = localMod.addDays( 1 ); |
1389 | if ( remCh ) | 1419 | if ( remCh ) |
1390 | remoteMod =( lastSync.addDays( 1 ) ); | 1420 | remoteMod =( lastSync.addDays( 1 ) ); |
1391 | 1421 | ||
1392 | } | 1422 | } |
1393 | } | 1423 | } |
1394 | full = true; | 1424 | full = true; |
1395 | if ( mode < SYNC_PREF_ASK ) | 1425 | if ( mode < SYNC_PREF_ASK ) |
1396 | mode = SYNC_PREF_ASK; | 1426 | mode = SYNC_PREF_ASK; |
1397 | } else { | 1427 | } else { |
1398 | if ( localMod == remoteMod ) | 1428 | if ( localMod == remoteMod ) |
1399 | // if ( local->revision() == remote->revision() ) | 1429 | // if ( local->revision() == remote->revision() ) |
1400 | return 0; | 1430 | return 0; |
1401 | 1431 | ||
1402 | } | 1432 | } |
1403 | // qDebug(" %d %d conflict on %s %s ", mode, full, local->summary().latin1(), remote->summary().latin1() ); | 1433 | // qDebug(" %d %d conflict on %s %s ", mode, full, local->summary().latin1(), remote->summary().latin1() ); |
1404 | 1434 | ||
1405 | //qDebug("%s %d %s %d", localMod.toString().latin1() , local->revision(), remoteMod.toString().latin1(), remote->revision()); | 1435 | //qDebug("%s %d %s %d", localMod.toString().latin1() , local->revision(), remoteMod.toString().latin1(), remote->revision()); |
1406 | //qDebug("%d %d %d %d ", localMod.time().second(), localMod.time().msec(), remoteMod.time().second(), remoteMod.time().msec() ); | 1436 | //qDebug("%d %d %d %d ", localMod.time().second(), localMod.time().msec(), remoteMod.time().second(), remoteMod.time().msec() ); |
1407 | //full = true; //debug only | 1437 | //full = true; //debug only |
1408 | if ( full ) { | 1438 | if ( full ) { |
1409 | bool equ = false; | 1439 | bool equ = false; |
1410 | if ( local->typeID() == eventID ) { | 1440 | if ( local->typeID() == eventID ) { |
1411 | equ = (*((Event*) local) == *((Event*) remote)); | 1441 | equ = (*((Event*) local) == *((Event*) remote)); |
1412 | } | 1442 | } |
1413 | else if ( local->typeID() == todoID ) | 1443 | else if ( local->typeID() == todoID ) |
1414 | equ = (*((Todo*) local) == (*(Todo*) remote)); | 1444 | equ = (*((Todo*) local) == (*(Todo*) remote)); |
1415 | else if ( local->typeID() == journalID ) | 1445 | else if ( local->typeID() == journalID ) |
1416 | equ = (*((Journal*) local) == *((Journal*) remote)); | 1446 | equ = (*((Journal*) local) == *((Journal*) remote)); |
1417 | if ( equ ) { | 1447 | if ( equ ) { |
1418 | //qDebug("equal "); | 1448 | //qDebug("equal "); |
1419 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 1449 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
1420 | local->setCsum( mCurrentSyncDevice, remote->getCsum(mCurrentSyncDevice) ); | 1450 | local->setCsum( mCurrentSyncDevice, remote->getCsum(mCurrentSyncDevice) ); |
1421 | } | 1451 | } |
1422 | if ( mode < SYNC_PREF_FORCE_LOCAL ) | 1452 | if ( mode < SYNC_PREF_FORCE_LOCAL ) |
1423 | return 0; | 1453 | return 0; |
1424 | 1454 | ||
1425 | }//else //debug only | 1455 | }//else //debug only |
1426 | //qDebug("not equal %s %s ", local->summary().latin1(), remote->summary().latin1()); | 1456 | //qDebug("not equal %s %s ", local->summary().latin1(), remote->summary().latin1()); |
1427 | } | 1457 | } |
1428 | int result; | 1458 | int result; |
1429 | bool localIsNew; | 1459 | bool localIsNew; |
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() ); | 1460 | //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() ); |
1431 | 1461 | ||
1432 | 1462 | ||
1433 | // ************************************************ | 1463 | // ************************************************ |
1434 | // ************************************************ | 1464 | // ************************************************ |
1435 | // ************************************************ | 1465 | // ************************************************ |
1436 | // We may have that lastSync > remoteMod AND lastSync > localMod | 1466 | // We may have that lastSync > remoteMod AND lastSync > localMod |
1437 | // BUT remoteMod != localMod | 1467 | // BUT remoteMod != localMod |
1438 | 1468 | ||
1439 | 1469 | ||
1440 | if ( full && mode < SYNC_PREF_NEWEST ) | 1470 | if ( full && mode < SYNC_PREF_NEWEST ) |
1441 | mode = SYNC_PREF_ASK; | 1471 | mode = SYNC_PREF_ASK; |
1442 | 1472 | ||
1443 | switch( mode ) { | 1473 | switch( mode ) { |
1444 | case SYNC_PREF_LOCAL: | 1474 | case SYNC_PREF_LOCAL: |
1445 | if ( lastSync > remoteMod ) | 1475 | if ( lastSync > remoteMod ) |
1446 | return 1; | 1476 | return 1; |
1447 | if ( lastSync > localMod ) | 1477 | if ( lastSync > localMod ) |
1448 | return 2; | 1478 | return 2; |
1449 | return 1; | 1479 | return 1; |
1450 | break; | 1480 | break; |
1451 | case SYNC_PREF_REMOTE: | 1481 | case SYNC_PREF_REMOTE: |
1452 | if ( lastSync > localMod ) | 1482 | if ( lastSync > localMod ) |
1453 | return 2; | 1483 | return 2; |
1454 | if ( lastSync > remoteMod ) | 1484 | if ( lastSync > remoteMod ) |
1455 | return 1; | 1485 | return 1; |
1456 | return 2; | 1486 | return 2; |
1457 | break; | 1487 | break; |
1458 | case SYNC_PREF_NEWEST: | 1488 | case SYNC_PREF_NEWEST: |
1459 | if ( localMod >= remoteMod ) | 1489 | if ( localMod >= remoteMod ) |
1460 | return 1; | 1490 | return 1; |
1461 | else | 1491 | else |
1462 | return 2; | 1492 | return 2; |
1463 | break; | 1493 | break; |
1464 | case SYNC_PREF_ASK: | 1494 | case SYNC_PREF_ASK: |
1465 | qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1() ); | 1495 | qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1() ); |
1466 | if ( lastSync > remoteMod && lastSync > localMod) | 1496 | if ( lastSync > remoteMod && lastSync > localMod) |
1467 | return 0; | 1497 | return 0; |
1468 | if ( lastSync > remoteMod ) | 1498 | if ( lastSync > remoteMod ) |
1469 | return 1; | 1499 | return 1; |
1470 | if ( lastSync > localMod ) | 1500 | if ( lastSync > localMod ) |
1471 | return 2; | 1501 | return 2; |
1472 | qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1() ); | 1502 | qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1() ); |
1473 | localIsNew = localMod >= remoteMod; | 1503 | localIsNew = localMod >= remoteMod; |
1474 | if ( localIsNew ) | 1504 | if ( localIsNew ) |
1475 | getEventViewerDialog()->setColorMode( 1 ); | 1505 | getEventViewerDialog()->setColorMode( 1 ); |
1476 | else | 1506 | else |
1477 | getEventViewerDialog()->setColorMode( 2 ); | 1507 | getEventViewerDialog()->setColorMode( 2 ); |
1478 | getEventViewerDialog()->setIncidence(local); | 1508 | getEventViewerDialog()->setIncidence(local); |
1479 | if ( localIsNew ) | 1509 | if ( localIsNew ) |
1480 | getEventViewerDialog()->setColorMode( 2 ); | 1510 | getEventViewerDialog()->setColorMode( 2 ); |
1481 | else | 1511 | else |
1482 | getEventViewerDialog()->setColorMode( 1 ); | 1512 | getEventViewerDialog()->setColorMode( 1 ); |
1483 | getEventViewerDialog()->addIncidence(remote); | 1513 | getEventViewerDialog()->addIncidence(remote); |
1484 | getEventViewerDialog()->setColorMode( 0 ); | 1514 | getEventViewerDialog()->setColorMode( 0 ); |
1485 | //qDebug("local %d remote %d ",local->relatedTo(),remote->relatedTo() ); | 1515 | //qDebug("local %d remote %d ",local->relatedTo(),remote->relatedTo() ); |
1486 | getEventViewerDialog()->setCaption( mCurrentSyncDevice +i18n(" : Conflict! Please choose entry!")); | 1516 | getEventViewerDialog()->setCaption( mCurrentSyncDevice +i18n(" : Conflict! Please choose entry!")); |
1487 | getEventViewerDialog()->showMe(); | 1517 | getEventViewerDialog()->showMe(); |
1488 | result = getEventViewerDialog()->executeS( localIsNew ); | 1518 | result = getEventViewerDialog()->executeS( localIsNew ); |
1489 | return result; | 1519 | return result; |
1490 | 1520 | ||
1491 | break; | 1521 | break; |
1492 | case SYNC_PREF_FORCE_LOCAL: | 1522 | case SYNC_PREF_FORCE_LOCAL: |
1493 | return 1; | 1523 | return 1; |
1494 | break; | 1524 | break; |
1495 | case SYNC_PREF_FORCE_REMOTE: | 1525 | case SYNC_PREF_FORCE_REMOTE: |
1496 | return 2; | 1526 | return 2; |
1497 | break; | 1527 | break; |
1498 | 1528 | ||
1499 | default: | 1529 | default: |
1500 | // SYNC_PREF_TAKE_BOTH not implemented | 1530 | // SYNC_PREF_TAKE_BOTH not implemented |
1501 | break; | 1531 | break; |
1502 | } | 1532 | } |
1503 | return 0; | 1533 | return 0; |
1504 | } | 1534 | } |
1505 | Event* CalendarView::getLastSyncEvent() | 1535 | Event* CalendarView::getLastSyncEvent() |
1506 | { | 1536 | { |
1507 | Event* lse; | 1537 | Event* lse; |
1508 | //qDebug("CurrentSyncDevice %s ",mCurrentSyncDevice .latin1() ); | 1538 | //qDebug("CurrentSyncDevice %s ",mCurrentSyncDevice .latin1() ); |
1509 | lse = mCalendar->event( "last-syncEvent-"+mCurrentSyncDevice ); | 1539 | lse = mCalendar->event( "last-syncEvent-"+mCurrentSyncDevice ); |
1510 | if (!lse) { | 1540 | if (!lse) { |
1511 | lse = new Event(); | 1541 | lse = new Event(); |
1512 | lse->setUid( "last-syncEvent-"+mCurrentSyncDevice ); | 1542 | lse->setUid( "last-syncEvent-"+mCurrentSyncDevice ); |
1513 | QString sum = ""; | 1543 | QString sum = ""; |
1514 | if ( mSyncManager->mExternSyncProfiles.contains( mCurrentSyncDevice ) ) | 1544 | if ( mSyncManager->mExternSyncProfiles.contains( mCurrentSyncDevice ) ) |
1515 | sum = "E: "; | 1545 | sum = "E: "; |
1516 | lse->setSummary(sum+mCurrentSyncDevice + i18n(" - sync event")); | 1546 | lse->setSummary(sum+mCurrentSyncDevice + i18n(" - sync event")); |
1517 | lse->setDtStart( mLastCalendarSync ); | 1547 | lse->setDtStart( mLastCalendarSync ); |
1518 | lse->setDtEnd( mLastCalendarSync.addSecs( 7200 ) ); | 1548 | lse->setDtEnd( mLastCalendarSync.addSecs( 7200 ) ); |
1519 | lse->setCategories( i18n("SyncEvent") ); | 1549 | lse->setCategories( i18n("SyncEvent") ); |
1520 | lse->setReadOnly( true ); | 1550 | lse->setReadOnly( true ); |
1521 | mCalendar->addEvent( lse ); | 1551 | mCalendar->addEvent( lse ); |
1522 | } | 1552 | } |
1523 | 1553 | ||
1524 | return lse; | 1554 | return lse; |
1525 | 1555 | ||
1526 | } | 1556 | } |
1527 | 1557 | ||
1528 | // we check, if the to delete event has a id for a profile | 1558 | // we check, if the to delete event has a id for a profile |
1529 | // if yes, we set this id in the profile to delete | 1559 | // if yes, we set this id in the profile to delete |
1530 | void CalendarView::checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* toDelete ) | 1560 | void CalendarView::checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* toDelete ) |
1531 | { | 1561 | { |
1532 | if ( lastSync.count() == 0 ) { | 1562 | if ( lastSync.count() == 0 ) { |
1533 | //qDebug(" lastSync.count() == 0"); | 1563 | //qDebug(" lastSync.count() == 0"); |
1534 | return; | 1564 | return; |
1535 | } | 1565 | } |
1536 | if ( toDelete->typeID() == journalID ) | 1566 | if ( toDelete->typeID() == journalID ) |
1537 | return; | 1567 | return; |
1538 | 1568 | ||
1539 | Event* eve = lastSync.first(); | 1569 | Event* eve = lastSync.first(); |
1540 | 1570 | ||
1541 | while ( eve ) { | 1571 | while ( eve ) { |
1542 | QString id = toDelete->getID( eve->uid().mid( 15 ) ); // this is the sync profile name | 1572 | QString id = toDelete->getID( eve->uid().mid( 15 ) ); // this is the sync profile name |
1543 | if ( !id.isEmpty() ) { | 1573 | if ( !id.isEmpty() ) { |
1544 | QString des = eve->description(); | 1574 | QString des = eve->description(); |
1545 | QString pref = "e"; | 1575 | QString pref = "e"; |
1546 | if ( toDelete->typeID() == todoID ) | 1576 | if ( toDelete->typeID() == todoID ) |
1547 | pref = "t"; | 1577 | pref = "t"; |
1548 | des += pref+ id + ","; | 1578 | des += pref+ id + ","; |
1549 | eve->setReadOnly( false ); | 1579 | eve->setReadOnly( false ); |
1550 | eve->setDescription( des ); | 1580 | eve->setDescription( des ); |
1551 | //qDebug("setdes %s ", des.latin1()); | 1581 | //qDebug("setdes %s ", des.latin1()); |
1552 | eve->setReadOnly( true ); | 1582 | eve->setReadOnly( true ); |
1553 | } | 1583 | } |
1554 | eve = lastSync.next(); | 1584 | eve = lastSync.next(); |
1555 | } | 1585 | } |
1556 | 1586 | ||
1557 | } | 1587 | } |
1558 | void CalendarView::checkExternalId( Incidence * inc ) | 1588 | void CalendarView::checkExternalId( Incidence * inc ) |
1559 | { | 1589 | { |
1560 | QPtrList<Event> lastSync = mCalendar->getExternLastSyncEvents() ; | 1590 | QPtrList<Event> lastSync = mCalendar->getExternLastSyncEvents() ; |
1561 | checkExternSyncEvent( lastSync, inc ); | 1591 | checkExternSyncEvent( lastSync, inc ); |
1562 | 1592 | ||
1563 | } | 1593 | } |
1564 | bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int mode ) | 1594 | bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int mode ) |
1565 | { | 1595 | { |
1566 | bool syncOK = true; | 1596 | bool syncOK = true; |
1567 | int addedEvent = 0; | 1597 | int addedEvent = 0; |
1568 | int addedEventR = 0; | 1598 | int addedEventR = 0; |
1569 | int deletedEventR = 0; | 1599 | int deletedEventR = 0; |
1570 | int deletedEventL = 0; | 1600 | int deletedEventL = 0; |
1571 | int changedLocal = 0; | 1601 | int changedLocal = 0; |
1572 | int changedRemote = 0; | 1602 | int changedRemote = 0; |
1573 | int filteredIN = 0; | 1603 | int filteredIN = 0; |
1574 | int filteredOUT = 0; | 1604 | int filteredOUT = 0; |
1575 | //QPtrList<Event> el = local->rawEvents(); | 1605 | //QPtrList<Event> el = local->rawEvents(); |
1576 | Event* eventR; | 1606 | Event* eventR; |
1577 | QString uid; | 1607 | QString uid; |
1578 | int take; | 1608 | int take; |
1579 | Event* eventRSync; | 1609 | Event* eventRSync; |
1580 | Event* eventLSync; | 1610 | Event* eventLSync; |
1581 | clearAllViews(); | 1611 | clearAllViews(); |
1582 | QPtrList<Event> eventRSyncSharp = remote->getExternLastSyncEvents(); | 1612 | QPtrList<Event> eventRSyncSharp = remote->getExternLastSyncEvents(); |
1583 | QPtrList<Event> eventLSyncSharp = local->getExternLastSyncEvents(); | 1613 | QPtrList<Event> eventLSyncSharp = local->getExternLastSyncEvents(); |
1584 | bool fullDateRange = false; | 1614 | bool fullDateRange = false; |
1585 | local->resetTempSyncStat(); | 1615 | local->resetTempSyncStat(); |
1586 | mLastCalendarSync = QDateTime::currentDateTime(); | 1616 | mLastCalendarSync = QDateTime::currentDateTime(); |
1587 | if ( mSyncManager->syncWithDesktop() ) { | 1617 | if ( mSyncManager->syncWithDesktop() ) { |
1588 | remote->resetPilotStat(1); | 1618 | remote->resetPilotStat(1); |
1589 | if ( KSyncManager::mRequestedSyncEvent.isValid() ) { | 1619 | if ( KSyncManager::mRequestedSyncEvent.isValid() ) { |
1590 | mLastCalendarSync = KSyncManager::mRequestedSyncEvent; | 1620 | mLastCalendarSync = KSyncManager::mRequestedSyncEvent; |
1591 | qDebug("KO: using extern time for calendar sync: %s ", mLastCalendarSync.toString().latin1() ); | 1621 | qDebug("KO: using extern time for calendar sync: %s ", mLastCalendarSync.toString().latin1() ); |
1592 | } else { | 1622 | } else { |
1593 | qDebug("KSyncManager::mRequestedSyncEvent has invalid datatime "); | 1623 | qDebug("KSyncManager::mRequestedSyncEvent has invalid datatime "); |
1594 | } | 1624 | } |
1595 | } | 1625 | } |
1596 | QDateTime modifiedCalendar = mLastCalendarSync; | 1626 | QDateTime modifiedCalendar = mLastCalendarSync; |
1597 | eventLSync = getLastSyncEvent(); | 1627 | eventLSync = getLastSyncEvent(); |
1598 | eventR = remote->event("last-syncEvent-"+mCurrentSyncName ); | 1628 | eventR = remote->event("last-syncEvent-"+mCurrentSyncName ); |
1599 | if ( eventR ) { | 1629 | if ( eventR ) { |
1600 | qDebug("last-syncEvent on remote found "); | 1630 | qDebug("last-syncEvent on remote found "); |
1601 | eventRSync = (Event*) eventR->clone(); | 1631 | eventRSync = (Event*) eventR->clone(); |
1602 | remote->deleteEvent(eventR ); | 1632 | remote->deleteEvent(eventR ); |
1603 | 1633 | ||
1604 | } else { | 1634 | } else { |
1605 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL || mSyncManager->syncWithDesktop()) { | 1635 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL || mSyncManager->syncWithDesktop()) { |
1606 | eventRSync = (Event*)eventLSync->clone(); | 1636 | eventRSync = (Event*)eventLSync->clone(); |
1607 | } else { | 1637 | } else { |
1608 | fullDateRange = true; | 1638 | fullDateRange = true; |
1609 | eventRSync = new Event(); | 1639 | eventRSync = new Event(); |
1610 | eventRSync->setSummary(mCurrentSyncName + i18n(" - sync event")); | 1640 | eventRSync->setSummary(mCurrentSyncName + i18n(" - sync event")); |
1611 | eventRSync->setUid("last-syncEvent-"+mCurrentSyncName ); | 1641 | eventRSync->setUid("last-syncEvent-"+mCurrentSyncName ); |
1612 | eventRSync->setDtStart( mLastCalendarSync ); | 1642 | eventRSync->setDtStart( mLastCalendarSync ); |
1613 | eventRSync->setDtEnd( mLastCalendarSync.addSecs( 7200 ) ); | 1643 | eventRSync->setDtEnd( mLastCalendarSync.addSecs( 7200 ) ); |
1614 | eventRSync->setCategories( i18n("SyncEvent") ); | 1644 | eventRSync->setCategories( i18n("SyncEvent") ); |
1615 | } | 1645 | } |
1616 | } | 1646 | } |
1617 | if ( eventLSync->dtStart() == mLastCalendarSync ) | 1647 | if ( eventLSync->dtStart() == mLastCalendarSync ) |
1618 | fullDateRange = true; | 1648 | fullDateRange = true; |
1619 | 1649 | ||
1620 | if ( ! fullDateRange ) { | 1650 | if ( ! fullDateRange ) { |
1621 | if ( eventLSync->dtStart() != eventRSync->dtStart() ) { | 1651 | if ( eventLSync->dtStart() != eventRSync->dtStart() ) { |
1622 | 1652 | ||
1623 | qDebug("set fulldate to true %s %s" ,eventLSync->dtStart().toString().latin1(), eventRSync->dtStart().toString().latin1() ); | 1653 | qDebug("set fulldate to true %s %s" ,eventLSync->dtStart().toString().latin1(), eventRSync->dtStart().toString().latin1() ); |
1624 | //qDebug("%d %d %d %d ", eventLSync->dtStart().time().second(), eventLSync->dtStart().time().msec() , eventRSync->dtStart().time().second(), eventRSync->dtStart().time().msec()); | 1654 | //qDebug("%d %d %d %d ", eventLSync->dtStart().time().second(), eventLSync->dtStart().time().msec() , eventRSync->dtStart().time().second(), eventRSync->dtStart().time().msec()); |
1625 | fullDateRange = true; | 1655 | fullDateRange = true; |
1626 | } | 1656 | } |
1627 | } | 1657 | } |
1628 | if ( mSyncManager->syncWithDesktop() ) { | 1658 | if ( mSyncManager->syncWithDesktop() ) { |
1629 | fullDateRange = ( eventLSync->dtStart() <= mLastCalendarSync && eventLSync->dtStart().addSecs(1) >= mLastCalendarSync ); | 1659 | fullDateRange = ( eventLSync->dtStart() <= mLastCalendarSync && eventLSync->dtStart().addSecs(1) >= mLastCalendarSync ); |
1630 | } | 1660 | } |
1631 | if ( fullDateRange ) | 1661 | if ( fullDateRange ) |
1632 | mLastCalendarSync = QDateTime::currentDateTime().addDays( -100*365); | 1662 | mLastCalendarSync = QDateTime::currentDateTime().addDays( -100*365); |
1633 | else | 1663 | else |
1634 | mLastCalendarSync = eventLSync->dtStart(); | 1664 | mLastCalendarSync = eventLSync->dtStart(); |
1635 | // for resyncing if own file has changed | 1665 | // for resyncing if own file has changed |
1636 | if ( mCurrentSyncDevice == "deleteaftersync" ) { | 1666 | if ( mCurrentSyncDevice == "deleteaftersync" ) { |
1637 | mLastCalendarSync = loadedFileVersion; | 1667 | mLastCalendarSync = loadedFileVersion; |
1638 | //qDebug("setting mLastCalendarSync "); | 1668 | //qDebug("setting mLastCalendarSync "); |
1639 | } | 1669 | } |
1640 | //qDebug("*************************** "); | 1670 | //qDebug("*************************** "); |
1641 | qDebug("KO: mLastCalendarSync %s .Full: %d",mLastCalendarSync.toString().latin1(), fullDateRange); | 1671 | qDebug("KO: mLastCalendarSync %s .Full: %d",mLastCalendarSync.toString().latin1(), fullDateRange); |
1642 | QPtrList<Incidence> er = remote->rawIncidences(); | 1672 | QPtrList<Incidence> er = remote->rawIncidences(); |
1643 | Incidence* inR = er.first(); | 1673 | Incidence* inR = er.first(); |
1644 | Incidence* inL; | 1674 | Incidence* inL; |
1645 | QProgressBar bar( er.count(),0 ); | 1675 | QProgressBar bar( er.count(),0 ); |
1646 | bar.setCaption (i18n("Syncing - close to abort!") ); | 1676 | bar.setCaption (i18n("Syncing - close to abort!") ); |
1647 | 1677 | ||
1648 | // ************** setting up filter ************* | 1678 | // ************** setting up filter ************* |
1649 | CalFilter *filterIN = 0; | 1679 | CalFilter *filterIN = 0; |
1650 | CalFilter *filterOUT = 0; | 1680 | CalFilter *filterOUT = 0; |
1651 | CalFilter *filter = mFilters.first(); | 1681 | CalFilter *filter = mFilters.first(); |
1652 | while(filter) { | 1682 | while(filter) { |
1653 | if ( filter->name() == mSyncManager->mFilterInCal ) | 1683 | if ( filter->name() == mSyncManager->mFilterInCal ) |
1654 | filterIN = filter; | 1684 | filterIN = filter; |
1655 | if ( filter->name() == mSyncManager->mFilterOutCal ) | 1685 | if ( filter->name() == mSyncManager->mFilterOutCal ) |
1656 | filterOUT = filter; | 1686 | filterOUT = filter; |
1657 | filter = mFilters.next(); | 1687 | filter = mFilters.next(); |
1658 | } | 1688 | } |
1659 | int w = 300; | 1689 | int w = 300; |
1660 | if ( QApplication::desktop()->width() < 320 ) | 1690 | if ( QApplication::desktop()->width() < 320 ) |
1661 | w = 220; | 1691 | w = 220; |
1662 | int h = bar.sizeHint().height() ; | 1692 | int h = bar.sizeHint().height() ; |
1663 | int dw = QApplication::desktop()->width(); | 1693 | int dw = QApplication::desktop()->width(); |
1664 | int dh = QApplication::desktop()->height(); | 1694 | int dh = QApplication::desktop()->height(); |