added birthday display into datebook

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
@@ -92,4 +92,4 @@ QMap<QDate,QStringList> ChrisHoliday::entries(const QDate&,const QDate&)
     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
@@ -32,6 +32,7 @@ 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