author | alwin <alwin> | 2005-03-19 23:08:06 (UTC) |
---|---|---|
committer | alwin <alwin> | 2005-03-19 23:08:06 (UTC) |
commit | 3b5693df5af4a08b3261efefa545c706ff305868 (patch) (unidiff) | |
tree | 962d74229950ff39901413c55ee57a5306317ca2 | |
parent | ff7fd64d755b2cc63f9944b1a17a6a2e186da0b6 (diff) | |
download | opie-3b5693df5af4a08b3261efefa545c706ff305868.zip opie-3b5693df5af4a08b3261efefa545c706ff305868.tar.gz opie-3b5693df5af4a08b3261efefa545c706ff305868.tar.bz2 |
added .cvsignore files
corrected the name of the christmas holidays
-rw-r--r-- | core/pim/datebook/holiday/birthday/.cvsignore | 2 | ||||
-rw-r--r-- | core/pim/datebook/holiday/christian/.cvsignore | 2 | ||||
-rw-r--r-- | core/pim/datebook/holiday/christian/hlist.cpp | 6 | ||||
-rw-r--r-- | core/pim/datebook/holiday/national/.cvsignore | 2 |
4 files changed, 11 insertions, 1 deletions
diff --git a/core/pim/datebook/holiday/birthday/.cvsignore b/core/pim/datebook/holiday/birthday/.cvsignore new file mode 100644 index 0000000..42d3c25 --- a/dev/null +++ b/core/pim/datebook/holiday/birthday/.cvsignore | |||
@@ -0,0 +1,2 @@ | |||
1 | .moc | ||
2 | Makefile | ||
diff --git a/core/pim/datebook/holiday/christian/.cvsignore b/core/pim/datebook/holiday/christian/.cvsignore new file mode 100644 index 0000000..42d3c25 --- a/dev/null +++ b/core/pim/datebook/holiday/christian/.cvsignore | |||
@@ -0,0 +1,2 @@ | |||
1 | .moc | ||
2 | Makefile | ||
diff --git a/core/pim/datebook/holiday/christian/hlist.cpp b/core/pim/datebook/holiday/christian/hlist.cpp index 2ce13f5..f1d51f8 100644 --- a/core/pim/datebook/holiday/christian/hlist.cpp +++ b/core/pim/datebook/holiday/christian/hlist.cpp | |||
@@ -1,18 +1,22 @@ | |||
1 | #include "hlist.h" | 1 | #include "hlist.h" |
2 | 2 | ||
3 | #include <qobject.h> | 3 | #include <qobject.h> |
4 | 4 | ||
5 | const QStringList HList::entries(const QDate&aDate)const | 5 | const QStringList HList::entries(const QDate&aDate)const |
6 | { | 6 | { |
7 | QStringList ret; | 7 | QStringList ret; |
8 | if (aDate.month()==12) { | 8 | if (aDate.month()==12) { |
9 | if (aDate.day()==24) { | 9 | if (aDate.day()==24) { |
10 | ret.append(QObject::tr("Christmas","holidays")); | 10 | ret.append(QObject::tr("Christmas Eve","holidays")); |
11 | } else if (aDate.day()==25) { | ||
12 | ret.append(QObject::tr("Christmas Day","holidays")); | ||
13 | } else if (aDate.day()==26) { | ||
14 | ret.append(QObject::tr("Boxing Day","holidays")); | ||
11 | } | 15 | } |
12 | } else if (aDate.month()==1) { | 16 | } else if (aDate.month()==1) { |
13 | if (aDate.day()==1) { | 17 | if (aDate.day()==1) { |
14 | ret.append(QObject::tr("New Year","holidays")); | 18 | ret.append(QObject::tr("New Year","holidays")); |
15 | } | 19 | } |
16 | } | 20 | } |
17 | return ret; | 21 | return ret; |
18 | } | 22 | } |
diff --git a/core/pim/datebook/holiday/national/.cvsignore b/core/pim/datebook/holiday/national/.cvsignore new file mode 100644 index 0000000..42d3c25 --- a/dev/null +++ b/core/pim/datebook/holiday/national/.cvsignore | |||
@@ -0,0 +1,2 @@ | |||
1 | .moc | ||
2 | Makefile | ||