author | alwin <alwin> | 2005-03-17 20:56:54 (UTC) |
---|---|---|
committer | alwin <alwin> | 2005-03-17 20:56:54 (UTC) |
commit | 120694217c012e3c1c394db0598da41f2705e965 (patch) (side-by-side diff) | |
tree | 6fa3d501c94aa2f6bfce7bc2c1a0556b69e75e20 /core | |
parent | 7382ac56570e7be468c570de27d5f7a40735873f (diff) | |
download | opie-120694217c012e3c1c394db0598da41f2705e965.zip opie-120694217c012e3c1c394db0598da41f2705e965.tar.gz opie-120694217c012e3c1c394db0598da41f2705e965.tar.bz2 |
fix error in thinking about date-diffs I made
-rw-r--r-- | core/pim/datebook/datebookweeklst.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/pim/datebook/datebookweeklst.cpp b/core/pim/datebook/datebookweeklst.cpp index 0555bc7..b0e78f1 100644 --- a/core/pim/datebook/datebookweeklst.cpp +++ b/core/pim/datebook/datebookweeklst.cpp @@ -363,55 +363,55 @@ void DateBookWeekLst::setDbl(bool on) { } void DateBookWeekLst::redraw() {getEvents();} QDate DateBookWeekLst::date() { return bdate; } // return the date at the beginning of the week... // copied from DateBookWeek QDate DateBookWeekLst::weekDate() const { QDate d=bdate; // Calculate offset to first day of week. int dayoffset=d.dayOfWeek(); if(bStartOnMonday) dayoffset--; else if( dayoffset == 7 ) dayoffset = 0; return d.addDays(-dayoffset); } void DateBookWeekLst::getEvents() { QDate start = weekDate(); //date(); - QDate stop = start.addDays(7); + QDate stop = start.addDays(6); QValueList<EffectiveEvent> el = db->getEffectiveEvents(start, stop); if (view) delete view; if (dbl) { - QDate start2=start.addDays(8); - stop=start2.addDays(7); + QDate start2=start.addDays(7); + stop=start2.addDays(6); QValueList<EffectiveEvent> el2 = db->getEffectiveEvents(start2, stop); view=new DateBookWeekLstDblView(el,el2,start,bStartOnMonday,scroll); } else { view=new DateBookWeekLstView(el,start,bStartOnMonday,scroll); } connect (view, SIGNAL(editEvent(const Event&)), this, SIGNAL(editEvent(const Event&))); connect (view, SIGNAL(duplicateEvent(const Event &)), this, SIGNAL(duplicateEvent(const Event &))); connect (view, SIGNAL(removeEvent(const Event &)), this, SIGNAL(removeEvent(const Event &))); connect (view, SIGNAL(beamEvent(const Event &)), this, SIGNAL(beamEvent(const Event &))); connect (view, SIGNAL(redraw()), this, SLOT(redraw())); connect (view, SIGNAL(showDate(int,int,int)), this, SIGNAL(showDate(int,int,int))); connect (view, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)), this, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&))); scroll->addChild(view); view->show(); scroll->updateScrollBars(); } void DateBookWeekLst::dateChanged(QDate &newdate) { bdate=newdate; getEvents(); } |