10 files changed, 229 insertions, 4 deletions

diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp
index a18a5b4..f6aab0c 100644
--- a/core/pim/datebook/datebook.cpp
+++ b/core/pim/datebook/datebook.cpp
@@ -27,12 +27,14 @@
 #include "datebooksettings.h"
 #include "datebookweek.h"
 #include "datebookweeklst.h"
 #include "dateentryimpl.h"
 
 #include <opie2/odebug.h>
+#include <opie2/oholidaypluginif.h>
+#include <opie2/oholidayplugin.h>
 
 #include <qpe/datebookmonth.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <qpe/finddialog.h>
 #include <qpe/ir.h>
@@ -46,12 +48,14 @@
 #include <qlayout.h>
 #include <qmessagebox.h>
 #include <qtimer.h>
 #include <qtl.h>
 #include <qtoolbar.h>
 #include <qwidgetstack.h>
+#include <qdir.h>
+#include <qtopia/qlibrary.h>
 
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <unistd.h>
 
@@ -70,12 +74,14 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
 {
         bool needEvilHack= false; // if we need an Evil Hack
         QTime t;
         t.start();
         db = new DateBookDBHack;
         odebug << "loading db t=" << t.elapsed() << oendl;
+    db_holiday = new DateBookHoliday();
+
         loadSettings();
         setCaption( tr("Calendar") );
         setIcon( Resource::loadPixmap( "datebook_icon" ) );
 
         setToolBarsMovable( FALSE );
 
@@ -222,12 +228,13 @@ void DateBook::receive( const QCString &msg, const QByteArray &data )
          viewDefault(day);
      }
 }
 
 DateBook::~DateBook()
 {
+    delete db_holiday;
 }
 
 void DateBook::slotSettings()
 {
         DateBookSettings frmSettings( ampm, this );
         frmSettings.setStartTime( startTime );
@@ -509,13 +516,13 @@ void DateBook::showDay( int year, int month, int day )
     view(DAY,d);
 }
 
 void DateBook::initDay()
 {
         if ( !dayView ) {
-                dayView = new DateBookDay( ampm, onMonday, db, views, "day view" );
+        dayView = new DateBookDay( ampm, onMonday, db, db_holiday, views, "day view" );
                 views->addWidget( dayView, DAY );
                 dayView->setJumpToCurTime( bJumpToCurTime );
                 dayView->setStartViewTime( startTime );
                 dayView->setRowStyle( rowStyle );
                 connect( this, SIGNAL( newEvent() ), dayView, SLOT( redraw() ) );
                         connect( dayView, SIGNAL( newEvent() ), this, SLOT( fileNew() ) );
@@ -1070,6 +1077,75 @@ Event DateBookDBHack::eventByUID(int uid) {
         if ((*it).uid() == uid) return *it;
     }
 
     Event ev;
     return ev; // return at least
 }
+
+DateBookHoliday::DateBookHoliday()
+{
+    _pluginlist.clear();
+    init();
+}
+
+DateBookHoliday::~DateBookHoliday()
+{
+    deinit();
+}
+
+void DateBookHoliday::deinit()
+{
+    QValueList<HPlugin*>::Iterator it;
+    for (it=_pluginlist.begin();it!=_pluginlist.end();++it) {
+        HPlugin*_pl = *it;
+        // destructs itself?
+        _pl->_if->release();
+        _pl->_lib->unload();
+        delete _pl->_lib;
+        delete _pl;
+    }
+    _pluginlist.clear();
+}
+
+void DateBookHoliday::init()
+{
+    deinit();
+    QString path = QPEApplication::qpeDir() + "plugins/datebook/holiday";
+    QDir dir( path, "lib*.so" );
+    QStringList list = dir.entryList();
+    QStringList::Iterator it;
+    for (it=list.begin();it!=list.end();++it) {
+        Opie::Datebook::HolidayPluginIf*hif = 0;
+        QLibrary*lib=new QLibrary(path+"/"+*it);
+        if ((lib->queryInterface(IID_HOLIDAY_PLUGIN,(QUnknownInterface**)&hif) == QS_OK) && hif) {
+            Opie::Datebook::HolidayPlugin*pl = hif->plugin();
+            if (pl) {
+                HPlugin*_pl=new HPlugin;
+                _pl->_plugin = pl;
+                odebug << "Found holiday " << pl->description()<<oendl;
+                _pl->_lib = lib;
+                _pl->_if = hif;
+                _pluginlist.append(_pl);
+            } else {
+            }
+        } else {
+            delete lib;
+        }
+    }
+}
+
+QStringList DateBookHoliday::holidaylist(const QDate&aDate)
+{
+    QStringList ret;
+    QValueList<HPlugin*>::Iterator it;
+    for (it=_pluginlist.begin();it!=_pluginlist.end();++it) {
+        HPlugin*_pl = *it;
+        ret+=_pl->_plugin->entries(aDate);
+    }
+    return ret;
+}
+
+QStringList DateBookHoliday::holidaylist(unsigned year, unsigned month, unsigned day)
+{
+    return holidaylist(QDate(year,month,day));
+}
+
diff --git a/core/pim/datebook/datebook.h b/core/pim/datebook/datebook.h
index d7cfb33..54ffcfb 100644
--- a/core/pim/datebook/datebook.h
+++ b/core/pim/datebook/datebook.h
@@ -33,18 +33,46 @@ class DateBookDay;
 class DateBookWeek;
 class DateBookWeekLst;
 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
 {
     Q_OBJECT
 
 public:
         static QString appName() { return QString::fromLatin1("datebook"); }
@@ -107,12 +135,13 @@ private:
     void initMonth();
     void loadSettings();
     void saveSettings();
 
 private:
         DateBookDBHack *db;
+    DateBookHoliday*db_holiday;
         QWidgetStack *views;
         DateBookDay *dayView;
         DateBookWeek *weekView;
         DateBookMonth *monthView;
         DateBookWeekLst *weekLstView;
         QAction *dayAction, *weekAction, *weekLstAction, *monthAction;
diff --git a/core/pim/datebook/datebookday.cpp b/core/pim/datebook/datebookday.cpp
index ca63dc5..dfe39e5 100644
--- a/core/pim/datebook/datebookday.cpp
+++ b/core/pim/datebook/datebookday.cpp
@@ -19,12 +19,13 @@
 **********************************************************************/
 
 #include "datebookday.h"
 #include "datebookdayheaderimpl.h"
 #include "datebookdayallday.h"
 
+#include <opie2/oholidayplugin.h>
 #include <qpe/resource.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/ir.h>
 
 #include <qsimplerichtext.h>
 #include <qpopupmenu.h>
@@ -223,16 +224,17 @@ void DateBookDayViewQuickLineEdit::focusOutEvent ( QFocusEvent* /* e */)
 {
         slotReturnPressed(); // Reuse code to add event and close this widget.
 }
 
 //===========================================================================
 
-DateBookDay::DateBookDay( bool ampm, bool startOnMonday, DateBookDB *newDb, QWidget *parent, const char *name )
+DateBookDay::DateBookDay( bool ampm, bool startOnMonday, DateBookDB *newDb, DateBookHoliday*newHdb, QWidget *parent, const char *name )
     : QVBox( parent, name ), currDate( QDate::currentDate() ), db( newDb ), startTime( 0 )
 {
         widgetList.setAutoDelete( true );
+    _holiday_db = newHdb;
         header = new DateBookDayHeader( startOnMonday, this, "day header" );
         header->setDate( currDate.year(), currDate.month(), currDate.day() );
 
         m_allDays = new DatebookdayAllday(newDb, this, "all day event list" );
         m_allDays->hide();
 
@@ -354,15 +356,23 @@ void DateBookDay::getEvents()
         widgetList.clear();
 
         /* clear the AllDay List */
         m_allDays->hide(); // just in case
         m_allDays->removeAllEvents();
 
+    QStringList hdays = _holiday_db->holidaylist(currDate);
+    QStringList::Iterator sit;
+    QObject* object = 0;
+    for (sit=hdays.begin();sit!=hdays.end();++sit) {
+        object = m_allDays->addHoliday(*sit);
+        if (!object) continue;
+        /* not to do something with it */
+    }
         QValueList<EffectiveEvent> eventList = db->getEffectiveEvents( currDate, currDate );
         QValueListIterator<EffectiveEvent> it;
-        QObject* object = 0;
+
         for ( it = eventList.begin(); it != eventList.end(); ++it ) {
                 EffectiveEvent ev=*it;
                         if(!((ev.end().hour()==0) && (ev.end().minute()==0) && (ev.startDate()!=ev.date()))) {// Skip events ending at 00:00 starting at another day.
                     if (ev.event().type() == Event::AllDay ) {
                         object = m_allDays->addEvent( ev );
                         if (!object)
diff --git a/core/pim/datebook/datebookday.h b/core/pim/datebook/datebookday.h
index c8cb26b..3e44364 100644
--- a/core/pim/datebook/datebookday.h
+++ b/core/pim/datebook/datebookday.h
@@ -177,15 +177,16 @@ class WidgetListClass : public QList<DateBookDayWidget>
 class DateBookDay : public QVBox
 {
     Q_OBJECT
 
     friend class DateBookDayWidget; // for beam this occurence and access to DateBookDB
 public:
-    DateBookDay( bool ampm, bool startOnMonday, DateBookDB *newDb,
+    DateBookDay( bool ampm, bool startOnMonday, DateBookDB *newDb,DateBookHoliday*newHdb,
                  QWidget *parent, const char *name );
     void selectedDates( QDateTime &start, QDateTime &end );
+
     QDate date() const;
     DateBookDayView *dayView() const { return view; }
     void setStartViewTime( int startHere );
     int startViewTime() const;
     void setSelectedWidget( DateBookDayWidget * );
     DateBookDayWidget * getSelectedWidget( void );
@@ -228,9 +229,10 @@ private:
             WidgetListClass widgetList;//reimplemented QList for sorting widgets by height
     int startTime;
             bool jumpToCurTime;//should we jump to current time in dayview?
     int rowStyle;
     DateBookDayWidget *selectedWidget; //actual selected widget (obviously)
             DateBookDayTimeMarker *timeMarker;//marker for current time
+    DateBookHoliday*_holiday_db;
 };
 
 #endif
diff --git a/core/pim/datebook/datebookdayallday.cpp b/core/pim/datebook/datebookdayallday.cpp
index a0aefd3..3c3f482 100644
--- a/core/pim/datebook/datebookdayallday.cpp
+++ b/core/pim/datebook/datebookdayallday.cpp
@@ -63,12 +63,26 @@ DatebookAlldayDisp* DatebookdayAllday::addEvent(const EffectiveEvent&ev)
     connect(lb,SIGNAL(displayMe(const Event&)),lblDesc,SLOT(disp_event(const Event&)));
     ++item_count;
 
     return lb;
 }
 
+DatebookAlldayDisp* DatebookdayAllday::addHoliday(const QString&e)
+{
+    DatebookAlldayDisp * lb;
+    lb = new DatebookAlldayDisp(e,m_MainFrame,NULL);
+    lb->show();
+    datebookdayalldayLayout->addWidget(lb);
+    subWidgets.append(lb);
+
+    connect(lb,SIGNAL(displayMe(const Event&)),lblDesc,SLOT(disp_event(const Event&)));
+    ++item_count;
+
+    return lb;
+}
+
 void DatebookdayAllday::removeAllEvents()
 {
     subWidgets.clear();
     item_count = 0;
 }
 
@@ -82,20 +96,41 @@ DatebookAlldayDisp::DatebookAlldayDisp(DateBookDB *db,const EffectiveEvent& ev,
     setText(strDesc);
     setFrameStyle(QFrame::Raised|QFrame::Panel);
 
     int s = QFontMetrics(font()).height()+4;
     setMaximumHeight( s );
     setMinimumSize( QSize( 0, s ) );
+    m_holiday = false;
+}
+
+DatebookAlldayDisp::DatebookAlldayDisp(const QString&aholiday,QWidget* parent,const char* name, WFlags fl)
+    : QLabel(parent,name,fl),m_Ev(),dateBook(0)
+{
+    QString strDesc = aholiday;
+    strDesc = strDesc.replace(QRegExp("<"),"&#60;");
+    Event ev;
+    ev.setDescription(strDesc);
+    ev.setAllDay(true);
+    m_Ev.setEvent(ev);
+    setBackgroundColor(yellow);
+    setText(strDesc);
+    setFrameStyle(QFrame::Raised|QFrame::Panel);
+
+    int s = QFontMetrics(font()).height()+4;
+    setMaximumHeight( s );
+    setMinimumSize( QSize( 0, s ) );
+    m_holiday = true;
 }
 
 DatebookAlldayDisp::~DatebookAlldayDisp()
 {
 }
 
 void DatebookAlldayDisp::beam_single_event()
 {
+    if (m_holiday) return;
     // create an Event and beam it...
     /*
      * Start with the easy stuff. If start and  end date is the same we can just use
      * the values of effective m_Events
      * If it is a multi day m_Event we need to find the real start and end date...
      */
@@ -148,17 +183,19 @@ void DatebookAlldayDisp::mousePressEvent(QMouseEvent*e)
 {
     Event ev = m_Ev.event();
     QColor b = backgroundColor();
     setBackgroundColor(green);
     update();
     QPopupMenu m;
+    if (!m_holiday) {
     m.insertItem( DateBookDayWidget::tr( "Edit" ), 1 );
     m.insertItem( DateBookDayWidget::tr( "Duplicate" ), 4 );
     m.insertItem( DateBookDayWidget::tr( "Delete" ), 2 );
     if(Ir::supported()) m.insertItem( DateBookDayWidget::tr( "Beam" ), 3 );
     if(Ir::supported() && m_Ev.event().doRepeat() ) m.insertItem( DateBookDayWidget::tr( "Beam this occurence"), 5 );
+    }
     m.insertItem( tr( "Info"),6);
     int r = m.exec( e->globalPos() );
     setBackgroundColor(b);
     update();
     switch (r) {
     case 1:
diff --git a/core/pim/datebook/datebookdayallday.h b/core/pim/datebook/datebookdayallday.h
index f5867e5..4f5cffa 100644
--- a/core/pim/datebook/datebookdayallday.h
+++ b/core/pim/datebook/datebookdayallday.h
@@ -21,12 +21,13 @@ class DatebookdayAllday : public QScrollView
 
 public:
     DatebookdayAllday(DateBookDB* db,
             QWidget* parent = 0, const char* name = 0, WFlags fl = 0);
     ~DatebookdayAllday();
     DatebookAlldayDisp* addEvent(const EffectiveEvent&e);
+    DatebookAlldayDisp* addHoliday(const QString&e);
     const unsigned int items()const{return item_count;}
 
 public slots:
     void removeAllEvents();
 
 protected:
@@ -42,12 +43,14 @@ class DatebookAlldayDisp : public QLabel
 {
     Q_OBJECT
 
 public:
     DatebookAlldayDisp(DateBookDB* db,const EffectiveEvent& e,
                        QWidget* parent=0,const char* name = 0, WFlags fl=0);
+    DatebookAlldayDisp(const QString&aholiday,
+                       QWidget* parent=0,const char* name = 0, WFlags fl=0);
     virtual ~DatebookAlldayDisp();
 
 signals:
     void deleteMe( const Event &e );
     void duplicateMe( const Event &e );
     void editMe( const Event &e );
@@ -58,12 +61,13 @@ public slots:
 
 protected:
     EffectiveEvent m_Ev;
     DateBookDB* dateBook;
     void mousePressEvent( QMouseEvent *e );
     void beam_single_event();
+    bool m_holiday:1;
 };
 
 class DatebookEventDesc: public QLabel
 {
     Q_OBJECT
 
diff --git a/core/pim/datebook/holiday/dummy/config.in b/core/pim/datebook/holiday/dummy/config.in
new file mode 100644
index 0000000..caa90bc
--- a/dev/null
+++ b/core/pim/datebook/holiday/dummy/config.in
@@ -0,0 +1,8 @@
+  config DATEBOOK_DUMMY_HOLIDAY
+    boolean "opie-datebook-dummyholidayplugin"
+    default "n"
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM
+
+    comment "opie-datebook-dummyholidayplugin requires libopie2core, libopie2ui, libopie2pim"
+    depends !( ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM )
+
diff --git a/core/pim/datebook/holiday/dummy/dummy.pro b/core/pim/datebook/holiday/dummy/dummy.pro
new file mode 100644
index 0000000..768bb77
--- a/dev/null
+++ b/core/pim/datebook/holiday/dummy/dummy.pro
@@ -0,0 +1,20 @@
+TEMPLATE = lib
+CONFIG -= moc
+CONFIG += qt plugin
+
+# Input
+HEADERS = dummyholiday.h
+SOURCES = dummyholiday.cpp
+INTERFACES=
+
+INCLUDEPATH     += $(OPIEDIR)/include \
+                ../ ../library
+DEPENDPATH      += $(OPIEDIR)/include \
+                ../ ../library
+
+LIBS+= -lqpe -lopiecore2 -lopieui2
+
+DESTDIR = $(OPIEDIR)/plugins/datebook/holiday
+TARGET = dummyholidayplugin
+
+include( $(OPIEDIR)/include.pro )
diff --git a/core/pim/datebook/holiday/dummy/dummyholiday.cpp b/core/pim/datebook/holiday/dummy/dummyholiday.cpp
new file mode 100644
index 0000000..dd00b9b
--- a/dev/null
+++ b/core/pim/datebook/holiday/dummy/dummyholiday.cpp
@@ -0,0 +1,20 @@
+#include "dummyholiday.h"

+

+#include <qobject.h>

+

+QString DummyHoliday::description()

+{

+    return QObject::tr("Test holiday plugin","dummyholiday");

+}

+

+QStringList DummyHoliday::entries(const QDate&aDate)

+{

+    return entries(0,0,aDate.day());

+}

+

+QStringList DummyHoliday::entries(unsigned year, unsigned month, unsigned day)

+{

+    QStringList ret;

+    if (day%2==0) ret.append(QObject::tr("You have a holiday!","dummyholiday"));

+    return ret;

+}

diff --git a/core/pim/datebook/holiday/dummy/dummyholiday.h b/core/pim/datebook/holiday/dummy/dummyholiday.h
new file mode 100644
index 0000000..9b28f24
--- a/dev/null
+++ b/core/pim/datebook/holiday/dummy/dummyholiday.h
@@ -0,0 +1,19 @@
+#ifndef __DUMMY_HOLIDAY_H

+#define __DUMMY_HOLIDAY_H

+

+#include <opie2/oholidayplugin.h>

+#include <opie2/oholidaypluginif.h>

+

+class DummyHoliday:public Opie::Datebook::HolidayPlugin

+{

+public:

+    DummyHoliday():Opie::Datebook::HolidayPlugin(){}

+    virtual ~DummyHoliday(){}

+

+    virtual QString description();

+    virtual QStringList entries(const QDate&);

+    virtual QStringList entries(unsigned year, unsigned month, unsigned day);

+};

+

+EXPORT_HOLIDAY_PLUGIN(DummyHoliday);

+#endif