so....

I looked for a problem. could not found due the kind of code structure.
so I had reorganized the code into a more sensefull structure so every one
should be able to find some code sequences when searching for a bug.
yes - now I found the problem and can thinking about resolving it.

15 files changed, 1167 insertions, 0 deletions

diff --git a/core/pim/datebook/modules/weeklst/.cvsignore b/core/pim/datebook/modules/weeklst/.cvsignore
new file mode 100644
index 0000000..2da0b2b
--- a/dev/null
+++ b/core/pim/datebook/modules/weeklst/.cvsignore
@@ -0,0 +1,4 @@
+datebookweeklstdayhdrbase.cpp
+datebookweeklstdayhdrbase.h
+datebookweeklstheaderbase.cpp
+datebookweeklstheaderbase.h
diff --git a/core/pim/datebook/modules/weeklst/datebookweeklst.cpp b/core/pim/datebook/modules/weeklst/datebookweeklst.cpp
new file mode 100644
index 0000000..47bc597
--- a/dev/null
+++ b/core/pim/datebook/modules/weeklst/datebookweeklst.cpp
@@ -0,0 +1,138 @@
+#include "namespace_hack.h"
+#include "datebookweeklst.h"
+#include "datebookweeklstheader.h"
+#include "datebookweeklstview.h"
+#include "datebookweeklstdblview.h"
+
+#include "datebook.h"
+
+#include <opie2/odebug.h>
+
+#include <qpe/datebookmonth.h>
+#include <qpe/config.h>
+#include <qpe/resource.h>
+
+#include <qlayout.h>
+#include <qtoolbutton.h>
+
+using namespace Opie::Ui;
+
+DateBookWeekLst::DateBookWeekLst( bool ap, bool onM, DateBookDBHoliday *newDB,
+                  QWidget *parent,
+                  const char *name )
+    : 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(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) {
+    bdate=d;
+    header->setDate(d);
+}
+
+void DateBookWeekLst::setDbl(bool on) {
+    dbl=on;
+    redraw();
+}
+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(6);
+    QValueList<EffectiveEvent> el = db->getEffectiveEvents(start, stop);
+
+    setUpdatesEnabled(false);
+    if (view) delete view;
+    if (dbl) {
+        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();
+    setUpdatesEnabled(true);
+}
+
+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();
+    }
+}
diff --git a/core/pim/datebook/modules/weeklst/datebookweeklst.h b/core/pim/datebook/modules/weeklst/datebookweeklst.h
new file mode 100644
index 0000000..3922fa1
--- a/dev/null
+++ b/core/pim/datebook/modules/weeklst/datebookweeklst.h
@@ -0,0 +1,65 @@
+#ifndef DATEBOOKWEEKLST
+#define DATEBOOKWEEKLST
+
+#include <qpe/event.h>
+
+#include <qwidget.h>
+#include <qdatetime.h>
+
+class DateBookDB;
+class DateBookDBHoliday;
+class DateBookWeekLstHeader;
+class DateBookWeekLstEvent;
+class DateBookWeekLstView;
+class QVBoxLayout;
+class QScrollView;
+
+class DateBookWeekLst : public QWidget
+{
+    Q_OBJECT
+
+public:
+    DateBookWeekLst( bool ampm, bool onM, DateBookDBHoliday *newDB,
+             QWidget *parent = 0,
+             const char *name = 0 );
+    ~DateBookWeekLst();
+    void setDate( int y, int w );
+    void setDate(const QDate &d );
+    int week() const { return _week; };
+    QDate date();
+    QDate weekDate() const;
+
+public slots:
+    void redraw();
+    void dateChanged(QDate &date);
+
+protected slots:
+    void keyPressEvent(QKeyEvent *);
+    void setDbl(bool on);
+
+signals:
+    void showDate(int y, int m, int d);
+    void addEvent(const QDateTime &start, const QDateTime &stop,
+    const QString &str, const QString &location);
+    void editEvent(const Event &e);
+    void duplicateEvent(const Event &e);
+    void removeEvent(const Event &e);
+    void beamEvent(const Event &e);
+
+private:
+    DateBookDBHoliday *db;
+    int startTime;
+    bool ampm;
+    bool bStartOnMonday;
+    bool dbl;
+    QDate bdate;
+    int year, _week,dow;
+    DateBookWeekLstHeader *header;
+    QWidget *view;
+    QVBoxLayout *layout;
+    QScrollView *scroll;
+
+    void getEvents();
+};
+
+#endif
diff --git a/core/pim/datebook/modules/weeklst/datebookweeklstdayhdr.cpp b/core/pim/datebook/modules/weeklst/datebookweeklstdayhdr.cpp
new file mode 100644
index 0000000..d173444
--- a/dev/null
+++ b/core/pim/datebook/modules/weeklst/datebookweeklstdayhdr.cpp
@@ -0,0 +1,53 @@
+#include "datebookweeklstdayhdr.h"

