-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 @@ -550,19 +550,20 @@ void MonthViewCell::insertEvent(Event *event) mItemList->insertItem( item ); mToolTip += "\n"; } void MonthViewCell::insertTodo(Todo *todo) { QString text; + mItemList->setFocusPolicy(WheelFocus); if (todo->hasDueDate()) { if (!todo->doesFloat()) { text += KGlobal::locale()->formatTime(todo->dtDue().time()); text += " "; } } - text += i18n("Td: %1").arg(todo->summary()); + text += i18n("T: %1").arg(todo->summary()); MonthViewItem *item = new MonthViewItem( todo, mDate, text ); //item->setPalette( mStandardPalette ); QPalette pal; if (KOPrefs::instance()->mMonthViewUsesCategoryColor) { QStringList categories = todo->categories(); @@ -779,13 +780,12 @@ void MonthViewCell::contextMenu( QListBoxItem *item ) if ( incidence ) mMonthView->showContextMenu( incidence ); } void MonthViewCell::selection( QListBoxItem *item ) { if ( !item ) return; - mMonthView->setSelectedCell( this ); } // ******************************************************************************* // ******************************************************************************* @@ -1262,16 +1262,22 @@ void KOMonthView::updateView() } void KOMonthView::resizeEvent(QResizeEvent * e) { qDebug("KOMonthView::resizeEvent %d %d -- %d %d ", e->size().width(), e->size().height(), e->oldSize().width(), e->oldSize().height()); if ( ignoreResizeEvent ) { + int diff = e->size().height() - e->oldSize().height(); + if ( diff < 0 ) + diff = diff * (-1); + if ( diff == ignoreResizeEventHeight ) { qDebug("KOMonthView::resizeEvent ignored "); --ignoreResizeEvent; return; } + ignoreResizeEvent = 0; + } if ( e->size().width()+ e->size().height() < 240 ) return; computeLayout(); clPending = true; if ( mShowWeekView ) mCellsW[0]->setFocus(); @@ -1508,13 +1514,13 @@ void KOMonthView::showContextMenu( Incidence *incidence ) MonthViewCell * KOMonthView::selectedCell( ) { return mSelectedCell; } void KOMonthView::setSelectedCell( MonthViewCell *cell ) { - // qDebug("KOMonthView::setSelectedCell "); + //qDebug("KOMonthView::setSelectedCell %x ", cell); if ( mSelectedCell && mSelectedCell != cell ) { MonthViewCell * mvc = mSelectedCell; mSelectedCell = cell; mvc->deselect(); } else mSelectedCell = cell; @@ -1547,19 +1553,25 @@ void KOMonthView::keyPressEvent ( QKeyEvent * e ) { //qDebug("KOMonthView::keyPressEvent "); switch(e->key()) { case Key_Up: { emit prevMonth(); + if ( mShowWeekView ) + mCellsW[0]->setFocus(); + else mCells[0]->setFocus(); } e->accept(); break; case Key_Down: { emit nextMonth(); + if ( mShowWeekView ) + mCellsW[0]->setFocus(); + else mCells[0]->setFocus(); } e->accept(); break; case Key_Return: |