7 files changed, 111 insertions, 1 deletions

diff --git a/core/pim/datebook/holiday/birthday/birthday.cpp b/core/pim/datebook/holiday/birthday/birthday.cpp
new file mode 100644
index 0000000..a32e0ea
--- a/dev/null
+++ b/core/pim/datebook/holiday/birthday/birthday.cpp
@@ -0,0 +1,56 @@
+#include "birthday.h"
+
+#include <opie2/ocontactaccess.h>
+
+#include <qobject.h>
+
+Birthday::Birthday()
+    :Opie::Datebook::HolidayPlugin()
+{
+    m_contactdb = new Opie::OPimContactAccess("addressplugin");
+/*
+    connect( m_contactdb, SIGNAL( signalChanged(const Opie::OPimContactAccess*) ),
+         this, SLOT( refresh(const Opie::OPimContactAccess*) ) );
+*/
+}
+
+QString Birthday::description()
+{
+    return QObject::tr("Birthdays","holidays");
+}
+
+QStringList Birthday::entries(const QDate&aDate)
+{
+    QStringList ret;
+    if ( m_contactdb->hasQuerySettings( Opie::OPimContactAccess::DateDay ) ){
+        Opie::OPimContact querybirthdays;
+        querybirthdays.setBirthday(aDate);
+        m_list = m_contactdb->queryByExample( querybirthdays,Opie::OPimContactAccess::DateDay| Opie::OPimContactAccess::DateMonth);
+        if ( m_list.count() > 0 ){
+            QString pre = QObject::tr("Birthday","holidays")+" ";
+            int z = 0;
+            for ( m_it = m_list.begin(); m_it != m_list.end(); ++m_it ) {
+                if (z) {
+                    pre+=", ";
+                }
+                pre+=((*m_it).fullName());
+                ++z;
+            }
+            ret.append(pre);
+        }
+    }
+    return ret;
+}
+
+QStringList Birthday::entries(unsigned year, unsigned month, unsigned day)
+{
+    return entries(QDate(year,month,day));
+}
+
+QMap<QDate,QStringList> Birthday::entries(const QDate&,const QDate&)
+{
+    QMap<QDate,QStringList> ret;
+    return ret;
+}
+
+EXPORT_HOLIDAY_PLUGIN(Birthday);
diff --git a/core/pim/datebook/holiday/birthday/birthday.h b/core/pim/datebook/holiday/birthday/birthday.h
new file mode 100644
index 0000000..5c9aacd
--- a/dev/null
+++ b/core/pim/datebook/holiday/birthday/birthday.h
@@ -0,0 +1,28 @@
+#ifndef __DUMMY_HOLIDAY_H
+#define __DUMMY_HOLIDAY_H
+
+#include <opie2/oholidayplugin.h>
+#include <opie2/oholidaypluginif.h>
+#include <opie2/ocontactaccess.h>
+
+#include <qmap.h>
+
+class Birthday:public Opie::Datebook::HolidayPlugin
+{
+typedef QMap<QDate,QStringList> tDayMap;
+
+public:
+    Birthday();
+    virtual ~Birthday(){}
+
+    virtual QString description();
+    virtual QStringList entries(const QDate&);
+    virtual QStringList entries(unsigned year, unsigned month, unsigned day);
+    virtual QMap<QDate,QStringList> entries(const QDate&,const QDate&);
+protected:
+    Opie::OPimContactAccess * m_contactdb;
+    Opie::OPimContactAccess::List m_list;
+    Opie::OPimContactAccess::List::Iterator m_it;
+};
+
+#endif
diff --git a/core/pim/datebook/holiday/birthday/birthdays.pro b/core/pim/datebook/holiday/birthday/birthdays.pro
new file mode 100644
index 0000000..b78dbd1
--- a/dev/null
+++ b/core/pim/datebook/holiday/birthday/birthdays.pro
@@ -0,0 +1,20 @@
+TEMPLATE = lib
+CONFIG -= moc
+CONFIG += qt plugin
+
+# Input
+HEADERS = birthday.h
+SOURCES = birthday.cpp
+INTERFACES=
+
+INCLUDEPATH     += $(OPIEDIR)/include \
+                ../ ../library
+DEPENDPATH      += $(OPIEDIR)/include \
+                ../ ../library
+
+LIBS+= -lqpe -lopiecore2 -lopieui2
+
+DESTDIR = $(OPIEDIR)/plugins/datebook/holiday
+TARGET = birthdayplugin
+
+include( $(OPIEDIR)/include.pro )
diff --git a/core/pim/datebook/holiday/birthday/config.in b/core/pim/datebook/holiday/birthday/config.in
new file mode 100644
index 0000000..0a3f3ff
--- a/dev/null
+++ b/core/pim/datebook/holiday/birthday/config.in
@@ -0,0 +1,4 @@
+  config DATEBOOK_BIRTHDAYS_HOLIDAY
+    boolean "opie-datebook-birthdays"
+    default "y"
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM
diff --git a/core/pim/datebook/holiday/christian/chrisholiday.cpp b/core/pim/datebook/holiday/christian/chrisholiday.cpp
index 3427b73..be16bd0 100644
--- a/core/pim/datebook/holiday/christian/chrisholiday.cpp
+++ b/core/pim/datebook/holiday/christian/chrisholiday.cpp
@@ -47,49 +47,49 @@ void ChrisHoliday::calc_christmas()
     _days[cday.addDays(-21)].append(QObject::tr("1. Advent","holidays"));

 }

 

 void ChrisHoliday::calc_easter()

 {

   unsigned long n = 0;

   unsigned long p = 0;

 

   if ( _lastyear > 1582 ) {

     unsigned long a = _lastyear%19;

     unsigned long b = _lastyear/100;

     unsigned long c = _lastyear%100;

     unsigned long d = b/4;

     unsigned long e = b%4;

     unsigned long f = (b+8)/25;

     unsigned long g = (b+f+1)/3;

     unsigned long h = (19*a+b-d-g+15)%30;

     unsigned long i = c/4;

     unsigned long j = c%4;

     unsigned long k = j%100;

     unsigned long l = (32+2*e+2*i-h-k)%7;

     unsigned long m = (a+11*h+22*l)/451;

     n = (h+l-7*m+114)/31;

     p = (h+l-7*m+114)%31;

   } else {

     unsigned long a = _lastyear%4;

     unsigned long b = _lastyear%7;

     unsigned long c = _lastyear%19;

     unsigned long d = (19*c+15)%30;

     unsigned long e = (2*a+4*b-d+34)%7;

     n = (d+e+114)/31;

     p = (d+e+114)%31;

   }

   p++;

   QDate d(_lastyear,n,p);

   _days[d].append(QObject::tr("Eastersunday","holidays"));

   _days[d.addDays(49)].append(QObject::tr("Whitsunday","holidays"));

   _days[d.addDays(50)].append(QObject::tr("Whitmonday","holidays"));

   _days[d.addDays(-46)].append(QObject::tr("Ash Wednesday","holidays"));

   _days[d.addDays(60)].append(QObject::tr("Corpus Christi","holidays"));

 }

 

 QMap<QDate,QStringList> ChrisHoliday::entries(const QDate&,const QDate&)

 {

     QMap<QDate,QStringList> ret;

     return ret;

 }

 

