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
@@ -4,8 +4,13 @@ Info about the changes in new versions of KDE-Pim/Pi
 
 KO/Pi:
 Fixed problem loading translations for summary/location edit boxes in event/todo editor.
 
+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 ************
 
 KO/Pi:
 Added feature for changing alarm settings for many items at once:
diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp
index ce66863..da5ef07 100644
--- a/korganizer/koeditorgeneraltodo.cpp
+++ b/korganizer/koeditorgeneraltodo.cpp
@@ -163,9 +163,9 @@ void KOEditorGeneralTodo::initCompletion(QWidget *parent, QBoxLayout *topLayout)
   if (  QApplication::desktop()->width() <= 480 ) {
       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
@@ -552,15 +552,16 @@ 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 );
         QPalette pal;
@@ -781,9 +782,8 @@ void MonthViewCell::contextMenu( QListBoxItem *item )
 
 void MonthViewCell::selection( QListBoxItem *item )
 {
     if ( !item ) return;
-
     mMonthView->setSelectedCell( this );
 }
 
 
@@ -1264,12 +1264,18 @@ 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; 
@@ -1510,9 +1516,9 @@ 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();
@@ -1549,15 +1555,21 @@ void KOMonthView::keyPressEvent ( QKeyEvent * e )
     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();
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index 9dbe319..d70cda1 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -225,9 +225,9 @@ class KOMonthView: public KOEventView
     virtual void printPreview(CalPrinter *calPrinter,
                               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:
     virtual void updateView();
@@ -259,8 +259,9 @@ class KOMonthView: public KOEventView
     void updateDayLabels();
 
   private:
     int ignoreResizeEvent;
+    int ignoreResizeEventHeight;
     int currentWeek();
     bool clPending;
     QWidgetStack * mWidStack;
     QWidget* mMonthView;
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index dcb51dc..c35de0a 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -222,9 +222,10 @@ void KOViewManager::raiseCurrentView( bool fullScreen, bool callUpdateView  )
     int wid =  mMainView->width() ;
     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();
         }
         //mMainView->navigatorBar()->hide();