summaryrefslogtreecommitdiffabout
path: root/korganizer/kdatenavigator.cpp
authorzautrix <zautrix>2004-08-29 14:16:05 (UTC)
committer zautrix <zautrix>2004-08-29 14:16:05 (UTC)
commit3a5648d8378b44cbe12d66bafa3d557c065f0f6d (patch) (side-by-side diff)
tree1f143371c48b017ee6cf86862fcbc261727421b4 /korganizer/kdatenavigator.cpp
parentf7bf415be8c727c887ec01c2d8fb8f1c2f85d096 (diff)
downloadkdepimpi-3a5648d8378b44cbe12d66bafa3d557c065f0f6d.zip
kdepimpi-3a5648d8378b44cbe12d66bafa3d557c065f0f6d.tar.gz
kdepimpi-3a5648d8378b44cbe12d66bafa3d557c065f0f6d.tar.bz2
Some compilation fixes
Diffstat (limited to 'korganizer/kdatenavigator.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/kdatenavigator.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp
index 7d0c516..b420351 100644
--- a/korganizer/kdatenavigator.cpp
+++ b/korganizer/kdatenavigator.cpp
@@ -236,36 +236,39 @@ void KDateNavigator::updateView()
int i;
// kdDebug() << "updateView() -> daymatrix->updateView()" << endl;
daymatrix->updateView();
// set the week numbers.
for(i = 0; i < 6; i++) {
QString weeknum;
// remember, according to ISO 8601, the first week of the year is the
// first week that contains a thursday. Thus we must subtract off 4,
// not just 1.
//ET int dayOfYear = buttons[(i + 1) * 7 - 4]->date().dayOfYear();
int dayOfYear = KOGlobals::self()->calendarSystem()->dayOfYear((daymatrix->getDate((i+1)*7-4)));
+ int add = 0;
+ if ( ! KGlobal::locale()->weekStartsMonday() )
+ ++add;
if (dayOfYear % 7 != 0)
- weeknum.setNum(dayOfYear / 7 + 1);
+ weeknum.setNum(dayOfYear / 7 + 1+add);
else
- weeknum.setNum(dayOfYear / 7);
+ weeknum.setNum(dayOfYear / 7 +add);
weeknos[i]->setText(weeknum);
}
setUpdatesEnabled( true );
// kdDebug() << "updateView() -> repaint()" << endl;
repaint();
daymatrix->repaint();
}
void KDateNavigator::updateConfig()
{
int day;
for(int i=0; i<7; i++) {
// take the first letter of the day name to be the abbreviation
if (KGlobal::locale()->weekStartsMonday()) {
day = i+1;