+

+#include "namespace_hack.h"

+

+DateBookWeekLstDayHdr::DateBookWeekLstDayHdr(const QDate &d, bool /* onM */,

+                         QWidget* parent,

+                         const char* name,

+                         WFlags fl )

+    : DateBookWeekLstDayHdrBase(parent, name, fl) {

+

+    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);

+

+        /*

+        QFont f=label->font();

+        f.setItalic(true);

+        label->setFont(f);

+        label->setPalette(QPalette(QColor(0,0,255),label->backgroundColor()));

+        */

+    } else if (d.dayOfWeek() == 7) { // FIXME: Match any holiday

+        QPalette pal=label->palette();

+        pal.setColor(QColorGroup::Foreground, QColor(255,0,0));

+        label->setPalette(pal);

+    }

+

+    connect (label, SIGNAL(clicked()), this, SLOT(showDay()));

+    connect (add, SIGNAL(clicked()), this, SLOT(newEvent()));

+}

+

+void DateBookWeekLstDayHdr::showDay() {

+    emit showDate(date.year(), date.month(), date.day());

+}

+

+void DateBookWeekLstDayHdr::newEvent() {

+    QDateTime start, stop;

+    start=stop=date;

+    start.setTime(QTime(10,0));

+    stop.setTime(QTime(12,0));

+

+    emit addEvent(start,stop,"",0);

+}

diff --git a/core/pim/datebook/modules/weeklst/datebookweeklstdayhdr.h b/core/pim/datebook/modules/weeklst/datebookweeklstdayhdr.h
new file mode 100644
index 0000000..de046d8
--- a/dev/null
+++ b/core/pim/datebook/modules/weeklst/datebookweeklstdayhdr.h
@@ -0,0 +1,26 @@
+#ifndef _DATEBOOKWEEKLSTDAYHDR_H

+#define _DATEBOOKWEEKLSTDAYHDR_H

+

+#include "datebookweeklstdayhdrbase.h"

+

+#include <qdatetime.h>

+

+class DateBookWeekLstDayHdr: public DateBookWeekLstDayHdrBase

+{

+    Q_OBJECT

+public:

+    DateBookWeekLstDayHdr(const QDate &d, bool onM,

+              QWidget* parent = 0, const char* name = 0,

+              WFlags fl = 0 );

+public slots:

+    void showDay();

+    void newEvent();

+signals:

+    void showDate(int y, int m, int d);

+    void addEvent(const QDateTime &start, const QDateTime &stop,

+          const QString &str, const QString &location);

+private:

+    QDate date;

+};

+

+#endif