-EXPORT_HOLIDAY_PLUGIN(ChrisHoliday);
\ No newline at end of file
+EXPORT_HOLIDAY_PLUGIN(ChrisHoliday);

diff --git a/core/pim/datebook/holiday/config.in b/core/pim/datebook/holiday/config.in
index e00f023..1912dbe 100644
--- a/core/pim/datebook/holiday/config.in
+++ b/core/pim/datebook/holiday/config.in
@@ -1,4 +1,5 @@
 menu "Holiday Plugins"
+  source core/pim/datebook/holiday/birthday/config.in
   source core/pim/datebook/holiday/christian/config.in
   source core/pim/datebook/holiday/dummy/config.in
 endmenu
diff --git a/packages b/packages
index 228bdb8..6181b00 100644
--- a/packages
+++ b/packages
@@ -1,82 +1,83 @@
         CONFIG_ABOUTAPPLET      core/applets/aboutappletaboutapplet.pro
         CONFIG_ADDRESSBOOK      core/pim/addressbookaddressbook.pro
         CONFIG_ADVANCEDFM       noncore/apps/advancedfmadvancedfm.pro
         CONFIG_APPEARANCE2      noncore/settings/appearance2appearance2.pro
         CONFIG_APPSKEY  noncore/settings/appskeyappskey.pro
         CONFIG_AQPKG    noncore/settings/aqpkgaqpkg.pro
         CONFIG_AUTOROTATEAPPLET         noncore/applets/autorotateappletautorotateapplet.pro
         CONFIG_BACKGAMMONnoncore/games/backgammon backgammon.pro
         CONFIG_BACKUP   noncore/settings/backupbackup.pro
         CONFIG_BARTENDER noncore/apps/opie-bartenderbartender.pro
         CONFIG_BATTERYAPPLET    core/applets/batteryappletbatteryapplet.pro
         CONFIG_BEND     noncore/unsupported/mail2/bendbend.pro
 CONFIG_BIGSCREEN_EXAMPLE       unsupported/libopie/big-screen/example      osplitter_mail.pro
         CONFIG_BINARY   noncore/tools/calc2/binarybinary.pro
         CONFIG_BLUE-PIN         noncore/net/opietooth/blue-pinblue-pin.pro
         CONFIG_BOUNCE   noncore/games/bouncebounce.pro
         CONFIG_BRIGHTNESSAPPLET         noncore/applets/brightnessappletbrightnessapplet.pro
         CONFIG_BUTTON-SETTINGS  core/settings/buttonbutton.pro
         CONFIG_BUZZWORD         noncore/games/buzzwordbuzzword.pro
         CONFIG_CALC2    noncore/tools/calc2calc.pro
         CONFIG_CALCULATOR       noncore/tools/calculatorcalculator.pro
         CONFIG_CALIBRATE        core/apps/calibratecalibrate.pro
         CONFIG_CAMERA   noncore/multimedia/cameracamera.pro
         CONFIG_CARDMON  core/applets/cardmoncardmon.pro
         CONFIG_CHECKBOOK        noncore/apps/checkbookcheckbook.pro
         CONFIG_CITYTIME         core/settings/citytimecitytime.pro
         CONFIG_CLIPBOARDAPPLET  core/applets/clipboardappletclipboardapplet.pro
         CONFIG_CLOCKAPPLET      core/applets/clockappletclockapplet.pro
         CONFIG_CLOCK    noncore/tools/clockclock.pro
         CONFIG_CONFEDIT         noncore/apps/confeditconfedit.pro
 CONFIG_DAGGER noncore/apps/dagger dagger.pro
         CONFIG_DASHER   inputmethods/dasherdasher.pro
         CONFIG_DATEBOOK2        core/pim/datebook2datebook2.pro
         CONFIG_DATEBOOK         core/pim/datebookdatebook.pro
