1. datebookweeklist - a week has SEVEN days, not SIX. I'm wondering why

   events on sunday never showed there ;)
2. extra file datebooktypes contains some special classes used by datebook
   so other classes must not include the big mainheader file.
3. added support for holiday-plugins to week-views. Month view is a little
   bit more tricky 'cause TT has never heard about virtual methods and so
   I have the choice between complete copy the monthview and make the modifications
   or changing the interface of datebookdb-class to virtual. both isn't nice.

10 files changed, 135 insertions, 51 deletions

diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp
index f6aab0c..36c4bd7 100644
--- a/core/pim/datebook/datebook.cpp
+++ b/core/pim/datebook/datebook.cpp
@@ -75,9 +75,10 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
     bool needEvilHack= false; // if we need an Evil Hack
     QTime t;
     t.start();
-    db = new DateBookDBHack;
+    db = new DateBookDBHoliday;
     odebug << "loading db t=" << t.elapsed() << oendl;
     db_holiday = new DateBookHoliday();
+    db->db_holiday=db_holiday;
 
     loadSettings();
     setCaption( tr("Calendar") );
@@ -1149,3 +1150,45 @@ QStringList DateBookHoliday::holidaylist(unsigned year, unsigned month, unsigned
     return holidaylist(QDate(year,month,day));
 }
 
+QValueList<EffectiveEvent> DateBookHoliday::getEffectiveEvents(const QDate &from,const QDate &to )
+{
+    QValueList<EffectiveEvent> ret;
+    QValueList<HPlugin*>::Iterator it;
+    for (it=_pluginlist.begin();it!=_pluginlist.end();++it) {
+        HPlugin*_pl = *it;
+        ret+=_pl->_plugin->events(from,to);
+    }
+    return ret;
+}
+
+QValueList<EffectiveEvent> DateBookDBHoliday::getEffectiveEventsNoHoliday(const QDate &from,const QDate &to )
+{
+    return DateBookDBHack::getEffectiveEvents(from,to);
+}
+
+QValueList<EffectiveEvent> DateBookDBHoliday::getEffectiveEventsNoHoliday(const QDateTime &start)
+{
+    return DateBookDBHack::getEffectiveEvents(start);
+}
+
+QValueList<EffectiveEvent> DateBookHoliday::getEffectiveEvents(const QDateTime &start)
+{
+    return getEffectiveEvents(start.date(),start.date());
+}
+
+QValueList<EffectiveEvent> DateBookDBHoliday::getEffectiveEvents(const QDate &from,const QDate &to )
+{
+    QValueList<EffectiveEvent> ret;
+    odebug << "Ueberlagert 1" << oendl;
+    if (db_holiday) {
+        ret+=db_holiday->getEffectiveEvents(from,to);
+    }
+    ret+=getEffectiveEventsNoHoliday(from,to);
+    return ret;
+}
+
+QValueList<EffectiveEvent> DateBookDBHoliday::getEffectiveEvents( const QDateTime &start)
+{
+    odebug << "Ueberlagert 2" << oendl;
+    return DateBookDBHack::getEffectiveEvents(start);
+}
diff --git a/core/pim/datebook/datebook.h b/core/pim/datebook/datebook.h
index 54ffcfb..3d7f5b5 100644
--- a/core/pim/datebook/datebook.h
+++ b/core/pim/datebook/datebook.h
@@ -20,6 +20,8 @@
 #ifndef DATEBOOK_H
 #define DATEBOOK_H
 
+#include "datebooktypes.h"
+
 #include <qpe/datebookdb.h>
 
 #include <qmainwindow.h>
@@ -36,39 +38,6 @@ class DateBookMonth;
 class Event;
 class QDate;
 class Ir;