diff --git a/core/pim/datebook/modules/weeklst/datebookweeklstdayhdrbase.ui b/core/pim/datebook/modules/weeklst/datebookweeklstdayhdrbase.ui
new file mode 100644
index 0000000..74ea584
--- a/dev/null
+++ b/core/pim/datebook/modules/weeklst/datebookweeklstdayhdrbase.ui
@@ -0,0 +1,145 @@
+<!DOCTYPE UI><UI>
+<class>DateBookWeekLstDayHdrBase</class>
+<widget>
+    <class>QWidget</class>
+    <property stdset="1">
+        <name>name</name>
+        <cstring>DateBookWeekLstDayHdrBase</cstring>
+    </property>
+    <property stdset="1">
+        <name>geometry</name>
+        <rect>
+            <x>0</x>
+            <y>106</y>
+            <width>621</width>
+            <height>5</height>
+        </rect>
+    </property>
+    <property stdset="1">
+        <name>sizePolicy</name>
+        <sizepolicy>
+            <hsizetype>7</hsizetype>
+            <vsizetype>0</vsizetype>
+        </sizepolicy>
+    </property>
+    <property>
+        <name>layoutMargin</name>
+    </property>
+    <hbox>
+        <property stdset="1">
+            <name>margin</name>
+            <number>0</number>
+        </property>
+        <property stdset="1">
+            <name>spacing</name>
+            <number>6</number>
+        </property>
+        <widget>
+            <class>Line</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Line1</cstring>
+            </property>
+            <property stdset="1">
+                <name>minimumSize</name>
+                <size>
+                    <width>0</width>
+                    <height>0</height>
+                </size>
+            </property>
+            <property stdset="1">
+                <name>maximumSize</name>
+                <size>
+                    <width>32767</width>
+                    <height>32767</height>
+                </size>
+            </property>
+            <property stdset="1">
+                <name>orientation</name>
+                <enum>Horizontal</enum>
+            </property>
+        </widget>
+        <widget>
+            <class>ClickableLabel</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>label</cstring>
+            </property>
+            <property stdset="1">
+                <name>sizePolicy</name>
+                <sizepolicy>
+                    <hsizetype>0</hsizetype>
+                    <vsizetype>0</vsizetype>
+                </sizepolicy>
+            </property>
+            <property stdset="1">
+                <name>font</name>
+                <font>
+                    <bold>1</bold>
+                </font>
+            </property>
+        </widget>
+        <widget>
+            <class>Line</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Line1_2</cstring>
+            </property>
+            <property stdset="1">
+                <name>minimumSize</name>
+                <size>
+                    <width>0</width>
+                    <height>0</height>
+                </size>
+            </property>
+            <property stdset="1">
+                <name>maximumSize</name>
+                <size>
+                    <width>32767</width>
+                    <height>32767</height>
+                </size>
+            </property>
+            <property stdset="1">
+                <name>orientation</name>
+                <enum>Horizontal</enum>
+            </property>
+        </widget>
+        <widget>
+            <class>ClickableLabel</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>add</cstring>
+            </property>
+            <property stdset="1">
+                <name>sizePolicy</name>
+                <sizepolicy>
+                    <hsizetype>0</hsizetype>
+                    <vsizetype>0</vsizetype>
+                </sizepolicy>
+            </property>
+        </widget>
+    </hbox>
+</widget>
+<customwidgets>
+    <customwidget>
+        <class>ClickableLabel</class>
+        <header location="local">namespace_hack.h</header>
+        <sizehint>
+            <width>-1</width>
+            <height>-1</height>
+        </sizehint>
+        <container>0</container>
+        <sizepolicy>
+            <hordata>5</hordata>
+            <verdata>5</verdata>
+        </sizepolicy>
+        <pixmap>image0</pixmap>
+    </customwidget>
+</customwidgets>
+<images>
+    <image>
+        <name>image0</name>
+        <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1ddec44f503c0ae2a154410f53d0ed20e2bf6bdb656dd6861dd23d9a66591b0587fd1654235ebded6f0edcd53e419d87ae7b1f4f9b8f906d0bfe012317426a70b07bdc2f3ec77f8ed6b89559061a0343d06a124cc105596482585094bc0ae599b04646c9018926491b2205e140c485cace25755c175d0a967b622ff900b8cc9c7d29af594ea722d589167f813aa852ba07d94b9dce296e883fe7bb163f23896753</data>
+    </image>
+</images>
+</UI>
diff --git a/core/pim/datebook/modules/weeklst/datebookweeklstdblview.cpp b/core/pim/datebook/modules/weeklst/datebookweeklstdblview.cpp
new file mode 100644
index 0000000..1cea602
--- a/dev/null
+++ b/core/pim/datebook/modules/weeklst/datebookweeklstdblview.cpp
@@ -0,0 +1,41 @@
+#include "datebookweeklstdblview.h"

+#include "datebookweeklstview.h"

+

+#include <qlayout.h>

+

+DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1,

+                           QValueList<EffectiveEvent> &ev2,

+                           QDate &d, bool onM,

+                           QWidget* parent,

+                           const char* name, WFlags fl)

+    : QWidget( parent, name, fl )

+{

+    QHBoxLayout *layout = new QHBoxLayout( this );

+

+    DateBookWeekLstView *w=new DateBookWeekLstView(ev1,d,onM,this);

+    layout->addWidget(w);

+    connect (w, SIGNAL(editEvent(const Event&)), this, SIGNAL(editEvent(const Event&)));

+    connect (w, SIGNAL(duplicateEvent(const Event &)), this, SIGNAL(duplicateEvent(const Event &)));

+    connect (w, SIGNAL(removeEvent(const Event &)), this, SIGNAL(removeEvent(const Event &)));

+    connect (w, SIGNAL(beamEvent(const Event &)), this, SIGNAL(beamEvent(const Event &)));

+    connect (w, SIGNAL(redraw()), this, SIGNAL(redraw()));

+    connect (w, SIGNAL(showDate(int,int,int)), this, SIGNAL(showDate(int,int,int)));

+    connect (w, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)),

+        this, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)));

+

+

+    w=new DateBookWeekLstView(ev2,d.addDays(7),onM,this);

+    layout->addWidget(w);

+    connect (w, SIGNAL(editEvent(const Event&)), this, SIGNAL(editEvent(const Event&)));

+    connect (w, SIGNAL(duplicateEvent(const Event &)), this, SIGNAL(duplicateEvent(const Event &)));

+    connect (w, SIGNAL(removeEvent(const Event &)), this, SIGNAL(removeEvent(const Event &)));

+    connect (w, SIGNAL(beamEvent(const Event &)), this, SIGNAL(beamEvent(const Event &)));

+    connect (w, SIGNAL(redraw()), this, SIGNAL(redraw()));

