-rw-r--r-- | korganizer/koagendaview.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index 8b79788..8e9add3 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp | |||
@@ -1414,135 +1414,137 @@ void KOAgendaView::setHolidayMasks() | |||
1414 | #ifndef KORG_NOPLUGINS | 1414 | #ifndef KORG_NOPLUGINS |
1415 | bool showHoliday = KOPrefs::instance()->mExcludeHolidays && | 1415 | bool showHoliday = KOPrefs::instance()->mExcludeHolidays && |
1416 | !KOCore::self()->holiday(date).isEmpty(); | 1416 | !KOCore::self()->holiday(date).isEmpty(); |
1417 | #endif | 1417 | #endif |
1418 | bool showDay = showSaturday || showSunday || showHoliday; | 1418 | bool showDay = showSaturday || showSunday || showHoliday; |
1419 | 1419 | ||
1420 | if (showDay) { | 1420 | if (showDay) { |
1421 | mHolidayMask.at(i) = true; | 1421 | mHolidayMask.at(i) = true; |
1422 | } else { | 1422 | } else { |
1423 | mHolidayMask.at(i) = false; | 1423 | mHolidayMask.at(i) = false; |
1424 | } | 1424 | } |
1425 | } | 1425 | } |
1426 | 1426 | ||
1427 | mAgenda->setHolidayMask(&mHolidayMask); | 1427 | mAgenda->setHolidayMask(&mHolidayMask); |
1428 | mAllDayAgenda->setHolidayMask(&mHolidayMask); | 1428 | mAllDayAgenda->setHolidayMask(&mHolidayMask); |
1429 | } | 1429 | } |
1430 | 1430 | ||
1431 | void KOAgendaView::setContentsPos(int y) | 1431 | void KOAgendaView::setContentsPos(int y) |
1432 | { | 1432 | { |
1433 | mAgenda->setContentsPos(0,y); | 1433 | mAgenda->setContentsPos(0,y); |
1434 | } | 1434 | } |
1435 | 1435 | ||
1436 | void KOAgendaView::setExpandedButton( bool expanded ) | 1436 | void KOAgendaView::setExpandedButton( bool expanded ) |
1437 | { | 1437 | { |
1438 | if ( expanded ) { | 1438 | if ( expanded ) { |
1439 | mExpandButton->setPixmap( mExpandedPixmap ); | 1439 | mExpandButton->setPixmap( mExpandedPixmap ); |
1440 | } else { | 1440 | } else { |
1441 | mExpandButton->setPixmap( mNotExpandedPixmap ); | 1441 | mExpandButton->setPixmap( mNotExpandedPixmap ); |
1442 | } | 1442 | } |
1443 | } | 1443 | } |
1444 | 1444 | ||
1445 | void KOAgendaView::clearSelection() | 1445 | void KOAgendaView::clearSelection() |
1446 | { | 1446 | { |
1447 | mAgenda->deselectItem(); | 1447 | mAgenda->deselectItem(); |
1448 | mAllDayAgenda->deselectItem(); | 1448 | mAllDayAgenda->deselectItem(); |
1449 | } | 1449 | } |
1450 | 1450 | ||
1451 | void KOAgendaView::newTimeSpanSelectedAllDay(int gxStart, int gyStart, | 1451 | void KOAgendaView::newTimeSpanSelectedAllDay(int gxStart, int gyStart, |
1452 | int gxEnd, int gyEnd) | 1452 | int gxEnd, int gyEnd) |
1453 | { | 1453 | { |
1454 | mTimeSpanInAllDay = true; | 1454 | mTimeSpanInAllDay = true; |
1455 | newTimeSpanSelected(gxStart,gyStart,gxEnd,gyEnd); | 1455 | newTimeSpanSelected(gxStart,gyStart,gxEnd,gyEnd); |
1456 | } | 1456 | } |
1457 | 1457 | ||
1458 | 1458 | ||
1459 | 1459 | ||
1460 | 1460 | ||
1461 | void KOAgendaView::newTimeSpanSelected(int gxStart, int gyStart, | 1461 | void KOAgendaView::newTimeSpanSelected(int gxStart, int gyStart, |
1462 | int gxEnd, int gyEnd) | 1462 | int gxEnd, int gyEnd) |
1463 | { | 1463 | { |
1464 | if (!mSelectedDates.count()) return; | 1464 | if (!mSelectedDates.count()) return; |
1465 | 1465 | ||
1466 | QDate dayStart = mSelectedDates[gxStart]; | 1466 | QDate dayStart = mSelectedDates[gxStart]; |
1467 | QDate dayEnd = mSelectedDates[gxEnd]; | 1467 | QDate dayEnd = mSelectedDates[gxEnd]; |
1468 | 1468 | ||
1469 | QTime timeStart = mAgenda->gyToTime(gyStart); | 1469 | QTime timeStart = mAgenda->gyToTime(gyStart); |
1470 | QTime timeEnd = mAgenda->gyToTime( gyEnd + 1 ); | 1470 | QTime timeEnd = mAgenda->gyToTime( gyEnd + 1 ); |
1471 | 1471 | ||
1472 | QDateTime dtStart(dayStart,timeStart); | 1472 | QDateTime dtStart(dayStart,timeStart); |
1473 | QDateTime dtEnd(dayEnd,timeEnd); | 1473 | QDateTime dtEnd(dayEnd,timeEnd); |
1474 | 1474 | ||
1475 | mTimeSpanBegin = dtStart; | 1475 | mTimeSpanBegin = dtStart; |
1476 | mTimeSpanEnd = dtEnd; | 1476 | mTimeSpanEnd = dtEnd; |
1477 | 1477 | ||
1478 | } | 1478 | } |
1479 | 1479 | ||
1480 | void KOAgendaView::deleteSelectedDateTime() | 1480 | void KOAgendaView::deleteSelectedDateTime() |
1481 | { | 1481 | { |
1482 | mTimeSpanBegin.setDate(QDate()); | 1482 | mTimeSpanBegin.setDate(QDate()); |
1483 | mTimeSpanEnd.setDate(QDate()); | 1483 | mTimeSpanEnd.setDate(QDate()); |
1484 | mTimeSpanInAllDay = false; | 1484 | mTimeSpanInAllDay = false; |
1485 | } | 1485 | } |
1486 | 1486 | ||
1487 | void KOAgendaView::keyPressEvent ( QKeyEvent * e ) | 1487 | void KOAgendaView::keyPressEvent ( QKeyEvent * e ) |
1488 | { | 1488 | { |
1489 | e->ignore(); | 1489 | e->ignore(); |
1490 | } | 1490 | } |
1491 | 1491 | ||
1492 | void KOAgendaView::scrollOneHourUp() | 1492 | void KOAgendaView::scrollOneHourUp() |
1493 | { | 1493 | { |
1494 | 1494 | ||
1495 | mAgenda->scrollBy ( 0, -mAgenda->contentsHeight () / 24 ); | 1495 | mAgenda->scrollBy ( 0, -mAgenda->contentsHeight () / 24 ); |
1496 | } | 1496 | } |
1497 | void KOAgendaView::scrollOneHourDown() | 1497 | void KOAgendaView::scrollOneHourDown() |
1498 | { | 1498 | { |
1499 | mAgenda->scrollBy ( 0, mAgenda->contentsHeight () / 24 ); | 1499 | mAgenda->scrollBy ( 0, mAgenda->contentsHeight () / 24 ); |
1500 | } | 1500 | } |
1501 | 1501 | ||
1502 | void KOAgendaView::setStartHour( int h ) | 1502 | void KOAgendaView::setStartHour( int h ) |
1503 | { | 1503 | { |
1504 | mAgenda->setStartHour( h ); | 1504 | mAgenda->setStartHour( h ); |
1505 | 1505 | ||
1506 | } | 1506 | } |
1507 | 1507 | ||
1508 | void KOAgendaView::updateTodo( Todo * t, int ) | 1508 | void KOAgendaView::updateTodo( Todo * t, int ) |
1509 | { | 1509 | { |
1510 | if ( !isVisible() ) | ||
1511 | return; | ||
1510 | bool remove = false; | 1512 | bool remove = false; |
1511 | bool removeAD = false; | 1513 | bool removeAD = false; |
1512 | QDate da; | 1514 | QDate da; |
1513 | if ( t->hasCompletedDate() ) | 1515 | if ( t->hasCompletedDate() ) |
1514 | da = t->completed().date(); | 1516 | da = t->completed().date(); |
1515 | else | 1517 | else |
1516 | da = t->dtDue().date(); | 1518 | da = t->dtDue().date(); |
1517 | if ( ! t->hasDueDate() && !t->hasCompletedDate() ) { | 1519 | if ( ! t->hasDueDate() && !t->hasCompletedDate() ) { |
1518 | remove = true; | 1520 | remove = true; |
1519 | removeAD = true; | 1521 | removeAD = true; |
1520 | } | 1522 | } |
1521 | else { | 1523 | else { |
1522 | bool overdue = (!t->isCompleted()) && (t->dtDue() < QDate::currentDate()) && KOPrefs::instance()->mShowTodoInAgenda ; | 1524 | bool overdue = (!t->isCompleted()) && (t->dtDue() < QDate::currentDate()) && KOPrefs::instance()->mShowTodoInAgenda ; |
1523 | if ( overdue && | 1525 | if ( overdue && |
1524 | QDate::currentDate() >= mSelectedDates.first() && | 1526 | QDate::currentDate() >= mSelectedDates.first() && |
1525 | QDate::currentDate() <= mSelectedDates.last()) { | 1527 | QDate::currentDate() <= mSelectedDates.last()) { |
1526 | removeAD = false; | 1528 | removeAD = false; |
1527 | remove = true; | 1529 | remove = true; |
1528 | } | 1530 | } |
1529 | else { | 1531 | else { |
1530 | 1532 | ||
1531 | if ( da < mSelectedDates.first() || | 1533 | if ( da < mSelectedDates.first() || |
1532 | da > mSelectedDates.last() ) { | 1534 | da > mSelectedDates.last() ) { |
1533 | remove = true; | 1535 | remove = true; |
1534 | removeAD = true; | 1536 | removeAD = true; |
1535 | } else { | 1537 | } else { |
1536 | remove = t->doesFloat() && !t->hasCompletedDate(); | 1538 | remove = t->doesFloat() && !t->hasCompletedDate(); |
1537 | removeAD = !remove; | 1539 | removeAD = !remove; |
1538 | } | 1540 | } |
1539 | } | 1541 | } |
1540 | } | 1542 | } |
1541 | int days = mSelectedDates.first().daysTo( da ); | 1543 | int days = mSelectedDates.first().daysTo( da ); |
1542 | //qDebug("daysto %d %d %d", days, remove,removeAD ); | 1544 | //qDebug("daysto %d %d %d", days, remove,removeAD ); |
1543 | mAgenda->updateTodo( t , days, remove); | 1545 | mAgenda->updateTodo( t , days, remove); |
1544 | if ( KOPrefs::instance()->mShowTodoInAgenda ) | 1546 | if ( KOPrefs::instance()->mShowTodoInAgenda ) |
1545 | mAllDayAgenda->updateTodo( t , days, removeAD); | 1547 | mAllDayAgenda->updateTodo( t , days, removeAD); |
1546 | //qDebug("KOAgendaView::updateTodo( Todo *, int ) "); | 1548 | //qDebug("KOAgendaView::updateTodo( Todo *, int ) "); |
1547 | 1549 | ||
1548 | } | 1550 | } |