-class QLibrary;
-
-namespace Opie {
-namespace Datebook {
-    class HolidayPlugin;
-    class HolidayPluginIf;
-}
-}
-
-class DateBookDBHack : public DateBookDB {
- public:
-  Event eventByUID(int id);
-};
-
-class DateBookHoliday
-{
-public:
-    DateBookHoliday();
-    virtual ~DateBookHoliday();
-
-    QStringList holidaylist(const QDate&);
-    QStringList holidaylist(unsigned year, unsigned month, unsigned day);
-protected:
-    void init();
-    void deinit();
-
-    struct HPlugin {
-        Opie::Datebook::HolidayPlugin*_plugin;
-        QLibrary*_lib;
-        Opie::Datebook::HolidayPluginIf*_if;
-    };
-    QValueList<HPlugin*>_pluginlist;
-};
 
 class DateBook : public QMainWindow
 {
@@ -137,7 +106,7 @@ private:
     void saveSettings();
 
 private:
-    DateBookDBHack *db;
+    DateBookDBHoliday *db;
     DateBookHoliday*db_holiday;
     QWidgetStack *views;
     DateBookDay *dayView;
diff --git a/core/pim/datebook/datebookday.cpp b/core/pim/datebook/datebookday.cpp
index dfe39e5..00ddd05 100644
--- a/core/pim/datebook/datebookday.cpp
+++ b/core/pim/datebook/datebookday.cpp
@@ -19,6 +19,7 @@
 **********************************************************************/
 
 #include "datebookday.h"
+#include "datebooktypes.h"
 #include "datebookdayheaderimpl.h"
 #include "datebookdayallday.h"
 
@@ -227,7 +228,7 @@ void DateBookDayViewQuickLineEdit::focusOutEvent ( QFocusEvent* /* e */)
 
 //===========================================================================
 
-DateBookDay::DateBookDay( bool ampm, bool startOnMonday, DateBookDB *newDb, DateBookHoliday*newHdb, QWidget *parent, const char *name )
+DateBookDay::DateBookDay( bool ampm, bool startOnMonday, DateBookDBHoliday *newDb, DateBookHoliday*newHdb, QWidget *parent, const char *name )
     : QVBox( parent, name ), currDate( QDate::currentDate() ), db( newDb ), startTime( 0 )
 {
     widgetList.setAutoDelete( true );
@@ -367,7 +368,7 @@ void DateBookDay::getEvents()
         if (!object) continue;
         /* not to do something with it */
     }
-    QValueList<EffectiveEvent> eventList = db->getEffectiveEvents( currDate, currDate );
+    QValueList<EffectiveEvent> eventList = db->getEffectiveEventsNoHoliday( currDate, currDate );
     QValueListIterator<EffectiveEvent> it;
 
     for ( it = eventList.begin(); it != eventList.end(); ++it ) {
diff --git a/core/pim/datebook/datebookday.h b/core/pim/datebook/datebookday.h
index 3e44364..3b75eba 100644
--- a/core/pim/datebook/datebookday.h
+++ b/core/pim/datebook/datebookday.h
@@ -28,10 +28,12 @@
 #include <qlist.h>
 
 #include "datebook.h"
+#include "datebooktypes.h"
 #include <qlineedit.h>
 
 class DateBookDayHeader;
 class DateBookDB;
+class DateBookDBHoliday;
 class DatebookdayAllday;
 class QDateTime;
 class QMouseEvent;
@@ -180,7 +182,7 @@ class DateBookDay : public QVBox
 
     friend class DateBookDayWidget; // for beam this occurence and access to DateBookDB
 public:
-    DateBookDay( bool ampm, bool startOnMonday, DateBookDB *newDb,DateBookHoliday*newHdb,
+    DateBookDay( bool ampm, bool startOnMonday, DateBookDBHoliday *newDb,DateBookHoliday*newHdb,
          QWidget *parent, const char *name );
     void selectedDates( QDateTime &start, QDateTime &end );
 
@@ -225,7 +227,7 @@ private:
     DateBookDayView *view;
     DateBookDayHeader *header;
     DatebookdayAllday *m_allDays;
-    DateBookDB *db;
+    DateBookDBHoliday *db;
     WidgetListClass widgetList; //reimplemented QList for sorting widgets by height
     int startTime;
     bool jumpToCurTime; //should we jump to current time in dayview?
diff --git a/core/pim/datebook/datebookdayallday.cpp b/core/pim/datebook/datebookdayallday.cpp
index 3c3f482..5b40246 100644
--- a/core/pim/datebook/datebookdayallday.cpp
+++ b/core/pim/datebook/datebookdayallday.cpp
@@ -30,7 +30,8 @@ DatebookdayAllday::DatebookdayAllday(DateBookDB* db, QWidget* parent,  const cha
     m_MainFrame = new QFrame(viewport());
     m_MainFrame->setFrameStyle(QFrame::NoFrame|QFrame::Plain);
     setFrameStyle(QFrame::NoFrame|QFrame::Plain);
-    setResizePolicy( QScrollView::Default );
+    //setResizePolicy( QScrollView::Default );
+    setResizePolicy(QScrollView::AutoOneFit);
     setHScrollBarMode( AlwaysOff );
     addChild(m_MainFrame);
 
@@ -111,13 +112,18 @@ DatebookAlldayDisp::DatebookAlldayDisp(const QString&aholiday,QWidget* parent,co
     ev.setDescription(strDesc);
     ev.setAllDay(true);
     m_Ev.setEvent(ev);
-    setBackgroundColor(yellow);
     setText(strDesc);
-    setFrameStyle(QFrame::Raised|QFrame::Panel);
+
+    setAlignment(AlignHCenter);
+    setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Minimum));
+
+    //setFrameStyle(QFrame::Raised|QFrame::Panel);
+    //setBackgroundColor(yellow);
 
     int s = QFontMetrics(font()).height()+4;
     setMaximumHeight( s );
     setMinimumSize( QSize( 0, s ) );
+
     m_holiday = true;
 }
 
diff --git a/core/pim/datebook/datebooktypes.h b/core/pim/datebook/datebooktypes.h
new file mode 100644
index 0000000..9eb7e89
--- a/dev/null
+++ b/core/pim/datebook/datebooktypes.h
@@ -0,0 +1,59 @@
+#ifndef _DATEBOOK_TYPES_H

+#define _DATEBOOK_TYPES_H

+

+#include <qpe/datebookdb.h>

+

+#include <qvaluelist.h>

+#include <qstringlist.h>

+

+namespace Opie {

+namespace Datebook {

+    class HolidayPlugin;

+    class HolidayPluginIf;

+}

+}

+

+class QLibrary;

+

+class DateBookDBHack : virtual public DateBookDB {

+ public:

+  virtual ~DateBookDBHack(){}

+  Event eventByUID(int id);

+};

+

+class DateBookHoliday

+{

+public:

+    DateBookHoliday();

+    virtual ~DateBookHoliday();

+

+    QStringList holidaylist(const QDate&);

+    QStringList holidaylist(unsigned year, unsigned month, unsigned day);

+    virtual QValueList<EffectiveEvent> getEffectiveEvents(const QDate &from,const QDate &to );

+    virtual QValueList<EffectiveEvent> getEffectiveEvents(const QDateTime &start);

+

+protected:

+    void init();

+    void deinit();

+

+    struct HPlugin {

+        Opie::Datebook::HolidayPlugin*_plugin;

+        QLibrary*_lib;

+        Opie::Datebook::HolidayPluginIf*_if;

+    };

+    QValueList<HPlugin*>_pluginlist;

+};

+

+class DateBookDBHoliday:virtual public DateBookDBHack {

+public:

+    DateBookDBHoliday():DateBookDBHack(){db_holiday=0;}

+    virtual ~DateBookDBHoliday(){}

+    virtual QValueList<EffectiveEvent> getEffectiveEvents(const QDate &from,const QDate &to );

+    virtual QValueList<EffectiveEvent> getEffectiveEvents(const QDateTime &start);

+    virtual QValueList<EffectiveEvent> getEffectiveEventsNoHoliday(const QDate &from,const QDate &to );

+    virtual QValueList<EffectiveEvent> getEffectiveEventsNoHoliday(const QDateTime &start);

+

+    DateBookHoliday*db_holiday;

+};

+

+#endif

diff --git a/core/pim/datebook/datebookweek.cpp b/core/pim/datebook/datebookweek.cpp
index 7503751..a509d89 100644
--- a/core/pim/datebook/datebookweek.cpp
+++ b/core/pim/datebook/datebookweek.cpp
@@ -19,6 +19,7 @@
 **********************************************************************/
 #include "datebookweek.h"
 #include "datebookweekheaderimpl.h"
+#include "datebooktypes.h"
 
 #include <qpe/datebookdb.h>
 #include <qpe/qpeapplication.h>
@@ -340,7 +341,7 @@ void DateBookWeekView::setStartOfWeek( bool bStartOnMonday )
 
 //-------------------------------------------------------------------
 
-DateBookWeek::DateBookWeek( bool ap, bool startOnMonday, DateBookDB *newDB,
+DateBookWeek::DateBookWeek( bool ap, bool startOnMonday, DateBookDBHoliday *newDB,
                             QWidget *parent, const char *name )
     : QWidget( parent, name ),
       db( newDB ),
diff --git a/core/pim/datebook/datebookweek.h b/core/pim/datebook/datebookweek.h
index c273e30..ddf54ed 100644
--- a/core/pim/datebook/datebookweek.h
+++ b/core/pim/datebook/datebookweek.h
@@ -28,6 +28,7 @@
 #include <qvaluelist.h>
 
 class DateBookDB;
+class DateBookDBHoliday;
 class DateBookWeekHeader;
 class QDate;
 class QLabel;
@@ -100,7 +101,7 @@ class DateBookWeek : public QWidget
     Q_OBJECT
 
 public:
-    DateBookWeek( bool ampm, bool weekOnMonday, DateBookDB *newDB,
+    DateBookWeek( bool ampm, bool weekOnMonday, DateBookDBHoliday *newDB,
                   QWidget *parent = 0, const char *name = 0 );
     void setDate( int y, int m, int d );
     void setDate( QDate d );
@@ -153,7 +154,7 @@ private:
     QDate bdate;
     DateBookWeekHeader *header;
     DateBookWeekView *view;
-    DateBookDB *db;
+    DateBookDBHoliday *db;
     QLabel *lblDesc;
     QTimer *tHide;
     int startTime;
diff --git a/core/pim/datebook/datebookweeklst.cpp b/core/pim/datebook/datebookweeklst.cpp
index 771aa00..0555bc7 100644
--- a/core/pim/datebook/datebookweeklst.cpp
+++ b/core/pim/datebook/datebookweeklst.cpp
@@ -2,6 +2,7 @@
 #include "datebookweeklst.h"
 
 #include "datebook.h"
+#include "datebooktypes.h"
 
 #include <opie2/odebug.h>
 
@@ -317,7 +318,7 @@ DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1,
                 this, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)));
 }
 