+    connect (w, SIGNAL(showDate(int,int,int)), this, SIGNAL(showDate(int,int,int)));

+    connect (w, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)),

+        this, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)));

+}

+

+DateBookWeekLstDblView::~DateBookWeekLstDblView()

+{

+}

diff --git a/core/pim/datebook/modules/weeklst/datebookweeklstdblview.h b/core/pim/datebook/modules/weeklst/datebookweeklstdblview.h
new file mode 100644
index 0000000..57e9690
--- a/dev/null
+++ b/core/pim/datebook/modules/weeklst/datebookweeklstdblview.h
@@ -0,0 +1,31 @@
+#ifndef _DATEBOOKWEEKLSTDBLVIEW_H

+#define _DATEBOOKWEEKLSTDBLVIEW_H

+

+#include <qpe/event.h>

+

+#include <qwidget.h>

+#include <qvaluelist.h>

+#include <qdatetime.h>

+#include <qstring.h>

+

+class DateBookWeekLstDblView: public QWidget {

+        Q_OBJECT

+public:

+    DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1,

+               QValueList<EffectiveEvent> &ev2,

+               QDate &d, bool onM,

+               QWidget* parent = 0, const char* name = 0,

+               WFlags fl = 0 );

+    virtual ~DateBookWeekLstDblView();

+signals:

+    void editEvent(const Event &e);

+    void duplicateEvent(const Event &e);

+    void removeEvent(const Event &e);

+    void beamEvent(const Event &e);

+    void redraw();

+    void showDate(int y, int m, int d);

+    void addEvent(const QDateTime &start, const QDateTime &stop,

+          const QString &str, const QString &location);

+};

+

+#endif

diff --git a/core/pim/datebook/modules/weeklst/datebookweeklstevent.cpp b/core/pim/datebook/modules/weeklst/datebookweeklstevent.cpp
new file mode 100644
index 0000000..797f766
--- a/dev/null
+++ b/core/pim/datebook/modules/weeklst/datebookweeklstevent.cpp
@@ -0,0 +1,85 @@
+#include "datebookweeklstevent.h"

+#include "datebooktypes.h"

+

+#include <opie2/odebug.h>

+

+#include <qpe/ir.h>

+

+#include <qstring.h>

+#include <qpopupmenu.h>

+

+DateBookWeekLstEvent::DateBookWeekLstEvent(const EffectiveEvent &ev,

+                        int weeklistviewconfig,

+                        QWidget* parent,

+                        const char* name,

+                        WFlags fl ) : OClickableLabel(parent,name,fl), event(ev)

+{

+    // old values... lastday = "__|__", middle="   |---", Firstday="00:00",

+    QString s,start,middle,end,day;

+

+    odebug << "weeklistviewconfig=" << weeklistviewconfig << oendl;

+    if(weeklistviewconfig==NONE) {  // No times displayed.

+//      start.sprintf("%.2d:%.2d-",ev.start().hour(),ev.start().minute());

+//      middle.sprintf("<--->");

+//      end.sprintf("-%.2d:%.2d",ev.end().hour(),ev.end().minute());

+//      day.sprintf("%.2d:%.2d-%.2d:%.2d",ev.start().hour(),ev.start().minute(),ev.end().hour(),ev.end().minute());

+    } else if(weeklistviewconfig==NORMAL) { // "Normal", only display start time.

+        start.sprintf("%.2d:%.2d",ev.start().hour(),ev.start().minute());

+        middle.sprintf("   |---");

+        end.sprintf("__|__");

+        day.sprintf("%.2d:%.2d",ev.start().hour(),ev.start().minute());

+    } else if(weeklistviewconfig==EXTENDED) { // Extended mode, display start and end times.

+        start.sprintf("%.2d:%.2d-",ev.start().hour(),ev.start().minute());

+        middle.sprintf("<--->");

+        end.sprintf("-%.2d:%.2d",ev.end().hour(),ev.end().minute());

+        day.sprintf("%.2d:%.2d-%.2d:%.2d",ev.start().hour(),ev.start().minute(),ev.end().hour(),ev.end().minute());

+    }

+

+    if(ev.event().type() == Event::Normal) {

+        if(ev.startDate()==ev.date() && ev.endDate()==ev.date()) {  // day event.

+            s=day;

+        } else if(ev.startDate()==ev.date()) {  // start event.

+            s=start;

+        } else if(ev.endDate()==ev.date()) { // end event.

+            s=end;

+        } else {    // middle day.

+            s=middle;

+        }

+    } else {

+        s="";

+    }

+    setText(QString(s) + " " + ev.description());

+//  connect(this, SIGNAL(clicked()), this, SLOT(editMe()));

+    setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) );

+}

+void DateBookWeekLstEvent::editMe() {

+    emit editEvent(event.event());

+}

