Diffstat (limited to 'core/pim/datebook/holiday/national/nationalholiday.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/pim/datebook/holiday/national/nationalholiday.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/core/pim/datebook/holiday/national/nationalholiday.cpp b/core/pim/datebook/holiday/national/nationalholiday.cpp index 26cd913..52f3489 100644 --- a/core/pim/datebook/holiday/national/nationalholiday.cpp +++ b/core/pim/datebook/holiday/national/nationalholiday.cpp | |||
@@ -1,14 +1,15 @@ | |||
1 | #include "nationalholiday.h" | 1 | #include "nationalholiday.h" |
2 | #include "nationalcfg.h" | 2 | #include "nationalcfg.h" |
3 | #include "nationalcfgwidget.h" | ||
3 | 4 | ||
4 | #include <opie2/odebug.h> | 5 | #include <opie2/odebug.h> |
5 | 6 | ||
6 | #include <qobject.h> | 7 | #include <qobject.h> |
7 | #include <qpe/event.h> | 8 | #include <qpe/event.h> |
8 | #include <qpe/config.h> | 9 | #include <qpe/config.h> |
9 | #include <qpe/qpeapplication.h> | 10 | #include <qpe/qpeapplication.h> |
10 | 11 | ||
11 | NationalHoliday::NationalHoliday() | 12 | NationalHoliday::NationalHoliday() |
12 | :Opie::Datebook::HolidayPlugin() | 13 | :Opie::Datebook::HolidayPlugin() |
13 | { | 14 | { |
14 | _lastyear=0; | 15 | _lastyear=0; |
@@ -17,36 +18,37 @@ NationalHoliday::NationalHoliday() | |||
17 | } | 18 | } |
18 | 19 | ||
19 | QString NationalHoliday::description() | 20 | QString NationalHoliday::description() |
20 | { | 21 | { |
21 | return QObject::tr("National holidays","holidays"); | 22 | return QObject::tr("National holidays","holidays"); |
22 | } | 23 | } |
23 | 24 | ||
24 | void NationalHoliday::init() | 25 | void NationalHoliday::init() |
25 | { | 26 | { |
26 | Config cfg("nationaldays"); | 27 | Config cfg("nationaldays"); |
27 | cfg.setGroup("entries"); | 28 | cfg.setGroup("entries"); |
28 | files = cfg.readListEntry("files"); | 29 | files = cfg.readListEntry("files"); |
29 | odebug << "Read " << files << oendl; | ||
30 | } | 30 | } |
31 | 31 | ||
32 | void NationalHoliday::load_days() | 32 | void NationalHoliday::load_days() |
33 | { | 33 | { |
34 | if (init_done) return; | 34 | if (init_done) return; |
35 | Config cfg("nationaldays"); | ||
36 | cfg.setGroup("entries"); | ||
35 | QStringList::ConstIterator it; | 37 | QStringList::ConstIterator it; |
36 | NHcfg readit; | 38 | NHcfg readit; |
37 | for (it=files.begin();it!=files.end();++it) { | 39 | for (it=files.begin();it!=files.end();++it) { |
38 | odebug << QPEApplication::qpeDir()+"/etc/nationaldays/"+(*it) << oendl; | 40 | if (!readit.load(QPEApplication::qpeDir()+"/etc/nationaldays/"+(*it))) { |
39 | if (!readit.load(QPEApplication::qpeDir()+"/etc/nationaldays/"+(*it))) | ||
40 | continue; | 41 | continue; |
42 | } | ||
41 | tholidaylist::ConstIterator it; | 43 | tholidaylist::ConstIterator it; |
42 | for (it=readit.days().begin();it!=readit.days().end();++it) { | 44 | for (it=readit.days().begin();it!=readit.days().end();++it) { |
43 | _days[it.key()]+=(it.data()); | 45 | _days[it.key()]+=(it.data()); |
44 | } | 46 | } |
45 | 47 | ||
46 | } | 48 | } |
47 | init_done = true; | 49 | init_done = true; |
48 | } | 50 | } |
49 | 51 | ||
50 | QStringList NationalHoliday::entries(const QDate&aDate) | 52 | QStringList NationalHoliday::entries(const QDate&aDate) |
51 | { | 53 | { |
52 | load_days(); | 54 | load_days(); |
@@ -111,13 +113,18 @@ QValueList<EffectiveEvent> NationalHoliday::events(const QDate&start,const QDate | |||
111 | for (unsigned j=0;j<temp.count();++j) { | 113 | for (unsigned j=0;j<temp.count();++j) { |
112 | Event ev; | 114 | Event ev; |
113 | ev.setDescription(temp[j]); | 115 | ev.setDescription(temp[j]); |
114 | ev.setStart(d.addDays(i)); | 116 | ev.setStart(d.addDays(i)); |
115 | ev.setAllDay(true); | 117 | ev.setAllDay(true); |
116 | ret.append(EffectiveEvent(ev,d.addDays(i))); | 118 | ret.append(EffectiveEvent(ev,d.addDays(i))); |
117 | } | 119 | } |
118 | } | 120 | } |
119 | 121 | ||
120 | return ret; | 122 | return ret; |
121 | } | 123 | } |
122 | 124 | ||
125 | Opie::Datebook::HolidayPluginConfigWidget*NationalHoliday::configWidget(QWidget *parent, const char *name, QWidget::WFlags fl) | ||
126 | { | ||
127 | return new NationalHolidayConfigWidget(parent,name,fl); | ||
128 | } | ||
129 | |||
123 | EXPORT_HOLIDAY_PLUGIN(NationalHoliday); | 130 | EXPORT_HOLIDAY_PLUGIN(NationalHoliday); |