| author | zautrix <zautrix> | 2004-08-29 14:16:05 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2004-08-29 14:16:05 (UTC) |
| commit | 3a5648d8378b44cbe12d66bafa3d557c065f0f6d (patch) (side-by-side diff) | |
| tree | 1f143371c48b017ee6cf86862fcbc261727421b4 /korganizer | |
| parent | f7bf415be8c727c887ec01c2d8fb8f1c2f85d096 (diff) | |
| download | kdepimpi-3a5648d8378b44cbe12d66bafa3d557c065f0f6d.zip kdepimpi-3a5648d8378b44cbe12d66bafa3d557c065f0f6d.tar.gz kdepimpi-3a5648d8378b44cbe12d66bafa3d557c065f0f6d.tar.bz2 | |
Some compilation fixes
| -rw-r--r-- | korganizer/kdatenavigator.cpp | 7 | ||||
| -rw-r--r-- | korganizer/koeditorrecurrence.cpp | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp index 7d0c516..b420351 100644 --- a/korganizer/kdatenavigator.cpp +++ b/korganizer/kdatenavigator.cpp @@ -246,16 +246,19 @@ void KDateNavigator::updateView() // 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(); diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp index 584d1ed..4209e10 100644 --- a/korganizer/koeditorrecurrence.cpp +++ b/korganizer/koeditorrecurrence.cpp @@ -1049,13 +1049,13 @@ void KOEditorRecurrence::writeEvent( Event *event ) bool found = false; for (j = 0; j < 7 ; ++j ) { found |=days.at(j); } if ( !found ) { days.setBit( event->dtStart().date().dayOfWeek()-1); - qDebug("bit set %d "); + qDebug("bit set %d ", event->dtStart().date().dayOfWeek()-1); } if ( duration != 0 ) r->setWeekly( freq, days, duration ); else r->setWeekly( freq, days, endDate ); } else if ( recurrenceType == RecurrenceChooser::Monthly ) { int freq = mMonthly->frequency(); if ( mMonthly->byPos() ) { |