-DateBookWeekLst::DateBookWeekLst( bool ap, bool onM, DateBookDB *newDB,
+DateBookWeekLst::DateBookWeekLst( bool ap, bool onM, DateBookDBHoliday *newDB,
                                   QWidget *parent,
                                   const char *name )
     : QWidget( parent, name ),
@@ -383,13 +384,13 @@ QDate DateBookWeekLst::weekDate() const
 
 void DateBookWeekLst::getEvents() {
         QDate start = weekDate(); //date();
-        QDate stop = start.addDays(6);
+    QDate stop = start.addDays(7);
         QValueList<EffectiveEvent> el = db->getEffectiveEvents(start, stop);
 
         if (view) delete view;
         if (dbl) {
-                QDate start2=start.addDays(7);
-                stop=start2.addDays(6);
+        QDate start2=start.addDays(8);
+        stop=start2.addDays(7);
                 QValueList<EffectiveEvent> el2 = db->getEffectiveEvents(start2, stop);
                 view=new DateBookWeekLstDblView(el,el2,start,bStartOnMonday,scroll);
         } else {
diff --git a/core/pim/datebook/datebookweeklst.h b/core/pim/datebook/datebookweeklst.h
index 3bc7f2f..38d7777 100644
--- a/core/pim/datebook/datebookweeklst.h
+++ b/core/pim/datebook/datebookweeklst.h
@@ -14,6 +14,7 @@
 
 class QDateTime;
 class DateBookDB;
+class DateBookDBHoliday;
 
 class DateBookWeekLstHeader: public DateBookWeekLstHeaderBase
 {
@@ -130,7 +131,7 @@ class DateBookWeekLst : public QWidget
     Q_OBJECT
 
 public:
-    DateBookWeekLst( bool ampm, bool onM, DateBookDB *newDB,
+    DateBookWeekLst( bool ampm, bool onM, DateBookDBHoliday *newDB,
                      QWidget *parent = 0,
                      const char *name = 0 );
     ~DateBookWeekLst();
@@ -158,7 +159,7 @@ signals:
         void beamEvent(const Event &e);
 
 private:
-    DateBookDB *db;
+    DateBookDBHoliday *db;
     int startTime;
     bool ampm;
     bool bStartOnMonday;