1 files changed, 22 insertions, 19 deletions

diff --git a/core/pim/datebook/datebookweeklst.cpp b/core/pim/datebook/datebookweeklst.cpp
index aad1f3a..24fb0ba 100644
--- a/core/pim/datebook/datebookweeklst.cpp
+++ b/core/pim/datebook/datebookweeklst.cpp
@@ -1,33 +1,18 @@
 #include "datebookweeklst.h"
 
-#include "datebookweekheaderimpl.h"
 
 #include "datebook.h"
 
-#include <qpe/calendar.h>
-#include <qpe/datebookdb.h>
-#include <qpe/event.h>
-#include <qpe/qpeapplication.h>
-#include <qpe/timestring.h>
 #include <qpe/datebookmonth.h>
 #include <qpe/config.h>
 #include <qpe/resource.h>
+#include <qpe/calendar.h>
 
-#include <qdatetime.h>
-#include <qheader.h>
-#include <qlabel.h>
 #include <qlayout.h>
-#include <qpainter.h>
-#include <qpopupmenu.h>
-#include <qtimer.h>
-#include <qstyle.h>
 #include <qtoolbutton.h>
-#include <qvbox.h>
-#include <qsizepolicy.h>
-#include <qabstractlayout.h>
 #include <qtl.h>
 
 bool calcWeek(const QDate &d, int &week, int &year,bool startOnMonday = false);
 
 DateBookWeekLstHeader::DateBookWeekLstHeader(bool onM, QWidget* parent, const char* name, WFlags fl)
     : DateBookWeekLstHeaderBase(parent, name, fl)
@@ -70,16 +55,17 @@ void DateBookWeekLstHeader::setDate(const QDate &d) {
 	date=date.addDays(-dayofweek);
 
 	calcWeek(date,week,year,bStartOnMonday);
 	QDate start=date;
 	QDate stop=start.addDays(6);
 	labelDate->setText( QString::number(start.day()) + "." +
-			start.monthName(start.month()) + "-" +
+			Calendar::nameOfMonth( start.month() ) + "-" +
 			QString::number(stop.day()) + "." +
-			start.monthName(stop.month()) +" ("+
+                                                Calendar::nameOfMonth( stop.month()) +" ("+
 			tr("w")+":"+QString::number( week ) +")");
+	date = d; // bugfix: 0001126 - date has to be the selected date, not monday!
 	emit dateChanged(date);
 }
 
 void DateBookWeekLstHeader::pickDate() {
 	static QPopupMenu *m1 = 0;
 	static DateBookMonth *picker = 0;
@@ -122,13 +108,15 @@ DateBookWeekLstDayHdr::DateBookWeekLstDayHdr(const QDate &d, bool /* onM */,
 
 	date=d;
 
 	static const QString wdays=tr("MTWTFSSM",  "Week days");
 	char day=wdays[d.dayOfWeek()-1];
 
+    //dont use dayOfWeek() to save space !
 	label->setText( QString(QObject::tr(QString(QChar(day)))) + " " +QString::number(d.day()) );
+
 	add->setText("+");
 
 	if (d == QDate::currentDate()) {
 		QPalette pal=label->palette();
 		pal.setColor(QColorGroup::Foreground, QColor(0,0,255));
 		label->setPalette(pal);
@@ -338,14 +326,29 @@ 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 = date();
+	QDate start = weekDate(); //date();
 	QDate stop = start.addDays(6);
 	QValueList<EffectiveEvent> el = db->getEffectiveEvents(start, stop);
 
 	if (view) delete view;
 	if (dbl) {
 		QDate start2=start.addDays(7);