summaryrefslogtreecommitdiffabout
path: root/korganizer/koagendaview.cpp
Unidiff
Diffstat (limited to 'korganizer/koagendaview.cpp') (more/less context) (show whitespace changes)
-rw-r--r--korganizer/koagendaview.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index c8cef44..d4ff77a 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -935,97 +935,96 @@ void KOAgendaView::updateEventDates(KOAgendaItem *item, int type)
935 QDate startDate; 935 QDate startDate;
936 int lenInSecs; 936 int lenInSecs;
937 // if ( type == KOAgenda::RESIZETOP ) 937 // if ( type == KOAgenda::RESIZETOP )
938 // qDebug("RESIZETOP "); 938 // qDebug("RESIZETOP ");
939 // if ( type == KOAgenda::RESIZEBOTTOM ) 939 // if ( type == KOAgenda::RESIZEBOTTOM )
940 // qDebug("RESIZEBOTTOM "); 940 // qDebug("RESIZEBOTTOM ");
941 // if ( type == KOAgenda::MOVE ) 941 // if ( type == KOAgenda::MOVE )
942 // qDebug("MOVE "); 942 // qDebug("MOVE ");
943 if ( item->incidence()->type() == "Event" ) { 943 if ( item->incidence()->type() == "Event" ) {
944 startDt =item->incidence()->dtStart(); 944 startDt =item->incidence()->dtStart();
945 endDt = item->incidence()->dtEnd(); 945 endDt = item->incidence()->dtEnd();
946 lenInSecs = startDt.secsTo( endDt ); 946 lenInSecs = startDt.secsTo( endDt );
947 } 947 }
948 948
949 // emit incidenceItemChanged( item->incidence(), KOGlobals::EVENTEDITED ); 949 // emit incidenceItemChanged( item->incidence(), KOGlobals::EVENTEDITED );
950 950
951 if ( item->incidence()->type()=="Todo" && item->mLastMoveXPos > 0 ) { 951 if ( item->incidence()->type()=="Todo" && item->mLastMoveXPos > 0 ) {
952 startDate = mSelectedDates[item->mLastMoveXPos]; 952 startDate = mSelectedDates[item->mLastMoveXPos];
953 } else { 953 } else {
954 if (item->cellX() < 0) { 954 if (item->cellX() < 0) {
955 startDate = (mSelectedDates.first()).addDays(item->cellX()); 955 startDate = (mSelectedDates.first()).addDays(item->cellX());
956 } else { 956 } else {
957 startDate = mSelectedDates[item->cellX()]; 957 startDate = mSelectedDates[item->cellX()];
958 } 958 }
959 } 959 }
960 startDt.setDate(startDate); 960 startDt.setDate(startDate);
961 961
962 if (item->incidence()->doesFloat()) { 962 if (item->incidence()->doesFloat()) {
963 endDt.setDate(startDate.addDays(item->cellWidth() - 1)); 963 endDt.setDate(startDate.addDays(item->cellWidth() - 1));
964 } else { 964 } else {
965 if ( type == KOAgenda::RESIZETOP || type == KOAgenda::MOVE ) 965 if ( type == KOAgenda::RESIZETOP || type == KOAgenda::MOVE )
966 startDt.setTime(mAgenda->gyToTime(item->cellYTop())); 966 startDt.setTime(mAgenda->gyToTime(item->cellYTop()));
967 if ( item->incidence()->type() == "Event" ) { 967 if ( item->incidence()->type() == "Event" ) {
968 if ( type == KOAgenda::MOVE ) { 968 if ( type == KOAgenda::MOVE ) {
969 endDt = startDt.addSecs(lenInSecs); 969 endDt = startDt.addSecs(lenInSecs);
970 970
971 } else if ( type == KOAgenda::RESIZEBOTTOM ) { 971 } else if ( type == KOAgenda::RESIZEBOTTOM ) {
972 if (item->lastMultiItem()) { 972 if (item->lastMultiItem()) {
973 endDt.setTime(mAgenda->gyToTime(item->lastMultiItem()->cellYBottom()+1)); 973 endDt.setTime(mAgenda->gyToTime(item->lastMultiItem()->cellYBottom()+1));
974 endDt.setDate(startDate. 974 endDt.setDate(startDate.
975 addDays(item->lastMultiItem()->cellX() - item->cellX())); 975 addDays(item->lastMultiItem()->cellX() - item->cellX()));
976 } else { 976 } else {
977 endDt.setTime(mAgenda->gyToTime(item->cellYBottom()+1)); 977 endDt.setTime(mAgenda->gyToTime(item->cellYBottom()+1));
978 endDt.setDate(startDate); 978 endDt.setDate(startDate);
979 } 979 }
980 } 980 }
981 } else { 981 } else {
982 // todo 982 // todo
983 qDebug("tooooodoooooo ");
984 if (item->lastMultiItem()) { 983 if (item->lastMultiItem()) {
985 endDt.setTime(mAgenda->gyToTime(item->lastMultiItem()->cellYBottom()+1)); 984 endDt.setTime(mAgenda->gyToTime(item->lastMultiItem()->cellYBottom()+1));
986 endDt.setDate(startDate. 985 endDt.setDate(startDate.
987 addDays(item->lastMultiItem()->cellX() - item->cellX())); 986 addDays(item->lastMultiItem()->cellX() - item->cellX()));
988 } else { 987 } else {
989 //qDebug("tem->cellYBottom() %d",item->cellYBottom() ); 988 //qDebug("tem->cellYBottom() %d",item->cellYBottom() );
990 if ( item->cellYBottom() > 0 ) 989 if ( item->cellYBottom() > 0 )
991 endDt.setTime(mAgenda->gyToTime(item->cellYBottom()+1)); 990 endDt.setTime(mAgenda->gyToTime(item->cellYBottom()+1));
992 else 991 else
993 endDt.setTime((static_cast<Todo*>(item->incidence()))->dtDue().time()); 992 endDt.setTime((static_cast<Todo*>(item->incidence()))->dtDue().time());
994 endDt.setDate(startDate); 993 endDt.setDate(startDate);
995 } 994 }
996 } 995 }
997 } 996 }
998 if ( item->incidence()->type() == "Event" ) { 997 if ( item->incidence()->type() == "Event" ) {
999 item->incidence()->setDtStart(startDt); 998 item->incidence()->setDtStart(startDt);
1000 (static_cast<Event*>(item->incidence()))->setDtEnd(endDt); 999 (static_cast<Event*>(item->incidence()))->setDtEnd(endDt);
1001 } else if ( item->incidence()->type() == "Todo" ) { 1000 } else if ( item->incidence()->type() == "Todo" ) {
1002 (static_cast<Todo*>(item->incidence()))->setDtDue(endDt); 1001 (static_cast<Todo*>(item->incidence()))->setDtDue(endDt);
1003 } 1002 }
1004 //qDebug("KOAgendaView::updateEventDates stsart %s end %s ", startDt.toString().latin1(), endDt.toString().latin1() ); 1003 //qDebug("KOAgendaView::updateEventDates stsart %s end %s ", startDt.toString().latin1(), endDt.toString().latin1() );
1005 item->incidence()->setRevision(item->incidence()->revision()+1); 1004 item->incidence()->setRevision(item->incidence()->revision()+1);
1006 item->setItemDate(startDt.date()); 1005 item->setItemDate(startDt.date());
1007 //item->updateItem(); 1006 //item->updateItem();
1008 if ( item->incidence()->type() == "Todo" ) { 1007 if ( item->incidence()->type() == "Todo" ) {
1009 emit todoMoved((Todo*)item->incidence(), KOGlobals::EVENTEDITED ); 1008 emit todoMoved((Todo*)item->incidence(), KOGlobals::EVENTEDITED );
1010 1009
1011 } 1010 }
1012 else 1011 else
1013 emit incidenceChanged(item->incidence(), KOGlobals::EVENTEDITED); 1012 emit incidenceChanged(item->incidence(), KOGlobals::EVENTEDITED);
1014 item->updateItem(); 1013 item->updateItem();
1015} 1014}
1016 1015
1017void KOAgendaView::showDates( const QDate &start, const QDate &end ) 1016void KOAgendaView::showDates( const QDate &start, const QDate &end )
1018{ 1017{
1019 // kdDebug() << "KOAgendaView::selectDates" << endl; 1018 // kdDebug() << "KOAgendaView::selectDates" << endl;
1020 1019
1021 mSelectedDates.clear(); 1020 mSelectedDates.clear();
1022 // qDebug("KOAgendaView::showDates "); 1021 // qDebug("KOAgendaView::showDates ");
1023 QDate d = start; 1022 QDate d = start;
1024 while (d <= end) { 1023 while (d <= end) {
1025 mSelectedDates.append(d); 1024 mSelectedDates.append(d);
1026 d = d.addDays( 1 ); 1025 d = d.addDays( 1 );
1027 } 1026 }
1028 1027
1029 // and update the view 1028 // and update the view
1030 fillAgenda(); 1029 fillAgenda();
1031} 1030}