+void DateBookWeekLstEvent::duplicateMe()

+{

+       emit duplicateEvent(event.event());

+}

+void DateBookWeekLstEvent::deleteMe()

+{

+       emit removeEvent(event.event());

+       emit redraw();

+}

+void DateBookWeekLstEvent::beamMe()

+{

+    emit beamEvent( event.event() );

+}

+void DateBookWeekLstEvent::mousePressEvent( QMouseEvent *e )

+{

+    if (!event.event().isValidUid()) {

+        // this is just such a holiday event.

+        return;

+    }

+    popmenue = new QPopupMenu;

+

+    popmenue->insertItem( tr( "Edit" ), this, SLOT(editMe()));

+    popmenue->insertItem( tr( "Duplicate" ), this, SLOT(duplicateMe()));

+    popmenue->insertItem( tr( "Delete" ), this, SLOT(deleteMe()));

+    if(Ir::supported())

+        popmenue->insertItem( tr( "Beam" ), this, SLOT(beamMe()));

+    popmenue->popup( mapToGlobal( e->pos() ));

+}

diff --git a/core/pim/datebook/modules/weeklst/datebookweeklstevent.h b/core/pim/datebook/modules/weeklst/datebookweeklstevent.h
new file mode 100644
index 0000000..77f6283
--- a/dev/null
+++ b/core/pim/datebook/modules/weeklst/datebookweeklstevent.h
@@ -0,0 +1,34 @@
+#ifndef _DATEBOOKWEEKLSTEVENT_H

+#define _DATEBOOKWEEKLSTEVENT_H

+

+#include <opie2/oclickablelabel.h>

+

+#include <qpe/event.h>

+

+class DateBookWeekLstEvent: public Opie::Ui::OClickableLabel

+{

+  Q_OBJECT

+public:

+    DateBookWeekLstEvent(const EffectiveEvent &ev, int weeklistviewconfig =1,

+             QWidget* parent = 0, const char* name = 0,

+             WFlags fl = 0);

+signals:

+    void editEvent(const Event &e);

+    void duplicateEvent(const Event &e);

+    void removeEvent(const Event &e);

+    void beamEvent(const Event &e);

+    void redraw();

+private slots:

+    void editMe();

+    void duplicateMe();

+    void deleteMe();

+    void beamMe();

+private:

+    const EffectiveEvent event;

+    QPopupMenu* popmenue;

+protected:

+    void mousePressEvent( QMouseEvent *e );

+};

+

+

+#endif

diff --git a/core/pim/datebook/modules/weeklst/datebookweeklstheader.cpp b/core/pim/datebook/modules/weeklst/datebookweeklstheader.cpp
new file mode 100644
index 0000000..81e0c31
--- a/dev/null
+++ b/core/pim/datebook/modules/weeklst/datebookweeklstheader.cpp
@@ -0,0 +1,96 @@
+#include "datebookweeklstheader.h"

+

+#include <qpe/resource.h>

+#include <qpe/datebookmonth.h>

+

+#include <qtoolbutton.h>

+#include <qlayout.h>

+

+/* implenented in datebookweek.cpp - HELL */

+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)

+{

+    setBackgroundMode( PaletteButton );

+    labelDate->setBackgroundMode( PaletteButton );

+    forwardweek->setBackgroundMode( PaletteButton );

+    forwardweek->setPixmap( Resource::loadPixmap("forward") );

+    forwardmonth->setBackgroundMode( PaletteButton );

+    forwardmonth->setPixmap( Resource::loadPixmap("fastforward") );

+    backweek->setBackgroundMode( PaletteButton );

+    backweek->setPixmap( Resource::loadPixmap("back") );

+    backmonth->setBackgroundMode( PaletteButton );

+    backmonth->setPixmap( Resource::loadPixmap("fastback") );

+    DateBookWeekLstHeaderBaseLayout->setSpacing(0);

+    DateBookWeekLstHeaderBaseLayout->setMargin(0);

+    //setSizePolicy(QSizePolicy(QSizePolicy::Fixed,QSizePolicy::Expanding));

+    setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Fixed));

+

+    connect(backmonth, SIGNAL(clicked()), this, SLOT(prevMonth()));

+    connect(backweek, SIGNAL(clicked()), this, SLOT(prevWeek()));

+    connect(forwardweek, SIGNAL(clicked()), this, SLOT(nextWeek()));

+    connect(forwardmonth, SIGNAL(clicked()), this, SLOT(nextMonth()));

+    connect(labelDate, SIGNAL(clicked()), this, SLOT(pickDate()));

+    connect(dbl, SIGNAL(toggled(bool)), this, SIGNAL(setDbl(bool)));

+    bStartOnMonday=onM;

+}

+DateBookWeekLstHeader::~DateBookWeekLstHeader(){}

+

