4 files changed, 20 insertions, 6 deletions

diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp
index ce66863..da5ef07 100644
--- a/korganizer/koeditorgeneraltodo.cpp
+++ b/korganizer/koeditorgeneraltodo.cpp
@@ -164,7 +164,7 @@ void KOEditorGeneralTodo::initCompletion(QWidget *parent, QBoxLayout *topLayout)
       if (  QApplication::desktop()->width() < 320 )
           mCompleteDateEdit->setMaximumWidth( 85 );
       else
-          mCompleteDateEdit->setMaximumWidth( 130 );
+          mCompleteDateEdit->setMaximumWidth( 140 );
       topLayout->setSpacing( 0 );
   }
 }
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 5926abe..ffb2e1e 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -553,13 +553,14 @@ void MonthViewCell::insertEvent(Event *event)
 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 );
@@ -782,7 +783,6 @@ void MonthViewCell::contextMenu( QListBoxItem *item )
 void MonthViewCell::selection( QListBoxItem *item )
 {
     if ( !item ) return;
-
     mMonthView->setSelectedCell( this );
 }
 
@@ -1265,10 +1265,16 @@ 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();
@@ -1511,7 +1517,7 @@ MonthViewCell * KOMonthView::selectedCell( )
 }
 void KOMonthView::setSelectedCell( MonthViewCell *cell )
 {
-    // qDebug("KOMonthView::setSelectedCell ");
+    //qDebug("KOMonthView::setSelectedCell %x ", cell);
     if ( mSelectedCell && mSelectedCell != cell ) {
         MonthViewCell * mvc = mSelectedCell;
         mSelectedCell = cell;
@@ -1550,6 +1556,9 @@ void KOMonthView::keyPressEvent ( QKeyEvent * e )
     case Key_Up: 
         {
             emit prevMonth();
+            if ( mShowWeekView )
+                mCellsW[0]->setFocus();
+            else
             mCells[0]->setFocus();
         }
         e->accept();
@@ -1557,6 +1566,9 @@ void KOMonthView::keyPressEvent ( QKeyEvent * e )
     case Key_Down:
         {
             emit nextMonth();
+            if ( mShowWeekView )
+                mCellsW[0]->setFocus();
+            else
             mCells[0]->setFocus();
            
         }
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index 9dbe319..d70cda1 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -226,7 +226,7 @@ class KOMonthView: public KOEventView
                               const QDate &, const QDate &);
     bool isMonthView() { return true; }
     bool isUpdatePossible() { return updatePossible; }
-    void setIgnoreResizeEvent( int c ) {  ignoreResizeEvent = c ;}
+    void setIgnoreResizeEvent( int c, int h ) {  ignoreResizeEvent = c ;ignoreResizeEventHeight = h;}
 
     MonthViewCell * selectedCell();
   public slots:
@@ -260,6 +260,7 @@ class KOMonthView: public KOEventView
 
   private:
     int ignoreResizeEvent;
+    int ignoreResizeEventHeight;
     int currentWeek();
     bool clPending;
     QWidgetStack * mWidStack;
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index dcb51dc..c35de0a 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -223,7 +223,8 @@ void KOViewManager::raiseCurrentView( bool fullScreen, bool callUpdateView  )
     int hei  = mMainView->height();
     if ( mCurrentView == mMonthView   ) { 
         if ( true /* !KOPrefs::instance()->mMonthViewWeek*/ ) {
-            mMonthView->setIgnoreResizeEvent( 2 ); 
+            
+            mMonthView->setIgnoreResizeEvent( 2 ,mMainView->navigatorBar()->height()); 
             mMainView->navigatorBar()->show();
             hei -= mMainView->navigatorBar()->sizeHint().height();
         }