fixxeess

5 files changed, 25 insertions, 6 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 4251283..e21bb44 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -7,2 +7,7 @@ Fixed problem loading translations for summary/location edit boxes in event/todo
 
+Added a general "select week number" to the toolbar.
+
+Fixed some small problem of the new features introduced in version 2.0.3.
+
+
 ********** VERSION 2.0.3 ************
diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp
index ce66863..da5ef07 100644
--- a/korganizer/koeditorgeneraltodo.cpp
+++ b/korganizer/koeditorgeneraltodo.cpp
@@ -166,3 +166,3 @@ void KOEditorGeneralTodo::initCompletion(QWidget *parent, QBoxLayout *topLayout)
       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
@@ -555,2 +555,3 @@ void MonthViewCell::insertTodo(Todo *todo)
       QString text;
+    mItemList->setFocusPolicy(WheelFocus); 
         if (todo->hasDueDate()) {
@@ -561,3 +562,3 @@ void MonthViewCell::insertTodo(Todo *todo)
         }
-        text += i18n("Td: %1").arg(todo->summary());
+    text += i18n("T: %1").arg(todo->summary());
 
@@ -784,3 +785,2 @@ void MonthViewCell::selection( QListBoxItem *item )
     if ( !item ) return;
-
     mMonthView->setSelectedCell( this );
@@ -1267,2 +1267,6 @@ void KOMonthView::resizeEvent(QResizeEvent * e)
     if ( ignoreResizeEvent ) {
+        int diff =  e->size().height() - e->oldSize().height();
+        if ( diff < 0 )
+            diff = diff * (-1);
+        if (  diff == ignoreResizeEventHeight ) {
         qDebug("KOMonthView::resizeEvent ignored ");
@@ -1271,2 +1275,4 @@ void KOMonthView::resizeEvent(QResizeEvent * e)
     }
+        ignoreResizeEvent = 0;
+    }
     if ( e->size().width()+ e->size().height() < 240 )
@@ -1513,3 +1519,3 @@ void KOMonthView::setSelectedCell( MonthViewCell *cell )
 {
-    // qDebug("KOMonthView::setSelectedCell ");
+    //qDebug("KOMonthView::setSelectedCell %x ", cell);
     if ( mSelectedCell && mSelectedCell != cell ) {
@@ -1552,2 +1558,5 @@ void KOMonthView::keyPressEvent ( QKeyEvent * e )
             emit prevMonth();
+            if ( mShowWeekView )
+                mCellsW[0]->setFocus();
+            else
             mCells[0]->setFocus();
@@ -1559,2 +1568,5 @@ void KOMonthView::keyPressEvent ( QKeyEvent * e )
             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
@@ -228,3 +228,3 @@ class KOMonthView: public KOEventView
     bool isUpdatePossible() { return updatePossible; }
-    void setIgnoreResizeEvent( int c ) {  ignoreResizeEvent = c ;}
+    void setIgnoreResizeEvent( int c, int h ) {  ignoreResizeEvent = c ;ignoreResizeEventHeight = h;}
 
@@ -262,2 +262,3 @@ class KOMonthView: public KOEventView
     int ignoreResizeEvent;
+    int ignoreResizeEventHeight;
     int currentWeek();
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index dcb51dc..c35de0a 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -225,3 +225,4 @@ void KOViewManager::raiseCurrentView( bool fullScreen, bool callUpdateView  )
         if ( true /* !KOPrefs::instance()->mMonthViewWeek*/ ) {
-            mMonthView->setIgnoreResizeEvent( 2 ); 
+            
+            mMonthView->setIgnoreResizeEvent( 2 ,mMainView->navigatorBar()->height()); 
             mMainView->navigatorBar()->show();