+void DateBookWeekLstHeader::setDate(const QDate &d) {

+    int year,week,dayofweek;

+    date=d;

+    dayofweek=d.dayOfWeek();

+    if(bStartOnMonday)

+        dayofweek--;

+    else if( dayofweek == 7 )

+        /* we already have the right day -7 would lead to the same week */

+        dayofweek = 0;

+

+    date=date.addDays(-dayofweek);

+

+    calcWeek(date,week,year,bStartOnMonday);

+    QDate start=date;

+    QDate stop=start.addDays(6);

+    labelDate->setText( QString::number(start.day()) + "." +

+            Calendar::nameOfMonth( start.month() ) + "-" +

+            QString::number(stop.day()) + "." +

+                                                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;

+    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() ) );

+    }

+    picker->setDate( date.year(), date.month(), date.day() );

+    m1->popup(mapToGlobal(labelDate->pos()+QPoint(0,labelDate->height())));

+    picker->setFocus();

+}

+void DateBookWeekLstHeader::setDate(int y, int m, int d) {

+    setDate(QDate(y,m,d));

+}

+

+void DateBookWeekLstHeader::nextWeek() {

+    setDate(date.addDays(7));

+}

+void DateBookWeekLstHeader::prevWeek() {

+    setDate(date.addDays(-7));

+}

+void DateBookWeekLstHeader::nextMonth()

+{

+    setDate(date.addDays(28));

+}

+void DateBookWeekLstHeader::prevMonth()

+{

+    setDate(date.addDays(-28));

+}

diff --git a/core/pim/datebook/modules/weeklst/datebookweeklstheader.h b/core/pim/datebook/modules/weeklst/datebookweeklstheader.h
new file mode 100644
index 0000000..818b825
--- a/dev/null
+++ b/core/pim/datebook/modules/weeklst/datebookweeklstheader.h
@@ -0,0 +1,34 @@
+#ifndef _DATEBOOKWEEKLSTHEADER_H

+#define _DATEBOOKWEEKLSTHEADER_H

+

+#include "datebookweeklstheaderbase.h"

+

+#include <qdatetime.h>

+

+class DateBookWeekLstHeader: public DateBookWeekLstHeaderBase

+{

+    Q_OBJECT

+public:

+    DateBookWeekLstHeader(bool onM, QWidget* parent = 0, const char* name = 0,

+              WFlags fl = 0 );

+    ~DateBookWeekLstHeader();

+    void setDate(const QDate &d);

+

+public slots:

+    void nextWeek();

+    void prevWeek();

+    void nextMonth();

+    void prevMonth();

+    void pickDate();

+    void setDate(int y, int m, int d);

+signals:

+    void dateChanged(QDate &newdate);

+    void setDbl(bool on);

+protected:

+    QDate date;

+//  bool onMonday;

+    bool bStartOnMonday;

+

+};

+

+#endif

