-rw-r--r-- | korganizer/kdatenavigator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp index 12e983b..7d0c516 100644 --- a/korganizer/kdatenavigator.cpp +++ b/korganizer/kdatenavigator.cpp | |||
@@ -316,49 +316,49 @@ void KDateNavigator::selectDates(const DateList& dateList) | |||
316 | 316 | ||
317 | daymatrix->setSelectedDaysFrom(*(dateList.begin()), *(--dateList.end())); | 317 | daymatrix->setSelectedDaysFrom(*(dateList.begin()), *(--dateList.end())); |
318 | 318 | ||
319 | updateView(); | 319 | updateView(); |
320 | } | 320 | } |
321 | } | 321 | } |
322 | 322 | ||
323 | int KDateNavigator::dayNum(int row, int col) | 323 | int KDateNavigator::dayNum(int row, int col) |
324 | { | 324 | { |
325 | return 7 * (row - 1) + (col + 1) - m_fstDayOfWk; | 325 | return 7 * (row - 1) + (col + 1) - m_fstDayOfWk; |
326 | } | 326 | } |
327 | 327 | ||
328 | int KDateNavigator::dayToIndex(int dayNum) | 328 | int KDateNavigator::dayToIndex(int dayNum) |
329 | { | 329 | { |
330 | int row, col; | 330 | int row, col; |
331 | 331 | ||
332 | row = (dayNum+m_fstDayOfWk-1-(KGlobal::locale()->weekStartsMonday() ? 1 : 0)) / 7; | 332 | row = (dayNum+m_fstDayOfWk-1-(KGlobal::locale()->weekStartsMonday() ? 1 : 0)) / 7; |
333 | if (KGlobal::locale()->weekStartsMonday() && (m_fstDayOfWk == 1)) | 333 | if (KGlobal::locale()->weekStartsMonday() && (m_fstDayOfWk == 1)) |
334 | row++; | 334 | row++; |
335 | col = (dayNum+m_fstDayOfWk-1-(KGlobal::locale()->weekStartsMonday() ? 1 : 0)) % 7; | 335 | col = (dayNum+m_fstDayOfWk-1-(KGlobal::locale()->weekStartsMonday() ? 1 : 0)) % 7; |
336 | return row * 7 + col; | 336 | return row * 7 + col; |
337 | } | 337 | } |
338 | 338 | ||
339 | void KDateNavigator::wheelEvent (QWheelEvent *e) | 339 | void KDateNavigator::wheelEvent (QWheelEvent *e) |
340 | { | 340 | { |
341 | if(e->delta()>0) emit goPrevious(); | 341 | if(e->delta()>0) emit goPrevious(); |
342 | else emit goNext(); | 342 | else emit goNext(); |
343 | 343 | ||
344 | e->accept(); | 344 | e->accept(); |
345 | } | 345 | } |
346 | 346 | ||
347 | bool KDateNavigator::eventFilter (QObject *o,QEvent *e) | 347 | bool KDateNavigator::eventFilter (QObject *o,QEvent *e) |
348 | { | 348 | { |
349 | if (e->type() == QEvent::MouseButtonPress) { | 349 | if (e->type() == QEvent::MouseButtonPress) { |
350 | int i; | 350 | int i; |
351 | for(i=0;i<6;++i) { | 351 | for(i=0;i<6;++i) { |
352 | if (o == weeknos[i]) { | 352 | if (o == weeknos[i]) { |
353 | QDate weekstart = daymatrix->getDate(i*7); | 353 | QDate weekstart = daymatrix->getDate(i*7); |
354 | emit weekClicked(weekstart); | 354 | emit weekClicked(weekstart); |
355 | break; | 355 | break; |
356 | } | 356 | } |
357 | } | 357 | } |
358 | return true; | 358 | return true; |
359 | } else { | 359 | } else { |
360 | return false; | 360 | return false; |
361 | } | 361 | } |
362 | } | 362 | } |
363 | 363 | ||
364 | #include "kdatenavigator.moc" | 364 | //#include "kdatenavigator.moc" |