Diffstat (limited to 'core/pim/datebook/holiday/christian') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/datebook/holiday/christian/chrisholiday.cpp | 50 | ||||
-rw-r--r-- | core/pim/datebook/holiday/christian/chrisholiday.h | 2 |
2 files changed, 51 insertions, 1 deletions
diff --git a/core/pim/datebook/holiday/christian/chrisholiday.cpp b/core/pim/datebook/holiday/christian/chrisholiday.cpp index ef6516e..f8e310f 100644 --- a/core/pim/datebook/holiday/christian/chrisholiday.cpp +++ b/core/pim/datebook/holiday/christian/chrisholiday.cpp @@ -1,15 +1,16 @@ #include "chrisholiday.h" #include <qobject.h> +#include <qpe/event.h> QString ChrisHoliday::description() { return QObject::tr("Christian holidays","holidays"); } QStringList ChrisHoliday::entries(const QDate&aDate) { QStringList ret; ret+=_internallist.entries(aDate); calcit(aDate.year()); tDayMap::Iterator it = _days.find(aDate); @@ -78,19 +79,66 @@ void ChrisHoliday::calc_easter() 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(39)].append(QObject::tr("Ascension Day","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> ChrisHoliday::entries(const QDate&start,const QDate&end) { QMap<QDate,QStringList> ret; + if (start==end) { + ret[start]=entries(start); + return ret; + } + QDate d; + int daysto; + if (end < start) { + d = end; + daysto = end.daysTo(start); + } else { + d = start; + daysto = start.daysTo(end); + } + QStringList temp; + for (int i=0;i<daysto;++i) { + temp = entries(d.addDays(i)); + if (temp.count()==0) continue; + ret[d.addDays(i)]+=temp; + temp.clear(); + } + return ret; +} + +QValueList<EffectiveEvent> ChrisHoliday::events(const QDate&start,const QDate&end) +{ + QValueList<EffectiveEvent> ret; + QDate d = (start<end?start:end); + int daysto = start.daysTo(end); + if (daysto < 0) { + daysto = end.daysTo(start); + } + + QStringList temp; + for (int i =0; i<daysto;++i) { + temp = entries(d.addDays(i)); + if (temp.count()==0) { + continue; + } + for (unsigned j=0;j<temp.count();++j) { + Event ev; + ev.setDescription(temp[j]); + ev.setStart(d.addDays(i)); + ev.setAllDay(true); + ret.append(EffectiveEvent(ev,d.addDays(i))); + } + } + return ret; } EXPORT_HOLIDAY_PLUGIN(ChrisHoliday); diff --git a/core/pim/datebook/holiday/christian/chrisholiday.h b/core/pim/datebook/holiday/christian/chrisholiday.h index 9ae500e..1ecb813 100644 --- a/core/pim/datebook/holiday/christian/chrisholiday.h +++ b/core/pim/datebook/holiday/christian/chrisholiday.h @@ -11,23 +11,25 @@ class ChrisHoliday:public Opie::Datebook::HolidayPlugin { typedef QMap<QDate,QStringList> tDayMap; public: ChrisHoliday():Opie::Datebook::HolidayPlugin(){_lastyear=0;} virtual ~ChrisHoliday(){} 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&); + virtual QValueList<EffectiveEvent> events(const QDate&,const QDate&); + protected: HList _internallist; unsigned int _lastyear; tDayMap _days; void calcit(int year); void calc_easter(); void calc_christmas(); }; #endif |