From 34991bac7d96b1c17601be6a5607819342571e0c Mon Sep 17 00:00:00 2001
From: eilers <eilers>
Date: Fri, 01 Aug 2003 14:19:44 +0000
Subject: Merging changes from BRANCH_1_0 to HEAD..

---
(limited to 'core/pim/datebook/datebookweekheaderimpl.cpp')

diff --git a/core/pim/datebook/datebookweekheaderimpl.cpp b/core/pim/datebook/datebookweekheaderimpl.cpp
index ff7626f..770410e 100644
--- a/core/pim/datebook/datebookweekheaderimpl.cpp
+++ b/core/pim/datebook/datebookweekheaderimpl.cpp
@@ -70,18 +70,22 @@ void DateBookWeekHeader::pickDate()
 
 void DateBookWeekHeader::nextMonth()
 {
+	qWarning("nextMonth() " );
 	setDate(date.addDays(28));
 }
 void DateBookWeekHeader::prevMonth()
 {
+	qWarning("prevMonth() " );
 	setDate(date.addDays(-28));
 }
 void DateBookWeekHeader::nextWeek()
 {
+	qWarning("nextWeek() " );
 	setDate(date.addDays(7));
 }
 void DateBookWeekHeader::prevWeek()
 {
+	qWarning("prevWeek() ");
 	setDate(date.addDays(-7));
 }
 
@@ -94,9 +98,13 @@ void DateBookWeekHeader::setDate(const QDate &d) {
 	int year,week,dayofweek;
 	date=d;
 	dayofweek=d.dayOfWeek();
-	if(bStartOnMonday) dayofweek--;
+	if(bStartOnMonday) 
+	    dayofweek--;
+	else if( dayofweek == 7 )
+	    /* we already have the right day -7 would lead to the current week..*/
+	    dayofweek = 0;
+	    	    
 	date=date.addDays(-dayofweek);
-
 	calcWeek(date,week,year,bStartOnMonday);
 	QDate start=date;
 	QDate stop=start.addDays(6);
--
cgit v0.9.0.2