more fixes

1 files changed, 38 insertions, 15 deletions

diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 940d288..ca35a86 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -98,13 +98,13 @@ QString KNoScrollListBox::getWhatsThisText(QPoint p)
                                                                   KOPrefs::instance()->mWTshowDetails,
                                                                   KOPrefs::instance()->mWTshowCreated,
                                                                   KOPrefs::instance()->mWTshowChanged);
 }
 void KNoScrollListBox::keyPressEvent(QKeyEvent *e)
 {
- 
+    //qDebug("KNoScrollListBox::keyPressEvent ");
     switch(e->key()) {
     case Key_Right:
         if ( e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton  )
         {
             e->ignore();
             return;
@@ -152,12 +152,23 @@ void KNoScrollListBox::keyPressEvent(QKeyEvent *e)
         }
         break;
     case Key_I:
         QTimer::singleShot( 11, this, SLOT ( oneDown() ) );
         e->ignore();
         break;
+    case Key_Return:
+    case Key_Enter:
+        {
+            if ( currentItem() >= 0 ) {
+                emit doubleClicked( item( currentItem() ) );
+                e->accept();
+            } else {
+                e->ignore();
+            }
+        }
+        break;
     case Key_Shift:
         emit shiftDown();
         break;
     default:
         e->ignore();
         break;
@@ -310,14 +321,14 @@ void MonthViewItem::paint(QPainter *p)
             p->drawLine ( x, heihei/2, x +half , heihei/2 +half ) ;
             p->drawLine (  x +half , heihei/2 +half ,  x +half+half +2 , heihei/2  -2 ) ;
             x += half+half + 4;
 
         } else {
             int val = td->percentComplete()/20;
-            p->fillRect ( x+1, y-1, val ,size+2,Qt::black );
-            p->drawRect ( x, y-1,7,size+2);
+            p->fillRect ( x+1, y-2, val ,size+4,Qt::black );
+            p->drawRect ( x, y-2,7,size+4);
             x += size + 3;
         }
     }
     QFontMetrics fm = p->fontMetrics();
     int yPos;
     int pmheight = size;
@@ -1049,12 +1060,13 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
         //label->setFrameStyle(QFrame::Panel|QFrame::Raised);
         //label->setLineWidth(1);
         //label->setAlignment(AlignCenter);
         mWeekLabels.insert( i, label );
     }
     mWeekLabels[mNumWeeks]->setText( i18n("W"));
+    mWeekLabels[0]->setFocusPolicy(WheelFocus);
     QWhatsThis::add(mWeekLabels[mNumWeeks],i18n("Click on this to\nselect week number"));
     
     for( i = 0; i < 1+1; i++ ) {
         KOWeekButton *label = new KOWeekButton( mWeekView );
         label->setFocusPolicy(NoFocus); 
         label->setFont(bfont);
@@ -1064,12 +1076,13 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
         //label->setFrameStyle(QFrame::Panel|QFrame::Raised);
         //label->setLineWidth(1);
         //label->setAlignment(AlignCenter);
         mWeekLabelsW.insert( i, label );
     }
     mWeekLabelsW[1]->setText( i18n("W"));
+    mWeekLabelsW[0]->setFocusPolicy(WheelFocus); 
 
 
     int row, col;
     mCells.resize( mNumCells );
     for( row = 0; row < mNumWeeks; ++row ) {
         for( col = 0; col < mDaysPerWeek; ++col ) {
@@ -1463,15 +1476,13 @@ void KOMonthView::updateView()
     }
     processSelectionChange();
     //qApp->processEvents();
      for( i = 0; i < timeSpan+1; ++i ) {
          (*cells)[i]->repaintfinishUpdateCell();
     }
-    (*cells)[0]->setFocus();
-
-
+     setKeyBFocus();
 #else
     // old code
     //qDebug("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ");
     int i;
     for( i = 0; i < (*cells).count(); ++i ) {
         (*cells)[i]->updateCell();
@@ -1483,12 +1494,32 @@ void KOMonthView::updateView()
     (*cells)[0]->setFocus();
 #endif
 
     //qDebug("update time %d ", ti.elapsed());
 }
 
+void KOMonthView::setKeyBoardFocus()
+{
+    bool shootAgain = false;
+    if ( mShowWeekView ) {
+        shootAgain = !mWeekLabelsW[0]->hasFocus();
+         mWeekLabelsW[0]->setFocus();
+    }
+    else {
+        shootAgain = !mWeekLabels[0]->hasFocus();
+         mWeekLabels[0]->setFocus();
+    }
+    if ( shootAgain ) {
+      QTimer::singleShot( 0, this, SLOT ( setKeyBFocus() ) );
+    }
+}
+void KOMonthView::setKeyBFocus()
+{
+    //qDebug("KOMonthView::setKeyBFocus() ");
+    QTimer::singleShot( 0, this, SLOT ( setKeyBoardFocus() ) );
+}
 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 ( isVisible() ) {
         //qDebug("KOMonthView::isVisible ");
         slotComputeLayout();
@@ -1499,17 +1530,13 @@ void KOMonthView::resizeEvent(QResizeEvent * e)
 void KOMonthView::slotComputeLayout()
 {
     mComputeLayoutTimer->stop();
     //qDebug("KOMonthView::Post - resizeEvent %d %d ", width(), height() );
     computeLayout();
     clPending = true; 
-    if ( mShowWeekView )
-        mCellsW[0]->setFocus();
-    else
-        mCells[0]->setFocus();
-
+    setKeyBFocus();
 }
 void KOMonthView::computeLayoutWeek()
 {
     static int lastWid = 0;
     static int lastHei = 0;
     int daysToShow;
@@ -1814,30 +1841,26 @@ void KOMonthView::keyPressEvent ( QKeyEvent * e )
 {
     //qDebug("KOMonthView::keyPressEvent ");
     switch(e->key()) {
     case Key_Up: 
         {
             if ( mShowWeekView ) {
-                mCellsW[0]->setFocus();
                 emit selectWeekNum ( currentWeek() - 1 );
             }
             else {
-                mCells[0]->setFocus();
                 emit prevMonth();
             }
         }
         e->accept();
         break;
     case Key_Down:
         {
             if ( mShowWeekView ) {
-                mCellsW[0]->setFocus();
                 emit selectWeekNum ( currentWeek() +1);
             }
             else {
-                mCells[0]->setFocus();
                 emit nextMonth();
             }
            
         }
         e->accept();
         break;