diff --git a/core/pim/datebook/modules/weeklst/datebookweeklstheaderbase.ui b/core/pim/datebook/modules/weeklst/datebookweeklstheaderbase.ui
new file mode 100644
index 0000000..e925ec3
--- a/dev/null
+++ b/core/pim/datebook/modules/weeklst/datebookweeklstheaderbase.ui
@@ -0,0 +1,306 @@
+<!DOCTYPE UI><UI>
+<class>DateBookWeekLstHeaderBase</class>
+<widget>
+    <class>QWidget</class>
+    <property stdset="1">
+        <name>name</name>
+        <cstring>DateBookWeekLstHeaderBase</cstring>
+    </property>
+    <property stdset="1">
+        <name>geometry</name>
+        <rect>
+            <x>0</x>
+            <y>183</y>
+            <width>447</width>
+            <height>45</height>
+        </rect>
+    </property>
+    <property stdset="1">
+        <name>sizePolicy</name>
+        <sizepolicy>
+            <hsizetype>7</hsizetype>
+            <vsizetype>0</vsizetype>
+        </sizepolicy>
+    </property>
+    <property>
+        <name>layoutMargin</name>
+    </property>
+    <property>
+        <name>layoutSpacing</name>
+    </property>
+    <hbox>
+        <property stdset="1">
+            <name>margin</name>
+            <number>11</number>
+        </property>
+        <property stdset="1">
+            <name>spacing</name>
+            <number>6</number>
+        </property>
+        <widget>
+            <class>QToolButton</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>backmonth</cstring>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string></string>
+            </property>
+            <property stdset="1">
+                <name>pixmap</name>
+                <pixmap></pixmap>
+            </property>
+            <property stdset="1">
+                <name>toggleButton</name>
+                <bool>false</bool>
+            </property>
+            <property stdset="1">
+                <name>autoRepeat</name>
+                <bool>true</bool>
+            </property>
+            <property stdset="1">
+                <name>autoRaise</name>
+                <bool>true</bool>
+            </property>
+            <property stdset="1">
+                <name>toggleButton</name>
+                <bool>false</bool>
+            </property>
+            <property>
+                <name>toolTip</name>
+                <string></string>
+            </property>
+        </widget>
+        <widget>
+            <class>QToolButton</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>backweek</cstring>
+            </property>
+            <property stdset="1">
+                <name>sizePolicy</name>
+                <sizepolicy>
+                    <hsizetype>7</hsizetype>
+                    <vsizetype>0</vsizetype>
+                </sizepolicy>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string></string>
+            </property>
+            <property stdset="1">
+                <name>pixmap</name>
+                <pixmap></pixmap>
+            </property>
+            <property stdset="1">
+                <name>toggleButton</name>
+                <bool>false</bool>
+            </property>
+            <property stdset="1">
+                <name>autoRepeat</name>
+                <bool>true</bool>
+            </property>
+            <property stdset="1">
+                <name>autoRaise</name>
+                <bool>true</bool>
+            </property>
+            <property stdset="1">
+                <name>toggleButton</name>
+                <bool>false</bool>
+            </property>
+            <property>
+                <name>toolTip</name>
+                <string></string>
+            </property>
+        </widget>
+	<spacer>
+            <property>
+                <name>name</name>
+                <cstring>Spacer1_3</cstring>
+            </property>
+            <property stdset="1">
+                <name>orientation</name>
+                <enum>Horizontal</enum>
+            </property>
+            <property stdset="1">
+                <name>sizeType</name>
+                <enum>Expanding</enum>
+            </property>
+            <property>
+                <name>sizeHint</name>
+                <size>
+                    <width>20</width>
+                    <height>20</height>
+                </size>
+            </property>
+        </spacer>
+        <widget>
+            <class>QToolButton</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>labelDate</cstring>
+            </property>
+            <property stdset="1">
+                <name>sizePolicy</name>
+                <sizepolicy>
+                    <hsizetype>7</hsizetype>
+                    <vsizetype>0</vsizetype>
+                </sizepolicy>
+            </property>
+            <property stdset="1">
+                <name>font</name>
+                <font>
+                    <bold>1</bold>
+                </font>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>W: 00,00</string>
+            </property>
+            <property stdset="1">
+                <name>toggleButton</name>
+                <bool>false</bool>
+            </property>
+            <property stdset="1">
+                <name>autoRaise</name>
+                <bool>false</bool>
+            </property>
+            <property stdset="1">
+                <name>toggleButton</name>
+                <bool>false</bool>
+            </property>
+            <property>
+                <name>toolTip</name>
+                <string></string>
+            </property>
+        </widget>
+        <widget>
+            <class>QToolButton</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>dbl</cstring>
+            </property>
+            <property stdset="1">
+                <name>sizePolicy</name>
+                <sizepolicy>
+                    <hsizetype>3</hsizetype>
+                    <vsizetype>0</vsizetype>
+                </sizepolicy>
+            </property>
+            <property stdset="1">
+                <name>font</name>
+                <font>
+                    <bold>1</bold>
+                </font>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>2</string>
+            </property>
+            <property stdset="1">
+                <name>toggleButton</name>
+                <bool>true</bool>
+            </property>
+            <property stdset="1">
+                <name>autoRaise</name>
+                <bool>false</bool>
+            </property>
+            <property stdset="1">
+                <name>toggleButton</name>
+                <bool>true</bool>
+            </property>
+            <property>
+                <name>toolTip</name>
+                <string></string>
+            </property>
+        </widget>
+        <spacer>
+            <property>
+                <name>name</name>
+                <cstring>Spacer1_3_2</cstring>
+            </property>
+            <property stdset="1">
+                <name>orientation</name>
+                <enum>Horizontal</enum>
+            </property>
+            <property stdset="1">
+                <name>sizeType</name>
+                <enum>Expanding</enum>
+            </property>
+            <property>
+                <name>sizeHint</name>
+                <size>
+                    <width>20</width>
+                    <height>20</height>
+                </size>
+            </property>
+        </spacer>
+        <widget>
+            <class>QToolButton</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>forwardweek</cstring>
+            </property>
+            <property stdset="1">
+                <name>sizePolicy</name>
+                <sizepolicy>
+                    <hsizetype>1</hsizetype>
+                    <vsizetype>0</vsizetype>
+                </sizepolicy>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string></string>
+            </property>
+            <property stdset="1">
+                <name>pixmap</name>
+                <pixmap></pixmap>
+            </property>
+            <property stdset="1">
+                <name>autoRepeat</name>
+                <bool>true</bool>
+            </property>
+            <property stdset="1">
+                <name>autoRaise</name>
+                <bool>true</bool>
+            </property>
+        </widget>
+        <widget>
+            <class>QToolButton</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>forwardmonth</cstring>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string></string>
+            </property>
+            <property stdset="1">
+                <name>pixmap</name>
+                <pixmap></pixmap>
+            </property>
+            <property stdset="1">
+                <name>toggleButton</name>
+                <bool>false</bool>
+            </property>
+            <property stdset="1">
+                <name>autoRepeat</name>
+                <bool>true</bool>
+            </property>
+            <property stdset="1">
+                <name>autoRaise</name>
+                <bool>true</bool>
+            </property>
+            <property stdset="1">
+                <name>toggleButton</name>
+                <bool>false</bool>
+            </property>
+            <property>
+                <name>toolTip</name>
+                <string></string>
+            </property>
+        </widget>
+    </hbox>
+</widget>
+</UI>
diff --git a/core/pim/datebook/modules/weeklst/datebookweeklstview.cpp b/core/pim/datebook/modules/weeklst/datebookweeklstview.cpp
new file mode 100644
index 0000000..efb4c01
--- a/dev/null
+++ b/core/pim/datebook/modules/weeklst/datebookweeklstview.cpp
@@ -0,0 +1,73 @@
+#include "datebookweeklstview.h"

