author | eilers <eilers> | 2003-08-01 14:19:44 (UTC) |
---|---|---|
committer | eilers <eilers> | 2003-08-01 14:19:44 (UTC) |
commit | 34991bac7d96b1c17601be6a5607819342571e0c (patch) (unidiff) | |
tree | 65d0bc2db22bcc1dc1b5eafdafd53b9cb08a6395 /core/pim/datebook/datebookweeklst.cpp | |
parent | 5346424fc26bde232a15aa34fbb720f86218b26f (diff) | |
download | opie-34991bac7d96b1c17601be6a5607819342571e0c.zip opie-34991bac7d96b1c17601be6a5607819342571e0c.tar.gz opie-34991bac7d96b1c17601be6a5607819342571e0c.tar.bz2 |
Merging changes from BRANCH_1_0 to HEAD..
Diffstat (limited to 'core/pim/datebook/datebookweeklst.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/pim/datebook/datebookweeklst.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/core/pim/datebook/datebookweeklst.cpp b/core/pim/datebook/datebookweeklst.cpp index 7817042..aad1f3a 100644 --- a/core/pim/datebook/datebookweeklst.cpp +++ b/core/pim/datebook/datebookweeklst.cpp | |||
@@ -61,7 +61,12 @@ void DateBookWeekLstHeader::setDate(const QDate &d) { | |||
61 | int year,week,dayofweek; | 61 | int year,week,dayofweek; |
62 | date=d; | 62 | date=d; |
63 | dayofweek=d.dayOfWeek(); | 63 | dayofweek=d.dayOfWeek(); |
64 | if(bStartOnMonday) dayofweek--; | 64 | if(bStartOnMonday) |
65 | dayofweek--; | ||
66 | else if( dayofweek == 7 ) | ||
67 | /* we already have the right day -7 would lead to the same week */ | ||
68 | dayofweek = 0; | ||
69 | |||
65 | date=date.addDays(-dayofweek); | 70 | date=date.addDays(-dayofweek); |
66 | 71 | ||
67 | calcWeek(date,week,year,bStartOnMonday); | 72 | calcWeek(date,week,year,bStartOnMonday); |
@@ -117,7 +122,7 @@ DateBookWeekLstDayHdr::DateBookWeekLstDayHdr(const QDate &d, bool /* onM */, | |||
117 | 122 | ||
118 | date=d; | 123 | date=d; |
119 | 124 | ||
120 | static const char *wdays={"MTWTFSSM"}; | 125 | static const QString wdays=tr("MTWTFSSM", "Week days"); |
121 | char day=wdays[d.dayOfWeek()-1]; | 126 | char day=wdays[d.dayOfWeek()-1]; |
122 | 127 | ||
123 | label->setText( QString(QObject::tr(QString(QChar(day)))) + " " +QString::number(d.day()) ); | 128 | label->setText( QString(QObject::tr(QString(QChar(day)))) + " " +QString::number(d.day()) ); |
@@ -237,6 +242,7 @@ DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev, | |||
237 | // Calculate offset to first day of week. | 242 | // Calculate offset to first day of week. |
238 | int dayoffset=d.dayOfWeek(); | 243 | int dayoffset=d.dayOfWeek(); |
239 | if(bStartOnMonday) dayoffset--; | 244 | if(bStartOnMonday) dayoffset--; |
245 | else if( dayoffset == 7 ) dayoffset = 0; | ||
240 | 246 | ||
241 | for (int i=0; i<7; i++) { | 247 | for (int i=0; i<7; i++) { |
242 | // Header | 248 | // Header |