summaryrefslogtreecommitdiffabout
path: root/korganizer/komonthview.cpp
Unidiff
Diffstat (limited to 'korganizer/komonthview.cpp') (more/less context) (show whitespace changes)
-rw-r--r--korganizer/komonthview.cpp18
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
@@ -552,15 +552,16 @@ void MonthViewCell::insertEvent(Event *event)
552} 552}
553void MonthViewCell::insertTodo(Todo *todo) 553void 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()) {
558 text += KGlobal::locale()->formatTime(todo->dtDue().time()); 559 text += KGlobal::locale()->formatTime(todo->dtDue().time());
559 text += " "; 560 text += " ";
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 );
565 //item->setPalette( mStandardPalette ); 566 //item->setPalette( mStandardPalette );
566 QPalette pal; 567 QPalette pal;
@@ -781,9 +782,8 @@ void MonthViewCell::contextMenu( QListBoxItem *item )
781 782
782void MonthViewCell::selection( QListBoxItem *item ) 783void 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}
788 788
789 789
@@ -1264,12 +1264,18 @@ void KOMonthView::updateView()
1264void KOMonthView::resizeEvent(QResizeEvent * e) 1264void KOMonthView::resizeEvent(QResizeEvent * e)
1265{ 1265{
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;
1274 computeLayout(); 1280 computeLayout();
1275 clPending = true; 1281 clPending = true;
@@ -1510,9 +1516,9 @@ MonthViewCell * KOMonthView::selectedCell( )
1510 return mSelectedCell; 1516 return mSelectedCell;
1511} 1517}
1512void KOMonthView::setSelectedCell( MonthViewCell *cell ) 1518void 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;
1517 mSelectedCell = cell; 1523 mSelectedCell = cell;
1518 mvc->deselect(); 1524 mvc->deselect();
@@ -1549,15 +1555,21 @@ void KOMonthView::keyPressEvent ( QKeyEvent * e )
1549 switch(e->key()) { 1555 switch(e->key()) {
1550 case Key_Up: 1556 case Key_Up:
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 }
1555 e->accept(); 1564 e->accept();
1556 break; 1565 break;
1557 case Key_Down: 1566 case Key_Down:
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
1562 } 1574 }
1563 e->accept(); 1575 e->accept();