+#include "datebooktypes.h"

+#include "datebookweeklstdayhdr.h"

+#include "datebookweeklstheader.h"

+#include "datebookweeklstevent.h"

+

+#include <opie2/odebug.h>

+

+#include <qpe/config.h>

+

+#include <qlayout.h>

+#include <qtl.h>

+

+DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev,

+                     const QDate &d, bool onM,

+                     QWidget* parent,

+                     const char* name, WFlags fl)

+    : QWidget( parent, name, fl )

+{

+    Config config("DateBook");

+    config.setGroup("Main");

+    int weeklistviewconfig=config.readNumEntry("weeklistviewconfig", NORMAL);

+    odebug << "weeklistviewconfig: " << weeklistviewconfig << oendl;

+

+    bStartOnMonday=onM;

+    setPalette(white);

+    setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding));

+

+    QVBoxLayout *layout = new QVBoxLayout( this );

+

+    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;

+    }

+

+    // Calculate offset to first day of week.

+    int dayoffset=d.dayOfWeek();

+    if(bStartOnMonday) dayoffset--;

+    else if( dayoffset == 7 ) dayoffset = 0;

+

+    for (int i=0; i<7; i++) {

+    // Header

+        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&)));

+                connect (l, SIGNAL(duplicateEvent(const Event &)), this, SIGNAL(duplicateEvent(const Event &)));

+                connect (l, SIGNAL(removeEvent(const Event &)), this, SIGNAL(removeEvent(const Event &)));

+                connect (l, SIGNAL(beamEvent(const Event &)), this, SIGNAL(beamEvent(const Event &)));

+                connect (l, SIGNAL(redraw()), this, SIGNAL(redraw()));

+            }

+            it++;

+        }

+        layout->addItem(new QSpacerItem(1,1, QSizePolicy::Minimum, QSizePolicy::Expanding));

+    }

+}

+DateBookWeekLstView::~DateBookWeekLstView(){}

+void DateBookWeekLstView::keyPressEvent(QKeyEvent *e) {e->ignore();}

diff --git a/core/pim/datebook/modules/weeklst/datebookweeklstview.h b/core/pim/datebook/modules/weeklst/datebookweeklstview.h
new file mode 100644
index 0000000..2428f1f
--- a/dev/null
+++ b/core/pim/datebook/modules/weeklst/datebookweeklstview.h
@@ -0,0 +1,36 @@
+#ifndef _DATEBOOKWEEKLISTVIEW_H

+#define _DATEBOOKWEEKLISTVIEW_H

+

+#include <qpe/event.h>

+

+#include <qwidget.h>

+#include <qvaluelist.h>

+#include <qstring.h>

+#include <qdatetime.h>

+

+class QKeyEvent;

+

+class DateBookWeekLstView: public QWidget

+{

+    Q_OBJECT

+public:

+    DateBookWeekLstView(QValueList<EffectiveEvent> &ev, const QDate &d, bool onM,

+            QWidget* parent = 0, const char* name = 0,

+            WFlags fl = 0 );

+    ~DateBookWeekLstView();

+signals:

+    void editEvent(const Event &e);

+    void duplicateEvent(const Event &e);

+    void removeEvent(const Event &e);

+    void beamEvent(const Event &e);

+    void redraw();

+    void showDate(int y, int m, int d);

+    void addEvent(const QDateTime &start, const QDateTime &stop,

+    const QString &str, const QString &location);

+private:

+    bool bStartOnMonday;

+protected slots:

+    void keyPressEvent(QKeyEvent *);

+};

+

+#endif