+CONFIG_DATEBOOK_BIRTHDAYS_HOLIDAY core/pim/datebook/holiday/birthday birthdays.pro
 CONFIG_DATEBOOK_CHRISTIAN_HOLIDAY core/pim/datebook/holiday/christian christian-holidays.pro
 CONFIG_DATEBOOK_DUMMY_HOLIDAY core/pim/datebook/holiday/dummy dummy.pro
         CONFIG_DECO_FLAT        noncore/decorations/flatflat.pro
         CONFIG_DECO_LIQUID      noncore/decorations/liquidliquid.pro
         CONFIG_DECO_POLISHED    noncore/decorations/polishedpolished.pro
         CONFIG_DICTIONARY       noncore/apps/dictionarydictionary.pro
 CONFIG_DOCTAB  noncore/settings/doctab doctab.pro
         CONFIG_DRAWPAD  noncore/graphics/drawpaddrawpad.pro
         CONFIG_DVORAK   inputmethods/dvorakdvorak.pro
         CONFIG_EMBEDDEDKONSOLE  core/apps/embeddedkonsoleembeddedkonsole.pro
         CONFIG_EUROCONV         noncore/tools/euroconv/ euroconv.pro
         CONFIG_EXAMPLE_APPLET   examples/appletapplet.pro
 CONFIG_EXAMPLE_BOARD    examples/inputmethod    inputmethod.pro
         CONFIG_EXAMPLE_LIBOPIE2COREexamples/opiecore       opiecore.pro
         CONFIG_EXAMPLE_LIBOPIE2DBexamples/opiedb opiedb.pro
         CONFIG_EXAMPLE_LIBOPIE2MMexamples/opiemm opiemm.pro
         CONFIG_EXAMPLE_LIBOPIE2NETexamples/opienet        opienet.pro
         CONFIG_EXAMPLE_LIBOPIE2PIMexamples/opiepim        opiepim.pro
         CONFIG_EXAMPLE_LIBOPIE2SECURITYexamples/opiesecurity opiesecurity.pro
         CONFIG_EXAMPLE_LIBOPIE2UI       examples/opieuiopieui.pro
 CONFIG_EXAMPLE_MENU     examples/menuapplet menuapplet.pro
 CONFIG_EXAMPLE_VPN      examples/networksettings        networksettings.pro
         CONFIG_FIFTEEN  noncore/games/fifteenfifteen.pro
         CONFIG_FILEBROWSER      noncore/unsupported/filebrowserfilebrowser.pro
         CONFIG_FLAT     noncore/styles/flatflat.pro
         CONFIG_FORMATTER        noncore/tools/formatterformatter.pro
         CONFIG_FREETYPE         freetypefreetype.pro
         CONFIG_FRESH    noncore/styles/freshfresh.pro
         CONFIG_FTPLIB   noncore/net/ftplibftplib.pro
         CONFIG_GO       noncore/games/gogo.pro
         CONFIG_GSMTOOL  noncore/unsupported/gsmtoolgsmtool.pro
         CONFIG_GUTENBROWSER     noncore/apps/opie-gutenbrowseropie-gutenbrowser.pro
         CONFIG_HANDWRITING      inputmethods/handwritinghandwriting.pro
         CONFIG_HELPBROWSER      core/apps/helpbrowserhelpbrowser.pro
         CONFIG_HOMEAPPLET       core/applets/homeapplethomeapplet.pro
         CONFIG_INTERFACES       noncore/settings/networksettings/interfacesinterfaces.pro
         CONFIG_IRDAAPPLET       core/applets/irdaappletirdaapplet.pro
         CONFIG_JUMPX    inputmethods/jumpxjumpx.pro
         CONFIG_KBILL    noncore/games/kbillkbill.pro
         CONFIG_KCHECKERS        noncore/games/kcheckerskcheckers.pro
         CONFIG_KEYBOARD         inputmethods/keyboardkeyboard.pro
 CONFIG_KEYHELPER noncore/applets/keyhelper keyhelper.pro
         CONFIG_KEYPEBBLE        noncore/comm/keypebblekeypebble.pro
         CONFIG_KEYVIEW  development/keyviewkeyview.pro
         CONFIG_KJUMPX   inputmethods/kjumpxkjumpx.pro
         CONFIG_KPACMAN  noncore/games/kpacmankpacman.pro
         CONFIG_LANGUAGE         noncore/settings/languagelanguage.pro
         CONFIG_LAUNCHER                 core/launcherserver.pro