1 files changed, 32 insertions, 44 deletions

diff --git a/core/pim/datebook/datebookweeklst.cpp b/core/pim/datebook/datebookweeklst.cpp
index a39ff40..7817042 100644
--- a/core/pim/datebook/datebookweeklst.cpp
+++ b/core/pim/datebook/datebookweeklst.cpp
@@ -63,25 +63,25 @@ void DateBookWeekLstHeader::setDate(const QDate &d) {
         dayofweek=d.dayOfWeek();
         if(bStartOnMonday) dayofweek--;
         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()) + "-" +
                         QString::number(stop.day()) + "." +
                         start.monthName(stop.month()) +" ("+
                         tr("w")+":"+QString::number( week ) +")");
-        emit dateChanged(year,week);
+        emit dateChanged(date);
 }
 
 void DateBookWeekLstHeader::pickDate() {
         static QPopupMenu *m1 = 0;
         static DateBookMonth *picker = 0;
         if ( !m1 ) {
                 m1 = new QPopupMenu( this );
                 picker = new DateBookMonth( m1, 0, TRUE );
                 m1->insertItem( picker );
                 connect( picker, SIGNAL( dateClicked( int, int, int ) ),this, SLOT( setDate( int, int, int ) ) );
                 //connect( m1, SIGNAL( aboutToHide() ),
                 //this, SLOT( gotHide() ) );
@@ -100,33 +100,33 @@ void DateBookWeekLstHeader::nextWeek() {
 void DateBookWeekLstHeader::prevWeek() {
         setDate(date.addDays(-7));
 }
 void DateBookWeekLstHeader::nextMonth()
 {
         setDate(date.addDays(28));
 }
 void DateBookWeekLstHeader::prevMonth()
 {
         setDate(date.addDays(-28));
 }
 
-DateBookWeekLstDayHdr::DateBookWeekLstDayHdr(const QDate &d, bool /*onM*/,
+DateBookWeekLstDayHdr::DateBookWeekLstDayHdr(const QDate &d, bool /* onM */,
                                              QWidget* parent,
                                              const char* name,
                                              WFlags fl )
     : DateBookWeekLstDayHdrBase(parent, name, fl) {
 
         date=d;
 
-        static const char *wdays={"MTWTFSS"};
+        static const char *wdays={"MTWTFSSM"};
         char day=wdays[d.dayOfWeek()-1];
 
         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);
 
                 /*
                 QFont f=label->font();
@@ -225,43 +225,46 @@ DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev,
         qBubbleSort(ev);
         QValueListIterator<EffectiveEvent> it;
         it=ev.begin();
 
         int dayOrder[7];
         if (bStartOnMonday) {
                 for (int d=0; d<7; d++) dayOrder[d]=d+1;
         } else {
                 for (int d=0; d<7; d++) dayOrder[d]=d;
                 dayOrder[0]=7;
         }
 
-    for (int i=0; i<7; i++) {
+        // Calculate offset to first day of week.
+        int dayoffset=d.dayOfWeek();
+        if(bStartOnMonday) dayoffset--;
+
+        for (int i=0; i<7; i++) {
         // Header
-        DateBookWeekLstDayHdr *hdr=new DateBookWeekLstDayHdr(d.addDays(i), bStartOnMonday,this);
-        connect(hdr, SIGNAL(showDate(int,int,int)), this, SIGNAL(showDate(int,int,int)));
-        connect(hdr, SIGNAL(addEvent(const QDateTime &, const QDateTime &, const QString &, const QString &)),
-                this, SIGNAL(addEvent(const QDateTime &, const QDateTime &, const QString &, const QString &)));
-        layout->addWidget(hdr);
-
-        // Events
-        while ( (*it).date().dayOfWeek() == dayOrder[i] && it!=ev.end() ) {
-                        if(!(((*it).end().hour()==0) && ((*it).end().minute()==0) && ((*it).startDate()!=(*it).date()))) {// Skip events ending at 00:00 starting at another day.
-                        DateBookWeekLstEvent *l=new DateBookWeekLstEvent(*it,weeklistviewconfig,this);
-                        layout->addWidget(l);
-                        connect (l, SIGNAL(editEvent(const Event &)), this, SIGNAL(editEvent(const Event &)));
+                DateBookWeekLstDayHdr *hdr=new DateBookWeekLstDayHdr(d.addDays(i-dayoffset), bStartOnMonday,this);
+                connect(hdr, SIGNAL(showDate(int,int,int)), this, SIGNAL(showDate(int,int,int)));
+                connect(hdr, SIGNAL(addEvent(const QDateTime &, const QDateTime &, const QString &, const QString &)),
+                        this, SIGNAL(addEvent(const QDateTime &, const QDateTime &, const QString &, const QString &)));
+                layout->addWidget(hdr);
+
+                // Events
+                while ( (*it).date().dayOfWeek() == dayOrder[i] && it!=ev.end() ) {
+                                if(!(((*it).end().hour()==0) && ((*it).end().minute()==0) && ((*it).startDate()!=(*it).date()))) {// Skip events ending at 00:00 starting at another day.
+                                DateBookWeekLstEvent *l=new DateBookWeekLstEvent(*it,weeklistviewconfig,this);
+                                layout->addWidget(l);
+                                connect (l, SIGNAL(editEvent(const Event &)), this, SIGNAL(editEvent(const Event &)));
+                        }
+                        it++;
                 }
-                it++;
-        }
-
-        layout->addItem(new QSpacerItem(1,1, QSizePolicy::Minimum, QSizePolicy::Expanding));
+                layout->addItem(new QSpacerItem(1,1, QSizePolicy::Minimum, QSizePolicy::Expanding));
     }
 }
 DateBookWeekLstView::~DateBookWeekLstView(){}
 void DateBookWeekLstView::keyPressEvent(QKeyEvent *e) {e->ignore();}
 
 DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1,
                                                QValueList<EffectiveEvent> &ev2,
                                                QDate &d, bool onM,
                                                QWidget* parent,
                                                const char* name, WFlags fl)
     : QWidget( parent, name, fl )
 {
@@ -289,70 +292,56 @@ DateBookWeekLst::DateBookWeekLst( bool ap, bool onM, DateBookDB *newDB,
     : QWidget( parent, name ),
       db( newDB ),
       startTime( 0 ),
       ampm( ap ),
       bStartOnMonday(onM)
 {
         setFocusPolicy(StrongFocus);
         layout = new QVBoxLayout( this );
         layout->setMargin(0);
 
         header=new DateBookWeekLstHeader(onM, this);
         layout->addWidget( header );
-        connect(header, SIGNAL(dateChanged(int,int)), this, SLOT(dateChanged(int,int)));
+        connect(header, SIGNAL(dateChanged(QDate &)), this, SLOT(dateChanged(QDate &)));
         connect(header, SIGNAL(setDbl(bool)), this, SLOT(setDbl(bool)));
 
         scroll=new QScrollView(this);
         scroll->setResizePolicy(QScrollView::AutoOneFit);
         layout->addWidget(scroll);
 
         view=NULL;
         Config config("DateBook");
         config.setGroup("Main");
         dbl=config.readBoolEntry("weeklst_dbl", false);
         header->dbl->setOn(dbl);
 }
 DateBookWeekLst::~DateBookWeekLst(){
         Config config("DateBook");
         config.setGroup("Main");
         config.writeEntry("weeklst_dbl", dbl);
 }
 
 void DateBookWeekLst::setDate(const QDate &d) {
-        int w,y;
-        calcWeek(d,w,y,bStartOnMonday);
-        year=y;
-        _week=w;
-        header->setDate(date());
+        bdate=d;
+        header->setDate(d);
 }
+
 void DateBookWeekLst::setDbl(bool on) {
         dbl=on;
         redraw();
 }
 void DateBookWeekLst::redraw() {getEvents();}
 
-QDate DateBookWeekLst::date() const {
-        QDate d;
-        d.setYMD(year,1,1);
-
-        int dow= d.dayOfWeek();
-        if (!bStartOnMonday)
-        if (dow==7) {
-                dow=1;
-        } else {
-                dow++;
-        }
-
-        d=d.addDays( (_week-1)*7 - dow + 1 );
-        return d;
+QDate DateBookWeekLst::date() {
+        return bdate;
 }
 
 void DateBookWeekLst::getEvents() {
         QDate start = date();
         QDate stop = start.addDays(6);
         QValueList<EffectiveEvent> el = db->getEffectiveEvents(start, stop);
 
         if (view) delete view;
         if (dbl) {
                 QDate start2=start.addDays(7);
                 stop=start2.addDays(6);
                 QValueList<EffectiveEvent> el2 = db->getEffectiveEvents(start2, stop);
@@ -362,37 +351,36 @@ void DateBookWeekLst::getEvents() {
         }
 
         connect (view, SIGNAL(editEvent(const Event &)), this, SIGNAL(editEvent(const Event &)));
         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(int y, int w) {
-        year=y;
-        _week=w;
+void DateBookWeekLst::dateChanged(QDate &newdate) {
+        bdate=newdate;
         getEvents();
 }
 
 void DateBookWeekLst::keyPressEvent(QKeyEvent *e)
 {
         switch(e->key()) {
                 case Key_Up:
                         scroll->scrollBy(0, -20);
                         break;
                 case Key_Down:
                         scroll->scrollBy(0, 20);
                         break;
                 case Key_Left:
                         header->prevWeek();
                         break;
                 case Key_Right:
                         header->nextWeek();
                         break;
                 default:
                         e->ignore();
         }
-}
\ No newline at end of file
+}