-rw-r--r-- | korganizer/komonthview.cpp | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 5926abe..ffb2e1e 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp | |||
@@ -554,4 +554,5 @@ void MonthViewCell::insertTodo(Todo *todo) | |||
554 | { | 554 | { |
555 | QString text; | 555 | QString text; |
556 | mItemList->setFocusPolicy(WheelFocus); | ||
556 | if (todo->hasDueDate()) { | 557 | if (todo->hasDueDate()) { |
557 | if (!todo->doesFloat()) { | 558 | if (!todo->doesFloat()) { |
@@ -560,5 +561,5 @@ void MonthViewCell::insertTodo(Todo *todo) | |||
560 | } | 561 | } |
561 | } | 562 | } |
562 | text += i18n("Td: %1").arg(todo->summary()); | 563 | text += i18n("T: %1").arg(todo->summary()); |
563 | 564 | ||
564 | MonthViewItem *item = new MonthViewItem( todo, mDate, text ); | 565 | MonthViewItem *item = new MonthViewItem( todo, mDate, text ); |
@@ -783,5 +784,4 @@ void MonthViewCell::selection( QListBoxItem *item ) | |||
783 | { | 784 | { |
784 | if ( !item ) return; | 785 | if ( !item ) return; |
785 | |||
786 | mMonthView->setSelectedCell( this ); | 786 | mMonthView->setSelectedCell( this ); |
787 | } | 787 | } |
@@ -1266,8 +1266,14 @@ void KOMonthView::resizeEvent(QResizeEvent * e) | |||
1266 | qDebug("KOMonthView::resizeEvent %d %d -- %d %d ", e->size().width(), e->size().height(), e->oldSize().width(), e->oldSize().height()); | 1266 | qDebug("KOMonthView::resizeEvent %d %d -- %d %d ", e->size().width(), e->size().height(), e->oldSize().width(), e->oldSize().height()); |
1267 | if ( ignoreResizeEvent ) { | 1267 | if ( ignoreResizeEvent ) { |
1268 | int diff = e->size().height() - e->oldSize().height(); | ||
1269 | if ( diff < 0 ) | ||
1270 | diff = diff * (-1); | ||
1271 | if ( diff == ignoreResizeEventHeight ) { | ||
1268 | qDebug("KOMonthView::resizeEvent ignored "); | 1272 | qDebug("KOMonthView::resizeEvent ignored "); |
1269 | --ignoreResizeEvent; | 1273 | --ignoreResizeEvent; |
1270 | return; | 1274 | return; |
1271 | } | 1275 | } |
1276 | ignoreResizeEvent = 0; | ||
1277 | } | ||
1272 | if ( e->size().width()+ e->size().height() < 240 ) | 1278 | if ( e->size().width()+ e->size().height() < 240 ) |
1273 | return; | 1279 | return; |
@@ -1512,5 +1518,5 @@ MonthViewCell * KOMonthView::selectedCell( ) | |||
1512 | void KOMonthView::setSelectedCell( MonthViewCell *cell ) | 1518 | void KOMonthView::setSelectedCell( MonthViewCell *cell ) |
1513 | { | 1519 | { |
1514 | // qDebug("KOMonthView::setSelectedCell "); | 1520 | //qDebug("KOMonthView::setSelectedCell %x ", cell); |
1515 | if ( mSelectedCell && mSelectedCell != cell ) { | 1521 | if ( mSelectedCell && mSelectedCell != cell ) { |
1516 | MonthViewCell * mvc = mSelectedCell; | 1522 | MonthViewCell * mvc = mSelectedCell; |
@@ -1551,4 +1557,7 @@ void KOMonthView::keyPressEvent ( QKeyEvent * e ) | |||
1551 | { | 1557 | { |
1552 | emit prevMonth(); | 1558 | emit prevMonth(); |
1559 | if ( mShowWeekView ) | ||
1560 | mCellsW[0]->setFocus(); | ||
1561 | else | ||
1553 | mCells[0]->setFocus(); | 1562 | mCells[0]->setFocus(); |
1554 | } | 1563 | } |
@@ -1558,4 +1567,7 @@ void KOMonthView::keyPressEvent ( QKeyEvent * e ) | |||
1558 | { | 1567 | { |
1559 | emit nextMonth(); | 1568 | emit nextMonth(); |
1569 | if ( mShowWeekView ) | ||
1570 | mCellsW[0]->setFocus(); | ||
1571 | else | ||
1560 | mCells[0]->setFocus(); | 1572 | mCells[0]->setFocus(); |
1561 | 1573 | ||